From 5b9c3a67be75406ecb787d134bd755ef2be389f5 Mon Sep 17 00:00:00 2001 From: Johan Compagner Date: Sat, 10 Apr 2021 11:24:43 +0200 Subject: [PATCH] SVY-16029 [NG2] investigate how services can be there own project (and included in ng2) big refactor to create a servoy-public lib that can be used by services or component packages. fix a lot of test to include now a more standard servoytesting.module that has the basics overwritten and injected. Fixed a lot of test to include the right modules so all directives are found. --- .../node/.eslintrc.json | 1 - .../node/angular.json | 44 +- .../node/karma.conf.js | 21 +- .../node/package-lock.json | 575 +++++++++++++++++- .../node/package.json | 7 +- .../node/projects/servoy-public/README.md | 24 + .../node/projects/servoy-public/karma.conf.js | 63 ++ .../projects/servoy-public/ng-package.json | 7 + .../node/projects/servoy-public/package.json | 11 + .../servoy-public/src/lib}/basecomponent.ts | 25 +- .../src/lib}/component_contributor.service.ts | 0 .../servoy-public/src/lib}/deferred.ts | 0 .../src/lib/directives}/autosave.directive.ts | 6 +- .../decimalkeyconverter.directive.ts | 6 +- .../lib/directives}/imagemediaid.directive.ts | 2 +- .../lib/directives}/sablotabseq.directive.ts | 0 .../lib/directives}/startedit.directive.ts | 6 +- .../src/lib/directives/upload.directive.ts | 25 + .../src/lib}/format/emptyvalue.pipe.ts | 0 .../src/lib}/format/format.pipe.ts | 0 .../formatcontrolvalueaccessor.directive.ts | 2 +- .../src/lib}/format/formatting.service.ts | 6 +- .../src/lib}/format/maskformat.ts | 0 .../servoy-public/src/lib/format}/pipes.ts | 14 + .../projects/servoy-public/src/lib/jsevent.ts | 18 + .../servoy-public/src/lib}/logger.service.ts | 2 +- .../src/lib/services/servoy_public.service.ts | 22 + .../src/lib/services}/windowref.service.ts | 0 .../servoy-public/src/lib/servoy_api.ts | 30 + .../src/lib}/servoy_public.module.ts | 29 +- .../lib}/tooltip/tooltip.directive.spec.ts | 2 +- .../src/lib}/tooltip/tooltip.directive.ts | 1 - .../src/lib}/tooltip/tooltip.service.ts | 27 +- .../src/lib}/utils/property_utils.ts | 0 .../projects/servoy-public/src/public-api.ts | 23 + .../node/projects/servoy-public/src/test.ts | 26 + .../projects/servoy-public/tsconfig.lib.json | 24 + .../servoy-public/tsconfig.lib.prod.json | 9 + .../projects/servoy-public/tsconfig.spec.json | 17 + .../node/projects/servoy-public/tslint.json | 17 + .../node/scripts/fixPrepublish.js | 10 + .../accordion/accordion.spec.ts | 11 +- .../accordion/accordion.ts | 2 +- .../src/bootstrapcomponents/bts_basecomp.ts | 2 +- .../src/bootstrapcomponents/bts_basefield.ts | 2 +- .../bootstrapcomponents/bts_basetabpanel.ts | 2 +- .../bootstrapcomponents/button/button.spec.ts | 8 +- .../calendar/basecalendar.ts | 6 +- .../calendar/calendar.spec.ts | 12 +- .../bootstrapcomponents/calendar/calendar.ts | 11 +- .../calendarinline/calendarinline.ts | 6 +- .../combobox/combobox.spec.ts | 8 +- .../bootstrapcomponents/combobox/combobox.ts | 2 +- .../datalabel/datalabel.spec.ts | 8 +- .../imagemedia/imagemedia.spec.ts | 5 +- .../bootstrapcomponents/label/label.spec.ts | 8 +- .../servoybootstrap.module.ts | 2 +- .../tablesspanel/tablesspanel.spec.ts | 8 +- .../tabpanel/tabpanel.spec.ts | 8 +- .../bootstrapcomponents/tabpanel/tabpanel.ts | 2 +- .../textarea/textarea.spec.ts | 10 +- .../textbox/textbox.spec.ts | 29 +- .../bootstrapcomponents/textbox/textbox.ts | 2 +- .../typeahead/typeahead.spec.ts | 8 +- .../typeahead/typeahead.ts | 2 +- .../bootstrapextracomponents/badge/badge.ts | 2 +- .../breadcrumbs/breadcrumbs.spec.ts | 10 +- .../breadcrumbs/breadcrumbs.ts | 2 +- .../buttonsgroup/buttonsgroup.spec.ts | 10 +- .../buttonsgroup/buttonsgroup.ts | 4 +- .../carousel/carousel.ts | 2 +- .../dropdown/dropdown.spec.ts | 11 +- .../dropdown/dropdown.ts | 17 +- .../inputgroup/inputgroup.ts | 32 +- .../bootstrapextracomponents/navbar/navbar.ts | 9 +- .../progressbar/progressbar.spec.ts | 9 +- .../progressbar/progressbar.ts | 2 +- .../bootstrapextracomponents/rating/rating.ts | 2 +- .../servoybootstrapextra.module.ts | 2 +- .../switch/switch.spec.ts | 9 +- .../bootstrapextracomponents/switch/switch.ts | 2 +- .../src/keylistener/keylistener.service.ts | 9 +- .../converters/clientfunction_converter.ts | 2 +- .../converters/component_converter.ts | 5 +- .../foundsetLinked_converter.spec.ts | 6 +- .../converters/foundsetLinked_converter.ts | 2 +- .../converters/foundset_converter.spec.ts | 6 +- .../ngclient/converters/foundset_converter.ts | 4 +- .../converters/json_array_converter.spec.ts | 4 +- .../converters/json_object_converter.spec.ts | 4 +- .../converters/valuelist_converter.spec.ts | 10 +- .../converters/valuelist_converter.ts | 2 +- .../node/src/ngclient/form.service.spec.ts | 6 +- .../node/src/ngclient/form.service.ts | 4 +- .../form/form_component.component.spec.ts | 6 +- .../ngclient/form/form_component.component.ts | 6 +- .../node/src/ngclient/locale.service.ts | 4 +- .../node/src/ngclient/main.component.spec.ts | 2 +- .../node/src/ngclient/main.component.ts | 2 +- .../ngclient/services/application.service.ts | 20 +- .../bootstrap-window/bswindow.service.ts | 4 +- .../bswindow_manager.service.ts | 2 +- .../services/clientfunction.service.ts | 6 +- .../file-upload-window.component.spec.ts | 2 +- .../file-upload-window.component.ts | 2 +- .../services/i18n_provider.service.ts | 2 +- .../ngclient/services/popupform.service.ts | 2 +- .../ngclient/services/serverdata.service.ts | 2 +- .../services/servoy_public_impl.service.ts | 50 ++ .../src/ngclient/services/window.service.ts | 2 +- .../node/src/ngclient/servoy.module.ts | 10 +- .../node/src/ngclient/servoy.service.ts | 6 +- .../node/src/ngclient/servoy_api.ts | 2 +- .../{servoy_public.ts => servoy_public2.ts} | 0 .../ngclient/{services => }/utils.service.ts | 56 +- .../src/ngclient/utils/upload.directive.ts | 28 - .../ngdesktopfile/ngdesktopfile.service.ts | 49 +- .../src/ngdesktopui/ngdesktopui.service.ts | 3 +- .../ngdesktoputils/ngdesktoputils.service.ts | 5 +- .../node/src/nggrids/datagrid/datagrid.ts | 6 +- .../datagrid/filters/datagridfilter.ts | 2 +- .../datagrid/filters/valuelistfilter.ts | 2 +- .../node/src/nggrids/editors/datepicker.ts | 6 +- .../src/nggrids/editors/typeaheadeditor.ts | 2 +- .../node/src/nggrids/nggrid.ts | 2 +- .../node/src/nggrids/nggrids.module.ts | 2 +- .../node/src/nggrids/powergrid/powergrid.ts | 4 +- .../node/src/sablo/converter.service.spec.ts | 4 +- .../node/src/sablo/converter.service.ts | 2 +- .../node/src/sablo/defer.service.ts | 4 +- .../src/sablo/io/reconnecting.websocket.ts | 2 +- .../sablo/io/reconnection.websocket.spec.ts | 4 +- .../node/src/sablo/logger.service.spec.ts | 4 +- .../node/src/sablo/pipes/pipes.ts | 17 - .../node/src/sablo/sablo.module.ts | 11 +- .../node/src/sablo/sablo.service.ts | 10 +- .../node/src/sablo/services.service.ts | 2 +- .../node/src/sablo/spectypes.service.ts | 2 +- .../node/src/sablo/testability.service.ts | 6 +- .../loading-indicator.service.ts | 2 +- .../node/src/sablo/websocket.service.spec.ts | 4 +- .../node/src/sablo/websocket.service.ts | 6 +- .../sablo/webstorage/localstorage.service.ts | 2 +- .../webstorage/sessionstorage.service.ts | 2 +- .../ngutils/ngutils.service.spec.ts | 4 +- .../ngutils/ngutils.service.ts | 2 +- .../default-navigator/default-navigator.ts | 2 +- .../formcontainer/formcontainer.spec.ts | 6 +- .../servoycore/formcontainer/formcontainer.ts | 10 +- .../listformcomponent/listformcomponent.ts | 6 +- .../node/src/servoycore/slider/slider.spec.ts | 8 +- .../node/src/servoydefault/basechoice.ts | 2 +- .../node/src/servoydefault/basecomponent.ts | 2 +- .../node/src/servoydefault/basefield.ts | 2 +- .../node/src/servoydefault/baselabel.ts | 2 +- .../src/servoydefault/button/button.spec.ts | 10 +- .../servoydefault/calendar/calendar.spec.ts | 13 +- .../src/servoydefault/calendar/calendar.ts | 11 +- .../src/servoydefault/check/check.spec.ts | 9 +- .../node/src/servoydefault/check/check.ts | 2 +- .../checkgroup/checkgroup.spec.ts | 10 +- .../servoydefault/checkgroup/checkgroup.ts | 2 +- .../servoydefault/combobox/combobox.spec.ts | 15 +- .../src/servoydefault/combobox/combobox.ts | 2 +- .../servoydefault/htmlarea/htmlarea.spec.ts | 13 +- .../src/servoydefault/htmlarea/htmlarea.ts | 6 +- .../servoydefault/htmlview/htmlview.spec.ts | 8 +- .../src/servoydefault/htmlview/htmlview.ts | 2 +- .../imagemedia/imagemedia.spec.ts | 17 +- .../servoydefault/imagemedia/imagemedia.ts | 2 +- .../src/servoydefault/label/label.spec.ts | 9 +- .../src/servoydefault/listbox/listbox.spec.ts | 8 +- .../node/src/servoydefault/listbox/listbox.ts | 2 +- .../servoydefault/password/password.spec.ts | 10 +- .../src/servoydefault/password/password.ts | 2 +- .../node/src/servoydefault/radio/radio.ts | 4 +- .../radiogroup/radiogroup.spec.ts | 10 +- .../servoydefault/radiogroup/radiogroup.ts | 2 +- .../servoydefault/rectangle/rectangle.spec.ts | 8 +- .../src/servoydefault/servoydefault.module.ts | 12 +- .../src/servoydefault/spinner/spinner.spec.ts | 8 +- .../node/src/servoydefault/spinner/spinner.ts | 2 +- .../servoydefault/splitpane/splitpane.spec.ts | 10 +- .../src/servoydefault/splitpane/splitpane.ts | 2 +- .../servoydefault/tabpanel/basetabpanel.ts | 6 +- .../tabpanel/tablesspanel.spec.ts | 14 +- .../servoydefault/tabpanel/tablesspanel.ts | 4 +- .../servoydefault/tabpanel/tabpanel.spec.ts | 12 +- .../src/servoydefault/tabpanel/tabpanel.ts | 4 +- .../servoydefault/textarea/textarea.spec.ts | 10 +- .../src/servoydefault/textarea/textarea.ts | 2 +- .../servoydefault/textfield/textfield.spec.ts | 11 +- .../src/servoydefault/textfield/textfield.ts | 2 +- .../servoydefault/typeahead/typeahead.spec.ts | 9 +- .../src/servoydefault/typeahead/typeahead.ts | 2 +- .../src/servoyextra/collapse/collapse.spec.ts | 9 +- .../node/src/servoyextra/collapse/collapse.ts | 2 +- .../src/servoyextra/dbtreeview/dbtreeview.ts | 4 +- .../src/servoyextra/fileupload/fileupload.ts | 10 +- .../src/servoyextra/htmlarea/htmlarea.spec.ts | 15 +- .../node/src/servoyextra/htmlarea/htmlarea.ts | 3 +- .../src/servoyextra/imagelabel/imagelabel.ts | 2 +- .../lightboxgallery/lightboxgallery.ts | 2 +- .../multifileupload/multifileupload.spec.ts | 6 +- .../multifileupload/multifileupload.ts | 6 +- .../select2tokenizer/select2tokenizer.spec.ts | 2 +- .../select2tokenizer/select2tokenizer.ts | 2 +- .../src/servoyextra/servoyextra.module.ts | 4 +- .../node/src/servoyextra/sidenav/sidenav.ts | 4 +- .../src/servoyextra/slider/slider.spec.ts | 4 +- .../node/src/servoyextra/slider/slider.ts | 4 +- .../src/servoyextra/spinner/spinner.spec.ts | 4 +- .../node/src/servoyextra/spinner/spinner.ts | 2 +- .../servoyextra/splitpane/splitpane.spec.ts | 6 +- .../src/servoyextra/splitpane/splitpane.ts | 2 +- .../node/src/servoyextra/table/table.spec.ts | 8 +- .../node/src/servoyextra/table/table.ts | 4 +- .../textfieldgroup/textfieldgroup.spec.ts | 4 +- .../textfieldgroup/textfieldgroup.ts | 2 +- .../node/src/servoyextra/treeview/treeview.ts | 2 +- .../youtubevideoembedder.ts | 2 +- .../node/src/svychartjs/chart/chart.ts | 2 +- .../decimalkeyconverter.directive.spec.ts | 17 +- .../node/src/testing/servoytesting.module.ts | 37 +- .../node/src/tsconfig.app.json | 9 +- .../node/src/tsconfig.spec.json | 8 +- .../src/window_service/window.service.spec.ts | 9 +- .../node/src/window_service/window.service.ts | 9 +- .../window_service/windowservice.module.ts | 4 +- .../node/tsconfig.json | 14 +- com.servoy.eclipse.ngclient.ui/pom.xml | 39 +- .../eclipse/ngclient/ui/IndexPageFilter.java | 2 +- 232 files changed, 1723 insertions(+), 713 deletions(-) create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/README.md create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/karma.conf.js create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/ng-package.json create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/package.json rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/basecomponent.ts (84%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/component_contributor.service.ts (100%) rename com.servoy.eclipse.ngclient.ui/node/{src/sablo/util => projects/servoy-public/src/lib}/deferred.ts (100%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient/utils => projects/servoy-public/src/lib/directives}/autosave.directive.ts (57%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient/utils => projects/servoy-public/src/lib/directives}/decimalkeyconverter.directive.ts (82%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient/utils => projects/servoy-public/src/lib/directives}/imagemediaid.directive.ts (99%) rename com.servoy.eclipse.ngclient.ui/node/{src/sablo/util => projects/servoy-public/src/lib/directives}/sablotabseq.directive.ts (100%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient/utils => projects/servoy-public/src/lib/directives}/startedit.directive.ts (81%) create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/upload.directive.ts rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/format/emptyvalue.pipe.ts (100%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/format/format.pipe.ts (100%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/format/formatcontrolvalueaccessor.directive.ts (96%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/format/formatting.service.ts (96%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/format/maskformat.ts (100%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient/pipes => projects/servoy-public/src/lib/format}/pipes.ts (69%) create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/jsevent.ts rename com.servoy.eclipse.ngclient.ui/node/{src/sablo => projects/servoy-public/src/lib}/logger.service.ts (95%) create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/services/servoy_public.service.ts rename com.servoy.eclipse.ngclient.ui/node/{src/sablo/util => projects/servoy-public/src/lib/services}/windowref.service.ts (100%) create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_api.ts rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/servoy_public.module.ts (57%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/tooltip/tooltip.directive.spec.ts (98%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/tooltip/tooltip.directive.ts (95%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/tooltip/tooltip.service.ts (85%) rename com.servoy.eclipse.ngclient.ui/node/{src/ngclient => projects/servoy-public/src/lib}/utils/property_utils.ts (100%) create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/public-api.ts create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/test.ts create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.json create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.prod.json create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.spec.json create mode 100644 com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tslint.json create mode 100644 com.servoy.eclipse.ngclient.ui/node/scripts/fixPrepublish.js create mode 100644 com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/servoy_public_impl.service.ts rename com.servoy.eclipse.ngclient.ui/node/src/ngclient/{servoy_public.ts => servoy_public2.ts} (100%) rename com.servoy.eclipse.ngclient.ui/node/src/ngclient/{services => }/utils.service.ts (66%) delete mode 100644 com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/upload.directive.ts delete mode 100644 com.servoy.eclipse.ngclient.ui/node/src/sablo/pipes/pipes.ts rename com.servoy.eclipse.ngclient.ui/node/src/{ngclient/utils => testing}/decimalkeyconverter.directive.spec.ts (78%) diff --git a/com.servoy.eclipse.ngclient.ui/node/.eslintrc.json b/com.servoy.eclipse.ngclient.ui/node/.eslintrc.json index b7a7f3e6b3..bd64677098 100644 --- a/com.servoy.eclipse.ngclient.ui/node/.eslintrc.json +++ b/com.servoy.eclipse.ngclient.ui/node/.eslintrc.json @@ -1,7 +1,6 @@ { "root": true, "ignorePatterns": [ - "projects/**/*" ], "plugins": [ "only-warn" diff --git a/com.servoy.eclipse.ngclient.ui/node/angular.json b/com.servoy.eclipse.ngclient.ui/node/angular.json index aa7a1e3b5f..13e4aca57d 100644 --- a/com.servoy.eclipse.ngclient.ui/node/angular.json +++ b/com.servoy.eclipse.ngclient.ui/node/angular.json @@ -12,7 +12,7 @@ "builder": "@angular-devkit/build-angular:browser", "options": { "aot": true, - "outputPath": "dist", + "outputPath": "dist/app", "index": "src/index.html", "main": "src/main.ts", "tsConfig": "src/tsconfig.app.json", @@ -78,6 +78,7 @@ "karmaConfig": "./karma.conf.js", "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", + "codeCoverage": true, "styles": [ "src/styles.css" ], @@ -121,6 +122,47 @@ } } } + }, + "servoy-public": { + "projectType": "library", + "root": "projects/servoy-public", + "sourceRoot": "projects/servoy-public/src", + "prefix": "lib", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:ng-packagr", + "options": { + "tsConfig": "projects/servoy-public/tsconfig.lib.json", + "project": "projects/servoy-public/ng-package.json" + }, + "configurations": { + "production": { + "tsConfig": "projects/servoy-public/tsconfig.lib.prod.json" + } + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "projects/servoy-public/src/test.ts", + "tsConfig": "projects/servoy-public/tsconfig.spec.json", + "karmaConfig": "projects/servoy-public/karma.conf.js", + "codeCoverage": true + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "projects/servoy-public/tsconfig.lib.json", + "projects/servoy-public/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + } + } } }, "defaultProject": "ngclient2", diff --git a/com.servoy.eclipse.ngclient.ui/node/karma.conf.js b/com.servoy.eclipse.ngclient.ui/node/karma.conf.js index 69623050e7..0a54157acb 100644 --- a/com.servoy.eclipse.ngclient.ui/node/karma.conf.js +++ b/com.servoy.eclipse.ngclient.ui/node/karma.conf.js @@ -10,25 +10,44 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('@chiragrupani/karma-chromium-edge-launcher'), require('karma-jasmine-html-reporter'), + require('karma-coverage'), require('karma-junit-reporter'), require('@angular-devkit/build-angular/plugins/karma') ], client:{ + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, clearContext: false // leave Jasmine Spec Runner output visible in browser }, + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, '../target/coverage/app'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' } + ] + }, angularCli: { environment: 'dev' }, reporters: ['progress', 'kjhtml','junit'], junitReporter: { outputFile: '../../target/TEST-browser-karma.xml' - }, + }, port: 9876, colors: true, logLevel: config.LOG_DEBUG, autoWatch: true, browsers: ['ChromeHeadless','Chrome', 'Edge'], singleRun: false, + restartOnFileChange: true, customLaunchers: { headlessChrome: { base: "ChromeHeadless", diff --git a/com.servoy.eclipse.ngclient.ui/node/package-lock.json b/com.servoy.eclipse.ngclient.ui/node/package-lock.json index c3649327d8..9508c63428 100644 --- a/com.servoy.eclipse.ngclient.ui/node/package-lock.json +++ b/com.servoy.eclipse.ngclient.ui/node/package-lock.json @@ -1506,7 +1506,6 @@ "version": "7.12.10", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz", "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==", - "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.10", @@ -1638,7 +1637,6 @@ "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz", "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==", - "dev": true, "requires": { "@babel/types": "^7.13.12" } @@ -1647,7 +1645,6 @@ "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz", "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==", - "dev": true, "requires": { "@babel/types": "^7.13.12" } @@ -1656,7 +1653,6 @@ "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz", "integrity": "sha512-7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ==", - "dev": true, "requires": { "@babel/helper-module-imports": "^7.13.12", "@babel/helper-replace-supers": "^7.13.12", @@ -1672,7 +1668,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz", "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==", - "dev": true, "requires": { "@babel/types": "^7.12.13" } @@ -1698,7 +1693,6 @@ "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz", "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==", - "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", @@ -1710,7 +1704,6 @@ "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz", "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==", - "dev": true, "requires": { "@babel/types": "^7.13.12" } @@ -2621,8 +2614,7 @@ "@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==" }, "@jsdevtools/coverage-istanbul-loader": { "version": "3.0.5", @@ -2902,6 +2894,143 @@ } } }, + "@rollup/plugin-commonjs": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz", + "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.1.0", + "commondir": "^1.0.1", + "estree-walker": "^2.0.1", + "glob": "^7.1.6", + "is-reference": "^1.2.1", + "magic-string": "^0.25.7", + "resolve": "^1.17.0" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } + } + } + }, + "@rollup/plugin-json": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz", + "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.0.8" + } + }, + "@rollup/plugin-node-resolve": { + "version": "11.2.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz", + "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.1.0", + "@types/resolve": "1.17.1", + "builtin-modules": "^3.1.0", + "deepmerge": "^4.2.2", + "is-module": "^1.0.0", + "resolve": "^1.19.0" + }, + "dependencies": { + "builtin-modules": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz", + "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==", + "dev": true + }, + "is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } + } + } + }, + "@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "requires": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "dependencies": { + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + } + } + }, "@schematics/angular": { "version": "11.2.6", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.6.tgz", @@ -2998,6 +3127,12 @@ "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==", "dev": true }, + "@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -3074,6 +3209,15 @@ "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "dev": true }, + "@types/resolve": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", + "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/selenium-webdriver": { "version": "3.0.17", "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz", @@ -4157,14 +4301,6 @@ "tslib": "^2.0.0" } }, - "angular-web-storage": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/angular-web-storage/-/angular-web-storage-10.0.0.tgz", - "integrity": "sha512-bnkPfmm6Nk/KU66kn4nYsWJWZNcxQdKGu2EppmCkbgwW/VaplDFl9A95hhoFi+QOKPIYpxzCMAtKUV1/8gmV6w==", - "requires": { - "tslib": "^2.0.0" - } - }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -6477,6 +6613,12 @@ "resolved": "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz", "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==" }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", + "dev": true + }, "custom-error-instance": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz", @@ -6562,6 +6704,12 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true + }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -7759,6 +7907,12 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true + }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -8321,6 +8475,12 @@ } } }, + "find-parent-dir": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz", + "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=", + "dev": true + }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -8581,6 +8741,12 @@ "has-symbols": "^1.0.1" } }, + "get-port": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", + "dev": true + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -8871,6 +9037,11 @@ "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==", "dev": true }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + }, "http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", @@ -9113,6 +9284,15 @@ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", "dev": true }, + "injection-js": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.4.0.tgz", + "integrity": "sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } + }, "inquirer": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", @@ -9412,6 +9592,12 @@ "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=", "dev": true }, + "is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", + "dev": true + }, "is-negative-zero": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", @@ -9491,6 +9677,15 @@ "isobject": "^3.0.1" } }, + "is-reference": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", + "dev": true, + "requires": { + "@types/estree": "*" + } + }, "is-regex": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", @@ -9600,14 +9795,12 @@ "istanbul-lib-coverage": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" }, "istanbul-lib-instrument": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, "requires": { "@babel/core": "^7.7.5", "@istanbuljs/schema": "^0.1.2", @@ -9618,11 +9811,74 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } } } }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, "jasmine": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.7.0.tgz", @@ -10099,6 +10355,19 @@ "resolve": "^1.3.3" } }, + "karma-coverage": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.0.3.tgz", + "integrity": "sha512-atDvLQqvPcLxhED0cmXYdsPMCQuh6Asa9FMZW1bhNqlVEhJoB9qyZ2BY1gu7D/rr5GLGb5QzYO4siQskxaWP/g==", + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.1", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.0", + "minimatch": "^3.0.4" + } + }, "karma-jasmine": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz", @@ -11164,6 +11433,184 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "ng-packagr": { + "version": "11.2.4", + "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-11.2.4.tgz", + "integrity": "sha512-pAZYRWe4duLx6bXgfNKgT2XBHiepWz2sA+CaJ9UYEbLHE+QxYGtw/PJAC6o0zRDv1bBCkv5oquKTyTZtYjkAQQ==", + "dev": true, + "requires": { + "@rollup/plugin-commonjs": "^17.0.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^11.1.0", + "ajv": "^7.0.3", + "ansi-colors": "^4.1.1", + "autoprefixer": "^10.2.4", + "browserslist": "^4.16.1", + "chokidar": "^3.5.1", + "commander": "^7.0.0", + "cssnano": "^4.1.10", + "glob": "^7.1.6", + "injection-js": "^2.4.0", + "less": "^4.1.0", + "node-sass-tilde-importer": "^1.0.2", + "ora": "^5.1.0", + "postcss": "^8.2.4", + "postcss-url": "^10.1.1", + "rimraf": "^3.0.0", + "rollup": "^2.37.0", + "rollup-plugin-sourcemaps": "^0.6.3", + "rxjs": "^6.5.0", + "sass": "^1.32.5", + "stylus": "^0.54.8", + "sync-rpc": "^1.3.6", + "terser": "^5.5.1" + }, + "dependencies": { + "ajv": { + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", + "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.3.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + } + }, + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + }, + "readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + }, + "terser": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz", + "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.19" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + } + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, "ng-select2-component": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ng-select2-component/-/ng-select2-component-7.2.3.tgz", @@ -11325,6 +11772,15 @@ "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", "dev": true }, + "node-sass-tilde-importer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz", + "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==", + "dev": true, + "requires": { + "find-parent-dir": "^0.3.0" + } + }, "nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -13766,6 +14222,41 @@ } } }, + "postcss-url": { + "version": "10.1.3", + "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz", + "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==", + "dev": true, + "requires": { + "make-dir": "~3.1.0", + "mime": "~2.5.2", + "minimatch": "~3.0.4", + "xxhashjs": "~0.2.2" + }, + "dependencies": { + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "postcss-value-parser": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", @@ -14820,6 +15311,28 @@ } } }, + "rollup-plugin-sourcemaps": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz", + "integrity": "sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^3.0.9", + "source-map-resolve": "^0.6.0" + }, + "dependencies": { + "source-map-resolve": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz", + "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==", + "dev": true, + "requires": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0" + } + } + } + }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -16288,6 +16801,15 @@ "integrity": "sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==", "dev": true }, + "sync-rpc": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz", + "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==", + "dev": true, + "requires": { + "get-port": "^3.1.0" + } + }, "table": { "version": "6.0.7", "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz", @@ -17957,6 +18479,15 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, + "xxhashjs": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz", + "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==", + "dev": true, + "requires": { + "cuint": "^0.2.2" + } + }, "y18n": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", diff --git a/com.servoy.eclipse.ngclient.ui/node/package.json b/com.servoy.eclipse.ngclient.ui/node/package.json index 6a35a2a667..28430262a9 100644 --- a/com.servoy.eclipse.ngclient.ui/node/package.json +++ b/com.servoy.eclipse.ngclient.ui/node/package.json @@ -6,7 +6,11 @@ "ng": "ng", "start": "ng serve", "build": "ng build --prod --subresourceIntegrity=true", + "build_lib": "ng build servoy-public --prod", + "fix_lib": "node scripts/fixPrepublish.js", "build_debug": "ng build --watch", + "build_lib_debug": "ng build servoy-public --watch", + "package": "ng-packagr -p public/package.json", "test": "ng test --watch --browsers Chrome", "test_edge": "ng test --watch --browsers Edge", "test_edge_nowatch": "ng test --watch=false --browsers Edge", @@ -40,12 +44,12 @@ "@tinymce/tinymce-angular": "^4.2.2", "angular-resizable-element": "3.3.5", "angular-tree-grid": "^3.0.0", - "angular-web-storage": "^10.0.0", "bootstrap": "^4.6.0", "chart.js": "^2.9.4", "core-js": "^3.9.1", "custom-event-polyfill": "^1.0.7", "jw-bootstrap-switch-ng2": "^2.0.5", + "karma-coverage": "^2.0.3", "lodash-es": "^4.17.21", "moment": "^2.29.1", "ng-select2-component": "^7.2.3", @@ -78,6 +82,7 @@ "@types/node": "^14.14.35", "@typescript-eslint/eslint-plugin": "4.19.0", "@typescript-eslint/parser": "4.19.0", + "ng-packagr": "^11.2.4", "eslint": "^7.22.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jsdoc": "32.3.0", diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/README.md b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/README.md new file mode 100644 index 0000000000..29e731a555 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/README.md @@ -0,0 +1,24 @@ +# ServoyPublic + +This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.7. + +## Code scaffolding + +Run `ng generate component component-name --project servoy-public` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project servoy-public`. +> Note: Don't forget to add `--project servoy-public` or else it will be added to the default project in your `angular.json` file. + +## Build + +Run `ng build servoy-public` to build the project. The build artifacts will be stored in the `dist/` directory. + +## Publishing + +After building your library with `ng build servoy-public`, go to the dist folder `cd dist/servoy-public` and run `npm publish`. + +## Running unit tests + +Run `ng test servoy-public` to execute the unit tests via [Karma](https://karma-runner.github.io). + +## Further help + +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page. diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/karma.conf.js b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/karma.conf.js new file mode 100644 index 0000000000..d0d088ca30 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/karma.conf.js @@ -0,0 +1,63 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('@chiragrupani/karma-chromium-edge-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage'), + require('karma-junit-reporter'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, '../../../target/coverage/servoy-public'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' } + ] + }, + reporters: ['progress', 'kjhtml','junit', 'coverage'], + junitReporter: { + outputFile: '../../../../target/LIB-browser-karma.xml' + }, + port: 9876, + colors: true, + logLevel: config.LOG_DEBUG, + autoWatch: true, + browsers: ['ChromeHeadless','Chrome', 'Edge'], + singleRun: false, + restartOnFileChange: true, + customLaunchers: { + headlessChrome: { + base: "ChromeHeadless", + flags: [ + "--no-sandbox", + "--js-flags=--max-old-space-size=8196", + "--disable-dev-shm-usage" + ], + }, + }, + captureTimeout: 180000, + browserDisconnectTolerance: 7, + browserDisconnectTimeout : 100000, + browserNoActivityTimeout : 100000 + }); +}; diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/ng-package.json b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/ng-package.json new file mode 100644 index 0000000000..190eb3777b --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/ng-package.json @@ -0,0 +1,7 @@ +{ + "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/servoy-public", + "lib": { + "entryFile": "src/public-api.ts" + } +} \ No newline at end of file diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/package.json b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/package.json new file mode 100644 index 0000000000..0ed44da6f4 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/package.json @@ -0,0 +1,11 @@ +{ + "name": "servoy-public", + "version": "2021.6.0", + "peerDependencies": { + "@angular/common": "^11.2.7", + "@angular/core": "^11.2.7" + }, + "dependencies": { + "tslib": "^2.0.0" + } +} \ No newline at end of file diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/basecomponent.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/basecomponent.ts similarity index 84% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/basecomponent.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/basecomponent.ts index ef646374fe..ccf29d6fd1 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/basecomponent.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/basecomponent.ts @@ -1,5 +1,4 @@ -import { OnInit, AfterViewInit, OnChanges, SimpleChanges, Input, Renderer2, ElementRef, ViewChild, Directive, ChangeDetectorRef, OnDestroy } from '@angular/core'; -import { ComponentContributor } from '../ngclient/component_contributor.service'; +import { OnInit, AfterViewInit, OnChanges, SimpleChanges, Input, Renderer2, ElementRef, ViewChild, Directive, ChangeDetectorRef, OnDestroy, Injectable } from '@angular/core'; import { ServoyApi } from './servoy_api'; @Directive() @@ -72,8 +71,7 @@ export class ServoyBaseComponent implements AfterViewInit } // our change event that is called when dom is ready - svyOnChanges(changes: SimpleChanges) { - + svyOnChanges(_changes: SimpleChanges) { } public detectChanges() { @@ -140,3 +138,22 @@ export class ServoyBaseComponent implements AfterViewInit export interface IViewStateListener { afterViewInit(): void; } + +@Injectable() +export class ComponentContributor { + private static listeners: Set = new Set(); + + public componentCreated(component: ServoyBaseComponent) { + ComponentContributor.listeners.forEach(listener => listener.componentCreated(component)); + } + + public addComponentListener(listener: IComponentContributorListener) { + ComponentContributor.listeners.add(listener); + } +} + +export interface IComponentContributorListener { + + componentCreated(component: ServoyBaseComponent): void; + +} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/component_contributor.service.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/component_contributor.service.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/component_contributor.service.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/component_contributor.service.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/deferred.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/deferred.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/sablo/util/deferred.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/deferred.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/autosave.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/autosave.directive.ts similarity index 57% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/autosave.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/autosave.directive.ts index 4b820b602c..0cb44d34ce 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/autosave.directive.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/autosave.directive.ts @@ -1,18 +1,18 @@ import { Directive , HostListener, ElementRef} from '@angular/core'; -import { SabloService } from '../../sablo/sablo.service'; +import { ServoyPublicService } from '../services/servoy_public.service'; @Directive({ selector: '[svyAutosave]' }) export class AutosaveDirective { - constructor(private sabloService: SabloService, private elementRef: ElementRef) { + constructor(private servoyService: ServoyPublicService, private elementRef: ElementRef) { } @HostListener('click', ['$event.target']) onClick(target): void { if (target == this.elementRef.nativeElement || target.parentNode == this.elementRef.nativeElement) { - this.sabloService.callService('applicationServerService', 'autosave', {}, true); + this.servoyService.callService('applicationServerService', 'autosave', {}, true); } } } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/decimalkeyconverter.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/decimalkeyconverter.directive.ts similarity index 82% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/decimalkeyconverter.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/decimalkeyconverter.directive.ts index 7a3140da7e..58737d65f4 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/decimalkeyconverter.directive.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/decimalkeyconverter.directive.ts @@ -1,6 +1,6 @@ import { Directive , Input , ElementRef, HostListener} from '@angular/core'; import { getLocaleNumberSymbol, NumberSymbol } from '@angular/common'; -import { LocaleService } from '../locale.service'; +import { ServoyPublicService } from '../services/servoy_public.service'; import { Format } from '../format/formatting.service'; @Directive({ @@ -11,7 +11,7 @@ export class DecimalkeyconverterDirective { @Input('svyDecimalKeyConverter') svyFormat: Format; private element: HTMLInputElement; - public constructor(private el: ElementRef, private localeService: LocaleService) { + public constructor(private el: ElementRef, private servoyService: ServoyPublicService) { this.element = el.nativeElement; } @@ -20,7 +20,7 @@ export class DecimalkeyconverterDirective { const caretPos = this.element.selectionStart; const startString = this.element.value.slice(0, caretPos); const endString = this.element.value.slice(this.element.selectionEnd, this.element.value.length); - this.element.value = (startString + getLocaleNumberSymbol(this.localeService.getLocale(), NumberSymbol.Decimal) + endString); + this.element.value = (startString + getLocaleNumberSymbol(this.servoyService.getLocale(), NumberSymbol.Decimal) + endString); this.element.focus(); this.element.setSelectionRange(caretPos + 1, caretPos + 1); if (e.preventDefault) e.preventDefault(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/imagemediaid.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/imagemediaid.directive.ts similarity index 99% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/imagemediaid.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/imagemediaid.directive.ts index f1194161b8..3d4d32983c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/imagemediaid.directive.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/imagemediaid.directive.ts @@ -1,5 +1,5 @@ import { Directive, Input, SimpleChanges, OnChanges, ElementRef, Renderer2, OnDestroy } from '@angular/core'; -import { ServoyBaseComponent } from '../servoy_public'; +import { ServoyBaseComponent } from '../basecomponent'; import { IViewStateListener } from '../basecomponent'; @Directive({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/sablotabseq.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/sablotabseq.directive.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/sablo/util/sablotabseq.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/sablotabseq.directive.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/startedit.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/startedit.directive.ts similarity index 81% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/startedit.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/startedit.directive.ts index 87906b1d30..2721e4765c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/startedit.directive.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/startedit.directive.ts @@ -1,6 +1,6 @@ -import { Directive , Input , HostListener, ViewContainerRef} from '@angular/core'; -import {LoggerService, LoggerFactory} from '../../sablo/logger.service'; -import { ServoyBaseComponent } from '../servoy_public'; +import { Directive , Input , HostListener} from '@angular/core'; +import {LoggerService, LoggerFactory} from '../logger.service'; +import { ServoyBaseComponent } from '../basecomponent'; @Directive({ selector: '[svyStartEdit]' diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/upload.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/upload.directive.ts new file mode 100644 index 0000000000..85927dc0d5 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/directives/upload.directive.ts @@ -0,0 +1,25 @@ +import { Directive , Input, OnInit, HostListener} from '@angular/core'; +import { ServoyPublicService } from '../services/servoy_public.service'; + +@Directive({ + selector: '[svyUpload]' +}) +export class UploadDirective implements OnInit { + @Input() formname: string; + @Input() componentName: string; + + private url: string; + private propertyName = 'dataProviderID'; + + constructor(private servoyService: ServoyPublicService) { + } + + @HostListener('click') click(e: Event) { + this.servoyService.showFileOpenDialog('Please select a file', false, null, this.url); + } + + ngOnInit(): void { + this.url = this.servoyService.generateUploadUrl(this.formname, this.componentName, this.propertyName); + } + +} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/emptyvalue.pipe.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/emptyvalue.pipe.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/emptyvalue.pipe.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/emptyvalue.pipe.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/format.pipe.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/format.pipe.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/format.pipe.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/format.pipe.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/formatcontrolvalueaccessor.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/formatcontrolvalueaccessor.directive.ts similarity index 96% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/formatcontrolvalueaccessor.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/formatcontrolvalueaccessor.directive.ts index 6fbde6d25c..c07739d4f2 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/formatcontrolvalueaccessor.directive.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/formatcontrolvalueaccessor.directive.ts @@ -4,7 +4,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { MaskFormat } from './maskformat'; import { Format, FormattingService } from './formatting.service'; import { DOCUMENT } from '@angular/common'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { LoggerFactory, LoggerService } from '../logger.service'; @Directive({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/formatting.service.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/formatting.service.ts similarity index 96% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/formatting.service.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/formatting.service.ts index cd0c48bbdc..990f89207c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/formatting.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/formatting.service.ts @@ -23,8 +23,10 @@ export class Format { @Injectable() export class FormattingService { - - constructor(@Inject(DOCUMENT) private doc: Document) {} + private doc: Document + constructor(@Inject(DOCUMENT) _doc: any) { + this.doc = _doc; + } // formatting stufff public format(data: any, format: Format, useEditFormat: boolean): string { const formatString = useEditFormat ? format.edit : format.display; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/maskformat.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/maskformat.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/format/maskformat.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/maskformat.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/pipes/pipes.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/pipes.ts similarity index 69% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/pipes/pipes.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/pipes.ts index e54c04e3ed..8d466e54cc 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/pipes/pipes.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/format/pipes.ts @@ -1,4 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; +import { DomSanitizer } from '@angular/platform-browser'; import {PropertyUtils} from '../utils/property_utils'; @Pipe( { name: 'mnemonicletterFilter' } ) @@ -25,3 +26,16 @@ export class HtmlFilterPipe implements PipeTransform { return input; } } + +@Pipe( { name: 'trustAsHtml' } ) +export class TrustAsHtmlPipe implements PipeTransform { + constructor( private domSanitizer: DomSanitizer ) { + } + + transform( input: string, trustAsHtml: boolean ): any { + if ( trustAsHtml ) { + return this.domSanitizer.bypassSecurityTrustHtml(input); + } + return input; + } +} diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/jsevent.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/jsevent.ts new file mode 100644 index 0000000000..651cfa38c3 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/jsevent.ts @@ -0,0 +1,18 @@ +export class JSEvent { + public formName?: string; + public elementName?: string; + public svyType: string; + public eventType: string; + public modifiers?: number; + public x?: number; + public y?: number; + public timestamp: number; +} + +export interface EventLike { + target: EventTarget; + altKey?: boolean; + shiftKey?: boolean; + ctrlKey?: boolean; + metaKey?: boolean; +} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/logger.service.ts similarity index 95% rename from com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/logger.service.ts index 7cf683de66..46bee5a557 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/logger.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { WindowRefService } from './util/windowref.service'; +import { WindowRefService } from './services/windowref.service'; // log levels for when debugEnabled(true) is called - if that is false, these levels are irrelevant // any custom debug levels can be used as well - these are just stored here so that custom code can test the level and see if it should log its message diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/services/servoy_public.service.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/services/servoy_public.service.ts new file mode 100644 index 0000000000..a717696c8c --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/services/servoy_public.service.ts @@ -0,0 +1,22 @@ +import { Injectable } from '@angular/core'; +import { EventLike, JSEvent } from '../jsevent'; + +@Injectable() +export abstract class ServoyPublicService { + public abstract showFileOpenDialog(title: string, multiselect: boolean, acceptFilter: string, url: string): void; + public abstract createJSEvent(event: EventLike, eventType: string, contextFilter?: string, contextFilterElement?: any): JSEvent; + public abstract getLocale(): string; + public abstract callService(serviceName: string, methodName: string, argsObject: any, async?: boolean): Promise; + public abstract getI18NMessages(...keys: string[]): Promise; + public abstract executeInlineScript(formname: string, script: string, params: any[]): Promise; + public abstract generateUploadUrl(formname: string, componentName: string, propertyName: string): string; + public abstract generateServiceUploadUrl(serviceName: string, apiFunctionName: string): string; +} + +export interface IFormCache { + getComponent(name: string): IComponentCache; +} + +export interface IComponentCache { + +} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/windowref.service.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/services/windowref.service.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/sablo/util/windowref.service.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/services/windowref.service.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_api.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_api.ts new file mode 100644 index 0000000000..b1dd256de3 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_api.ts @@ -0,0 +1,30 @@ +import { ServoyBaseComponent } from "./basecomponent"; + +export abstract class ServoyApi { + public abstract formWillShow(formname: string, relationname?: string, formIndex?: number): Promise; + public abstract hideForm(formname: string, relationname?: string, formIndex?: number, + formNameThatWillShow?: string, relationnameThatWillBeShown?: string, formIndexThatWillBeShown?: number): Promise; + + public abstract startEdit(propertyName: string); + + public abstract apply(propertyName: string, value: any); + + public abstract callServerSideApi(methodName: string, args: Array); + + public abstract getFormComponentElements(_propertyName: string, _formComponentValue: any); + + public abstract isInDesigner(): boolean; + + public abstract trustAsHtml(): boolean; + + public abstract isInAbsoluteLayout(): boolean; + public abstract getMarkupId(): string; + + public abstract getFormName(): string; + + public abstract registerComponent(component: ServoyBaseComponent); + + public abstract unRegisterComponent(component: ServoyBaseComponent); + + public abstract getClientProperty(key); +} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public.module.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_public.module.ts similarity index 57% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public.module.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_public.module.ts index 1d49eb5afc..9b01473a09 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/servoy_public.module.ts @@ -2,15 +2,19 @@ import { NgModule } from '@angular/core'; import { TooltipDirective } from './tooltip/tooltip.directive'; import { TooltipService } from './tooltip/tooltip.service'; -import { MnemonicletterFilterPipe, NotNullOrEmptyPipe, HtmlFilterPipe} from './pipes/pipes'; -import { DecimalkeyconverterDirective } from './utils/decimalkeyconverter.directive'; +import { DecimalkeyconverterDirective } from './directives/decimalkeyconverter.directive'; +import { MnemonicletterFilterPipe, NotNullOrEmptyPipe, HtmlFilterPipe, TrustAsHtmlPipe} from './format/pipes'; import { FormatFilterPipe } from './format/format.pipe'; import { EmptyValueFilterPipe } from './format/emptyvalue.pipe'; -import { StartEditDirective } from './utils/startedit.directive'; -import { ImageMediaIdDirective } from './utils/imagemediaid.directive'; -import { AutosaveDirective } from './utils/autosave.directive'; +import { StartEditDirective } from './directives/startedit.directive'; +import { ImageMediaIdDirective } from './directives/imagemediaid.directive'; +import {AutosaveDirective } from './directives/autosave.directive'; +import { UploadDirective } from './directives/upload.directive'; import { FormatDirective } from './format/formatcontrolvalueaccessor.directive'; import { FormattingService } from './format/formatting.service'; +import { ComponentContributor } from './basecomponent'; +import { SabloTabseq } from './directives/sablotabseq.directive'; +import { WindowRefService } from './services/windowref.service'; @NgModule({ declarations: [ TooltipDirective, @@ -23,7 +27,10 @@ import { FormattingService } from './format/formatting.service'; EmptyValueFilterPipe, StartEditDirective, ImageMediaIdDirective, - AutosaveDirective + AutosaveDirective, + UploadDirective, + SabloTabseq, + TrustAsHtmlPipe ], imports: [], exports: [TooltipDirective, @@ -36,9 +43,11 @@ import { FormattingService } from './format/formatting.service'; EmptyValueFilterPipe, StartEditDirective, ImageMediaIdDirective, - AutosaveDirective + AutosaveDirective, + UploadDirective, + SabloTabseq, + TrustAsHtmlPipe ], - providers: [ TooltipService, FormattingService ] - }) - + providers: [ TooltipService, FormattingService, ComponentContributor, WindowRefService ] +}) export class ServoyPublicModule { } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.directive.spec.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.directive.spec.ts similarity index 98% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.directive.spec.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.directive.spec.ts index 1c537f5dfa..77411f5fcb 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.directive.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.directive.spec.ts @@ -3,7 +3,7 @@ import {TooltipDirective} from './tooltip.directive'; import {TooltipService} from './tooltip.service'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from '../services/windowref.service'; const mouseEnter: Event = new Event('mouseenter'); @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.directive.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.directive.ts similarity index 95% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.directive.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.directive.ts index cd4162338b..31b09cf91b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.directive.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.directive.ts @@ -1,6 +1,5 @@ import {Directive, HostListener, Input, OnDestroy} from '@angular/core'; import {TooltipService} from './tooltip.service'; -import {ServoyService} from '../servoy.service'; @Directive({ selector: '[svyTooltip]' }) export class TooltipDirective implements OnDestroy { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.service.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.service.ts similarity index 85% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.service.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.service.ts index 2e7551ff48..dd6b8825a5 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/tooltip/tooltip.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/tooltip/tooltip.service.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Inject, Injectable } from '@angular/core'; import { Subject } from 'rxjs'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from '../services/windowref.service'; @Injectable() export class TooltipService { @@ -11,24 +11,25 @@ export class TooltipService { private tooltipDiv: HTMLDivElement; private tipmousemouveEventX: any; private tipmousemouveEventY: any; - private tipmousemouveEventIsPage: boolean; - constructor(@Inject(DOCUMENT) private doc: Document, private windowRefService: WindowRefService) { - this.isTooltipActive = new Subject(); + private tipmousemouveEventIsPage: boolean; + private doc: Document; + constructor(@Inject(DOCUMENT) _doc: any, private windowRefService: WindowRefService) { + this.isTooltipActive = new Subject(); + this.doc = _doc; } - public showTooltip(event, message, initialDelay, dismissDelay) { + public showTooltip(event: MouseEvent, message: string, initialDelay: number, dismissDelay: number) { let e = event; - if (!e) e = this.windowRefService.nativeWindow.event; + if (!e) e = this.windowRefService.nativeWindow.event as MouseEvent; let targ; if (e.target) targ = e.target; else if (e.srcElement) targ = e.srcElement; - if (targ.nodeType == 3) // defeat Safari bug + if (targ.nodeType === 3) // defeat Safari bug targ = targ.parentNode; - if (targ.tagName && targ.tagName.toLowerCase() == 'option') // stop tooltip if over option element - { + if (targ.tagName && targ.tagName.toLowerCase() === 'option') { // stop tooltip if over option element this.hideTooltip(); return; } @@ -60,7 +61,7 @@ export class TooltipService { return this.tooltipDiv; } - private tipmousemove = (e) => { + private tipmousemove = (e: MouseEvent) => { if (e.pageX || e.pageY) { this.tipmousemouveEventIsPage = true; this.tipmousemouveEventX = e.pageX; @@ -70,9 +71,9 @@ export class TooltipService { this.tipmousemouveEventX = e.clientX; this.tipmousemouveEventY = e.clientY; } - } + }; - private adjustAndShowTooltip(dismissDelay) { + private adjustAndShowTooltip(dismissDelay: number) { let x = 0; let y = 0; @@ -110,7 +111,7 @@ export class TooltipService { newLeft = 0; tDiv.style.width = x - 10 + 'px'; } - if (newLeft == 0) + if (newLeft === 0) newLeft = tDiv.offsetWidth; tDiv.style.left = newLeft + 'px'; } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/property_utils.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/utils/property_utils.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/property_utils.ts rename to com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/lib/utils/property_utils.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/public-api.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/public-api.ts new file mode 100644 index 0000000000..0bc1c04b2b --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/public-api.ts @@ -0,0 +1,23 @@ +export * from './lib/basecomponent'; +export * from './lib/deferred'; +export * from './lib/jsevent'; +export * from './lib/logger.service'; +export * from './lib/servoy_api'; +export * from './lib/servoy_public.module'; +export * from './lib/format/emptyvalue.pipe'; +export * from './lib/format/format.pipe'; +export * from './lib/format/formatcontrolvalueaccessor.directive'; +export * from './lib/format/formatting.service'; +export * from './lib/format/maskformat'; +export * from './lib/format/pipes'; +export * from './lib/tooltip/tooltip.directive'; +export * from './lib/tooltip/tooltip.service'; +export * from './lib/services/servoy_public.service'; +export * from './lib/services/windowref.service'; +export * from './lib/directives/autosave.directive'; +export * from './lib/directives/decimalkeyconverter.directive'; +export * from './lib/directives/imagemediaid.directive'; +export * from './lib/directives/sablotabseq.directive'; +export * from './lib/directives/startedit.directive'; +export * from './lib/directives/upload.directive'; +export * from './lib/utils/property_utils'; diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/test.ts b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/test.ts new file mode 100644 index 0000000000..303b32a220 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/src/test.ts @@ -0,0 +1,26 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js/dist/zone'; +import 'zone.js/dist/zone-testing'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +declare const require: { + context(path: string, deep?: boolean, filter?: RegExp): { + keys(): string[]; + (id: string): T; + }; +}; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.json b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.json new file mode 100644 index 0000000000..c55a5fcdc8 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.json @@ -0,0 +1,24 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/lib", + "target": "es2015", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [], + "lib": [ + "dom", + "es2018" + ] + }, + "angularCompilerOptions": { + "skipTemplateCodegen": true, + "strictMetadataEmit": true, + "enableResourceInlining": true + }, + "exclude": [ + "src/test.ts", + "**/*.spec.ts" + ] +} diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.prod.json b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.prod.json new file mode 100644 index 0000000000..a05c793059 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.lib.prod.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.lib.json", + "compilerOptions": { + "declarationMap": false + }, + "angularCompilerOptions": { + "enableIvy": true + } +} diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.spec.json b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.spec.json new file mode 100644 index 0000000000..715dd0a5d2 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tsconfig.spec.json @@ -0,0 +1,17 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/spec", + "types": [ + "jasmine" + ] + }, + "files": [ + "src/test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tslint.json b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tslint.json new file mode 100644 index 0000000000..124133f849 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/projects/servoy-public/tslint.json @@ -0,0 +1,17 @@ +{ + "extends": "../../tslint.json", + "rules": { + "directive-selector": [ + true, + "attribute", + "lib", + "camelCase" + ], + "component-selector": [ + true, + "element", + "lib", + "kebab-case" + ] + } +} diff --git a/com.servoy.eclipse.ngclient.ui/node/scripts/fixPrepublish.js b/com.servoy.eclipse.ngclient.ui/node/scripts/fixPrepublish.js new file mode 100644 index 0000000000..dcd2376dc4 --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/scripts/fixPrepublish.js @@ -0,0 +1,10 @@ +// or using a script like: +try { + const pkg = require('../dist/servoy-public/package.json'); + delete pkg.scripts; + require('fs').writeFileSync('./dist/servoy-public/package.json', JSON.stringify(pkg, null, 2)); +} +catch (err) { + console.log(`Ivy package fix failed: ${err}`); + process.exit(); +} \ No newline at end of file diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.spec.ts index 810b13ff47..0f3b2639e7 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.spec.ts @@ -1,11 +1,10 @@ -import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { Tab } from '../bts_basetabpanel'; import { ServoyBootstrapAccordion } from './accordion'; -import { WindowRefService } from '../../sablo/util/windowref.service' +import { WindowRefService } from 'servoy-public' import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyApi } from '../../ngclient/servoy_public' +import { ServoyApi } from 'servoy-public' +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe('AccordionComponent', () => { let component: ServoyBootstrapAccordion; @@ -15,7 +14,7 @@ describe('AccordionComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapAccordion ], - imports: [NgbModule, SabloModule], + imports: [NgbModule, ServoyTestingModule], providers: [WindowRefService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.ts index d508bf283b..354d1240d7 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/accordion/accordion.ts @@ -1,5 +1,5 @@ import { Component, Renderer2, Input, Output, EventEmitter, ViewChild, SimpleChanges, ElementRef,ContentChild, TemplateRef, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { ServoyBootstrapBaseTabPanel,Tab } from '../bts_basetabpanel'; import { NgbPanelChangeEvent } from '@ng-bootstrap/ng-bootstrap'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basecomp.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basecomp.ts index f9f646ca66..585cf4629d 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basecomp.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basecomp.ts @@ -1,4 +1,4 @@ -import { ServoyBaseComponent } from '../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { Directive, Input, Renderer2, SimpleChanges, ChangeDetectorRef } from '@angular/core'; @Directive() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basefield.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basefield.ts index 328e7c9c6c..b30fbbd009 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basefield.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basefield.ts @@ -1,6 +1,6 @@ import { ServoyBootstrapBaseComponent } from './bts_basecomp'; import { Directive, Input, Output, EventEmitter, SimpleChanges, Renderer2, ChangeDetectorRef, Inject } from '@angular/core'; -import { PropertyUtils } from '../ngclient/servoy_public'; +import { PropertyUtils } from 'servoy-public'; import { DOCUMENT } from '@angular/common'; @Directive() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basetabpanel.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basetabpanel.ts index d24bba5cfa..e8bc65e0ce 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basetabpanel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/bts_basetabpanel.ts @@ -1,5 +1,5 @@ import { Renderer2, Input, Output, EventEmitter, SimpleChanges, ContentChild, TemplateRef, Directive, ChangeDetectorRef } from '@angular/core'; -import { WindowRefService } from '../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { ServoyBootstrapBaseComponent } from './bts_basecomp'; import { BaseCustomObject } from '../sablo/spectypes.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/button/button.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/button/button.spec.ts index 946e230813..2b8180db19 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/button/button.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/button/button.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed, waitForAsync, tick, fakeAsync } from '@angular/core/testing'; -import { ServoyApi } from '../../ngclient/servoy_public'; +import { ServoyApi } from 'servoy-public'; import { ServoyBootstrapButton } from './button'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { runOnPushChangeDetection } from '../../testing'; import { By } from '@angular/platform-browser'; @@ -19,7 +19,7 @@ describe('ServoyBootstrapButton', () => { declarations: [ServoyBootstrapButton], providers: [], imports: [ - SabloModule, ServoyPublicModule] + ServoyTestingModule, ServoyPublicModule] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/basecalendar.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/basecalendar.ts index 1e80221a3f..25b0992839 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/basecalendar.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/basecalendar.ts @@ -2,9 +2,9 @@ import { Renderer2, ChangeDetectorRef, Inject } from '@angular/core'; import { Moment } from 'moment'; import { ServoyBootstrapBasefield } from '../bts_basefield'; import * as moment from 'moment'; -import { LocaleService } from '../../ngclient/servoy_public'; import { DateTimeAdapter } from '@danielmoncada/angular-datetime-picker'; import { DOCUMENT } from '@angular/common'; +import { ServoyPublicService } from 'servoy-public'; export class ServoyBootstrapBaseCalendar extends ServoyBootstrapBasefield { @@ -19,10 +19,10 @@ export class ServoyBootstrapBaseCalendar extends ServoyBootstrapBasefield, @Inject(DOCUMENT) doc: Document) { super(renderer, cdRef, doc); - dateTimeAdapter.setLocale(localeService.getLocale()); + dateTimeAdapter.setLocale(servoyService.getLocale()); const ld = moment.localeData(); this.firstDayOfWeek = ld.firstDayOfWeek(); const lts = ld.longDateFormat('LTS'); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.spec.ts index 2091297b4c..3fdab2e982 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.spec.ts @@ -2,14 +2,14 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyBootstrapCalendar } from './calendar'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; import { OwlDateTimeIntl, OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { Renderer2 } from '@angular/core'; -import { LocaleService, I18NProvider } from '../../ngclient/servoy_public'; -import { SabloService } from '../../sablo/sablo.service'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; describe('CalendarComponent', () => { let component: ServoyBootstrapCalendar; @@ -21,9 +21,9 @@ describe('CalendarComponent', () => { const promise = Promise.resolve({}); i18nProvider.getI18NMessages.and.returnValue(promise); TestBed.configureTestingModule({ declarations: [ ServoyBootstrapCalendar ], - imports: [BrowserModule, SabloModule, ServoyPublicModule, OwlDateTimeModule, FormsModule, OwlNativeDateTimeModule], + imports: [ServoyTestingModule,BrowserModule, ServoyPublicModule, OwlDateTimeModule, FormsModule, OwlNativeDateTimeModule], providers: [Renderer2, FormsModule, { provide: LocaleService, useValue: {getLocale: () => 'en' } }, { provide: I18NProvider, useValue: i18nProvider }, - OwlDateTimeIntl, SabloService] + OwlDateTimeIntl] }) .compileComponents(); }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.ts index f892264de8..3c1c800e82 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendar/calendar.ts @@ -2,8 +2,8 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, ElementRef, ViewChild, Input, ChangeDetectorRef, SimpleChanges, ChangeDetectionStrategy, Inject } from '@angular/core'; import { DateTimeAdapter, OwlDateTimeComponent, OwlDateTimeIntl } from '@danielmoncada/angular-datetime-picker'; import { PickerType } from '@danielmoncada/angular-datetime-picker/lib/date-time/date-time.class'; -import { Format, I18NProvider, LocaleService } from '../../ngclient/servoy_public'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { Format } from 'servoy-public'; +import { LoggerFactory, LoggerService, ServoyPublicService } from 'servoy-public'; import { ServoyBootstrapBaseCalendar } from './basecalendar'; @Component({ @@ -27,14 +27,13 @@ export class ServoyBootstrapCalendar extends ServoyBootstrapBaseCalendar { constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, - i18nProvider: I18NProvider, - localeService: LocaleService, dateTimeAdapter: DateTimeAdapter, owlDateTimeIntl: OwlDateTimeIntl, logFactory: LoggerFactory, + servoyService: ServoyPublicService, @Inject(DOCUMENT) doc: Document) { - super(renderer, cdRef, localeService, dateTimeAdapter, doc); - i18nProvider.getI18NMessages('servoy.button.ok', 'servoy.button.cancel').then((val) => { + super(renderer, cdRef, servoyService, dateTimeAdapter, doc); + servoyService.getI18NMessages('servoy.button.ok', 'servoy.button.cancel').then((val) => { if (val['servoy.button.ok']) owlDateTimeIntl.setBtnLabel = val['servoy.button.ok']; if (val['servoy.button.cancel']) owlDateTimeIntl.cancelBtnLabel = val['servoy.button.cancel']; }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendarinline/calendarinline.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendarinline/calendarinline.ts index 2bc540859a..e3a43f001e 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendarinline/calendarinline.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/calendarinline/calendarinline.ts @@ -2,7 +2,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; import { DateTimeAdapter } from '@danielmoncada/angular-datetime-picker'; import { Moment } from 'moment'; -import { LocaleService } from '../../ngclient/servoy_public'; +import { ServoyPublicService } from 'servoy-public'; import { ServoyBootstrapBaseCalendar } from '../calendar/basecalendar'; @Component({ @@ -14,8 +14,8 @@ import { ServoyBootstrapBaseCalendar } from '../calendar/basecalendar'; export class ServoyBootstrapCalendarinline extends ServoyBootstrapBaseCalendar { constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, - localeService: LocaleService, dateTimeAdapter: DateTimeAdapter, @Inject(DOCUMENT) doc: Document) { - super(renderer, cdRef, localeService, dateTimeAdapter, doc); + servoyService: ServoyPublicService, dateTimeAdapter: DateTimeAdapter, @Inject(DOCUMENT) doc: Document) { + super(renderer, cdRef, servoyService, dateTimeAdapter, doc); } public dateChanged(event: Moment) { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.spec.ts index 45b7ceeb34..b068705b2c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ServoyBootstrapCombobox } from './combobox'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; -import { FormattingService, TooltipService } from '../../ngclient/servoy_public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { FormattingService, TooltipService } from 'servoy-public'; import { FormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -15,7 +15,7 @@ describe('ComboboxComponent', () => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapCombobox ], providers: [ FormattingService, TooltipService], - imports: [ServoyPublicModule, SabloModule, NgbModule, FormsModule] + imports: [ServoyPublicModule, ServoyTestingModule, NgbModule, FormsModule] }) .compileComponents(); }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.ts index d9072ce245..c2f4ff3546 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/combobox/combobox.ts @@ -1,7 +1,7 @@ import { Component, Renderer2, Input, SimpleChanges, ChangeDetectorRef, ViewChild, ViewChildren, QueryList, ElementRef, HostListener, ChangeDetectionStrategy, Inject } from '@angular/core'; import { ServoyBootstrapBasefield } from '../bts_basefield'; import { IValuelist } from '../../sablo/spectypes.service'; -import { Format, FormattingService } from '../../ngclient/servoy_public'; +import { Format, FormattingService } from 'servoy-public'; import { NgbDropdownItem, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { DOCUMENT } from '@angular/common'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/datalabel/datalabel.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/datalabel/datalabel.spec.ts index 39b77f18b8..d185314014 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/datalabel/datalabel.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/datalabel/datalabel.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed, waitForAsync, tick, fakeAsync } from '@angular/core/testing'; -import { ServoyApi } from '../../ngclient/servoy_public'; +import { ServoyApi } from 'servoy-public'; import { ServoyBootstrapDatalabel } from './datalabel'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { runOnPushChangeDetection } from '../../testing'; import { By } from '@angular/platform-browser'; @@ -19,7 +19,7 @@ describe('ServoyBootstrapDatalabel', () => { declarations: [ServoyBootstrapDatalabel], providers: [], imports: [ - SabloModule, ServoyPublicModule] + ServoyTestingModule, ServoyPublicModule] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/imagemedia/imagemedia.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/imagemedia/imagemedia.spec.ts index 3124c7d705..4430289974 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/imagemedia/imagemedia.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/imagemedia/imagemedia.spec.ts @@ -3,6 +3,8 @@ import { runOnPushChangeDetection } from '../../testing'; import { ServoyBootstrapImageMedia } from './imagemedia'; import { By } from '@angular/platform-browser'; import { SimpleChange } from '@angular/core'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; describe('ImagemediaComponent', () => { let component: ServoyBootstrapImageMedia; @@ -11,7 +13,8 @@ describe('ImagemediaComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ServoyBootstrapImageMedia] + declarations: [ServoyBootstrapImageMedia], + imports: [ServoyTestingModule, ServoyPublicModule], }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/label/label.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/label/label.spec.ts index 9c06685578..3095ec9925 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/label/label.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/label/label.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed, waitForAsync, tick, fakeAsync } from '@angular/core/testing'; -import { ServoyApi } from '../../ngclient/servoy_public'; +import { ServoyApi } from 'servoy-public'; import { ServoyBootstrapLabel } from './label'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { runOnPushChangeDetection } from '../../testing'; import { By } from '@angular/platform-browser'; @@ -19,7 +19,7 @@ describe('ServoyBootstrapLabel', () => { declarations: [ServoyBootstrapLabel], providers: [], imports: [ - SabloModule, ServoyPublicModule] + ServoyTestingModule, ServoyPublicModule] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/servoybootstrap.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/servoybootstrap.module.ts index 117f35ec48..37b6b047bd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/servoybootstrap.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/servoybootstrap.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; -import { ServoyPublicModule } from '../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { SabloModule } from '../sablo/sablo.module'; import { ServoyBootstrapButton } from './button/button'; import { ServoyBootstrapLabel } from './label/label'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tablesspanel/tablesspanel.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tablesspanel/tablesspanel.spec.ts index 2e4d9b7c28..09d1012221 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tablesspanel/tablesspanel.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tablesspanel/tablesspanel.spec.ts @@ -1,8 +1,8 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormService } from '../../ngclient/form.service'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { ServoyBootstrapTablesspanel } from './tablesspanel'; @@ -13,7 +13,7 @@ describe('TablesspanelComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapTablesspanel ], - imports: [NgbModule, SabloModule, ServoyPublicModule, SabloModule], + imports: [NgbModule, ServoyTestingModule, ServoyPublicModule], providers: [ { provide: FormService, useValue: {getFormCacheByName: () => {} }} ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.spec.ts index a96787e5d5..4dc69d77ca 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyBootstrapTabpanel } from './tabpanel'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { ServoyPublicModule, WindowRefService } from 'servoy-public'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyApi } from '../../ngclient/servoy_public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyApi } from 'servoy-public'; describe('TabpanelComponent', () => { let component: ServoyBootstrapTabpanel; @@ -14,7 +14,7 @@ describe('TabpanelComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapTabpanel ], - imports: [NgbModule, SabloModule], + imports: [NgbModule, ServoyTestingModule, ServoyPublicModule], providers: [WindowRefService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.ts index 0a486b72b9..ad4d8ad732 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/tabpanel/tabpanel.ts @@ -1,5 +1,5 @@ import { Component, Renderer2, Input, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { ServoyBootstrapBaseTabPanel, Tab } from '../bts_basetabpanel'; import { NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textarea/textarea.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textarea/textarea.spec.ts index 57e695aaab..1d12ddc5cd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textarea/textarea.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textarea/textarea.spec.ts @@ -1,8 +1,10 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { FormattingService, I18NProvider, LocaleService, TooltipService } from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, TooltipService } from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { ServoyBootstrapTextarea } from './textarea'; import { By } from '@angular/platform-browser'; @@ -16,7 +18,7 @@ describe('TextareaComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapTextarea ], - imports: [SabloModule, ServoyPublicModule, FormsModule], + imports: [ServoyTestingModule, ServoyPublicModule, FormsModule], providers: [I18NProvider, FormattingService, TooltipService, LocaleService ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.spec.ts index 8f771f8f9a..d4030f54f2 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.spec.ts @@ -1,26 +1,28 @@ import { ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import { ServoyBootstrapTextbox } from './textbox'; -import { FormattingService, I18NProvider, LocaleService, TooltipService } from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { Format, FormattingService, TooltipService } from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { runOnPushChangeDetection } from '../../testing'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe('TextboxComponent', () => { let component: ServoyBootstrapTextbox; let fixture: ComponentFixture; let textField; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ServoyBootstrapTextbox], - imports: [SabloModule, ServoyPublicModule, FormsModule], - providers: [I18NProvider, FormattingService, TooltipService, LocaleService] - }) - .compileComponents(); - })); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ServoyBootstrapTextbox ], + imports: [ServoyTestingModule, ServoyPublicModule, FormsModule], + providers: [I18NProvider, FormattingService, TooltipService, LocaleService ] + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ServoyBootstrapTextbox); @@ -28,6 +30,8 @@ describe('TextboxComponent', () => { component = fixture.componentInstance; component.servoyApi = jasmine.createSpyObj('ServoyApi', ['getMarkupId', 'trustAsHtml', 'startEdit', 'registerComponent', 'unRegisterComponent']); component.inputType = 'text'; + component.format = new Format(); + component.format.type = 'TEXT'; fixture.detectChanges(); }); @@ -86,12 +90,11 @@ describe('TextboxComponent', () => { await runOnPushChangeDetection(fixture); expect(component.getNativeElement().value).toBe('mytest2'); }); - + it('should apply dataprovider from UI', async () => { component.getNativeElement().value = 'uitest'; textField.nativeElement.dispatchEvent(new Event('change')); await runOnPushChangeDetection(fixture); expect(component.dataProviderID).toBe('uitest'); }); - }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.ts index 23582b0d54..a42f65c696 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/textbox/textbox.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import { Component, ChangeDetectorRef, Renderer2, Input, ChangeDetectionStrategy, Inject, Output, EventEmitter } from '@angular/core'; -import { Format } from '../../ngclient/servoy_public'; +import { Format } from 'servoy-public'; import { ServoyBootstrapBasefield } from '../bts_basefield'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.spec.ts index 65cbfe5968..c1fe1824c2 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyBootstrapTypeahead } from './typeahead'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { FormattingService, TooltipService } from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, TooltipService } from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { FormsModule } from '@angular/forms'; describe('TypeaheadComponent', () => { @@ -16,7 +16,7 @@ describe('TypeaheadComponent', () => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapTypeahead ], providers: [ FormattingService, TooltipService], - imports: [ServoyPublicModule, SabloModule, NgbModule, FormsModule] + imports: [ServoyPublicModule, ServoyTestingModule, NgbModule, FormsModule] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.ts index 60b655324d..c430aaf308 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapcomponents/typeahead/typeahead.ts @@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, In import { NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; import { merge, Observable, of, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, switchMap } from 'rxjs/operators'; -import { Format, FormattingService } from '../../ngclient/servoy_public'; +import { Format, FormattingService } from 'servoy-public'; import { IValuelist } from '../../sablo/spectypes.service'; import { ServoyBootstrapBasefield } from '../bts_basefield'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/badge/badge.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/badge/badge.ts index 3cf60314b7..c225da1154 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/badge/badge.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/badge/badge.ts @@ -1,5 +1,5 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; @Component({ selector: 'bootstrapextracomponents-badge', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.spec.ts index 1e51b01b89..eaac76ab2d 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.spec.ts @@ -1,8 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { FormattingService, I18NProvider, LocaleService, TooltipService } from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, TooltipService } from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { ServoyBootstrapExtraBreadcrumbs } from './breadcrumbs'; @@ -13,7 +15,7 @@ describe('BreadcrumbsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapExtraBreadcrumbs ], - imports: [SabloModule, ServoyPublicModule, FormsModule], + imports: [ServoyTestingModule, ServoyPublicModule, FormsModule], providers: [I18NProvider, FormattingService, TooltipService, LocaleService ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.ts index 926810e3f6..77a44da230 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/breadcrumbs/breadcrumbs.ts @@ -1,5 +1,5 @@ import { Component, Input, ChangeDetectorRef, Renderer2, Output, EventEmitter } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; @Component({ selector: 'bootstrapextracomponents-breadcrumbs', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.spec.ts index c98e16af98..e5359cde23 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.spec.ts @@ -1,8 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { FormattingService, I18NProvider, LocaleService, TooltipService } from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, TooltipService } from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { ServoyBootstrapExtraButtonsGroup } from './buttonsgroup'; @@ -13,7 +15,7 @@ describe('ServoyBootstrapExtraButtonsGroup', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapExtraButtonsGroup ], - imports: [SabloModule, ServoyPublicModule, FormsModule], + imports: [ServoyTestingModule, ServoyPublicModule, FormsModule], providers: [I18NProvider, FormattingService, TooltipService, LocaleService ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.ts index a945efc40d..f48ac0c478 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/buttonsgroup/buttonsgroup.ts @@ -1,7 +1,7 @@ import { Component, Input, ChangeDetectorRef, Renderer2, Output, EventEmitter, SimpleChanges } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { IValuelist } from '../../sablo/spectypes.service'; -import { Format } from '../../ngclient/servoy_public'; +import { Format } from 'servoy-public'; @Component({ selector: 'bootstrapextracomponents-buttons-group', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/carousel/carousel.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/carousel/carousel.ts index 25ba7fa02c..b5a72b0077 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/carousel/carousel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/carousel/carousel.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectorRef, ViewChild, SimpleChanges, Renderer2, Input, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { IFoundset } from '../../sablo/spectypes.service'; import { NgbCarouselConfig, NgbCarousel } from '@ng-bootstrap/ng-bootstrap'; import { BaseCustomObject } from '../../sablo/spectypes.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.spec.ts index c6982b64cc..9d018f8517 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.spec.ts @@ -1,12 +1,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { ServoyService } from '../../ngclient/servoy.service'; import { ServoyBootstrapExtraDropdown } from './dropdown'; -import { SvyUtilsService, LocaleService} from '../../ngclient/servoy_public'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ClientFunctionService } from '../../ngclient/services/clientfunction.service'; import { ViewportService } from '../../ngclient/services/viewport.service'; -import { FormService } from '../../ngclient/form.service'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe('ServoyBootstrapExtraDropdown', () => { let component: ServoyBootstrapExtraDropdown; @@ -15,8 +12,8 @@ describe('ServoyBootstrapExtraDropdown', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapExtraDropdown ], - imports: [SabloModule, ServoyPublicModule], - providers: [SvyUtilsService, ServoyService, FormService, ClientFunctionService, ViewportService, { provide: LocaleService, useValue: {getLocale: () => 'en' }}] + imports: [ServoyTestingModule, ServoyPublicModule], + providers: [ClientFunctionService, ViewportService ] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.ts index c0f48984d4..29a727229b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/dropdown/dropdown.ts @@ -1,8 +1,6 @@ import { Component, SimpleChanges, Input, Renderer2, ChangeDetectorRef } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent, ServoyPublicService } from 'servoy-public'; import { BaseCustomObject } from '../../sablo/spectypes.service'; -import { ServoyService } from '../../ngclient/servoy.service'; -import { SvyUtilsService } from '../../ngclient/servoy_public'; @Component({ selector: 'bootstrapextracomponents-dropdown', @@ -26,7 +24,7 @@ export class ServoyBootstrapExtraDropdown extends ServoyBaseComponent void; - constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, private servoyService: ServoyService, private utils: SvyUtilsService) { + constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, private servoyService: ServoyPublicService) { super(renderer, cdRef); } @@ -40,21 +38,20 @@ export class ServoyBootstrapExtraDropdown extends ServoyBaseComponent addOnBtn.position === position ); } - preventSimpleClick: Boolean = false; - timer: any; buttonClicked( event: any, btnText: string, btnIndex: number ) { const addOnButton = this.addOnButtons[btnIndex]; this.timer = 0; this.preventSimpleClick = false; - if ( addOnButton && addOnButton.onAction && event.type == 'click' ) { + if ( addOnButton && addOnButton.onAction && event.type === 'click' ) { if ( addOnButton.onDoubleClick ) { this.timer = setTimeout(() => { if ( !this.preventSimpleClick ) { - const jsEvent = this.utils.createJSEvent( event, 'action' ); + const jsEvent = this.servoyService.createJSEvent( event, 'action' ); this.servoyService.executeInlineScript( addOnButton.onAction.formname, addOnButton.onAction.script, [jsEvent, addOnButton.name, btnText, btnIndex] ); } }, 250 ); } else { - const jsEvent = this.utils.createJSEvent( event, 'action' ); + const jsEvent = this.servoyService.createJSEvent( event, 'action' ); this.servoyService.executeInlineScript( addOnButton.onAction.formname, addOnButton.onAction.script, [jsEvent, addOnButton.name, btnText, btnIndex] ); } } @@ -129,10 +125,10 @@ export class ServoyBootstrapExtraInputGroup extends ServoyBaseComponent this.renderer.setAttribute( nativeElem, attribute.key, attribute.value ) ); } } -} \ No newline at end of file +} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/navbar/navbar.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/navbar/navbar.ts index 351e89e618..715b7091e1 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/navbar/navbar.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/navbar/navbar.ts @@ -2,11 +2,8 @@ import { Component, SimpleChanges, Input, Renderer2, ChangeDetectorRef, Directiv import { DOCUMENT } from '@angular/common'; import { merge, Observable, of, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent, FormattingService, ServoyPublicService } from 'servoy-public'; import { IValuelist } from '../../sablo/spectypes.service'; -import { FormattingService } from '../../ngclient/servoy_public'; -import { ServoyService } from '../../ngclient/servoy.service'; -import { SvyUtilsService } from '../../ngclient/servoy_public'; import { BaseCustomObject } from '../../sablo/spectypes.service'; @Component({ @@ -39,7 +36,7 @@ export class ServoyBootstrapExtraNavbar extends ServoyBaseComponent { let component: ServoyBootstrapExtraProgressBar; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ ServoyBootstrapExtraProgressBar ] + declarations: [ ServoyBootstrapExtraProgressBar ], + imports: [ NgbModule, ServoyPublicModule ] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/progressbar/progressbar.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/progressbar/progressbar.ts index 4447c3093c..922a1ade46 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/progressbar/progressbar.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/progressbar/progressbar.ts @@ -1,5 +1,5 @@ import { Component, Output, EventEmitter, Input, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; @Component({ selector: 'bootstrapextracomponents-progressbar', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/rating/rating.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/rating/rating.ts index 7405eac099..f2c0acde77 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/rating/rating.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/rating/rating.ts @@ -1,5 +1,5 @@ import { Component, Output, EventEmitter, Input, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; @Component({ selector: 'bootstrapextracomponents-rating', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/servoybootstrapextra.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/servoybootstrapextra.module.ts index c3b992e931..0f0c9f1252 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/servoybootstrapextra.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/servoybootstrapextra.module.ts @@ -10,7 +10,7 @@ import {ServoyBootstrapExtraDropdown} from './dropdown/dropdown'; import { ServoyBootstrapExtraCarousel, Slide } from './carousel/carousel'; import { MenuItem, ServoyBootstrapExtraNavbar, SvyAttributes } from './navbar/navbar'; import { CommonModule } from '@angular/common'; -import { ServoyPublicModule } from '../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { SabloModule } from '../sablo/sablo.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormsModule } from '@angular/forms'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.spec.ts index fab5523eea..25a151551c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.spec.ts @@ -1,5 +1,8 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule } from '@angular/forms'; import { JwBootstrapSwitchNg2Module } from 'jw-bootstrap-switch-ng2'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { ServoyBootstrapExtraSwitch } from './switch'; @@ -7,10 +10,10 @@ describe('BootstrapExtraSwitch', () => { let component: ServoyBootstrapExtraSwitch; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyBootstrapExtraSwitch ], - imports: [ JwBootstrapSwitchNg2Module ] + imports: [ JwBootstrapSwitchNg2Module, FormsModule, ServoyPublicModule, ServoyTestingModule ] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.ts b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.ts index 6e1826234c..f30e982ad0 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/bootstrapextracomponents/switch/switch.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import { ChangeDetectorRef, Component, EventEmitter, Inject, Input, Output, Renderer2, SimpleChanges } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; @Component({ selector: 'bootstrapextracomponents-switch', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/keylistener/keylistener.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/keylistener/keylistener.service.ts index 3596fceaab..ca148d2291 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/keylistener/keylistener.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/keylistener/keylistener.service.ts @@ -1,14 +1,13 @@ -import { Injectable, Renderer2 } from '@angular/core'; +import { Injectable } from '@angular/core'; -import { SvyUtilsService, ComponentContributor, IComponentContributorListener, ServoyBaseComponent } from '../ngclient/servoy_public'; +import { ComponentContributor, IComponentContributorListener, ServoyBaseComponent, ServoyPublicService } from 'servoy-public'; import { ServiceChangeHandler } from '../sablo/util/servicechangehandler'; -import { ServoyService } from '../ngclient/servoy.service'; @Injectable() export class KeyListener implements IComponentContributorListener { private _callbacks: Callback[] = []; - constructor(private componentContributor: ComponentContributor, private servoyService: ServoyService, private utils: SvyUtilsService, private changeHandler: ServiceChangeHandler) { + constructor(private componentContributor: ComponentContributor, private servoyService: ServoyPublicService, private changeHandler: ServiceChangeHandler) { componentContributor.addComponentListener(this); } @@ -29,7 +28,7 @@ export class KeyListener implements IComponentContributorListener { renderer.listen(element, 'keyup', (event) => { const callback = this.getCallback(attribute); if (callback) { - const ev = this.utils.createJSEvent(event, 'keyup'); + const ev = this.servoyService.createJSEvent(event, 'keyup'); let capsLockEnabled = false; if (event instanceof KeyboardEvent) { capsLockEnabled = event.getModifierState('CapsLock'); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/clientfunction_converter.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/clientfunction_converter.ts index e933e8cce4..2ffa9371ed 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/clientfunction_converter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/clientfunction_converter.ts @@ -1,5 +1,5 @@ import { IConverter, PropertyContext } from '../../sablo/converter.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; export class ClientFunctionConverter implements IConverter { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/component_converter.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/component_converter.ts index b346e6422c..40eb48fc6e 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/component_converter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/component_converter.ts @@ -1,10 +1,9 @@ import { IConverter, PropertyContext, ConverterService } from '../../sablo/converter.service'; -import { LoggerService, LoggerFactory } from '../../sablo/logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { FoundsetViewportState, ViewportService } from '../services/viewport.service'; import { FoundsetChangeEvent, FoundsetConverter } from './foundset_converter'; -import { ViewportRowUpdates, IChangeAwareValue, instanceOfChangeAwareValue, isChanged, ChangeAwareState } from '../../sablo/spectypes.service'; +import { ViewportRowUpdates, IChangeAwareValue, instanceOfChangeAwareValue } from '../../sablo/spectypes.service'; import { FoundsetLinkedConverter } from './foundsetLinked_converter'; -import { Deferred } from '../../sablo/util/deferred'; import { ComponentCache } from '../types'; import { SabloService } from '../../sablo/sablo.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.spec.ts index 9422a798e4..bb472471c5 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.spec.ts @@ -1,8 +1,8 @@ import { TestBed } from '@angular/core/testing'; import { ConverterService, PropertyContext } from '../../sablo/converter.service'; import { SabloService } from '../../sablo/sablo.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { LoggerFactory } from 'servoy-public'; +import { WindowRefService } from 'servoy-public'; import { SpecTypesService } from '../../sablo/spectypes.service'; import { ServicesService } from '../../sablo/services.service'; import { FoundsetConverter } from './foundset_converter'; @@ -29,7 +29,7 @@ describe('FoundsetLinked Converter', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ServoyTestingModule], - providers: [FoundsetLinkedConverter, FoundsetConverter, ConverterService, SabloService,TestabilityService, SpecTypesService, LoggerFactory, + providers: [FoundsetLinkedConverter, FoundsetConverter, ConverterService, TestabilityService, SpecTypesService, LoggerFactory, WindowRefService, ServicesService, SessionStorageService, ViewportService, LoadingIndicatorService] }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.ts index e93c6c897b..6eea3f2483 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundsetLinked_converter.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { IConverter, ConverterService, PropertyContext } from '../../sablo/converter.service'; -import { LoggerService, LoggerFactory } from '../../sablo/logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { ChangeAwareState, ChangeListener, IChangeAwareValue, instanceOfChangeAwareValue, ViewportChangeEvent } from '../../sablo/spectypes.service'; import { SabloService } from '../../sablo/sablo.service'; import { ViewportService, FoundsetViewportState } from '../services/viewport.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.spec.ts index 242fe68473..5626cf0a5f 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.spec.ts @@ -1,8 +1,8 @@ import { TestBed, inject } from '@angular/core/testing'; import { ConverterService } from '../../sablo/converter.service'; import { SabloService } from '../../sablo/sablo.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { LoggerFactory } from 'servoy-public'; +import { WindowRefService } from 'servoy-public'; import { SpecTypesService } from '../../sablo/spectypes.service'; import { ServicesService } from '../../sablo/services.service'; import { FoundsetConverter, Foundset } from './foundset_converter'; @@ -29,7 +29,7 @@ describe('FoundsetConverter', () => { beforeEach(() => { TestBed.configureTestingModule({ imports : [ServoyTestingModule], - providers: [FoundsetConverter, ConverterService, SabloService, TestabilityService, SpecTypesService, LoggerFactory, + providers: [FoundsetConverter, ConverterService, TestabilityService, SpecTypesService, LoggerFactory, WindowRefService, ServicesService, SessionStorageService, ViewportService, LoadingIndicatorService] }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.ts index a60e017eb8..99378960ad 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/foundset_converter.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { IConverter, ConverterService, PropertyContext } from '../../sablo/converter.service'; -import { LoggerService, LoggerFactory } from '../../sablo/logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { IFoundset, ChangeListener, ViewPort, ViewportRowUpdates, ViewportChangeEvent, ColumnRef, ChangeAwareState, IChangeAwareValue } from '../../sablo/spectypes.service'; import { SabloService } from '../../sablo/sablo.service'; import { SabloDeferHelper, IDeferedState } from '../../sablo/defer.service'; -import { Deferred } from '../../sablo/util/deferred'; +import { Deferred } from 'servoy-public'; import { SabloUtils } from '../../sablo/websocket.service'; import { ViewportService, FoundsetViewportState } from '../services/viewport.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_array_converter.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_array_converter.spec.ts index 10461d0c4d..a531f1c0a8 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_array_converter.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_array_converter.spec.ts @@ -2,8 +2,8 @@ import { TestBed, inject } from '@angular/core/testing'; import { IterableDiffers } from '@angular/core'; import { ConverterService } from '../../sablo/converter.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import {WindowRefService} from '../../sablo/util/windowref.service'; +import { LoggerFactory } from 'servoy-public'; +import {WindowRefService} from 'servoy-public'; import { SpecTypesService, BaseCustomObject, ICustomArray } from '../../sablo/spectypes.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_object_converter.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_object_converter.spec.ts index 6c685cfc5e..49c0395108 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_object_converter.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/json_object_converter.spec.ts @@ -2,8 +2,8 @@ import { TestBed, inject } from '@angular/core/testing'; import { ConverterService } from '../../sablo/converter.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { LoggerFactory } from 'servoy-public'; +import { WindowRefService } from 'servoy-public'; import { SpecTypesService, BaseCustomObject } from '../../sablo/spectypes.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.spec.ts index 9a9b5475d5..3dda1eda40 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.spec.ts @@ -1,8 +1,8 @@ import { TestBed, inject, tick, fakeAsync, flushMicrotasks } from '@angular/core/testing'; import { ConverterService } from '../../sablo/converter.service'; import { SabloService } from '../../sablo/sablo.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { LoggerFactory } from 'servoy-public'; +import { WindowRefService } from 'servoy-public'; import { SpecTypesService, instanceOfChangeAwareValue } from '../../sablo/spectypes.service'; import { ServicesService } from '../../sablo/services.service'; import { ValuelistConverter } from './valuelist_converter'; @@ -10,7 +10,7 @@ import { SabloDeferHelper} from '../../sablo/defer.service'; import { SessionStorageService } from '../../sablo/webstorage/sessionstorage.service'; import { IValuelist } from '../../sablo/spectypes.service'; import { LoadingIndicatorService } from '../../sablo/util/loading-indicator/loading-indicator.service'; -import { TestWebsocketService } from '../../testing/servoytesting.module'; +import { TestSabloService, TestWebsocketService } from '../../testing/servoytesting.module'; import { WebsocketService } from '../../sablo/websocket.service'; import { TestabilityService } from '../../sablo/testability.service'; @@ -26,9 +26,9 @@ describe('ValuelistConverter', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ValuelistConverter, ConverterService, SabloService, SpecTypesService, + providers: [ValuelistConverter, ConverterService, SpecTypesService, LoggerFactory, WindowRefService, SabloDeferHelper, TestabilityService, ServicesService, SessionStorageService, LoadingIndicatorService, - { provide: WebsocketService, useClass: TestWebsocketService }] + { provide: WebsocketService, useClass: TestWebsocketService }, { provide: SabloService, useClass: TestSabloService }] }); const sabloService: SabloService = TestBed.get( SabloService ); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.ts index 70c8089069..526fefaf55 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/converters/valuelist_converter.ts @@ -3,7 +3,7 @@ import { IConverter, ConverterService, PropertyContext } from '../../sablo/conve import { IValuelist, IChangeAwareValue, ChangeAwareState } from '../../sablo/spectypes.service'; import { SabloService } from '../../sablo/sablo.service'; import { SabloDeferHelper, IDeferedState } from '../../sablo/defer.service'; -import { Deferred, IDeferred } from '../../sablo/util/deferred'; +import { Deferred, IDeferred } from 'servoy-public'; import { Observable, of, from } from 'rxjs'; @Injectable() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.spec.ts index 050e6b5b60..65706eec35 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.spec.ts @@ -1,12 +1,10 @@ import { TestBed, inject } from '@angular/core/testing'; -import {EventEmitter } from '@angular/core'; - import {WebsocketService} from '../sablo/websocket.service'; import {SabloService} from '../sablo/sablo.service'; import {ConverterService} from '../sablo/converter.service'; -import {LoggerFactory} from '../sablo/logger.service'; -import {WindowRefService} from '../sablo/util/windowref.service'; +import {LoggerFactory} from 'servoy-public'; +import {WindowRefService} from 'servoy-public'; import { FormService } from './form.service'; import {ServoyService} from './servoy.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.ts index ab7050f718..12affcc851 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@angular/core'; import { WebsocketService } from '../sablo/websocket.service'; import { SabloService } from '../sablo/sablo.service'; -import { Deferred } from '../sablo/util/deferred'; +import { Deferred } from 'servoy-public'; import { ConverterService } from '../sablo/converter.service'; -import { LoggerService, LoggerFactory } from '../sablo/logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { ServoyService } from './servoy.service'; import { instanceOfChangeAwareValue, IChangeAwareValue } from '../sablo/spectypes.service'; import { get } from 'lodash-es'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.spec.ts index b273593ede..3ed3ce02e2 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.spec.ts @@ -11,10 +11,10 @@ import { ErrorBean } from '../../servoycore/error-bean/error-bean'; import { ServoyDefaultComponentsModule } from '../../servoydefault/servoydefault.module'; import {ServoyCoreSlider} from '../../servoycore/slider/slider'; -import { ServoyPublicModule } from '../servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ServoyExtraComponentsModule } from '../../servoyextra/servoyextra.module'; import { ServoyBootstrapComponentsModule } from '../../bootstrapcomponents/servoybootstrap.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe('FormComponent', () => { @@ -37,7 +37,7 @@ describe('FormComponent', () => { TestBed.configureTestingModule({ declarations: [ FormComponent, AddAttributeDirective, ServoyCoreSlider, ErrorBean ], imports: [ - ServoyDefaultComponentsModule, ServoyExtraComponentsModule, ServoyBootstrapComponentsModule, ServoyPublicModule, SabloModule + ServoyTestingModule,ServoyDefaultComponentsModule, ServoyExtraComponentsModule, ServoyBootstrapComponentsModule, ServoyPublicModule ], providers: [ {provide: FormService, useValue: formService }, {provide: SabloService, useValue: sabloService }, diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.ts index e407cf9a2b..c76ed61e11 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/form/form_component.component.ts @@ -6,12 +6,12 @@ import { FormCache, StructureCache, FormComponentCache, ComponentCache, instance import { ServoyService } from '../servoy.service'; import { SabloService } from '../../sablo/sablo.service'; -import { LoggerService, LoggerFactory } from '../../sablo/logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { ServoyApi } from '../servoy_api'; import { FormService } from '../form.service'; -import { ServoyBaseComponent } from '../basecomponent'; import { DOCUMENT } from '@angular/common'; +import { ServoyBaseComponent } from 'servoy-public'; @Component({ // eslint-disable-next-line @@ -213,7 +213,7 @@ export class FormComponent implements OnDestroy, OnChanges { - @Input() readonly name: string; + @Input() name: string; formClasses: string[]; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/locale.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/locale.service.ts index e1c2f7417d..3288a2f58a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/locale.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/locale.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { SabloService } from '../sablo/sablo.service'; -import { Deferred } from '../sablo/util/deferred'; +import { Deferred } from 'servoy-public'; import { registerLocaleData } from '@angular/common'; import { SessionStorageService } from '../sablo/webstorage/sessionstorage.service'; @@ -8,7 +8,7 @@ import * as moment from 'moment'; import numbro from 'numbro'; import { I18NProvider } from './services/i18n_provider.service'; -import { LoggerFactory, LoggerService } from '../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; @Injectable() export class LocaleService { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.spec.ts index 05b5cef5e3..7b275a473e 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.spec.ts @@ -4,10 +4,10 @@ import { MainComponent } from './main.component'; import {ServoyService} from './servoy.service'; import {AllServiceService} from './allservices.service'; import { FormService } from './form.service'; -import { I18NProvider } from './servoy_public'; import { WebsocketService } from '../sablo/websocket.service'; import { LoadingIndicatorService } from '../sablo/util/loading-indicator/loading-indicator.service'; import { ServerDataService } from './services/serverdata.service'; +import { I18NProvider } from './services/i18n_provider.service'; describe('MainComponent', () => { const servicesService = jasmine.createSpyObj('ServoyService', ['connect']); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.ts index cc446e4bc3..3e5b9ff201 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/main.component.ts @@ -3,10 +3,10 @@ import { Component, OnInit } from '@angular/core'; import { ServoyService } from './servoy.service'; import { AllServiceService } from './allservices.service'; import { FormService } from './form.service'; -import { I18NProvider } from './servoy_public'; import { WebsocketService } from '../sablo/websocket.service'; import { LoadingIndicatorService } from '../sablo/util/loading-indicator/loading-indicator.service'; import { ServerDataService } from './services/serverdata.service'; +import { I18NProvider } from './services/i18n_provider.service'; @Component({ selector: 'svy-main', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/application.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/application.service.ts index 8bb09783f3..99ebb59d69 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/application.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/application.service.ts @@ -3,7 +3,7 @@ import { DOCUMENT } from '@angular/common'; import {ServoyService} from '../servoy.service'; -import {WindowRefService} from '../../sablo/util/windowref.service'; +import {WindowRefService} from 'servoy-public'; import {SabloService} from '../../sablo/sablo.service'; @@ -13,7 +13,6 @@ import { FileUploadWindowComponent } from './file-upload-window/file-upload-wind import { LocalStorageService } from '../../sablo/webstorage/localstorage.service'; import { LocaleService } from '../locale.service'; import { ServerDataService } from './serverdata.service'; -import { SvyUtilsService } from './utils.service'; @Injectable() export class ApplicationService { @@ -26,8 +25,7 @@ export class ApplicationService { private sabloService: SabloService, @Inject(DOCUMENT) private doc: Document, private modalService: NgbModal, - private serverData: ServerDataService, - private utilsService: SvyUtilsService) { + private serverData: ServerDataService) { } public setLocale(language: string, country: string ) { @@ -181,7 +179,7 @@ export class ApplicationService { public showFileOpenDialog(title: string, multiselect: boolean, acceptFilter: string, url: string ) { if (!url) { - url = this.utilsService.generateUploadUrl(null, null, null); + url = this.generateUploadUrl(null, null, null); } const modalRef = this.modalService.open(FileUploadWindowComponent, { backdrop: 'static' }); modalRef.componentInstance.url = url; @@ -202,6 +200,18 @@ export class ApplicationService { return this.servoyService.getUIProperties().getUIProperty('trustDataAsHtml'); } + public generateUploadUrl(formname: string, componentName: string, propertyName: string): string { + return 'resources/upload/' + this.sabloService.getClientnr() + + (formname ? '/' + formname : '') + + (componentName ? '/' + componentName : '') + + (propertyName ? '/' + propertyName : ''); + } + + public generateServiceUploadUrl(serviceName: string, apiFunctionName: string): string{ + // svy_services should be in sync with MediaResourceServlet.SERVICE_UPLOAD + return 'resources/upload/' + this.sabloService.getClientnr() + '/svy_services/' + serviceName + '/' + apiFunctionName; + } + private showDefaultLoginWindow() { this.modalService.open(DefaultLoginWindowComponent, { backdrop: 'static' }); } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow.service.ts index bebbd26503..7bdaaf723b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow.service.ts @@ -1,8 +1,8 @@ -import { WindowRefService } from '../../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { Renderer2, Injectable, RendererFactory2, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { SvyUtilsService } from '../utils.service'; import { BSWindowManager } from './bswindow_manager.service'; +import { SvyUtilsService } from '../../utils.service'; const NORTH = 1; const SOUTH = 2; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow_manager.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow_manager.service.ts index f05710d924..9f6fa68c97 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow_manager.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/bootstrap-window/bswindow_manager.service.ts @@ -1,7 +1,7 @@ import { BSWindow, BSWindowOptions } from './bswindow.service'; import { Injectable, Inject, RendererFactory2, Renderer2 } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { SvyUtilsService } from '../utils.service'; +import { SvyUtilsService } from '../../utils.service'; @Injectable() export class BSWindowManager { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/clientfunction.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/clientfunction.service.ts index c7e1d884d6..2430d662ac 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/clientfunction.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/clientfunction.service.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; import { SabloService } from '../../sablo/sablo.service'; -import { Deferred, IDeferred } from '../../sablo/util/deferred'; +import { Deferred, IDeferred } from 'servoy-public'; @Injectable() export class ClientFunctionService { @@ -10,9 +10,11 @@ export class ClientFunctionService { private script: HTMLScriptElement; private deferred: IDeferred; + private doc: Document; - constructor(private sabloService: SabloService, rendererFactory: RendererFactory2, @Inject(DOCUMENT) private doc: Document) { + constructor(private sabloService: SabloService, rendererFactory: RendererFactory2, @Inject(DOCUMENT) _doc: any) { this.renderer = rendererFactory.createRenderer(null, null); + this.doc = _doc; } public reloadClientFunctions() { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.spec.ts index ca5dc47966..0b6e25ebec 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FileUploadWindowComponent } from './file-upload-window.component'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { HttpClient, HttpHandler } from '@angular/common/http'; -import { I18NProvider } from '../../../ngclient/servoy_public'; +import { I18NProvider } from '../i18n_provider.service'; describe('FileUploadWindowComponent', () => { let component: FileUploadWindowComponent; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.ts index a0d2a7d84c..c5a17ffbd9 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/file-upload-window/file-upload-window.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { HttpClient, HttpErrorResponse, HttpEventType, HttpResponse } from '@angular/common/http'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { I18NProvider } from '../../../ngclient/servoy_public'; +import { I18NProvider } from '../i18n_provider.service'; @Component({ selector: 'servoycore-file-upload-window', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/i18n_provider.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/i18n_provider.service.ts index 7bfe1bc014..92c74cf20b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/i18n_provider.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/i18n_provider.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { SabloService } from '../../sablo/sablo.service'; -import { Deferred } from '../../sablo/util/deferred'; +import { Deferred } from 'servoy-public'; @Injectable() export class I18NProvider { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/popupform.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/popupform.service.ts index e09fbbb730..12c1f2e994 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/popupform.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/popupform.service.ts @@ -3,7 +3,7 @@ import { DOCUMENT } from '@angular/common'; import { ServoyFormPopupComponent } from './popupform/popupform'; import { FormService } from '../form.service'; import { ServoyService } from '../servoy.service'; -import { SvyUtilsService } from '../servoy_public'; +import { SvyUtilsService } from '../utils.service'; @Injectable({ providedIn: 'root', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/serverdata.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/serverdata.service.ts index f447c941ca..db72467442 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/serverdata.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/serverdata.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { SabloService } from '../../sablo/sablo.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { WebsocketService } from '../../sablo/websocket.service'; import { ServoyService } from '../servoy.service'; import { I18NProvider } from './i18n_provider.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/servoy_public_impl.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/servoy_public_impl.service.ts new file mode 100644 index 0000000000..4dc58c8aeb --- /dev/null +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/servoy_public_impl.service.ts @@ -0,0 +1,50 @@ +import { Injectable } from '@angular/core'; +import { EventLike, JSEvent, ServoyPublicService } from 'servoy-public'; +import { SabloService } from '../../sablo/sablo.service'; +import { LocaleService } from '../locale.service'; +import { ServoyService } from '../servoy.service'; +import { SvyUtilsService } from '../utils.service'; +import { ApplicationService } from './application.service'; +import { I18NProvider } from './i18n_provider.service'; + +@Injectable() +export class ServoyPublicServiceImpl extends ServoyPublicService { + constructor(private sabloService: SabloService, + private i18nProvider: I18NProvider, + private utils: SvyUtilsService, + private localeService: LocaleService, + private applicationService: ApplicationService, + private servoyService: ServoyService) { + super(); + } + + executeInlineScript(formname: string, script: string, params: any[]): Promise { + return this.servoyService.executeInlineScript(formname, script, params); + } + getI18NMessages(...keys: string[]): Promise { + return this.i18nProvider.getI18NMessages(...keys); + } + getClientnr(): string { + return this.sabloService.getClientnr(); + } + callService(serviceName: string, methodName: string, argsObject: any, async?: boolean): Promise { + return this.sabloService.callService(serviceName, methodName, argsObject, async); + } + getLocale(): string { + return this.localeService.getLocale(); + } + createJSEvent(event: EventLike, eventType: string, contextFilter?: string, contextFilterElement?: any): JSEvent { + return this.utils.createJSEvent(event, eventType, contextFilter, contextFilterElement); + } + showFileOpenDialog(title: string, multiselect: boolean, acceptFilter: string, url: string): void { + this.applicationService.showFileOpenDialog(title, multiselect, acceptFilter, url); + } + generateServiceUploadUrl(serviceName: string, apiFunctionName: string): string { + return this.applicationService.generateServiceUploadUrl(serviceName, apiFunctionName); + } + generateUploadUrl(formname: string, componentName: string, propertyName: string): string { + return this.applicationService.generateUploadUrl(formname, componentName, propertyName); + } + +} + diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/window.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/window.service.ts index 1f808a6694..2ca676c42e 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/window.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/window.service.ts @@ -6,7 +6,7 @@ import { ServoyService } from '../servoy.service'; import { DialogWindowComponent } from './dialog-window/dialog-window.component'; import { BSWindowManager } from './bootstrap-window/bswindow_manager.service'; import { BSWindow, BSWindowOptions } from './bootstrap-window/bswindow.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { LocalStorageService } from '../../sablo/webstorage/localstorage.service'; import { SessionStorageService } from '../../sablo/webstorage/sessionstorage.service'; import { SabloService } from '../../sablo/sablo.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.module.ts index 90b2d6fbfd..4b6b4dc861 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.module.ts @@ -28,18 +28,18 @@ import { SessionView } from '../servoycore/session-view/session-view'; import { ServoyCoreFormContainer } from '../servoycore/formcontainer/formcontainer'; import { ViewportService } from './services/viewport.service'; -import { ComponentContributor } from './component_contributor.service'; -import { ServoyPublicModule } from './servoy_public.module'; +import { ServoyPublicModule, ServoyPublicService } from 'servoy-public'; import { LoadingIndicatorComponent } from '../sablo/util/loading-indicator/loading-indicator'; import { ListFormComponent } from '../servoycore/listformcomponent/listformcomponent'; import { LocaleService } from './locale.service'; import { NGGridsModule } from '../nggrids/nggrids.module'; -import { SvyUtilsService } from './services/utils.service'; import { ServerDataService } from './services/serverdata.service'; import { BSWindow } from './services/bootstrap-window/bswindow.service'; import { BSWindowManager } from './services/bootstrap-window/bswindow_manager.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { ServoyPublicServiceImpl } from './services/servoy_public_impl.service'; +import { SvyUtilsService } from './utils.service'; @NgModule( { declarations: [ @@ -71,8 +71,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; BrowserAnimationsModule ], providers: [FormService, ServoyService, LocaleService, I18NProvider, UpperCasePipe, LowerCasePipe, - SvyUtilsService,ServerDataService, BSWindow, BSWindowManager, - DatePipe, DecimalPipe, ComponentContributor, ViewportService], + ServerDataService, BSWindow, BSWindowManager, DatePipe, DecimalPipe, ViewportService, SvyUtilsService, + ServoyPublicServiceImpl, { provide: ServoyPublicService, useExisting: ServoyPublicServiceImpl }], bootstrap: [MainComponent], entryComponents: [DefaultLoginWindowComponent, FileUploadWindowComponent, DialogWindowComponent, ServoyFormPopupComponent], schemas: [ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.service.ts index a350a03141..6c7171e725 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy.service.ts @@ -3,8 +3,8 @@ import { Injectable } from '@angular/core'; import { WebsocketService } from '../sablo/websocket.service'; import { SabloService } from '../sablo/sablo.service'; import { ConverterService } from '../sablo/converter.service'; -import { WindowRefService } from '../sablo/util/windowref.service'; -import { LoggerFactory } from '../sablo/logger.service'; +import { WindowRefService } from 'servoy-public'; +import { LoggerFactory } from 'servoy-public'; import { SabloDeferHelper } from '../sablo/defer.service'; import { SessionStorageService } from '../sablo/webstorage/sessionstorage.service'; @@ -163,7 +163,7 @@ export class ServoyService { return this.uiProperties; } - public executeInlineScript(formname: string, script: string, params: any[]) { + public executeInlineScript(formname: string, script: string, params: any[]): Promise { return this.sabloService.callService('formService', 'executeInlineScript', { formname, script, params }, false); } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_api.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_api.ts index 9cb1b237d1..189fa8917c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_api.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_api.ts @@ -1,6 +1,6 @@ import { FormService } from '../ngclient/form.service'; import { ServoyService } from '../ngclient/servoy.service'; -import { ServoyBaseComponent } from './servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { ComponentCache } from './types'; export class ServoyApi { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public2.ts similarity index 100% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public.ts rename to com.servoy.eclipse.ngclient.ui/node/src/ngclient/servoy_public2.ts diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/utils.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils.service.ts similarity index 66% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/utils.service.ts rename to com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils.service.ts index 4f449ee432..498a095e4c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/services/utils.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils.service.ts @@ -1,25 +1,26 @@ import { Injectable, Inject } from '@angular/core'; -import { SabloService } from '../../sablo/sablo.service'; import { DOCUMENT } from '@angular/common'; -import { FormService } from '../form.service'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { EventLike, JSEvent, LoggerFactory, LoggerService } from 'servoy-public'; +import { FormService } from './form.service'; @Injectable() export class SvyUtilsService { private log: LoggerService; + private doc: Document; - constructor(private sabloService: SabloService, @Inject(DOCUMENT) private doc: Document, private formservice: FormService, logFactory: LoggerFactory) { + constructor(private formService: FormService, @Inject(DOCUMENT) _doc: any, logFactory: LoggerFactory) { this.log = logFactory.getLogger('SvyUtilsService'); + this.doc = _doc; } - public createJSEvent(event: EventLike, eventType: string, contextFilter?: string, contextFilterElement?: any): JSEvent{ + public createJSEvent(event: EventLike, eventType: string, contextFilter?: string, contextFilterElement?: any): JSEvent { if (!event) { if (contextFilter || contextFilterElement) return null; this.log.error('event is undefined, returning default event'); return { svyType: 'JSEvent', eventType, timestamp: new Date().getTime() }; } const targetEl = event.target as Element; - let form; + let form: string; let parent = targetEl; const targetElNameChain = new Array(); let contextMatch = false; @@ -27,7 +28,7 @@ export class SvyUtilsService { form = parent.tagName.toLowerCase() === 'svy-form' ? parent.getAttribute('name') : undefined; if (form) { //global shortcut or context match - const shortcuthit = !contextFilter || (contextFilter && form == contextFilter); + const shortcuthit = !contextFilter || (contextFilter && form === contextFilter); if (!shortcuthit) break; contextMatch = true; @@ -54,36 +55,25 @@ export class SvyUtilsService { if (!contextMatch) return null; const jsEvent: JSEvent = { svyType: 'JSEvent', eventType, timestamp: new Date().getTime() } ; + // eslint-disable-next-line no-bitwise const modifiers = (event.altKey ? 8 : 0) | (event.shiftKey ? 1 : 0) | (event.ctrlKey ? 2 : 0) | (event.metaKey ? 4 : 0); jsEvent.modifiers = modifiers; jsEvent.x = event['pageX'];//TODO check jsEvent.y = event['pageY']; jsEvent.formName = form; - for (let i = 0; i < targetElNameChain.length; i++) { - if (this.formservice.getFormCacheByName(form).getComponent(targetElNameChain[i])) { - jsEvent['elementName'] = targetElNameChain[i]; + for (const chain of targetElNameChain) { + if (this.formService.getFormCacheByName(form).getComponent(chain)) { + jsEvent['elementName'] = chain; break; } } - if (contextFilterElement && (contextFilterElement != jsEvent['elementName'])) { + if (contextFilterElement && (contextFilterElement !== jsEvent['elementName'])) { return null; } return jsEvent; } - public generateUploadUrl(formname: string, componentName: string, propertyName: string) { - return 'resources/upload/' + this.sabloService.getClientnr() + - (formname ? '/' + formname : '') + - (componentName ? '/' + componentName : '') + - (propertyName ? '/' + propertyName : ''); - } - - public generateServiceUploadUrl(serviceName: string, apiFunctionName: string){ - // svy_services should be in sync with MediaResourceServlet.SERVICE_UPLOAD - return 'resources/upload/' + this.sabloService.getClientnr() + '/svy_services/' + serviceName + '/' + apiFunctionName; - } - /** * JS implementation of the $.extend() jQuery method. * Source: https://gomakethings.com/vanilla-javascript-version-of-jquery-extend/ @@ -102,7 +92,7 @@ export class SvyUtilsService { } // Merge the object into the extended object - const merge = (obj) => { + const merge = (obj: any) => { for (const prop in obj) { if (Object.prototype.hasOwnProperty.call(obj, prop)) { // If deep merge and property is an object, merge properties @@ -129,21 +119,3 @@ export class SvyUtilsService { } } -export class JSEvent { - public formName?: string; - public elementName?: string; - public svyType: string; - public eventType: string; - public modifiers?: number; - public x?: number; - public y?: number; - public timestamp: number; -} - -export interface EventLike { - target: EventTarget; - altKey?: boolean; - shiftKey?: boolean; - ctrlKey?: boolean; - metaKey?: boolean; -} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/upload.directive.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/upload.directive.ts deleted file mode 100644 index 5a3b7340d1..0000000000 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/upload.directive.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Directive , Input, OnInit, HostListener} from '@angular/core'; -import { ApplicationService } from '../services/application.service'; -import { SvyUtilsService } from '../servoy_public'; - -@Directive({ - selector: '[svyUpload]' -}) - -export class UploadDirective implements OnInit { - @Input() formname: string; - @Input() componentName: string; - - private url: string; - private propertyName = 'dataProviderID'; - - constructor(private appService: ApplicationService, - private utilsService: SvyUtilsService) { - } - - @HostListener('click') click(e: Event) { - this.appService.showFileOpenDialog('Please select a file', false, null, this.url); - } - - ngOnInit(): void { - this.url = this.utilsService.generateUploadUrl(this.formname, this.componentName, this.propertyName); - } - -} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopfile/ngdesktopfile.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopfile/ngdesktopfile.service.ts index 2d234a410e..b3048fb7e5 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopfile/ngdesktopfile.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopfile/ngdesktopfile.service.ts @@ -1,10 +1,7 @@ /// import { Injectable } from '@angular/core'; -import { ServoyService } from '../ngclient/servoy.service'; -import { SvyUtilsService } from '../ngclient/servoy_public'; -import { LoggerFactory, LoggerService } from '../sablo/logger.service'; -import { Deferred } from '../sablo/util/deferred'; -import { WindowRefService } from '../sablo/util/windowref.service'; +import { LoggerFactory, LoggerService, Deferred, WindowRefService, ServoyPublicService } from 'servoy-public'; + import * as fs from 'node:fs'; import * as os from 'node:os'; @@ -27,8 +24,7 @@ export class NGDesktopFileService { // private session: typeof electron.Session; private dialog: electron.Dialog; - constructor(private servoyService: ServoyService, private utilsService: SvyUtilsService, - private windowRef: WindowRefService, logFactory: LoggerFactory) { + constructor(private servoyService: ServoyPublicService, private windowRef: WindowRefService, logFactory: LoggerFactory) { this.log = logFactory.getLogger('NGDesktopFileService'); const userAgent = navigator.userAgent.toLowerCase(); const r = this.windowRef.nativeWindow['require']; @@ -41,8 +37,7 @@ export class NGDesktopFileService { this.shell = r('electron').shell; // this.session = this.remote.session; this.dialog = this.remote.dialog; - } - else { + } else { this.log.warn('ngdesktopfile service/plugin loaded in a none electron environment'); } } @@ -214,7 +209,7 @@ export class NGDesktopFileService { this.defer = null; } }).catch((err) => { - console.log(err); + this.log.info(err); this.defer.resolve(false); this.defer = null; }); @@ -249,7 +244,7 @@ export class NGDesktopFileService { this.readUrlFromPath(result.filePaths[0].replace(/\\/g, '/'), id); //on Windows the path contains backslash } }).catch((err) => { - console.log(err); + this.log.info(err); }); } }); @@ -271,7 +266,7 @@ export class NGDesktopFileService { this.servoyService.executeInlineScript(callback.formname, callback.script, [result.filePaths[0]]); } }).catch((err) => { - console.log(err); + this.log.info(err); }); }); } @@ -302,7 +297,7 @@ export class NGDesktopFileService { this.servoyService.executeInlineScript(callback.formname, callback.script, [result.filePath]); } }).catch((err) => { - console.log(err); + this.log.info(err); }); }); } @@ -329,7 +324,7 @@ export class NGDesktopFileService { try { return this.dialog.showSaveDialogSync(this.remote.getCurrentWindow(), options); } catch (e) { - console.log(e); + this.log.info(e); } } @@ -363,7 +358,7 @@ export class NGDesktopFileService { this.servoyService.executeInlineScript(callback.formname, callback.script, [result.filePaths]); } }).catch((err) => { - console.log(err); + this.log.info(err); }); }); } @@ -393,7 +388,7 @@ export class NGDesktopFileService { try { return this.dialog.showOpenDialogSync(this.remote.getCurrentWindow(), options); } catch (e) { - console.log(e); + this.log.info(e); } } @@ -448,7 +443,7 @@ export class NGDesktopFileService { }; return retStats; } catch (err) { - console.log(err); + this.log.info(err); } } @@ -481,7 +476,7 @@ export class NGDesktopFileService { return result; } catch (err) { - console.log(err); + this.log.info(err); } } @@ -506,7 +501,7 @@ export class NGDesktopFileService { } } catch (err) { result = false; - console.log(err); + this.log.info(err); } return result; } @@ -531,7 +526,7 @@ export class NGDesktopFileService { } } catch (err) { result = false; - console.log(err); + this.log.info(err); } return result; } @@ -554,7 +549,7 @@ export class NGDesktopFileService { } } catch (err) { result = false; - console.log(err); + this.log.info(err); } return result; } @@ -577,7 +572,7 @@ export class NGDesktopFileService { } } catch (err) { result = false; - console.log(err); + this.log.info(err); } return result; } @@ -601,7 +596,7 @@ export class NGDesktopFileService { } } catch (err) { result = false; - console.log(err); + this.log.info(err); } return result; } @@ -633,7 +628,7 @@ export class NGDesktopFileService { } } catch (err) { result = false; - console.log(err); + this.log.info(err); } return result; } @@ -660,7 +655,7 @@ export class NGDesktopFileService { result = this.fs.readFileSync(path, options); } } catch (err) { - console.log(err); + this.log.info(err); } return result; } @@ -698,10 +693,10 @@ export class NGDesktopFileService { id, file: this.fs.createReadStream(path) }; - this.request.post({ url: this.getFullUrl(this.utilsService.generateServiceUploadUrl('ngdesktopfile', 'callback')), formData }, + this.request.post({ url: this.getFullUrl(this.servoyService.generateServiceUploadUrl('ngdesktopfile', 'callback')), formData }, (err, httpResponse, body) => { if (err) { - return console.error('upload failed:', err); + return this.log.error('upload failed:', err); } }); } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopui/ngdesktopui.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopui/ngdesktopui.service.ts index c35e2b4399..d212d49475 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopui/ngdesktopui.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngdesktopui/ngdesktopui.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; -import { LoggerFactory, LoggerService } from '../sablo/logger.service'; -import { WindowRefService } from '../sablo/util/windowref.service'; +import { LoggerFactory, LoggerService, WindowRefService } from 'servoy-public'; import * as electron from 'electron'; import { ServoyService } from '../ngclient/servoy.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngdesktoputils/ngdesktoputils.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/ngdesktoputils/ngdesktoputils.service.ts index 846217fed9..7d4af40787 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngdesktoputils/ngdesktoputils.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/ngdesktoputils/ngdesktoputils.service.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; import { NGDesktopFileService } from '../ngdesktopfile/ngdesktopfile.service'; -import { Deferred } from '../sablo/util/deferred'; +import { Deferred, WindowRefService } from 'servoy-public'; -import { WindowRefService } from '../sablo/util/windowref.service'; -import { LoggerFactory, LoggerService } from '../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import * as child_process from 'node:child_process'; import * as electron from 'electron'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/datagrid.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/datagrid.ts index bf9a6b5b65..8a3e0171d5 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/datagrid.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/datagrid.ts @@ -5,10 +5,10 @@ import { DomSanitizer } from '@angular/platform-browser'; import { FoundsetChangeEvent } from '../../ngclient/converters/foundset_converter'; import { ViewportService } from '../../ngclient/services/viewport.service'; import { ServoyService } from '../../ngclient/servoy.service'; -import { FormattingService } from '../../ngclient/servoy_public'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { FormattingService } from 'servoy-public'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { ChangeType, IFoundset } from '../../sablo/spectypes.service'; -import { Deferred } from '../../sablo/util/deferred'; +import { Deferred } from 'servoy-public'; import { DatagridService } from './datagrid.service'; import { DatePicker } from '../editors/datepicker'; import { FormEditor } from '../editors/formeditor'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/datagridfilter.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/datagridfilter.ts index 1bc7f1844f..de89e93821 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/datagridfilter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/datagridfilter.ts @@ -1,5 +1,5 @@ import { AgFilterComponent } from '@ag-grid-community/angular'; -import { IFilterParams, IDoesFilterPassParams } from '@ag-grid-community/core'; +import { IFilterParams } from '@ag-grid-community/core'; import { Directive, ElementRef, ViewChild } from '@angular/core'; import { DataGrid } from '../datagrid'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/valuelistfilter.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/valuelistfilter.ts index 6ffae3a9da..4f7a50a293 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/valuelistfilter.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/datagrid/filters/valuelistfilter.ts @@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core'; import { NgbTypeahead, NgbTypeaheadConfig } from '@ng-bootstrap/ng-bootstrap'; import { merge, Observable, of, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, switchMap } from 'rxjs/operators'; -import { FormattingService } from '../../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { DatagridFilterDirective } from './datagridfilter'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/datepicker.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/datepicker.ts index b7678bed35..1e8c77edf5 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/datepicker.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/datepicker.ts @@ -1,11 +1,11 @@ import { Component, Inject } from '@angular/core'; import { DateTimeAdapter, OwlDateTimeIntl } from '@danielmoncada/angular-datetime-picker'; -import { LocaleService } from '../../ngclient/servoy_public'; import { EditorDirective } from './editor'; import { ICellEditorParams } from '@ag-grid-community/core'; import * as moment from 'moment'; import { DOCUMENT } from '@angular/common'; import { PickerType } from '@danielmoncada/angular-datetime-picker/lib/date-time/date-time.class'; +import { ServoyPublicService } from 'servoy-public'; @Component({ selector: 'aggrid-datepicker', @@ -28,9 +28,9 @@ export class DatePicker extends EditorDirective { selectedValue: any; - constructor(localeService: LocaleService, dateTimeAdapter: DateTimeAdapter, @Inject(DOCUMENT) private doc: Document) { + constructor(servoyService: ServoyPublicService, dateTimeAdapter: DateTimeAdapter, @Inject(DOCUMENT) private doc: Document) { super(); - dateTimeAdapter.setLocale(localeService.getLocale()); + dateTimeAdapter.setLocale(servoyService.getLocale()); const ld = moment.localeData(); this.firstDayOfWeek = ld.firstDayOfWeek(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/typeaheadeditor.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/typeaheadeditor.ts index d99964a4b8..d6637c9555 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/typeaheadeditor.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/editors/typeaheadeditor.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; import { NgbTypeahead, NgbTypeaheadConfig } from '@ng-bootstrap/ng-bootstrap'; import { merge, Observable, of, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, switchMap } from 'rxjs/operators'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { EditorDirective } from './editor'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrid.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrid.ts index dcd0aaa178..4b9a92671b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrid.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrid.ts @@ -1,6 +1,6 @@ import { AgGridAngular } from '@ag-grid-community/angular'; import { ContentChild, Directive, Input, TemplateRef, ViewChild } from '@angular/core'; -import { FormattingService, ServoyBaseComponent } from '../ngclient/servoy_public'; +import { FormattingService, ServoyBaseComponent } from 'servoy-public'; @Directive() export abstract class NGGridDirective extends ServoyBaseComponent { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrids.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrids.module.ts index f49058aa6d..606d951be3 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrids.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/nggrids.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { OwlDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { ServoyPublicModule } from '../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { DataGrid } from './datagrid/datagrid'; import { DatePicker } from './editors/datepicker'; import { FormEditor } from './editors/formeditor'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/powergrid/powergrid.ts b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/powergrid/powergrid.ts index 2333d41752..ebc5c5715a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/nggrids/powergrid/powergrid.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/nggrids/powergrid/powergrid.ts @@ -1,7 +1,7 @@ import { GridOptions, GroupCellRenderer } from '@ag-grid-community/core'; import { ChangeDetectorRef, Component, ElementRef, EventEmitter, Inject, Input, Output, Renderer2, SecurityContext, SimpleChanges, ViewChild } from '@angular/core'; -import { FormattingService } from '../../ngclient/servoy_public'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { FormattingService } from 'servoy-public'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { NGGridDirective } from '../nggrid'; import { DatePicker } from '../editors/datepicker'; import { FormEditor } from '../editors/formeditor'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.spec.ts index 51802d18ad..f91400a056 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.spec.ts @@ -4,8 +4,8 @@ import { ConverterService } from './converter.service'; import {SpecTypesService} from '../sablo/spectypes.service'; -import {LoggerService, LoggerFactory} from './logger.service'; -import {WindowRefService} from './util/windowref.service'; +import {LoggerService, LoggerFactory} from 'servoy-public'; +import {WindowRefService} from 'servoy-public'; describe('ConverterService', () => { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.ts index fd5b618749..89ddc0dab8 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/converter.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { LoggerService, LoggerFactory } from './logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; class SwingModifiers { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/defer.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/defer.service.ts index 38ce19f681..b1a15be426 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/defer.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/defer.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Deferred, IDeferred } from '../sablo/util/deferred'; +import { Deferred, IDeferred } from 'servoy-public'; -import { LoggerService, LoggerFactory } from './logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { SabloService } from './sablo.service'; @Injectable() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnecting.websocket.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnecting.websocket.ts index 49eaed046b..88132010d0 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnecting.websocket.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnecting.websocket.ts @@ -1,4 +1,4 @@ -import { LoggerFactory, LoggerService, LogLevel } from '../logger.service'; +import { LoggerFactory, LoggerService, LogLevel } from 'servoy-public'; import { CustomEventEmitter, CustomEvent } from '../util/eventemitter'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnection.websocket.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnection.websocket.spec.ts index 7b1215cdd8..cbe2892c94 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnection.websocket.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/io/reconnection.websocket.spec.ts @@ -3,8 +3,8 @@ import { TestBed,fakeAsync,tick } from '@angular/core/testing'; import {ReconnectingWebSocket} from './reconnecting.websocket'; import {CustomEvent} from '../util/eventemitter'; -import { LoggerFactory } from '../logger.service'; -import { WindowRefService } from '../util/windowref.service'; +import { LoggerFactory } from 'servoy-public'; +import { WindowRefService } from 'servoy-public'; describe('ReconnectionWebsocket', () => { let normalWebSocket = null; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.spec.ts index 0f023898ce..6341587a85 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/logger.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed, inject } from '@angular/core/testing'; -import {LoggerService, LogLevel, LoggerFactory} from './logger.service'; -import {WindowRefService} from './util/windowref.service'; +import {LoggerService, LogLevel, LoggerFactory} from 'servoy-public'; +import {WindowRefService} from 'servoy-public'; describe('LoggerService', () => { let windowRef; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/pipes/pipes.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/pipes/pipes.ts deleted file mode 100644 index 45c12abd86..0000000000 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/pipes/pipes.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; - -import { DomSanitizer } from '@angular/platform-browser'; - - -@Pipe( { name: 'trustAsHtml' } ) -export class TrustAsHtmlPipe implements PipeTransform { - constructor( private domSanitizer: DomSanitizer ) { - } - - transform( input: string, trustAsHtml: boolean ): any { - if ( trustAsHtml ) { - return this.domSanitizer.bypassSecurityTrustHtml(input); - } - return input; - } -} diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.module.ts index a950da866e..a55b48b1bd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.module.ts @@ -1,22 +1,18 @@ import { NgModule } from '@angular/core'; import { WebStorageModule } from './webstorage/webstorage.module'; -import { WindowRefService } from './util/windowref.service'; -import { TrustAsHtmlPipe } from './pipes/pipes'; import { WebsocketService } from './websocket.service'; import { ConverterService } from './converter.service'; import { ServicesService } from './services.service'; import { SabloService } from './sablo.service'; import { ServiceChangeHandler } from './util/servicechangehandler'; -import { LoggerFactory } from './logger.service'; +import { LoggerFactory } from 'servoy-public'; import { SpecTypesService } from './spectypes.service'; import { SabloDeferHelper} from './defer.service'; -import { SabloTabseq } from './util/sablotabseq.directive'; import { LoadingIndicatorService } from './util/loading-indicator/loading-indicator.service'; import { TestabilityService } from './testability.service'; @NgModule( { - declarations: [TrustAsHtmlPipe, SabloTabseq - ], + declarations: [], imports: [ WebStorageModule, ], @@ -26,12 +22,11 @@ import { TestabilityService } from './testability.service'; ServicesService, WebsocketService, TestabilityService, - WindowRefService, LoadingIndicatorService, LoggerFactory, SabloDeferHelper, ServiceChangeHandler], - exports: [TrustAsHtmlPipe, SabloTabseq] + exports: [] } ) export class SabloModule { } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.service.ts index 802265bc4d..774f6031b7 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/sablo.service.ts @@ -1,10 +1,10 @@ import { Injectable, } from '@angular/core'; import { SessionStorageService } from './webstorage/sessionstorage.service'; -import { WindowRefService } from './util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { WebsocketService, WebsocketSession } from '../sablo/websocket.service'; import { ConverterService } from './converter.service'; -import { LoggerService, LoggerFactory } from './logger.service'; -import { Deferred } from './util/deferred'; +import { LoggerService, LoggerFactory } from 'servoy-public'; +import { Deferred } from 'servoy-public'; @Injectable() export class SabloService { @@ -19,7 +19,7 @@ export class SabloService { constructor(private websocketService: WebsocketService, private sessionStorage: SessionStorageService, private converterService: ConverterService, - private windowRefService: WindowRefService, private logFactory: LoggerFactory) { + private windowRefService: WindowRefService, logFactory: LoggerFactory) { this.log = logFactory.getLogger('SabloService'); this.windowRefService.nativeWindow.window.addEventListener('unload', () => { sessionStorage.remove('svy_session_lock'); @@ -28,7 +28,7 @@ export class SabloService { if (sessionStorage.has('svy_session_lock')) { this.clearSabloInfo() - console.warn('Found a lock in session storage. The storage was cleared.'); + this.log.warn('Found a lock in session storage. The storage was cleared.'); } sessionStorage.set('svy_session_lock', '1'); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/services.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/services.service.ts index 34a21e3db2..b1bd224572 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/services.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/services.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ConverterService } from './converter.service'; -import { LoggerService, LoggerFactory } from './logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; @Injectable() export class ServicesService { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/spectypes.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/spectypes.service.ts index ef63c2a823..ad45aa020d 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/spectypes.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/spectypes.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { IterableDiffers, IterableDiffer } from '@angular/core'; import { Observable } from 'rxjs'; -import { LoggerFactory, LoggerService } from './logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; @Injectable() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/testability.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/testability.service.ts index 5d918c1beb..c21cb544f4 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/testability.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/testability.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { LoggerFactory, LoggerService } from './logger.service'; -import { Deferred } from './util/deferred'; -import { WindowRefService } from './util/windowref.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; +import { Deferred } from 'servoy-public'; +import { WindowRefService } from 'servoy-public'; @Injectable() export class TestabilityService { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/loading-indicator/loading-indicator.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/loading-indicator/loading-indicator.service.ts index 8bc7afcf11..11117055c3 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/loading-indicator/loading-indicator.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/util/loading-indicator/loading-indicator.service.ts @@ -1,6 +1,6 @@ import { Subject } from 'rxjs'; import { Injectable, NgZone } from '@angular/core'; -import { LoggerFactory, LoggerService } from '../../logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; export interface ICustomLoadingIndicator { showLoading(): void; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.spec.ts index b272762f97..f113bcbab1 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.spec.ts @@ -2,10 +2,10 @@ import { TestBed, inject , fakeAsync, flush, discardPeriodicTasks} from '@angula import { WebsocketService } from './websocket.service'; -import {WindowRefService} from './util/windowref.service'; +import {WindowRefService} from 'servoy-public'; import { ServicesService } from './services.service'; import { ConverterService } from './converter.service'; -import { LoggerFactory } from './logger.service'; +import { LoggerFactory } from 'servoy-public'; import { LoadingIndicatorService } from './util/loading-indicator/loading-indicator.service'; import { TestabilityService } from './testability.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.ts index 70f7ae42b3..7c05157ef1 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/websocket.service.ts @@ -4,11 +4,11 @@ import { Subscription, interval, Subject } from 'rxjs'; import { ReconnectingWebSocket, WebsocketCustomEvent } from './io/reconnecting.websocket'; -import { WindowRefService } from './util/windowref.service'; -import { Deferred } from './util/deferred'; +import { WindowRefService } from 'servoy-public'; +import { Deferred } from 'servoy-public'; import { ServicesService } from './services.service'; import { ConverterService } from './converter.service'; -import { LoggerService, LogLevel, LoggerFactory } from './logger.service'; +import { LoggerService, LogLevel, LoggerFactory } from 'servoy-public'; import { LoadingIndicatorService } from './util/loading-indicator/loading-indicator.service'; import { TestabilityService } from './testability.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/localstorage.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/localstorage.service.ts index afdea100c3..6c27eaf7cc 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/localstorage.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/localstorage.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { LoggerFactory, LoggerService } from '../logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { WebStorage } from './webstorage.interface'; @Injectable() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/sessionstorage.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/sessionstorage.service.ts index bd731a0661..85d738c966 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/sessionstorage.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/sablo/webstorage/sessionstorage.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { LoggerFactory, LoggerService } from '../logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { WebStorage } from './webstorage.interface'; @Injectable() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.spec.ts index 3e6f4a8034..939bf754dc 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.spec.ts @@ -4,7 +4,7 @@ import { SessionStorageService } from '../../sablo/webstorage/sessionstorage.ser import { NGUtilsService } from './ngutils.service'; -import {WindowRefService} from '../../sablo/util/windowref.service'; +import {WindowRefService} from 'servoy-public'; import {ServiceChangeHandler} from '../../sablo/util/servicechangehandler'; @@ -12,7 +12,7 @@ import { SabloService } from '../../sablo/sablo.service'; import { WebsocketService } from '../../sablo/websocket.service'; import { ConverterService } from '../../sablo/converter.service'; -import { LoggerFactory } from '../../sablo/logger.service'; +import { LoggerFactory } from 'servoy-public'; import { ServicesService } from '../../sablo/services.service'; import { ServoyService } from '../../ngclient/servoy.service'; import { PlatformLocation } from '@angular/common'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.ts index 9228092996..1067f4575a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoy_ng_only_services/ngutils/ngutils.service.ts @@ -1,7 +1,7 @@ import { Injectable, Renderer2, Inject, RendererFactory2 } from '@angular/core'; import { DOCUMENT, PlatformLocation } from '@angular/common'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { ServiceChangeHandler } from '../../sablo/util/servicechangehandler'; import { ServoyService } from '../../ngclient/servoy.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/default-navigator/default-navigator.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/default-navigator/default-navigator.ts index 18a9f5ed3a..568cf9adb1 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/default-navigator/default-navigator.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/default-navigator/default-navigator.ts @@ -9,7 +9,7 @@ import { ComponentCache } from '../../ngclient/types'; }) export class DefaultNavigator { - @Input() readonly name: string; + @Input() name: string; navigatorComponentCache: ComponentCache; sliderValue: number; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.spec.ts index d4c41e83ca..c17663f2bb 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormService } from '../../ngclient/form.service'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { ServoyCoreFormContainer } from './formcontainer'; @@ -13,7 +13,7 @@ describe('ServoyCoreFormContainer', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyCoreFormContainer ], - imports: [NgbModule, SabloModule, ServoyPublicModule, SabloModule], + imports: [NgbModule, ServoyTestingModule, ServoyPublicModule], providers: [ { provide: FormService, useValue: {getFormCacheByName: () => {} }} ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.ts index 1ab157f83c..97b07fe199 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/formcontainer/formcontainer.ts @@ -1,6 +1,5 @@ import { Component, ChangeDetectorRef, Renderer2, ContentChild, TemplateRef, Input, SimpleChanges, ChangeDetectionStrategy } from '@angular/core'; import { FormService } from '../../ngclient/form.service'; -import { ServoyBaseComponent } from '../../ngclient/basecomponent'; import { ServoyDefaultBaseComponent } from '../../servoydefault/basecomponent'; @Component({ @@ -82,12 +81,11 @@ export class ServoyCoreFormContainer extends ServoyDefaultBaseComponent 0) { - style['minHeight'] = minHeight + "px"; + style['minHeight'] = minHeight + 'px'; } return style; } diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/listformcomponent/listformcomponent.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/listformcomponent/listformcomponent.ts index 370bb1efa0..d0b91f8c3e 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/listformcomponent/listformcomponent.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/listformcomponent/listformcomponent.ts @@ -6,16 +6,16 @@ import { ChangeType, ViewPortRow } from '../../sablo/spectypes.service'; import { FormComponent } from '../../ngclient/form/form_component.component'; import { ViewportService } from '../../ngclient/services/viewport.service'; import { ComponentConverter, ComponentModel } from '../../ngclient/converters/component_converter'; -import { ServoyBaseComponent } from '../../ngclient/basecomponent'; +import { ServoyBaseComponent } from 'servoy-public'; import { Foundset, FoundsetChangeEvent } from '../../ngclient/converters/foundset_converter'; import { FormComponentState } from '../../ngclient/converters/formcomponent_converter'; -import { ServoyApi } from '../../ngclient/servoy_public'; import { FormService } from '../../ngclient/form.service'; import { ServoyService } from '../../ngclient/servoy.service'; import { ComponentCache, FormComponentCache, IApiExecutor, instanceOfApiExecutor, StructureCache } from '../../ngclient/types'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { isEmpty } from 'lodash-es'; import { DOCUMENT } from '@angular/common'; +import { ServoyApi } from '../../ngclient/servoy_api'; @Component({ selector: 'servoycore-listformcomponent', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/slider/slider.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/slider/slider.spec.ts index d38b6f0298..29b5a9c25d 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoycore/slider/slider.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoycore/slider/slider.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ServoyCoreSlider } from './slider'; -import { TooltipService } from '../../ngclient/servoy_public'; +import { TooltipService } from 'servoy-public'; describe('ServoyCoreSlider', () => { @@ -14,7 +14,7 @@ describe('ServoyCoreSlider', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyCoreSlider], - imports: [SabloModule, ServoyPublicModule], + imports: [ServoyTestingModule, ServoyPublicModule], providers: [TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basechoice.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basechoice.ts index 8420c801b0..1ea1a930de 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basechoice.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basechoice.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import { Renderer2, ViewChild, ElementRef, SimpleChanges, Directive, ChangeDetectorRef, Input, OnInit, Inject } from '@angular/core'; -import { FormattingService } from '../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyDefaultBaseField } from './basefield'; @Directive() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basecomponent.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basecomponent.ts index df269f6b20..6ba561ed71 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basecomponent.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basecomponent.ts @@ -1,6 +1,6 @@ import { Input, SimpleChanges, Renderer2, ChangeDetectorRef, Directive } from '@angular/core'; -import { Format, PropertyUtils, ServoyBaseComponent } from '../ngclient/servoy_public'; +import { ServoyBaseComponent, PropertyUtils, Format } from 'servoy-public'; @Directive() diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basefield.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basefield.ts index 53c4dba9f4..b8873c89fd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basefield.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/basefield.ts @@ -1,6 +1,6 @@ import { Input, Output, EventEmitter, SimpleChanges, Renderer2, Directive, OnChanges, ChangeDetectorRef, Inject } from '@angular/core'; -import { PropertyUtils, FormattingService } from '../ngclient/servoy_public'; +import { PropertyUtils, FormattingService } from 'servoy-public'; import { ServoyDefaultBaseComponent } from './basecomponent'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/baselabel.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/baselabel.ts index e78215737e..73448c51d8 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/baselabel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/baselabel.ts @@ -1,6 +1,6 @@ import { Input, ChangeDetectorRef, SimpleChanges, Renderer2, ElementRef, ViewChild, Directive } from '@angular/core'; -import { PropertyUtils } from '../ngclient/servoy_public'; +import { PropertyUtils } from 'servoy-public'; import { ServoyDefaultBaseComponent } from './basecomponent'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/button/button.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/button/button.spec.ts index 1f7719d6b3..c499058a16 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/button/button.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/button/button.spec.ts @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultButton } from './button'; -import { SabloModule } from '../../sablo/sablo.module'; -import { TooltipService, ComponentContributor, ServoyApi} from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { TooltipService, ComponentContributor, ServoyApi} from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; import { runOnPushChangeDetection } from '../../testing'; @@ -19,7 +19,7 @@ describe('SvyButton', () => { declarations: [ ServoyDefaultButton], providers: [ TooltipService, ComponentContributor], imports: [ - SabloModule, ServoyPublicModule], + ServoyTestingModule, ServoyPublicModule], }) .compileComponents(); })); @@ -41,7 +41,7 @@ describe('SvyButton', () => { expect( component.servoyApi.getMarkupId ).toHaveBeenCalled(); }); - it( 'should render html', () => { + it( 'should render html', async () => { servoyApi.trustAsHtml.and.returnValue( true ); component.dataProviderID = '
hallo
'; runOnPushChangeDetection(fixture); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.spec.ts index 05776ced64..5ee8f9aaae 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.spec.ts @@ -1,19 +1,20 @@ import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; -import { LocaleService, I18NProvider, Format} from '../../ngclient/servoy_public'; +import { Format} from 'servoy-public'; import { By, BrowserModule } from '@angular/platform-browser'; import { ServoyDefaultCalendar } from './calendar'; import { OwlDateTimeIntl, OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { Renderer2 } from '@angular/core'; -import { SabloService } from '../../sablo/sablo.service'; import { FormsModule } from '@angular/forms'; const moment = require('moment'); import { runOnPushChangeDetection } from '../../testing'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe('ServoyDefaultCalendar', () => { let component: ServoyDefaultCalendar; @@ -31,9 +32,9 @@ describe('ServoyDefaultCalendar', () => { TestBed.configureTestingModule({ declarations: [ServoyDefaultCalendar], - imports: [BrowserModule, SabloModule, ServoyPublicModule, OwlDateTimeModule, FormsModule, OwlNativeDateTimeModule], + imports: [ServoyTestingModule, BrowserModule, ServoyPublicModule, OwlDateTimeModule, FormsModule, OwlNativeDateTimeModule], providers: [Renderer2, FormsModule, { provide: LocaleService, useValue: {getLocale: () => 'en' } }, { provide: I18NProvider, useValue: i18nProvider }, - OwlDateTimeIntl, SabloService] + OwlDateTimeIntl] }).compileComponents(); }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.ts index 57c722795e..debf97357a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/calendar/calendar.ts @@ -1,6 +1,6 @@ import { Component, SimpleChanges, Renderer2, ElementRef, ViewChild, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { LocaleService, FormattingService, I18NProvider } from '../../ngclient/servoy_public'; +import { FormattingService, ServoyPublicService } from 'servoy-public'; import { DateTimeAdapter, OwlDateTimeIntl, OwlDateTimeComponent } from '@danielmoncada/angular-datetime-picker'; @@ -8,7 +8,7 @@ import { ServoyDefaultBaseField } from '../basefield'; import * as moment from 'moment'; import { DOCUMENT } from '@angular/common'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { PickerType } from '@danielmoncada/angular-datetime-picker/lib/date-time/date-time.class'; @Component({ @@ -32,15 +32,14 @@ export class ServoyDefaultCalendar extends ServoyDefaultBaseField, owlDateTimeIntl: OwlDateTimeIntl, @Inject(DOCUMENT) doc: Document, logFactory: LoggerFactory) { super(renderer, cdRef, formattingService, doc); - dateTimeAdapter.setLocale(localeService.getLocale()); - i18nProvider.getI18NMessages('servoy.button.ok', 'servoy.button.cancel').then((val) => { + dateTimeAdapter.setLocale(servoyService.getLocale()); + servoyService.getI18NMessages('servoy.button.ok', 'servoy.button.cancel').then((val) => { if (val['servoy.button.ok']) owlDateTimeIntl.setBtnLabel = val['servoy.button.ok']; if (val['servoy.button.cancel']) owlDateTimeIntl.cancelBtnLabel = val['servoy.button.cancel']; }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.spec.ts index ad4d577944..d7627a8b59 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.spec.ts @@ -1,10 +1,11 @@ import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ServoyDefaultCheck } from './check'; -import {SabloModule} from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { FormattingService, ServoyApi, TooltipService} from '../../ngclient/servoy_public'; + +import { ServoyPublicModule } from 'servoy-public'; +import { FormattingService, ServoyApi, TooltipService} from 'servoy-public'; import {FormsModule} from '@angular/forms'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe('CheckComponent', () => { let component: ServoyDefaultCheck; @@ -15,7 +16,7 @@ describe('CheckComponent', () => { servoyApi = jasmine.createSpyObj('ServoyApi', ['getMarkupId','trustAsHtml','registerComponent','unRegisterComponent']); TestBed.configureTestingModule({ declarations: [ ServoyDefaultCheck ], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.ts index b66baaaca3..fc8a23766b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/check/check.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import { Renderer2, Component, ChangeDetectorRef, SimpleChanges, Input, ViewChild, ElementRef, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyDefaultBaseField } from '../basefield'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.spec.ts index 82ac74df67..12a0589615 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultCheckGroup } from './checkgroup'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { FormattingService, ServoyApi, TooltipService } from '../../ngclient/servoy_public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { FormattingService, ServoyApi, TooltipService } from 'servoy-public'; import {FormsModule} from '@angular/forms'; -import {NotNullOrEmptyPipe} from '../../ngclient/pipes/pipes'; +import {NotNullOrEmptyPipe} from 'servoy-public'; import {By} from '@angular/platform-browser'; import { IValuelist } from '../../sablo/spectypes.service'; @@ -37,7 +37,7 @@ describe('ServoyDefaultCheckGroup', () => { TestBed.configureTestingModule({ declarations: [ServoyDefaultCheckGroup,ChoiceElementDirective], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [NotNullOrEmptyPipe, FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.ts index 46045d8400..ddf1126ee4 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/checkgroup/checkgroup.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, Output, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyDefaultBaseChoice } from '../basechoice'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.spec.ts index e748cca1e5..25510e5d00 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultCombobox } from './combobox'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { Format, FormattingService, ServoyApi, TooltipService } from '../../ngclient/servoy_public'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { Format, FormattingService, ServoyApi, TooltipService } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ConverterService } from '../../sablo/converter.service'; @@ -14,8 +14,8 @@ import { LoadingIndicatorService } from '../../sablo/util/loading-indicator/load import { SessionStorageService } from '../../sablo/webstorage/sessionstorage.service'; import { ServicesService } from '../../sablo/services.service'; import { WebsocketService } from '../../sablo/websocket.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; -import { LoggerFactory } from '../../sablo/logger.service'; +import { WindowRefService } from 'servoy-public'; +import { LoggerFactory } from 'servoy-public'; import { By } from '@angular/platform-browser'; import { DebugElement, SimpleChange } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -55,9 +55,8 @@ describe('ComboboxComponent', () => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultCombobox], - providers: [ FormattingService, TooltipService, ValuelistConverter, ConverterService, SabloService, SabloDeferHelper, SpecTypesService, - LoggerFactory, WindowRefService, WebsocketService, ServicesService, SessionStorageService, LoadingIndicatorService], - imports: [ServoyPublicModule, SabloModule, NgbModule, FormsModule] + providers: [ ValuelistConverter, ServicesService ], + imports: [ServoyPublicModule, ServoyTestingModule, NgbModule, FormsModule] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.ts index 9413fc639a..6cfbe84196 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/combobox/combobox.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, SimpleChanges, ChangeDetectorRef, ViewChild, HostListener, QueryList, ElementRef, ViewChildren, ChangeDetectionStrategy, Inject } from '@angular/core'; import { NgbDropdownItem } from '@ng-bootstrap/ng-bootstrap'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyDefaultBaseField } from '../basefield'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.spec.ts index 8066b1fec6..c779b63546 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.spec.ts @@ -1,18 +1,19 @@ import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultHtmlarea } from './htmlarea'; -import { LocaleService, FormattingService, ServoyApi, TooltipService, SvyUtilsService } from '../../ngclient/servoy_public'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, ServoyApi, TooltipService } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { FormsModule } from '@angular/forms'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ApplicationService } from '../../ngclient/services/application.service'; import {HttpClientModule} from '@angular/common/http'; import { ServoyService } from '../../ngclient/servoy.service'; import { ClientFunctionService } from '../../ngclient/services/clientfunction.service'; import { ViewportService } from '../../ngclient/services/viewport.service'; import { ServerDataService } from '../../ngclient//services/serverdata.service'; -import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { FormService } from '../../ngclient/form.service'; import { EditorModule, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; describe('HtmlareaComponent', () => { let component: ServoyDefaultHtmlarea; @@ -24,9 +25,9 @@ describe('HtmlareaComponent', () => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultHtmlarea], - imports: [EditorModule, SabloModule, FormsModule, HttpClientModule, ServoyPublicModule], + imports: [EditorModule, ServoyTestingModule, FormsModule, HttpClientModule, ServoyPublicModule], providers: [FormattingService, TooltipService, { provide: LocaleService, useValue: {getLocale: () => 'en' } }, ServoyService,ClientFunctionService, - , I18NProvider, SvyUtilsService, FormService, { provide:ServerDataService, useValue: {init: ()=>{}}} , ViewportService, ApplicationService, + , I18NProvider, FormService, { provide:ServerDataService, useValue: {init: ()=>{}}} , ViewportService, ApplicationService, { provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' }] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.ts index 7c97e0ec29..5ddf5c7b2b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlarea/htmlarea.ts @@ -1,6 +1,6 @@ import { Component, Input, ChangeDetectorRef, Renderer2, SimpleChanges, ViewChild, ChangeDetectionStrategy, Inject } from '@angular/core'; import { ServoyDefaultBaseField } from '../basefield'; -import { LocaleService, FormattingService, PropertyUtils } from '../../ngclient/servoy_public'; +import { FormattingService, PropertyUtils, ServoyPublicService } from 'servoy-public'; import { ApplicationService } from '../../ngclient/services/application.service'; import { DOCUMENT } from '@angular/common'; import tinymce from 'tinymce'; @@ -25,7 +25,7 @@ export class ServoyDefaultHtmlarea extends ServoyDefaultBaseField { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultHTMLView], - imports: [SabloModule, ServoyPublicModule ], + imports: [ServoyTestingModule, ServoyPublicModule ], providers: [FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlview/htmlview.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlview/htmlview.ts index a4798d95c4..7715d87235 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlview/htmlview.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/htmlview/htmlview.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy, Inject} from '@angular/core'; -import {FormattingService} from '../../ngclient/servoy_public'; +import {FormattingService} from 'servoy-public'; import {ServoyDefaultBaseField} from '../basefield'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.spec.ts index 50dd8deaf9..31f5e93cb7 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.spec.ts @@ -1,13 +1,14 @@ import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ServoyDefaultImageMedia } from './imagemedia'; import { ServoyService } from '../../ngclient/servoy.service'; +import { LocaleService } from '../../ngclient/locale.service'; import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; -import { FormattingService, TooltipService, SvyUtilsService, ServoyApi, LocaleService} from '../../ngclient/servoy_public'; -import { UploadDirective } from '../../ngclient/utils/upload.directive'; -import { DebugElement, NgModule } from '@angular/core'; +import { FormattingService, TooltipService, ServoyApi} from 'servoy-public'; +import { UploadDirective } from 'servoy-public'; +import { DebugElement } from '@angular/core'; import { ApplicationService } from '../../ngclient/services/application.service'; import { By } from '@angular/platform-browser'; import { ViewportService } from '../../ngclient/services/viewport.service'; @@ -23,14 +24,14 @@ describe('ServoyDefaultImageMedia', () => { beforeEach(() => { - applicationService = jasmine.createSpyObj('ApplicationService', ['showFileOpenDialog']); + applicationService = jasmine.createSpyObj('ApplicationService', ['showFileOpenDialog', 'generateUploadUrl']); servoyApi = jasmine.createSpyObj('ServoyApi', ['getMarkupId','trustAsHtml', 'getFormName','registerComponent','unRegisterComponent']); TestBed.configureTestingModule({ declarations: [ ServoyDefaultImageMedia, UploadDirective], - imports: [SabloModule, ServoyPublicModule], + imports: [ServoyTestingModule, ServoyPublicModule], providers: [FormattingService, TooltipService, ClientFunctionService, { provide: ApplicationService, useValue: applicationService}, - ServoyService, I18NProvider, SvyUtilsService, {provide: ServoyApi, useValue: servoyApi}, + ServoyService, I18NProvider, {provide: ServoyApi, useValue: servoyApi}, ViewportService, FormService , { provide: LocaleService, useValue: {getLocale: () => 'en' }}], }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.ts index 4bae32f21b..3a6e767209 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/imagemedia/imagemedia.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, SimpleChanges, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyDefaultBaseField } from '../basefield'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/label/label.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/label/label.spec.ts index ed28fd7981..676ee1def6 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/label/label.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/label/label.spec.ts @@ -3,10 +3,9 @@ import {SimpleChange} from '@angular/core'; import { By } from '@angular/platform-browser'; import { ServoyDefaultLabel } from './label'; -import { TooltipService, ComponentContributor, ServoyApi, FormattingService} from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; - +import { TooltipService, ComponentContributor, ServoyApi, FormattingService} from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { runOnPushChangeDetection } from '../../testing'; describe( 'SvLabel', () => { @@ -20,7 +19,7 @@ describe( 'SvLabel', () => { declarations: [ServoyDefaultLabel], providers: [TooltipService, FormattingService, ComponentContributor], imports: [ - SabloModule, ServoyPublicModule], + ServoyTestingModule, ServoyPublicModule], } ) .compileComponents(); } ) ); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.spec.ts index 28ffb55567..ebbdbffbcf 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed, fakeAsync, waitForAsync } from '@angular/core/testing'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ServoyDefaultListBox } from './listbox'; -import { FormattingService, TooltipService, ServoyApi} from '../../ngclient/servoy_public'; +import { FormattingService, TooltipService, ServoyApi} from 'servoy-public'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; @@ -37,7 +37,7 @@ describe('ServoyDefaultListBox', () => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultListBox], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.ts index b9f16ff4fc..65b2f12f74 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/listbox/listbox.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, Input, ChangeDetectorRef, SimpleChanges, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyDefaultBaseField } from '../basefield'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.spec.ts index 07215ea5a5..5cab0dfbbc 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.spec.ts @@ -1,13 +1,13 @@ import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultPassword } from './password'; -import { SabloModule } from '../../sablo/sablo.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { FormsModule } from '@angular/forms'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { FormattingService, ServoyApi, TooltipService} from '../../ngclient/servoy_public'; +import { ServoyPublicModule } from 'servoy-public'; +import { FormattingService, ServoyApi, TooltipService} from 'servoy-public'; import { DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { TooltipDirective } from '../../ngclient/tooltip/tooltip.directive'; +import { TooltipDirective } from 'servoy-public'; import { runOnPushChangeDetection } from '../../testing'; @@ -22,7 +22,7 @@ describe('PasswordComponent', () => { servoyApi = jasmine.createSpyObj('ServoyApi', ['getMarkupId','trustAsHtml','registerComponent','unRegisterComponent']); TestBed.configureTestingModule({ declarations: [ServoyDefaultPassword, TooltipDirective], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.ts index 93e85374bf..7e6e34d977 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/password/password.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import {Component, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy, Inject} from '@angular/core'; -import {FormattingService} from '../../ngclient/servoy_public'; +import {FormattingService} from 'servoy-public'; import {ServoyDefaultBaseField} from '../basefield'; @Component({ selector: 'servoydefault-password', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radio/radio.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radio/radio.ts index 1185985f09..40e2907313 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radio/radio.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radio/radio.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Renderer2, Component, ViewChild, ElementRef, ChangeDetectorRef, SimpleChanges, Input, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { FormattingService } from '../../ngclient/servoy_public'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { FormattingService } from 'servoy-public'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { ServoyDefaultBaseField } from '../basefield'; @Component( { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.spec.ts index f689a9854e..9b4b6593d9 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.spec.ts @@ -1,13 +1,13 @@ import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultRadiogroup } from './radiogroup'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; import { FormsModule } from '@angular/forms'; -import { FormattingService, TooltipService } from '../../ngclient/servoy_public'; +import { FormattingService, TooltipService } from 'servoy-public'; import { IValuelist } from '../../sablo/spectypes.service'; import { By } from '@angular/platform-browser'; -import { NotNullOrEmptyPipe } from '../../ngclient/pipes/pipes'; +import { NotNullOrEmptyPipe } from 'servoy-public'; import { DebugElement } from '@angular/core'; import {ChoiceElementDirective} from '../basechoice'; @@ -37,7 +37,7 @@ describe('ServoyDefaultRadiogroup', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultRadiogroup,ChoiceElementDirective], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [NotNullOrEmptyPipe, FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.ts index addce1959f..70f7ae25ec 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/radiogroup/radiogroup.ts @@ -1,6 +1,6 @@ import { Component, OnInit, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; import { ServoyDefaultBaseChoice } from '../basechoice'; -import { FormattingService, PropertyUtils } from '../../ngclient/servoy_public'; +import { FormattingService, PropertyUtils } from 'servoy-public'; import { DOCUMENT } from '@angular/common'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/rectangle/rectangle.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/rectangle/rectangle.spec.ts index fd727482f9..290bd0fea2 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/rectangle/rectangle.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/rectangle/rectangle.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultRectangle } from './rectangle'; -import {SabloModule} from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; import {FormsModule} from '@angular/forms'; -import {ServoyApi,TooltipService,FormattingService} from '../../ngclient/servoy_public'; +import {ServoyApi,TooltipService,FormattingService} from 'servoy-public'; import { SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; describe('ServoyDefaultRectangle', () => { @@ -18,7 +18,7 @@ describe('ServoyDefaultRectangle', () => { servoyApi = jasmine.createSpyObj('ServoyApi', ['getMarkupId','trustAsHtml','registerComponent','unRegisterComponent']); TestBed.configureTestingModule({ declarations: [ ServoyDefaultRectangle ], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/servoydefault.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/servoydefault.module.ts index cf8bc1f216..4ae566c183 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/servoydefault.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/servoydefault.module.ts @@ -32,19 +32,17 @@ import {ServoyDefaultSpinner} from './spinner/spinner'; import {ChoiceElementDirective} from './basechoice'; import { SabloModule } from '../sablo/sablo.module'; -import { ServoyPublicModule } from '../ngclient/servoy_public.module'; - -import { FormattingService, I18NProvider} from '../ngclient/servoy_public'; +import { ServoyPublicModule } from 'servoy-public'; import { OwlDateTimeModule} from '@danielmoncada/angular-datetime-picker'; import { OwlMomentDateTimeModule} from '@danielmoncada/angular-datetime-picker'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { UploadDirective } from '../ngclient/utils/upload.directive'; import { Select2Module } from 'ng-select2-component'; import { SpecTypesService } from '../sablo/spectypes.service'; import { Tab } from './tabpanel/basetabpanel'; import { EditorModule , TINYMCE_SCRIPT_SRC} from '@tinymce/tinymce-angular'; +import { I18NProvider } from '../ngclient/services/i18n_provider.service'; @NgModule({ declarations: [ @@ -71,8 +69,7 @@ import { EditorModule , TINYMCE_SCRIPT_SRC} from '@tinymce/tinymce-angular'; ServoyDefaultImageMedia, ChoiceElementDirective, BGSplitter, - BGPane, - UploadDirective + BGPane ], imports: [ FormsModule, @@ -111,7 +108,6 @@ import { EditorModule , TINYMCE_SCRIPT_SRC} from '@tinymce/tinymce-angular'; ], providers: [ - FormattingService, I18NProvider, { provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' } ], @@ -119,7 +115,7 @@ import { EditorModule , TINYMCE_SCRIPT_SRC} from '@tinymce/tinymce-angular'; CUSTOM_ELEMENTS_SCHEMA ] }) -export class ServoyDefaultComponentsModule { +export class ServoyDefaultComponentsModule { constructor( specTypesService: SpecTypesService ) { specTypesService.registerType('servoydefault-tabpanel.tab', Tab); specTypesService.registerType('servoydefault-splitpane.tab', Tab); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.spec.ts index e72307f367..c9011f8e83 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultSpinner } from './spinner'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { FormattingService, ServoyApi, TooltipService } from '../../ngclient/servoy_public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; +import { FormattingService, ServoyApi, TooltipService } from 'servoy-public'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { IValuelist } from '../../sablo/spectypes.service'; @@ -35,7 +35,7 @@ describe('ServoyDefaultCheckGroup', () => { TestBed.configureTestingModule({ declarations: [ServoyDefaultSpinner], - imports: [SabloModule, FormsModule, ServoyPublicModule], + imports: [ServoyTestingModule, FormsModule, ServoyPublicModule], providers: [FormattingService, TooltipService] }).compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.ts index 0d7806d223..4c6ab5d365 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/spinner/spinner.ts @@ -1,6 +1,6 @@ import { Component, Renderer2, SimpleChanges, ChangeDetectorRef, ElementRef, ViewChild, ChangeDetectionStrategy, Inject } from '@angular/core'; import { ServoyDefaultBaseField } from '../basefield'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { DOCUMENT } from '@angular/common'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.spec.ts index 6bbbac5ad3..fe657fa462 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.spec.ts @@ -1,11 +1,13 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultSplitpane } from './splitpane'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { BGSplitter } from './bg_splitter/bg_splitter.component'; import { BGPane } from './bg_splitter/bg_pane.component'; -import { SabloModule } from '../../sablo/sablo.module'; -import { FormattingService, I18NProvider, LocaleService, TooltipService } from '../../ngclient/servoy_public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { FormattingService, TooltipService } from 'servoy-public'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; describe('ServoyDefaultSplitpane', () => { let component: ServoyDefaultSplitpane; @@ -14,7 +16,7 @@ describe('ServoyDefaultSplitpane', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultSplitpane, BGPane, BGSplitter ], - imports: [SabloModule, ServoyPublicModule], + imports: [ServoyTestingModule, ServoyPublicModule], providers: [I18NProvider, FormattingService, TooltipService, LocaleService ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.ts index 7462fbb973..f0d982398d 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/splitpane/splitpane.ts @@ -1,6 +1,6 @@ import { Component, Input, Output, EventEmitter, ContentChild, TemplateRef, ChangeDetectorRef, SimpleChanges, Renderer2, ChangeDetectionStrategy} from '@angular/core'; -import { ServoyApi, ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { Tab } from '../tabpanel/basetabpanel'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/basetabpanel.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/basetabpanel.ts index 0c78154931..aaee3fa290 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/basetabpanel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/basetabpanel.ts @@ -1,12 +1,12 @@ import { Input, ContentChild, TemplateRef, Output, EventEmitter, SimpleChanges, Renderer2, Directive, ChangeDetectorRef } from '@angular/core'; -import { PropertyUtils, ServoyApi, ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { PropertyUtils, ServoyApi, ServoyBaseComponent } from 'servoy-public'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { BaseCustomObject } from '../../sablo/spectypes.service'; -import { LoggerService, LoggerFactory } from '../../sablo/logger.service'; +import { LoggerService, LoggerFactory } from 'servoy-public'; import { ServoyDefaultBaseComponent } from '../basecomponent'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.spec.ts index f9cc5a811a..e3f44177f0 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.spec.ts @@ -1,17 +1,17 @@ -import { Directive, Input, SimpleChanges, SimpleChange } from '@angular/core'; +import { SimpleChanges, SimpleChange } from '@angular/core'; import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { ServoyDefaultTablesspanel } from './tablesspanel'; import { Tab } from './basetabpanel'; -import { ServoyApi } from '../../ngclient/servoy_public'; +import { ServoyApi } from 'servoy-public'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { WindowRefService } from '../../sablo/util/windowref.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { WindowRefService } from 'servoy-public'; +import { LoggerFactory } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; describe( 'ServoyDefaultTabpanel', () => { let servoyApi; @@ -24,7 +24,7 @@ describe( 'ServoyDefaultTabpanel', () => { declarations: [ ServoyDefaultTablesspanel ], - imports: [NgbModule, SabloModule, ServoyPublicModule, SabloModule], + imports: [NgbModule, ServoyTestingModule, ServoyPublicModule, ServoyTestingModule], providers: [WindowRefService, LoggerFactory] } ).compileComponents(); } ); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.ts index ef112eb961..725c3c7288 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tablesspanel.ts @@ -2,9 +2,9 @@ import { Component, Renderer2,ChangeDetectorRef, ChangeDetectionStrategy} from ' import {BaseTabpanel,Tab} from './basetabpanel'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; -import { LoggerFactory } from '../../sablo/logger.service'; +import { LoggerFactory } from 'servoy-public'; @Component( { selector: 'servoydefault-tablesspanel', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.spec.ts index b0378623ca..8dcbb1216b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.spec.ts @@ -1,16 +1,16 @@ -import { Directive, Input, SimpleChanges, SimpleChange } from '@angular/core'; +import { SimpleChanges, SimpleChange } from '@angular/core'; import { TestBed, fakeAsync, tick, waitForAsync, discardPeriodicTasks } from '@angular/core/testing'; import { ServoyDefaultTabpanel } from './tabpanel'; import { Tab } from './basetabpanel'; -import { ServoyApi } from '../../ngclient/servoy_public'; +import { ServoyApi, ServoyPublicModule } from 'servoy-public'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { WindowRefService } from '../../sablo/util/windowref.service'; -import { LoggerFactory } from '../../sablo/logger.service'; -import { SabloModule } from '../../sablo/sablo.module'; +import { WindowRefService } from 'servoy-public'; +import { LoggerFactory } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; describe( 'ServoyDefaultTabpanel', () => { let servoyApi; @@ -23,7 +23,7 @@ describe( 'ServoyDefaultTabpanel', () => { declarations: [ ServoyDefaultTabpanel ], - imports: [NgbModule, SabloModule], + imports: [NgbModule, ServoyTestingModule, ServoyPublicModule], providers: [WindowRefService, LoggerFactory] } ).compileComponents(); } ) ); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.ts index ca164d9e21..5a41f0d182 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/tabpanel/tabpanel.ts @@ -2,8 +2,8 @@ import { Component, Renderer2 , ChangeDetectorRef, ChangeDetectionStrategy} from import { BaseTabpanel, Tab } from './basetabpanel'; -import { WindowRefService } from '../../sablo/util/windowref.service'; -import { LoggerFactory } from '../../sablo/logger.service'; +import { WindowRefService } from 'servoy-public'; +import { LoggerFactory } from 'servoy-public'; import { NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.spec.ts index 660af7235d..e867bfcbac 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ServoyDefaultTextArea } from './textarea'; -import { FormattingService, TooltipService} from '../../ngclient/servoy_public'; -import { StartEditDirective } from '../../ngclient/utils/startedit.directive'; +import { FormattingService, TooltipService} from 'servoy-public'; +import { StartEditDirective } from 'servoy-public'; import { DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; @@ -20,7 +20,7 @@ describe('ServoyDefaultTextArea', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultTextArea, StartEditDirective], - imports: [SabloModule, ServoyPublicModule, FormsModule], + imports: [ServoyTestingModule, ServoyPublicModule, FormsModule], providers: [FormattingService, TooltipService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.ts index 7d47025e28..9c9048de3f 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textarea/textarea.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy, Inject} from '@angular/core'; -import {FormattingService} from '../../ngclient/servoy_public'; +import {FormattingService} from 'servoy-public'; import {ServoyDefaultBaseField} from '../basefield'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.spec.ts index 15cb9adb18..f412200cca 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.spec.ts @@ -1,13 +1,14 @@ import { async, ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule, } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule, } from 'servoy-public'; import { ServoyDefaultTextField } from './textfield'; -import { FormattingService, TooltipService, LocaleService, I18NProvider, Format} from '../../ngclient/servoy_public'; +import { FormattingService, TooltipService, Format} from 'servoy-public'; import { By } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; - +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { runOnPushChangeDetection } from '../../testing'; describe('ServoyDefaultTextField', () => { @@ -18,7 +19,7 @@ describe('ServoyDefaultTextField', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultTextField], - imports: [SabloModule, ServoyPublicModule, FormsModule], + imports: [ServoyTestingModule, ServoyPublicModule, FormsModule], providers: [I18NProvider, FormattingService, TooltipService, LocaleService ] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.ts index cc9edca78a..688ac91f3a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/textfield/textfield.ts @@ -1,7 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy, Inject} from '@angular/core'; -import {FormattingService} from '../../ngclient/servoy_public'; +import {FormattingService} from 'servoy-public'; import {ServoyDefaultBaseField} from '../basefield'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.spec.ts index fcb3d3b89c..43e22c0ca7 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.spec.ts @@ -1,9 +1,8 @@ import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; -import { TestScheduler, } from 'rxjs/testing'; import { ServoyDefaultTypeahead } from './typeahead'; -import { FormattingService, TooltipService, ServoyApi, Format} from '../../ngclient/servoy_public'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, TooltipService, ServoyApi, Format} from 'servoy-public'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import {IValuelist} from '../../sablo/spectypes.service'; import { of } from 'rxjs'; @@ -38,7 +37,7 @@ describe('TypeaheadComponent', () => { TestBed.configureTestingModule({ declarations: [ ServoyDefaultTypeahead ], providers: [ FormattingService , TooltipService], - imports: [ServoyPublicModule, SabloModule, NgbModule, FormsModule] + imports: [ServoyPublicModule, ServoyTestingModule, NgbModule, FormsModule] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.ts index d0f23da104..767a363f08 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoydefault/typeahead/typeahead.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectorRef, Renderer2, ViewChild, SimpleChanges, Host import { Observable, merge, Subject, of } from 'rxjs'; import { ServoyDefaultBaseField } from '../basefield'; import { NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { debounceTime, distinctUntilChanged, filter, switchMap } from 'rxjs/operators'; import { DOCUMENT } from '@angular/common'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.spec.ts index 22ad664eb5..1ab23600cd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.spec.ts @@ -3,11 +3,12 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyExtraCollapse } from './collapse'; import { FormService } from './../../ngclient/form.service'; import { ServoyService } from '../../ngclient/servoy.service'; -import { I18NProvider, LocaleService } from '../../ngclient/servoy_public'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { ClientFunctionService } from '../../ngclient/services/clientfunction.service'; import { ViewportService } from '../../ngclient/services/viewport.service'; -import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { ServoyPublicModule } from 'servoy-public'; describe('ServoyExtraCollapse', () => { let component: ServoyExtraCollapse; @@ -16,7 +17,7 @@ describe('ServoyExtraCollapse', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ ServoyExtraCollapse ], - imports: [SabloModule, ServoyPublicModule], + imports: [ServoyTestingModule, ServoyPublicModule], providers: [FormService, ServoyService, LocaleService, I18NProvider, ClientFunctionService, ViewportService] }) .compileComponents(); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.ts index 0c10d4c048..cd623809fb 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/collapse/collapse.ts @@ -1,5 +1,5 @@ import { Component, Renderer2, SimpleChanges, ChangeDetectorRef, ChangeDetectionStrategy, Input, TemplateRef, Inject, ContentChild, Output, EventEmitter } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { FormService } from './../../ngclient/form.service'; import { DOCUMENT } from '@angular/common'; import { BaseCustomObject } from '../../sablo/spectypes.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/dbtreeview/dbtreeview.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/dbtreeview/dbtreeview.ts index 1d8f632461..5a81cdf693 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/dbtreeview/dbtreeview.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/dbtreeview/dbtreeview.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostListener, Input, OnDestroy, Renderer2, SimpleChanges, ViewChild } from "@angular/core"; -import { ServoyBaseComponent } from "../../ngclient/basecomponent"; +import { ServoyBaseComponent } from "servoy-public"; import { IActionMapping, ITreeOptions, TreeComponent, TreeNode} from '@circlon/angular-tree-component' -import { LoggerService, LoggerFactory } from "../../sablo/logger.service"; +import { LoggerService, LoggerFactory } from "servoy-public"; import { ApplicationService } from "../../ngclient/services/application.service"; import { ServoyService } from "../../ngclient/servoy.service"; import { ITreeNode } from "@circlon/angular-tree-component/lib/defs/api"; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/fileupload/fileupload.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/fileupload/fileupload.ts index 58f55a4979..4ca9a71147 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/fileupload/fileupload.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/fileupload/fileupload.ts @@ -1,8 +1,8 @@ import { Component, SimpleChanges, Input, Renderer2, EventEmitter, Output, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { ServoyBaseComponent, SvyUtilsService } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent, ServoyPublicService } from 'servoy-public'; import { FileUploader } from 'ng2-file-upload'; import { DOCUMENT } from '@angular/common'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; @Component( { selector: 'servoyextra-fileupload', @@ -46,7 +46,7 @@ export class ServoyExtraFileUpload extends ServoyBaseComponent { private ready = true; private log: LoggerService; - constructor( renderer: Renderer2, cdRef: ChangeDetectorRef, private utilsService: SvyUtilsService, @Inject(DOCUMENT) private doc: Document , logFactory: LoggerFactory) { + constructor( renderer: Renderer2, cdRef: ChangeDetectorRef, private servoyService: ServoyPublicService, @Inject(DOCUMENT) private doc: Document , logFactory: LoggerFactory) { super(renderer, cdRef); this.log = logFactory.getLogger('FileUpload'); } @@ -65,8 +65,8 @@ export class ServoyExtraFileUpload extends ServoyBaseComponent { if (this.multiFileUpload && ! this.onFileUploadedMethodID) { this.log.warn('Multifile upload without onFileUploaded Method isn\'t supported. To upload multi file start using onFileUploaded Method'); } - const url = this.onFileUploadedMethodID ? this.utilsService.generateUploadUrl( this.servoyApi.getFormName(), this.name, 'onFileUploadedMethodID' ): - this.utilsService.generateUploadUrl( this.servoyApi.getFormName(), this.name, 'dataProviderID' ); + const url = this.onFileUploadedMethodID ? this.servoyService.generateUploadUrl( this.servoyApi.getFormName(), this.name, 'onFileUploadedMethodID' ): + this.servoyService.generateUploadUrl( this.servoyApi.getFormName(), this.name, 'dataProviderID' ); if (!this.multiFileUpload) this.uploader = new FileUploader( { url, filters: [{name:'multi', fn: (): boolean => { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.spec.ts index 4a61ade746..f349d6f3e2 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.spec.ts @@ -1,16 +1,17 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyExtraHtmlarea } from './htmlarea'; -import { LocaleService, FormattingService, ServoyApi, TooltipService, SvyUtilsService } from '../../ngclient/servoy_public'; -import { SabloModule } from '../../sablo/sablo.module'; +import { FormattingService, ServoyApi, TooltipService } from 'servoy-public'; +import { ServoyTestingModule } from '../../testing/servoytesting.module'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { FormsModule } from '@angular/forms'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { HttpClientModule } from '@angular/common/http'; import { ApplicationService } from '../../ngclient/services/application.service'; import { ServoyService } from '../../ngclient/servoy.service'; import { ClientFunctionService } from '../../ngclient/services/clientfunction.service'; import { ViewportService } from '../../ngclient/services/viewport.service'; import { ServerDataService } from '../../ngclient//services/serverdata.service'; -import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; import { FormService } from '../../ngclient/form.service'; import { EditorModule } from '@tinymce/tinymce-angular'; @@ -24,9 +25,9 @@ describe('HtmlareaComponent', () => { TestBed.configureTestingModule({ declarations: [ ServoyExtraHtmlarea ], - imports: [EditorModule, SabloModule, FormsModule, HttpClientModule, ServoyPublicModule], - providers: [FormattingService, TooltipService, { provide: LocaleService, useValue: {getLocale: () => 'en' } },ServoyService,ClientFunctionService, - ViewportService,I18NProvider, SvyUtilsService, FormService, { provide:ServerDataService, useValue: {init: ()=>{}}}, ApplicationService] + imports: [EditorModule, ServoyTestingModule, FormsModule, HttpClientModule, ServoyPublicModule], + providers: [{ provide: LocaleService, useValue: {getLocale: () => 'en' } },ServoyService,ClientFunctionService, + ViewportService,I18NProvider, FormService, { provide:ServerDataService, useValue: {init: ()=>{}}}, ApplicationService] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.ts index efbfee260b..4b1ee0d878 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/htmlarea/htmlarea.ts @@ -1,5 +1,6 @@ import { Component, SimpleChanges, Input, Renderer2, EventEmitter, Output, ChangeDetectorRef, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { ServoyBaseComponent, PropertyUtils, LocaleService } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent, PropertyUtils } from 'servoy-public'; +import { LocaleService } from '../../ngclient/locale.service'; import tinymce from 'tinymce'; import { ApplicationService } from '../../ngclient/services/application.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/imagelabel/imagelabel.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/imagelabel/imagelabel.ts index c3a4c5c2e7..852cb229e9 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/imagelabel/imagelabel.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/imagelabel/imagelabel.ts @@ -1,5 +1,5 @@ import { Component, SimpleChanges, Input, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; @Component( { selector: 'servoyextra-imagelabel', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/lightboxgallery/lightboxgallery.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/lightboxgallery/lightboxgallery.ts index 7cd063e4af..149fe5eb6b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/lightboxgallery/lightboxgallery.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/lightboxgallery/lightboxgallery.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectorRef, SimpleChanges, Renderer2, Input, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { IFoundset } from '../../sablo/spectypes.service'; import { Lightbox, LightboxConfig } from 'ngx-lightbox'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.spec.ts index 20fab238a4..3754b06373 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { ServoyExtraMultiFileUpload } from './multifileupload'; -import { SvyUtilsService, LocaleService} from '../../ngclient/servoy_public'; import { FormService } from '../../ngclient/form.service'; import { ServoyService } from '../../ngclient/servoy.service'; import { ViewportService } from '../../ngclient/services/viewport.service'; +import { LocaleService } from '../../ngclient/locale.service'; describe('ServoyExtraMultiFileUpload', () => { let component: ServoyExtraMultiFileUpload; @@ -16,7 +16,7 @@ describe('ServoyExtraMultiFileUpload', () => { TestBed.configureTestingModule({ declarations: [ ServoyExtraMultiFileUpload ], imports: [SabloModule, ServoyPublicModule], - providers: [SvyUtilsService, ViewportService, FormService, ServoyService, { provide: LocaleService, useValue: {getLocale: () => 'en' }}] + providers: [ViewportService, FormService, ServoyService, { provide: LocaleService, useValue: {getLocale: () => 'en' }}] }) .compileComponents(); })); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.ts index fb2c4d3d2f..f251cd32d0 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/multifileupload/multifileupload.ts @@ -1,5 +1,5 @@ import { Component, ViewChild, SimpleChanges, Input, Renderer2, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent, SvyUtilsService } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent, ServoyPublicService } from 'servoy-public'; import { UppyConfig, UppyAngularComponent } from 'uppy-angular'; @Component({ @@ -38,7 +38,7 @@ export class ServoyExtraMultiFileUpload extends ServoyBaseComponent = []; - constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, private utilsService: SvyUtilsService) { + constructor(renderer: Renderer2, cdRef: ChangeDetectorRef, private servoyService: ServoyPublicService) { super(renderer, cdRef); } @@ -185,7 +185,7 @@ export class ServoyExtraMultiFileUpload extends ServoyBaseComponent { let component: ServoyExtraSelect2Tokenizer; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/select2tokenizer/select2tokenizer.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/select2tokenizer/select2tokenizer.ts index 28bbfb00bc..76169349f5 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/select2tokenizer/select2tokenizer.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/select2tokenizer/select2tokenizer.ts @@ -1,6 +1,6 @@ import { Component, Renderer2, SimpleChanges, ChangeDetectorRef, ViewChild, Input, Output, EventEmitter, HostListener, ChangeDetectionStrategy, Inject } from '@angular/core'; import { Select2Option, Select2UpdateEvent, Select2 } from 'ng-select2-component'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { IValuelist } from '../../sablo/spectypes.service'; import { DOCUMENT } from '@angular/common'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/servoyextra.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/servoyextra.module.ts index d97228d024..08bd95c0fe 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/servoyextra.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/servoyextra.module.ts @@ -12,7 +12,7 @@ import { ServoyExtraMultiFileUpload } from './multifileupload/multifileupload'; import { ServoyExtraSelect2Tokenizer } from './select2tokenizer/select2tokenizer'; import { ServoyExtraYoutubeVideoEmbedder } from './youtubevideoembedder/youtubevideoembedder'; import { ServoyExtraSidenav } from './sidenav/sidenav'; -import { ServoyPublicModule } from '../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { SabloModule } from '../sablo/sablo.module'; import { ScrollingModule } from '@angular/cdk/scrolling'; import { ResizableModule } from 'angular-resizable-element'; @@ -74,7 +74,7 @@ import { SpecTypesService } from '../sablo/spectypes.service'; TreeModule, EditorModule, AngularTreeGridModule - ], + ], providers: [AsyncPipe, { provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' } ], diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/sidenav/sidenav.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/sidenav/sidenav.ts index 3b3f710492..8fcd55a3b0 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/sidenav/sidenav.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/sidenav/sidenav.ts @@ -1,8 +1,8 @@ import { Component, SimpleChanges, Input, Output, Renderer2, ChangeDetectorRef, ContentChild, TemplateRef, EventEmitter, ViewChild, ElementRef, Inject } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { FormService } from '../../ngclient/form.service'; import { DOCUMENT } from '@angular/common'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; @Component({ selector: 'servoyextra-sidenav', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.spec.ts index b0b5499697..f40d732641 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; import { ServoyExtraSlider } from './slider'; import { NgxSliderModule } from '@angular-slider/ngx-slider'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; describe('ServoyExtraSlider', () => { let component: ServoyExtraSlider; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.ts index 932e7b25ba..cf22305e5c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/slider/slider.ts @@ -1,8 +1,8 @@ import { Component, SimpleChanges, Input, Renderer2, EventEmitter, Output, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { Format, ServoyBaseComponent } from '../../ngclient/servoy_public' +import { Format, ServoyBaseComponent } from 'servoy-public' import { Options, ChangeContext, LabelType } from '@angular-slider/ngx-slider'; -import { FormattingService } from '../../ngclient/servoy_public'; +import { FormattingService } from 'servoy-public'; @Component({ selector: 'servoyextra-slider', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.spec.ts index 8a45fdf2cc..4b23635eab 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angul import { ServoyExtraSpinner } from './spinner'; import { SabloModule } from '../../sablo/sablo.module'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; -import { FormattingService, ServoyApi, TooltipService } from '../../ngclient/servoy_public'; +import { ServoyPublicModule } from 'servoy-public'; +import { FormattingService, ServoyApi, TooltipService } from 'servoy-public'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { IValuelist } from '../../sablo/spectypes.service'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.ts index ce88f0169a..4f65ed60bc 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/spinner/spinner.ts @@ -1,5 +1,5 @@ import { Component, Renderer2, SimpleChanges, ChangeDetectorRef, Input, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core'; -import { Format, FormattingService, ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { Format, FormattingService, ServoyBaseComponent } from 'servoy-public'; import { IValuelist } from '../../sablo/spectypes.service'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.spec.ts index f703faf326..1b22e6d6dd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.spec.ts @@ -1,11 +1,13 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ServoyExtraSplitpane } from './splitpane'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { BGSplitter } from './bg_splitter/bg_splitter.component'; import { BGPane } from './bg_splitter/bg_pane.component'; import { SabloModule } from '../../sablo/sablo.module'; -import { FormattingService, I18NProvider, LocaleService, TooltipService } from '../../ngclient/servoy_public'; +import { FormattingService, TooltipService } from 'servoy-public'; +import { LocaleService } from '../../ngclient/locale.service'; +import { I18NProvider } from '../../ngclient/services/i18n_provider.service'; describe('ServoyExtraSplitpane', () => { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.ts index d1c6f68fe7..fc863e1afd 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/splitpane/splitpane.ts @@ -1,6 +1,6 @@ import { Component, Input, Output, EventEmitter, ContentChild, TemplateRef, ChangeDetectorRef, SimpleChanges, Renderer2, ChangeDetectionStrategy} from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { BaseCustomObject } from '../../sablo/spectypes.service'; @Component( { diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.spec.ts index 9a1067672d..29f802268c 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.spec.ts @@ -7,13 +7,13 @@ import { ViewportService } from '../../ngclient/services/viewport.service'; import { ServoyApi } from '../../ngclient/servoy_api'; import { ConverterService, PropertyContext } from '../../sablo/converter.service'; import { SabloDeferHelper } from '../../sablo/defer.service'; -import { LoggerFactory } from '../../sablo/logger.service'; +import { LoggerFactory, ServoyPublicModule } from 'servoy-public'; import { SabloService } from '../../sablo/sablo.service'; import { ServicesService } from '../../sablo/services.service'; import { SpecTypesService, ViewPortRow } from '../../sablo/spectypes.service'; import { TestabilityService } from '../../sablo/testability.service'; import { LoadingIndicatorService } from '../../sablo/util/loading-indicator/loading-indicator.service'; -import { WindowRefService } from '../../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { SessionStorageService } from '../../sablo/webstorage/sessionstorage.service'; import { ServoyTestingModule } from '../../testing/servoytesting.module'; import { ServoyExtraTable, TableRow } from './table'; @@ -142,8 +142,8 @@ const finishInit = () => { beforeEach( () => { TestBed.configureTestingModule({ declarations: [TestWrapperComponent, ServoyExtraTable, TableRow], - imports: [ServoyTestingModule, ScrollingModule, NgbModule, ResizableModule, SabloModule], - providers: [FoundsetLinkedConverter, FoundsetConverter, ConverterService, SabloService, TestabilityService, SpecTypesService, LoggerFactory, + imports: [ServoyTestingModule, ScrollingModule, NgbModule, ResizableModule, ServoyPublicModule], + providers: [FoundsetLinkedConverter, FoundsetConverter, ConverterService, TestabilityService, SpecTypesService, LoggerFactory, WindowRefService, ServicesService, SessionStorageService, ViewportService, LoadingIndicatorService] }); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.ts index 10f0b14444..c86a33d660 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/table/table.ts @@ -1,7 +1,7 @@ import { Component, ViewChild, Input, Renderer2, ElementRef, OnDestroy, ChangeDetectorRef, ChangeDetectionStrategy, QueryList, ViewChildren, Directive, Inject } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { IFoundset, ViewPortRow } from '../../sablo/spectypes.service'; -import { LoggerFactory, LoggerService } from '../../sablo/logger.service'; +import { LoggerFactory, LoggerService } from 'servoy-public'; import { ResizeEvent } from 'angular-resizable-element'; import { FoundsetChangeEvent } from '../../ngclient/converters/foundset_converter'; import { CdkVirtualScrollViewport, VIRTUAL_SCROLL_STRATEGY } from '@angular/cdk/scrolling'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.spec.ts index 51e854e2bf..9eb342a648 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { ServoyExtraTextfieldGroup } from './textfieldgroup'; -import { FormattingService, ServoyApi, TooltipService } from '../../ngclient/servoy_public'; +import { FormattingService, ServoyApi, TooltipService } from 'servoy-public'; import { SabloModule } from '../../sablo/sablo.module'; import { FormsModule } from '@angular/forms'; -import { ServoyPublicModule } from '../../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { By } from '@angular/platform-browser'; import { HttpClientModule } from '@angular/common/http'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.ts index 7f281d1cfc..826002f2d3 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/textfieldgroup/textfieldgroup.ts @@ -1,5 +1,5 @@ import { Component, ViewChild, SimpleChanges, Input, Renderer2, ElementRef, EventEmitter, Output, OnDestroy, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { ServoyBaseComponent, Format } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent, Format } from 'servoy-public'; @Component( { selector: 'servoyextra-textfieldgroup', diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/treeview/treeview.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/treeview/treeview.ts index 80d9241d5b..c5b05c2c6a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/treeview/treeview.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/treeview/treeview.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Output, SimpleChanges, ViewChild } from '@angular/core'; import { Component, Input } from '@angular/core'; import { AngularTreeGridComponent } from 'angular-tree-grid'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { ServoyExtraTreeviewCellRenderer } from './cellrenderer'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/youtubevideoembedder/youtubevideoembedder.ts b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/youtubevideoembedder/youtubevideoembedder.ts index c42a22900a..3362a51140 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/youtubevideoembedder/youtubevideoembedder.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/servoyextra/youtubevideoembedder/youtubevideoembedder.ts @@ -1,5 +1,5 @@ import { Component, SimpleChanges, Input, Renderer2, ChangeDetectorRef } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; @Component({ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/svychartjs/chart/chart.ts b/com.servoy.eclipse.ngclient.ui/node/src/svychartjs/chart/chart.ts index 9402b2a555..15157c4c97 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/svychartjs/chart/chart.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/svychartjs/chart/chart.ts @@ -1,5 +1,5 @@ import { Component, SimpleChanges, Input, Renderer2, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core'; -import { ServoyBaseComponent } from '../../ngclient/servoy_public'; +import { ServoyBaseComponent } from 'servoy-public'; import { IFoundset } from '../../sablo/spectypes.service'; import { ChartType, ChartOptions, ChartDataSets } from 'chart.js'; import { BaseChartDirective, Label } from 'ng2-charts'; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/decimalkeyconverter.directive.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/testing/decimalkeyconverter.directive.spec.ts similarity index 78% rename from com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/decimalkeyconverter.directive.spec.ts rename to com.servoy.eclipse.ngclient.ui/node/src/testing/decimalkeyconverter.directive.spec.ts index fed7a4a929..d1bd4cc149 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/ngclient/utils/decimalkeyconverter.directive.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/testing/decimalkeyconverter.directive.spec.ts @@ -1,12 +1,10 @@ -import { DecimalkeyconverterDirective } from './decimalkeyconverter.directive'; -import { TestBed, ComponentFixture, fakeAsync, tick, flushMicrotasks, async, waitForAsync, inject } from '@angular/core/testing'; +import { TestBed, ComponentFixture, fakeAsync, tick, waitForAsync, inject } from '@angular/core/testing'; import { Component, Input, ViewChild, ElementRef, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { SabloService } from '../../sablo/sablo.service'; -import { SessionStorageService } from '../../sablo/webstorage/sessionstorage.service'; -import { I18NProvider } from '../services/i18n_provider.service'; -import { ServoyModule } from '../servoy.module'; -import { LocaleService } from '../locale.service'; +import { I18NProvider } from '../ngclient/services/i18n_provider.service'; +import { LocaleService } from '../ngclient/locale.service'; +import { ServoyPublicModule } from 'servoy-public'; +import { ServoyTestingModule } from './servoytesting.module'; @Component({ template: '' @@ -26,10 +24,9 @@ describe('Directive: DecimalKeyConverter', () => { TestBed.configureTestingModule({ declarations: [ TestDecimalKeyConverterComponent, - DecimalkeyconverterDirective ], - imports: [ServoyModule], - providers: [I18NProvider, SessionStorageService, SabloService, LocaleService] + imports: [ServoyTestingModule, ServoyPublicModule], + providers: [I18NProvider, LocaleService] }); fixture = TestBed.createComponent(TestDecimalKeyConverterComponent); component = fixture.componentInstance; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/testing/servoytesting.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/testing/servoytesting.module.ts index 7e35c1983b..5c7e247315 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/testing/servoytesting.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/testing/servoytesting.module.ts @@ -2,13 +2,24 @@ import { Injectable, NgModule, NgZone } from '@angular/core'; import { ConverterService } from '../sablo/converter.service'; import { IDeferedState, SabloDeferHelper } from '../sablo/defer.service'; import { ReconnectingWebSocket } from '../sablo/io/reconnecting.websocket'; -import { LoggerFactory } from '../sablo/logger.service'; +import { LoggerFactory, ServoyPublicService } from 'servoy-public'; import { ServicesService } from '../sablo/services.service'; import { TestabilityService } from '../sablo/testability.service'; -import { IDeferred } from '../sablo/util/deferred'; +import { IDeferred } from 'servoy-public'; import { LoadingIndicatorService } from '../sablo/util/loading-indicator/loading-indicator.service'; -import { WindowRefService } from '../sablo/util/windowref.service'; +import { WindowRefService } from 'servoy-public'; import { WebsocketService, WebsocketSession } from '../sablo/websocket.service'; +import { ServoyPublicServiceImpl } from '../ngclient/services/servoy_public_impl.service'; +import { FormService } from '../ngclient/form.service'; +import { LocaleService } from '../ngclient/locale.service'; +import { ApplicationService } from '../ngclient/services/application.service'; +import { ServoyService } from '../ngclient/servoy.service'; +import { I18NProvider } from '../ngclient/services/i18n_provider.service'; +import { SvyUtilsService } from '../ngclient/utils.service'; +import { SabloModule } from '../sablo/sablo.module'; +import { SabloService } from '../sablo/sablo.service'; +import { SessionStorageService } from '../sablo/webstorage/sessionstorage.service'; +import { WebStorageModule } from '../sablo/webstorage/webstorage.module'; class TestDeferred implements IDeferred { @@ -45,12 +56,22 @@ export class TestWebsocketService extends WebsocketService { } } +@Injectable() +export class TestSabloService extends SabloService { + constructor(private wService: WebsocketService, sessionStorage: SessionStorageService, converterService: ConverterService, + windowRefService: WindowRefService, logFactory: LoggerFactory) { + super(wService, sessionStorage, converterService, windowRefService, logFactory); + sessionStorage.remove('svy_session_lock'); + } +} + @NgModule({ declarations: [ ], imports: [ - + WebStorageModule, + SabloModule ], exports: [ @@ -58,7 +79,13 @@ export class TestWebsocketService extends WebsocketService { ], providers: [ { provide: SabloDeferHelper, useClass: TestSabloDeferHelper }, - { provide: WebsocketService, useClass: TestWebsocketService } + { provide: WebsocketService, useClass: TestWebsocketService }, + { provide: SabloService, useClass: TestSabloService }, + { provide: FormService, useValue: {} }, + { provide: ApplicationService, useValue: {} }, + { provide: ServoyService, useValue: {} }, + ServoyPublicServiceImpl, { provide: ServoyPublicService, useExisting: ServoyPublicServiceImpl }, + LocaleService, I18NProvider, SvyUtilsService ], schemas: [ diff --git a/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.app.json b/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.app.json index ff60c2172c..867e24afbb 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.app.json +++ b/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.app.json @@ -2,7 +2,14 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "baseUrl": "./" + "baseUrl": "./", + "paths": { + "servoy-public": [ + "../dist/servoy-public/servoy-public", + "../dist/servoy-public" + ] + } + }, "files": [ "main.ts", diff --git a/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.spec.json b/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.spec.json index c89454bef9..065b4ca18b 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.spec.json +++ b/com.servoy.eclipse.ngclient.ui/node/src/tsconfig.spec.json @@ -6,7 +6,13 @@ "types": [ "jasmine", "node" - ] + ], + "paths": { + "servoy-public": [ + "../dist/servoy-public/servoy-public", + "../dist/servoy-public" + ] + } }, "files": [ "test.ts", diff --git a/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.spec.ts b/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.spec.ts index ed03f35f07..ed680d760a 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.spec.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.spec.ts @@ -3,22 +3,23 @@ import { TestBed } from '@angular/core/testing'; import { WindowService } from './window.service'; import { ShortcutService } from './shortcut.service'; import {PopupMenuService} from './popupmenu.service'; -import { SvyUtilsService, LocaleService } from '../ngclient/servoy_public'; +import { LocaleService } from '../ngclient/locale.service'; import { SabloModule } from '../sablo/sablo.module'; -import { ServoyPublicModule } from '../ngclient/servoy_public.module'; +import { ServoyPublicModule } from 'servoy-public'; import { FormService } from '../ngclient/form.service'; import { ServoyService } from '../ngclient/servoy.service'; import { ViewportService } from '../ngclient/services/viewport.service'; import {ServiceChangeHandler} from '../sablo/util/servicechangehandler'; import { ClientFunctionService } from '../ngclient/services/clientfunction.service'; +import { ServoyTestingModule } from '../testing/servoytesting.module'; describe('WindowService', () => { let service: WindowService; beforeEach(() => { TestBed.configureTestingModule({ - imports: [SabloModule, ServoyPublicModule], - providers:[WindowService, ShortcutService, PopupMenuService, SvyUtilsService,ViewportService, ClientFunctionService, + imports: [ServoyTestingModule, SabloModule, ServoyPublicModule], + providers:[WindowService, ShortcutService, PopupMenuService,ViewportService, ClientFunctionService, FormService, ServoyService, ServiceChangeHandler, { provide: LocaleService, useValue: {getLocale: () => 'en' }}] }); service = TestBed.inject(WindowService); diff --git a/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.ts b/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.ts index 1f42cc93d9..d7d7e8a310 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/window_service/window.service.ts @@ -2,12 +2,10 @@ import { Injectable, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; import { ShortcutService } from './shortcut.service'; -import { SvyUtilsService } from '../ngclient/servoy_public'; -import { ServoyService } from '../ngclient/servoy.service'; import { PopupMenuService, Popup } from './popupmenu.service'; import { ServiceChangeHandler } from '../sablo/util/servicechangehandler'; import { PopupFormService, PopupForm, Callback } from '../ngclient/services/popupform.service'; -import { LoggerFactory, LoggerService } from '../sablo/logger.service'; +import { LoggerFactory, LoggerService, ServoyPublicService } from 'servoy-public'; @Injectable() export class WindowService { @@ -19,8 +17,7 @@ export class WindowService { constructor(private shortcutService: ShortcutService, private popupMenuService: PopupMenuService, - private utils: SvyUtilsService, - private servoyService: ServoyService, + private servoyService: ServoyPublicService, @Inject(DOCUMENT) private doc: Document, private changeHandler: ServiceChangeHandler, private popupFormService: PopupFormService, @@ -62,7 +59,7 @@ export class WindowService { } } - const jsEvent = this.utils.createJSEvent(e, newvalue.shortcut, contextFilter, contextFilterElement); + const jsEvent = this.servoyService.createJSEvent(e, newvalue.shortcut, contextFilter, contextFilterElement); if (!jsEvent) return retValue; diff --git a/com.servoy.eclipse.ngclient.ui/node/src/window_service/windowservice.module.ts b/com.servoy.eclipse.ngclient.ui/node/src/window_service/windowservice.module.ts index a986fc45a7..7bb332b517 100644 --- a/com.servoy.eclipse.ngclient.ui/node/src/window_service/windowservice.module.ts +++ b/com.servoy.eclipse.ngclient.ui/node/src/window_service/windowservice.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from "@angular/core"; +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import {ShortcutService} from './shortcut.service'; import {WindowService} from './window.service'; @@ -10,4 +10,4 @@ import { SabloModule } from '../sablo/sablo.module'; imports: [CommonModule, SabloModule], providers: [WindowService, ShortcutService, PopupMenuService ] }) -export class WindowServiceModule {} \ No newline at end of file +export class WindowServiceModule {} diff --git a/com.servoy.eclipse.ngclient.ui/node/tsconfig.json b/com.servoy.eclipse.ngclient.ui/node/tsconfig.json index d10440de42..11be756d17 100644 --- a/com.servoy.eclipse.ngclient.ui/node/tsconfig.json +++ b/com.servoy.eclipse.ngclient.ui/node/tsconfig.json @@ -1,6 +1,7 @@ { - "compileOnSave": true, + "compileOnSave": false, "compilerOptions": { + "baseUrl": "./", "downlevelIteration": true, "importHelpers": true, "module": "es2020", @@ -19,12 +20,17 @@ "es2018.promise" ], "paths": { - "core-js/es7/reflect": ["../node_modules/core-js/proposals/reflect-metadata"] + "servoy-public": [ + "dist/servoy-public/servoy-public", + "dist/servoy-public" + ] }, "outDir": "./out-tsc/app" }, "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, "strictTemplates": true - }, - "buildOnSave": true + } } diff --git a/com.servoy.eclipse.ngclient.ui/pom.xml b/com.servoy.eclipse.ngclient.ui/pom.xml index 5e73bf8c1f..0c98f63dc4 100644 --- a/com.servoy.eclipse.ngclient.ui/pom.xml +++ b/com.servoy.eclipse.ngclient.ui/pom.xml @@ -1,7 +1,8 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 com.servoy @@ -12,7 +13,7 @@ 2021.6.0.3680_rc eclipse-plugin - test_headless + test_headless @@ -47,7 +48,33 @@ - + + + npm run build_lib + compile + + npm + + + node + run build_lib + + + + + + npm run fix_lib + compile + + npm + + + node + run fix_lib + + + + npm run build compile @@ -60,17 +87,17 @@ - + angular karma test - test + test npm node ${maven.test.skip} - true + true run ${test.script} diff --git a/com.servoy.eclipse.ngclient.ui/src/com/servoy/eclipse/ngclient/ui/IndexPageFilter.java b/com.servoy.eclipse.ngclient.ui/src/com/servoy/eclipse/ngclient/ui/IndexPageFilter.java index 720dae06af..f9bb403305 100644 --- a/com.servoy.eclipse.ngclient.ui/src/com/servoy/eclipse/ngclient/ui/IndexPageFilter.java +++ b/com.servoy.eclipse.ngclient.ui/src/com/servoy/eclipse/ngclient/ui/IndexPageFilter.java @@ -57,7 +57,7 @@ public void init(FilterConfig filterConfig) throws ServletException public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { File projectFolder = Activator.getInstance().getProjectFolder(); - File distFolder = new File(projectFolder, "dist"); + File distFolder = new File(projectFolder, "dist/app"); if (distFolder.exists()) { HttpServletRequest request = (HttpServletRequest)servletRequest;