You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/02/17 09:32:29 UTC
[incubator-streampipes] 02/03: STREAMPIPES-53: Upgrade Angular
version to 8
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 0eac65b841ea4755400295bfd783ea679cc7e033
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Feb 15 22:24:07 2020 +0100
STREAMPIPES-53: Upgrade Angular version to 8
---
ui/package.json | 32 +++++++++++-----------
ui/src/app/app-container/view/view.component.ts | 2 +-
.../transport-selection.component.ts | 2 +-
.../pipeline-element-configuration.component.ts | 2 +-
.../connect/new-adapter/new-adapter.component.ts | 4 +--
.../event-schema/event-schema.component.css | 30 ++++++++++----------
.../event-schema/event-schema.component.ts | 2 +-
.../datadownloadDialog/dataDownload.dialog.ts | 2 +-
ui/tsconfig.json | 4 ++-
ui/tslint.json | 8 +++---
10 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/ui/package.json b/ui/package.json
index eb5088f..8eb1a20 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -15,18 +15,18 @@
"lint": "tslint -c tslint.json 'src/**/*.ts*"
},
"dependencies": {
- "@angular/animations": "7.2.9",
+ "@angular/animations": "8.2.14",
"@angular/cdk": "7.3.7",
- "@angular/common": "7.2.9",
- "@angular/compiler": "7.2.9",
- "@angular/core": "7.2.9",
+ "@angular/common": "8.2.14",
+ "@angular/compiler": "8.2.14",
+ "@angular/core": "8.2.14",
"@angular/flex-layout": "7.0.0-beta.23",
- "@angular/forms": "7.2.9",
+ "@angular/forms": "8.2.14",
"@angular/material": "7.3.7",
- "@angular/platform-browser": "7.2.9",
- "@angular/platform-browser-dynamic": "7.2.9",
- "@angular/router": "7.2.9",
- "@angular/upgrade": "7.2.9",
+ "@angular/platform-browser": "8.2.14",
+ "@angular/platform-browser-dynamic": "8.2.14",
+ "@angular/router": "8.2.14",
+ "@angular/upgrade": "8.2.14",
"@ngui/datetime-picker": "0.16.2",
"@stomp/ng2-stompjs": "^7.2.0",
"@swimlane/ngx-charts": "^13.0.2",
@@ -86,18 +86,18 @@
"rxjs-compat": "^6.3.3",
"shepherd.js": "2.4.0",
"slick-carousel": "1.6.0",
- "zone.js": "^0.8.29"
+ "zone.js": "~0.9.1"
},
"devDependencies": {
- "@angular/cli": "7.3.6",
- "@angular/compiler-cli": "7.2.9",
- "@ngtools/webpack": "7.3.6",
+ "@angular/cli": "8.3.25",
+ "@angular/compiler-cli": "8.2.14",
+ "@ngtools/webpack": "8.3.25",
"@types/angular": "^1.6.43",
"@types/jasmine": "~2.8.3",
"@types/jqueryui": "^1.12.7",
"@types/node": "11.11.3",
"@types/rx": "^4.1.1",
- "codelyzer": "^4.1.0",
+ "codelyzer": "^5.0.1",
"copy-webpack-plugin": "^5.0.2",
"compression-webpack-plugin": "^3.0.0",
"css-loader": "^0.28.11",
@@ -123,7 +123,7 @@
"to-string-loader": "^1.1.5",
"tslint": "^5.15.0",
"tslint-config-prettier": "^1.15.0",
- "typescript": "3.2.4",
+ "typescript": "3.5.3",
"uglifyjs-webpack-plugin": "^2.1.2",
"webpack": "^4.29.6",
"webpack-cli": "^3.2.3",
@@ -131,4 +131,4 @@
"webpack-bundle-analyzer": "^3.4.1",
"webpack-merge": "^4.2.1"
}
-}
+}
\ No newline at end of file
diff --git a/ui/src/app/app-container/view/view.component.ts b/ui/src/app/app-container/view/view.component.ts
index 2976a79..ae3ccfb 100644
--- a/ui/src/app/app-container/view/view.component.ts
+++ b/ui/src/app/app-container/view/view.component.ts
@@ -95,7 +95,7 @@ SystemJS.set('ngx-color-picker', SystemJS.newModule(ngxColorPicker));
export class ViewComponent implements AfterViewInit {
@Input() installedApp: InstalledApp;
- @ViewChild('pluginHost', { read: ViewContainerRef }) content: ViewContainerRef;
+ @ViewChild('pluginHost', { read: ViewContainerRef, static: true }) content: ViewContainerRef;
constructor(private compiler: Compiler, private injector: Injector) {
}
diff --git a/ui/src/app/app-transport-monitoring/components/transport-selection/transport-selection.component.ts b/ui/src/app/app-transport-monitoring/components/transport-selection/transport-selection.component.ts
index e04945b..109eb38 100644
--- a/ui/src/app/app-transport-monitoring/components/transport-selection/transport-selection.component.ts
+++ b/ui/src/app/app-transport-monitoring/components/transport-selection/transport-selection.component.ts
@@ -32,7 +32,7 @@ export class TransportSelectionComponent {
transportProcesses: TransportProcessEventModel[] = [];
displayedColumns: string[] = ['position', 'startTime', 'endTime', 'action'];
- @ViewChild(MatPaginator, {}) paginator: MatPaginator;
+ @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
dataSource = new MatTableDataSource<TransportProcessEventModel>();
@Output() selectedProcess = new EventEmitter<TransportProcessEventModel>();
diff --git a/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.ts b/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.ts
index 63c19b1..9c297d1 100644
--- a/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.ts
+++ b/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.ts
@@ -40,7 +40,7 @@ export class PipelineElementConfigurationComponent {
consulServices: StreampipesPeContainer[];
displayedColumns: string[] = ['status', 'name', 'action'];
- @ViewChild(MatPaginator, {}) paginator: MatPaginator;
+ @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
dataSource = new MatTableDataSource<StreampipesPeContainer>();
expandedElement: any;
diff --git a/ui/src/app/connect/new-adapter/new-adapter.component.ts b/ui/src/app/connect/new-adapter/new-adapter.component.ts
index 2233cbf..af95b93 100644
--- a/ui/src/app/connect/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/new-adapter/new-adapter.component.ts
@@ -79,7 +79,7 @@ export class NewAdapterComponent implements OnInit {
@Output()
updateAdapterEmitter: EventEmitter<void> = new EventEmitter<void>();
- @ViewChild('stepper') myStepper: MatStepper;
+ @ViewChild('stepper', { static: true }) myStepper: MatStepper;
allFormats: FormatDescription[] = [];
@@ -111,7 +111,7 @@ export class NewAdapterComponent implements OnInit {
// deactivates all edit functions when user starts a template
isEditable: Boolean = true;
- @ViewChild(EventSchemaComponent)
+ @ViewChild(EventSchemaComponent, { static: true })
private eventSchemaComponent: EventSchemaComponent;
isSetAdapter: Boolean = false;
diff --git a/ui/src/app/connect/schema-editor/event-schema/event-schema.component.css b/ui/src/app/connect/schema-editor/event-schema/event-schema.component.css
index 5b0d9cf..f5b67dd 100644
--- a/ui/src/app/connect/schema-editor/event-schema/event-schema.component.css
+++ b/ui/src/app/connect/schema-editor/event-schema/event-schema.component.css
@@ -55,7 +55,7 @@ ul {
padding: 10px;
width: 95%;
}
-:host /deep/ .tree-node {
+:host ::ng-deep .tree-node {
color: #000;
border-left: none;
border-right: none;
@@ -65,19 +65,19 @@ ul {
background: transparent;
margin: 0;
}
-:host /deep/ tree-node-expander {
+:host ::ng-deep tree-node-expander {
display: none;
}
-:host /deep/ .node-content-wrapper {
+:host ::ng-deep .node-content-wrapper {
flex: 1;
}
-:host /deep/ .node-content-wrapper:hover {
+:host ::ng-deep .node-content-wrapper:hover {
background-color: darkgrey;
}
-:host /deep/ .node-content-wrapper-active, .node-content-wrapper-focused {
+:host ::ng-deep .node-content-wrapper-active, .node-content-wrapper-focused {
background: transparent;
}
-:host /deep/ .node-drop-slot {
+:host ::ng-deep .node-drop-slot {
position: relative;
/*background: red;*/
/* padding: 8px 0;*/
@@ -85,22 +85,22 @@ ul {
margin: -7px 0;
z-index: 1000;
}
-:host /deep/ .node-drop-slot.is-dragging-over {
+:host ::ng-deep .node-drop-slot.is-dragging-over {
background-color: rgb(27, 20, 100);
border: none;
}
-:host /deep/ .tree-node-expanded {
+:host ::ng-deep .tree-node-expanded {
border-left: 2px dashed black;
}
-:host /deep/ tree-viewport {
+:host ::ng-deep tree-viewport {
overflow: hidden;
}
-:host /deep/ .tree-node-level-1 {
+:host ::ng-deep .tree-node-level-1 {
border: none;
}
-:host /deep/ .node-content-wrapper-focused, .node-content-wrapper:hover, .node-content-wrapper-active, .node-content-wrapper.node-content-wrapper-active:hover, .node-content-wrapper-active.node-content-wrapper-focused {
+:host ::ng-deep .node-content-wrapper-focused, .node-content-wrapper:hover, .node-content-wrapper-active, .node-content-wrapper.node-content-wrapper-active:hover, .node-content-wrapper-active.node-content-wrapper-focused {
background: none !important;
}
@@ -109,19 +109,19 @@ ul {
margin-right: 3px;
}
-:host /deep/ .node-content-wrapper .dimension-star {
+:host ::ng-deep .node-content-wrapper .dimension-star {
opacity: 0.2;
}
-:host /deep/ .node-content-wrapper:hover .dimension-star {
+:host ::ng-deep .node-content-wrapper:hover .dimension-star {
opacity: 1;
}
-:host /deep/ .node-content-wrapper mat-checkbox {
+:host ::ng-deep .node-content-wrapper mat-checkbox {
opacity: 0.2;
}
-:host /deep/ .node-content-wrapper:hover mat-checkbox {
+:host ::ng-deep .node-content-wrapper:hover mat-checkbox {
opacity: 1;
}
diff --git a/ui/src/app/connect/schema-editor/event-schema/event-schema.component.ts b/ui/src/app/connect/schema-editor/event-schema/event-schema.component.ts
index 7c2f9bd..2480156 100644
--- a/ui/src/app/connect/schema-editor/event-schema/event-schema.component.ts
+++ b/ui/src/app/connect/schema-editor/event-schema/event-schema.component.ts
@@ -52,7 +52,7 @@ export class EventSchemaComponent implements OnChanges {
@Output() eventSchemaChange = new EventEmitter<EventSchema>();
@Output() oldEventSchemaChange = new EventEmitter<EventSchema>();
- @ViewChild(TreeComponent) tree: TreeComponent;
+ @ViewChild(TreeComponent, { static: true }) tree: TreeComponent;
schemaGuess: GuessSchema = new GuessSchema();
countSelected: number = 0;
diff --git a/ui/src/app/data-explorer/explorer/datadownloadDialog/dataDownload.dialog.ts b/ui/src/app/data-explorer/explorer/datadownloadDialog/dataDownload.dialog.ts
index 808081b..73eedf1 100644
--- a/ui/src/app/data-explorer/explorer/datadownloadDialog/dataDownload.dialog.ts
+++ b/ui/src/app/data-explorer/explorer/datadownloadDialog/dataDownload.dialog.ts
@@ -34,7 +34,7 @@ export class DataDownloadDialog {
downloadFinish: boolean = false;
downloadedMBs: number = undefined;
- @ViewChild('stepper') stepper: MatStepper;
+ @ViewChild('stepper', { static: true }) stepper: MatStepper;
downloadHttpRequestSubscribtion;
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index fc7e3a8..10b43f6 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -1,13 +1,15 @@
{
"compileOnSave": false,
"compilerOptions": {
+ "downlevelIteration": true,
+ "module": "esnext",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
- "target": "es5",
+ "target": "es2015",
"typeRoots": [
"node_modules/@types"
],
diff --git a/ui/tslint.json b/ui/tslint.json
index fd03a59..38f302b 100644
--- a/ui/tslint.json
+++ b/ui/tslint.json
@@ -88,12 +88,12 @@
"directive-selector": [true, "attribute", "sp", "camelCase"],
"component-selector": [true, "element", "sp", "kebab-case"],
"no-output-on-prefix": true,
- "use-input-property-decorator": true,
- "use-output-property-decorator": true,
- "use-host-property-decorator": true,
+ "no-inputs-metadata-property": true,
+ "no-outputs-metadata-property": true,
+ "no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
- "use-life-cycle-interface": true,
+ "use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"component-class-suffix": true,
"directive-class-suffix": true