Patch for artifact delivery POST

Change-Id: If36201ba3f9a97dba46d839d8d9cfa5af533fed9
Issue-ID: SDC-1645
Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>

diff --git a/catalog-ui/configurations/dev.js b/catalog-ui/configurations/dev.js
index 1dc8c81..3833e20 100644 (file)
--- a/catalog-ui/configurations/dev.js
+++ b/catalog-ui/configurations/dev.js
@@ -49,7 +49,7 @@ const SDC_CONFIG = {
                "root": "/sdc1/feProxy/rest",
         "no_proxy_root": "/sdc1/rest",
                "workflow_root": "/sdc1/feProxy/wf",
-               "POST_workflow_artifact": "/v1/catalog",
+               "POST_workflow_artifact": "sdc/v1/catalog",
                "PUT_service": "/v1/catalog/services/:id/metadata",
                "GET_download_artifact": "/v1/catalog/",
         "GET_SDC_Version": "/version",

diff --git a/catalog-ui/configurations/prod.js b/catalog-ui/configurations/prod.js
index cd94f53..65b3737 100644 (file)
--- a/catalog-ui/configurations/prod.js
+++ b/catalog-ui/configurations/prod.js
@@ -49,7 +49,7 @@ const SDC_CONFIG = {
                "root": "/sdc1/feProxy/rest",
         "no_proxy_root": "/sdc1/rest",
                "workflow_root": "/sdc1/feProxy/wf",
-               "POST_workflow_artifact": "/v1/catalog",
+               "POST_workflow_artifact": "sdc/v1/catalog",
                "PUT_service": "/v1/catalog/services/:id/metadata",
                "GET_download_artifact": "/v1/catalog/",
         "GET_SDC_Version": "/version",

diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts
index 010a1f9..b3e06c3 100644 (file)
--- a/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts
@@ -157,15 +157,14 @@ export class InterfaceOperationComponent {
     private createOperation = (operation: OperationModel): any => {
         this.ComponentServiceNg2.createInterfaceOperation(this.component, operation).subscribe((response: CreateOperationResponse) => {
             this.openOperation = null;
-
+            this.operationList.push(new OperationModel(response));
             if (response.workflowId) {
                 const resourceId = this.component.uuid;
                 const operationId = response.uniqueId;
                 const workflowId = response.workflowId;
                 const versionId = response.workflowVersionId;
                 const artifactId = response.artifactUUID;
-
-                this.WorkflowServiceNg2.associateWorkflowArtifact(resourceId, operationId, workflowId, versionId, artifactId);
+                this.WorkflowServiceNg2.associateWorkflowArtifact(resourceId, operationId, workflowId, versionId, artifactId).subscribe();
             }
         });
     }

diff --git a/catalog-ui/src/app/ng2/services/workflow.service.ts b/catalog-ui/src/app/ng2/services/workflow.service.ts
index b880955..ae06a39 100644 (file)
--- a/catalog-ui/src/app/ng2/services/workflow.service.ts
+++ b/catalog-ui/src/app/ng2/services/workflow.service.ts
@@ -34,13 +34,12 @@ export class WorkflowServiceNg2 {
     public updateWorkflowVersion(workflowId: string, versionId: string, payload: any): Observable<any> {
         return this.http.put(this.baseUrl + '/workflows/' + workflowId + '/versions/' + versionId, payload)
             .map((res:Response) => {
-                return res;
+                return res.json();
             });
     }
 
     public associateWorkflowArtifact(resourceUuid, operationId, workflowId, workflowVersionId, artifactUuid): Observable<any> {
-        return this.http.post(this.baseUrl + '/workflows/' + workflowId + '/versions/' + workflowVersionId + '/artifact-deliveries',
-            {
+        return this.http.post(this.baseUrl + '/workflows/' + workflowId + '/versions/' + workflowVersionId + '/artifact-deliveries', {
                 endpoint: this.catalogBaseUrl + '/resources/' + resourceUuid + '/interfaces/' + operationId + '/artifacts/' + artifactUuid,
                 method: 'POST'
             })