From a6a5400956bbb61798ec6adbcb71cbc8d1aa8e15 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 22 Nov 2016 13:36:09 +0000
Subject: [PATCH] Move Start Process form into Process List view

Refs #1048
---
 .../activiti/activiti-demo.component.html     | 16 ++-------------
 .../activiti/activiti-demo.component.ts       | 20 ++++++++++++++-----
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index 0e5159fe2c..3ab75114d5 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -8,7 +8,6 @@
             <a id="apps-header" href="#apps" class="mdl-layout__tab is-active">APPS</a>
             <a id="tasks-header" href="#tasks" class="mdl-layout__tab">TASK LIST</a>
             <a id="processes-header" href="#processes" class="mdl-layout__tab">PROCESS LIST</a>
-            <a id="start-process-header" href="#start-process" class="mdl-layout__tab">START PROCESS</a>
             <a id="report-header" href="#report" class="mdl-layout__tab">ANALYTICS</a>
         </div>
     </header>
@@ -81,22 +80,11 @@
                                                (rowClick)="onProcessRowClick($event)" (onSuccess)="onSuccessProcessList($event)"
                                                             #activitiprocesslist></activiti-process-instance-list>
                         </div>
-                        <div class="mdl-cell mdl-cell--7-col task-column">
+                        <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="!isStartProcessMode()">
                             <span>Process Details</span>
                             <activiti-process-instance-details [processInstanceId]="currentProcessInstanceId" (activitiprocesslist)="taskFormCompleted()" (processCancelled)="processCancelled()" #activitiprocessdetails></activiti-process-instance-details>
                         </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-
-
-        <!-- START PROCESS COMPONENT -->
-        <section class="mdl-layout__tab-panel" id="start-process">
-            <div class="page-content">
-                <div class="page-content">
-                    <div class="mdl-grid">
-                        <div class="mdl-cell mdl-cell--12-col task-column">
+                        <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()">
                             <span>Start Process</span>
                             <activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
                         </div>
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index c04b748931..c003ba0c36 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -22,7 +22,11 @@ import {
     ActivitiApps,
     ActivitiTaskList
 } from 'ng2-activiti-tasklist';
-import { ActivitiProcessInstanceListComponent, ActivitiStartProcessInstance } from 'ng2-activiti-processlist';
+import {
+    ActivitiProcessInstanceListComponent,
+    ActivitiStartProcessInstance,
+    ProcessInstance
+} from 'ng2-activiti-processlist';
 import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs/Rx';
 import {
@@ -36,6 +40,8 @@ import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custo
 declare let __moduleName: string;
 declare var componentHandler;
 
+const currentProcessIdNew = '__NEW__';
+
 @Component({
     moduleId: __moduleName,
     selector: 'activiti-demo',
@@ -189,13 +195,17 @@ export class ActivitiDemoComponent implements AfterViewChecked {
     }
 
     navigateStartProcess() {
-        this.changeTab('processes', 'start-process');
+        this.currentProcessInstanceId = currentProcessIdNew;
     }
 
-    onStartProcessInstance() {
+    onStartProcessInstance(instance: ProcessInstance) {
+        this.currentProcessInstanceId = instance.id;
+        this.activitiprocesslist.reload(false);
         this.activitiStartProcess.reset();
-        this.activitiprocesslist.reload();
-        this.changeTab('start-process', 'processes');
+    }
+
+    isStartProcessMode() {
+        return this.currentProcessInstanceId === currentProcessIdNew;
     }
 
     processCancelled(data: any) {