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 2022/10/24 11:57:03 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-602] Bump Angular to v14, update dependencies
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
The following commit(s) were added to refs/heads/dev by this push:
new b8c679aa5 [STREAMPIPES-602] Bump Angular to v14, update dependencies
b8c679aa5 is described below
commit b8c679aa5cd92ada94e3d1faf2c098252068e60e
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Mon Oct 24 12:56:37 2022 +0200
[STREAMPIPES-602] Bump Angular to v14, update dependencies
---
ui/angular.json | 5 +-
ui/package.json | 56 +++++++++++-----------
.../streampipes/platform-services/package.json | 8 ++--
.../platform-services/tsconfig.lib.json | 2 +-
ui/projects/streampipes/shared-ui/package.json | 16 +++----
.../src/lib/dialog/base-dialog/dialog-ref.ts | 3 +-
.../streampipes/shared-ui/tsconfig.lib.json | 2 +-
.../edit-asset-link-dialog.component.ts | 4 +-
.../email-configuration.component.ts | 36 +++++++-------
.../general-configuration.component.ts | 20 ++++----
.../edit-group-dialog.component.ts | 8 ++--
.../edit-user-dialog/edit-user-dialog.component.ts | 30 ++++++------
.../adapter-configuration.component.ts | 6 +--
.../adapter-template-configuration.directive.ts | 4 +-
.../format-configuration.component.ts | 6 +--
.../generic-adapter-configuration.component.ts | 6 +--
.../specific-adapter-configuration.component.ts | 6 +--
.../start-adapter-configuration.component.ts | 8 ++--
.../configuration-group.component.ts | 4 +-
.../edit-schema-transformation.component.ts | 4 +-
.../edit-unit-transformation.component.ts | 8 ++--
.../edit-event-property.component.ts | 6 +--
.../object-permission-dialog.component.ts | 14 +++---
.../base/abstract-static-property.ts | 4 +-
.../base/abstract-validated-static-property.ts | 4 +-
.../static-color-picker.component.ts | 4 +-
.../static-file-input.component.ts | 4 +-
.../static-properties/static-property.component.ts | 4 +-
...tic-runtime-resolvable-oneof-input.component.ts | 4 +-
.../static-tree-input.component.ts | 4 +-
.../core/components/toolbar/toolbar.component.ts | 6 +--
.../add-visualization-dialog.component.ts | 6 +--
.../output-strategy/base/BaseOutputStrategy.ts | 4 +-
.../custom-output-strategy.component.ts | 4 +-
.../output-strategy/output-strategy.component.ts | 4 +-
.../user-defined-output.component.ts | 4 +-
.../editor/dialog/customize/customize.component.ts | 6 +--
.../save-pipeline/save-pipeline.component.ts | 8 ++--
.../app/login/components/login/login.component.ts | 10 ++--
.../components/register/register.component.ts | 16 +++----
.../restore-password/restore-password.component.ts | 8 ++--
.../set-new-password/set-new-password.component.ts | 10 ++--
.../components/edit/quickedit.component.ts | 6 +--
.../change-email/change-email-dialog.component.ts | 16 +++----
.../change-password-dialog.component.ts | 16 +++----
ui/tsconfig.json | 2 +-
46 files changed, 208 insertions(+), 208 deletions(-)
diff --git a/ui/angular.json b/ui/angular.json
index a30176101..173cef346 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -186,8 +186,9 @@
"style": "scss"
}
},
- "defaultProject": "app",
"cli": {
- "defaultCollection": "@angular-eslint/schematics"
+ "schematicCollections": [
+ "@angular-eslint/schematics"
+ ]
}
}
diff --git a/ui/package.json b/ui/package.json
index 69dcf11c1..8856ce6cc 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -30,23 +30,23 @@
"@streampipes/shared-ui": "0.0.1"
},
"dependencies": {
- "@angular-architects/module-federation": "^14.0.1",
- "@angular/animations": "^13.3.0",
- "@angular/cdk": "^13.3.0",
- "@angular/common": "^13.3.0",
- "@angular/compiler": "^13.3.0",
- "@angular/core": "^13.3.0",
- "@angular/flex-layout": "^13.0.0-beta.38",
- "@angular/forms": "^13.3.0",
- "@angular/material": "^13.3.0",
- "@angular/platform-browser": "^13.3.0",
- "@angular/platform-browser-dynamic": "^13.3.0",
- "@angular/router": "^13.3.0",
+ "@angular-architects/module-federation": "^14.3.14",
+ "@angular/animations": "^14.2.7",
+ "@angular/cdk": "^14.2.5",
+ "@angular/common": "^14.2.7",
+ "@angular/compiler": "^14.2.7",
+ "@angular/core": "^14.2.7",
+ "@angular/flex-layout": "^14.0.0-beta.41",
+ "@angular/forms": "^14.2.7",
+ "@angular/material": "^14.2.5",
+ "@angular/platform-browser": "^14.2.7",
+ "@angular/platform-browser-dynamic": "^14.2.7",
+ "@angular/router": "^14.2.7",
"@asymmetrik/ngx-leaflet": "6.0.1",
"@auth0/angular-jwt": "5.0.2",
"@circlon/angular-tree-component": "^11.0.4",
"@ctrl/ngx-codemirror": "5.1.1",
- "@danielmoncada/angular-datetime-picker": "^13.1.1",
+ "@danielmoncada/angular-datetime-picker": "^14.2.0",
"@fortawesome/fontawesome-free": "5.12.1",
"@jsplumb/browser-ui": "^5.3.1",
"@jsplumb/common": "^5.3.1",
@@ -56,9 +56,9 @@
"@ngx-loading-bar/core": "5.1.2",
"@ngx-loading-bar/http-client": "5.1.2",
"@panzoom/panzoom": "^4.4.3",
- "@swimlane/ngx-charts": "16.0.0",
- "angular-datatables": "^13.0.1",
- "angular-gridster2": "13.1.1",
+ "@swimlane/ngx-charts": "^20.1.0",
+ "angular-datatables": "^14.0.0",
+ "angular-gridster2": "^14.1.2",
"angular-plotly.js": "^4.0.0",
"angular2-uuid": "1.1.1",
"codemirror": "^5.55.0",
@@ -78,12 +78,12 @@
"material-icons": "^1.11.4",
"ngx-color-picker": "^11.0.0",
"ngx-echarts": "^8.0.1",
- "ngx-quill": "15.0.0",
+ "ngx-quill": "^19.0.1",
"ngx-showdown": "6.0.0",
"plotly.js": "^2.3.1",
"quill": "1.3.7",
"roboto-fontface": "0.10.0",
- "rxjs": "6.6.2",
+ "rxjs": "^7.5.7",
"shepherd.js": "^9.0.0",
"showdown": "1.9.1",
"stream-browserify": "3.0.0",
@@ -92,18 +92,18 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
- "@angular-builders/custom-webpack": "^13.1.0",
- "@angular-devkit/build-angular": "^13.3.0",
+ "@angular-builders/custom-webpack": "^14.0.1",
+ "@angular-devkit/build-angular": "^14.2.6",
"@angular-eslint/builder": "13.5.0",
- "@angular-eslint/eslint-plugin": "13.5.0",
- "@angular-eslint/eslint-plugin-template": "13.5.0",
- "@angular-eslint/schematics": "13.5.0",
- "@angular-eslint/template-parser": "13.5.0",
- "@angular/cli": "^13.3.0",
- "@angular/compiler-cli": "^13.3.0",
+ "@angular-eslint/eslint-plugin": "^14.1.2",
+ "@angular-eslint/eslint-plugin-template": "^14.1.2",
+ "@angular-eslint/schematics": "^14.1.2",
+ "@angular-eslint/template-parser": "^14.1.2",
+ "@angular/cli": "^14.2.6",
+ "@angular/compiler-cli": "^14.2.7",
"@cypress/webpack-batteries-included-preprocessor": "2.2.3",
"@cypress/webpack-preprocessor": "5.14.0",
- "@ngtools/webpack": "^13.3.0",
+ "@ngtools/webpack": "^14.2.6",
"@types/angular": "^1.7.4",
"@types/jasmine": "~3.6.0",
"@types/jqueryui": "^1.12.13",
@@ -134,7 +134,7 @@
"karma-jasmine-html-reporter": "^1.5.0",
"karma-verbose-reporter": "0.0.6",
"mustache": "^2.3.0",
- "ng-packagr": "^13.3.0",
+ "ng-packagr": "^14.2.2",
"path": "^0.12.7",
"prettier": "1.14.2",
"raw-loader": "^4.0.2",
diff --git a/ui/projects/streampipes/platform-services/package.json b/ui/projects/streampipes/platform-services/package.json
index 57a5c640b..bb1fb0e29 100644
--- a/ui/projects/streampipes/platform-services/package.json
+++ b/ui/projects/streampipes/platform-services/package.json
@@ -2,10 +2,10 @@
"name": "@streampipes/platform-services",
"version": "0.0.1",
"peerDependencies": {
- "@angular/common": "^13.3.0",
- "@angular/core": "^13.3.0",
- "rxjs": "6.6.2",
- "angular-gridster2": "^13.1.1"
+ "@angular/common": "^14.2.7",
+ "@angular/core": "^14.2.7",
+ "rxjs": "^7.5.7",
+ "angular-gridster2": "^14.1.2"
},
"dependencies": {
"tslib": "^2.3.0"
diff --git a/ui/projects/streampipes/platform-services/tsconfig.lib.json b/ui/projects/streampipes/platform-services/tsconfig.lib.json
index a7141c543..fbbed4791 100644
--- a/ui/projects/streampipes/platform-services/tsconfig.lib.json
+++ b/ui/projects/streampipes/platform-services/tsconfig.lib.json
@@ -3,7 +3,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
- "target": "es2015",
+ "target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
diff --git a/ui/projects/streampipes/shared-ui/package.json b/ui/projects/streampipes/shared-ui/package.json
index 8a55c7fd6..b07cc86ea 100644
--- a/ui/projects/streampipes/shared-ui/package.json
+++ b/ui/projects/streampipes/shared-ui/package.json
@@ -2,15 +2,15 @@
"name": "@streampipes/shared-ui",
"version": "0.0.1",
"peerDependencies": {
- "@angular/animations": "^13.3.0",
- "@angular/cdk": "^13.3.0",
- "@angular/common": "^13.3.0",
- "@angular/core": "^13.3.0",
- "@angular/flex-layout": "^13.0.0-beta.38",
- "@angular/material": "^13.3.0",
- "@angular/router": "^13.3.0",
+ "@angular/animations": "^14.2.7",
+ "@angular/cdk": "^14.2.5",
+ "@angular/common": "^14.2.7",
+ "@angular/core": "^14.2.7",
+ "@angular/flex-layout": "^14.0.0-beta.41",
+ "@angular/material": "^14.2.5",
+ "@angular/router": "^14.2.7",
"@streampipes/platform-services": "0.0.1",
- "rxjs": "^6.6.2"
+ "rxjs": "^7.5.7"
},
"dependencies": {
"tslib": "^2.3.0"
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/dialog-ref.ts b/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/dialog-ref.ts
index 74869aa51..530b277b8 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/dialog-ref.ts
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/dialog-ref.ts
@@ -20,8 +20,7 @@ import { ComponentRef } from '@angular/core';
import { OverlayRef } from '@angular/cdk/overlay';
import { Observable, Subject } from 'rxjs';
import { BaseDialogComponentUnion } from './base-dialog.model';
-import { OverlaySizeConfig } from '@angular/cdk/overlay/overlay-ref';
-import { OverlayConfig } from '@angular/cdk/overlay/overlay-config';
+import { OverlayConfig, OverlaySizeConfig } from '@angular/cdk/overlay';
export class DialogRef<T> {
private _componentInstance: ComponentRef<T>;
diff --git a/ui/projects/streampipes/shared-ui/tsconfig.lib.json b/ui/projects/streampipes/shared-ui/tsconfig.lib.json
index a7141c543..fbbed4791 100644
--- a/ui/projects/streampipes/shared-ui/tsconfig.lib.json
+++ b/ui/projects/streampipes/shared-ui/tsconfig.lib.json
@@ -3,7 +3,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
- "target": "es2015",
+ "target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
diff --git a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts
index 417a086b7..216ca432c 100644
--- a/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts
+++ b/ui/src/app/assets/dialog/edit-asset-link/edit-asset-link-dialog.component.ts
@@ -33,7 +33,7 @@ import {
PipelineService,
PipelineElementService, FileMetadata, FilesService
} from '@streampipes/platform-services';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
import { zip } from 'rxjs';
import { MatSelectChange } from '@angular/material/select';
import { BaseAssetLinksDirective } from '../base-asset-links.directive';
@@ -54,7 +54,7 @@ export class EditAssetLinkDialogComponent extends BaseAssetLinksDirective implem
@Input()
createMode: boolean;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
clonedAssetLink: AssetLink;
diff --git a/ui/src/app/configuration/email-configuration/email-configuration.component.ts b/ui/src/app/configuration/email-configuration/email-configuration.component.ts
index 4c49b4042..0b42f6456 100644
--- a/ui/src/app/configuration/email-configuration/email-configuration.component.ts
+++ b/ui/src/app/configuration/email-configuration/email-configuration.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { EmailConfig, MailConfigService } from '@streampipes/platform-services';
import { SpConfigurationTabs } from '../configuration-tabs';
import { SpConfigurationRoutes } from '../configuration.routes';
@@ -32,7 +32,7 @@ export class EmailConfigurationComponent implements OnInit {
tabs = SpConfigurationTabs.getTabs();
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
mailConfig: EmailConfig;
formReady = false;
@@ -43,7 +43,7 @@ export class EmailConfigurationComponent implements OnInit {
sendingTestMailSuccess = false;
sendingEmailErrorMessage = '';
- constructor(private fb: FormBuilder,
+ constructor(private fb: UntypedFormBuilder,
private mailConfigService: MailConfigService,
private breadcrumbService: SpBreadcrumbService) {}
@@ -64,21 +64,21 @@ export class EmailConfigurationComponent implements OnInit {
initForm() {
this.formReady = true;
this.parentForm = this.fb.group({});
- this.parentForm.addControl('smtpServerHost', new FormControl(this.mailConfig.smtpServerHost, Validators.required));
- this.parentForm.addControl('smtpServerPort', new FormControl(this.mailConfig.smtpServerPort, Validators.required));
- this.parentForm.addControl('usesAuthentication', new FormControl(this.mailConfig.usesAuthentication));
- this.parentForm.addControl('smtpUsername', new FormControl(this.mailConfig.smtpUsername));
- this.parentForm.addControl('smtpPassword', new FormControl(this.mailConfig.smtpPassword));
- this.parentForm.addControl('usesProxy', new FormControl(this.mailConfig.usesProxy));
- this.parentForm.addControl('proxyHost', new FormControl(this.mailConfig.proxyHost));
- this.parentForm.addControl('proxyPort', new FormControl(this.mailConfig.proxyPort));
- this.parentForm.addControl('usesProxyAuthentication', new FormControl(this.mailConfig.usesProxyAuthentication));
- this.parentForm.addControl('proxyUsername', new FormControl(this.mailConfig.proxyUser));
- this.parentForm.addControl('proxyPassword', new FormControl(this.mailConfig.proxyPassword));
- this.parentForm.addControl('senderAddress', new FormControl(this.mailConfig.senderAddress, [Validators.required, Validators.email]));
- this.parentForm.addControl('senderName', new FormControl(this.mailConfig.senderName));
- this.parentForm.addControl('transport', new FormControl(this.mailConfig.transportStrategy, Validators.required));
- this.parentForm.addControl('defaultRecipient', new FormControl(this.defaultRecipient, Validators.email));
+ this.parentForm.addControl('smtpServerHost', new UntypedFormControl(this.mailConfig.smtpServerHost, Validators.required));
+ this.parentForm.addControl('smtpServerPort', new UntypedFormControl(this.mailConfig.smtpServerPort, Validators.required));
+ this.parentForm.addControl('usesAuthentication', new UntypedFormControl(this.mailConfig.usesAuthentication));
+ this.parentForm.addControl('smtpUsername', new UntypedFormControl(this.mailConfig.smtpUsername));
+ this.parentForm.addControl('smtpPassword', new UntypedFormControl(this.mailConfig.smtpPassword));
+ this.parentForm.addControl('usesProxy', new UntypedFormControl(this.mailConfig.usesProxy));
+ this.parentForm.addControl('proxyHost', new UntypedFormControl(this.mailConfig.proxyHost));
+ this.parentForm.addControl('proxyPort', new UntypedFormControl(this.mailConfig.proxyPort));
+ this.parentForm.addControl('usesProxyAuthentication', new UntypedFormControl(this.mailConfig.usesProxyAuthentication));
+ this.parentForm.addControl('proxyUsername', new UntypedFormControl(this.mailConfig.proxyUser));
+ this.parentForm.addControl('proxyPassword', new UntypedFormControl(this.mailConfig.proxyPassword));
+ this.parentForm.addControl('senderAddress', new UntypedFormControl(this.mailConfig.senderAddress, [Validators.required, Validators.email]));
+ this.parentForm.addControl('senderName', new UntypedFormControl(this.mailConfig.senderName));
+ this.parentForm.addControl('transport', new UntypedFormControl(this.mailConfig.transportStrategy, Validators.required));
+ this.parentForm.addControl('defaultRecipient', new UntypedFormControl(this.defaultRecipient, Validators.email));
this.parentForm.valueChanges.subscribe(v => {
this.mailConfig.smtpServerHost = v.smtpServerHost;
diff --git a/ui/src/app/configuration/general-configuration/general-configuration.component.ts b/ui/src/app/configuration/general-configuration/general-configuration.component.ts
index a2a55367f..c36879f05 100644
--- a/ui/src/app/configuration/general-configuration/general-configuration.component.ts
+++ b/ui/src/app/configuration/general-configuration/general-configuration.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import {
EmailConfig,
GeneralConfigModel,
@@ -42,7 +42,7 @@ export class GeneralConfigurationComponent implements OnInit {
tabs = SpConfigurationTabs.getTabs();
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
formReady = false;
generalConfig: GeneralConfigModel;
@@ -50,7 +50,7 @@ export class GeneralConfigurationComponent implements OnInit {
availableRoles: RoleDescription[];
- constructor(private fb: FormBuilder,
+ constructor(private fb: UntypedFormBuilder,
private generalConfigService: GeneralConfigService,
private mailConfigService: MailConfigService,
private availableRolesService: AvailableRolesService,
@@ -77,13 +77,13 @@ export class GeneralConfigurationComponent implements OnInit {
}
this.mailConfig = configs[1];
this.parentForm = this.fb.group({});
- this.parentForm.addControl('appName', new FormControl(this.generalConfig.appName, Validators.required));
- this.parentForm.addControl('protocol', new FormControl(this.generalConfig.protocol, Validators.required));
- this.parentForm.addControl('port', new FormControl(this.generalConfig.port, Validators.required));
- this.parentForm.addControl('hostname', new FormControl(this.generalConfig.hostname, Validators.required));
- this.parentForm.addControl('allowSelfRegistration', new FormControl(this.generalConfig.allowSelfRegistration));
- this.parentForm.addControl('allowPasswordRecovery', new FormControl(this.generalConfig.allowPasswordRecovery));
- this.parentForm.addControl('defaultUserRoles', new FormControl([UserRole.ROLE_PIPELINE_USER], Validators.required));
+ this.parentForm.addControl('appName', new UntypedFormControl(this.generalConfig.appName, Validators.required));
+ this.parentForm.addControl('protocol', new UntypedFormControl(this.generalConfig.protocol, Validators.required));
+ this.parentForm.addControl('port', new UntypedFormControl(this.generalConfig.port, Validators.required));
+ this.parentForm.addControl('hostname', new UntypedFormControl(this.generalConfig.hostname, Validators.required));
+ this.parentForm.addControl('allowSelfRegistration', new UntypedFormControl(this.generalConfig.allowSelfRegistration));
+ this.parentForm.addControl('allowPasswordRecovery', new UntypedFormControl(this.generalConfig.allowPasswordRecovery));
+ this.parentForm.addControl('defaultUserRoles', new UntypedFormControl([UserRole.ROLE_PIPELINE_USER], Validators.required));
this.parentForm.valueChanges.subscribe(v => {
this.generalConfig.appName = v.appName;
this.generalConfig.protocol = v.protocol;
diff --git a/ui/src/app/configuration/security-configuration/edit-group-dialog/edit-group-dialog.component.ts b/ui/src/app/configuration/security-configuration/edit-group-dialog/edit-group-dialog.component.ts
index e8e18e444..b81629c97 100644
--- a/ui/src/app/configuration/security-configuration/edit-group-dialog/edit-group-dialog.component.ts
+++ b/ui/src/app/configuration/security-configuration/edit-group-dialog/edit-group-dialog.component.ts
@@ -18,7 +18,7 @@
import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { Group, Role, UserGroupService } from '@streampipes/platform-services';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { DialogRef } from '@streampipes/shared-ui';
import { MatCheckboxChange } from '@angular/material/checkbox';
import { RoleDescription } from '../../../_models/auth.model';
@@ -38,11 +38,11 @@ export class EditGroupDialogComponent implements OnInit {
@Input()
editMode: boolean;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
availableRoles: RoleDescription[];
clonedGroup: Group;
- constructor(private fb: FormBuilder,
+ constructor(private fb: UntypedFormBuilder,
private availableRolesService: AvailableRolesService,
private dialogRef: DialogRef<EditGroupDialogComponent>,
private userGroupService: UserGroupService) {}
@@ -51,7 +51,7 @@ export class EditGroupDialogComponent implements OnInit {
this.availableRoles = this.availableRolesService.getAvailableRoles();
this.clonedGroup = Group.fromData(this.group, new Group());
this.parentForm = this.fb.group({});
- this.parentForm.addControl('groupName', new FormControl(this.clonedGroup.groupName, Validators.required));
+ this.parentForm.addControl('groupName', new UntypedFormControl(this.clonedGroup.groupName, Validators.required));
this.parentForm.valueChanges.subscribe(v => this.clonedGroup.groupName = v.groupName);
}
diff --git a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
index 175bcbf13..a92d05009 100644
--- a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
+++ b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
@@ -29,9 +29,9 @@ import {
} from '@streampipes/platform-services';
import {
AbstractControl,
- FormBuilder,
- FormControl,
- FormGroup,
+ UntypedFormBuilder,
+ UntypedFormControl,
+ UntypedFormGroup,
ValidationErrors,
ValidatorFn,
Validators
@@ -58,7 +58,7 @@ export class EditUserDialogComponent implements OnInit {
editMode: boolean;
isUserAccount: boolean;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
clonedUser: UserAccount | ServiceAccount;
availableRoles: RoleDescription[];
@@ -72,7 +72,7 @@ export class EditUserDialogComponent implements OnInit {
constructor(private dialogRef: DialogRef<EditUserDialogComponent>,
private availableRolesService: AvailableRolesService,
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private userService: UserService,
private userGroupService: UserGroupService,
private authService: AuthService,
@@ -90,22 +90,22 @@ export class EditUserDialogComponent implements OnInit {
this.clonedUser = this.user instanceof UserAccount ? UserAccount.fromData(this.user, new UserAccount()) : ServiceAccount.fromData(this.user, new ServiceAccount());
this.isUserAccount = this.user instanceof UserAccount;
this.parentForm = this.fb.group({});
- this.parentForm.addControl('username', new FormControl(this.clonedUser.username, Validators.required));
+ this.parentForm.addControl('username', new UntypedFormControl(this.clonedUser.username, Validators.required));
if (this.isUserAccount) {
this.parentForm.controls['username'].setValidators([Validators.required, Validators.email]);
}
- this.parentForm.addControl('accountEnabled', new FormControl(this.clonedUser.accountEnabled));
- this.parentForm.addControl('accountLocked', new FormControl(this.clonedUser.accountLocked));
+ this.parentForm.addControl('accountEnabled', new UntypedFormControl(this.clonedUser.accountEnabled));
+ this.parentForm.addControl('accountLocked', new UntypedFormControl(this.clonedUser.accountLocked));
if (this.clonedUser instanceof UserAccount) {
- this.parentForm.addControl('fullName', new FormControl(this.clonedUser.fullName));
+ this.parentForm.addControl('fullName', new UntypedFormControl(this.clonedUser.fullName));
} else {
- this.parentForm.addControl('clientSecret', new FormControl(this.clonedUser.clientSecret, [Validators.required, Validators.minLength(35)]));
+ this.parentForm.addControl('clientSecret', new UntypedFormControl(this.clonedUser.clientSecret, [Validators.required, Validators.minLength(35)]));
}
if (!this.editMode && this.clonedUser instanceof UserAccount) {
- this.parentForm.addControl('password', new FormControl(this.clonedUser.password, Validators.required));
- this.parentForm.addControl('repeatPassword', new FormControl());
- this.parentForm.addControl('sendPasswordToUser', new FormControl(this.sendPasswordToUser));
+ this.parentForm.addControl('password', new UntypedFormControl(this.clonedUser.password, Validators.required));
+ this.parentForm.addControl('repeatPassword', new UntypedFormControl());
+ this.parentForm.addControl('sendPasswordToUser', new UntypedFormControl(this.sendPasswordToUser));
this.parentForm.setValidators(this.checkPasswords);
}
@@ -127,8 +127,8 @@ export class EditUserDialogComponent implements OnInit {
}
} else {
if (!this.parentForm.controls['password']) {
- this.parentForm.addControl('password', new FormControl(this.clonedUser.password, Validators.required));
- this.parentForm.addControl('repeatPassword', new FormControl());
+ this.parentForm.addControl('password', new UntypedFormControl(this.clonedUser.password, Validators.required));
+ this.parentForm.addControl('repeatPassword', new UntypedFormControl());
this.parentForm.setValidators(this.checkPasswords);
}
this.clonedUser.password = v.password;
diff --git a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
index 251594467..6f9c40e85 100644
--- a/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/adapter-configuration.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { MatStepper } from '@angular/material/stepper';
import {
AdapterDescriptionUnion,
@@ -54,7 +54,7 @@ export class AdapterConfigurationComponent implements OnInit {
isGenericAdapter = false;
myStepper: MatStepper;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
eventSchema: EventSchema;
oldEventSchema: EventSchema;
@@ -65,7 +65,7 @@ export class AdapterConfigurationComponent implements OnInit {
private transformationRuleService: TransformationRuleService,
private shepherdService: ShepherdService,
private connectService: ConnectService,
- private _formBuilder: FormBuilder,
+ private _formBuilder: UntypedFormBuilder,
private router: Router,
) {
}
diff --git a/ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts b/ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts
index 04b476941..fdb58f133 100644
--- a/ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts
+++ b/ui/src/app/connect/components/adapter-configuration/directives/adapter-template-configuration.directive.ts
@@ -19,7 +19,7 @@
import { Directive, EventEmitter, Input, Output } from '@angular/core';
import { MatStepper } from '@angular/material/stepper';
import { AdapterDescriptionUnion, PipelineElementTemplate, PipelineElementTemplateService } from '@streampipes/platform-services';
-import { FormBuilder } from '@angular/forms';
+import { UntypedFormBuilder } from '@angular/forms';
import { AdapterTemplateService } from '../../../services/adapter-template.service';
import { DialogService } from '@streampipes/shared-ui';
@@ -48,7 +48,7 @@ export abstract class AdapterTemplateConfigurationDirective {
availableTemplates: PipelineElementTemplate[];
selectedTemplate: any = false;
- protected constructor(protected _formBuilder: FormBuilder,
+ protected constructor(protected _formBuilder: UntypedFormBuilder,
protected dialogService: DialogService,
protected pipelineElementTemplateService: PipelineElementTemplateService,
protected adapterTemplateService: AdapterTemplateService) {
diff --git a/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
index b1296510b..2c4082032 100644
--- a/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/format-configuration/format-configuration.component.ts
@@ -23,7 +23,7 @@ import {
GenericAdapterSetDescription,
GenericAdapterStreamDescription
} from '@streampipes/platform-services';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { RestService } from '../../../services/rest.service';
import { MatStepper } from '@angular/material/stepper';
@@ -61,11 +61,11 @@ export class FormatConfigurationComponent implements OnInit {
/**
* The form group to validate the configuration for the format
*/
- formatForm: FormGroup;
+ formatForm: UntypedFormGroup;
constructor(
private restService: RestService,
- private _formBuilder: FormBuilder) {
+ private _formBuilder: UntypedFormBuilder) {
}
ngOnInit(): void {
diff --git a/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
index 5a8b80fe9..9dc6222e7 100644
--- a/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/generic-adapter-configuration/generic-adapter-configuration.component.ts
@@ -23,7 +23,7 @@ import {
ProtocolDescription,
PipelineElementTemplateService
} from '@streampipes/platform-services';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { AdapterTemplateConfigurationDirective } from '../directives/adapter-template-configuration.directive';
import { AdapterTemplateService } from '../../../services/adapter-template.service';
import { DialogService } from '@streampipes/shared-ui';
@@ -37,11 +37,11 @@ export class GenericAdapterConfigurationComponent extends AdapterTemplateConfigu
genericAdapterSettingsFormValid: boolean;
- genericAdapterForm: FormGroup;
+ genericAdapterForm: UntypedFormGroup;
protocolDescription: ProtocolDescription;
- constructor(_formBuilder: FormBuilder,
+ constructor(_formBuilder: UntypedFormBuilder,
dialogService: DialogService,
pipelineElementTemplateService: PipelineElementTemplateService,
adapterTemplateService: AdapterTemplateService) {
diff --git a/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts
index 879bf5030..2070696f5 100644
--- a/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/specific-adapter-configuration/specific-adapter-configuration.component.ts
@@ -18,7 +18,7 @@
import { Component, OnInit } from '@angular/core';
import { AdapterDescription, PipelineElementTemplateService } from '@streampipes/platform-services';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { DialogService } from '@streampipes/shared-ui';
import { AdapterTemplateService } from '../../../services/adapter-template.service';
import { AdapterTemplateConfigurationDirective } from '../directives/adapter-template-configuration.directive';
@@ -32,10 +32,10 @@ export class SpecificAdapterConfigurationComponent extends AdapterTemplateConfig
specificAdapterSettingsFormValid: boolean;
- specificAdapterForm: FormGroup;
+ specificAdapterForm: UntypedFormGroup;
- constructor(_formBuilder: FormBuilder,
+ constructor(_formBuilder: UntypedFormBuilder,
dialogService: DialogService,
pipelineElementTemplateService: PipelineElementTemplateService,
adapterTemplateService: AdapterTemplateService) {
diff --git a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
index 7fedcaeb6..4fbe6bec7 100644
--- a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -23,7 +23,7 @@ import {
EventSchema,
RemoveDuplicatesTransformationRuleDescription,
} from '@streampipes/platform-services';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { MatStepper } from '@angular/material/stepper';
import { AdapterStartedDialog } from '../../../dialog/adapter-started/adapter-started-dialog.component';
import { DialogService, PanelType } from '@streampipes/shared-ui';
@@ -66,7 +66,7 @@ export class StartAdapterConfigurationComponent implements OnInit {
/**
* The form group to validate the configuration for the format
*/
- startAdapterForm: FormGroup;
+ startAdapterForm: UntypedFormGroup;
startAdapterSettingsFormValid = false;
@@ -85,14 +85,14 @@ export class StartAdapterConfigurationComponent implements OnInit {
constructor(
private dialogService: DialogService,
private shepherdService: ShepherdService,
- private _formBuilder: FormBuilder,
+ private _formBuilder: UntypedFormBuilder,
private timestampPipe: TimestampPipe) {
}
ngOnInit(): void {
// initialize form for validation
this.startAdapterForm = this._formBuilder.group({});
- this.startAdapterForm.addControl('adapterName', new FormControl(this.adapterDescription.name, Validators.required));
+ this.startAdapterForm.addControl('adapterName', new UntypedFormControl(this.adapterDescription.name, Validators.required));
this.startAdapterForm.valueChanges.subscribe(v => this.adapterDescription.name = v.adapterName);
this.startAdapterForm.statusChanges.subscribe(() => {
this.startAdapterSettingsFormValid = this.startAdapterForm.valid;
diff --git a/ui/src/app/connect/components/configuration-group/configuration-group.component.ts b/ui/src/app/connect/components/configuration-group/configuration-group.component.ts
index ae8f76bec..41574d1c1 100644
--- a/ui/src/app/connect/components/configuration-group/configuration-group.component.ts
+++ b/ui/src/app/connect/components/configuration-group/configuration-group.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input, OnInit } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
import { StaticPropertyUnion } from '@streampipes/platform-services';
import { ConfigurationInfo } from '../../model/ConfigurationInfo';
@@ -28,7 +28,7 @@ import { ConfigurationInfo } from '../../model/ConfigurationInfo';
})
export class ConfigurationGroupComponent implements OnInit {
- @Input() configurationGroup: FormGroup;
+ @Input() configurationGroup: UntypedFormGroup;
@Input() adapterId: string;
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts
index b58d49996..1cb3fb3d8 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-schema-transformation/edit-schema-transformation.component.ts
@@ -19,7 +19,7 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { EventPropertyUnion, SemanticTypesService } from '@streampipes/platform-services';
import { debounceTime, distinctUntilChanged, startWith, switchMap } from 'rxjs/operators';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
import { Observable } from 'rxjs';
@Component({
@@ -42,7 +42,7 @@ export class EditSchemaTransformationComponent implements OnInit {
@Output() dataTypeChanged = new EventEmitter<boolean>();
@Output() timestampSemanticsChanged = new EventEmitter<boolean>();
- domainPropertyControl = new FormControl();
+ domainPropertyControl = new UntypedFormControl();
semanticTypes: Observable<string[]>;
constructor(private semanticTypesService: SemanticTypesService) {
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
index a796c5cea..4eb0ae7f1 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, Input, OnInit } from '@angular/core';
-import { FormBuilder, FormControl } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl } from '@angular/forms';
import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
import { UnitDescription } from '../../../../model/UnitDescription';
@@ -45,14 +45,14 @@ export class EditUnitTransformationComponent implements OnInit {
private possibleUnitTransformations: UnitDescription[] = [];
private selectUnit: UnitDescription;
private allUnits: UnitDescription[];
- private stateCtrl = new FormControl();
+ private stateCtrl = new UntypedFormControl();
- private newUnitStateCtrl = new FormControl();
+ private newUnitStateCtrl = new UntypedFormControl();
private filteredUnits: Observable<UnitDescription[]>;
public hadMeasurementUnit = false;
private oldMeasurementUnitDipsplay;
- constructor(private formBuilder: FormBuilder,
+ constructor(private formBuilder: UntypedFormBuilder,
private restService: RestService,
private unitProviderService: UnitProviderService) {
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
index d3a3dc989..f8b1e74ec 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import {
EventPropertyList,
EventPropertyNested,
@@ -57,12 +57,12 @@ export class EditEventPropertyComponent implements OnInit {
isNumericProperty: boolean;
isSaveBtnEnabled: boolean;
- private propertyForm: FormGroup;
+ private propertyForm: UntypedFormGroup;
private runtimeDataTypes;
constructor(public dialogRef: DialogRef<EditEventPropertyComponent>,
- private formBuilder: FormBuilder,
+ private formBuilder: UntypedFormBuilder,
private dataTypeService: DataTypesService,
private semanticTypeUtilsService: SemanticTypeUtilsService,
private semanticTypesService: SemanticTypesService) {
diff --git a/ui/src/app/core-ui/object-permission-dialog/object-permission-dialog.component.ts b/ui/src/app/core-ui/object-permission-dialog/object-permission-dialog.component.ts
index bd6b3e70c..6c76851aa 100644
--- a/ui/src/app/core-ui/object-permission-dialog/object-permission-dialog.component.ts
+++ b/ui/src/app/core-ui/object-permission-dialog/object-permission-dialog.component.ts
@@ -19,7 +19,7 @@
import { COMMA, ENTER } from '@angular/cdk/keycodes';
import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
import { DialogRef } from '@streampipes/shared-ui';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import {
PermissionsService,
Group,
@@ -50,7 +50,7 @@ export class ObjectPermissionDialogComponent implements OnInit {
@Input()
headerTitle: string;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
permission: Permission;
@@ -68,12 +68,12 @@ export class ObjectPermissionDialogComponent implements OnInit {
@ViewChild('userInput') userInput: ElementRef<HTMLInputElement>;
@ViewChild('groupInput') groupInput: ElementRef<HTMLInputElement>;
- userCtrl = new FormControl();
- groupCtrl = new FormControl();
+ userCtrl = new UntypedFormControl();
+ groupCtrl = new UntypedFormControl();
constructor(
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private dialogRef: DialogRef<ObjectPermissionDialogComponent>,
private permissionsService: PermissionsService,
private userService: UserService,
@@ -116,8 +116,8 @@ export class ObjectPermissionDialogComponent implements OnInit {
processPermissions(permissions: Permission[]) {
if (permissions.length > 0) {
this.permission = permissions[0];
- this.parentForm.addControl('publicElement', new FormControl(this.permission.publicElement, Validators.required));
- this.parentForm.addControl('owner', new FormControl(this.permission.ownerSid, Validators.required));
+ this.parentForm.addControl('publicElement', new UntypedFormControl(this.permission.publicElement, Validators.required));
+ this.parentForm.addControl('owner', new UntypedFormControl(this.permission.ownerSid, Validators.required));
this.filteredUsers = this.userCtrl.valueChanges.pipe(
startWith(null),
map((username: string | null) => {
diff --git a/ui/src/app/core-ui/static-properties/base/abstract-static-property.ts b/ui/src/app/core-ui/static-properties/base/abstract-static-property.ts
index dbaa23960..f93bbdfeb 100644
--- a/ui/src/app/core-ui/static-properties/base/abstract-static-property.ts
+++ b/ui/src/app/core-ui/static-properties/base/abstract-static-property.ts
@@ -18,7 +18,7 @@
import { EventSchema, StaticProperty, StaticPropertyUnion } from '@streampipes/platform-services';
import { Directive, EventEmitter, Input, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
import { ConfigurationInfo } from '../../../connect/model/ConfigurationInfo';
import { InvocablePipelineElementUnion } from '../../../editor/model/editor.model';
@@ -42,7 +42,7 @@ export abstract class AbstractStaticPropertyRenderer<T extends StaticProperty> {
pipelineElement: InvocablePipelineElementUnion;
@Input()
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
@Input()
fieldName: string;
diff --git a/ui/src/app/core-ui/static-properties/base/abstract-validated-static-property.ts b/ui/src/app/core-ui/static-properties/base/abstract-validated-static-property.ts
index 1076be8ba..70b825b10 100644
--- a/ui/src/app/core-ui/static-properties/base/abstract-validated-static-property.ts
+++ b/ui/src/app/core-ui/static-properties/base/abstract-validated-static-property.ts
@@ -18,7 +18,7 @@
import { StaticProperty } from '@streampipes/platform-services';
import { AbstractStaticPropertyRenderer } from './abstract-static-property';
-import { FormControl, ValidatorFn } from '@angular/forms';
+import { UntypedFormControl, ValidatorFn } from '@angular/forms';
import { Directive, OnDestroy } from '@angular/core';
@Directive()
@@ -43,7 +43,7 @@ export abstract class AbstractValidatedStaticPropertyRenderer<T extends StaticPr
}
addValidator(defaultValue: any, validators: ValidatorFn | ValidatorFn[]) {
- this.parentForm.addControl(this.fieldName, new FormControl(defaultValue, validators));
+ this.parentForm.addControl(this.fieldName, new UntypedFormControl(defaultValue, validators));
this.parentForm.updateValueAndValidity();
}
diff --git a/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts b/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts
index eb7a96757..043e221dd 100644
--- a/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-color-picker/static-color-picker.component.ts
@@ -19,7 +19,7 @@
import { Component, OnInit } from '@angular/core';
import { ConfigurationInfo } from '../../../connect/model/ConfigurationInfo';
import { StaticPropertyUtilService } from '../static-property-util.service';
-import { FormGroup, Validators } from '@angular/forms';
+import { UntypedFormGroup, Validators } from '@angular/forms';
import { ColorPickerStaticProperty } from '@streampipes/platform-services';
import { AbstractValidatedStaticPropertyRenderer } from '../base/abstract-validated-static-property';
@@ -37,7 +37,7 @@ export class StaticColorPickerComponent
inputValue: String;
hasInput: Boolean;
- colorPickerForm: FormGroup;
+ colorPickerForm: UntypedFormGroup;
presetColors: any[] = ['#39B54A', '#1B1464', '#f44336', '#4CAF50', '#FFEB3B', '#FFFFFF', '#000000'];
diff --git a/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.ts b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.ts
index 8a3269e07..d025d7b66 100644
--- a/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.ts
@@ -21,7 +21,7 @@ import { HttpEventType, HttpResponse } from '@angular/common/http';
import { FilesService, FileStaticProperty, FileMetadata } from '@streampipes/platform-services';
import { ConfigurationInfo } from '../../../connect/model/ConfigurationInfo';
import { AbstractValidatedStaticPropertyRenderer } from '../base/abstract-validated-static-property';
-import { FormControl, ValidatorFn, Validators } from '@angular/forms';
+import { UntypedFormControl, ValidatorFn, Validators } from '@angular/forms';
@Component({
@@ -33,7 +33,7 @@ export class StaticFileInputComponent extends AbstractValidatedStaticPropertyRen
@Output() inputEmitter: EventEmitter<boolean> = new EventEmitter<boolean>();
- public chooseExistingFileControl = new FormControl();
+ public chooseExistingFileControl = new UntypedFormControl();
// inputValue: string;
fileName: string;
diff --git a/ui/src/app/core-ui/static-properties/static-property.component.ts b/ui/src/app/core-ui/static-properties/static-property.component.ts
index a6b98e849..ea0f738db 100644
--- a/ui/src/app/core-ui/static-properties/static-property.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-property.component.ts
@@ -38,7 +38,7 @@ import {
StaticPropertyAlternatives,
StaticPropertyGroup
} from '@streampipes/platform-services';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
import { InvocablePipelineElementUnion } from '../../editor/model/editor.model';
@Component({
@@ -71,7 +71,7 @@ export class StaticPropertyComponent implements OnInit {
completedStaticProperty: ConfigurationInfo;
@Input()
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
@Input()
fieldName: string;
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts
index f5b973c11..b7f779ea2 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.ts
@@ -20,7 +20,7 @@ import { Component, OnChanges, OnInit } from '@angular/core';
import { RuntimeResolvableOneOfStaticProperty, StaticPropertyUnion } from '@streampipes/platform-services';
import { RuntimeResolvableService } from '../static-runtime-resolvable-input/runtime-resolvable.service';
import { BaseRuntimeResolvableSelectionInput } from '../static-runtime-resolvable-input/base-runtime-resolvable-selection-input';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
@Component({
selector: 'app-static-runtime-resolvable-oneof-input',
@@ -36,7 +36,7 @@ export class StaticRuntimeResolvableOneOfInputComponent
ngOnInit() {
super.onInit();
- this.parentForm.addControl(this.staticProperty.internalName, new FormControl(this.staticProperty.options, []));
+ this.parentForm.addControl(this.staticProperty.internalName, new UntypedFormControl(this.staticProperty.options, []));
this.performValidation();
}
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.ts b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.ts
index cb2fa1883..8bb5ee24e 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.ts
@@ -26,7 +26,7 @@ import {
import { RuntimeResolvableService } from '../static-runtime-resolvable-input/runtime-resolvable.service';
import { NestedTreeControl } from '@angular/cdk/tree';
import { MatTreeNestedDataSource } from '@angular/material/tree';
-import { AbstractControl, FormControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+import { AbstractControl, UntypedFormControl, ValidationErrors, ValidatorFn } from '@angular/forms';
@Component({
selector: 'sp-runtime-resolvable-tree-input',
@@ -56,7 +56,7 @@ export class StaticRuntimeResolvableTreeInputComponent
this.showOptions = true;
}
super.onInit();
- this.parentForm.addControl(this.staticProperty.internalName, new FormControl(this.staticProperty.nodes, []));
+ this.parentForm.addControl(this.staticProperty.internalName, new UntypedFormControl(this.staticProperty.nodes, []));
}
parse(staticProperty: StaticPropertyUnion): RuntimeResolvableTreeInputStaticProperty {
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.ts b/ui/src/app/core/components/toolbar/toolbar.component.ts
index d476b91df..c8722b60b 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.ts
+++ b/ui/src/app/core/components/toolbar/toolbar.component.ts
@@ -21,7 +21,7 @@ import { BaseNavigationComponent } from '../base-navigation.component';
import { Router } from '@angular/router';
import { RestApi } from '../../../services/rest-api.service';
import { MatMenuTrigger } from '@angular/material/menu';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
import { OverlayContainer } from '@angular/cdk/overlay';
import { ProfileService } from '../../../profile/profile.service';
import { AuthService } from '../../../services/auth.service';
@@ -43,7 +43,7 @@ export class ToolbarComponent extends BaseNavigationComponent implements OnInit,
userEmail;
darkMode: boolean;
- appearanceControl: FormControl;
+ appearanceControl: UntypedFormControl;
unreadNotificationCount = 0;
unreadNotificationsSubscription: Subscription;
@@ -76,7 +76,7 @@ export class ToolbarComponent extends BaseNavigationComponent implements OnInit,
});
});
- this.appearanceControl = new FormControl(this.authService.darkMode$.getValue());
+ this.appearanceControl = new UntypedFormControl(this.authService.darkMode$.getValue());
this.appearanceControl.valueChanges.subscribe(darkMode => {
this.authService.darkMode$.next(darkMode);
this.modifyAppearance(darkMode);
diff --git a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
index 538408d89..b6edd0b07 100644
--- a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
+++ b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
@@ -35,7 +35,7 @@ import {
MappingPropertyUnary,
PipelineService
} from '@streampipes/platform-services';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { DialogRef } from '@streampipes/shared-ui';
import { zip } from 'rxjs';
@@ -72,7 +72,7 @@ export class AddVisualizationDialogComponent implements OnInit, AfterViewInit {
page: any = 'select-pipeline';
dialogTitle: string;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
formValid = false;
viewInitialized = false;
@@ -97,7 +97,7 @@ export class AddVisualizationDialogComponent implements OnInit, AfterViewInit {
private dataExplorerService: DataViewDataExplorerService,
private pipelineService: PipelineService,
public elementIconText: ElementIconText,
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private changeDetectorRef: ChangeDetectorRef) {
}
diff --git a/ui/src/app/editor/components/output-strategy/base/BaseOutputStrategy.ts b/ui/src/app/editor/components/output-strategy/base/BaseOutputStrategy.ts
index 8b2dfd3a6..8a920817f 100644
--- a/ui/src/app/editor/components/output-strategy/base/BaseOutputStrategy.ts
+++ b/ui/src/app/editor/components/output-strategy/base/BaseOutputStrategy.ts
@@ -17,7 +17,7 @@
*/
import { Input, Directive } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
import {
DataProcessorInvocation,
OutputStrategy
@@ -28,7 +28,7 @@ import {
export abstract class BaseOutputStrategy<T extends OutputStrategy> {
@Input()
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
@Input()
outputStrategy: T;
diff --git a/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.ts b/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.ts
index d64b1da9d..12faf2615 100644
--- a/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.ts
+++ b/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.ts
@@ -20,7 +20,7 @@ import { Component, OnInit } from '@angular/core';
import { CustomOutputStrategy } from '@streampipes/platform-services';
import { BaseOutputStrategy } from '../base/BaseOutputStrategy';
import { PropertySelectorService } from '../../../../services/property-selector.service';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
@Component({
selector: 'custom-output-strategy',
@@ -37,7 +37,7 @@ export class CustomOutputStrategyComponent extends BaseOutputStrategy<CustomOutp
}
ngOnInit() {
- this.parentForm.addControl('output-strategy', new FormControl());
+ this.parentForm.addControl('output-strategy', new UntypedFormControl());
this.collectedPropertiesFirstStream = this.propertySelectorService
.makeProperties(this.getProperties(0), this.outputStrategy.availablePropertyKeys, this.propertySelectorService.firstStreamPrefix);
this.collectedPropertiesSecondStream = this.propertySelectorService
diff --git a/ui/src/app/editor/components/output-strategy/output-strategy.component.ts b/ui/src/app/editor/components/output-strategy/output-strategy.component.ts
index e2229ad02..c51d716fa 100644
--- a/ui/src/app/editor/components/output-strategy/output-strategy.component.ts
+++ b/ui/src/app/editor/components/output-strategy/output-strategy.component.ts
@@ -18,7 +18,7 @@
import { Component, Input, OnInit } from '@angular/core';
import { DataProcessorInvocation, OutputStrategy } from '@streampipes/platform-services';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
@Component({
selector: 'output-strategy',
@@ -28,7 +28,7 @@ import { FormGroup } from '@angular/forms';
export class OutputStrategyComponent implements OnInit {
@Input()
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
@Input()
outputStrategy: OutputStrategy;
diff --git a/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts b/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts
index b66303a2d..2207b42f4 100644
--- a/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts
+++ b/ui/src/app/editor/components/output-strategy/user-defined-output/user-defined-output.component.ts
@@ -22,7 +22,7 @@ import {
EventPropertyPrimitive,
UserDefinedOutputStrategy
} from '@streampipes/platform-services';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
@Component({
selector: 'user-defined-output-strategy',
@@ -49,7 +49,7 @@ export class UserDefinedOutputStrategyComponent extends BaseOutputStrategy<UserD
}
ngOnInit() {
- this.parentForm.addControl('output-strategy', new FormControl());
+ this.parentForm.addControl('output-strategy', new UntypedFormControl());
if (!this.outputStrategy.eventProperties) {
this.outputStrategy.eventProperties = [];
}
diff --git a/ui/src/app/editor/dialog/customize/customize.component.ts b/ui/src/app/editor/dialog/customize/customize.component.ts
index f042ccfe8..88e3795cb 100644
--- a/ui/src/app/editor/dialog/customize/customize.component.ts
+++ b/ui/src/app/editor/dialog/customize/customize.component.ts
@@ -31,7 +31,7 @@ import {
PipelineElementTemplateConfig,
PipelineElementTemplateService
} from '@streampipes/platform-services';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { ShepherdService } from '../../../services/tour/shepherd.service';
import { ConfigurationInfo } from '../../../connect/model/ConfigurationInfo';
import { PipelineStyleService } from '../../services/pipeline-style.service';
@@ -63,7 +63,7 @@ export class CustomizeComponent implements OnInit, AfterViewInit {
sourceEndpoint: any;
sepa: any;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
formValid: boolean;
viewInitialized = false;
@@ -80,7 +80,7 @@ export class CustomizeComponent implements OnInit, AfterViewInit {
constructor(private dialogRef: DialogRef<CustomizeComponent>,
private jsPlumbService: JsplumbService,
private shepherdService: ShepherdService,
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private changeDetectorRef: ChangeDetectorRef,
private pipelineElementTemplateService: PipelineElementTemplateService,
private pipelineStyleService: PipelineStyleService) {
diff --git a/ui/src/app/editor/dialog/save-pipeline/save-pipeline.component.ts b/ui/src/app/editor/dialog/save-pipeline/save-pipeline.component.ts
index 8c522bf22..907be7193 100644
--- a/ui/src/app/editor/dialog/save-pipeline/save-pipeline.component.ts
+++ b/ui/src/app/editor/dialog/save-pipeline/save-pipeline.component.ts
@@ -22,7 +22,7 @@ import { Message, Pipeline, PipelineCanvasMetadata, PipelineService, PipelineCan
import { ObjectProvider } from '../../services/object-provider.service';
import { EditorService } from '../../services/editor.service';
import { ShepherdService } from '../../../services/tour/shepherd.service';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { InvocablePipelineElementUnion } from "../../model/editor.model";
import { JsplumbService } from "../../services/jsplumb.service";
@@ -38,7 +38,7 @@ export class SavePipelineComponent implements OnInit {
startPipelineAfterStorage: any;
updateMode: any;
- submitPipelineForm: FormGroup = new FormGroup({});
+ submitPipelineForm: UntypedFormGroup = new UntypedFormGroup({});
@Input()
pipeline: Pipeline;
@@ -78,10 +78,10 @@ export class SavePipelineComponent implements OnInit {
this.currentPipelineName = this.pipeline.name;
}
- this.submitPipelineForm.addControl('pipelineName', new FormControl(this.pipeline.name,
+ this.submitPipelineForm.addControl('pipelineName', new UntypedFormControl(this.pipeline.name,
[Validators.required,
Validators.maxLength(40)]));
- this.submitPipelineForm.addControl('pipelineDescription', new FormControl(this.pipeline.description,
+ this.submitPipelineForm.addControl('pipelineDescription', new UntypedFormControl(this.pipeline.description,
[Validators.maxLength(80)]));
this.submitPipelineForm.controls['pipelineName'].valueChanges.subscribe(value => {
diff --git a/ui/src/app/login/components/login/login.component.ts b/ui/src/app/login/components/login/login.component.ts
index 2a5ae6172..8ad2670a8 100644
--- a/ui/src/app/login/components/login/login.component.ts
+++ b/ui/src/app/login/components/login/login.component.ts
@@ -22,7 +22,7 @@ import { LoginService } from '../../services/login.service';
import { Router } from '@angular/router';
import { AuthService } from '../../../services/auth.service';
import { LoginModel } from './login.model';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
@Component({
selector: 'login',
@@ -31,7 +31,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
})
export class LoginComponent implements OnInit {
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
configReady = false;
loading: boolean;
authenticationFailed: boolean;
@@ -43,7 +43,7 @@ export class LoginComponent implements OnInit {
private router: Router,
private shepherdService: ShepherdService,
private authService: AuthService,
- private fb: FormBuilder) {
+ private fb: UntypedFormBuilder) {
this.loading = false;
this.authenticationFailed = false;
this.credentials = {};
@@ -54,8 +54,8 @@ export class LoginComponent implements OnInit {
this.loginSettings = result;
this.configReady = true;
this.parentForm = this.fb.group({});
- this.parentForm.addControl('username', new FormControl('', Validators.required));
- this.parentForm.addControl('password', new FormControl('', Validators.required));
+ this.parentForm.addControl('username', new UntypedFormControl('', Validators.required));
+ this.parentForm.addControl('password', new UntypedFormControl('', Validators.required));
this.parentForm.valueChanges.subscribe(v => {
this.credentials.username = v.username;
diff --git a/ui/src/app/login/components/register/register.component.ts b/ui/src/app/login/components/register/register.component.ts
index 4e48faeb4..33c88484a 100644
--- a/ui/src/app/login/components/register/register.component.ts
+++ b/ui/src/app/login/components/register/register.component.ts
@@ -18,9 +18,9 @@
import { Component, OnInit } from '@angular/core';
import {
- FormBuilder,
- FormControl,
- FormGroup,
+ UntypedFormBuilder,
+ UntypedFormControl,
+ UntypedFormGroup,
Validators
} from '@angular/forms';
import { RegistrationModel } from './registration.model';
@@ -34,7 +34,7 @@ import { checkPasswords } from '../../utils/check-password';
})
export class RegisterComponent implements OnInit {
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
registrationData: RegistrationModel;
@@ -42,15 +42,15 @@ export class RegisterComponent implements OnInit {
registrationSuccess = false;
registrationError: string;
- constructor(private fb: FormBuilder,
+ constructor(private fb: UntypedFormBuilder,
private loginService: LoginService) {
}
ngOnInit(): void {
this.parentForm = this.fb.group({});
- this.parentForm.addControl('username', new FormControl('', [Validators.required, Validators.email]));
- this.parentForm.addControl('password', new FormControl('', Validators.required));
- this.parentForm.addControl('repeatPassword', new FormControl('', Validators.required));
+ this.parentForm.addControl('username', new UntypedFormControl('', [Validators.required, Validators.email]));
+ this.parentForm.addControl('password', new UntypedFormControl('', Validators.required));
+ this.parentForm.addControl('repeatPassword', new UntypedFormControl('', Validators.required));
this.parentForm.setValidators(checkPasswords);
this.parentForm.valueChanges.subscribe(v => {
diff --git a/ui/src/app/login/components/restore-password/restore-password.component.ts b/ui/src/app/login/components/restore-password/restore-password.component.ts
index 1883f8397..d820fea0e 100644
--- a/ui/src/app/login/components/restore-password/restore-password.component.ts
+++ b/ui/src/app/login/components/restore-password/restore-password.component.ts
@@ -17,7 +17,7 @@
*/
import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { LoginService } from '../../services/login.service';
@Component({
@@ -27,19 +27,19 @@ import { LoginService } from '../../services/login.service';
})
export class RestorePasswordComponent implements OnInit {
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
restoreSuccess = false;
restoreCompleted = false;
username: string;
- constructor(private fb: FormBuilder,
+ constructor(private fb: UntypedFormBuilder,
private loginService: LoginService) {
}
ngOnInit(): void {
this.parentForm = this.fb.group({});
- this.parentForm.addControl('username', new FormControl('', Validators.required));
+ this.parentForm.addControl('username', new UntypedFormControl('', Validators.required));
this.parentForm.valueChanges.subscribe(result => {
this.username = result.username;
diff --git a/ui/src/app/login/components/set-new-password/set-new-password.component.ts b/ui/src/app/login/components/set-new-password/set-new-password.component.ts
index 6716e8537..563108a33 100644
--- a/ui/src/app/login/components/set-new-password/set-new-password.component.ts
+++ b/ui/src/app/login/components/set-new-password/set-new-password.component.ts
@@ -18,7 +18,7 @@
import { Component, OnInit } from '@angular/core';
import { RestorePasswordService } from '../../services/restore-password.service';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { checkPasswords } from '../../utils/check-password';
import { RegistrationModel } from '../register/registration.model';
import { ActivatedRoute, Router } from '@angular/router';
@@ -30,7 +30,7 @@ import { ActivatedRoute, Router } from '@angular/router';
})
export class SetNewPasswordComponent implements OnInit {
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
registrationModel: RegistrationModel;
recoveryCode: string;
@@ -38,7 +38,7 @@ export class SetNewPasswordComponent implements OnInit {
resetInProgress = false;
resetSuccess = false;
- constructor(private fb: FormBuilder,
+ constructor(private fb: UntypedFormBuilder,
private restorePasswordService: RestorePasswordService,
private route: ActivatedRoute,
private router: Router) {
@@ -58,8 +58,8 @@ export class SetNewPasswordComponent implements OnInit {
}
});
this.parentForm = this.fb.group({});
- this.parentForm.addControl('password', new FormControl('', Validators.required));
- this.parentForm.addControl('repeatPassword', new FormControl('', Validators.required));
+ this.parentForm.addControl('password', new UntypedFormControl('', Validators.required));
+ this.parentForm.addControl('repeatPassword', new UntypedFormControl('', Validators.required));
this.parentForm.setValidators(checkPasswords);
this.parentForm.valueChanges.subscribe(v => {
diff --git a/ui/src/app/pipeline-details/components/edit/quickedit.component.ts b/ui/src/app/pipeline-details/components/edit/quickedit.component.ts
index 5432ce0f6..6e07888fc 100644
--- a/ui/src/app/pipeline-details/components/edit/quickedit.component.ts
+++ b/ui/src/app/pipeline-details/components/edit/quickedit.component.ts
@@ -24,7 +24,7 @@ import {
PipelineService
} from '@streampipes/platform-services';
import { PipelineElementUnion } from '../../../editor/model/editor.model';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { SpPipelineDetailsDirective } from '../sp-pipeline-details.directive';
import { ActivatedRoute } from '@angular/router';
import { AuthService } from '../../../services/auth.service';
@@ -41,7 +41,7 @@ export class QuickEditComponent extends SpPipelineDetailsDirective implements On
eventSchemas: EventSchema[];
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
formValid: boolean;
viewInitialized = false;
@@ -53,7 +53,7 @@ export class QuickEditComponent extends SpPipelineDetailsDirective implements On
constructor(activatedRoute: ActivatedRoute,
pipelineService: PipelineService,
authService: AuthService,
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private changeDetectorRef: ChangeDetectorRef,
breadcrumbService: SpBreadcrumbService) {
super(activatedRoute, pipelineService, authService, breadcrumbService);
diff --git a/ui/src/app/profile/dialog/change-email/change-email-dialog.component.ts b/ui/src/app/profile/dialog/change-email/change-email-dialog.component.ts
index df185e5f9..c8271502d 100644
--- a/ui/src/app/profile/dialog/change-email/change-email-dialog.component.ts
+++ b/ui/src/app/profile/dialog/change-email/change-email-dialog.component.ts
@@ -20,9 +20,9 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { DialogRef } from '@streampipes/shared-ui';
import {
AbstractControl,
- FormBuilder,
- FormControl,
- FormGroup,
+ UntypedFormBuilder,
+ UntypedFormControl,
+ UntypedFormGroup,
ValidationErrors,
ValidatorFn,
Validators
@@ -37,7 +37,7 @@ import { UserAccount, UserService } from '@streampipes/platform-services';
})
export class ChangeEmailDialogComponent implements OnInit {
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
@Input()
user: UserAccount;
@@ -53,7 +53,7 @@ export class ChangeEmailDialogComponent implements OnInit {
errorMessage = '';
constructor(private dialogRef: DialogRef<ChangeEmailDialogComponent>,
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private userService: UserService) {
}
@@ -62,9 +62,9 @@ export class ChangeEmailDialogComponent implements OnInit {
this.clonedUser = UserAccount.fromData(this.user);
this.email = this.clonedUser.username;
this.parentForm = this.fb.group({});
- this.parentForm.addControl('email', new FormControl(this.email, [Validators.required, Validators.email]));
- this.parentForm.addControl('emailConfirm', new FormControl(this.confirmMail, [Validators.required, Validators.email]));
- this.parentForm.addControl('passwordConfirm', new FormControl(this.confirmPw, [Validators.required]));
+ this.parentForm.addControl('email', new UntypedFormControl(this.email, [Validators.required, Validators.email]));
+ this.parentForm.addControl('emailConfirm', new UntypedFormControl(this.confirmMail, [Validators.required, Validators.email]));
+ this.parentForm.addControl('passwordConfirm', new UntypedFormControl(this.confirmPw, [Validators.required]));
this.parentForm.setValidators(this.checkEmail);
this.parentForm.valueChanges.subscribe(v => {
diff --git a/ui/src/app/profile/dialog/change-password/change-password-dialog.component.ts b/ui/src/app/profile/dialog/change-password/change-password-dialog.component.ts
index 77b2c77dd..657c74acf 100644
--- a/ui/src/app/profile/dialog/change-password/change-password-dialog.component.ts
+++ b/ui/src/app/profile/dialog/change-password/change-password-dialog.component.ts
@@ -20,9 +20,9 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { DialogRef } from '@streampipes/shared-ui';
import {
AbstractControl,
- FormBuilder,
- FormControl,
- FormGroup,
+ UntypedFormBuilder,
+ UntypedFormControl,
+ UntypedFormGroup,
ValidationErrors,
ValidatorFn,
Validators
@@ -40,7 +40,7 @@ export class ChangePasswordDialogComponent implements OnInit {
@Input()
user: UserAccount;
- parentForm: FormGroup;
+ parentForm: UntypedFormGroup;
existingPw = '';
newPw = '';
@@ -51,16 +51,16 @@ export class ChangePasswordDialogComponent implements OnInit {
errorMessage = '';
constructor(private dialogRef: DialogRef<ChangePasswordDialogComponent>,
- private fb: FormBuilder,
+ private fb: UntypedFormBuilder,
private userService: UserService) {
}
ngOnInit(): void {
this.parentForm = this.fb.group({});
- this.parentForm.addControl('currentPassword', new FormControl(this.existingPw, [Validators.required]));
- this.parentForm.addControl('newPassword', new FormControl(this.newPw, [Validators.required]));
- this.parentForm.addControl('newPasswordConfirm', new FormControl(this.newPw, [Validators.required]));
+ this.parentForm.addControl('currentPassword', new UntypedFormControl(this.existingPw, [Validators.required]));
+ this.parentForm.addControl('newPassword', new UntypedFormControl(this.newPw, [Validators.required]));
+ this.parentForm.addControl('newPasswordConfirm', new UntypedFormControl(this.newPw, [Validators.required]));
this.parentForm.setValidators(this.checkPasswords);
this.parentForm.valueChanges.subscribe(v => {
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index 725c0180b..85aa7a826 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -18,7 +18,7 @@
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
- "target": "es2015",
+ "target": "es2020",
"typeRoots": [
"node_modules/@types"
],