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>

1 files changed, 35 insertions, 18 deletions

diff --git a/sdc-workflow-designer-ui/src/app/app.module.ts b/sdc-workflow-designer-ui/src/app/app.module.ts
index 88ccbc1e..66ea97cd 100644
--- a/sdc-workflow-designer-ui/src/app/app.module.ts
+++ b/sdc-workflow-designer-ui/src/app/app.module.ts
@@ -9,10 +9,11 @@
  * Contributors:
  *     ZTE - initial API and implementation and/or initial documentation
  */
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule } from '@angular/router';
+import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
 import { AccordionModule } from 'ngx-bootstrap/accordion';
 import { AlertModule, ModalModule } from 'ngx-bootstrap/index';
 import { NgxTreeSelectModule } from 'ngx-tree-select';
@@ -23,8 +24,8 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { AppComponent } from './app.component';
 import { ContainerComponent } from './components/container/container.component';
 import { EditablePropertyComponent } from './components/editable-property/editable-property.component';
-import { NodeParametersComponent } from './components/node-parameters/node-parameters.component';
-import { ParameterTreeComponent } from './components/node-parameters/parameter-tree/parameter-tree.component';
+import { NodeParametersComponent } from './components/property/rest-task/node-parameters/node-parameters.component';
+import { ParameterTreeComponent } from './components/property/rest-task/node-parameters/parameter-tree/parameter-tree.component';
 import { NodeComponent } from './components/node/node.component';
 import { ParameterComponent } from './components/parameter/parameter.component';
 import { IntermediateCatchEventComponent } from './components/property/intermediate-catch-event/intermediate-catch-event.component';
@@ -41,25 +42,32 @@ import { ToolbarComponent } from './components/toolbar/toolbar.component';
 
 import { ResizableDirective } from './directive/resizable/resizable.directive';
 
+import { AuthService } from './services/auth.service';
 import { BroadcastService } from './services/broadcast.service';
-import { DataService } from './services/data/data.service';
+import { InterfaceService } from './services/interface.service';
 import { JsPlumbService } from './services/jsplumb.service';
 import { ModelService } from './services/model.service';
 import { NoticeService } from './services/notice.service';
 import { RestService } from './services/rest.service';
 import { SwaggerTreeConverterService } from './services/swagger-tree-converter.service';
 import { SettingService } from './services/setting.service';
+import { ToscaService } from './services/tosca.service';
 
 import { SharedModule } from './shared/shared.module';
 import { HttpService } from './util/http.service';
 import { GlobalNoticeComponent } from './components/global-notice/global-notice.component';
 import { MenusComponent } from './components/menus/menus.component';
 import { ScriptTaskComponent } from "./components/property/script-task/script-task.component";
-import { WorkflowsComponent } from './components/menus/workflows/workflows.component';
-import { WorkflowService } from './services/workflow.service';
-import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
-import { InMemoryDataService } from './services/data/in-memory-data.service';
-import { HttpModule } from '@angular/http';
+import { ToolbarNodeComponent } from "./components/toolbar/toolbar-node/toolbar-node.component";
+import { NodeTypeService } from "./services/node-type.service";
+import { DisplayInfoService } from "./services/display-info.service";
+import { ServiceTaskComponent } from './components/property/service-task/service-task.component';
+import { RestParametersComponent } from './components/property/rest-task/rest-parameters/rest-parameters.component';
+import {WfmInputModule} from "./shared/input/wfm-text-input.module";
+import { PlxTextInputModule } from "./paletx/plx-text-input/index";
+import { PlxTooltipModule } from "./paletx/plx-tooltip/plx-tooltip.module";
+import { PlxModalModule } from "./paletx/plx-modal/modal.module";
+import { PlxDatePickerModule } from "./paletx/plx-datepicker/picker.module";
 
 // AoT requires an exported function for factories
 export function HttpLoaderFactory(http: HttpClient) {
@@ -85,14 +93,17 @@ export function HttpLoaderFactory(http: HttpClient) {
         ScriptTaskComponent,
         StartEventComponent,
         ToolbarComponent,
+        ToolbarNodeComponent,
         RestConfigDetailComponent,
         RestConfigListComponent,
         ResizableDirective,
         GlobalNoticeComponent,
         MenusComponent,
-        WorkflowsComponent,
+        ServiceTaskComponent,
+        RestParametersComponent
     ],
     providers: [
+        AuthService,
         BroadcastService,
         HttpService,
         JsPlumbService,
@@ -100,28 +111,33 @@ export function HttpLoaderFactory(http: HttpClient) {
         NoticeService,
         RestService,
         SwaggerTreeConverterService,
-	DataService,
+        InterfaceService,
         SettingService,
-        WorkflowService
+        ToscaService,
+        NodeTypeService,
+        DisplayInfoService
     ],
     imports: [
         AccordionModule.forRoot(),
         AlertModule.forRoot(),
-        BrowserAnimationsModule,
         BrowserModule,
-        HttpModule,
-        InMemoryWebApiModule.forRoot(InMemoryDataService),
+        BrowserAnimationsModule,
         ModalModule.forRoot(),
         RouterModule.forRoot([]),
         SharedModule,
+        PlxTextInputModule,
+        PlxTooltipModule,
+        PlxModalModule.forRoot(),
+        PlxDatePickerModule,
         NgxTreeSelectModule.forRoot({
             allowFilter: true,
-            filterPlaceholder: 'Type your filter here...',
+            // filterPlaceholder: 'Type your filter here...',
             maxVisibleItemCount: 5,
             idField: 'id',
             textField: 'name',
             childrenField: 'children',
-            allowParentSelection: false
+            allowParentSelection: false,
+            expandMode: 'Selection'
         }),
         HttpClientModule,
         TranslateModule.forRoot({
@@ -130,7 +146,8 @@ export function HttpLoaderFactory(http: HttpClient) {
                 useFactory: HttpLoaderFactory,
                 deps: [HttpClient]
             }
-        })
+        }),
+        WfmInputModule
     ],
     bootstrap: [
         AppComponent,