From 1c2b2fa40a13228794e04e2e5588682ccacf74db Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Thu, 17 Nov 2016 11:42:13 +0000
Subject: [PATCH] Display selected file name when re-selected after clear

Refs #812
---
 .../src/components/widgets/attach/attach.widget.html |  2 +-
 .../components/widgets/attach/attach.widget.spec.ts  | 12 ++++++------
 .../src/components/widgets/attach/attach.widget.ts   | 10 ++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.html
index e79e98dbc7..286748a802 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.html
@@ -2,7 +2,7 @@
 
     <label [attr.for]="field.id">{{field.name}}</label>
     <div>
-        <span *ngIf="hasFile" class="attach-widget__file">{{getLinkedFileName()}}</span>
+        <span *ngIf="hasFile()" class="attach-widget__file mdl-chip"><span class="mdl-chip__text">{{getLinkedFileName()}}</span></span>
         <button #browseFile (click)="showDialog();" class="mdl-button mdl-js-button mdl-js-ripple-effect attach-widget__browser">
             <i class="material-icons">image</i>
             Browse {{selectedFolderSiteName}}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts
index 1f31e743da..95121ed10b 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts
@@ -42,24 +42,23 @@ describe('AttachWidget', () => {
     });
 
     it('should require field value to check file', () => {
-        widget.hasFile = false;
         widget.field = null;
         widget.ngOnInit();
-        expect(widget.hasFile).toBeFalsy();
+        expect(widget.hasFile()).toBeFalsy();
 
         widget.field = new FormFieldModel(null, {
             type: FormFieldTypes.UPLOAD,
             value: null
         });
         widget.ngOnInit();
-        expect(widget.hasFile).toBeFalsy();
+        expect(widget.hasFile()).toBeFalsy();
 
         widget.field = new FormFieldModel(null, {
             type: FormFieldTypes.UPLOAD,
             value: [{ name: 'file' }]
         });
         widget.ngOnInit();
-        expect(widget.hasFile).toBeTruthy();
+        expect(widget.hasFile()).toBeTruthy();
     });
 
     it('should setup with form field', () => {
@@ -116,19 +115,20 @@ describe('AttachWidget', () => {
         expect(widget.selectedFile).toBe(node);
         expect(widget.field.value).toEqual([link]);
         expect(widget.field.json.value).toEqual([link]);
+        expect(widget.hasFile()).toBeTruthy();
     });
 
     it('should reset', () => {
-        widget.hasFile = true;
         widget.field = new FormFieldModel(null, {
             type: FormFieldTypes.UPLOAD,
             value: [{ name: 'filename' }]
         });
 
         widget.reset();
-        expect(widget.hasFile).toBeFalsy();
+        expect(widget.hasFile()).toBeFalsy();
         expect(widget.field.value).toBeNull();
         expect(widget.field.json.value).toBeNull();
+        expect(widget.hasFile()).toBeFalsy();
     });
 
     it('should close dialog on cancel', () => {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts
index 2c77567c02..101accf328 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts
@@ -35,7 +35,6 @@ export class AttachWidget extends WidgetComponent implements OnInit {
     selectedFolderSiteName: string;
     selectedFolderAccountId: string;
     fileName: string;
-    hasFile: boolean;
     selectedFolderNodes: [ExternalContent];
     selectedFile: ExternalContent;
 
@@ -54,10 +53,6 @@ export class AttachWidget extends WidgetComponent implements OnInit {
 
     ngOnInit() {
         if (this.field) {
-            if (this.field.value) {
-                this.hasFile = true;
-            }
-
             let params = this.field.params;
 
             if (params &&
@@ -149,7 +144,10 @@ export class AttachWidget extends WidgetComponent implements OnInit {
     reset() {
         this.field.value = null;
         this.field.json.value = null;
-        this.hasFile = false;
+    }
+
+    hasFile(): boolean {
+        return this.field && this.field.value;
     }
 
 }