From f89d97790b744961cc7adb619fb7c9f830449efc Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 18 Oct 2019 07:16:46 -0700 Subject: [PATCH] SHIBUI-1527 Updated app to work with breaking changes from updates --- ui/src/app/app.component.spec.ts | 2 +- ui/src/app/app.routing.ts | 4 ++-- ui/src/app/core/service/file.service.ts | 2 -- ui/src/app/core/service/modal.service.ts | 5 ++--- ui/src/app/core/service/user.service.spec.ts | 3 +-- .../component/filter-version-list.component.spec.ts | 2 +- .../configuration/component/history-list.component.spec.ts | 2 +- .../component/metadata-configuration.component.spec.ts | 2 +- .../component/metadata-header.component.spec.ts | 2 +- .../component/property/array-property.component.spec.ts | 2 +- .../property/configuration-property.component.spec.ts | 2 +- .../property/filter-target-property.component.spec.ts | 2 +- .../component/property/object-property.component.spec.ts | 2 +- .../component/property/primitive-property.component.spec.ts | 2 +- .../configuration/container/configuration.component.spec.ts | 2 +- .../container/metadata-options.component.spec.ts | 2 +- .../configuration/container/metadata-xml.component.spec.ts | 2 +- .../container/restore-edit-step.component.spec.ts | 2 +- .../configuration/container/restore-edit.component.spec.ts | 2 +- .../configuration/container/restore.component.spec.ts | 2 +- .../container/version-options.component.spec.ts | 2 +- .../configuration/container/version.component.spec.ts | 2 +- .../metadata/domain/component/editor-nav.component.spec.ts | 2 +- .../domain/component/preview-dialog.component.spec.ts | 2 +- .../domain/component/summary-property.component.spec.ts | 2 +- .../metadata/domain/component/unsaved-entity.dialog.spec.ts | 2 +- ui/src/app/metadata/domain/domain.module.ts | 2 -- ui/src/app/metadata/metadata.component.spec.ts | 2 +- .../provider/container/provider-edit-step.component.spec.ts | 2 +- .../provider/container/provider-edit.component.spec.ts | 2 +- .../container/provider-filter-list.component.spec.ts | 2 +- .../provider/container/provider-select.component.spec.ts | 2 +- .../container/provider-wizard-step.component.spec.ts | 2 +- .../provider/container/provider-wizard.component.spec.ts | 2 +- .../resolver/component/finish-form.component.spec.ts | 2 +- .../resolver/container/copy-resolver.component.spec.ts | 2 +- .../container/resolver-wizard-step.component.spec.ts | 2 +- .../resolver/container/resolver-wizard.component.spec.ts | 2 +- .../resolver/container/upload-resolver.component.spec.ts | 2 +- ui/src/app/schema-form/widget/number/float.component.ts | 2 +- .../app/shared/autocomplete/autocomplete.component.spec.ts | 2 +- ui/src/app/shared/autocomplete/autocomplete.component.ts | 2 +- ui/src/app/shared/switch/switch.component.spec.ts | 2 +- ui/src/app/wizard/component/wizard.component.spec.ts | 2 +- 44 files changed, 44 insertions(+), 50 deletions(-) diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts index 78c90e6a2..929507eeb 100644 --- a/ui/src/app/app.component.spec.ts +++ b/ui/src/app/app.component.spec.ts @@ -18,7 +18,7 @@ import { NavigationServiceStub } from '../testing/navigation-service.stub'; ` }) class TestHostComponent { - @ViewChild(AppComponent) + @ViewChild(AppComponent, {static: true}) public componentUnderTest: AppComponent; } diff --git a/ui/src/app/app.routing.ts b/ui/src/app/app.routing.ts index 091cec57b..06f79db25 100644 --- a/ui/src/app/app.routing.ts +++ b/ui/src/app/app.routing.ts @@ -5,11 +5,11 @@ const routes: Routes = [ { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, { path: 'dashboard', - loadChildren: './dashboard/dashboard.module#DashboardModule' + loadChildren: () => import('./dashboard/dashboard.module').then(m => m.DashboardModule) }, { path: 'metadata', - loadChildren: './metadata/metadata.module#MetadataModule' + loadChildren: () => import('./metadata/metadata.module').then(m => m.MetadataModule) } ]; diff --git a/ui/src/app/core/service/file.service.ts b/ui/src/app/core/service/file.service.ts index c41cfeb27..5be9a739f 100644 --- a/ui/src/app/core/service/file.service.ts +++ b/ui/src/app/core/service/file.service.ts @@ -1,7 +1,5 @@ import { Injectable } from '@angular/core'; -import { Http } from '@angular/http'; import { Observable, Subject } from 'rxjs'; -import { User } from '../model/user'; @Injectable() export class FileService { diff --git a/ui/src/app/core/service/modal.service.ts b/ui/src/app/core/service/modal.service.ts index 955773b89..cea6780ca 100644 --- a/ui/src/app/core/service/modal.service.ts +++ b/ui/src/app/core/service/modal.service.ts @@ -1,6 +1,5 @@ -import { Injectable, ComponentRef } from '@angular/core'; -import { Http } from '@angular/http'; -import { Observable, of } from 'rxjs'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; import { NgbModal, NgbModalOptions } from '@ng-bootstrap/ng-bootstrap'; import { fromPromise } from 'rxjs/observable/fromPromise'; diff --git a/ui/src/app/core/service/user.service.spec.ts b/ui/src/app/core/service/user.service.spec.ts index 55bad9bab..61780bcfd 100644 --- a/ui/src/app/core/service/user.service.spec.ts +++ b/ui/src/app/core/service/user.service.spec.ts @@ -1,5 +1,4 @@ -import { TestBed, async, inject } from '@angular/core/testing'; -import { HttpModule } from '@angular/http'; +import { TestBed } from '@angular/core/testing'; import { UserService } from './user.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; diff --git a/ui/src/app/metadata/configuration/component/filter-version-list.component.spec.ts b/ui/src/app/metadata/configuration/component/filter-version-list.component.spec.ts index c555ea9fc..c13607cef 100644 --- a/ui/src/app/metadata/configuration/component/filter-version-list.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/filter-version-list.component.spec.ts @@ -31,7 +31,7 @@ export const TestData: FilterConfiguration = { template: `` }) class TestHostComponent { - @ViewChild(FilterVersionListComponent) + @ViewChild(FilterVersionListComponent, {static: true}) public componentUnderTest: FilterVersionListComponent; filters = TestData; diff --git a/ui/src/app/metadata/configuration/component/history-list.component.spec.ts b/ui/src/app/metadata/configuration/component/history-list.component.spec.ts index 35fcbe68d..257262963 100644 --- a/ui/src/app/metadata/configuration/component/history-list.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/history-list.component.spec.ts @@ -20,7 +20,7 @@ export const TestData = { template: `` }) class TestHostComponent { - @ViewChild(HistoryListComponent) + @ViewChild(HistoryListComponent, {static: true}) public componentUnderTest: HistoryListComponent; history: MetadataHistory = TestData; diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts index 3feb146b5..e1f49151f 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts @@ -24,7 +24,7 @@ class ObjectPropertyComponent { ` }) class TestHostComponent { - @ViewChild(MetadataConfigurationComponent) + @ViewChild(MetadataConfigurationComponent, {static: true}) public componentUnderTest: MetadataConfigurationComponent; configuration: MetadataConfiguration = { diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts index f3cfd0d45..95aa91bda 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts @@ -14,7 +14,7 @@ import { MetadataHeaderComponent } from './metadata-header.component'; ` }) class TestHostComponent { - @ViewChild(MetadataHeaderComponent) + @ViewChild(MetadataHeaderComponent, {static: true}) public componentUnderTest: MetadataHeaderComponent; isEnabled = true; diff --git a/ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts index 363b3163a..05be27ca8 100644 --- a/ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts @@ -18,7 +18,7 @@ import { of } from 'rxjs'; ` }) class TestHostComponent { - @ViewChild(ArrayPropertyComponent) + @ViewChild(ArrayPropertyComponent, {static: true}) public componentUnderTest: ArrayPropertyComponent; property: Property = getStepProperty(SCHEMA.properties.list, [{ diff --git a/ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts index cccfd9114..a3c7d31ce 100644 --- a/ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts @@ -15,7 +15,7 @@ import { ConfigurationPropertyComponent } from './configuration-property.compone ` }) class TestHostComponent { - @ViewChild(ConfigurationPropertyComponent) + @ViewChild(ConfigurationPropertyComponent, {static: true}) public componentUnderTest: ConfigurationPropertyComponent; property: Property = getStepProperty(SCHEMA.properties.name, { diff --git a/ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts index d1308787d..9c63a1b86 100644 --- a/ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts @@ -16,7 +16,7 @@ import { ArrayPropertyComponentStub, PrimitivePropertyComponentStub } from '../. ` }) class TestHostComponent { - @ViewChild(FilterTargetPropertyComponent) + @ViewChild(FilterTargetPropertyComponent, {static: true}) public componentUnderTest: FilterTargetPropertyComponent; property: Property = getStepProperty(SCHEMA.properties.formatFilterTarget, { diff --git a/ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts index d9ddcdd97..57aac139c 100644 --- a/ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts @@ -18,7 +18,7 @@ import { FilterTargetPropertyComponent } from './filter-target-property.componen ` }) class TestHostComponent { - @ViewChild(ObjectPropertyComponent) + @ViewChild(ObjectPropertyComponent, {static: true}) public componentUnderTest: ObjectPropertyComponent; property: Property = getStepProperty(SCHEMA.properties.name, { diff --git a/ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts index bf893396e..17e57b6dc 100644 --- a/ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts @@ -13,7 +13,7 @@ import { PrimitivePropertyComponent } from './primitive-property.component'; ` }) class TestHostComponent { - @ViewChild(PrimitivePropertyComponent) + @ViewChild(PrimitivePropertyComponent, {static: true}) public componentUnderTest: PrimitivePropertyComponent; property: Property = { diff --git a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts index b1d9bc2f2..6341d73db 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts @@ -16,7 +16,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; ` }) class TestHostComponent { - @ViewChild(ConfigurationComponent) + @ViewChild(ConfigurationComponent, {static: true}) public componentUnderTest: ConfigurationComponent; } diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts index 120cd7c5c..59dabed3a 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts @@ -32,7 +32,7 @@ import { NgbModalStub } from '../../../../testing/modal.stub'; ` }) class TestHostComponent { - @ViewChild(MetadataOptionsComponent) + @ViewChild(MetadataOptionsComponent, {static: true}) public componentUnderTest: MetadataOptionsComponent; configuration: MetadataConfiguration = { diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts index 5e5815c06..4767482f9 100644 --- a/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts @@ -15,7 +15,7 @@ import { MetadataXmlComponent } from './metadata-xml.component'; ` }) class TestHostComponent { - @ViewChild(MetadataXmlComponent) + @ViewChild(MetadataXmlComponent, {static: true}) public componentUnderTest: MetadataXmlComponent; } diff --git a/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts b/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts index d42f0be51..501a35609 100644 --- a/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts @@ -22,7 +22,7 @@ import { WizardActionTypes } from '../../../wizard/action/wizard.action'; ` }) class TestHostComponent { - @ViewChild(RestoreEditStepComponent) + @ViewChild(RestoreEditStepComponent, {static: true}) public componentUnderTest: RestoreEditStepComponent; } diff --git a/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts b/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts index 847ab5623..972236642 100644 --- a/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts @@ -17,7 +17,7 @@ import { RestoreActionTypes } from '../action/restore.action'; ` }) class TestHostComponent { - @ViewChild(RestoreEditComponent) + @ViewChild(RestoreEditComponent, {static: true}) public componentUnderTest: RestoreEditComponent; } diff --git a/ui/src/app/metadata/configuration/container/restore.component.spec.ts b/ui/src/app/metadata/configuration/container/restore.component.spec.ts index 36420e2f6..afa3d3dfe 100644 --- a/ui/src/app/metadata/configuration/container/restore.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/restore.component.spec.ts @@ -19,7 +19,7 @@ import { Router } from '@angular/router'; ` }) class TestHostComponent { - @ViewChild(RestoreComponent) + @ViewChild(RestoreComponent, {static: true}) public componentUnderTest: RestoreComponent; } diff --git a/ui/src/app/metadata/configuration/container/version-options.component.spec.ts b/ui/src/app/metadata/configuration/container/version-options.component.spec.ts index 86f78f839..8894111a9 100644 --- a/ui/src/app/metadata/configuration/container/version-options.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/version-options.component.spec.ts @@ -18,7 +18,7 @@ import { ViewportScroller } from '@angular/common'; ` }) class TestHostComponent { - @ViewChild(VersionOptionsComponent) + @ViewChild(VersionOptionsComponent, {static: true}) public componentUnderTest: VersionOptionsComponent; } diff --git a/ui/src/app/metadata/configuration/container/version.component.spec.ts b/ui/src/app/metadata/configuration/container/version.component.spec.ts index ae745f1b4..9a020f3dc 100644 --- a/ui/src/app/metadata/configuration/container/version.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/version.component.spec.ts @@ -16,7 +16,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; ` }) class TestHostComponent { - @ViewChild(VersionComponent) + @ViewChild(VersionComponent, {static: true}) public componentUnderTest: VersionComponent; } diff --git a/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts b/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts index 3d6627a4e..58c3df04e 100644 --- a/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts +++ b/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts @@ -18,7 +18,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; ` }) class TestHostComponent { - @ViewChild(EditorNavComponent) + @ViewChild(EditorNavComponent, {static: true}) public componentUnderTest: EditorNavComponent; public format = NAV_FORMATS; diff --git a/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts b/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts index 11f8499fe..819d93c7b 100644 --- a/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts +++ b/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts @@ -12,7 +12,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; template: `` }) class TestHostComponent { - @ViewChild(PreviewDialogComponent) + @ViewChild(PreviewDialogComponent, {static: true}) public formUnderTest: PreviewDialogComponent; } diff --git a/ui/src/app/metadata/domain/component/summary-property.component.spec.ts b/ui/src/app/metadata/domain/component/summary-property.component.spec.ts index 06afa7bc3..b03bf4d70 100644 --- a/ui/src/app/metadata/domain/component/summary-property.component.spec.ts +++ b/ui/src/app/metadata/domain/component/summary-property.component.spec.ts @@ -17,7 +17,7 @@ import { of } from 'rxjs'; ` }) class TestHostComponent { - @ViewChild(SummaryPropertyComponent) + @ViewChild(SummaryPropertyComponent, {static: true}) public componentUnderTest: SummaryPropertyComponent; private _property; diff --git a/ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts index e47af9c90..4bd80a64e 100644 --- a/ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts +++ b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts @@ -11,7 +11,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; ` }) class TestHostComponent { - @ViewChild(UnsavedEntityComponent) + @ViewChild(UnsavedEntityComponent, {static: true}) public componentUnderTest: UnsavedEntityComponent; } diff --git a/ui/src/app/metadata/domain/domain.module.ts b/ui/src/app/metadata/domain/domain.module.ts index b109734a6..954655cdc 100644 --- a/ui/src/app/metadata/domain/domain.module.ts +++ b/ui/src/app/metadata/domain/domain.module.ts @@ -1,5 +1,4 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; -import { HttpModule } from '@angular/http'; import { EffectsModule } from '@ngrx/effects'; import { CommonModule } from '@angular/common'; import { NgbPopoverModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; @@ -38,7 +37,6 @@ export const DECLARATIONS = [ declarations: DECLARATIONS, entryComponents: COMPONENTS, imports: [ - HttpModule, CommonModule, I18nModule, NgbPopoverModule, diff --git a/ui/src/app/metadata/metadata.component.spec.ts b/ui/src/app/metadata/metadata.component.spec.ts index 5ce3c61c7..5cc74adf9 100644 --- a/ui/src/app/metadata/metadata.component.spec.ts +++ b/ui/src/app/metadata/metadata.component.spec.ts @@ -13,7 +13,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; ` }) class TestHostComponent { - @ViewChild(MetadataPageComponent) + @ViewChild(MetadataPageComponent, {static: true}) public componentUnderTest: MetadataPageComponent; } diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts index a9013176a..701ee99a0 100644 --- a/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts @@ -16,7 +16,7 @@ import { FileBackedHttpMetadataProviderEditor } from '../model'; ` }) class TestHostComponent { - @ViewChild(ProviderEditStepComponent) + @ViewChild(ProviderEditStepComponent, {static: true}) public componentUnderTest: ProviderEditStepComponent; } diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts index 81da40d38..875fd9b65 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts @@ -24,7 +24,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; ` }) class TestHostComponent { - @ViewChild(ProviderEditComponent) + @ViewChild(ProviderEditComponent, {static: true}) public componentUnderTest: ProviderEditComponent; } diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts index bc1d737c0..6e91ad8cf 100644 --- a/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts @@ -19,7 +19,7 @@ import { FilterListComponentStub } from '../../../../testing/filter-list.stub'; ` }) class TestHostComponent { - @ViewChild(ProviderFilterListComponent) + @ViewChild(ProviderFilterListComponent, {static: true}) public componentUnderTest: ProviderFilterListComponent; } diff --git a/ui/src/app/metadata/provider/container/provider-select.component.spec.ts b/ui/src/app/metadata/provider/container/provider-select.component.spec.ts index 532469afc..281b25117 100644 --- a/ui/src/app/metadata/provider/container/provider-select.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-select.component.spec.ts @@ -14,7 +14,7 @@ import { MetadataProvider } from '../../domain/model'; ` }) class TestHostComponent { - @ViewChild(ProviderSelectComponent) + @ViewChild(ProviderSelectComponent, {static: true}) public componentUnderTest: ProviderSelectComponent; } diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts index d9462eab8..6eea51e99 100644 --- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.spec.ts @@ -18,7 +18,7 @@ import { MetadataProviderWizard } from '../model'; ` }) class TestHostComponent { - @ViewChild(ProviderWizardStepComponent) + @ViewChild(ProviderWizardStepComponent, {static: true}) public componentUnderTest: ProviderWizardStepComponent; } diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts index 1dc620637..2f76d7d5d 100644 --- a/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts @@ -19,7 +19,7 @@ import { MetadataConfigurationComponentStub } from '../../../../testing/metadata ` }) class TestHostComponent { - @ViewChild(ProviderWizardComponent) + @ViewChild(ProviderWizardComponent, {static: true}) public componentUnderTest: ProviderWizardComponent; } diff --git a/ui/src/app/metadata/resolver/component/finish-form.component.spec.ts b/ui/src/app/metadata/resolver/component/finish-form.component.spec.ts index eddbd6ae8..4bf37267c 100644 --- a/ui/src/app/metadata/resolver/component/finish-form.component.spec.ts +++ b/ui/src/app/metadata/resolver/component/finish-form.component.spec.ts @@ -25,7 +25,7 @@ class TestHostComponent { ...stubs.resolver }); - @ViewChild(FinishFormComponent) + @ViewChild(FinishFormComponent, {static: true}) public formUnderTest: FinishFormComponent; changeProvider(opts: any): void { diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts index c8473b155..ea6053cce 100644 --- a/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts @@ -14,7 +14,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; (save)="onSave($event)">` }) class TestHostComponent { - @ViewChild(CopyResolverComponent) + @ViewChild(CopyResolverComponent, {static: true}) public formUnderTest: CopyResolverComponent; onSave(event: any): void {} diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts index c64445dd4..c04a4d136 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts @@ -18,7 +18,7 @@ import { MetadataSourceWizard } from '../../domain/model/wizards/metadata-source ` }) class TestHostComponent { - @ViewChild(ResolverWizardStepComponent) + @ViewChild(ResolverWizardStepComponent, {static: true}) public componentUnderTest: ResolverWizardStepComponent; } diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts index 58191efeb..af0ce357a 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts @@ -26,7 +26,7 @@ import { MetadataConfigurationComponentStub } from '../../../../testing/metadata ` }) class TestHostComponent { - @ViewChild(ResolverWizardComponent) + @ViewChild(ResolverWizardComponent, {static: true}) public componentUnderTest: ResolverWizardComponent; } diff --git a/ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts index 74d2fd5da..de4bb6fa2 100644 --- a/ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts @@ -16,7 +16,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub'; (fromUrl)="createFromUrl($event)">` }) class TestHostComponent { - @ViewChild(UploadResolverComponent) + @ViewChild(UploadResolverComponent, {static: true}) public formUnderTest: UploadResolverComponent; upload(event: Event): void {} diff --git a/ui/src/app/schema-form/widget/number/float.component.ts b/ui/src/app/schema-form/widget/number/float.component.ts index 4a465a6ef..c7e2083f5 100644 --- a/ui/src/app/schema-form/widget/number/float.component.ts +++ b/ui/src/app/schema-form/widget/number/float.component.ts @@ -10,7 +10,7 @@ import { SchemaService } from '../../service/schema.service'; }) export class CustomFloatComponent extends IntegerWidget implements AfterViewInit { private _displayValue: string; - @ViewChild('input') element: ElementRef; + @ViewChild('input', { static: true }) element: ElementRef; constructor( private widgetService: SchemaService diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.spec.ts b/ui/src/app/shared/autocomplete/autocomplete.component.spec.ts index 67c2110b5..05ead3f49 100644 --- a/ui/src/app/shared/autocomplete/autocomplete.component.spec.ts +++ b/ui/src/app/shared/autocomplete/autocomplete.component.spec.ts @@ -45,7 +45,7 @@ class TestHostComponent { search: [''] }); - @ViewChild(AutoCompleteComponent) + @ViewChild(AutoCompleteComponent, {static: true}) public autoCompleteUnderTest: AutoCompleteComponent; configure(opts: any): void { diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.ts b/ui/src/app/shared/autocomplete/autocomplete.component.ts index 076f26a1c..bc9994b1a 100644 --- a/ui/src/app/shared/autocomplete/autocomplete.component.ts +++ b/ui/src/app/shared/autocomplete/autocomplete.component.ts @@ -55,7 +55,7 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit, @Output() more: EventEmitter = new EventEmitter(); @Output() onChange: EventEmitter = new EventEmitter(); - @ViewChild('inputField') inputField: ElementRef; + @ViewChild('inputField', { static: true }) inputField: ElementRef; @ViewChildren('matchElement', { read: ElementRef }) listItems: QueryList; focused: number; diff --git a/ui/src/app/shared/switch/switch.component.spec.ts b/ui/src/app/shared/switch/switch.component.spec.ts index 16933e729..52659f4df 100644 --- a/ui/src/app/shared/switch/switch.component.spec.ts +++ b/ui/src/app/shared/switch/switch.component.spec.ts @@ -12,7 +12,7 @@ class TestHostComponent { foo: FormControl = new FormControl(false); - @ViewChild(ToggleSwitchComponent) + @ViewChild(ToggleSwitchComponent, {static: true}) public instanceUnderTest: ToggleSwitchComponent; } diff --git a/ui/src/app/wizard/component/wizard.component.spec.ts b/ui/src/app/wizard/component/wizard.component.spec.ts index 75e2babe4..250db89da 100644 --- a/ui/src/app/wizard/component/wizard.component.spec.ts +++ b/ui/src/app/wizard/component/wizard.component.spec.ts @@ -14,7 +14,7 @@ import { MockI18nModule } from '../../../testing/i18n.stub'; ` }) class TestHostComponent { - @ViewChild(WizardComponent) + @ViewChild(WizardComponent, {static: true}) public componentUnderTest: WizardComponent; }