merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 122 insertions, 0 deletions

diff --git a/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.spec.ts b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.spec.ts
new file mode 100644
index 000000000..6e8fdc757
--- /dev/null
+++ b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.spec.ts
@@ -0,0 +1,82 @@
+import {getTestBed, TestBed} from '@angular/core/testing';
+import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
+import {NgRedux} from "@angular-redux/store";
+import {ViewEditResolver} from "./viewEdit.resolver";
+import {AaiService} from "../../services/aaiService/aai.service";
+import {FeatureFlagsService} from "../../services/featureFlag/feature-flags.service";
+import {ActivatedRouteSnapshot, convertToParamMap} from "@angular/router";
+import {AppState} from "../../store/reducers";
+import {UpdateDrawingBoardStatusAction} from "../../storeUtil/utils/global/global.actions";
+
+class MockAppStore<T> {
+  getState() {
+    return {
+      global:{
+        drawingBoardStatus: "VIEW"
+      },
+      service: {
+        serviceInstance: {}
+      }
+    }
+  }
+  dispatch(){
+
+  }
+}
+
+
+describe('View Edit resolver', () => {
+  let injector;
+  let aaiService: AaiService;
+  let resolver: ViewEditResolver;
+  let httpMock: HttpTestingController;
+  let store : NgRedux<AppState>;
+
+  let activatedRouteSnapshot: ActivatedRouteSnapshot;
+  let updateDrawingBoardStatusAction: UpdateDrawingBoardStatusAction;
+
+  beforeAll(done => (async () => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        ViewEditResolver,
+        AaiService,
+        FeatureFlagsService,
+        {provide: NgRedux, useClass: MockAppStore},
+        {
+          provide: ActivatedRouteSnapshot, useValue: {
+            queryParamMap:
+              convertToParamMap({
+                serviceModelId: 'serviceModelId',
+                subscriberId: 'subscriberId',
+                serviceType: 'serviceType',
+                serviceInstanceId : 'serviceInstanceId'
+              })
+          },
+
+        }
+      ]
+    });
+    await TestBed.compileComponents();
+
+    injector = getTestBed();
+    aaiService = injector.get(AaiService);
+    resolver = injector.get(ViewEditResolver);
+    httpMock = injector.get(HttpTestingController);
+    activatedRouteSnapshot = injector.get(ActivatedRouteSnapshot);
+    store = injector.get(NgRedux)
+
+  })().then(done).catch(done.fail));
+
+
+  test('should call both api', () => {
+    // spyOn(aaiService, 'getServiceModelById');
+    // spyOn(aaiService, 'retrieveAndStoreServiceInstanceTopology');
+    // spyOn(store, 'dispatch');
+    // resolver.resolve(activatedRouteSnapshot);
+    //
+    // expect(aaiService.getServiceModelById).toHaveBeenCalledWith('serviceModelId');
+    // expect(aaiService.retrieveAndStoreServiceInstanceTopology).toHaveBeenCalledWith('serviceInstanceId', 'subscriberId', 'serviceType', 'serviceModelId');
+  });
+
+});
diff --git a/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
new file mode 100644
index 000000000..d4aef1937
--- /dev/null
+++ b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
@@ -0,0 +1,40 @@
+import {ActivatedRouteSnapshot, Resolve} from "@angular/router";
+import {Injectable} from "@angular/core";
+import {Observable} from "rxjs";
+import {AaiService} from "../../services/aaiService/aai.service";
+import {forkJoin} from "rxjs/observable/forkJoin";
+import {AppState} from "../../store/reducers";
+import {NgRedux} from "@angular-redux/store";
+import {createServiceInstance} from "../../storeUtil/utils/service/service.actions";
+
+@Injectable()
+export class ViewEditResolver implements Resolve<Observable<boolean>> {
+
+  constructor(private _aaiService: AaiService, private _store: NgRedux<AppState>) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot): Observable<boolean> {
+    const serviceModeId: string = route.queryParamMap.get("serviceModelId");
+    const serviceInstanceId: string = route.queryParamMap.get("serviceInstanceId");
+    const subscriberId: string = route.queryParamMap.get("subscriberId");
+    const serviceType: string = route.queryParamMap.get("serviceType");
+      let serviceModelApi = this._aaiService.getServiceModelById(serviceModeId);
+      let serviceInstanceApi = this._aaiService.retrieveAndStoreServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType, serviceModeId);
+      return forkJoin([serviceModelApi, serviceInstanceApi]).map(([serviceModel, serviceInstance ]) => {
+        this.setIsALaCarte(serviceInstance,serviceModel.service.instantiationType );
+        this.setTestApi(serviceInstance);
+        this._store.dispatch(createServiceInstance( serviceInstance, serviceModeId));
+          return true;
+        });
+  }
+
+  setTestApi = (service: any) => {
+    if (this._store.getState().global.flags['FLAG_ADD_MSO_TESTAPI_FIELD'] && service.isALaCarte) {
+      service.testApi = sessionStorage.getItem("msoRequestParametersTestApiValue");
+    }
+  };
+  setIsALaCarte = (service: any, instantiationType) => {
+    service.isALaCarte = instantiationType === 'A-La-Carte';
+  };
+
+}