tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into feature/nested-rule-chains

pull/5673/head
Igor Kulikov 5 years ago
parent
bbd1d8ae86 c628957ec8
commit
9c6732e61b
67 changed files with 10212 additions and 4560 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
  2. 2
      common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
  3. 2
      common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageClient.java
  4. 2
      common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
  5. 2
      common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
  6. 4190
      rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
  7. 16
      ui-ngx/.browserslistrc
  8. 40
      ui-ngx/angular.json
  9. 14
      ui-ngx/extra-webpack.config.js
  10. 160
      ui-ngx/package.json
  11. 4
      ui-ngx/pom.xml
  12. 11
      ui-ngx/src/.browserslistrc
  13. 24
      ui-ngx/src/app/core/http/entity.service.ts
  14. 13
      ui-ngx/src/app/core/http/rule-chain.service.ts
  15. 119
      ui-ngx/src/app/core/services/resources.service.ts
  16. 19
      ui-ngx/src/app/modules/common/modules-map.models.ts
  17. 579
      ui-ngx/src/app/modules/common/modules-map.ts
  18. 6
      ui-ngx/src/app/modules/home/components/dashboard-page/states/states-controller.module.ts
  19. 10
      ui-ngx/src/app/modules/home/components/device/device-credentials.module.ts
  20. 3
      ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
  21. 20
      ui-ngx/src/app/modules/home/components/filter/complex-filter-predicate-dialog.component.ts
  22. 16
      ui-ngx/src/app/modules/home/components/filter/complex-filter-predicate.component.ts
  23. 29
      ui-ngx/src/app/modules/home/components/filter/filter-component.models.ts
  24. 14
      ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.ts
  25. 8
      ui-ngx/src/app/modules/home/components/home-components.module.ts
  26. 4
      ui-ngx/src/app/modules/home/components/profile/device/common/device-profile-common.module.ts
  27. 22
      ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-components.module.ts
  28. 4
      ui-ngx/src/app/modules/home/components/profile/device/snpm/snmp-device-profile-transport.module.ts
  29. 4
      ui-ngx/src/app/modules/home/components/shared-home-components.module.ts
  30. 27
      ui-ngx/src/app/modules/home/components/tokens.ts
  31. 22
      ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.service.ts
  32. 1
      ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
  33. 1
      ui-ngx/src/app/modules/home/components/widget/lib/rpc/led-indicator.component.scss
  34. 1
      ui-ngx/src/app/modules/home/components/widget/lib/rpc/round-switch.component.scss
  35. 3
      ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
  36. 10
      ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
  37. 7
      ui-ngx/src/app/modules/home/components/widget/widget.component.ts
  38. 4
      ui-ngx/src/app/modules/home/home.component.ts
  39. 4
      ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts
  40. 85
      ui-ngx/src/app/modules/home/models/entity/entity-table-component.models.ts
  41. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
  42. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.models.ts
  43. 3
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
  44. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
  45. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulenode.component.ts
  46. 2
      ui-ngx/src/app/shared/components/cheatsheet.component.ts
  47. 13
      ui-ngx/src/app/shared/components/fab-toolbar.component.scss
  48. 3
      ui-ngx/src/app/shared/components/hotkeys.directive.ts
  49. 4
      ui-ngx/src/app/shared/components/json-form/react/json-form-react.tsx
  50. 1
      ui-ngx/src/app/shared/components/json-form/react/json-form.scss
  51. 2
      ui-ngx/src/app/shared/components/json-form/react/styles/thingsboardTheme.ts
  52. 10
      ui-ngx/src/app/shared/components/nav-tree.component.ts
  53. 2
      ui-ngx/src/app/shared/components/popover.component.scss
  54. 2
      ui-ngx/src/app/shared/components/tokens.ts
  55. 3
      ui-ngx/src/app/shared/models/constants.ts
  56. 2
      ui-ngx/src/app/shared/models/rule-node.models.ts
  57. 6
      ui-ngx/src/app/shared/shared.module.ts
  58. 2
      ui-ngx/src/environments/environment.ts
  59. 2
      ui-ngx/src/polyfills.ts
  60. 1
      ui-ngx/src/scss/animations.scss
  61. 4
      ui-ngx/src/scss/mixins.scss
  62. 2
      ui-ngx/src/test.ts
  63. 115
      ui-ngx/src/theme.scss
  64. 2
      ui-ngx/src/tsconfig.app.json
  65. 1493
      ui-ngx/src/typings/leaflet-geoman-extend.d.ts
  66. 21
      ui-ngx/tsconfig.json
  67. 7565
      ui-ngx/yarn.lock

2
common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
View File

@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
import org.thingsboard.server.common.data.id.DashboardId;
@ -39,6 +40,7 @@ import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalIn
@ApiModel
@Data
@ToString(exclude = {"image", "profileDataBytes"})
@EqualsAndHashCode(callSuper = true)
@Slf4j
public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements HasName, HasTenantId, HasOtaPackage {

2
common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
View File

@ -29,7 +29,7 @@ import java.util.UUID;
@Value
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@ToString(callSuper = true, exclude = "image")
public class DeviceProfileInfo extends EntityInfo {
@ApiModelProperty(position = 3, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")

2
common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageClient.java
View File

@ -125,7 +125,7 @@ public class DefaultTbApiUsageClient implements TbApiUsageClient {
}));
if (!report.isEmpty()) {
log.info("Reporting API usage statistics for {} tenants and customers", report.size());
log.debug("Reporting API usage statistics for {} tenants and customers", report.size());
}
}

2
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View File

@ -18,6 +18,7 @@ package org.thingsboard.server.transport.lwm2m.server.client;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.model.ResourceModel;
@ -64,6 +65,7 @@ import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.g
@Slf4j
@EqualsAndHashCode(of = {"endpoint"})
@ToString(of = "endpoint")
public class LwM2mClient implements Serializable {
private static final long serialVersionUID = 8793482946289222623L;

2
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View File

@ -1184,7 +1184,7 @@ public class DefaultTransportService implements TransportService {
@Scheduled(fixedDelayString = "${transport.stats.print-interval-ms:60000}")
public void printStats() {
if (statsEnabled) {
if (statsEnabled && !statsMap.isEmpty()) {
String values = statsMap.entrySet().stream()
.map(kv -> kv.getKey() + " [" + kv.getValue() + "]").collect(Collectors.joining(", "));
log.info("Transport Stats: {}", values);

4190
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
View File

File diff suppressed because one or more lines are too long

16
ui-ngx/.browserslistrc
View File

@ -0,0 +1,16 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support
# You can see what browsers were selected by your queries by running:
# npx browserslist
last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR

40
ui-ngx/angular.json
View File

@ -11,6 +11,9 @@
"schematics": {
"@schematics/angular:component": {
"style": "scss"
},
"@schematics/angular:application": {
"strict": true
}
},
"architect": {
@ -92,6 +95,7 @@
"node_modules/tinycolor2/dist/tinycolor-min.js",
"node_modules/split.js/dist/split.min.js",
"node_modules/systemjs/dist/system.js",
"node_modules/systemjs-babel/dist/systemjs-babel.js",
"node_modules/marked/lib/marked.js",
"node_modules/prismjs/prism.js",
"node_modules/prismjs/components/prism-css.min.js",
@ -99,7 +103,7 @@
"node_modules/prismjs/components/prism-json.min.js",
"node_modules/prismjs/components/prism-javascript.min.js",
"node_modules/prismjs/components/prism-typescript.min.js",
"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.min.js"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
@ -130,7 +134,9 @@
"jquery.terminal",
"tooltipster",
"jstree",
"qrcode"
"qrcode",
"wcwidth",
"leaflet-polylinedecorator"
]
},
"configurations": {
@ -141,7 +147,14 @@
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"optimization": {
"scripts": true,
"styles": {
"minify": true,
"inlineCritical": false
},
"fonts": false
},
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
@ -155,6 +168,21 @@
"maximumError": "12mb"
}
]
},
"development": {
"buildOptimizer": false,
"optimization": {
"scripts": false,
"styles": {
"minify": false,
"inlineCritical": false
},
"fonts": false
},
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
}
},
@ -167,8 +195,12 @@
"configurations": {
"production": {
"browserTarget": "thingsboard:build:production"
},
"development": {
"browserTarget": "thingsboard:build:development"
}
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",

14
ui-ngx/extra-webpack.config.js
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
const CompressionPlugin = require("compression-webpack-plugin");
const TerserPlugin = require("terser-webpack-plugin");
const JavaScriptOptimizerPlugin = require("@angular-devkit/build-angular/src/webpack/plugins/javascript-optimizer-plugin").JavaScriptOptimizerPlugin;
const webpack = require("webpack");
const dirTree = require("directory-tree");
const ngWebpack = require('@ngtools/webpack');
@ -52,7 +52,10 @@ module.exports = (config, options) => {
})
);
config.plugins.push(
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)
new webpack.IgnorePlugin({
resourceRegExp: /^\.\/locale$/,
contextRegExp: /moment$/,
})
);
if (config.mode === 'production') {
@ -62,11 +65,10 @@ module.exports = (config, options) => {
angularCompilerOptions.emitNgModuleScope = true;
config.plugins.splice(index, 1);
config.plugins.push(new ngWebpack.ivy.AngularWebpackPlugin(angularCompilerOptions));
const terserPluginOptions = config.optimization.minimizer[1].options;
delete terserPluginOptions.terserOptions.compress.global_defs.ngJitMode;
terserPluginOptions.terserOptions.compress.side_effects = false;
const javascriptOptimizerOptions = config.optimization.minimizer[1].options;
delete javascriptOptimizerOptions.define.ngJitMode;
config.optimization.minimizer.splice(1, 1);
config.optimization.minimizer.push(new TerserPlugin(terserPluginOptions));
config.optimization.minimizer.push(new JavaScriptOptimizerPlugin(javascriptOptimizerOptions));
}
return config;
};

160
ui-ngx/package.json
View File

@ -3,9 +3,9 @@
"version": "3.3.3",
"scripts": {
"ng": "ng",
"start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --host 0.0.0.0 --open",
"start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",
"build": "ng build",
"build:prod": "ng build --prod --vendor-chunk",
"build:prod": "ng build --configuration production --vendor-chunk",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
@ -13,50 +13,49 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^11.2.14",
"@angular/cdk": "^11.2.13",
"@angular/common": "^11.2.14",
"@angular/compiler": "^11.2.14",
"@angular/core": "^11.2.14",
"@angular/flex-layout": "^11.0.0-beta.33",
"@angular/forms": "^11.2.14",
"@angular/material": "^11.2.13",
"@angular/platform-browser": "^11.2.14",
"@angular/platform-browser-dynamic": "^11.2.14",
"@angular/router": "^11.2.14",
"@angular/animations": "^12.2.13",
"@angular/cdk": "^12.2.13",
"@angular/common": "^12.2.13",
"@angular/compiler": "^12.2.13",
"@angular/core": "^12.2.13",
"@angular/flex-layout": "^12.0.0-beta.35",
"@angular/forms": "^12.2.13",
"@angular/material": "^12.2.13",
"@angular/platform-browser": "^12.2.13",
"@angular/platform-browser-dynamic": "^12.2.13",
"@angular/router": "^12.2.13",
"@auth0/angular-jwt": "^5.0.2",
"@date-io/date-fns": "^2.10.11",
"@date-io/date-fns": "^2.11.0",
"@flowjs/flow.js": "^2.14.1",
"@flowjs/ngx-flow": "~0.4.6",
"@geoman-io/leaflet-geoman-free": "^2.11.3",
"@juggle/resize-observer": "^3.3.1",
"@mat-datetimepicker/core": "~6.0.2",
"@material-ui/core": "^4.11.4",
"@mat-datetimepicker/core": "~7.0.1",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/pickers": "^3.3.10",
"@ngrx/effects": "^10.1.2",
"@ngrx/store": "^10.1.2",
"@ngrx/store-devtools": "^10.1.2",
"@ngrx/effects": "^12.5.1",
"@ngrx/store": "^12.5.1",
"@ngrx/store-devtools": "^12.5.1",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"ace-builds": "^1.4.12",
"angular-gridster2": "~11.2.0",
"angular2-hotkeys": "^2.2.0",
"ace-builds": "^1.4.13",
"angular-gridster2": "~12.1.1",
"angular2-hotkeys": "^2.4.0",
"canvas-gauges": "^2.1.7",
"compass-sass-mixins": "^0.12.7",
"core-js": "^3.18.3",
"date-fns": "^2.21.3",
"core-js": "^3.19.2",
"date-fns": "^2.26.0",
"flot": "git://github.com/thingsboard/flot.git#0.9-work",
"flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master",
"font-awesome": "^4.7.0",
"html2canvas": "^1.0.0-rc.7",
"jquery": "^3.5.1",
"jquery.terminal": "^2.24.0",
"js-beautify": "^1.13.13",
"html2canvas": "^1.3.3",
"jquery": "^3.6.0",
"jquery.terminal": "^2.29.4",
"js-beautify": "^1.14.0",
"json-schema-defaults": "^0.4.0",
"jstree": "^3.3.11",
"jstree": "^3.3.12",
"jstree-bootstrap-theme": "^1.0.1",
"jszip": "^3.6.0",
"jszip": "^3.7.1",
"leaflet": "^1.7.1",
"leaflet-polylinedecorator": "^1.6.0",
"leaflet-providers": "^1.13.0",
@ -65,85 +64,88 @@
"material-design-icons": "^3.0.1",
"messageformat": "^2.3.0",
"moment": "^2.29.1",
"moment-timezone": "^0.5.33",
"mousetrap": "1.6.3",
"ngx-clipboard": "^14.0.1",
"moment-timezone": "^0.5.34",
"ngx-clipboard": "^14.0.2",
"ngx-color-picker": "^11.0.0",
"ngx-daterangepicker-material": "^4.0.1",
"ngx-daterangepicker-material": "^5.0.1",
"ngx-drag-drop": "^2.0.0",
"ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#master",
"ngx-hm-carousel": "^2.0.0-rc.1",
"ngx-markdown": "^11.1.3",
"ngx-sharebuttons": "^8.0.5",
"ngx-translate-messageformat-compiler": "^4.9.0",
"ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#release/1.0.0",
"ngx-hm-carousel": "^2.0.1",
"ngx-markdown": "^12.0.1",
"ngx-sharebuttons": "^9.0.0",
"ngx-translate-messageformat-compiler": "^4.11.0",
"objectpath": "^2.0.0",
"prettier": "^2.1.2",
"prettier": "^2.5.0",
"prop-types": "^15.7.2",
"qrcode": "^1.4.4",
"qrcode": "^1.5.0",
"raphael": "^2.3.0",
"rc-select": "~10.5.1",
"react": "~16.14.0",
"react-ace": "^9.1.4",
"react-dom": "^16.13.1",
"react-dropzone": "^11.2.0",
"rc-select": "~13.2.0",
"react": "~17.0.2",
"react-ace": "^9.5.0",
"react-dom": "^17.0.2",
"react-dropzone": "^11.4.2",
"reactcss": "^1.2.3",
"rxjs": "~6.6.7",
"schema-inspector": "^2.0.1",
"screenfull": "^5.1.0",
"screenfull": "^6.0.0",
"split.js": "^1.6.4",
"systemjs": "0.21.5",
"systemjs": "6.11.0",
"systemjs-babel": "^0.3.1",
"tinycolor2": "^1.4.2",
"tooltipster": "^4.2.8",
"tslib": "^2.2.0",
"tslib": "^2.3.1",
"tv4": "^1.3.0",
"typeface-roboto": "^1.1.13",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/custom-webpack": "~11.1.1",
"@angular-devkit/build-angular": "^0.1102.13",
"@angular/cli": "^11.2.13",
"@angular/compiler-cli": "^11.2.14",
"@angular/language-service": "^11.2.14",
"@ngtools/webpack": "~11.2.13",
"@types/canvas-gauges": "^2.1.2",
"@types/flot": "^0.0.31",
"@types/jasmine": "~3.7.4",
"@types/jasminewd2": "^2.0.9",
"@types/jquery": "^3.5.2",
"@types/js-beautify": "^1.13.1",
"@types/jstree": "^3.3.40",
"@angular-builders/custom-webpack": "~12.1.3",
"@angular-devkit/build-angular": "^12.2.13",
"@angular/cli": "^12.2.13",
"@angular/compiler-cli": "^12.2.13",
"@angular/language-service": "^12.2.13",
"@ngtools/webpack": "~12.2.13",
"@types/canvas-gauges": "^2.1.4",
"@types/flot": "^0.0.32",
"@types/jasmine": "~3.10.2",
"@types/jasminewd2": "^2.0.10",
"@types/jquery": "^3.5.9",
"@types/js-beautify": "^1.13.3",
"@types/jstree": "^3.3.41",
"@types/leaflet": "^1.7.6",
"@types/leaflet-polylinedecorator": "^1.6.1",
"@types/leaflet-providers": "^1.2.1",
"@types/leaflet.gridlayer.googlemutant": "^0.4.6",
"@types/leaflet.markercluster": "^1.4.6",
"@types/lodash": "^4.14.170",
"@types/lodash": "^4.14.177",
"@types/moment-timezone": "^0.5.30",
"@types/mousetrap": "1.6.3",
"@types/raphael": "^2.3.1",
"@types/react": "^16.9.51",
"@types/react-dom": "^16.9.8",
"@types/tinycolor2": "^1.4.2",
"@types/tooltipster": "^0.0.30",
"@types/mousetrap": "^1.6.0",
"@types/node": "~15.14.9",
"@types/raphael": "^2.3.2",
"@types/react": "^17.0.37",
"@types/react-dom": "^17.0.11",
"@types/systemjs": "6.1.1",
"@types/tinycolor2": "^1.4.3",
"@types/tooltipster": "^0.0.31",
"codelyzer": "^6.0.2",
"compression-webpack-plugin": "^6.1.1",
"directory-tree": "^2.2.4",
"jasmine-core": "~3.7.1",
"compression-webpack-plugin": "^9.0.1",
"directory-tree": "^3.0.1",
"jasmine-core": "~3.10.1",
"jasmine-spec-reporter": "~7.0.0",
"karma": "~6.3.2",
"karma": "~6.3.9",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"ngrx-store-freeze": "^0.2.4",
"patch-package": "^6.4.7",
"postinstall-prepare": "^2.0.0",
"protractor": "~7.0.0",
"ts-node": "^9.0.0",
"raw-loader": "^4.0.2",
"ts-node": "^10.4.0",
"tslint": "~6.1.3",
"typescript": "~4.0.3",
"webpack": "^4.46.0"
"typescript": "~4.3.5",
"webpack": "^5.64.4"
},
"resolutions": {
"lodash": "~4.17.21"

4
ui-ngx/pom.xml
View File

@ -56,8 +56,8 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v12.16.1</nodeVersion>
<yarnVersion>v1.22.4</yarnVersion>
<nodeVersion>v16.13.0</nodeVersion>
<yarnVersion>v1.22.17</yarnVersion>
</configuration>
</execution>
<execution>

11
ui-ngx/src/.browserslistrc
View File

@ -1,11 +0,0 @@
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
#
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
> 0.5%
last 2 versions
Firefox ESR
not dead
IE 11

24
ui-ngx/src/app/core/http/entity.service.ts
View File

@ -906,28 +906,12 @@ export class EntityService {
result.entityFilter = deepClone(filter);
return of(result);
case AliasFilterType.relationsQuery:
result.stateEntity = filter.rootStateEntity;
let rootEntityType;
let rootEntityId;
if (result.stateEntity && stateEntityId) {
rootEntityType = stateEntityId.entityType;
rootEntityId = stateEntityId.id;
} else if (!result.stateEntity) {
rootEntityType = filter.rootEntity.entityType;
rootEntityId = filter.rootEntity.id;
}
if (rootEntityType && rootEntityId) {
const relationQueryRootEntityId = this.resolveAliasEntityId(rootEntityType, rootEntityId);
result.entityFilter = deepClone(filter);
result.entityFilter.rootEntity = relationQueryRootEntityId;
return of(result);
} else {
return of(result);
}
case AliasFilterType.assetSearchQuery:
case AliasFilterType.deviceSearchQuery:
case AliasFilterType.edgeSearchQuery:
case AliasFilterType.entityViewSearchQuery:
let rootEntityType;
let rootEntityId;
result.stateEntity = filter.rootStateEntity;
if (result.stateEntity && stateEntityId) {
rootEntityType = stateEntityId.entityType;
@ -937,9 +921,9 @@ export class EntityService {
rootEntityId = filter.rootEntity.id;
}
if (rootEntityType && rootEntityId) {
const searchQueryRootEntityId = this.resolveAliasEntityId(rootEntityType, rootEntityId);
const queryRootEntityId = this.resolveAliasEntityId(rootEntityType, rootEntityId);
result.entityFilter = deepClone(filter);
result.entityFilter.rootEntity = searchQueryRootEntityId;
result.entityFilter.rootEntity = queryRootEntityId;
return of(result);
} else {
return of(result);

13
ui-ngx/src/app/core/http/rule-chain.service.ts
View File

@ -45,6 +45,7 @@ import { EntityType } from '@shared/models/entity-type.models';
import { deepClone, snakeCase } from '@core/utils';
import { DebugRuleNodeEventBody } from '@app/shared/models/event.models';
import { Edge } from '@shared/models/edge.models';
import { IModulesMap } from '@modules/common/modules-map.models';
@Injectable({
providedIn: 'root'
@ -119,14 +120,14 @@ export class RuleChainService {
);
}
public getRuleNodeComponents(ruleNodeConfigResourcesModulesMap: {[key: string]: any}, ruleChainType: RuleChainType, config?: RequestConfig):
public getRuleNodeComponents(modulesMap: IModulesMap, ruleChainType: RuleChainType, config?: RequestConfig):
Observable<Array<RuleNodeComponentDescriptor>> {
if (this.ruleNodeComponentsMap.get(ruleChainType)) {
return of(this.ruleNodeComponentsMap.get(ruleChainType));
} else {
return this.loadRuleNodeComponents(ruleChainType, config).pipe(
mergeMap((components) => {
return this.resolveRuleNodeComponentsUiResources(components, ruleNodeConfigResourcesModulesMap).pipe(
return this.resolveRuleNodeComponentsUiResources(components, modulesMap).pipe(
map((ruleNodeComponents) => {
this.ruleNodeComponentsMap.set(ruleChainType, ruleNodeComponents);
this.ruleNodeComponentsMap.get(ruleChainType).push(ruleChainNodeComponent);
@ -220,11 +221,11 @@ export class RuleChainService {
}
private resolveRuleNodeComponentsUiResources(components: Array<RuleNodeComponentDescriptor>,
ruleNodeConfigResourcesModulesMap: {[key: string]: any}):
modulesMap: IModulesMap):
Observable<Array<RuleNodeComponentDescriptor>> {
const tasks: Observable<RuleNodeComponentDescriptor>[] = [];
components.forEach((component) => {
tasks.push(this.resolveRuleNodeComponentUiResources(component, ruleNodeConfigResourcesModulesMap));
tasks.push(this.resolveRuleNodeComponentUiResources(component, modulesMap));
});
return forkJoin(tasks).pipe(
catchError((err) => {
@ -234,7 +235,7 @@ export class RuleChainService {
}
private resolveRuleNodeComponentUiResources(component: RuleNodeComponentDescriptor,
ruleNodeConfigResourcesModulesMap: {[key: string]: any}):
modulesMap: IModulesMap):
Observable<RuleNodeComponentDescriptor> {
const nodeDefinition = component.configurationDescriptor.nodeDefinition;
const uiResources = nodeDefinition.uiResources;
@ -248,7 +249,7 @@ export class RuleChainService {
});
}
if (moduleResource) {
tasks.push(this.resourcesService.loadFactories(moduleResource, ruleNodeConfigResourcesModulesMap).pipe(
tasks.push(this.resourcesService.loadFactories(moduleResource, modulesMap).pipe(
map((res) => {
if (nodeDefinition.configDirective && nodeDefinition.configDirective.length) {
const selector = snakeCase(nodeDefinition.configDirective, '-');

119
ui-ngx/src/app/core/services/resources.service.ts
View File

@ -26,8 +26,9 @@ import {
import { DOCUMENT } from '@angular/common';
import { forkJoin, Observable, ReplaySubject, throwError } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { IModulesMap } from '@modules/common/modules-map.models';
declare const SystemJS;
declare const System;
@Injectable({
providedIn: 'root'
@ -63,23 +64,19 @@ export class ResourcesService {
return this.loadResourceByType(fileType, url);
}
public loadFactories(url: string, modulesMap: {[key: string]: any}): Observable<ComponentFactory<any>[]> {
public loadFactories(url: string, modulesMap: IModulesMap): Observable<ComponentFactory<any>[]> {
if (this.loadedFactories[url]) {
return this.loadedFactories[url].asObservable();
}
modulesMap.init();
const subject = new ReplaySubject<ComponentFactory<any>[]>();
this.loadedFactories[url] = subject;
if (modulesMap) {
for (const moduleId of Object.keys(modulesMap)) {
SystemJS.set(moduleId, modulesMap[moduleId]);
}
}
SystemJS.import(url).then(
(module) => {
const modules = this.extractNgModules(module);
if (modules.length) {
import('@angular/compiler').then(
() => {
import('@angular/compiler').then(
() => {
System.import(url).then(
(module) => {
const modules = this.extractNgModules(module);
if (modules.length) {
const tasks: Promise<ModuleWithComponentFactories<any>>[] = [];
for (const m of modules) {
tasks.push(this.compiler.compileModuleAndAllComponentsAsync(m));
@ -101,44 +98,41 @@ export class ResourcesService {
(e) => {
this.loadedFactories[url].error(new Error(`Unable to compile module from url: ${url}`));
delete this.loadedFactories[url];
}); }
);
} else {
this.loadedFactories[url].error(new Error(`Module '${url}' doesn't have default export!`));
delete this.loadedFactories[url];
}
},
(e) => {
this.loadedFactories[url].error(new Error(`Unable to load module from url: ${url}`));
delete this.loadedFactories[url];
});
} else {
this.loadedFactories[url].error(new Error(`Module '${url}' doesn't have default export!`));
delete this.loadedFactories[url];
}
},
(e) => {
this.loadedFactories[url].error(new Error(`Unable to load module from url: ${url}`));
delete this.loadedFactories[url];
}
);
}
);
return subject.asObservable();
}
public loadModules(url: string, modulesMap: {[key: string]: any}): Observable<Type<any>[]> {
public loadModules(url: string, modulesMap: IModulesMap): Observable<Type<any>[]> {
if (this.loadedModules[url]) {
return this.loadedModules[url].asObservable();
}
modulesMap.init();
const subject = new ReplaySubject<Type<any>[]>();
this.loadedModules[url] = subject;
if (modulesMap) {
for (const moduleId of Object.keys(modulesMap)) {
SystemJS.set(moduleId, modulesMap[moduleId]);
}
}
SystemJS.import(url).then(
(module) => {
try {
let modules;
try {
modules = this.extractNgModules(module);
} catch (e) {
console.error(e);
}
if (modules && modules.length) {
import('@angular/compiler').then(
() => {
import('@angular/compiler').then(
() => {
System.import(url).then(
(module) => {
try {
let modules;
try {
modules = this.extractNgModules(module);
} catch (e) {
console.error(e);
}
if (modules && modules.length) {
const tasks: Promise<ModuleWithComponentFactories<any>>[] = [];
for (const m of modules) {
tasks.push(this.compiler.compileModuleAndAllComponentsAsync(m));
@ -159,21 +153,21 @@ export class ResourcesService {
this.loadedModules[url].error(new Error(`Unable to compile module from url: ${url}`));
delete this.loadedModules[url];
});
} else {
this.loadedModules[url].error(new Error(`Module '${url}' doesn't have default export or not NgModule!`));
delete this.loadedModules[url];
}
);
} else {
this.loadedModules[url].error(new Error(`Module '${url}' doesn't have default export or not NgModule!`));
} catch (e) {
this.loadedModules[url].error(new Error(`Unable to load module from url: ${url}`));
delete this.loadedModules[url];
}
},
(e) => {
this.loadedModules[url].error(new Error(`Unable to load module from url: ${url}`));
delete this.loadedModules[url];
console.error(`Unable to load module from url: ${url}`, e);
}
} catch (e) {
this.loadedModules[url].error(new Error(`Unable to load module from url: ${url}`));
delete this.loadedModules[url];
}
},
(e) => {
this.loadedModules[url].error(new Error(`Unable to load module from url: ${url}`));
delete this.loadedModules[url];
console.error(`Unable to load module from url: ${url}`, e);
);
}
);
return subject.asObservable();
@ -184,24 +178,23 @@ export class ResourcesService {
let potentialModules = [module];
let currentScanDepth = 0;
while(potentialModules.length && currentScanDepth < 10) {
let newPotentialModules = [];
for (const module of potentialModules) {
if (module && 'ɵmod' in module) {
modules.push(module);
while (potentialModules.length && currentScanDepth < 10) {
const newPotentialModules = [];
for (const potentialModule of potentialModules) {
if (potentialModule && ('ɵmod' in potentialModule)) {
modules.push(potentialModule);
} else {
for (const k of Object.keys(module)) {
if(!this.isPrimitive(module[k])) {
newPotentialModules.push(module[k]);
for (const k of Object.keys(potentialModule)) {
if (!this.isPrimitive(potentialModule[k])) {
newPotentialModules.push(potentialModule[k]);
}
}
}
}
potentialModules = newPotentialModules;
currentScanDepth++;
}
} catch(e) {
} catch (e) {
console.log('Could not load NgModule', e);
}
return modules;

19
ui-ngx/src/app/modules/common/modules-map.models.ts
View File

@ -0,0 +1,19 @@
///
/// Copyright © 2016-2021 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
export interface IModulesMap {
init(): void;
}

579
ui-ngx/src/app/modules/common/modules-map.ts
View File

@ -19,6 +19,9 @@ import * as AngularCore from '@angular/core';
import * as AngularCommon from '@angular/common';
import * as AngularForms from '@angular/forms';
import * as AngularFlexLayout from '@angular/flex-layout';
import * as AngularFlexLayoutFlex from '@angular/flex-layout/flex';
import * as AngularFlexLayoutGrid from '@angular/flex-layout/grid';
import * as AngularFlexLayoutExtended from '@angular/flex-layout/extended';
import * as AngularPlatformBrowser from '@angular/platform-browser';
import * as AngularRouter from '@angular/router';
import * as AngularCdkCoercion from '@angular/cdk/coercion';
@ -62,76 +65,520 @@ import * as AngularMaterialTabs from '@angular/material/tabs';
import * as AngularMaterialToolbar from '@angular/material/toolbar';
import * as AngularMaterialTooltip from '@angular/material/tooltip';
import * as AngularMaterialTree from '@angular/material/tree';
import * as DragDropModule from '@angular/cdk/drag-drop';
import * as HttpClientModule from '@angular/common/http';
import * as NgrxStore from '@ngrx/store';
import * as RxJs from 'rxjs';
import * as RxJsOperators from 'rxjs/operators';
import * as TranslateCore from '@ngx-translate/core';
import * as _moment from 'moment';
import * as TbCore from '@core/public-api';
import * as TbShared from '@shared/public-api';
import * as TbHomeComponents from '@home/components/public-api';
import * as _moment from 'moment';
import * as DragDropModule from "@angular/cdk/drag-drop";
import * as HttpClientModule from "@angular/common/http";
declare const SystemJS;
export const modulesMap: {[key: string]: any} = {
'@angular/animations': SystemJS.newModule(AngularAnimations),
'@angular/core': SystemJS.newModule(AngularCore),
'@angular/common': SystemJS.newModule(AngularCommon),
'@angular/common/http': SystemJS.newModule(HttpClientModule),
'@angular/forms': SystemJS.newModule(AngularForms),
'@angular/flex-layout': SystemJS.newModule(AngularFlexLayout),
'@angular/platform-browser': SystemJS.newModule(AngularPlatformBrowser),
'@angular/router': SystemJS.newModule(AngularRouter),
'@angular/cdk/coercion': SystemJS.newModule(AngularCdkCoercion),
'@angular/cdk/collections': SystemJS.newModule(AngularCdkCollections),
'@angular/cdk/keycodes': SystemJS.newModule(AngularCdkKeycodes),
'@angular/cdk/layout': SystemJS.newModule(AngularCdkLayout),
'@angular/cdk/overlay': SystemJS.newModule(AngularCdkOverlay),
'@angular/cdk/portal': SystemJS.newModule(AngularCdkPortal),
'@angular/cdk/drag-drop': SystemJS.newModule(DragDropModule),
'@angular/material/autocomplete': SystemJS.newModule(AngularMaterialAutocomplete),
'@angular/material/badge': SystemJS.newModule(AngularMaterialBadge),
'@angular/material/bottom-sheet': SystemJS.newModule(AngularMaterialBottomSheet),
'@angular/material/button': SystemJS.newModule(AngularMaterialButton),
'@angular/material/button-toggle': SystemJS.newModule(AngularMaterialButtonToggle),
'@angular/material/card': SystemJS.newModule(AngularMaterialCard),
'@angular/material/checkbox': SystemJS.newModule(AngularMaterialCheckbox),
'@angular/material/chips': SystemJS.newModule(AngularMaterialChips),
'@angular/material/core': SystemJS.newModule(AngularMaterialCore),
'@angular/material/datepicker': SystemJS.newModule(AngularMaterialDatepicker),
'@angular/material/dialog': SystemJS.newModule(AngularMaterialDialog),
'@angular/material/divider': SystemJS.newModule(AngularMaterialDivider),
'@angular/material/expansion': SystemJS.newModule(AngularMaterialExpansion),
'@angular/material/form-field': SystemJS.newModule(AngularMaterialFormField),
'@angular/material/grid-list': SystemJS.newModule(AngularMaterialGridList),
'@angular/material/icon': SystemJS.newModule(AngularMaterialIcon),
'@angular/material/input': SystemJS.newModule(AngularMaterialInput),
'@angular/material/list': SystemJS.newModule(AngularMaterialList),
'@angular/material/menu': SystemJS.newModule(AngularMaterialMenu),
'@angular/material/paginator': SystemJS.newModule(AngularMaterialPaginator),
'@angular/material/progress-bar': SystemJS.newModule(AngularMaterialProgressBar),
'@angular/material/progress-spinner': SystemJS.newModule(AngularMaterialProgressSpinner),
'@angular/material/radio': SystemJS.newModule(AngularMaterialRadio),
'@angular/material/select': SystemJS.newModule(AngularMaterialSelect),
'@angular/material/sidenav': SystemJS.newModule(AngularMaterialSidenav),
'@angular/material/slide-toggle': SystemJS.newModule(AngularMaterialSlideToggle),
'@angular/material/slider': SystemJS.newModule(AngularMaterialSlider),
'@angular/material/snack-bar': SystemJS.newModule(AngularMaterialSnackBar),
'@angular/material/sort': SystemJS.newModule(AngularMaterialSort),
'@angular/material/stepper': SystemJS.newModule(AngularMaterialStepper),
'@angular/material/table': SystemJS.newModule(AngularMaterialTable),
'@angular/material/tabs': SystemJS.newModule(AngularMaterialTabs),
'@angular/material/toolbar': SystemJS.newModule(AngularMaterialToolbar),
'@angular/material/tooltip': SystemJS.newModule(AngularMaterialTooltip),
'@angular/material/tree': SystemJS.newModule(AngularMaterialTree),
'@ngrx/store': SystemJS.newModule(NgrxStore),
rxjs: SystemJS.newModule(RxJs),
'rxjs/operators': SystemJS.newModule(RxJsOperators),
'@ngx-translate/core': SystemJS.newModule(TranslateCore),
'@core/public-api': SystemJS.newModule(TbCore),
'@shared/public-api': SystemJS.newModule(TbShared),
'@home/components/public-api': SystemJS.newModule(TbHomeComponents),
moment: SystemJS.newModule(_moment)
};
import * as MillisecondsToTimeStringPipe from '@shared/pipe/milliseconds-to-time-string.pipe';
import * as EnumToArrayPipe from '@shared/pipe/enum-to-array.pipe';
import * as HighlightPipe from '@shared/pipe/highlight.pipe';
import * as TruncatePipe from '@shared/pipe/truncate.pipe';
import * as TbJsonPipe from '@shared/pipe/tbJson.pipe';
import * as FileSizePipe from '@shared/pipe/file-size.pipe';
import * as NospacePipe from '@shared/pipe/nospace.pipe';
import * as SelectableColumnsPipe from '@shared/pipe/selectable-columns.pipe';
import * as KeyboardShortcutPipe from '@shared/pipe/keyboard-shortcut.pipe';
import * as FooterComponent from '@shared/components/footer.component';
import * as LogoComponent from '@shared/components/logo.component';
import * as FooterFabButtonsComponent from '@shared/components/footer-fab-buttons.component';
import * as FullscreenDirective from '@shared/components/fullscreen.directive';
import * as CircularProgressDirective from '@shared/components/circular-progress.directive';
import * as MatChipDraggableDirective from '@shared/components/mat-chip-draggable.directive';
import * as TbHotkeysDirective from '@shared/components/hotkeys.directive';
import * as TbAnchorComponent from '@shared/components/tb-anchor.component';
import * as TbPopoverComponent from '@shared/components/popover.component';
import * as TbStringTemplateOutletDirective from '@shared/components/directives/sring-template-outlet.directive';
import * as TbComponentOutletDirective from '@shared/components/directives/component-outlet.directive';
import * as TbMarkdownComponent from '@shared/components/markdown.component';
import * as HelpComponent from '@shared/components/help.component';
import * as HelpMarkdownComponent from '@shared/components/help-markdown.component';
import * as HelpPopupComponent from '@shared/components/help-popup.component';
import * as TbCheckboxComponent from '@shared/components/tb-checkbox.component';
import * as TbToast from '@shared/components/toast.directive';
import * as TbErrorComponent from '@shared/components/tb-error.component';
import * as TbCheatSheetComponent from '@shared/components/cheatsheet.component';
import * as BreadcrumbComponent from '@shared/components/breadcrumb.component';
import * as UserMenuComponent from '@shared/components/user-menu.component';
import * as TimewindowComponent from '@shared/components/time/timewindow.component';
import * as TimewindowPanelComponent from '@shared/components/time/timewindow-panel.component';
import * as TimeintervalComponent from '@shared/components/time/timeinterval.component';
import * as QuickTimeIntervalComponent from '@shared/components/time/quick-time-interval.component';
import * as DashboardSelectComponent from '@shared/components/dashboard-select.component';
import * as DashboardSelectPanelComponent from '@shared/components/dashboard-select-panel.component';
import * as DatetimePeriodComponent from '@shared/components/time/datetime-period.component';
import * as DatetimeComponent from '@shared/components/time/datetime.component';
import * as TimezoneSelectComponent from '@shared/components/time/timezone-select.component';
import * as ValueInputComponent from '@shared/components/value-input.component';
import * as DashboardAutocompleteComponent from '@shared/components/dashboard-autocomplete.component';
import * as EntitySubTypeAutocompleteComponent from '@shared/components/entity/entity-subtype-autocomplete.component';
import * as EntitySubTypeSelectComponent from '@shared/components/entity/entity-subtype-select.component';
import * as EntitySubTypeListComponent from '@shared/components/entity/entity-subtype-list.component';
import * as EntityAutocompleteComponent from '@shared/components/entity/entity-autocomplete.component';
import * as EntityListComponent from '@shared/components/entity/entity-list.component';
import * as EntityTypeSelectComponent from '@shared/components/entity/entity-type-select.component';
import * as EntitySelectComponent from '@shared/components/entity/entity-select.component';
import * as EntityKeysListComponent from '@shared/components/entity/entity-keys-list.component';
import * as EntityListSelectComponent from '@shared/components/entity/entity-list-select.component';
import * as EntityTypeListComponent from '@shared/components/entity/entity-type-list.component';
import * as QueueTypeListComponent from '@shared/components/queue/queue-type-list.component';
import * as RelationTypeAutocompleteComponent from '@shared/components/relation/relation-type-autocomplete.component';
import * as SocialSharePanelComponent from '@shared/components/socialshare-panel.component';
import * as JsonObjectEditComponent from '@shared/components/json-object-edit.component';
import * as JsonContentComponent from '@shared/components/json-content.component';
import * as JsFuncComponent from '@shared/components/js-func.component';
import * as FabToolbarComponent from '@shared/components/fab-toolbar.component';
import * as WidgetsBundleSelectComponent from '@shared/components/widgets-bundle-select.component';
import * as ConfirmDialogComponent from '@shared/components/dialog/confirm-dialog.component';
import * as AlertDialogComponent from '@shared/components/dialog/alert-dialog.component';
import * as TodoDialogComponent from '@shared/components/dialog/todo-dialog.component';
import * as ColorPickerDialogComponent from '@shared/components/dialog/color-picker-dialog.component';
import * as MaterialIconsDialogComponent from '@shared/components/dialog/material-icons-dialog.component';
import * as ColorInputComponent from '@shared/components/color-input.component';
import * as MaterialIconSelectComponent from '@shared/components/material-icon-select.component';
import * as NodeScriptTestDialogComponent from '@shared/components/dialog/node-script-test-dialog.component';
import * as JsonFormComponent from '@shared/components/json-form/json-form.component';
import * as ImageInputComponent from '@shared/components/image-input.component';
import * as FileInputComponent from '@shared/components/file-input.component';
import * as MessageTypeAutocompleteComponent from '@shared/components/message-type-autocomplete.component';
import * as KeyValMapComponent from '@shared/components/kv-map.component';
import * as NavTreeComponent from '@shared/components/nav-tree.component';
import * as LedLightComponent from '@shared/components/led-light.component';
import * as TbJsonToStringDirective from '@shared/components/directives/tb-json-to-string.directive';
import * as JsonObjectEditDialogComponent from '@shared/components/dialog/json-object-edit-dialog.component';
import * as HistorySelectorComponent from '@shared/components/time/history-selector/history-selector.component';
import * as EntityGatewaySelectComponent from '@shared/components/entity/entity-gateway-select.component';
import * as ContactComponent from '@shared/components/contact.component';
import * as OtaPackageAutocompleteComponent from '@shared/components/ota-package/ota-package-autocomplete.component';
import * as WidgetsBundleSearchComponent from '@shared/components/widgets-bundle-search.component';
import * as CopyButtonComponent from '@shared/components/button/copy-button.component';
import * as TogglePasswordComponent from '@shared/components/button/toggle-password.component';
import * as ProtobufContentComponent from '@shared/components/protobuf-content.component';
import * as AddEntityDialogComponent from '@home/components/entity/add-entity-dialog.component';
import * as EntitiesTableComponent from '@home/components/entity/entities-table.component';
import * as DetailsPanelComponent from '@home/components/details-panel.component';
import * as EntityDetailsPanelComponent from '@home/components/entity/entity-details-panel.component';
import * as AuditLogDetailsDialogComponent from '@home/components/audit-log/audit-log-details-dialog.component';
import * as AuditLogTableComponent from '@home/components/audit-log/audit-log-table.component';
import * as EventTableHeaderComponent from '@home/components/event/event-table-header.component';
import * as EventTableComponent from '@home/components/event/event-table.component';
import * as EventFilterPanelComponent from '@home/components/event/event-filter-panel.component';
import * as RelationTableComponent from '@home/components/relation/relation-table.component';
import * as RelationDialogComponent from '@home/components/relation/relation-dialog.component';
import * as AlarmTableHeaderComponent from '@home/components/alarm/alarm-table-header.component';
import * as AlarmTableComponent from '@home/components/alarm/alarm-table.component';
import * as AttributeTableComponent from '@home/components/attribute/attribute-table.component';
import * as AddAttributeDialogComponent from '@home/components/attribute/add-attribute-dialog.component';
import * as EditAttributeValuePanelComponent from '@home/components/attribute/edit-attribute-value-panel.component';
import * as DashboardComponent from '@home/components/dashboard/dashboard.component';
import * as WidgetComponent from '@home/components/widget/widget.component';
import * as LegendComponent from '@home/components/widget/legend.component';
import * as AliasesEntitySelectPanelComponent from '@home/components/alias/aliases-entity-select-panel.component';
import * as AliasesEntitySelectComponent from '@home/components/alias/aliases-entity-select.component';
import * as WidgetConfigComponent from '@home/components/widget/widget-config.component';
import * as EntityAliasesDialogComponent from '@home/components/alias/entity-aliases-dialog.component';
import * as EntityFilterViewComponent from '@home/components/entity/entity-filter-view.component';
import * as EntityAliasDialogComponent from '@home/components/alias/entity-alias-dialog.component';
import * as EntityFilterComponent from '@home/components/entity/entity-filter.component';
import * as RelationFiltersComponent from '@home/components/relation/relation-filters.component';
import * as EntityAliasSelectComponent from '@home/components/alias/entity-alias-select.component';
import * as DataKeysComponent from '@home/components/widget/data-keys.component';
import * as DataKeyConfigDialogComponent from '@home/components/widget/data-key-config-dialog.component';
import * as DataKeyConfigComponent from '@home/components/widget/data-key-config.component';
import * as LegendConfigComponent from '@home/components/widget/legend-config.component';
import * as ManageWidgetActionsComponent from '@home/components/widget/action/manage-widget-actions.component';
import * as WidgetActionDialogComponent from '@home/components/widget/action/widget-action-dialog.component';
import * as CustomActionPrettyResourcesTabsComponent from '@home/components/widget/action/custom-action-pretty-resources-tabs.component';
import * as CustomActionPrettyEditorComponent from '@home/components/widget/action/custom-action-pretty-editor.component';
import * as MobileActionEditorComponent from '@home/components/widget/action/mobile-action-editor.component';
import * as CustomDialogService from '@home/components/widget/dialog/custom-dialog.service';
import * as CustomDialogContainerComponent from '@home/components/widget/dialog/custom-dialog-container.component';
import * as ImportDialogComponent from '@home/components/import-export/import-dialog.component';
import * as AddWidgetToDashboardDialogComponent from '@home/components/attribute/add-widget-to-dashboard-dialog.component';
import * as ImportDialogCsvComponent from '@home/components/import-export/import-dialog-csv.component';
import * as TableColumnsAssignmentComponent from '@home/components/import-export/table-columns-assignment.component';
import * as EventContentDialogComponent from '@home/components/event/event-content-dialog.component';
import * as SharedHomeComponentsModule from '@home/components/shared-home-components.module';
import * as SelectTargetLayoutDialogComponent from '@home/components/dashboard/select-target-layout-dialog.component';
import * as SelectTargetStateDialogComponent from '@home/components/dashboard/select-target-state-dialog.component';
import * as AliasesEntityAutocompleteComponent from '@home/components/alias/aliases-entity-autocomplete.component';
import * as BooleanFilterPredicateComponent from '@home/components/filter/boolean-filter-predicate.component';
import * as StringFilterPredicateComponent from '@home/components/filter/string-filter-predicate.component';
import * as NumericFilterPredicateComponent from '@home/components/filter/numeric-filter-predicate.component';
import * as ComplexFilterPredicateComponent from '@home/components/filter/complex-filter-predicate.component';
import * as FilterPredicateComponent from '@home/components/filter/filter-predicate.component';
import * as FilterPredicateListComponent from '@home/components/filter/filter-predicate-list.component';
import * as KeyFilterListComponent from '@home/components/filter/key-filter-list.component';
import * as ComplexFilterPredicateDialogComponent from '@home/components/filter/complex-filter-predicate-dialog.component';
import * as KeyFilterDialogComponent from '@home/components/filter/key-filter-dialog.component';
import * as FiltersDialogComponent from '@home/components/filter/filters-dialog.component';
import * as FilterDialogComponent from '@home/components/filter/filter-dialog.component';
import * as FilterSelectComponent from '@home/components/filter/filter-select.component';
import * as FiltersEditComponent from '@home/components/filter/filters-edit.component';
import * as FiltersEditPanelComponent from '@home/components/filter/filters-edit-panel.component';
import * as UserFilterDialogComponent from '@home/components/filter/user-filter-dialog.component';
import * as FilterUserInfoComponent from '@home/components/filter/filter-user-info.component';
import * as FilterUserInfoDialogComponent from '@home/components/filter/filter-user-info-dialog.component';
import * as FilterPredicateValueComponent from '@home/components/filter/filter-predicate-value.component';
import * as TenantProfileComponent from '@home/components/profile/tenant-profile.component';
import * as TenantProfileDialogComponent from '@home/components/profile/tenant-profile-dialog.component';
import * as TenantProfileDataComponent from '@home/components/profile/tenant-profile-data.component';
// tslint:disable-next-line:max-line-length
import * as DefaultDeviceProfileConfigurationComponent from '@home/components/profile/device/default-device-profile-configuration.component';
import * as DeviceProfileConfigurationComponent from '@home/components/profile/device/device-profile-configuration.component';
import * as DeviceProfileComponent from '@home/components/profile/device-profile.component';
import * as DefaultDeviceProfileTransportConfigurationComponent from '@home/components/profile/device/default-device-profile-transport-configuration.component';
import * as DeviceProfileTransportConfigurationComponent from '@home/components/profile/device/device-profile-transport-configuration.component';
import * as DeviceProfileDialogComponent from '@home/components/profile/device-profile-dialog.component';
import * as DeviceProfileAutocompleteComponent from '@home/components/profile/device-profile-autocomplete.component';
import * as MqttDeviceProfileTransportConfigurationComponent from '@home/components/profile/device/mqtt-device-profile-transport-configuration.component';
import * as CoapDeviceProfileTransportConfigurationComponent from '@home/components/profile/device/coap-device-profile-transport-configuration.component';
import * as DeviceProfileAlarmsComponent from '@home/components/profile/alarm/device-profile-alarms.component';
import * as DeviceProfileAlarmComponent from '@home/components/profile/alarm/device-profile-alarm.component';
import * as CreateAlarmRulesComponent from '@home/components/profile/alarm/create-alarm-rules.component';
import * as AlarmRuleComponent from '@home/components/profile/alarm/alarm-rule.component';
import * as AlarmRuleConditionComponent from '@home/components/profile/alarm/alarm-rule-condition.component';
import * as FilterTextComponent from '@home/components/filter/filter-text.component';
import * as AddDeviceProfileDialogComponent from '@home/components/profile/add-device-profile-dialog.component';
import * as RuleChainAutocompleteComponent from '@home/components/rule-chain/rule-chain-autocomplete.component';
import * as DeviceProfileProvisionConfigurationComponent from '@home/components/profile/device-profile-provision-configuration.component';
import * as AlarmScheduleComponent from '@home/components/profile/alarm/alarm-schedule.component';
import * as DeviceWizardDialogComponent from '@home/components/wizard/device-wizard-dialog.component';
import * as AlarmScheduleInfoComponent from '@home/components/profile/alarm/alarm-schedule-info.component';
import * as AlarmScheduleDialogComponent from '@home/components/profile/alarm/alarm-schedule-dialog.component';
import * as EditAlarmDetailsDialogComponent from '@home/components/profile/alarm/edit-alarm-details-dialog.component';
import * as AlarmRuleConditionDialogComponent from '@home/components/profile/alarm/alarm-rule-condition-dialog.component';
// tslint:disable-next-line:max-line-length
import * as DefaultTenantProfileConfigurationComponent from '@home/components/profile/tenant/default-tenant-profile-configuration.component';
import * as TenantProfileConfigurationComponent from '@home/components/profile/tenant/tenant-profile-configuration.component';
import * as SmsProviderConfigurationComponent from '@home/components/sms/sms-provider-configuration.component';
import * as AwsSnsProviderConfigurationComponent from '@home/components/sms/aws-sns-provider-configuration.component';
import * as TwilioSmsProviderConfigurationComponent from '@home/components/sms/twilio-sms-provider-configuration.component';
import * as DashboardPageComponent from '@home/components/dashboard-page/dashboard-page.component';
import * as DashboardToolbarComponent from '@home/components/dashboard-page/dashboard-toolbar.component';
import * as DashboardLayoutComponent from '@home/components/dashboard-page/layout/dashboard-layout.component';
import * as EditWidgetComponent from '@home/components/dashboard-page/edit-widget.component';
import * as DashboardWidgetSelectComponent from '@home/components/dashboard-page/dashboard-widget-select.component';
import * as AddWidgetDialogComponent from '@home/components/dashboard-page/add-widget-dialog.component';
import * as ManageDashboardLayoutsDialogComponent from '@home/components/dashboard-page/layout/manage-dashboard-layouts-dialog.component';
import * as DashboardSettingsDialogComponent from '@home/components/dashboard-page/dashboard-settings-dialog.component';
import * as ManageDashboardStatesDialogComponent from '@home/components/dashboard-page/states/manage-dashboard-states-dialog.component';
import * as DashboardStateDialogComponent from '@home/components/dashboard-page/states/dashboard-state-dialog.component';
import * as EmbedDashboardDialogComponent from '@home/components/widget/dialog/embed-dashboard-dialog.component';
import * as EdgeDownlinkTableComponent from '@home/components/edge/edge-downlink-table.component';
import * as EdgeDownlinkTableHeaderComponent from '@home/components/edge/edge-downlink-table-header.component';
import * as DisplayWidgetTypesPanelComponent from '@home/components/dashboard-page/widget-types-panel.component';
import * as AlarmDurationPredicateValueComponent from '@home/components/profile/alarm/alarm-duration-predicate-value.component';
import * as DashboardImageDialogComponent from '@home/components/dashboard-page/dashboard-image-dialog.component';
import * as WidgetContainerComponent from '@home/components/widget/widget-container.component';
import { IModulesMap } from '@modules/common/modules-map.models';
declare const System;
class ModulesMap implements IModulesMap {
private initialized = false;
private modulesMap: {[key: string]: any} = {
'@angular/animations': AngularAnimations,
'@angular/core': AngularCore,
'@angular/common': AngularCommon,
'@angular/common/http': HttpClientModule,
'@angular/forms': AngularForms,
'@angular/flex-layout': AngularFlexLayout,
'@angular/flex-layout/flex': AngularFlexLayoutFlex,
'@angular/flex-layout/grid': AngularFlexLayoutGrid,
'@angular/flex-layout/extended': AngularFlexLayoutExtended,
'@angular/platform-browser': AngularPlatformBrowser,
'@angular/router': AngularRouter,
'@angular/cdk/coercion': AngularCdkCoercion,
'@angular/cdk/collections': AngularCdkCollections,
'@angular/cdk/keycodes': AngularCdkKeycodes,
'@angular/cdk/layout': AngularCdkLayout,
'@angular/cdk/overlay': AngularCdkOverlay,
'@angular/cdk/portal': AngularCdkPortal,
'@angular/cdk/drag-drop': DragDropModule,
'@angular/material/autocomplete': AngularMaterialAutocomplete,
'@angular/material/badge': AngularMaterialBadge,
'@angular/material/bottom-sheet': AngularMaterialBottomSheet,
'@angular/material/button': AngularMaterialButton,
'@angular/material/button-toggle': AngularMaterialButtonToggle,
'@angular/material/card': AngularMaterialCard,
'@angular/material/checkbox': AngularMaterialCheckbox,
'@angular/material/chips': AngularMaterialChips,
'@angular/material/core': AngularMaterialCore,
'@angular/material/datepicker': AngularMaterialDatepicker,
'@angular/material/dialog': AngularMaterialDialog,
'@angular/material/divider': AngularMaterialDivider,
'@angular/material/expansion': AngularMaterialExpansion,
'@angular/material/form-field': AngularMaterialFormField,
'@angular/material/grid-list': AngularMaterialGridList,
'@angular/material/icon': AngularMaterialIcon,
'@angular/material/input': AngularMaterialInput,
'@angular/material/list': AngularMaterialList,
'@angular/material/menu': AngularMaterialMenu,
'@angular/material/paginator': AngularMaterialPaginator,
'@angular/material/progress-bar': AngularMaterialProgressBar,
'@angular/material/progress-spinner': AngularMaterialProgressSpinner,
'@angular/material/radio': AngularMaterialRadio,
'@angular/material/select': AngularMaterialSelect,
'@angular/material/sidenav': AngularMaterialSidenav,
'@angular/material/slide-toggle': AngularMaterialSlideToggle,
'@angular/material/slider': AngularMaterialSlider,
'@angular/material/snack-bar': AngularMaterialSnackBar,
'@angular/material/sort': AngularMaterialSort,
'@angular/material/stepper': AngularMaterialStepper,
'@angular/material/table': AngularMaterialTable,
'@angular/material/tabs': AngularMaterialTabs,
'@angular/material/toolbar': AngularMaterialToolbar,
'@angular/material/tooltip': AngularMaterialTooltip,
'@angular/material/tree': AngularMaterialTree,
'@ngrx/store': NgrxStore,
rxjs: RxJs,
'rxjs/operators': RxJsOperators,
'@ngx-translate/core': TranslateCore,
moment: _moment,
'@core/public-api': TbCore,
'@shared/public-api': TbShared,
'@home/components/public-api': TbHomeComponents,
'@shared/pipe/milliseconds-to-time-string.pipe': MillisecondsToTimeStringPipe,
'@shared/pipe/enum-to-array.pipe': EnumToArrayPipe,
'@shared/pipe/highlight.pipe': HighlightPipe,
'@shared/pipe/truncate.pipe': TruncatePipe,
'@shared/pipe/tbJson.pipe': TbJsonPipe,
'@shared/pipe/file-size.pipe': FileSizePipe,
'@shared/pipe/nospace.pipe': NospacePipe,
'@shared/pipe/selectable-columns.pipe': SelectableColumnsPipe,
'@shared/pipe/keyboard-shortcut.pipe': KeyboardShortcutPipe,
'@shared/components/footer.component': FooterComponent,
'@shared/components/logo.component': LogoComponent,
'@shared/components/footer-fab-buttons.component': FooterFabButtonsComponent,
'@shared/components/fullscreen.directive': FullscreenDirective,
'@shared/components/circular-progress.directive': CircularProgressDirective,
'@shared/components/mat-chip-draggable.directive': MatChipDraggableDirective,
'@shared/components/hotkeys.directive': TbHotkeysDirective,
'@shared/components/tb-anchor.component': TbAnchorComponent,
'@shared/components/popover.component': TbPopoverComponent,
'@shared/components/directives/sring-template-outlet.directive': TbStringTemplateOutletDirective,
'@shared/components/directives/component-outlet.directive': TbComponentOutletDirective,
'@shared/components/markdown.component': TbMarkdownComponent,
'@shared/components/help.component': HelpComponent,
'@shared/components/help-markdown.component': HelpMarkdownComponent,
'@shared/components/help-popup.component': HelpPopupComponent,
'@shared/components/tb-checkbox.component': TbCheckboxComponent,
'@shared/components/toast.directive': TbToast,
'@shared/components/tb-error.component': TbErrorComponent,
'@shared/components/cheatsheet.component': TbCheatSheetComponent,
'@shared/components/breadcrumb.component': BreadcrumbComponent,
'@shared/components/user-menu.component': UserMenuComponent,
'@shared/components/time/timewindow.component': TimewindowComponent,
'@shared/components/time/timewindow-panel.component': TimewindowPanelComponent,
'@shared/components/time/timeinterval.component': TimeintervalComponent,
'@shared/components/time/quick-time-interval.component': QuickTimeIntervalComponent,
'@shared/components/dashboard-select.component': DashboardSelectComponent,
'@shared/components/dashboard-select-panel.component': DashboardSelectPanelComponent,
'@shared/components/time/datetime-period.component': DatetimePeriodComponent,
'@shared/components/time/datetime.component': DatetimeComponent,
'@shared/components/time/timezone-select.component': TimezoneSelectComponent,
'@shared/components/value-input.component': ValueInputComponent,
'@shared/components/dashboard-autocomplete.component': DashboardAutocompleteComponent,
'@shared/components/entity/entity-subtype-autocomplete.component': EntitySubTypeAutocompleteComponent,
'@shared/components/entity/entity-subtype-select.component': EntitySubTypeSelectComponent,
'@shared/components/entity/entity-subtype-list.component': EntitySubTypeListComponent,
'@shared/components/entity/entity-autocomplete.component': EntityAutocompleteComponent,
'@shared/components/entity/entity-list.component': EntityListComponent,
'@shared/components/entity/entity-type-select.component': EntityTypeSelectComponent,
'@shared/components/entity/entity-select.component': EntitySelectComponent,
'@shared/components/entity/entity-keys-list.component': EntityKeysListComponent,
'@shared/components/entity/entity-list-select.component': EntityListSelectComponent,
'@shared/components/entity/entity-type-list.component': EntityTypeListComponent,
'@shared/components/queue/queue-type-list.component': QueueTypeListComponent,
'@shared/components/relation/relation-type-autocomplete.component': RelationTypeAutocompleteComponent,
'@shared/components/socialshare-panel.component': SocialSharePanelComponent,
'@shared/components/json-object-edit.component': JsonObjectEditComponent,
'@shared/components/json-content.component': JsonContentComponent,
'@shared/components/js-func.component': JsFuncComponent,
'@shared/components/fab-toolbar.component': FabToolbarComponent,
'@shared/components/widgets-bundle-select.component': WidgetsBundleSelectComponent,
'@shared/components/dialog/confirm-dialog.component': ConfirmDialogComponent,
'@shared/components/dialog/alert-dialog.component': AlertDialogComponent,
'@shared/components/dialog/todo-dialog.component': TodoDialogComponent,
'@shared/components/dialog/color-picker-dialog.component': ColorPickerDialogComponent,
'@shared/components/dialog/material-icons-dialog.component': MaterialIconsDialogComponent,
'@shared/components/color-input.component': ColorInputComponent,
'@shared/components/material-icon-select.component': MaterialIconSelectComponent,
'@shared/components/dialog/node-script-test-dialog.component': NodeScriptTestDialogComponent,
'@shared/components/json-form/json-form.component': JsonFormComponent,
'@shared/components/image-input.component': ImageInputComponent,
'@shared/components/file-input.component': FileInputComponent,
'@shared/components/message-type-autocomplete.component': MessageTypeAutocompleteComponent,
'@shared/components/kv-map.component': KeyValMapComponent,
'@shared/components/nav-tree.component': NavTreeComponent,
'@shared/components/led-light.component': LedLightComponent,
'@shared/components/directives/tb-json-to-string.directive': TbJsonToStringDirective,
'@shared/components/dialog/json-object-edit-dialog.component': JsonObjectEditDialogComponent,
'@shared/components/time/history-selector/history-selector.component': HistorySelectorComponent,
'@shared/components/entity/entity-gateway-select.component': EntityGatewaySelectComponent,
'@shared/components/contact.component': ContactComponent,
'@shared/components/ota-package/ota-package-autocomplete.component': OtaPackageAutocompleteComponent,
'@shared/components/widgets-bundle-search.component': WidgetsBundleSearchComponent,
'@shared/components/button/copy-button.component': CopyButtonComponent,
'@shared/components/button/toggle-password.component': TogglePasswordComponent,
'@shared/components/protobuf-content.component': ProtobufContentComponent,
'@home/components/entity/add-entity-dialog.component': AddEntityDialogComponent,
'@home/components/entity/entities-table.component': EntitiesTableComponent,
'@home/components/details-panel.component': DetailsPanelComponent,
'@home/components/entity/entity-details-panel.component': EntityDetailsPanelComponent,
'@home/components/audit-log/audit-log-details-dialog.component': AuditLogDetailsDialogComponent,
'@home/components/audit-log/audit-log-table.component': AuditLogTableComponent,
'@home/components/event/event-table-header.component': EventTableHeaderComponent,
'@home/components/event/event-table.component': EventTableComponent,
'@home/components/event/event-filter-panel.component': EventFilterPanelComponent,
'@home/components/relation/relation-table.component': RelationTableComponent,
'@home/components/relation/relation-dialog.component': RelationDialogComponent,
'@home/components/alarm/alarm-table-header.component': AlarmTableHeaderComponent,
'@home/components/alarm/alarm-table.component': AlarmTableComponent,
'@home/components/attribute/attribute-table.component': AttributeTableComponent,
'@home/components/attribute/add-attribute-dialog.component': AddAttributeDialogComponent,
'@home/components/attribute/edit-attribute-value-panel.component': EditAttributeValuePanelComponent,
'@home/components/dashboard/dashboard.component': DashboardComponent,
'@home/components/widget/widget.component': WidgetComponent,
'@home/components/widget/legend.component': LegendComponent,
'@home/components/alias/aliases-entity-select-panel.component': AliasesEntitySelectPanelComponent,
'@home/components/alias/aliases-entity-select.component': AliasesEntitySelectComponent,
'@home/components/widget/widget-config.component': WidgetConfigComponent,
'@home/components/alias/entity-aliases-dialog.component': EntityAliasesDialogComponent,
'@home/components/entity/entity-filter-view.component': EntityFilterViewComponent,
'@home/components/alias/entity-alias-dialog.component': EntityAliasDialogComponent,
'@home/components/entity/entity-filter.component': EntityFilterComponent,
'@home/components/relation/relation-filters.component': RelationFiltersComponent,
'@home/components/alias/entity-alias-select.component': EntityAliasSelectComponent,
'@home/components/widget/data-keys.component': DataKeysComponent,
'@home/components/widget/data-key-config-dialog.component': DataKeyConfigDialogComponent,
'@home/components/widget/data-key-config.component': DataKeyConfigComponent,
'@home/components/widget/legend-config.component': LegendConfigComponent,
'@home/components/widget/action/manage-widget-actions.component': ManageWidgetActionsComponent,
'@home/components/widget/action/widget-action-dialog.component': WidgetActionDialogComponent,
'@home/components/widget/action/custom-action-pretty-resources-tabs.component': CustomActionPrettyResourcesTabsComponent,
'@home/components/widget/action/custom-action-pretty-editor.component': CustomActionPrettyEditorComponent,
'@home/components/widget/action/mobile-action-editor.component': MobileActionEditorComponent,
'@home/components/widget/dialog/custom-dialog.service': CustomDialogService,
'@home/components/widget/dialog/custom-dialog-container.component': CustomDialogContainerComponent,
'@home/components/import-export/import-dialog.component': ImportDialogComponent,
'@home/components/attribute/add-widget-to-dashboard-dialog.component': AddWidgetToDashboardDialogComponent,
'@home/components/import-export/import-dialog-csv.component': ImportDialogCsvComponent,
'@home/components/import-export/table-columns-assignment.component': TableColumnsAssignmentComponent,
'@home/components/event/event-content-dialog.component': EventContentDialogComponent,
'@home/components/shared-home-components.module': SharedHomeComponentsModule,
'@home/components/dashboard/select-target-layout-dialog.component': SelectTargetLayoutDialogComponent,
'@home/components/dashboard/select-target-state-dialog.component': SelectTargetStateDialogComponent,
'@home/components/alias/aliases-entity-autocomplete.component': AliasesEntityAutocompleteComponent,
'@home/components/filter/boolean-filter-predicate.component': BooleanFilterPredicateComponent,
'@home/components/filter/string-filter-predicate.component': StringFilterPredicateComponent,
'@home/components/filter/numeric-filter-predicate.component': NumericFilterPredicateComponent,
'@home/components/filter/complex-filter-predicate.component': ComplexFilterPredicateComponent,
'@home/components/filter/filter-predicate.component': FilterPredicateComponent,
'@home/components/filter/filter-predicate-list.component': FilterPredicateListComponent,
'@home/components/filter/key-filter-list.component': KeyFilterListComponent,
'@home/components/filter/complex-filter-predicate-dialog.component': ComplexFilterPredicateDialogComponent,
'@home/components/filter/key-filter-dialog.component': KeyFilterDialogComponent,
'@home/components/filter/filters-dialog.component': FiltersDialogComponent,
'@home/components/filter/filter-dialog.component': FilterDialogComponent,
'@home/components/filter/filter-select.component': FilterSelectComponent,
'@home/components/filter/filters-edit.component': FiltersEditComponent,
'@home/components/filter/filters-edit-panel.component': FiltersEditPanelComponent,
'@home/components/filter/user-filter-dialog.component': UserFilterDialogComponent,
'@home/components/filter/filter-user-info.component': FilterUserInfoComponent,
'@home/components/filter/filter-user-info-dialog.component': FilterUserInfoDialogComponent,
'@home/components/filter/filter-predicate-value.component': FilterPredicateValueComponent,
'@home/components/profile/tenant-profile.component': TenantProfileComponent,
'@home/components/profile/tenant-profile-dialog.component': TenantProfileDialogComponent,
'@home/components/profile/tenant-profile-data.component': TenantProfileDataComponent,
'@home/components/profile/device/default-device-profile-configuration.component': DefaultDeviceProfileConfigurationComponent,
'@home/components/profile/device/device-profile-configuration.component': DeviceProfileConfigurationComponent,
'@home/components/profile/device-profile.component': DeviceProfileComponent,
'@home/components/profile/device/default-device-profile-transport-configuration.component':
DefaultDeviceProfileTransportConfigurationComponent,
'@home/components/profile/device/device-profile-transport-configuration.component': DeviceProfileTransportConfigurationComponent,
'@home/components/profile/device-profile-dialog.component': DeviceProfileDialogComponent,
'@home/components/profile/device-profile-autocomplete.component': DeviceProfileAutocompleteComponent,
'@home/components/profile/device/mqtt-device-profile-transport-configuration.component':
MqttDeviceProfileTransportConfigurationComponent,
'@home/components/profile/device/coap-device-profile-transport-configuration.component':
CoapDeviceProfileTransportConfigurationComponent,
'@home/components/profile/alarm/device-profile-alarms.component': DeviceProfileAlarmsComponent,
'@home/components/profile/alarm/device-profile-alarm.component': DeviceProfileAlarmComponent,
'@home/components/profile/alarm/create-alarm-rules.component': CreateAlarmRulesComponent,
'@home/components/profile/alarm/alarm-rule.component': AlarmRuleComponent,
'@home/components/profile/alarm/alarm-rule-condition.component': AlarmRuleConditionComponent,
'@home/components/filter/filter-text.component': FilterTextComponent,
'@home/components/profile/add-device-profile-dialog.component': AddDeviceProfileDialogComponent,
'@home/components/rule-chain/rule-chain-autocomplete.component': RuleChainAutocompleteComponent,
'@home/components/profile/device-profile-provision-configuration.component': DeviceProfileProvisionConfigurationComponent,
'@home/components/profile/alarm/alarm-schedule.component': AlarmScheduleComponent,
'@home/components/wizard/device-wizard-dialog.component': DeviceWizardDialogComponent,
'@home/components/profile/alarm/alarm-schedule-info.component': AlarmScheduleInfoComponent,
'@home/components/profile/alarm/alarm-schedule-dialog.component': AlarmScheduleDialogComponent,
'@home/components/profile/alarm/edit-alarm-details-dialog.component': EditAlarmDetailsDialogComponent,
'@home/components/profile/alarm/alarm-rule-condition-dialog.component': AlarmRuleConditionDialogComponent,
'@home/components/profile/tenant/default-tenant-profile-configuration.component': DefaultTenantProfileConfigurationComponent,
'@home/components/profile/tenant/tenant-profile-configuration.component': TenantProfileConfigurationComponent,
'@home/components/sms/sms-provider-configuration.component': SmsProviderConfigurationComponent,
'@home/components/sms/aws-sns-provider-configuration.component': AwsSnsProviderConfigurationComponent,
'@home/components/sms/twilio-sms-provider-configuration.component': TwilioSmsProviderConfigurationComponent,
'@home/components/dashboard-page/dashboard-page.component': DashboardPageComponent,
'@home/components/dashboard-page/dashboard-toolbar.component': DashboardToolbarComponent,
'@home/components/dashboard-page/layout/dashboard-layout.component': DashboardLayoutComponent,
'@home/components/dashboard-page/edit-widget.component': EditWidgetComponent,
'@home/components/dashboard-page/dashboard-widget-select.component': DashboardWidgetSelectComponent,
'@home/components/dashboard-page/add-widget-dialog.component': AddWidgetDialogComponent,
'@home/components/dashboard-page/layout/manage-dashboard-layouts-dialog.component': ManageDashboardLayoutsDialogComponent,
'@home/components/dashboard-page/dashboard-settings-dialog.component': DashboardSettingsDialogComponent,
'@home/components/dashboard-page/states/manage-dashboard-states-dialog.component': ManageDashboardStatesDialogComponent,
'@home/components/dashboard-page/states/dashboard-state-dialog.component': DashboardStateDialogComponent,
'@home/components/widget/dialog/embed-dashboard-dialog.component': EmbedDashboardDialogComponent,
'@home/components/edge/edge-downlink-table.component': EdgeDownlinkTableComponent,
'@home/components/edge/edge-downlink-table-header.component': EdgeDownlinkTableHeaderComponent,
'@home/components/dashboard-page/widget-types-panel.component': DisplayWidgetTypesPanelComponent,
'@home/components/profile/alarm/alarm-duration-predicate-value.component': AlarmDurationPredicateValueComponent,
'@home/components/dashboard-page/dashboard-image-dialog.component': DashboardImageDialogComponent,
'@home/components/widget/widget-container.component': WidgetContainerComponent,
};
init() {
if (!this.initialized) {
System.constructor.prototype.resolve = (id) => {
try {
if (this.modulesMap[id]) {
return 'app:' + id;
} else {
return id;
}
} catch (err) {
return id;
}
};
for (const moduleId of Object.keys(this.modulesMap)) {
System.set('app:' + moduleId, this.modulesMap[moduleId]);
}
this.initialized = true;
}
}
}
export const modulesMap = new ModulesMap();

6
ui-ngx/src/app/modules/home/components/dashboard-page/states/states-controller.module.ts
View File

@ -17,9 +17,9 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared/shared.module';
import { StatesControllerService } from './states-controller.service';
import { EntityStateControllerComponent } from './entity-state-controller.component';
import { StatesComponentDirective } from './states-component.directive';
import { StatesControllerService } from '@home/components/dashboard-page/states/states-controller.service';
import { EntityStateControllerComponent } from '@home/components/dashboard-page/states/entity-state-controller.component';
import { StatesComponentDirective } from '@home/components/dashboard-page/states/states-component.directive';
import { HomeDialogsModule } from '@app/modules/home/dialogs/home-dialogs.module';
import { DefaultStateControllerComponent } from '@home/components/dashboard-page/states/default-state-controller.component';

10
ui-ngx/src/app/modules/home/components/device/device-credentials.module.ts
View File

@ -17,11 +17,11 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared/shared.module';
import { CopyDeviceCredentialsComponent } from './copy-device-credentials.component';
import { DeviceCredentialsComponent } from './device-credentials.component';
import { DeviceCredentialsLwm2mComponent } from './device-credentials-lwm2m.component';
import { DeviceCredentialsLwm2mServerComponent } from './device-credentials-lwm2m-server.component';
import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-basic.component';
import { CopyDeviceCredentialsComponent } from '@home/components/device/copy-device-credentials.component';
import { DeviceCredentialsComponent } from '@home/components/device/device-credentials.component';
import { DeviceCredentialsLwm2mComponent } from '@home/components/device/device-credentials-lwm2m.component';
import { DeviceCredentialsLwm2mServerComponent } from '@home/components/device/device-credentials-lwm2m-server.component';
import { DeviceCredentialsMqttBasicComponent } from '@home/components/device/device-credentials-mqtt-basic.component';
@NgModule({
declarations: [

3
ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
View File

@ -64,6 +64,7 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { TbAnchorComponent } from '@shared/components/tb-anchor.component';
import { isDefined, isUndefined } from '@core/utils';
import { HasUUID } from '@shared/models/id/has-uuid';
import { IEntitiesTableComponent } from '@home/models/entity/entity-table-component.models';
@Component({
selector: 'tb-entities-table',
@ -71,7 +72,7 @@ import { HasUUID } from '@shared/models/id/has-uuid';
styleUrls: ['./entities-table.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class EntitiesTableComponent extends PageComponent implements AfterViewInit, OnInit, OnChanges {
export class EntitiesTableComponent extends PageComponent implements IEntitiesTableComponent, AfterViewInit, OnInit, OnChanges {
@Input()
entitiesTableConfig: EntityTableConfig<BaseData<HasId>>;

20
ui-ngx/src/app/modules/home/components/filter/complex-filter-predicate-dialog.component.ts
View File

@ -23,22 +23,12 @@ import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Valida
import { Router } from '@angular/router';
import { DialogComponent } from '@app/shared/components/dialog.component';
import {
BooleanOperation, booleanOperationTranslationMap,
ComplexFilterPredicate, ComplexFilterPredicateInfo, ComplexOperation, complexOperationTranslationMap,
EntityKeyValueType,
FilterPredicateType, KeyFilterPredicateInfo
ComplexFilterPredicateInfo,
ComplexOperation,
complexOperationTranslationMap,
FilterPredicateType
} from '@shared/models/query/query.models';
export interface ComplexFilterPredicateDialogData {
complexPredicate: ComplexFilterPredicateInfo;
key: string;
readonly: boolean;
isAdd: boolean;
valueType: EntityKeyValueType;
displayUserParameters: boolean;
allowUserDynamicSource: boolean;
onlyUserDynamicSource: boolean;
}
import { ComplexFilterPredicateDialogData } from '@home/components/filter/filter-component.models';
@Component({
selector: 'tb-complex-filter-predicate-dialog',

16
ui-ngx/src/app/modules/home/components/filter/complex-filter-predicate.component.ts
View File

@ -14,15 +14,14 @@
/// limitations under the License.
///
import { Component, forwardRef, Input, OnInit } from '@angular/core';
import { Component, forwardRef, Inject, Input, OnInit } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { ComplexFilterPredicateInfo, EntityKeyValueType } from '@shared/models/query/query.models';
import { MatDialog } from '@angular/material/dialog';
import {
ComplexFilterPredicateDialogComponent,
ComplexFilterPredicateDialogData
} from '@home/components/filter/complex-filter-predicate-dialog.component';
import { deepClone } from '@core/utils';
import { ComplexFilterPredicateDialogData } from '@home/components/filter/filter-component.models';
import { COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN } from '@home/components/tokens';
import { ComponentType } from '@angular/cdk/portal';
@Component({
selector: 'tb-complex-filter-predicate',
@ -54,7 +53,8 @@ export class ComplexFilterPredicateComponent implements ControlValueAccessor, On
private complexFilterPredicate: ComplexFilterPredicateInfo;
constructor(private dialog: MatDialog) {
constructor(@Inject(COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN) private complexFilterPredicateDialogComponent: ComponentType<any>,
private dialog: MatDialog) {
}
ngOnInit(): void {
@ -76,8 +76,8 @@ export class ComplexFilterPredicateComponent implements ControlValueAccessor, On
}
public openComplexFilterDialog() {
this.dialog.open<ComplexFilterPredicateDialogComponent, ComplexFilterPredicateDialogData,
ComplexFilterPredicateInfo>(ComplexFilterPredicateDialogComponent, {
this.dialog.open<any, ComplexFilterPredicateDialogData,
ComplexFilterPredicateInfo>(this.complexFilterPredicateDialogComponent, {
disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: {

29
ui-ngx/src/app/modules/home/components/filter/filter-component.models.ts
View File

@ -0,0 +1,29 @@
///
/// Copyright © 2016-2021 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
import { ComplexFilterPredicateInfo, EntityKeyValueType } from '@shared/models/query/query.models';
export interface ComplexFilterPredicateDialogData {
complexPredicate: ComplexFilterPredicateInfo;
key: string;
readonly: boolean;
isAdd: boolean;
valueType: EntityKeyValueType;
displayUserParameters: boolean;
allowUserDynamicSource: boolean;
onlyUserDynamicSource: boolean;
}

14
ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.ts
View File

@ -14,7 +14,7 @@
/// limitations under the License.
///
import { Component, forwardRef, Input, OnInit } from '@angular/core';
import { Component, forwardRef, Inject, Input, OnInit } from '@angular/core';
import {
AbstractControl,
ControlValueAccessor,
@ -36,12 +36,11 @@ import {
EntityKeyValueType,
KeyFilterPredicateInfo
} from '@shared/models/query/query.models';
import {
ComplexFilterPredicateDialogComponent,
ComplexFilterPredicateDialogData
} from '@home/components/filter/complex-filter-predicate-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { map } from 'rxjs/operators';
import { ComponentType } from '@angular/cdk/portal';
import { COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN } from '@home/components/tokens';
import { ComplexFilterPredicateDialogData } from '@home/components/filter/filter-component.models';
@Component({
selector: 'tb-filter-predicate-list',
@ -87,6 +86,7 @@ export class FilterPredicateListComponent implements ControlValueAccessor, Valid
private valueChangeSubscription: Subscription = null;
constructor(private fb: FormBuilder,
@Inject(COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN) private complexFilterPredicateDialogComponent: ComponentType<any>,
private dialog: MatDialog) {
}
@ -164,8 +164,8 @@ export class FilterPredicateListComponent implements ControlValueAccessor, Valid
}
private openComplexFilterDialog(predicate: KeyFilterPredicateInfo): Observable<KeyFilterPredicateInfo> {
return this.dialog.open<ComplexFilterPredicateDialogComponent, ComplexFilterPredicateDialogData,
ComplexFilterPredicateInfo>(ComplexFilterPredicateDialogComponent, {
return this.dialog.open<any, ComplexFilterPredicateDialogData,
ComplexFilterPredicateInfo>(this.complexFilterPredicateDialogComponent, {
disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: {

8
ui-ngx/src/app/modules/home/components/home-components.module.ts
View File

@ -141,6 +141,10 @@ import { WidgetContainerComponent } from '@home/components/widget/widget-contain
import { SnmpDeviceProfileTransportModule } from '@home/components/profile/device/snpm/snmp-device-profile-transport.module';
import { DeviceCredentialsModule } from '@home/components/device/device-credentials.module';
import { DeviceProfileCommonModule } from '@home/components/profile/device/common/device-profile-common.module';
import {
COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN,
DASHBOARD_PAGE_COMPONENT_TOKEN
} from '@home/components/tokens';
@NgModule({
declarations:
@ -375,7 +379,9 @@ import { DeviceProfileCommonModule } from '@home/components/profile/device/commo
WidgetComponentService,
CustomDialogService,
ImportExportService,
{provide: EMBED_DASHBOARD_DIALOG_TOKEN, useValue: EmbedDashboardDialogComponent}
{provide: EMBED_DASHBOARD_DIALOG_TOKEN, useValue: EmbedDashboardDialogComponent},
{provide: COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN, useValue: ComplexFilterPredicateDialogComponent},
{provide: DASHBOARD_PAGE_COMPONENT_TOKEN, useValue: DashboardPageComponent}
]
})
export class HomeComponentsModule { }

4
ui-ngx/src/app/modules/home/components/profile/device/common/device-profile-common.module.ts
View File

@ -15,10 +15,10 @@
///
import { NgModule } from '@angular/core';
import { PowerModeSettingComponent } from './power-mode-setting.component';
import { PowerModeSettingComponent } from '@home/components/profile/device/common/power-mode-setting.component';
import { SharedModule } from '@shared/shared.module';
import { CommonModule } from '@angular/common';
import { TimeUnitSelectComponent } from './time-unit-select.component';
import { TimeUnitSelectComponent } from '@home/components/profile/device/common/time-unit-select.component';
@NgModule({
declarations: [

22
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-components.module.ts
View File

@ -15,19 +15,19 @@
///
import { NgModule } from '@angular/core';
import { Lwm2mDeviceProfileTransportConfigurationComponent } from './lwm2m-device-profile-transport-configuration.component';
import { Lwm2mObjectListComponent } from './lwm2m-object-list.component';
import { Lwm2mObserveAttrTelemetryComponent } from './lwm2m-observe-attr-telemetry.component';
import { Lwm2mObserveAttrTelemetryResourcesComponent } from './lwm2m-observe-attr-telemetry-resources.component';
import { Lwm2mAttributesDialogComponent } from './lwm2m-attributes-dialog.component';
import { Lwm2mAttributesComponent } from './lwm2m-attributes.component';
import { Lwm2mAttributesKeyListComponent } from './lwm2m-attributes-key-list.component';
import { Lwm2mDeviceConfigServerComponent } from './lwm2m-device-config-server.component';
import { Lwm2mObjectAddInstancesDialogComponent } from './lwm2m-object-add-instances-dialog.component';
import { Lwm2mObjectAddInstancesListComponent } from './lwm2m-object-add-instances-list.component';
import { Lwm2mDeviceProfileTransportConfigurationComponent } from '@home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component';
import { Lwm2mObjectListComponent } from '@home/components/profile/device/lwm2m/lwm2m-object-list.component';
import { Lwm2mObserveAttrTelemetryComponent } from '@home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component';
import { Lwm2mObserveAttrTelemetryResourcesComponent } from '@home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component';
import { Lwm2mAttributesDialogComponent } from '@home/components/profile/device/lwm2m/lwm2m-attributes-dialog.component';
import { Lwm2mAttributesComponent } from '@home/components/profile/device/lwm2m/lwm2m-attributes.component';
import { Lwm2mAttributesKeyListComponent } from '@home/components/profile/device/lwm2m/lwm2m-attributes-key-list.component';
import { Lwm2mDeviceConfigServerComponent } from '@home/components/profile/device/lwm2m/lwm2m-device-config-server.component';
import { Lwm2mObjectAddInstancesDialogComponent } from '@home/components/profile/device/lwm2m/lwm2m-object-add-instances-dialog.component';
import { Lwm2mObjectAddInstancesListComponent } from '@home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@app/shared/shared.module';
import { Lwm2mObserveAttrTelemetryInstancesComponent } from './lwm2m-observe-attr-telemetry-instances.component';
import { Lwm2mObserveAttrTelemetryInstancesComponent } from '@home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-instances.component';
import { DeviceProfileCommonModule } from '@home/components/profile/device/common/device-profile-common.module';
@NgModule({

4
ui-ngx/src/app/modules/home/components/profile/device/snpm/snmp-device-profile-transport.module.ts
View File

@ -18,8 +18,8 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '@shared/shared.module';
import { CommonModule } from '@angular/common';
import { SnmpDeviceProfileTransportConfigurationComponent } from '@home/components/profile/device/snpm/snmp-device-profile-transport-configuration.component';
import { SnmpDeviceProfileCommunicationConfigComponent } from './snmp-device-profile-communication-config.component';
import { SnmpDeviceProfileMappingComponent } from './snmp-device-profile-mapping.component';
import { SnmpDeviceProfileCommunicationConfigComponent } from '@home/components/profile/device/snpm/snmp-device-profile-communication-config.component';
import { SnmpDeviceProfileMappingComponent } from '@home/components/profile/device/snpm/snmp-device-profile-mapping.component';
@NgModule({
declarations: [

4
ui-ngx/src/app/modules/home/components/shared-home-components.module.ts
View File

@ -18,8 +18,12 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@app/shared/shared.module';
import { AlarmDetailsDialogComponent } from '@home/components/alarm/alarm-details-dialog.component';
import { SHARED_HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
@NgModule({
providers: [
{ provide: SHARED_HOME_COMPONENTS_MODULE_TOKEN, useValue: SharedHomeComponentsModule }
],
declarations:
[
AlarmDetailsDialogComponent

27
ui-ngx/src/app/modules/home/components/tokens.ts
View File

@ -0,0 +1,27 @@
///
/// Copyright © 2016-2021 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
import { InjectionToken, Type } from '@angular/core';
import { ComponentType } from '@angular/cdk/portal';
export const SHARED_HOME_COMPONENTS_MODULE_TOKEN: InjectionToken<Type<any>> =
new InjectionToken<Type<any>>('SHARED_HOME_COMPONENTS_MODULE_TOKEN');
export const COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN: InjectionToken<ComponentType<any>> =
new InjectionToken<ComponentType<any>>('COMPLEX_FILTER_PREDICATE_DIALOG_COMPONENT_TOKEN');
export const DASHBOARD_PAGE_COMPONENT_TOKEN: InjectionToken<ComponentType<any>> =
new InjectionToken<ComponentType<any>>('DASHBOARD_PAGE_COMPONENT_TOKEN');

22
ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.service.ts
View File

@ -14,21 +14,21 @@
/// limitations under the License.
///
import { Injectable, NgModule } from '@angular/core';
import { Inject, Injectable, Type } from '@angular/core';
import { Observable } from 'rxjs';
import { MatDialog } from '@angular/material/dialog';
import { TranslateService } from '@ngx-translate/core';
import { AuthService } from '@core/auth/auth.service';
import { DynamicComponentFactoryService } from '@core/services/dynamic-component-factory.service';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared/shared.module';
import { mergeMap, tap } from 'rxjs/operators';
import { CustomDialogComponent } from './custom-dialog.component';
import {
CustomDialogContainerComponent,
CustomDialogContainerData
} from '@home/components/widget/dialog/custom-dialog-container.component';
import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module';
import { SHARED_MODULE_TOKEN } from '@shared/components/tokens';
import { SHARED_HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
@Injectable()
export class CustomDialogService {
@ -37,6 +37,8 @@ export class CustomDialogService {
private translate: TranslateService,
private authService: AuthService,
private dynamicComponentFactoryService: DynamicComponentFactoryService,
@Inject(SHARED_MODULE_TOKEN) private sharedModule: Type<any>,
@Inject(SHARED_HOME_COMPONENTS_MODULE_TOKEN) private sharedHomeComponentsModule: Type<any>,
public dialog: MatDialog
) {
}
@ -45,7 +47,7 @@ export class CustomDialogService {
return this.dynamicComponentFactoryService.createDynamicComponentFactory(
class CustomDialogComponentInstance extends CustomDialogComponent {},
template,
[SharedModule, CustomDialogModule, SharedHomeComponentsModule]).pipe(
[this.sharedModule, CommonModule, this.sharedHomeComponentsModule]).pipe(
mergeMap((factory) => {
const dialogData: CustomDialogContainerData = {
controller,
@ -69,15 +71,3 @@ export class CustomDialogService {
}
@NgModule({
declarations:
[
],
imports: [
CommonModule,
SharedModule
],
exports: [
]
})
class CustomDialogModule { }

1
ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
View File

@ -168,6 +168,7 @@ export default abstract class LeafletMap {
this.selectedEntity = data;
this.toggleDrawMode(type);
} else {
// @ts-ignore
this.map.pm.Toolbar.toggleButton(type, false);
}
});

1
ui-ngx/src/app/modules/home/components/widget/lib/rpc/led-indicator.component.scss
View File

@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import "node_modules/compass-sass-mixins/lib/compass";
$error-height: 14px !default;

1
ui-ngx/src/app/modules/home/components/widget/lib/rpc/round-switch.component.scss
View File

@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import "node_modules/compass-sass-mixins/lib/compass";
$error-height: 14px !default;

3
ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
View File

@ -44,6 +44,7 @@ import { SharedModule } from '@shared/shared.module';
import { MODULES_MAP } from '@shared/public-api';
import * as tinycolor_ from 'tinycolor2';
import moment from 'moment';
import { IModulesMap } from '@modules/common/modules-map.models';
const tinycolor = tinycolor_;
@ -64,7 +65,7 @@ export class WidgetComponentService {
private editingWidgetType: WidgetType;
constructor(@Inject(WINDOW) private window: Window,
@Optional() @Inject(MODULES_MAP) private modulesMap: {[key: string]: any},
@Optional() @Inject(MODULES_MAP) private modulesMap: IModulesMap,
private dynamicComponentFactoryService: DynamicComponentFactoryService,
private widgetService: WidgetService,
private utils: UtilsService,

10
ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
View File

@ -30,10 +30,10 @@ import {
DateRangeNavigatorPanelComponent,
DateRangeNavigatorWidgetComponent
} from '@home/components/widget/lib/date-range-navigator/date-range-navigator.component';
import { MultipleInputWidgetComponent } from './lib/multiple-input-widget.component';
import { TripAnimationComponent } from './trip-animation/trip-animation.component';
import { PhotoCameraInputWidgetComponent } from './lib/photo-camera-input.component';
import { GatewayFormComponent } from './lib/gateway/gateway-form.component';
import { MultipleInputWidgetComponent } from '@home/components/widget/lib/multiple-input-widget.component';
import { TripAnimationComponent } from '@home/components/widget/trip-animation/trip-animation.component';
import { PhotoCameraInputWidgetComponent } from '@home/components/widget/lib/photo-camera-input.component';
import { GatewayFormComponent } from '@home/components/widget/lib/gateway/gateway-form.component';
import { ImportExportService } from '@home/components/import-export/import-export.service';
import { NavigationCardsWidgetComponent } from '@home/components/widget/lib/navigation-cards-widget.component';
import { NavigationCardWidgetComponent } from '@home/components/widget/lib/navigation-card-widget.component';
@ -41,7 +41,7 @@ import { EdgesOverviewWidgetComponent } from '@home/components/widget/lib/edges-
import { JsonInputWidgetComponent } from '@home/components/widget/lib/json-input-widget.component';
import { QrCodeWidgetComponent } from '@home/components/widget/lib/qrcode-widget.component';
import { MarkdownWidgetComponent } from '@home/components/widget/lib/markdown-widget.component';
import { SelectEntityDialogComponent } from './lib/maps/dialogs/select-entity-dialog.component';
import { SelectEntityDialogComponent } from '@home/components/widget/lib/maps/dialogs/select-entity-dialog.component';
@NgModule({
declarations:

7
ui-ngx/src/app/modules/home/components/widget/widget.component.ts
View File

@ -107,9 +107,11 @@ import { ComponentType } from '@angular/cdk/portal';
import { EMBED_DASHBOARD_DIALOG_TOKEN } from '@home/components/widget/dialog/embed-dashboard-dialog-token';
import { MobileService } from '@core/services/mobile.service';
import { DialogService } from '@core/services/dialog.service';
import { DashboardPageComponent } from '@home/components/dashboard-page/dashboard-page.component';
import { PopoverPlacement } from '@shared/components/popover.models';
import { TbPopoverService } from '@shared/components/popover.service';
import {
DASHBOARD_PAGE_COMPONENT_TOKEN
} from '@home/components/tokens';
@Component({
selector: 'tb-widget',
@ -183,6 +185,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
private renderer: Renderer2,
private popoverService: TbPopoverService,
@Inject(EMBED_DASHBOARD_DIALOG_TOKEN) private embedDashboardDialogComponent: ComponentType<any>,
@Inject(DASHBOARD_PAGE_COMPONENT_TOKEN) private dashboardPageComponent: ComponentType<any>,
private widgetService: WidgetService,
private resources: ResourcesService,
private timeService: TimeService,
@ -1354,7 +1357,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
]
});
const component = this.popoverService.displayPopover(trigger, this.renderer,
this.widgetContentContainer, DashboardPageComponent, preferredPlacement, hideOnClickOutside,
this.widgetContentContainer, this.dashboardPageComponent, preferredPlacement, hideOnClickOutside,
injector,
{
embed: true,

4
ui-ngx/src/app/modules/home/home.component.ts
View File

@ -25,14 +25,12 @@ import { PageComponent } from '@shared/components/page.component';
import { AppState } from '@core/core.state';
import { getCurrentAuthState, selectAuthUser, selectUserDetails } from '@core/auth/auth.selectors';
import { MediaBreakpoints } from '@shared/models/constants';
import * as _screenfull from 'screenfull';
import screenfull from 'screenfull';
import { MatSidenav } from '@angular/material/sidenav';
import { AuthState } from '@core/auth/auth.models';
import { WINDOW } from '@core/services/window.service';
import { instanceOfSearchableComponent, ISearchableComponent } from '@home/models/searchable-component.models';
const screenfull = _screenfull as _screenfull.Screenfull;
@Component({
selector: 'tb-home',
templateUrl: './home.component.html',

4
ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts
View File

@ -26,11 +26,11 @@ import { Type } from '@angular/core';
import { EntityAction } from './entity-component.models';
import { HasUUID } from '@shared/models/id/has-uuid';
import { PageLink } from '@shared/models/page/page-link';
import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
import { EntityTableHeaderComponent } from '@home/components/entity/entity-table-header.component';
import { ActivatedRoute } from '@angular/router';
import { EntityTabsComponent } from '../../components/entity/entity-tabs.component';
import { DAY, historyInterval } from '@shared/models/time/time.models';
import { IEntitiesTableComponent } from '@home/models/entity/entity-table-component.models';
export type EntityBooleanFunction<T extends BaseData<HasId>> = (entity: T) => boolean;
export type EntityStringFunction<T extends BaseData<HasId>> = (entity: T) => string;
@ -140,7 +140,7 @@ export class EntityTableConfig<T extends BaseData<HasId>, P extends PageLink = P
loadDataOnInit = true;
onLoadAction: (route: ActivatedRoute) => void = null;
table: EntitiesTableComponent = null;
table: IEntitiesTableComponent = null;
useTimePageLink = false;
defaultTimewindowInterval = historyInterval(DAY);
entityType: EntityType = null;

85
ui-ngx/src/app/modules/home/models/entity/entity-table-component.models.ts
View File

@ -0,0 +1,85 @@
///
/// Copyright © 2016-2021 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
import { BaseData, HasId } from '@shared/models/base-data';
import { EntityTypeTranslation } from '@shared/models/entity-type.models';
import { SafeHtml } from '@angular/platform-browser';
import { PageLink } from '@shared/models/page/page-link';
import { Timewindow } from '@shared/models/time/time.models';
import { EntitiesDataSource } from '@home/models/datasource/entity-datasource';
import { ElementRef, EventEmitter } from '@angular/core';
import { TbAnchorComponent } from '@shared/components/tb-anchor.component';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { EntityAction } from '@home/models/entity/entity-component.models';
import {
CellActionDescriptor, EntityActionTableColumn, EntityColumn, EntityTableColumn,
EntityTableConfig,
GroupActionDescriptor,
HeaderActionDescriptor
} from '@home/models/entity/entities-table-config.models';
export interface IEntitiesTableComponent {
entitiesTableConfig: EntityTableConfig<BaseData<HasId>>;
translations: EntityTypeTranslation;
headerActionDescriptors: Array<HeaderActionDescriptor>;
groupActionDescriptors: Array<GroupActionDescriptor<BaseData<HasId>>>;
cellActionDescriptors: Array<CellActionDescriptor<BaseData<HasId>>>;
actionColumns: Array<EntityActionTableColumn<BaseData<HasId>>>;
entityColumns: Array<EntityTableColumn<BaseData<HasId>>>;
displayedColumns: string[];
headerCellStyleCache: Array<any>;
cellContentCache: Array<SafeHtml>;
cellTooltipCache: Array<string>;
cellStyleCache: Array<any>;
selectionEnabled: boolean;
defaultPageSize: number;
displayPagination: boolean;
pageSizeOptions: number[];
pageLink: PageLink;
textSearchMode: boolean;
timewindow: Timewindow;
dataSource: EntitiesDataSource<BaseData<HasId>>;
isDetailsOpen: boolean;
detailsPanelOpened: EventEmitter<boolean>;
entityTableHeaderAnchor: TbAnchorComponent;
searchInputField: ElementRef;
paginator: MatPaginator;
sort: MatSort;
addEnabled(): boolean;
clearSelection(): void;
updateData(closeDetails?: boolean): void;
onRowClick($event: Event, entity): void;
toggleEntityDetails($event: Event, entity);
addEntity($event: Event): void;
onEntityUpdated(entity: BaseData<HasId>): void;
onEntityAction(action: EntityAction<BaseData<HasId>>): void;
deleteEntity($event: Event, entity: BaseData<HasId>): void;
deleteEntities($event: Event, entities: BaseData<HasId>[]): void;
onTimewindowChange(): void;
enterFilterMode(): void;
exitFilterMode(): void;
resetSortAndFilter(update?: boolean, preserveTimewindow?: boolean): void;
columnsUpdated(resetData?: boolean): void;
headerCellStyle(column: EntityColumn<BaseData<HasId>>): any;
clearCellCache(col: number, row: number): void;
cellContent(entity: BaseData<HasId>, column: EntityColumn<BaseData<HasId>>, row: number): any;
cellTooltip(entity: BaseData<HasId>, column: EntityColumn<BaseData<HasId>>, row: number): string;
cellStyle(entity: BaseData<HasId>, column: EntityColumn<BaseData<HasId>>, row: number): any;
trackByColumnKey(index, column: EntityTableColumn<BaseData<HasId>>): string;
trackByEntityId(index: number, entity: BaseData<HasId>): string;
}

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
View File

@ -50,7 +50,7 @@ import {
RuleChainMetaData,
ruleChainNodeComponent, RuleChainType
} from '@shared/models/rule-chain.models';
import { FcItemInfo, FlowchartConstants, NgxFlowchartComponent, UserCallbacks } from 'ngx-flowchart/dist/ngx-flowchart';
import { FcItemInfo, FlowchartConstants, NgxFlowchartComponent, UserCallbacks } from 'ngx-flowchart';
import {
FcRuleEdge,
FcRuleNode,

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.models.ts
View File

@ -14,7 +14,7 @@
/// limitations under the License.
///
import { FcModel } from 'ngx-flowchart/dist/ngx-flowchart';
import { FcModel } from 'ngx-flowchart';
import { FcRuleEdge, FcRuleNode, FcRuleNodeType } from '@shared/models/rule-node.models';
export interface FcRuleNodeTypeModel extends FcModel {

3
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
View File

@ -41,6 +41,7 @@ import { RuleNodeComponentDescriptor } from '@shared/models/rule-node.models';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { ItemBufferService } from '@core/public-api';
import { MODULES_MAP } from '@shared/public-api';
import { IModulesMap } from '@modules/common/modules-map.models';
@Injectable()
export class RuleChainResolver implements Resolve<RuleChain> {
@ -70,7 +71,7 @@ export class ResolvedRuleChainMetaDataResolver implements Resolve<ResolvedRuleCh
export class RuleNodeComponentsResolver implements Resolve<Array<RuleNodeComponentDescriptor>> {
constructor(private ruleChainService: RuleChainService,
@Optional() @Inject(MODULES_MAP) private modulesMap: {[key: string]: any}) {
@Optional() @Inject(MODULES_MAP) private modulesMap: IModulesMap) {
}
resolve(route: ActivatedRouteSnapshot): Observable<Array<RuleNodeComponentDescriptor>> {

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
View File

@ -27,7 +27,7 @@ import {
RuleChainPageComponent
} from './rulechain-page.component';
import { RuleNodeComponent } from '@home/pages/rulechain/rulenode.component';
import { FC_NODE_COMPONENT_CONFIG } from 'ngx-flowchart/dist/ngx-flowchart';
import { FC_NODE_COMPONENT_CONFIG } from 'ngx-flowchart';
import { RuleNodeDetailsComponent } from './rule-node-details.component';
import { RuleNodeLinkComponent } from './rule-node-link.component';
import { LinkLabelsComponent } from '@home/pages/rulechain/link-labels.component';

2
ui-ngx/src/app/modules/home/pages/rulechain/rulenode.component.ts
View File

@ -16,7 +16,7 @@
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { Component, OnInit } from '@angular/core';
import { FcNodeComponent } from 'ngx-flowchart/dist/ngx-flowchart';
import { FcNodeComponent } from 'ngx-flowchart';
import { FcRuleNode, RuleNodeType } from '@shared/models/rule-node.models';
import { Router } from '@angular/router';
import { RuleChainType } from '@app/shared/models/rule-chain.models';

2
ui-ngx/src/app/shared/components/cheatsheet.component.ts
View File

@ -16,6 +16,8 @@
import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
import { Hotkey, HotkeysService } from 'angular2-hotkeys';
import { MousetrapInstance } from 'mousetrap';
import * as Mousetrap from 'mousetrap';
@Component({
selector : 'tb-hotkeys-cheatsheet',

13
ui-ngx/src/app/shared/components/fab-toolbar.component.scss
View File

@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@use "sass:math";
$font-size: 10px !default;
@function rem($multiplier) {
@return $multiplier * $font-size;
@ -47,10 +50,10 @@ $swift-ease-in: all $swift-ease-in-duration $swift-ease-in-timing-function !defa
}
@mixin fab-all-positions() {
@include fab-position(bottom-right, auto, ($button-fab-width - $button-fab-padding)/2, ($button-fab-height - $button-fab-padding)/2, auto);
@include fab-position(bottom-left, auto, auto, ($button-fab-height - $button-fab-padding)/2, ($button-fab-width - $button-fab-padding)/2);
@include fab-position(top-right, ($button-fab-height - $button-fab-padding)/2, ($button-fab-width - $button-fab-padding)/2, auto, auto);
@include fab-position(top-left, ($button-fab-height - $button-fab-padding)/2, auto, auto, ($button-fab-width - $button-fab-padding)/2);
@include fab-position(bottom-right, auto, math.div(($button-fab-width - $button-fab-padding), 2), math.div(($button-fab-height - $button-fab-padding), 2), auto);
@include fab-position(bottom-left, auto, auto, math.div(($button-fab-height - $button-fab-padding), 2), math.div(($button-fab-width - $button-fab-padding), 2));
@include fab-position(top-right, math.div(($button-fab-height - $button-fab-padding), 2), math.div(($button-fab-width - $button-fab-padding), 2), auto, auto);
@include fab-position(top-left, math.div(($button-fab-height - $button-fab-padding), 2), auto, auto, math.div(($button-fab-width - $button-fab-padding), 2));
}
mat-fab-toolbar {
@ -175,7 +178,7 @@ mat-fab-toolbar {
mat-toolbar {
.mat-fab-action-item {
transition: $swift-ease-in;
transition-duration: $swift-ease-in-duration / 2;
transition-duration: math.div($swift-ease-in-duration, 2);
}
}
&.mat-is-open {

3
ui-ngx/src/app/shared/components/hotkeys.directive.ts
View File

@ -16,7 +16,8 @@
import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core';
import { Hotkey } from 'angular2-hotkeys';
import 'mousetrap';
import { MousetrapInstance } from 'mousetrap';
import * as Mousetrap from 'mousetrap';
import { TbCheatSheetComponent } from '@shared/components/cheatsheet.component';
@Directive({

4
ui-ngx/src/app/shared/components/json-form/react/json-form-react.tsx
View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
import * as React from 'react';
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
import { createTheme, ThemeProvider } from '@material-ui/core/styles';
import thingsboardTheme from './styles/thingsboardTheme';
import ThingsboardSchemaForm from './json-form-schema-form';
import { JsonFormProps } from './json-form.models';
const tbTheme = createMuiTheme(thingsboardTheme);
const tbTheme = createTheme(thingsboardTheme);
class ReactSchemaForm extends React.Component<JsonFormProps, {}> {

1
ui-ngx/src/app/shared/components/json-form/react/json-form.scss
View File

@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import "~compass-sass-mixins/lib/compass";
$swift-ease-out-duration: .4s !default;
$swift-ease-out-timing-function: cubic-bezier(.25, .8, .25, 1) !default;

2
ui-ngx/src/app/shared/components/json-form/react/styles/thingsboardTheme.ts
View File

@ -31,7 +31,7 @@
*/
import indigo from '@material-ui/core/colors/indigo';
import deeepOrange from '@material-ui/core/colors/deepOrange';
import { ThemeOptions } from '@material-ui/core/styles/createMuiTheme';
import { ThemeOptions } from '@material-ui/core/styles';
import { PaletteOptions } from '@material-ui/core/styles/createPalette';
import { mergeDeep } from '@core/utils';

10
ui-ngx/src/app/shared/components/nav-tree.component.ts
View File

@ -76,19 +76,19 @@ export class NavTreeComponent implements OnInit {
}
@Input()
private loadNodes: LoadNodesCallback;
loadNodes: LoadNodesCallback;
@Input()
private searchCallback: NodeSearchCallback;
searchCallback: NodeSearchCallback;
@Input()
private onNodeSelected: NodeSelectedCallback;
onNodeSelected: NodeSelectedCallback;
@Input()
private onNodesInserted: NodesInsertedCallback;
onNodesInserted: NodesInsertedCallback;
@Input()
private editCallbacks: NavTreeEditCallbacks;
editCallbacks: NavTreeEditCallbacks;
private treeElement: JSTree;

2
ui-ngx/src/app/shared/components/popover.component.scss
View File

@ -124,7 +124,7 @@ $box-shadow-base: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0,
height: sqrt($popover-arrow-width * $popover-arrow-width * 2) + px;
background: transparent;
border-style: solid;
border-width: (sqrt($popover-arrow-width * $popover-arrow-width * 2) / 2) + px;
border-width: (sqrt($popover-arrow-width * $popover-arrow-width * 2) * 0.5) + px;
transform: rotate(45deg);
z-index: 10;
}

2
ui-ngx/src/app/shared/components/tokens.ts
View File

@ -21,4 +21,4 @@ export const HELP_MARKDOWN_COMPONENT_TOKEN: InjectionToken<ComponentType<any>> =
new InjectionToken<ComponentType<any>>('HELP_MARKDOWN_COMPONENT_TOKEN');
export const SHARED_MODULE_TOKEN: InjectionToken<Type<any>> =
new InjectionToken<Type<any>>('HELP_MARKDOWN_COMPONENT_TOKEN');
new InjectionToken<Type<any>>('SHARED_MODULE_TOKEN');

3
ui-ngx/src/app/shared/models/constants.ts
View File

@ -15,6 +15,7 @@
///
import { InjectionToken } from '@angular/core';
import { IModulesMap } from '@modules/common/modules-map.models';
export const Constants = {
serverErrorCode: {
@ -244,4 +245,4 @@ export const contentTypesMap = new Map<ContentType, ContentTypeData>(
export const customTranslationsPrefix = 'custom.';
export const i18nPrefix = 'i18n';
export const MODULES_MAP = new InjectionToken<{[key: string]: any}>('ModulesMap');
export const MODULES_MAP = new InjectionToken<IModulesMap>('ModulesMap');

2
ui-ngx/src/app/shared/models/rule-node.models.ts
View File

@ -18,7 +18,7 @@ import { BaseData } from '@shared/models/base-data';
import { RuleChainId } from '@shared/models/id/rule-chain-id';
import { RuleNodeId } from '@shared/models/id/rule-node-id';
import { ComponentDescriptor } from '@shared/models/component-descriptor.models';
import { FcEdge, FcNode } from 'ngx-flowchart/dist/ngx-flowchart';
import { FcEdge, FcNode } from 'ngx-flowchart';
import { Observable } from 'rxjs';
import { PageComponent } from '@shared/components/page.component';
import { AfterViewInit, EventEmitter, Inject, OnInit, Directive } from '@angular/core';

6
ui-ngx/src/app/shared/shared.module.ts
View File

@ -21,7 +21,7 @@ import { LogoComponent } from '@shared/components/logo.component';
import { TbSnackBarComponent, ToastDirective } from '@shared/components/toast.directive';
import { BreadcrumbComponent } from '@shared/components/breadcrumb.component';
import { FlowInjectionToken, NgxFlowModule } from '@flowjs/ngx-flow';
import { NgxFlowchartModule } from 'ngx-flowchart/dist/ngx-flowchart';
import { NgxFlowchartModule } from 'ngx-flowchart';
import Flow from '@flowjs/flow.js';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@ -132,7 +132,7 @@ import { NavTreeComponent } from '@shared/components/nav-tree.component';
import { LedLightComponent } from '@shared/components/led-light.component';
import { TbJsonToStringDirective } from '@shared/components/directives/tb-json-to-string.directive';
import { JsonObjectEditDialogComponent } from '@shared/components/dialog/json-object-edit-dialog.component';
import { HistorySelectorComponent } from './components/time/history-selector/history-selector.component';
import { HistorySelectorComponent } from '@shared/components/time/history-selector/history-selector.component';
import { EntityGatewaySelectComponent } from '@shared/components/entity/entity-gateway-select.component';
import { DndModule } from 'ngx-drag-drop';
import { QueueTypeListComponent } from '@shared/components/queue/queue-type-list.component';
@ -155,7 +155,7 @@ import { MarkedOptionsService } from '@shared/components/marked-options.service'
import { TbPopoverService } from '@shared/components/popover.service';
import { HELP_MARKDOWN_COMPONENT_TOKEN, SHARED_MODULE_TOKEN } from '@shared/components/tokens';
import { TbMarkdownComponent } from '@shared/components/markdown.component';
import { ProtobufContentComponent } from './components/protobuf-content.component';
import { ProtobufContentComponent } from '@shared/components/protobuf-content.component';
export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
return markedOptionsService;

2
ui-ngx/src/environments/environment.ts
View File

@ -35,4 +35,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

2
ui-ngx/src/polyfills.ts
View File

@ -73,7 +73,7 @@
*/
import './zone-flags';
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.
import 'core-js/es/array';
/***************************************************************************************************

1
ui-ngx/src/scss/animations.scss
View File

@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import "~compass-sass-mixins/lib/animate";
@keyframes tbMoveFromTopFade {
from {

4
ui-ngx/src/scss/mixins.scss
View File

@ -13,6 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@use "sass:math";
@mixin tb-mat-icon-size($size) {
width: #{$size}px;
min-width: #{$size}px;
@ -51,7 +53,7 @@
$x1: $x0;
@for $i from 1 through 10 {
$x1: $x0 - ($x0 * $x0 - abs($r)) / (2 * $x0);
$x1: $x0 - math.div($x0 * $x0 - abs($r), 2 * $x0);
$x0: $x1;
}

2
ui-ngx/src/test.ts
View File

@ -16,7 +16,7 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,

115
ui-ngx/src/theme.scss
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import '~@angular/material/theming';
@use '~@angular/material' as mat;
@import '~@mat-datetimepicker/core/datetimepicker/datetimepicker-theme.scss';
@import './scss/constants';
@include mat-core();
@include mat.core();
$tb-primary-color: #305680;
$tb-secondary-color: #527dad;
@ -41,39 +41,39 @@ $tb-mat-indigo: (
A400: #3d5afe,
A700: #304ffe,
contrast: (
50: $dark-primary-text,
100: $dark-primary-text,
200: $dark-primary-text,
300: $light-primary-text,
400: $light-primary-text,
500: $light-primary-text,
600: $light-primary-text,
700: $light-primary-text,
800: $light-primary-text,
900: $light-primary-text,
A100: $dark-primary-text,
A200: $light-primary-text,
A400: $light-primary-text,
A700: $light-primary-text,
50: rgba(black, 0.87),
100: rgba(black, 0.87),
200: rgba(black, 0.87),
300: white,
400: white,
500: white,
600: white,
700: white,
800: white,
900: white,
A100: rgba(black, 0.87),
A200: white,
A400: white,
A700: white,
)
);
$tb-primary: mat-palette($tb-mat-indigo);
$tb-accent: mat-palette($mat-deep-orange);
$tb-primary: mat.define-palette($tb-mat-indigo);
$tb-accent: mat.define-palette(mat.$deep-orange-palette);
$background: (background: map_get($mat-grey, 200));
$background: (background: map_get(mat.$grey-palette, 200));
$tb-theme-background: map_merge($mat-light-theme-background, $background);
$tb-theme-background: map_merge(mat.$light-theme-background-palette, $background);
$tb-mat-theme: mat-light-theme(
$tb-mat-theme: mat.define-light-theme(
$tb-primary,
$tb-accent
);
$tb-theme: map_merge($tb-mat-theme, (background: $tb-theme-background));
$primary: mat-color($tb-primary);
$accent: mat-color($tb-accent);
$primary: mat.get-color-from-palette($tb-primary);
$accent: mat.get-color-from-palette($tb-accent);
$tb-dark-mat-indigo: (
50: #e8eaf6,
@ -91,24 +91,24 @@ $tb-dark-mat-indigo: (
A400: #3d5afe,
A700: #304ffe,
contrast: (
50: $dark-primary-text,
100: $dark-primary-text,
200: $dark-primary-text,
300: $dark-primary-text,
400: $dark-primary-text,
50: rgba(black, 0.87),
100: rgba(black, 0.87),
200: rgba(black, 0.87),
300: rgba(black, 0.87),
400: rgba(black, 0.87),
500: map_get($tb-mat-indigo, 900),
600: $light-primary-text,
700: $light-primary-text,
800: $light-primary-text,
900: $light-primary-text,
A100: $dark-primary-text,
A200: $dark-primary-text,
A400: $dark-primary-text,
A700: $dark-primary-text,
600: white,
700: white,
800: white,
900: white,
A100: rgba(black, 0.87),
A200: rgba(black, 0.87),
A400: rgba(black, 0.87),
A700: rgba(black, 0.87),
)
);
$tb-dark-primary: mat-palette($tb-dark-mat-indigo);
$tb-dark-primary: mat.define-palette($tb-dark-mat-indigo);
$tb-dark-theme-background: (
status-bar: black,
@ -119,22 +119,22 @@ $tb-dark-theme-background: (
dialog: map_get($tb-dark-mat-indigo, 800),
disabled-button: rgba(white, 0.12),
raised-button: map-get($tb-dark-mat-indigo, 50),
focused-button: $light-focused,
focused-button: rgba(white, 0.12),
selected-button: map_get($tb-dark-mat-indigo, 900),
selected-disabled-button: map_get($tb-dark-mat-indigo, 800),
disabled-button-toggle: black,
unselected-chip: map_get($tb-dark-mat-indigo, 700),
disabled-list-option: black,
tooltip: map_get($mat-grey, 700),
tooltip: map_get(mat.$grey-palette, 700),
);
@function get-tb-dark-theme($primary, $accent, $warn: mat-palette($mat-red)) {
@function get-tb-dark-theme($primary, $accent, $warn: mat.define-palette(mat.$red-palette)) {
@return (
primary: $primary,
accent: $accent,
warn: $warn,
is-dark: true,
foreground: $mat-dark-theme-foreground,
foreground: mat.$dark-theme-foreground-palette,
background: $tb-dark-theme-background,
);
}
@ -153,30 +153,33 @@ $tb-dark-theme: get-tb-dark-theme(
mat-fab-toolbar {
.mat-fab-toolbar-background {
background: mat-color($background, app-bar);
color: mat-color($foreground, text);
background: mat.get-color-from-palette($background, app-bar);
color: mat.get-color-from-palette($foreground, text);
}
&.mat-primary {
.mat-fab-toolbar-background {
@include _mat-toolbar-color($primary);
background: mat.get-color-from-palette($primary);
color: mat.get-color-from-palette($primary, default-contrast);
}
}
&.mat-accent {
.mat-fab-toolbar-background {
@include _mat-toolbar-color($accent);
background: mat.get-color-from-palette($accent);
color: mat.get-color-from-palette($accent, default-contrast);
}
}
&.mat-warn {
.mat-fab-toolbar-background {
@include _mat-toolbar-color($warn);
background: mat.get-color-from-palette($warn);
color: mat.get-color-from-palette($warn, default-contrast);
}
}
}
}
@mixin _mat-toolbar-inverse-color($palette) {
background: mat-color($palette, default-contrast);
color: $dark-primary-text;
background: mat.get-color-from-palette($palette, default-contrast);
color: rgba(black, 0.87);
}
@mixin mat-fab-toolbar-inverse-theme($theme) {
@ -188,8 +191,8 @@ $tb-dark-theme: get-tb-dark-theme(
mat-fab-toolbar {
.mat-fab-toolbar-background {
background: mat-color($background, app-bar);
color: mat-color($foreground, text);
background: mat.get-color-from-palette($background, app-bar);
color: mat.get-color-from-palette($foreground, text);
}
&.mat-primary {
.mat-fab-toolbar-background {
@ -201,15 +204,15 @@ $tb-dark-theme: get-tb-dark-theme(
@include _mat-toolbar-inverse-color($primary);
button.mat-icon-button {
mat-icon {
color: mat-color($primary);
color: mat.get-color-from-palette($primary);
}
}
}
}
.mat-fab {
&.mat-primary {
background: mat-color($primary, default-contrast);
color: mat-color($primary);
background: mat.get-color-from-palette($primary, default-contrast);
color: mat.get-color-from-palette($primary);
}
}
}
@ -221,7 +224,7 @@ $tb-dark-theme: get-tb-dark-theme(
mat-toolbar{
&.mat-hue-3 {
background-color: mat-color($primary, 'A100');
background-color: mat.get-color-from-palette($primary, 'A100');
}
}
@ -233,12 +236,12 @@ $tb-dark-theme: get-tb-dark-theme(
}
.tb-default {
@include angular-material-theme($tb-theme);
@include mat.all-component-themes($tb-theme);
@include mat-datetimepicker-theme($tb-theme);
@include tb-components-theme($tb-theme);
}
.tb-dark {
@include angular-material-theme($tb-dark-theme);
@include mat.all-component-themes($tb-dark-theme);
}

2
ui-ngx/src/tsconfig.app.json
View File

@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": ["node", "jquery", "flot", "tooltipster", "tinycolor2", "js-beautify",
"react", "react-dom", "jstree", "raphael", "canvas-gauges"]
"react", "react-dom", "jstree", "raphael", "canvas-gauges", "systemjs"]
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true

1493
ui-ngx/src/typings/leaflet-geoman-extend.d.ts
View File

File diff suppressed because it is too large

21
ui-ngx/tsconfig.json
View File

@ -3,15 +3,18 @@
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
"module": "es2020",
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2017",
"module": "es2020",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"importHelpers": true,
"target": "es5",
"jsx": "react",
"typeRoots": [
"node_modules/@types",
@ -20,7 +23,6 @@
"src/typings/jquery.flot.typings.d.ts",
"src/typings/jquery.jstree.typings.d.ts",
"src/typings/split.js.typings.d.ts",
"node_modules/@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.d.ts",
"src/typings/leaflet-geoman-extend.d.ts"
],
"paths": {
@ -52,9 +54,14 @@
]
},
"lib": [
"es2018",
"es2019",
"es2020",
"dom"
]
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
"strictInjectionParameters": true,
"strictInputAccessModifiers": true,
"strictTemplates": false
}
}

7565
ui-ngx/yarn.lock
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save