From 4eef8b486cac644be8c1ff2eb43893f201008feb Mon Sep 17 00:00:00 2001 From: Claudia Bressi Date: Tue, 8 Aug 2023 20:25:30 +0200 Subject: [PATCH] Up parameters --- ui/src/app/shared/api/task.service.spec.ts | 3 +-- ui/src/app/shared/api/task.service.ts | 2 +- ui/src/app/shared/model/task-execution.model.ts | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/app/shared/api/task.service.spec.ts b/ui/src/app/shared/api/task.service.spec.ts index 3f23bd0e8..1ae5e6aa4 100644 --- a/ui/src/app/shared/api/task.service.spec.ts +++ b/ui/src/app/shared/api/task.service.spec.ts @@ -132,8 +132,7 @@ describe('shared/api/task.service.ts', () => { TaskExecution.parse({ externalExecutionId: 'foo', arguments: [ - '--spring.cloud.data.flow.platformname=bar', - '--spring.cloud.data.flow.schematarget=boot2' + '--spring.cloud.data.flow.platformname=bar' ] }) ); diff --git a/ui/src/app/shared/api/task.service.ts b/ui/src/app/shared/api/task.service.ts index 8b6f71647..4029513a3 100644 --- a/ui/src/app/shared/api/task.service.ts +++ b/ui/src/app/shared/api/task.service.ts @@ -174,7 +174,7 @@ export class TaskService { } const url = taskExecution?._links && taskExecution?._links['tasks/logs'] !== undefined ? taskExecution?._links['tasks/logs'].href : - UrlUtilities.calculateBaseApiUrl() + `tasks/logs/${taskExecution.externalExecutionId}?platformName=${platform}&schemaTarget=${taskExecution.schemaTarget}`; + UrlUtilities.calculateBaseApiUrl() + `tasks/logs/${taskExecution.externalExecutionId}${platform}&schemaTarget=${taskExecution.schemaTarget}`; return this.httpClient .get(url, { headers diff --git a/ui/src/app/shared/model/task-execution.model.ts b/ui/src/app/shared/model/task-execution.model.ts index ce5d074cb..f6c845b30 100644 --- a/ui/src/app/shared/model/task-execution.model.ts +++ b/ui/src/app/shared/model/task-execution.model.ts @@ -39,6 +39,7 @@ export class TaskExecution { execution.endTime = input?.endTime ? DateTime.fromISO(input.endTime) : null; execution.exitMessage = input?.exitMessage; execution.arguments = input?.arguments || []; + execution.schemaTarget = input?.schemaTarget || 'boot2'; execution.jobExecutionIds = input?.jobExecutionIds || []; execution.errorMessage = input?.errorMessage; execution.taskExecutionStatus = input?.taskExecutionStatus;