From: Alexey Sandler <alexey.sandler@intl.att.com>
Date: Thu, 5 Dec 2019 15:04:45 +0000 (+0200)
Subject: Call to useTemplate create Action in order
X-Git-Tag: 6.0.1~115
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f53a917032b6c71c3d2b8f536244d4ba2611c068;p=vid.git

Call to useTemplate create Action in order

to update state with template which was called from back end.

Issue-ID: VID-724
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I0726d54324e523d60bcd41116ee44b01a88d9c7b
---

diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
index 5f423f8c2..0b19b667c 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
@@ -47,10 +47,10 @@ describe('Drawing Board: Instantiation Templates', function () {
       // Then...
 
       cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
-        //  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json').then((expectedResult) => {
-        //    convertRollbackOnFailureValueFromStringToBoolean(expectedResult);
-        //     cy.deepCompare(xhr.request.body, expectedResult);
-        // });
+         cy.readFile('cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json').then((expectedResult) => {
+           convertRollbackOnFailureValueFromStringToBoolean(expectedResult);
+            cy.deepCompare(xhr.request.body, expectedResult);
+        });
       });
 
     });
diff --git a/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts b/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts
index 21cdc9296..018e0d367 100644
--- a/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts
+++ b/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts
@@ -6,6 +6,7 @@ import {Observable} from "rxjs";
 import {ServiceInstance} from "../../models/serviceInstance";
 import {Constants} from "../../utils/constants";
 import {createServiceInstance} from "../../storeUtil/utils/service/service.actions";
+import {createServiceInstanceFromTemplate} from "../../storeUtil/utils/useTemplate/useTemplate.action";
 
 @Injectable()
 export class InstantiationTemplatesService {
@@ -19,7 +20,7 @@ export class InstantiationTemplatesService {
 
   public retrieveAndStoreInstantiationTemplateTopology(jobId: string, serviceModelId: string): Observable<ServiceInstance> {
     return this.retrieveInstantiationTemplateTopology(jobId).do((instantiationTemplate: ServiceInstance) => {
-      this.store.dispatch(createServiceInstance(instantiationTemplate, serviceModelId));
+      this.store.dispatch(createServiceInstanceFromTemplate(instantiationTemplate, serviceModelId));
     });
   };