From a608bc40a4ba3a3fb5a74ad4b4d165bf5ce56674 Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Thu, 30 Mar 2017 18:10:26 +0100
Subject: [PATCH] Close the dialog when the activiti content preview is
 cliecked (#1792)

---
 .../src/components/activiti-start-form.component.ts    | 10 ++++++++++
 .../activiti-process-instance-tasks.component.html     |  3 ++-
 .../activiti-process-instance-tasks.component.ts       |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts
index e76f06b659..47c23acbae 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts
@@ -31,6 +31,7 @@ import { ActivitiForm } from './activiti-form.component';
 import { FormService } from './../services/form.service';
 import { WidgetVisibilityService }  from './../services/widget-visibility.service';
 import { FormOutcomeModel } from './widgets/core/index';
+import { ContentLinkModel } from './widgets/core/content-link.model';
 
 /**
  * Displays the start form for a named process definition, which can be used to retrieve values to start a new process.
@@ -75,6 +76,9 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked,
     @Output()
     outcomeClick: EventEmitter<any> = new EventEmitter<any>();
 
+    @Output()
+    formContentClicked: EventEmitter<ContentLinkModel> = new EventEmitter<ContentLinkModel>();
+
     @ViewChild('outcomesContainer', {})
     outcomesContainer: ElementRef = null;
 
@@ -91,6 +95,12 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked,
         this.showTitle = false;
     }
 
+    ngOnInit() {
+        this.formService.formContentClicked.subscribe((content: ContentLinkModel) => {
+            this.formContentClicked.emit(content);
+        });
+    }
+
     ngOnChanges(changes: SimpleChanges) {
         let processDefinitionId = changes['processDefinitionId'];
         if (processDefinitionId && processDefinitionId.currentValue) {
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
index ff9c962bb5..ed5749a4c6 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
@@ -75,7 +75,8 @@
     <h4 class="mdl-dialog__title">{{ 'DETAILS.LABELS.START_FORM'|translate }}</h4>
     <div class="mdl-dialog__content form__size">
         <activiti-start-form [processId]="processId" [processDefinitionId]="processInstanceDetails?.processDefinitionId"
-                             [showRefreshButton]="false" [readOnlyForm]="true" >
+                             [showRefreshButton]="false" [readOnlyForm]="true"
+                             (formContentClicked)='onFormContentClick($event)'>
         </activiti-start-form>
     </div>
     <div class="mdl-dialog__actions">
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
index 26a86ce222..5ae9d8a90f 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
@@ -183,4 +183,10 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges {
     onRefreshClicked() {
         this.load(this.processInstanceDetails.id);
     }
+
+    onFormContentClick() {
+        if (this.startDialog) {
+            this.startDialog.nativeElement.close();
+        }
+    }
 }