Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0

ui-ngx/LICENSE

@@ -178,7 +178,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2016 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.
@@ -198,4 +198,4 @@
    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.
+   limitations under the License.

ui-ngx/package.json

@@ -6,24 +6,24 @@
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --open",
     "build": "ng build",
-    "build:prod": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng build --prod --vendor-chunk",
+    "build:prod": "ng build --prod --vendor-chunk",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^9.0.1",
+    "@angular/animations": "^9.0.7",
-    "@angular/cdk": "^9.0.0",
+    "@angular/cdk": "^9.1.3",
-    "@angular/common": "^9.0.1",
+    "@angular/common": "^9.0.7",
-    "@angular/compiler": "^9.0.1",
+    "@angular/compiler": "^9.0.7",
-    "@angular/core": "^9.0.1",
+    "@angular/core": "^9.0.7",
     "@angular/flex-layout": "^9.0.0-beta.29",
-    "@angular/forms": "^9.0.1",
+    "@angular/forms": "^9.0.7",
-    "@angular/material": "^9.0.0",
+    "@angular/material": "^9.1.3",
-    "@angular/platform-browser": "^9.0.1",
+    "@angular/platform-browser": "^9.0.7",
-    "@angular/platform-browser-dynamic": "^9.0.1",
+    "@angular/platform-browser-dynamic": "^9.0.7",
-    "@angular/router": "^9.0.1",
+    "@angular/router": "^9.0.7",
     "@auth0/angular-jwt": "^4.0.0",
     "@date-io/date-fns": "^2.4.0",
     "@flowjs/flow.js": "^2.14.0",
@@ -69,7 +69,7 @@
     "ngx-color-picker": "^9.0.0",
     "ngx-daterangepicker-material": "^2.2.0",
     "ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#master",
-    "ngx-hm-carousel": "^1.7.2",
+    "ngx-hm-carousel": "^2.0.0-rc.1",
     "ngx-translate-messageformat-compiler": "^4.5.0",
     "objectpath": "^2.0.0",
     "prop-types": "^15.7.2",
@@ -94,10 +94,10 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "^9.0.0-beta.7",
-    "@angular-devkit/build-angular": "^0.900.2",
+    "@angular-devkit/build-angular": "^0.900.7",
-    "@angular/cli": "^9.0.2",
+    "@angular/cli": "^9.0.7",
-    "@angular/compiler-cli": "^9.0.1",
+    "@angular/compiler-cli": "^9.0.7",
-    "@angular/language-service": "^9.0.1",
+    "@angular/language-service": "^9.0.7",
     "@types/canvas-gauges": "^2.1.2",
     "@types/flot": "^0.0.31",
     "@types/jasmine": "^3.5.5",
@@ -127,6 +127,6 @@
     "protractor": "^5.4.3",
     "ts-node": "^8.6.2",
     "tslint": "^6.0.0",
-    "typescript": "^3.7.5"
+    "typescript": "~3.7.5"
   }
 }

ui-ngx/pom.xml

@@ -57,8 +57,8 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v10.16.0</nodeVersion>
+                            <nodeVersion>v12.16.1</nodeVersion>
-                            <npmVersion>6.9.0</npmVersion>
+                            <npmVersion>6.13.4</npmVersion>
                         </configuration>
                     </execution>
                     <execution>

ui-ngx/src/app/app.component.ts

@@ -14,6 +14,8 @@
 /// limitations under the License.
 ///
 
+import 'hammerjs';
+
 import { Component, OnInit } from '@angular/core';
 
 import { environment as env } from '@env/environment';

ui-ngx/src/app/core/utils.ts

@@ -401,6 +401,10 @@ export function isEqual(a: any, b: any): boolean {
   return _.isEqual(a, b);
 }
 
+export function mergeDeep<T>(target: T, ...sources: T[]): T {
+  return _.merge(target, ...sources);
+}
+
 export function guid(): string {
   function s4(): string {
     return Math.floor((1 + Math.random()) * 0x10000)
@@ -565,4 +569,4 @@ export function padValue(val: any, dec: number): string {
   }
   strVal = (n ? '-' : '') + strVal;
   return strVal;
-}
+}

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

@@ -33,17 +33,18 @@ 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 { PaletteOptions } from '@material-ui/core/styles/createPalette';
-import { deepClone } from '@core/utils';
+import { mergeDeep } from '@core/utils';
 
 const PRIMARY_COLOR = '#305680';
 const SECONDARY_COLOR = '#527dad';
 const HUE3_COLOR = '#a7c1de';
 
-const tbIndigo = deepClone(indigo);
+const tbIndigo = mergeDeep<any>({}, indigo, {
-tbIndigo['500'] = PRIMARY_COLOR;
+  500: PRIMARY_COLOR,
-tbIndigo['600'] = SECONDARY_COLOR;
+  600: SECONDARY_COLOR,
-tbIndigo['700'] = tbIndigo['500'];
+  700: PRIMARY_COLOR,
-tbIndigo.A100 = HUE3_COLOR;
+  A100: HUE3_COLOR
+});
 
 const thingsboardPalette: PaletteOptions = {
   primary: tbIndigo,