Skip to content

feat: task layout design update #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edward-ly merged 10 commits into from
May 7, 2025
Merged

feat: task layout design update #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8d6106f
feat: update layout design
edward-ly Apr 25, 2025
51053b7
fix(TaskList): center empty task list text
edward-ly Apr 26, 2025
4c42576
fix(TaskListItem): shorten input/output text
edward-ly Apr 26, 2025
6bfe0ee
feat: show active task in task list
edward-ly Apr 29, 2025
080b575
fix: clear active task from task list on new task
edward-ly May 5, 2025
f940cbc
fix: clear active task from task list on new task type
edward-ly May 5, 2025
c7d36ea
fix: remove unused showHistory property
edward-ly May 6, 2025
b243206
fix(AssistantTextProcessingForm): set default values on new translate…
edward-ly May 6, 2025
cb59f53
feat: show loading screen for active task if scheduled/running
edward-ly May 6, 2025
899d6f6
fix(TaskList): update task list when loading a new task
edward-ly May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions src/assistant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,63 @@ export async function openAssistantForm({
view.$on('load-task', (task) => {
if (!view.loading) {
console.debug('[assistant] loading task', task)
cancelTaskPolling()

view.selectedTaskTypeId = task.type
view.inputs = task.input
view.outputs = task.status === TASK_STATUS_STRING.successful ? task.output : null
view.selectedTaskId = task.id
lastTask = task

if ([TASK_STATUS_STRING.scheduled, TASK_STATUS_STRING.running].includes(task?.status)) {
getTask(task.id).then(response => {
const updatedTask = response.data?.ocs?.data?.task

if (![TASK_STATUS_STRING.scheduled, TASK_STATUS_STRING.running].includes(updatedTask?.status)) {
view.selectedTaskTypeId = updatedTask.type
view.inputs = updatedTask.input
view.outputs = updatedTask.status === TASK_STATUS_STRING.successful ? updatedTask.output : null
view.selectedTaskId = updatedTask.id
lastTask = updatedTask
return
}

view.loading = true
view.showSyncTaskRunning = true
view.progress = null
view.expectedRuntime = (updatedTask?.completionExpectedAt - updatedTask?.scheduledAt) || null

const setProgress = (progress) => {
view.progress = progress
}
pollTask(updatedTask.id, setProgress).then(finishedTask => {
console.debug('pollTask.then', finishedTask)
if (finishedTask.status === TASK_STATUS_STRING.successful) {
view.outputs = finishedTask?.output
view.selectedTaskId = finishedTask?.id
} else if (finishedTask.status === TASK_STATUS_STRING.failed) {
showError(t('assistant', 'Your task with ID {id} has failed', { id: finishedTask.id }))
console.error('[assistant] Task failed', finishedTask)
view.outputs = null
}
// resolve(finishedTask)
view.loading = false
view.showSyncTaskRunning = false
}).catch(error => {
console.debug('[assistant] poll error', error)
})
}).catch(error => {
console.error(error)
})
}
}
})
view.$on('new-task', () => {
console.debug('[assistant] new task')
view.outputs = null
view.selectedTaskId = null
lastTask = null
})
view.$on('background-notify', () => {
cancelTaskPolling()
view.showScheduleConfirmation = true
Expand All @@ -166,6 +216,7 @@ export async function openAssistantForm({
view.$destroy()
})
view.$on('back-to-assistant', () => {
cancelTaskPolling()
view.showScheduleConfirmation = false
view.showSyncTaskRunning = false
view.loading = false
Expand Down Expand Up @@ -430,13 +481,63 @@ export async function openAssistantTask(task, { isInsideViewer = undefined, acti
})
view.$on('load-task', (task) => {
if (!view.loading) {
cancelTaskPolling()

view.selectedTaskTypeId = task.type
view.inputs = task.input
view.outputs = task.status === TASK_STATUS_STRING.successful ? task.output : null
view.selectedTaskId = task.id
lastTask = task

if ([TASK_STATUS_STRING.scheduled, TASK_STATUS_STRING.running].includes(task?.status)) {
getTask(task.id).then(response => {
const updatedTask = response.data?.ocs?.data?.task

if (![TASK_STATUS_STRING.scheduled, TASK_STATUS_STRING.running].includes(updatedTask?.status)) {
view.selectedTaskTypeId = updatedTask.type
view.inputs = updatedTask.input
view.outputs = updatedTask.status === TASK_STATUS_STRING.successful ? updatedTask.output : null
view.selectedTaskId = updatedTask.id
lastTask = updatedTask
return
}

view.loading = true
view.showSyncTaskRunning = true
view.progress = null
view.expectedRuntime = (updatedTask?.completionExpectedAt - updatedTask?.scheduledAt) || null

const setProgress = (progress) => {
view.progress = progress
}
pollTask(updatedTask.id, setProgress).then(finishedTask => {
console.debug('pollTask.then', finishedTask)
if (finishedTask.status === TASK_STATUS_STRING.successful) {
view.outputs = finishedTask?.output
view.selectedTaskId = finishedTask?.id
} else if (finishedTask.status === TASK_STATUS_STRING.failed) {
showError(t('assistant', 'Your task with ID {id} has failed', { id: finishedTask.id }))
console.error('[assistant] Task failed', finishedTask)
view.outputs = null
}
// resolve(finishedTask)
view.loading = false
view.showSyncTaskRunning = false
}).catch(error => {
console.debug('[assistant] poll error', error)
})
}).catch(error => {
console.error(error)
})
}
}
})
view.$on('new-task', () => {
console.debug('[assistant] new task')
view.outputs = null
view.selectedTaskId = null
lastTask = null
})
view.$on('background-notify', () => {
cancelTaskPolling()
view.showScheduleConfirmation = true
Expand All @@ -457,6 +558,7 @@ export async function openAssistantTask(task, { isInsideViewer = undefined, acti
view.$destroy()
})
view.$on('back-to-assistant', () => {
cancelTaskPolling()
view.showScheduleConfirmation = false
view.showSyncTaskRunning = false
view.loading = false
Expand Down
5 changes: 1 addition & 4 deletions src/components/AssistantFormInputs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template>
<ChattyLLMInputForm v-if="selectedTaskTypeId === 'chatty-llm'" class="chatty-inputs" />
<ContextChatInputForm v-else-if="selectedTaskTypeId === 'context_chat:context_chat'"
<ContextChatInputForm v-if="selectedTaskTypeId === 'context_chat:context_chat'"
:inputs="inputs"
:task-type="selectedTaskType"
@update:inputs="$emit('update:inputs', $event)" />
Expand All @@ -26,15 +25,13 @@
</template>

<script>
import ChattyLLMInputForm from './ChattyLLM/ChattyLLMInputForm.vue'
import ContextChatInputForm from './ContextChat/ContextChatInputForm.vue'
import TaskTypeFields from './fields/TaskTypeFields.vue'

export default {
name: 'AssistantFormInputs',
components: {
ContextChatInputForm,
ChattyLLMInputForm,
TaskTypeFields,
},
props: {
Expand Down
Loading
Loading