From d55f47d354ac8a1ea681b6be0a3482518e2c47a6 Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Thu, 10 Nov 2016 17:48:13 +0000
Subject: [PATCH] Fix reset processDefinition #1046

---
 .../activiti-start-process.component.html     |  2 +-
 .../activiti-start-process.component.ts       | 23 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html
index 4f7abee354..22d51186c5 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html
@@ -4,7 +4,7 @@
     <h4 class="mdl-dialog__title">{{'START_PROCESS.DIALOG.TITLE'|translate}}</h4>
     <div class="mdl-dialog__content">
         <div class="mdl-textfield mdl-js-textfield alf-mdl-selectfield">
-            <select name="processDefinition" [(ngModel)]="processDefinitionId" id="processDefinition">
+            <select name="processDefinition" [(ngModel)]="processDefinitionId" (ngModelChange)="onChange($event)" id="processDefinition">
                 <option value="" selected="selected">{{'START_PROCESS.DIALOG.TYPE_PLACEHOLDER'|translate}}</option>
                 <option *ngFor="let processDef of processDefinitions" [value]="processDef.id">
                     {{processDef.name}}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
index 4c8179216a..9f6edfc120 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
@@ -48,6 +48,8 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
     name: string;
     processDefinitionId: string;
 
+    currentProcessDef: any;
+
     constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService) {
 
@@ -57,18 +59,19 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
     }
 
     ngOnInit() {
-        this.load();
+        this.load(this.appId);
     }
 
     ngOnChanges(changes: SimpleChanges) {
         let appId = changes['appId'];
         if (appId && (appId.currentValue || appId.currentValue === null)) {
-            this.load();
+            this.load(appId.currentValue);
             return;
         }
     }
 
-    public load() {
+    public load(appId: string) {
+        this.reset();
         this.activitiProcess.getProcessDefinitions(this.appId).subscribe(
             (res: any[]) => {
                 this.processDefinitions = res;
@@ -107,15 +110,14 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
         this.dialog.nativeElement.close();
     }
 
-    private getSelectedProcess(): any {
-        return this.processDefinitions.filter((processDefinition) => {
-            return processDefinition.id === this.processDefinitionId;
+    onChange(processDefinitionId) {
+        this.currentProcessDef = this.processDefinitions.filter((processDefinition) => {
+            return processDefinition.id === processDefinitionId;
         })[0];
     }
 
     hasStartForm() {
-        let selectedProcessDefinition = this.getSelectedProcess();
-        return selectedProcessDefinition && selectedProcessDefinition.hasStartForm;
+        return this.currentProcessDef && this.currentProcessDef.hasStartForm;
     }
 
     isStartFormMissingOrValid() {
@@ -125,4 +127,9 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
     validateForm() {
         return this.processDefinitionId && this.name && this.isStartFormMissingOrValid();
     }
+
+    reset() {
+        this.processDefinitionId = undefined;
+        this.currentProcessDef = undefined;
+    }
 }