Merged in feature/SHIBUI-1527-updates (pull request #396)

SHIBUI-1527 Updated UI libraries Approved-by: Dmitriy Kopylenko <dkopylenko@unicon.net>
TIER · Oct 22, 2019 · 8bde79b · 8bde79b
2 parents 09e7c06 + 2c38a9f
commit 8bde79b
Show file tree

Hide file tree

Showing 64 changed files with 5,124 additions and 6,918 deletions.
diff --git a/ui/browserslist b/ui/browserslist
@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -15,28 +15,22 @@
     "buildProd": "ng build --prod && npm run copy",
     "bundle-report": "webpack-bundle-analyzer dist/stats.json"
   },
-  "browserslist": [
-    "last 1 version",
-    "> 1%",
-    "IE 11"
-  ],
   "private": true,
   "dependencies": {
-    "@angular/animations": "7.2.14",
-    "@angular/common": "7.2.14",
-    "@angular/compiler": "7.2.14",
-    "@angular/core": "7.2.14",
-    "@angular/forms": "7.2.14",
-    "@angular/http": "7.2.14",
-    "@angular/platform-browser": "7.2.14",
-    "@angular/platform-browser-dynamic": "7.2.14",
-    "@angular/router": "7.2.14",
-    "@ng-bootstrap/ng-bootstrap": "4.1.2",
-    "@ngrx/effects": "7.4.0",
-    "@ngrx/entity": "7.4.0",
-    "@ngrx/router-store": "7.4.0",
-    "@ngrx/store": "7.4.0",
-    "@ngrx/store-devtools": "7.4.0",
+    "@angular/animations": "8.2.11",
+    "@angular/common": "8.2.11",
+    "@angular/compiler": "8.2.11",
+    "@angular/core": "8.2.11",
+    "@angular/forms": "8.2.11",
+    "@angular/platform-browser": "8.2.11",
+    "@angular/platform-browser-dynamic": "8.2.11",
+    "@angular/router": "8.2.11",
+    "@ng-bootstrap/ng-bootstrap": "5.1.1",
+    "@ngrx/effects": "8.4.0",
+    "@ngrx/entity": "8.4.0",
+    "@ngrx/router-store": "8.4.0",
+    "@ngrx/store": "8.4.0",
+    "@ngrx/store-devtools": "8.4.0",
     "bootstrap": "4.3.1",
     "core-js": "^2.4.1",
     "deep-object-diff": "^1.1.0",
@@ -45,17 +39,16 @@
     "font-awesome": "^4.7.0",
     "ngx-infinite-scroll": "^7.2.0",
     "ngx-schema-form": "2.3.5",
-    "rxjs": "^6.5.1",
-    "rxjs-compat": "^6.5.1",
+    "rxjs": "^6.5.3",
     "xml-formatter": "^1.0.1",
     "z-schema": "^3.22.0",
-    "zone.js": "^0.8.29"
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.5.0",
-    "@angular/cli": "^7.3.8",
-    "@angular/compiler-cli": "^7.2.14",
-    "@angular/language-service": "^7.2.14",
+    "@angular-devkit/build-angular": "~0.803.12",
+    "@angular/cli": "^8.3.12",
+    "@angular/compiler-cli": "^8.2.11",
+    "@angular/language-service": "^8.2.11",
     "@types/file-saver": "^1.3.0",
     "@types/jasmine": "~3.3.12",
     "@types/jasminewd2": "~2.0.6",
@@ -77,7 +70,7 @@
     "path": "^0.12.7",
     "ts-node": "~3.2.0",
     "tslint": "~5.3.2",
-    "typescript": "3.1.1",
+    "typescript": "3.5.3",
     "webpack-bundle-analyzer": "^3.3.2"
   }
-}
+}
diff --git 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.module.ts b/ui/src/app/app.module.ts
@@ -33,7 +33,13 @@ import { NavigationService } from './core/service/navigation.service';
     ],
     imports: [
         StoreModule.forRoot(reducers, {
-            metaReducers
+            metaReducers,
+            runtimeChecks: {
+                strictActionImmutability: false,
+                strictActionSerializability: false,
+                strictStateImmutability: false,
+                strictStateSerializability: false
+            }
         }),
         StoreDevtoolsModule.instrument({
             maxAge: 25, // Retains last 25 states
@@ -42,7 +48,7 @@ import { NavigationService } from './core/service/navigation.service';
         EffectsModule.forRoot([]),
         BrowserModule,
         CoreModule.forRoot(),
-        StoreRouterConnectingModule,
+        StoreRouterConnectingModule.forRoot(),
         NgbDropdownModule,
         NgbModalModule,
         NgbPopoverModule,

diff --git 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/effect/user.effect.spec.ts b/ui/src/app/core/effect/user.effect.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { ReplaySubject } from 'rxjs';
 
 import { UserEffects } from './user.effect';
 import { Subject, of, throwError } from 'rxjs';

diff --git a/ui/src/app/core/effect/version.effect.spec.ts b/ui/src/app/core/effect/version.effect.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { ReplaySubject } from 'rxjs';
 
 import { VersionEffects } from './version.effect';
 import {

diff --git 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
@@ -1,8 +1,7 @@
-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';
+import { from } from 'rxjs';
 
 export const DEFAULT_MODAL_OPTIONS: NgbModalOptions = {
     size: 'lg'
@@ -22,6 +21,6 @@ export class ModalService {
         if (modal.hasOwnProperty('componentInstance')) {
             Object.keys(inputs).forEach(key => modal.componentInstance[key] = inputs[key]);
         }
-        return fromPromise(modal.result);
+        return from(modal.result);
     }
 } /* istanbul ignore next */
diff --git 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/i18n/effect/message.effect.spec.ts b/ui/src/app/i18n/effect/message.effect.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { ReplaySubject } from 'rxjs';
 
 import { MessageEffects } from './message.effect';
 

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
@@ -31,7 +31,7 @@ export const TestData: FilterConfiguration = {
     template: `<filter-version-list [filters]="filters" (compare)="compare($event)"></filter-version-list>`
 })
 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
@@ -20,7 +20,7 @@ export const TestData = {
     template: `<history-list [history]="history.versions" (compare)="compare($event)" (restore)="restore($event)"></history-list>`
 })
 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
@@ -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
@@ -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
@@ -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/...rc/app/metadata/configuration/component/property/configuration-property.component.spec.ts b/...rc/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/...rc/app/metadata/configuration/component/property/filter-target-property.component.spec.ts b/...rc/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub';
     template: `<preview-dialog></preview-dialog>`
 })
 class TestHostComponent {
-    @ViewChild(PreviewDialogComponent)
+    @ViewChild(PreviewDialogComponent, {static: true})
     public formUnderTest: PreviewDialogComponent;
 }
 

diff --git a/ui/src/app/metadata/domain/component/preview-dialog.component.ts b/ui/src/app/metadata/domain/component/preview-dialog.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import * as FileSaver from 'file-saver';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { MetadataEntity } from '../../domain/model';
 
 @Component({

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
@@ -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
@@ -11,7 +11,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub';
     `
 })
 class TestHostComponent {
-    @ViewChild(UnsavedEntityComponent)
+    @ViewChild(UnsavedEntityComponent, {static: true})
     public componentUnderTest: UnsavedEntityComponent;
 }