From a0007d82b2dcae3f4c1832e8f89c0f0fb10ed979 Mon Sep 17 00:00:00 2001
From: davidcanonieto <david.cano@alfresco.com>
Date: Tue, 5 Mar 2019 15:51:48 +0100
Subject: [PATCH] [ADF-4156] Regression - Return ISO format for date properties
 on Task List Component (#4393)

---
 .../task-list-demo/task-list-demo.component.html     | 12 ++++++++++--
 .../task-list/components/task-list.component.spec.ts |  6 +++---
 .../task-list/components/task-list.component.ts      | 10 ----------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html
index 446b769672..dd27c62036 100644
--- a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html
+++ b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.html
@@ -169,8 +169,16 @@
             </data-column>
             <data-column key="name" title="Name"></data-column>
             <data-column key="description" title="Description"></data-column>
-            <data-column key="created" title="Created"></data-column>
-            <data-column key="dueDate" title="Due Date"></data-column>
+            <data-column key="created" title="Created">
+                <ng-template let-entry="$implicit">
+                    <div>{{entry.row.obj.created | date:'MMM d, yyyy' }} </div>
+                </ng-template>
+            </data-column>
+            <data-column key="dueDate" title="Due Date" type="date">
+                <ng-template let-entry="$implicit">
+                    <div>{{entry.row.obj.dueDate | date:'MMM d, yyyy' }} </div>
+                </ng-template>
+            </data-column>
             <data-column key="processInstanceId" title="Process Instance Id"></data-column>
             <data-column key="processDefinitionId" title="Process Definition Id"></data-column>
         </data-columns>
diff --git a/lib/process-services/task-list/components/task-list.component.spec.ts b/lib/process-services/task-list/components/task-list.component.spec.ts
index c81c344491..3a42c62abd 100644
--- a/lib/process-services/task-list/components/task-list.component.spec.ts
+++ b/lib/process-services/task-list/components/task-list.component.spec.ts
@@ -123,9 +123,9 @@ describe('TaskListComponent', () => {
             expect(component.rows[0]['assignee'].firstName).toEqual('firstNameFake1');
             expect(component.rows[0]['assignee'].lastName).toEqual('lastNameFake1');
             expect(component.rows[0][('assignee')].email).toEqual('emailFake1');
-            expect(component.rows[0]['created']).toEqual('Mar 1, 2017');
-            expect(component.rows[0]['dueDate']).toEqual('Apr 2, 2017');
-            expect(component.rows[0]['endDate']).toEqual('May 3, 2017');
+            expect(component.rows[0]['created'].toISOString()).toEqual('2017-03-01T12:25:17.189Z');
+            expect(component.rows[0]['dueDate'].toISOString()).toEqual('2017-04-02T12:25:17.189Z');
+            expect(component.rows[0]['endDate'].toISOString()).toEqual('2017-05-03T12:25:31.129Z');
             expect(component.rows[0]['duration']).toEqual(13940);
             expect(component.rows[0]['priority']).toEqual(50);
             expect(component.rows[0]['parentTaskId']).toEqual(1);
diff --git a/lib/process-services/task-list/components/task-list.component.ts b/lib/process-services/task-list/components/task-list.component.ts
index 2320430eaa..79258ceded 100644
--- a/lib/process-services/task-list/components/task-list.component.ts
+++ b/lib/process-services/task-list/components/task-list.component.ts
@@ -38,7 +38,6 @@ import moment from 'moment-es6';
 export class TaskListComponent extends DataTableSchema implements OnChanges, AfterContentInit, PaginatedComponent {
 
     static PRESET_KEY = 'adf-task-list.presets';
-    public FORMAT_DATE: string = 'll';
 
     @ContentChild(CustomEmptyContentTemplateDirective)
     customEmptyContent: CustomEmptyContentTemplateDirective;
@@ -347,15 +346,6 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
             if (!task.name) {
                 task.name = 'No name';
             }
-            if (task.created) {
-                task.created = moment(task.created).format(this.FORMAT_DATE);
-            }
-            if (task.dueDate) {
-                task.dueDate = moment(task.dueDate).format(this.FORMAT_DATE);
-            }
-            if (task.endDate) {
-                task.endDate = moment(task.endDate).format(this.FORMAT_DATE);
-            }
             return task;
         });
         return instances;