Skip to content

Commit

Permalink
Update task execution list (#1998)
Browse files Browse the repository at this point in the history
* Update task execution list

Resolves #1996

* Fix test

* Remove Dev
  • Loading branch information
oodamien authored May 6, 2024
1 parent 20ae2b7 commit ba60f31
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ui/src/app/shared/api/task.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/shared/api/task.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export class TaskService {
params = params.append('sort', `${sort},${order}`);
}
return this.httpClient
.get<any>(UrlUtilities.calculateBaseApiUrl() + 'tasks/executions', {headers, params})
.get<any>(UrlUtilities.calculateBaseApiUrl() + 'tasks/thinexecutions', {headers, params})
.pipe(map(TaskExecutionPage.parse), catchError(ErrorUtils.catchError));
}

Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/shared/model/task-execution.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ export class TaskExecution {
export class TaskExecutionPage extends Page<TaskExecution> {
static parse(input: any): Page<TaskExecution> {
const page = Page.fromJSON<TaskExecution>(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;
}
Expand Down

0 comments on commit ba60f31

Please sign in to comment.