From 59884c775c9d06e2195401a09e08650a5cf37b20 Mon Sep 17 00:00:00 2001
From: YuanHu <yuan.hu1@zte.com.cn>
Date: Tue, 27 Mar 2018 17:58:42 +0800
Subject: Display Extend Activities on WF Designer UI.

Display Extend Activities on WF Designer UI.
Use Extend Activities to Design Workflow and Save

Issue-ID: SDC-1130,SDC-1131

Change-Id: Iea62eb0edafb2270deaac89b458015e78d961cd0
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---
 .../rest-config-detail.component.html                 | 19 ++++++++++++++++---
 .../rest-config-detail.component.ts                   |  4 ++--
 .../rest-config-list/rest-config-list.component.html  | 17 +++++++++++++++--
 .../rest-config-list/rest-config-list.component.ts    |  8 +++-----
 .../menus/rest-config/rest-config.component.html      | 17 +++++++++++++++--
 .../menus/rest-config/rest-config.component.ts        |  2 +-
 6 files changed, 52 insertions(+), 15 deletions(-)

(limited to 'sdc-workflow-designer-ui/src/app/components/menus/rest-config')

diff --git a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.html b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.html
index ea0d3c68..9550ed33 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.html
+++ b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.html
@@ -1,13 +1,26 @@
+<!--
+/**
+ * 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
+ */
+-->
 <div class="form-group row">
     <label class="col-md-2 form-control-label text-md-right">Name</label>
     <div class="col-md-10">
         <input class="form-control" [(ngModel)]="restConfig.name">
     </div>
 </div>
-<div class="form-group row">
+<!-- <div class="form-group row">
     <label class="col-md-2 form-control-label text-md-right">BaseUrl</label>
     <div class="col-md-10">
-        <input class="form-control" [(ngModel)]="restConfig.url">
+        <input class="form-control" [(ngModel)]="restConfig.baseUrl">
     </div>
 </div>
 <div class="form-group row">
@@ -31,5 +44,5 @@
         <textarea class="form-control" [disabled]="restConfig.dynamic" rows="8" [ngModel]="detail"
                   (ngModelChange)="onDetailChanged($event)"></textarea>
     </div>
-</div>
+</div> -->
 
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.ts
index d99a9a10..e4d43d8c 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-detail/rest-config-detail.component.ts
@@ -22,7 +22,7 @@ import { RestService } from '../../../../services/rest.service';
  * The supported nodes can be dragged to container component. which will add a new node to the workflow.
  */
 @Component({
-    selector: 'b4t-rest-config-detail',
+    selector: 'wfm-rest-config-detail',
     templateUrl: 'rest-config-detail.component.html',
 })
 export class RestConfigDetailComponent implements OnChanges {
@@ -35,7 +35,7 @@ export class RestConfigDetailComponent implements OnChanges {
 
     public ngOnChanges() {
         if (this.restConfig == null) {
-            this.restConfig = new RestConfig('', '', '', '', '');
+            this.restConfig = new RestConfig('', '', '', '');
         }
         this.parseSwagger2String();
     }
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.html b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.html
index aa98bc80..f8d745c1 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.html
+++ b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.html
@@ -1,3 +1,16 @@
+<!--
+/**
+ * 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
+ */
+-->
 <div class="scroll" style="overflow:hidden; max-height: 300px; height: 300px;">
     <div class="card">
         <div class="card-header d-flex justify-content-between align-items-center">
@@ -6,13 +19,13 @@
         </div>
 
         <ul class="list-group">
-            <li class="list-group-item d-flex justify-content-between align-items-center"
+            <!-- <li class="list-group-item d-flex justify-content-between align-items-center"
                 *ngFor="let restConfig of restService.getRestConfigs(); index as i">
                 <div (click)="onConfigSelected(restConfig)">{{restConfig.name}}</div>
                 <div class="badge badge-danger badge-pill" (click)="deleteRestConfig(i)">
                     <i class="fa fa-minus"></i>
                 </div>
-            </li>
+            </li> -->
         </ul>
     </div>
 </div>
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.ts
index 43120e85..8a84c476 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config-list/rest-config-list.component.ts
@@ -22,7 +22,7 @@ import { RestService } from '../../../../services/rest.service';
  * The supported nodes can be dragged to container component. which will add a new node to the workflow.
  */
 @Component({
-    selector: 'b4t-rest-config-list',
+    selector: 'wfm-rest-config-list',
     templateUrl: 'rest-config-list.component.html',
 })
 export class RestConfigListComponent {
@@ -36,11 +36,9 @@ export class RestConfigListComponent {
     }
 
     public addRestConfig() {
+        // const restConfig = this.restService.addRestConfig();
 
-        const restConfig = this.restService.newRestConfig();
-        this.restService.addRestConfig(restConfig);
-
-        this.onConfigSelected(restConfig);
+        // this.onConfigSelected(restConfig);
     }
 
     public deleteRestConfig(index: number) {
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.html b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.html
index 9bd5bfc0..a858b0fe 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.html
+++ b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.html
@@ -1,3 +1,16 @@
+<!--
+/**
+ * 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
+ */
+-->
 <div class="modal fade" bsModal #restConfigModal="bs-modal" [config]="{backdrop: 'static'}"
      tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
@@ -11,10 +24,10 @@
             <div class="modal-body">
                 <div class="row">
                     <div class="col-sm-4">
-                        <b4t-rest-config-list (configSelected)="configSelected($event)"></b4t-rest-config-list>
+                        <wfm-rest-config-list (configSelected)="configSelected($event)"></wfm-rest-config-list>
                     </div>
                     <div class="col-sm-8">
-                        <b4t-rest-config-detail [restConfig]="currentRestConfig"></b4t-rest-config-detail>
+                        <wfm-rest-config-detail [restConfig]="currentRestConfig"></wfm-rest-config-detail>
                     </div>
                 </div>
             </div>
diff --git a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.ts b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.ts
index 6a9c9c22..46ac3f90 100644
--- a/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.ts
+++ b/sdc-workflow-designer-ui/src/app/components/menus/rest-config/rest-config.component.ts
@@ -21,7 +21,7 @@ import { RestConfigListComponent } from './rest-config-list/rest-config-list.com
  * The supported nodes can be dragged to container component. which will add a new node to the workflow.
  */
 @Component({
-    selector: 'b4t-rest-config',
+    selector: 'wfm-rest-config',
     templateUrl: 'rest-config.component.html',
 })
 export class RestConfigComponent {
-- 
cgit 1.2.3-korg