Catalog alignment

[sdc.git] / catalog-ui / src / app / ng2 / services / workflow.service.ts

diff --git a/catalog-ui/src/app/ng2/services/workflow.service.ts b/catalog-ui/src/app/ng2/services/workflow.service.ts
index 81a2ea3..044ca37 100644 (file)
--- a/catalog-ui/src/app/ng2/services/workflow.service.ts
+++ b/catalog-ui/src/app/ng2/services/workflow.service.ts
@@ -1,14 +1,13 @@
 import { Injectable, Inject } from "@angular/core";
-import { Response } from "@angular/http";
 import { Observable } from "rxjs/Observable";
-import { HttpService } from "./http.service";
 import { SdcConfigToken, ISdcConfig } from "../config/sdc-config.config";
+import { HttpClient } from "@angular/common/http";
 import { Component, OperationModel } from "app/models";
 
 interface WorkflowOutputParameter {
-    name: string,
-    type: string,
-    mandatory: boolean
+    name: string;
+    type: string;
+    mandatory: boolean;
 }
 
 interface WorkflowInputParameter extends WorkflowOutputParameter {
@@ -25,40 +24,31 @@ export class WorkflowServiceNg2 {
     WF_STATE_ARCHIVED = 'ARCHIVED';
     VERSION_STATE_CERTIFIED = 'CERTIFIED';
 
-    constructor(private http: HttpService, @Inject(SdcConfigToken) sdcConfig: ISdcConfig) {
+    constructor(private http: HttpClient, @Inject(SdcConfigToken) sdcConfig:ISdcConfig) {
         this.baseUrl = sdcConfig.api.workflow_root;
         this.catalogBaseUrl = sdcConfig.api.POST_workflow_artifact;
     }
 
     public associateWorkflowArtifact(component: Component, operation: OperationModel): Observable<any> {
-        return this.http.post(this.baseUrl + '/workflows/' + operation.workflowId + '/versions/' + operation.workflowVersionId + '/artifact-deliveries', {
-                endpoint: this.catalogBaseUrl + '/' + component.getTypeUrl() + component.uuid + '/interfaces/' + operation.interfaceId + '/operations/' + operation.uniqueId + '/artifacts/' + operation.implementation.artifactUUID,
-                method: 'POST'
-            })
-            .map((res:Response) => {
-                return res.json();
+        return this.http.post<any>(this.baseUrl + '/workflows/' + operation.workflowId + '/versions/' + operation.workflowVersionId + '/artifact-deliveries', {
+                endpoint: this.catalogBaseUrl + '/' + component.getTypeUrl() + component.uuid + '/interfaces/' + operation.interfaceId + '/operations/'
+                + operation.uniqueId + '/artifacts/' + operation.implementation.artifactUUID, method: 'POST'
             });
     }
 
     public getWorkflows(filterCertified: boolean = true): Observable<any> {
-        return this.http.get(this.baseUrl + '/workflows' + (filterCertified ? '?versionState=' + this.VERSION_STATE_CERTIFIED : ''))
-            .map((res:Response) => {
-                return res.json().items;
-            });
+        return this.http.get<any>(this.baseUrl + '/workflows' + (filterCertified ? '?versionState=' + this.VERSION_STATE_CERTIFIED : ''));
     }
 
     public getWorkflowVersions(workflowId: string, filterCertified: boolean = true): Observable<any> {
-        return this.http.get(this.baseUrl + '/workflows/' + workflowId + '/versions' + (filterCertified ? '?state=' + this.VERSION_STATE_CERTIFIED : ''))
-            .map((res:Response) => {
-                return _.map(res.json().items, version => version);
+        return this.http.get<any>(this.baseUrl + '/workflows/' + workflowId + '/versions' + (filterCertified ? '?state=' + this.VERSION_STATE_CERTIFIED : ''))
+            .map((res) => {
+                return res.items;
             });
     }
 
     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.json();
-            });
+        return this.http.put<any>(this.baseUrl + '/workflows/' + workflowId + '/versions/' + versionId, payload);
     }
 
 }