fix(RunningEmptyContent): Give more feedback to user

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)

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',

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,

src/components/RunningEmptyContent.vue

@@ -4,15 +4,15 @@
 -->
 <template>
 	<NcEmptyContent
-		:name="t('assistant', 'Getting results…')"
+		:name="progressMessage"
 		:description="description">
 		<template #action>
 			<div class="running-actions">
-				<div v-if="progress !== null"
+				<div v-if="speculativeProgress !== null"
 					class="progress">
 					<span>{{ formattedProgress }} %</span>
 					<NcProgressBar
-						:value="progress" />
+						:value="speculativeProgress" />
 				</div>
 				<div v-if="formattedRuntime">
 					{{ formattedRuntime }}
@@ -99,6 +99,14 @@ export default {
 			type: [Number, null],
 			default: null,
 		},
+		startedAt: {
+			type: [Number, null],
+			default: null,
+		},
+		completionExpectedAt: {
+			type: [Number, null],
+			default: null,
+		},
 	},
 
 	emits: [
@@ -110,6 +118,7 @@ export default {
 		return {
 			now: Date.now() / 1000,
 			timer: null,
+			speculativeProgress: this.progress,
 		}
 	},
 
@@ -121,8 +130,8 @@ export default {
 			return TASK_STATUS_STRING
 		},
 		formattedProgress() {
-			if (this.progress !== null) {
-				return this.progress.toFixed(2)
+			if (this.speculativeProgress !== null) {
+				return this.speculativeProgress.toFixed(2)
 			}
 			return null
 		},
@@ -135,6 +144,20 @@ export default {
 			}
 			return t('assistant', 'This may take a few minutes…')
 		},
+		progressMessage() {
+			if (this.taskStatus === TASK_STATUS_STRING.scheduled || this.taskStatus === null) {
+				return t('assistant', 'Waiting…')
+			}
+			return t('assistant', 'Processing…')
+		},
+	},
+
+	watch: {
+		progress() {
+			if (this.progress) {
+				this.speculativeProgress = this.progress
+			}
+		},
 	},
 
 	mounted() {
@@ -143,6 +166,7 @@ export default {
 			console.debug('scheduledAt', this.scheduledAt)
 			console.debug('status', this.taskStatus)
 			this.now = Date.now() / 1000
+			this.updateProgressSpeculatively()
 		}, 2000)
 	},
 
@@ -153,6 +177,16 @@ export default {
 	},
 
 	methods: {
+		updateProgressSpeculatively() {
+			if (this.progress !== null && this.startedAt !== null && this.completionExpectedAt !== null) {
+				const total = (this.completionExpectedAt - this.startedAt)
+				const elapsed = (this.now - this.startedAt)
+				const newProgress = elapsed / total
+				if (newProgress > this.speculativeProgress) {
+					this.speculativeProgress = newProgress
+				}
+			}
+		},
 	},
 }
 </script>

src/views/AssistantPage.vue

@@ -19,6 +19,8 @@
 					:scheduled-at="task.scheduledAt"
 					:progress="progress"
 					:expected-runtime="expectedRuntime"
+					:started-at="startedAt"
+					:completion-expected-at="completionExpectedAt"
 					:is-notify-enabled="isNotifyEnabled"
 					@sync-submit="onSyncSubmit"
 					@try-again="onTryAgain"
@@ -88,6 +90,12 @@ export default {
 			const scheduled = this.task.scheduledAt
 			return (expected && scheduled) ? (expected - scheduled) : null
 		},
+		startedAt() {
+			return this?.task?.startedAt
+		},
+		completionExpectedAt() {
+			return this?.task?.completionExpectedAt
+		},
 	},
 
 	mounted() {
@@ -114,6 +122,7 @@ export default {
 			this.isNotifyEnabled = false
 			this.progress = null
 			this.task.completionExpectedAt = null
+			this.task.startedAt = null
 			this.task.scheduledAt = null
 			this.task.input = inputs
 			this.task.type = taskTypeId
@@ -123,6 +132,7 @@ export default {
 					const task = response.data?.ocs?.data?.task
 					this.task.id = task.id
 					this.task.completionExpectedAt = task.completionExpectedAt
+					this.task.startedAt = task.startedAt
 					this.task.scheduledAt = task.scheduledAt
 					pollTask(task.id, this, this.updateTask).then(finishedTask => {
 						if (finishedTask.status === TASK_STATUS_STRING.successful) {
@@ -196,6 +206,7 @@ export default {
 					this.showSyncTaskRunning = true
 					this.progress = null
 					this.task.completionExpectedAt = updatedTask.completionExpectedAt
+					this.task.startedAt = updatedTask.startedAt
 					this.task.scheduledAt = updatedTask.scheduledAt
 
 					pollTask(updatedTask.id, this, this.updateTask).then(finishedTask => {