From b45d377a6114b2e3f6bcfbbaee1ce9668b91e0aa Mon Sep 17 00:00:00 2001
From: Lvbo163 <lv.bo163@zte.com.cn>
Date: Fri, 1 Sep 2017 14:31:04 +0800
Subject: support setting microservice info

support setting microservice info for workflow

Issue-ID: SDC-266

Change-Id: I8c6ad2a95f63a86db0789f9c400be38131404b66
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>
---
 .../services/data-access/in-memory-data.service.ts | 10 ++++++--
 .../src/app/services/data-access/sdc.service.ts    |  2 +-
 .../src/app/services/jsplumb.service.ts            |  1 -
 .../src/app/services/workflow-config.service.ts    | 28 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 sdc-workflow-designer-ui/src/app/services/workflow-config.service.ts

(limited to 'sdc-workflow-designer-ui/src/app/services')

diff --git a/sdc-workflow-designer-ui/src/app/services/data-access/in-memory-data.service.ts b/sdc-workflow-designer-ui/src/app/services/data-access/in-memory-data.service.ts
index 1609c948..c9b803bb 100644
--- a/sdc-workflow-designer-ui/src/app/services/data-access/in-memory-data.service.ts
+++ b/sdc-workflow-designer-ui/src/app/services/data-access/in-memory-data.service.ts
@@ -21,11 +21,17 @@ export class InMemoryDataService implements InMemoryDbService {
         const workflows = [{
             id: 'workflow1',
             name:'workflow1',
-            nodes: []
+            nodes: [],
+            configs:{
+                microservices:[]
+            }
         },{
             id:'workflow2',
             name: 'workflow2',
-            nodes: []
+            nodes: [],
+            configs:{
+                microservices:[]
+            }
         }
     ];
         return {workflows};
diff --git a/sdc-workflow-designer-ui/src/app/services/data-access/sdc.service.ts b/sdc-workflow-designer-ui/src/app/services/data-access/sdc.service.ts
index 74fc8c3b..02ade955 100644
--- a/sdc-workflow-designer-ui/src/app/services/data-access/sdc.service.ts
+++ b/sdc-workflow-designer-ui/src/app/services/data-access/sdc.service.ts
@@ -37,7 +37,7 @@ export class SdcService extends CatalogService {
     public loadWorkflow(workflowId: string): Observable<Workflow> {
         // TODO load data from sdc
         const url = `api/workflows/${workflowId}`;
-        return this.httpService.get(url).map(response => response.data);
+        return this.httpService.get(url).map(response => response.data as Workflow);
     }
 
     public saveWorkflow(workflow: Workflow): Observable<boolean> {
diff --git a/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts b/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts
index 0863fb5d..ffd00c6a 100644
--- a/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts
+++ b/sdc-workflow-designer-ui/src/app/services/jsplumb.service.ts
@@ -107,7 +107,6 @@ export class JsPlumbService {
     }
 
     public buttonDroppable() {
-        console.log('buttonDroppable');
         const selector = this.jsplumbInstance.getSelector('.canvas');
         this.jsplumbInstance.droppable(selector, {
             scope: 'btn',
diff --git a/sdc-workflow-designer-ui/src/app/services/workflow-config.service.ts b/sdc-workflow-designer-ui/src/app/services/workflow-config.service.ts
new file mode 100644
index 00000000..d645ebc2
--- /dev/null
+++ b/sdc-workflow-designer-ui/src/app/services/workflow-config.service.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2017 ZTE Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and the Apache License 2.0 which both accompany this distribution,
+ * and are available at http://www.eclipse.org/legal/epl-v10.html
+ * and http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Contributors:
+ *     ZTE - initial API and implementation and/or initial documentation
+ */
+
+import { Injectable } from '@angular/core';
+import { WorkflowService } from "./workflow.service";
+import { Microservice } from "../model/workflow/microservice";
+
+/**
+ * WorkflowConfigService
+ * provides all of the operations about workflow configs.
+ */
+@Injectable()
+export class WorkflowConfigService {
+    constructor(private workflowService: WorkflowService) {}
+
+    public getMicroservices(): Microservice[] {
+        return this.workflowService.workflow.configs.microservices;
+    }
+}
-- 
cgit 1.2.3-korg