diff --git a/src/assistant.js b/src/assistant.js index d5b101806..25deadf4d 100644 --- a/src/assistant.js +++ b/src/assistant.js @@ -135,6 +135,8 @@ export async function openAssistantForm({ view.isNotifyEnabled = false view.progress = null view.expectedRuntime = null + view.startedAt = null + view.completionExpectedAt = null view.inputs = inputs view.selectedTaskTypeId = taskTypeId @@ -144,6 +146,8 @@ export async function openAssistantForm({ lastTask = task view.selectedTaskId = lastTask?.id view.expectedRuntime = (lastTask?.completionExpectedAt - lastTask?.scheduledAt) || null + view.startedAt = lastTask?.startedAt || null + view.completionExpectedAt = lastTask?.completionExpectedAt || null pollTask(task.id, view).then(finishedTask => { console.debug('pollTask.then', finishedTask) @@ -239,6 +243,8 @@ export async function openAssistantForm({ view.showSyncTaskRunning = true view.progress = null view.expectedRuntime = (updatedTask?.completionExpectedAt - updatedTask?.scheduledAt) || null + view.startedAt = lastTask?.startedAt || null + view.completionExpectedAt = lastTask?.completionExpectedAt || null pollTask(updatedTask.id, view).then(finishedTask => { console.debug('pollTask.then', finishedTask) @@ -323,6 +329,8 @@ function updateTask(task, object) { } object.taskStatus = task?.status object.scheduledAt = task?.scheduledAt + object.startedAt = task?.startedAt + object.completionExpectedAt = task?.completionExpectedAt } export async function pollTask(taskId, obj, callback = updateTask) { @@ -605,6 +613,8 @@ export async function openAssistantTask( view.showSyncTaskRunning = true view.isNotifyEnabled = false view.expectedRuntime = null + view.startedAt = null + view.completionExpectedAt = null view.inputs = inputs view.selectedTaskTypeId = taskTypeId @@ -614,6 +624,8 @@ export async function openAssistantTask( lastTask = task view.selectedTaskId = lastTask?.id view.expectedRuntime = (lastTask?.completionExpectedAt - lastTask?.scheduledAt) || null + view.startedAt = lastTask?.startedAt || null + view.completionExpectedAt = lastTask?.completionExpectedAt || null pollTask(task.id, view).then(finishedTask => { if (finishedTask.status === TASK_STATUS_STRING.successful) { view.outputs = finishedTask?.output @@ -699,6 +711,8 @@ export async function openAssistantTask( view.showSyncTaskRunning = true view.progress = null view.expectedRuntime = (updatedTask?.completionExpectedAt - updatedTask?.scheduledAt) || null + view.startedAt = lastTask?.startedAt || null + view.completionExpectedAt = lastTask?.completionExpectedAt || null pollTask(updatedTask.id, view).then(finishedTask => { console.debug('pollTask.then', finishedTask) diff --git a/src/components/AssistantTextProcessingForm.vue b/src/components/AssistantTextProcessingForm.vue index 48e0e42e8..d22f9f733 100644 --- a/src/components/AssistantTextProcessingForm.vue +++ b/src/components/AssistantTextProcessingForm.vue @@ -47,6 +47,8 @@ :description="shortInput" :progress="progress" :expected-runtime="expectedRuntime" + :started-at="startedAt" + :completion-expected-at="completionExpectedAt" :is-notify-enabled="isNotifyEnabled" :task-status="taskStatus" :scheduled-at="scheduledAt" @@ -277,6 +279,14 @@ export default { type: [Number, null], default: null, }, + startedAt: { + type: [Number, null], + default: null, + }, + completionExpectedAt: { + type: [Number, null], + default: null, + }, }, emits: [ 'sync-submit', diff --git a/src/components/AssistantTextProcessingModal.vue b/src/components/AssistantTextProcessingModal.vue index 58a370e3a..9c543e025 100644 --- a/src/components/AssistantTextProcessingModal.vue +++ b/src/components/AssistantTextProcessingModal.vue @@ -36,6 +36,8 @@ :short-input="shortInput" :progress="progress" :expected-runtime="expectedRuntime" + :started-at="startedAt" + :completion-expected-at="completionExpectedAt" :is-notify-enabled="isNotifyEnabled" :task-type-id-list="taskTypeIdList" :task-status="taskStatus" @@ -124,6 +126,8 @@ export default { scheduledAt: null, loading: false, expectedRuntime: null, + startedAt: null, + completionExpectedAt: null, isNotifyEnabled: false, showSyncTaskRunning: false, showScheduleConfirmation: false, diff --git a/src/components/RunningEmptyContent.vue b/src/components/RunningEmptyContent.vue index badef8d27..2036b8a7f 100644 --- a/src/components/RunningEmptyContent.vue +++ b/src/components/RunningEmptyContent.vue @@ -4,15 +4,15 @@ -->