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

Fix issues after angular update

pull/2663/head
Igor Kulikov 7 years ago
parent
bee843696c
commit
256500ee85
7 changed files with 1484 additions and 3267 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. 4644
      ui-ngx/package-lock.json
  2. 92
      ui-ngx/package.json
  3. 2
      ui-ngx/src/app/modules/home/home.component.ts
  4. 2
      ui-ngx/src/app/modules/home/pages/dashboard/states/entity-state-controller.component.ts
  5. 2
      ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts
  6. 7
      ui-ngx/src/app/shared/components/led-light.component.ts
  7. 2
      ui-ngx/src/app/shared/components/logo.component.ts

4644
ui-ngx/package-lock.json
View File

File diff suppressed because it is too large

92
ui-ngx/package.json
View File

@ -20,115 +20,115 @@
"@angular/core": "^9.1.2",
"@angular/flex-layout": "^9.0.0-beta.29",
"@angular/forms": "^9.1.2",
"@angular/material": "^9.1.3",
"@angular/material": "^9.2.1",
"@angular/platform-browser": "^9.1.2",
"@angular/platform-browser-dynamic": "^9.1.2",
"@angular/router": "^9.1.2",
"@auth0/angular-jwt": "^4.0.0",
"@date-io/date-fns": "^2.4.0",
"@date-io/date-fns": "^2.6.1",
"@flowjs/flow.js": "^2.14.0",
"@flowjs/ngx-flow": "^0.4.3",
"@mat-datetimepicker/core": "^4.1.0",
"@material-ui/core": "^4.9.3",
"@material-ui/core": "^4.9.11",
"@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",
"@ngrx/effects": "^9.1.0",
"@ngrx/store": "^9.1.0",
"@ngrx/store-devtools": "^9.1.0",
"@ngx-share/core": "^7.1.4",
"@ngx-translate/core": "^12.1.1",
"@ngx-translate/core": "^12.1.2",
"@ngx-translate/http-loader": "^4.0.0",
"ace-builds": "^1.4.8",
"angular-gridster2": "^9.0.1",
"angular2-hotkeys": "^2.1.5",
"ace-builds": "^1.4.11",
"angular-gridster2": "^9.1.0",
"angular2-hotkeys": "^2.2.0",
"base64-js": "^1.3.1",
"canvas-gauges": "^2.1.5",
"canvas-gauges": "^2.1.7",
"compass-sass-mixins": "^0.12.7",
"core-js": "^3.6.4",
"date-fns": "^2.9.0",
"core-js": "^3.6.5",
"date-fns": "^2.12.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",
"javascript-detect-element-resize": "^0.5.3",
"jquery": "^3.4.1",
"jquery.terminal": "^2.14.0",
"js-beautify": "^1.10.3",
"jquery": "^3.5.0",
"jquery.terminal": "^2.15.4",
"js-beautify": "^1.11.0",
"json-schema-defaults": "^0.4.0",
"jstree": "^3.3.9",
"jstree-bootstrap-theme": "^1.0.1",
"jszip": "^3.2.2",
"jszip": "^3.4.0",
"leaflet": "^1.6.0",
"leaflet-geometryutil": "^0.9.3",
"leaflet-polylinedecorator": "^1.6.0",
"leaflet-providers": "^1.9.1",
"leaflet.gridlayer.googlemutant": "^0.8.0",
"leaflet.gridlayer.googlemutant": "^0.9.0",
"leaflet.markercluster": "^1.4.1",
"material-design-icons": "^3.0.1",
"messageformat": "^2.3.0",
"moment": "^2.24.0",
"ngx-clipboard": "^12.3.1",
"ngx-color-picker": "^9.0.0",
"ngx-daterangepicker-material": "^2.2.0",
"ngx-clipboard": "^13.0.0",
"ngx-color-picker": "^9.1.0",
"ngx-daterangepicker-material": "^3.0.1",
"ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#master",
"ngx-hm-carousel": "^2.0.0-rc.1",
"ngx-translate-messageformat-compiler": "^4.5.0",
"ngx-translate-messageformat-compiler": "^4.6.0",
"objectpath": "^2.0.0",
"prop-types": "^15.7.2",
"raphael": "^2.3.0",
"rc-select": "^10.0.0-rc.6",
"react": "^16.12.0",
"react-ace": "^8.0.0",
"react-dom": "^16.12.0",
"react-dropzone": "^10.2.1",
"rc-select": "^10.2.4",
"react": "^16.13.1",
"react-ace": "^8.1.0",
"react-dom": "^16.13.1",
"react-dropzone": "^10.2.2",
"reactcss": "^1.2.3",
"rxjs": "^6.5.4",
"rxjs": "^6.5.5",
"schema-inspector": "1.6.8",
"screenfull": "^5.0.2",
"split.js": "^1.5.11",
"systemjs": "0.21.5",
"tinycolor2": "^1.4.1",
"tooltipster": "^4.2.7",
"tslib": "^1.10.0",
"tslib": "^1.11.1",
"tv4": "^1.3.0",
"typeface-roboto": "^0.0.75",
"zone.js": "~0.10.2"
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^9.0.0-beta.7",
"@angular-builders/custom-webpack": "^9.1.0",
"@angular-devkit/build-angular": "^0.901.1",
"@angular/cli": "^9.1.1",
"@angular/compiler-cli": "^9.1.2",
"@angular/language-service": "^9.1.2",
"@types/canvas-gauges": "^2.1.2",
"@types/flot": "^0.0.31",
"@types/jasmine": "^3.5.5",
"@types/jasmine": "^3.5.10",
"@types/jasminewd2": "^2.0.8",
"@types/jquery": "^3.3.32",
"@types/js-beautify": "^1.8.1",
"@types/jquery": "^3.3.35",
"@types/js-beautify": "^1.8.2",
"@types/jstree": "^3.3.39",
"@types/jszip": "^3.1.7",
"@types/leaflet": "^1.5.9",
"@types/leaflet": "^1.5.12",
"@types/leaflet-polylinedecorator": "^1.6.0",
"@types/lodash": "^4.14.149",
"@types/raphael": "^2.1.30",
"@types/react": "^16.9.20",
"@types/react-dom": "^16.9.5",
"@types/lodash": "^4.14.150",
"@types/raphael": "^2.3.0",
"@types/react": "^16.9.34",
"@types/react-dom": "^16.9.6",
"@types/tinycolor2": "^1.4.2",
"@types/tooltipster": "^0.0.29",
"codelyzer": "^5.2.1",
"codelyzer": "^5.2.2",
"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",
"jasmine-spec-reporter": "^5.0.1",
"karma": "^5.0.2",
"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",
"karma-jasmine-html-reporter": "^1.5.3",
"ngrx-store-freeze": "^0.2.4",
"protractor": "^5.4.3",
"ts-node": "^8.6.2",
"tslint": "^6.0.0",
"protractor": "^5.4.4",
"ts-node": "^8.9.0",
"tslint": "^6.1.1",
"typescript": "~3.7.5"
}
}

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

@ -50,7 +50,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni
sidenavMode: 'over' | 'push' | 'side' = 'side';
sidenavOpened = true;
logo = require('../../../assets/logo_title_white.svg');
logo = require('../../../assets/logo_title_white.svg').default;
@ViewChild('sidenav')
sidenav: MatSidenav;

2
ui-ngx/src/app/modules/home/pages/dashboard/states/entity-state-controller.component.ts
View File

@ -201,7 +201,7 @@ export class EntityStateControllerComponent extends StateControllerComponent imp
const entityName = targetParams && targetParams.entityName ? targetParams.entityName : '';
const entityLabel = targetParams && targetParams.entityLabel ? targetParams.entityLabel : '';
result = this.utils.insertVariable(stateName, 'entityName', entityName);
result = this.utils.insertVariable(stateName, 'entityLabel', entityLabel);
result = this.utils.insertVariable(result, 'entityLabel', entityLabel);
for (const prop of Object.keys(params)) {
if (params[prop] && params[prop].entityName) {
result = this.utils.insertVariable(result, prop + ':entityName', params[prop].entityName);

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

@ -24,7 +24,7 @@ import { MatDialogRef } from '@angular/material/dialog';
})
export class TodoDialogComponent {
comingSoon = require('../../../../assets/coming-soon.jpg');
comingSoon = require('../../../../assets/coming-soon.jpg').default;
constructor(public dialogRef: MatDialogRef<TodoDialogComponent>) {
}

7
ui-ngx/src/app/shared/components/led-light.component.ts
View File

@ -16,6 +16,7 @@
import { AfterViewInit, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { RaphaelElement, RaphaelPaper, RaphaelSet } from 'raphael';
import Raphael from 'raphael';
import * as tinycolor_ from 'tinycolor2';
@ -38,7 +39,7 @@ export class LedLightComponent implements OnInit, AfterViewInit, OnChanges {
@Input() colorOff: string;
@Input() offOpacity: string;
@Input() offOpacity: number;
private enabledValue: boolean;
get enabled(): boolean {
@ -61,7 +62,7 @@ export class LedLightComponent implements OnInit, AfterViewInit, OnChanges {
}
ngOnInit(): void {
this.offOpacity = this.offOpacity || '0.4';
this.offOpacity = this.offOpacity || 0.4;
this.glowColor = tinycolor(this.colorOn).lighten().toHexString();
}
@ -100,7 +101,7 @@ export class LedLightComponent implements OnInit, AfterViewInit, OnChanges {
if (this.enabled) {
this.circleElement.attr('fill', this.colorOn);
this.circleElement.attr('stroke', this.colorOn);
this.circleElement.attr('opacity', '1');
this.circleElement.attr('opacity', 1);
if (this.circleElement.theGlow) {
this.circleElement.theGlow.remove();
}

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

@ -23,7 +23,7 @@ import { Component } from '@angular/core';
})
export class LogoComponent {
logo = require('../../../assets/logo_title_white.svg');
logo = require('../../../assets/logo_title_white.svg').default;
gotoThingsboard(): void {
window.open('https://thingsboard.io', '_blank');

Write Preview
Loading…
Cancel
Save