SHIBUI-nojira updated angular version

TIER · May 2, 2019 · 80974d0 · 80974d0
1 parent 99d1184
commit 80974d0
Show file tree

Hide file tree

Showing 23 changed files with 2,967 additions and 578 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -17,44 +17,44 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.0.2",
-    "@angular/common": "^6.0.2",
-    "@angular/compiler": "^6.0.2",
-    "@angular/core": "^6.0.2",
-    "@angular/forms": "^6.0.2",
-    "@angular/http": "^6.0.2",
-    "@angular/platform-browser": "^6.0.2",
-    "@angular/platform-browser-dynamic": "^6.0.2",
-    "@angular/router": "^6.0.2",
-    "@ng-bootstrap/ng-bootstrap": "^3.2.2",
-    "@ngrx/effects": "^5.2.0",
-    "@ngrx/entity": "^5.2.0",
-    "@ngrx/router-store": "^5.2.0",
-    "@ngrx/store": "^5.2.0",
-    "@ngrx/store-devtools": "^6.1.0",
-    "bootstrap": "4.1.1",
+    "@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",
+    "bootstrap": "4.3.1",
     "core-js": "^2.4.1",
     "deep-object-diff": "^1.1.0",
     "deepmerge": "^2.2.1",
     "file-saver": "^1.3.3",
     "font-awesome": "^4.7.0",
     "ngx-schema-form": "^2.2.0-beta.1",
-    "rxjs": "^6.1.0",
-    "rxjs-compat": "^6.1.0",
+    "rxjs": "^6.5.1",
+    "rxjs-compat": "^6.5.1",
     "xml-formatter": "^1.0.1",
     "z-schema": "^3.22.0",
-    "zone.js": "^0.8.26"
+    "zone.js": "^0.8.29"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.5.0",
-    "@angular/cli": "^6.0.1",
-    "@angular/compiler-cli": "^6.0.2",
-    "@angular/language-service": "^6.0.2",
+    "@angular/cli": "^7.3.8",
+    "@angular/compiler-cli": "^7.2.14",
+    "@angular/language-service": "^7.2.14",
     "@types/file-saver": "^1.3.0",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
-    "codelyzer": "~4.2.1",
+    "codelyzer": "^5.0.1",
     "fs-extra": "^7.0.1",
     "jasmine-core": "~2.99.0",
     "jasmine-marbles": "^0.3.1",
@@ -72,7 +72,7 @@
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
     "tslint": "~5.3.2",
-    "typescript": "2.7.2",
+    "typescript": "3.1.1",
     "webpack-bundle-analyzer": "^2.11.0"
   }
 }
diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts
@@ -33,7 +33,7 @@ describe('AppComponent', () => {
                 {provide: I18nService, useClass: MockI18nService }
             ],
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     core: combineReducers(fromRoot.reducers)

diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
@@ -42,10 +42,10 @@ import { I18nModule } from './i18n/i18n.module';
         BrowserModule,
         CoreModule.forRoot(),
         StoreRouterConnectingModule,
-        NgbDropdownModule.forRoot(),
-        NgbModalModule.forRoot(),
-        NgbPopoverModule.forRoot(),
-        NgbPaginationModule.forRoot(),
+        NgbDropdownModule,
+        NgbModalModule,
+        NgbPopoverModule,
+        NgbPaginationModule,
         WizardModule.forRoot(),
         FormModule.forRoot(),
         NotificationModule,

diff --git a/ui/src/app/core/effect/version.effect.ts b/ui/src/app/core/effect/version.effect.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Effect, Actions } from '@ngrx/effects';
+import { Effect, Actions, ofType } from '@ngrx/effects';
 import { Location } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 
@@ -17,8 +17,8 @@ export class VersionEffects {
 
     @Effect()
     loadVersionInfo$ = this.actions$
-        .ofType(version.VERSION_LOAD_REQUEST)
         .pipe(
+            ofType(version.VERSION_LOAD_REQUEST),
             switchMap(() =>
                 this.http.get<VersionInfo>(`${this.base}${this.endpoint}`)
                     .pipe(

diff --git a/ui/src/app/core/service/modal.service.spec.ts b/ui/src/app/core/service/modal.service.spec.ts
@@ -10,7 +10,7 @@ describe('Modal Service', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbModalModule.forRoot()
+                NgbModalModule
             ],
             providers: [
                 ModalService

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
@@ -42,7 +42,7 @@ describe('Editor Nav Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 SchemaFormModule.forRoot(),
                 StoreModule.forRoot({

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
@@ -41,8 +41,8 @@ describe('Summary Property Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
-                NgbPopoverModule.forRoot(),
+                NgbDropdownModule,
+                NgbPopoverModule,
                 RouterTestingModule,
                 SchemaFormModule.forRoot(),
                 MockI18nModule

diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts
@@ -42,8 +42,8 @@ describe('Provider Wizard Summary Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
-                NgbPopoverModule.forRoot(),
+                NgbDropdownModule,
+                NgbPopoverModule,
                 RouterTestingModule,
                 SchemaFormModule.forRoot(),
                 MockI18nModule

diff --git a/ui/src/app/metadata/metadata.component.spec.ts b/ui/src/app/metadata/metadata.component.spec.ts
@@ -27,7 +27,7 @@ describe('Metadata Root Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     core: combineReducers(fromRoot.reducers)

diff --git a/ui/src/app/metadata/provider/action/collection.action.ts b/ui/src/app/metadata/provider/action/collection.action.ts
@@ -65,7 +65,7 @@ export class SelectProviderRequest implements Action {
 export class SelectProviderSuccess implements Action {
     readonly type = ProviderCollectionActionTypes.SELECT_PROVIDER_SUCCESS;
 
-    constructor(public payload: Update<MetadataProvider>) { }
+    constructor(public payload: MetadataProvider) { }
 }
 
 export class SelectProviderError implements Action {

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
@@ -31,7 +31,7 @@ describe('Provider Edit Step Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 SchemaFormModule.forRoot(),
                 SharedModule,

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
@@ -45,7 +45,7 @@ describe('Provider Edit Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule.withRoutes([
                     {path: 'edit', children: []},
                     {path: 'foo', children: []},

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
@@ -32,7 +32,7 @@ describe('Provider Filter List Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     provider: combineReducers(fromRoot.reducers),

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
@@ -28,7 +28,7 @@ describe('Provider Select Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     provider: combineReducers(fromRoot.reducers),

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
@@ -32,7 +32,7 @@ describe('Provider Wizard Step Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 SchemaFormModule.forRoot(),
                 StoreModule.forRoot({

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
@@ -34,8 +34,8 @@ describe('Provider Wizard Component', () => {
         TestBed.configureTestingModule({
             imports: [
                 WizardModule,
-                NgbDropdownModule.forRoot(),
-                NgbPopoverModule.forRoot(),
+                NgbDropdownModule,
+                NgbPopoverModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     provider: combineReducers(fromRoot.reducers),

diff --git a/ui/src/app/metadata/provider/container/provider.component.spec.ts b/ui/src/app/metadata/provider/container/provider.component.spec.ts
@@ -29,7 +29,7 @@ describe('Provider Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     provider: combineReducers(fromRoot.reducers),

diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -86,7 +86,7 @@ export class CollectionEffects {
             this.providerService
                 .find(id)
                 .pipe(
-                    map(provider => new SelectProviderSuccess({ id, changes: provider })),
+                    map(provider => new SelectProviderSuccess(provider)),
                     catchError(error => of(new SelectProviderError(error)))
                 )
         )

diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
@@ -21,10 +21,10 @@ export const initialState: CollectionState = adapter.getInitialState({
 export function reducer(state = initialState, action: ProviderCollectionActionsUnion): CollectionState {
     switch (action.type) {
         case ProviderCollectionActionTypes.SELECT_PROVIDER_SUCCESS: {
-            return adapter.upsertOne(action.payload, {
+            return {
                 ...state,
                 selectedProviderId: action.payload.id as string
-            });
+            };
         }
 
         case ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS: {

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
@@ -47,7 +47,7 @@ describe('Resolver Wizard Step Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 SchemaFormModule.forRoot(),
                 StoreModule.forRoot({

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
@@ -53,8 +53,8 @@ describe('Resolver Wizard Component', () => {
         TestBed.configureTestingModule({
             imports: [
                 MockWizardModule,
-                NgbDropdownModule.forRoot(),
-                NgbPopoverModule.forRoot(),
+                NgbDropdownModule,
+                NgbPopoverModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     resolver: combineReducers(fromRoot.reducers, {

diff --git a/ui/src/app/wizard/component/wizard.component.spec.ts b/ui/src/app/wizard/component/wizard.component.spec.ts
@@ -28,7 +28,7 @@ describe('Wizard Component', () => {
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [
-                NgbDropdownModule.forRoot(),
+                NgbDropdownModule,
                 RouterTestingModule,
                 StoreModule.forRoot({
                     wizard: combineReducers(fromWizard.reducers)