From ba60f313c9c4279e90c82e0d8f0d9840a586ca4c Mon Sep 17 00:00:00 2001 From: Damien Vitrac Date: Mon, 6 May 2024 17:23:13 +0200 Subject: [PATCH] Update task execution list (#1998) * Update task execution list Resolves #1996 * Fix test * Remove Dev --- ui/src/app/shared/api/task.service.spec.ts | 2 +- ui/src/app/shared/api/task.service.ts | 2 +- ui/src/app/shared/model/task-execution.model.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/app/shared/api/task.service.spec.ts b/ui/src/app/shared/api/task.service.spec.ts index 34c232bc9..3aac9ac41 100644 --- a/ui/src/app/shared/api/task.service.spec.ts +++ b/ui/src/app/shared/api/task.service.spec.ts @@ -129,7 +129,7 @@ describe('shared/api/task.service.ts', () => { expect(httpParams.get('name')).toEqual('bar'); expect(httpParams.get('page')).toEqual('0'); expect(httpParams.get('size')).toEqual('20'); - expect(httpUri).toEqual('/tasks/executions'); + expect(httpUri).toEqual('/tasks/thinexecutions'); }); it('getExecution', () => { diff --git a/ui/src/app/shared/api/task.service.ts b/ui/src/app/shared/api/task.service.ts index b5e409468..159333c59 100644 --- a/ui/src/app/shared/api/task.service.ts +++ b/ui/src/app/shared/api/task.service.ts @@ -216,7 +216,7 @@ export class TaskService { params = params.append('sort', `${sort},${order}`); } return this.httpClient - .get(UrlUtilities.calculateBaseApiUrl() + 'tasks/executions', {headers, params}) + .get(UrlUtilities.calculateBaseApiUrl() + 'tasks/thinexecutions', {headers, params}) .pipe(map(TaskExecutionPage.parse), catchError(ErrorUtils.catchError)); } diff --git a/ui/src/app/shared/model/task-execution.model.ts b/ui/src/app/shared/model/task-execution.model.ts index df1310791..d30232773 100644 --- a/ui/src/app/shared/model/task-execution.model.ts +++ b/ui/src/app/shared/model/task-execution.model.ts @@ -109,8 +109,8 @@ export class TaskExecution { export class TaskExecutionPage extends Page { static parse(input: any): Page { const page = Page.fromJSON(input); - if (input && input._embedded && input._embedded.taskExecutionResourceList) { - page.items = input._embedded.taskExecutionResourceList.map(TaskExecution.parse); + if (input && input._embedded && input._embedded.taskExecutionThinResourceList) { + page.items = input._embedded.taskExecutionThinResourceList.map(TaskExecution.parse); } return page; }