From fd1a069214fea9c3f4b8fb0b0ba42893c6a26c65 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 19 Feb 2020 13:39:50 +0200 Subject: [PATCH] Update versions --- ui-ngx/angular.json | 4 +- ui-ngx/package-lock.json | 38 ++++----- ui-ngx/package.json | 79 +++++++++--------- ui-ngx/proxy.conf.json | 14 ---- .../shared/components/nav-tree.component.scss | 65 +++++++++++++- .../assets/jstree/{32px.png => tb32px.png} | Bin .../assets/jstree/{40px.png => tb40px.png} | Bin 7 files changed, 122 insertions(+), 78 deletions(-) delete mode 100644 ui-ngx/proxy.conf.json rename ui-ngx/src/assets/jstree/{32px.png => tb32px.png} (100%) rename ui-ngx/src/assets/jstree/{40px.png => tb40px.png} (100%) diff --git a/ui-ngx/angular.json b/ui-ngx/angular.json index 2031867edc..f6cf3125d5 100644 --- a/ui-ngx/angular.json +++ b/ui-ngx/angular.json @@ -107,8 +107,8 @@ "budgets": [ { "type": "initial", - "maximumWarning": "5mb", - "maximumError": "10mb" + "maximumWarning": "9mb", + "maximumError": "12mb" } ] } diff --git a/ui-ngx/package-lock.json b/ui-ngx/package-lock.json index d926ee5c35..33f404b76c 100644 --- a/ui-ngx/package-lock.json +++ b/ui-ngx/package-lock.json @@ -1845,9 +1845,9 @@ } }, "@types/jasmine": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.4.tgz", - "integrity": "sha512-Uc/obv/lRh1t6RMOV6wkiAfYSZ0AOSTJqVl0Th8bHFcDhw4rQ0L60sxVnmOJj+RXbVboAE1Fd/mBclQWARRAsQ==", + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.5.tgz", + "integrity": "sha512-LlhwGivHkUV8ehNmaXjGGXopLm91G9ORIRcjw7Ya47jVAIGudewFZM2PdPXBvueZfRWwYzLt083wiPfKRXrSlg==", "dev": true }, "@types/jasminewd2": { @@ -1894,9 +1894,9 @@ "integrity": "sha512-13gmo3M2qVvjQrWNseqM3+cR6S2Ss3grbR2NZltgMq94wOwqJYQdgn8qzwDshzgXqMlSUtyPZjysImmktu22ew==" }, "@types/node": { - "version": "13.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz", - "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==", + "version": "13.7.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.2.tgz", + "integrity": "sha512-uvilvAQbdJvnSBFcKJ2td4016urcGvsiR+N4dHGU87ml8O2Vl6l+ErOi9w0kXSPiwJ1AYlIW+0pDXDWWMOiWbw==", "dev": true }, "@types/prop-types": { @@ -5372,9 +5372,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.354", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.354.tgz", - "integrity": "sha512-24YMkNiZWOUeF6YeoscWfIGP0oMx+lJpU/miwI+lcu7plIDpyZn8Gx0lx0qTDlzGoz7hx+lpyD8QkbkX5L2Pqw==", + "version": "1.3.355", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz", + "integrity": "sha512-zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ==", "dev": true }, "elliptic": { @@ -8673,9 +8673,9 @@ } }, "make-error": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, "make-fetch-happen": { @@ -9418,7 +9418,7 @@ } }, "ngx-flowchart": { - "version": "git://github.com/thingsboard/ngx-flowchart.git#684c71fa3f15f99c5c22c8a6cf69a12d0b12be6e", + "version": "git://github.com/thingsboard/ngx-flowchart.git#97a77477ca8579becf0e3a07866046b4536fe30a", "from": "git://github.com/thingsboard/ngx-flowchart.git#master", "requires": { "tslib": "^1.10.0" @@ -11124,9 +11124,9 @@ } }, "postcss-value-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", - "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", + "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", "dev": true }, "prepend-http": { @@ -13972,9 +13972,9 @@ "dev": true }, "uglify-js": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz", - "integrity": "sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz", + "integrity": "sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==", "optional": true, "requires": { "commander": "~2.20.3", diff --git a/ui-ngx/package.json b/ui-ngx/package.json index bfc5afae99..a8375a169d 100644 --- a/ui-ngx/package.json +++ b/ui-ngx/package.json @@ -13,33 +13,33 @@ }, "private": true, "dependencies": { - "@angular/animations": "~9.0.0", - "@angular/cdk": "~9.0.0", - "@angular/common": "~9.0.0", - "@angular/compiler": "~9.0.0", - "@angular/core": "~9.0.0", + "@angular/animations": "^9.0.1", + "@angular/cdk": "^9.0.0", + "@angular/common": "^9.0.1", + "@angular/compiler": "^9.0.1", + "@angular/core": "^9.0.1", "@angular/flex-layout": "^9.0.0-beta.29", - "@angular/forms": "~9.0.0", + "@angular/forms": "^9.0.1", "@angular/material": "^9.0.0", - "@angular/platform-browser": "~9.0.0", - "@angular/platform-browser-dynamic": "~9.0.0", - "@angular/router": "~9.0.0", + "@angular/platform-browser": "^9.0.1", + "@angular/platform-browser-dynamic": "^9.0.1", + "@angular/router": "^9.0.1", "@auth0/angular-jwt": "^4.0.0", - "@date-io/date-fns": "^2.3.0", + "@date-io/date-fns": "^2.4.0", "@flowjs/flow.js": "^2.14.0", "@flowjs/ngx-flow": "^0.4.3", - "@mat-datetimepicker/core": "^4.0.0", - "@material-ui/core": "^4.9.2", + "@mat-datetimepicker/core": "^4.0.1", + "@material-ui/core": "^4.9.3", "@material-ui/icons": "^4.9.1", "@material-ui/pickers": "^3.2.10", "@ngrx/effects": "^8.6.0", "@ngrx/store": "^8.6.0", "@ngrx/store-devtools": "^8.6.0", "@ngx-share/core": "^7.1.4", - "@ngx-translate/core": "^12.0.0", + "@ngx-translate/core": "^12.1.1", "@ngx-translate/http-loader": "^4.0.0", "ace-builds": "^1.4.8", - "angular-gridster2": "^9.0.0", + "angular-gridster2": "^9.0.1", "angular2-hotkeys": "^2.1.5", "base64-js": "^1.3.1", "canvas-gauges": "^2.1.5", @@ -52,15 +52,15 @@ "font-awesome": "^4.7.0", "javascript-detect-element-resize": "^0.5.3", "jquery": "^3.4.1", - "jquery.terminal": "^2.12.0", + "jquery.terminal": "^2.14.0", "js-beautify": "^1.10.3", "json-schema-defaults": "^0.4.0", - "jstree": "^3.3.8", + "jstree": "^3.3.9", "jstree-bootstrap-theme": "^1.0.1", "material-design-icons": "^3.0.1", "messageformat": "^2.3.0", "moment": "^2.24.0", - "ngx-clipboard": "^12.3.0", + "ngx-clipboard": "^12.3.1", "ngx-color-picker": "^9.0.0", "ngx-daterangepicker-material": "^2.2.0", "ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#master", @@ -77,7 +77,7 @@ "reactcss": "^1.2.3", "rxjs": "^6.5.4", "schema-inspector": "1.6.8", - "screenfull": "^5.0.1", + "screenfull": "^5.0.2", "split.js": "^1.5.11", "systemjs": "0.21.5", "tinycolor2": "^1.4.1", @@ -89,40 +89,37 @@ }, "devDependencies": { "@angular-builders/custom-webpack": "^9.0.0-beta.7", - "@angular-devkit/build-angular": "~0.900.1", - "@angular/cli": "^9.0.1", - "@angular/compiler-cli": "~9.0.0", - "@angular/language-service": "~9.0.0", + "@angular-devkit/build-angular": "^0.900.2", + "@angular/cli": "^9.0.2", + "@angular/compiler-cli": "^9.0.1", + "@angular/language-service": "^9.0.1", "@types/canvas-gauges": "^2.1.2", - "@types/flot": "0.0.31", - "@types/jasmine": "^3.5.3", - "@types/jasminewd2": "~2.0.8", + "@types/flot": "^0.0.31", + "@types/jasmine": "^3.5.5", + "@types/jasminewd2": "^2.0.8", "@types/jquery": "^3.3.32", "@types/js-beautify": "^1.8.1", "@types/jstree": "^3.3.39", - "@types/node": "^13.7.0", + "@types/node": "^13.7.2", "@types/raphael": "^2.1.30", - "@types/react": "^16.9.19", + "@types/react": "^16.9.20", "@types/react-dom": "^16.9.5", "@types/tinycolor2": "^1.4.2", - "@types/tooltipster": "0.0.29", - "codelyzer": "^5.1.2", + "@types/tooltipster": "^0.0.29", + "codelyzer": "^5.2.1", "compression-webpack-plugin": "^3.1.0", "directory-tree": "^2.2.4", - "jasmine-core": "~3.5.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "~4.4.1", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage-istanbul-reporter": "~2.1.1", - "karma-jasmine": "~3.1.0", + "jasmine-core": "^3.5.0", + "jasmine-spec-reporter": "^4.2.1", + "karma": "^4.4.1", + "karma-chrome-launcher": "^3.1.0", + "karma-coverage-istanbul-reporter": "^2.1.1", + "karma-jasmine": "^3.1.1", "karma-jasmine-html-reporter": "^1.5.2", "ngrx-store-freeze": "^0.2.4", "protractor": "^5.4.3", - "ts-node": "~8.6.2", - "tslint": "~6.0.0", - "typescript": "~3.7.5" - }, - "resolutions": { - "serialize-javascript": "^2.1.1" + "ts-node": "^8.6.2", + "tslint": "^6.0.0", + "typescript": "^3.7.5" } } diff --git a/ui-ngx/proxy.conf.json b/ui-ngx/proxy.conf.json deleted file mode 100644 index a558aee24e..0000000000 --- a/ui-ngx/proxy.conf.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "/api": { - "target": "http://localhost:8080", - "secure": false - }, - "/static/rulenode": { - "target": "http://localhost:8080", - "secure": false - }, - "/api/ws": { - "target": "ws://localhost:8080", - "ws": true - } -} diff --git a/ui-ngx/src/app/shared/components/nav-tree.component.scss b/ui-ngx/src/app/shared/components/nav-tree.component.scss index e57cca30f7..46290a277d 100644 --- a/ui-ngx/src/app/shared/components/nav-tree.component.scss +++ b/ui-ngx/src/app/shared/components/nav-tree.component.scss @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + .tb-nav-tree-container { padding: 15px; font-family: Roboto, "Helvetica Neue", sans-serif; @@ -20,7 +21,7 @@ &.jstree-proton, &.jstree-proton-small, &.jstree-proton-large { .jstree-node, .jstree-icon { - background-image: url("../../../assets/jstree/32px.png"); + background-image: url("../../../assets/jstree/tb32px.png"); } .jstree-last { @@ -43,6 +44,14 @@ .jstree-anchor { font-size: 16px; } + + .jstree-file { + background: url("../../../assets/jstree/tb32px.png") -101px -69px no-repeat; + } + + .jstree-folder { + background: url("../../../assets/jstree/tb32px.png") -261px -5px no-repeat; + } } &.jstree-proton-small { @@ -56,6 +65,14 @@ .jstree-anchor { font-size: 14px; } + + .jstree-file { + background: url("../../../assets/jstree/tb32px.png") -103px -71px no-repeat; + } + + .jstree-folder { + background: url("../../../assets/jstree/tb32px.png") -263px -7px no-repeat; + } } &.jstree-proton-large { @@ -69,6 +86,14 @@ .jstree-anchor { font-size: 20px; } + + .jstree-file { + background: url("../../../assets/jstree/tb32px.png") -96px -64px no-repeat; + } + + .jstree-folder { + background: url("../../../assets/jstree/tb32px.png") -256px 0px no-repeat; + } } a { @@ -120,6 +145,15 @@ } } +#jstree-dnd { + &.jstree-proton, &.jstree-proton-small, &.jstree-proton-large { + .jstree-ok, + .jstree-er { + background-image: url("../../../assets/jstree/tb32px.png"); + } + } +} + @media (max-width: 768px) { .tb-nav-tree-container { &.jstree-proton-responsive { @@ -128,7 +162,7 @@ .jstree-node > .jstree-ocl, .jstree-themeicon, .jstree-checkbox { - background-image: url("../../../assets/jstree/40px.png"); + background-image: url("../../../assets/jstree/tb40px.png"); background-size: 120px 240px; } @@ -215,6 +249,15 @@ background-position: -40px -40px; } + .jstree-file { + background: url("../../../assets/jstree/tb40px.png") 0 -160px no-repeat; + background-size: 120px 240px; + } + .jstree-folder { + background: url("../../../assets/jstree/tb40px.png") -40px -40px no-repeat; + background-size: 120px 240px; + } + .jstree-checkbox, .jstree-checkbox:hover { background-position: -40px -80px; @@ -289,6 +332,24 @@ } } +@media (max-width: 768px) { + #jstree-dnd { + &.jstree-dnd-responsive { + .jstree-ok, + .jstree-er { + background-image: url("../../../assets/jstree/tb40px.png"); + background-size: 120px 240px; + } + .jstree-ok { + background-position: 0 -200px; + } + .jstree-er { + background-position: -40px -200px; + } + } + } +} + .tb-nav-tree .mat-button.tb-active { font-weight: 500; background-color: rgba(255, 255, 255, .15); diff --git a/ui-ngx/src/assets/jstree/32px.png b/ui-ngx/src/assets/jstree/tb32px.png similarity index 100% rename from ui-ngx/src/assets/jstree/32px.png rename to ui-ngx/src/assets/jstree/tb32px.png diff --git a/ui-ngx/src/assets/jstree/40px.png b/ui-ngx/src/assets/jstree/tb40px.png similarity index 100% rename from ui-ngx/src/assets/jstree/40px.png rename to ui-ngx/src/assets/jstree/tb40px.png