refactor updateTask function, update vue-libraries, and improve wording

Signed-off-by: Lukas Schaefer <lukas@lschaefer.xyz>

Author: lukasdotcom

package-lock.json

@@ -49,7 +49,7 @@
 		"@nextcloud/l10n": "^3.1.0",
 		"@nextcloud/moment": "^1.3.1",
 		"@nextcloud/router": "^3.0.0",
-		"@nextcloud/vue": "^9.0.0-rc.2",
+		"@nextcloud/vue": "^9.0.0-rc.4",
 		"extendable-media-recorder": "^9.2.11",
 		"extendable-media-recorder-wav-encoder": "^7.0.129",
 		"moment": "^2.30.1",

package.json

@@ -137,7 +137,7 @@ export async function openAssistantForm({
 						} else if (finishedTask.status === TASK_STATUS_STRING.failed) {
 							showError(
 								t('assistant', 'The server failed to process your task with ID {id}', { id: finishedTask.id })
-									+ '. ' + t('assistant', 'Please inform the server administrators of this issue.'),
+								+ '. ' + t('assistant', 'Please inform the server administrators of this issue.'),
 							)
 							console.error('[assistant] Task failed', finishedTask)
 							view.outputs = null
@@ -212,7 +212,7 @@ export async function openAssistantForm({
 						} else if (finishedTask.status === TASK_STATUS_STRING.failed) {
 							showError(
 								t('assistant', 'The server failed to process your task with ID {id}', { id: finishedTask.id })
-									+ '. ' + t('assistant', 'Please inform the server administrators of this issue.'),
+								+ '. ' + t('assistant', 'Please inform the server administrators of this issue.'),
 							)
 							console.error('[assistant] Task failed', finishedTask)
 							view.outputs = null
@@ -272,7 +272,7 @@ function updateTask(task, object) {
 	object.scheduledAt = task?.scheduledAt
 }
 
-export async function pollTask(taskId, obj) {
+export async function pollTask(taskId, obj, callback = updateTask) {
 	return new Promise((resolve, reject) => {
 		window.assistantPollTimerId = setInterval(() => {
 			getTask(taskId).then(response => {
@@ -282,7 +282,7 @@ export async function pollTask(taskId, obj) {
 					return
 				}
 				if (obj) {
-					updateTask(task, obj)
+					callback(task, obj)
 				}
 				if (![TASK_STATUS_STRING.scheduled, TASK_STATUS_STRING.running].includes(task?.status)) {
 					// stop polling
@@ -528,7 +528,7 @@ export async function openAssistantTask(
 				lastTask = task
 				view.selectedTaskId = lastTask?.id
 				view.expectedRuntime = (lastTask?.completionExpectedAt - lastTask?.scheduledAt) || null
-				pollTask(task.id).then(finishedTask => {
+				pollTask(task.id, view).then(finishedTask => {
 					if (finishedTask.status === TASK_STATUS_STRING.successful) {
 						view.outputs = finishedTask?.output
 					} else if (finishedTask.status === TASK_STATUS_STRING.failed) {

src/assistant.js

@@ -33,7 +33,7 @@
 					{{ t('assistant', 'Cancel task') }}
 				</NcButton>
 				<NcNoteCard v-if="taskStatus === TASK_STATUS_STRING.scheduled && toLongForScheduling" show-alert type="warning">
-					{{ t('assistant', 'This task is taking longer to start running than expected. Please contact your administrator to ensure this task type is being picked up.') }}
+					{{ t('assistant', 'This task is taking longer to start running than expected. Please contact your administrator to ensure that this is correctly configured.') }}
 				</NcNoteCard>
 			</div>
 		</template>
@@ -103,12 +103,15 @@ export default {
 
 	data() {
 		return {
-			toLongForScheduling: false,
+			now: Date.now() / 1000,
 			timer: null,
 		}
 	},
 
 	computed: {
+		toLongForScheduling() {
+			return this.scheduledAt !== null && this.scheduledAt + 60 * 5 < this.now
+		},
 		TASK_STATUS_STRING() {
 			return TASK_STATUS_STRING
 		},
@@ -131,11 +134,9 @@ export default {
 
 	mounted() {
 		this.timer = setInterval(() => {
-			if (this.scheduledAt === null) {
-				this.toLongForScheduling = false
-				return
-			}
-			this.toLongForScheduling = this.scheduledAt + 60 * 5 < Date.now() / 1000
+			console.debug('scheduledAt', this.scheduledAt)
+			console.debug('status', this.taskStatus)
+			this.now = Date.now() / 1000
 		}, 2000)
 	},
 

src/components/RunningEmptyContent.vue

@@ -15,8 +15,8 @@
 					:loading="loading"
 					:show-sync-task-running="showSyncTaskRunning"
 					:short-input="shortInput"
-					:task-status="taskStatus"
-					:scheduled-at="scheduledAt"
+					:task-status="task.status"
+					:scheduled-at="task.scheduledAt"
 					:progress="progress"
 					:expected-runtime="expectedRuntime"
 					:is-notify-enabled="isNotifyEnabled"
@@ -69,8 +69,6 @@ export default {
 			progress: null,
 			loading: false,
 			isNotifyEnabled: false,
-			taskStatus: null,
-			scheduledAt: null,
 		}
 	},
 
@@ -126,7 +124,7 @@ export default {
 					this.task.id = task.id
 					this.task.completionExpectedAt = task.completionExpectedAt
 					this.task.scheduledAt = task.scheduledAt
-					pollTask(task.id, this).then(finishedTask => {
+					pollTask(task.id, this, this.updateTask).then(finishedTask => {
 						if (finishedTask.status === TASK_STATUS_STRING.successful) {
 							this.task.output = finishedTask?.output
 						} else if (finishedTask.status === TASK_STATUS_STRING.failed) {
@@ -148,6 +146,12 @@ export default {
 				.then(() => {
 				})
 		},
+		updateTask(task) {
+			if (task.status === TASK_STATUS_STRING.running) {
+				this.progress = task.progress
+			}
+			this.task = task
+		},
 		onSyncSubmit(data) {
 			this.syncSubmit(data.inputs, data.selectedTaskTypeId, this.task.identifier)
 		},