From e1ff2909bdc45b5ae8ea8f4dcae0a7f43192ab78 Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Thu, 12 Dec 2019 13:41:40 +0000
Subject: [PATCH] Fix the attach content from alfresco and local (#5328)

---
 .../start-process-cloud-demo.component.html      |  1 +
 .../cloud/start-process-cloud-demo.component.ts  |  6 ++++++
 .../lib/form/components/form-cloud.component.ts  |  2 ++
 .../attach-file-cloud-widget.component.html      |  1 -
 .../attach-file-cloud-widget.component.ts        | 16 +++++-----------
 .../start-process-cloud.component.html           |  1 +
 .../components/start-process-cloud.component.ts  | 10 +++++++++-
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.html b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.html
index 6e1e8728e5..1862ea1a6e 100644
--- a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.html
+++ b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.html
@@ -5,5 +5,6 @@
     [variables]="variables"
     (error)="openSnackMessage($event)"
     (success)="onStartProcessSuccess()"
+    (formContentClicked)="onFormContentClicked($event)"
     (cancel)="onCancelStartProcess()">
 </adf-cloud-start-process>
diff --git a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts
index 2d6470ca29..ee2dfe8f04 100644
--- a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts
+++ b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts
@@ -19,6 +19,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationService, AppConfigService } from '@alfresco/adf-core';
 import { CloudLayoutService } from './services/cloud-layout.service';
+import { PreviewService } from 'app/services/preview.service';
 
 @Component({
     templateUrl: './start-process-cloud-demo.component.html',
@@ -34,6 +35,7 @@ export class StartProcessCloudDemoComponent implements OnInit {
     constructor(private appConfig: AppConfigService,
                 private cloudLayoutService: CloudLayoutService,
                 private route: ActivatedRoute,
+                private previewService: PreviewService,
                 private notificationService: NotificationService,
                 private router: Router) {
     }
@@ -61,4 +63,8 @@ export class StartProcessCloudDemoComponent implements OnInit {
     openSnackMessage(event: any) {
         this.notificationService.openSnackMessage(event.response.body.entry.message);
     }
+
+    onFormContentClicked(resourceClicked: any) {
+        this.previewService.showResource(resourceClicked.nodeId);
+    }
 }
diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
index 8f6a44707d..3f7341d5c5 100644
--- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
@@ -210,6 +210,7 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges,
                     this.visibilityService.refreshVisibility(<any> parsedForm);
                     parsedForm.validateForm();
                     this.form = parsedForm;
+                    this.form.nodeId = '-my-';
                     this.form.contentHost = this.appConfigService.get('ecmHost');
                     this.onFormLoaded(this.form);
                     resolve(this.form);
@@ -238,6 +239,7 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges,
                     this.visibilityService.refreshVisibility(<any> parsedForm);
                     parsedForm.validateForm();
                     this.form = parsedForm;
+                    this.form.nodeId = '-my-';
                     this.form.contentHost = this.appConfigService.get('ecmHost');
                     this.onFormLoaded(this.form);
                 },
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
index 9a4dee3a7e..1d127e9e09 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
@@ -53,7 +53,6 @@
             </button>
             <mat-menu #fileActionMenu="matMenu" xPosition="before">
                 <button id="{{'file-'+file?.id+'-show-file'}}"
-                    [disabled]="file['isExternal']"
                     mat-menu-item (click)="onAttachFileClicked(file)">
                     <mat-icon>image</mat-icon>
                     <span>{{ 'FORM.FIELD.SHOW_FILE' | translate }}</span>
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
index f9cbc4d54f..031dd86eae 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
@@ -22,9 +22,9 @@ import {
   FormService,
   LogService,
   ThumbnailService,
-  ContentLinkModel,
   NotificationService,
-  baseHost
+  baseHost,
+  ContentLinkModel
 } from '@alfresco/adf-core';
 import { Node, RelatedContentRepresentation } from '@alfresco/js-api';
 import { ContentCloudNodeSelectorService } from '../../../services/content-cloud-node-selector.service';
@@ -124,14 +124,8 @@ export class AttachFileCloudWidgetComponent extends UploadCloudWidgetComponent
         );
     }
 
-    onAttachFileClicked(file: ContentLinkModel) {
-        this.processCloudContentService
-            .getRawContentNode(file.nodeId, this.field.form.contentHost)
-            .subscribe(
-                blob => {
-                    file.contentBlob = blob;
-                    this.fileClicked(file);
-                }
-            );
+    onAttachFileClicked(nodeSelector: any) {
+        nodeSelector.nodeId = nodeSelector.id;
+        this.fileClicked(new ContentLinkModel(nodeSelector));
     }
 }
diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html
index 00a882e614..9b04581633 100755
--- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html
@@ -58,6 +58,7 @@
                 [showRefreshButton]="false"
                 [showValidationIcon]="false"
                 [showTitle]="false"
+                (formContentClicked)="onFormContentClicked($event)"
                 (formLoaded)="onFormLoaded($event)">
                 <adf-cloud-form-custom-outcomes>
                     <ng-template [ngTemplateOutlet]="taskFormCloudButtons">
diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
index c453a1b175..8a1c788a7e 100755
--- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
@@ -23,7 +23,7 @@ import {
 import { ProcessInstanceCloud } from '../models/process-instance-cloud.model';
 import { StartProcessCloudService } from '../services/start-process-cloud.service';
 import { FormControl, Validators, FormGroup, AbstractControl, FormBuilder, ValidatorFn } from '@angular/forms';
-import { FormModel } from '@alfresco/adf-core';
+import { FormModel, ContentLinkModel } from '@alfresco/adf-core';
 import { MatAutocompleteTrigger } from '@angular/material';
 import { ProcessPayloadCloud } from '../models/process-payload-cloud.model';
 import { debounceTime, takeUntil } from 'rxjs/operators';
@@ -84,6 +84,10 @@ export class StartProcessCloudComponent implements OnChanges, OnInit, OnDestroy
     @Output()
     error = new EventEmitter<ProcessInstanceCloud>();
 
+    /** Emitted when form content is clicked. */
+    @Output()
+    formContentClicked: EventEmitter<ContentLinkModel> = new EventEmitter();
+
     processDefinitionList: ProcessDefinitionCloud[] = [];
     processDefinitionCurrent: ProcessDefinitionCloud;
     errorMessageId: string = '';
@@ -301,6 +305,10 @@ export class StartProcessCloudComponent implements OnChanges, OnInit, OnDestroy
         return this.processForm.get('processDefinition');
     }
 
+    onFormContentClicked(content: ContentLinkModel) {
+        this.formContentClicked.emit(content);
+    }
+
     ngOnDestroy() {
         this.onDestroy$.next(true);
         this.onDestroy$.complete();