From d5bd97e3d2b87122f0361e6903ca5e0eba42f905 Mon Sep 17 00:00:00 2001
From: Stephen Donnell <120061677+sdonnell-hyland@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:22:24 -0500
Subject: [PATCH] [AAE-27160] Fix the structure of data returned from
 service-tasks API (#10711)

---
 .../service-task-list-cloud.component.spec.ts |  2 +-
 .../service-task-list-cloud.component.ts      |  2 +-
 .../task-list/mock/fake-task-response.mock.ts | 63 ++++++++++---------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.spec.ts
index a4e1916f09..2f90c16763 100644
--- a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.spec.ts
@@ -230,7 +230,7 @@ describe('ServiceTaskListCloudComponent', () => {
 
     describe('component changes', () => {
         beforeEach(() => {
-            component.rows = fakeServiceTask.list.entries;
+            component.rows = fakeServiceTask.list.entries.map((task) => task.entry);
             fixture.detectChanges();
         });
 
diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.ts
index d634b05dd9..8c91a6ea41 100644
--- a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list/service-task-list-cloud.component.ts
@@ -87,7 +87,7 @@ export class ServiceTaskListCloudComponent extends BaseTaskListCloudComponent {
                 .pipe(takeUntilDestroyed(this.destroyRef))
                 .subscribe(
                     ([tasks]) => {
-                        this.rows = tasks.list.entries;
+                        this.rows = tasks.list.entries.map((task) => task.entry);
                         this.success.emit(tasks);
                         this.pagination.next(tasks.list.pagination);
                         this.isReloadingSubject$.next(false);
diff --git a/lib/process-services-cloud/src/lib/task/task-list/mock/fake-task-response.mock.ts b/lib/process-services-cloud/src/lib/task/task-list/mock/fake-task-response.mock.ts
index 6cb4c0b70a..61a066966d 100644
--- a/lib/process-services-cloud/src/lib/task/task-list/mock/fake-task-response.mock.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/mock/fake-task-response.mock.ts
@@ -51,22 +51,24 @@ export const fakeServiceTask = {
     list: {
         entries: [
             {
-                activityType: 'serviceTask',
-                activityName: 'serviceTaskName',
-                appName: 'simpleapp',
-                completedDate: '2020-09-22T16:03:37.482+0000',
-                elementId: 'ServiceTask_0lszm0x',
-                executionId: '2023b099-fced-11ea-b116-62141048995a',
-                id: '04fdf69f-4ddd-48ab-9563-da776c9b163c',
-                processDefinitionId: 'Process_24rkVVSR:1:0db78dcd-fc14-11ea-bce0-62141048995a',
-                processDefinitionKey: 'Process_24rkVVSR',
-                processDefinitionVersion: 1,
-                processInstanceId: '2023b097-fced-11ea-b116-62141048995a',
-                serviceFullName: 'simpleapp-rb',
-                serviceName: 'simpleapp-rb',
-                serviceVersion: '',
-                startedDate: '2020-09-22T16:03:37.444+0000',
-                status: 'COMPLETED'
+                entry: {
+                    activityType: 'serviceTask',
+                    activityName: 'serviceTaskName',
+                    appName: 'simpleapp',
+                    completedDate: '2020-09-22T16:03:37.482+0000',
+                    elementId: 'ServiceTask_0lszm0x',
+                    executionId: '2023b099-fced-11ea-b116-62141048995a',
+                    id: '04fdf69f-4ddd-48ab-9563-da776c9b163c',
+                    processDefinitionId: 'Process_24rkVVSR:1:0db78dcd-fc14-11ea-bce0-62141048995a',
+                    processDefinitionKey: 'Process_24rkVVSR',
+                    processDefinitionVersion: 1,
+                    processInstanceId: '2023b097-fced-11ea-b116-62141048995a',
+                    serviceFullName: 'simpleapp-rb',
+                    serviceName: 'simpleapp-rb',
+                    serviceVersion: '',
+                    startedDate: '2020-09-22T16:03:37.444+0000',
+                    status: 'COMPLETED'
+                }
             }
         ],
         pagination: {
@@ -79,18 +81,17 @@ export const fakeServiceTask = {
     }
 };
 
-export const fakeCustomSchema =
-    [
-        new ObjectDataColumn<ProcessListDataColumnCustomData>({
-            key: 'fakeName',
-            type: 'text',
-            title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.FAKE',
-            sortable: true
-        }),
-        new ObjectDataColumn<ProcessListDataColumnCustomData>({
-            key: 'fakeTaskName',
-            type: 'text',
-            title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.TASK_FAKE',
-            sortable: true
-        })
-    ];
+export const fakeCustomSchema = [
+    new ObjectDataColumn<ProcessListDataColumnCustomData>({
+        key: 'fakeName',
+        type: 'text',
+        title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.FAKE',
+        sortable: true
+    }),
+    new ObjectDataColumn<ProcessListDataColumnCustomData>({
+        key: 'fakeTaskName',
+        type: 'text',
+        title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.TASK_FAKE',
+        sortable: true
+    })
+];