Skip to content

Prevent opening the assistant dialog multiple times #523

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

Open
julien-nc wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −3
Open

Prevent opening the assistant dialog multiple times #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions src/assistant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import Aura from '@primeuix/themes/aura'

window.assistantPollTimerId = null

// TODO add param to lock on specific task type

/**
* Creates an assistant modal and return a promise which provides the result
*
Expand Down Expand Up @@ -63,6 +61,12 @@ export async function openAssistantForm({
const selectedTaskTypeId = taskType ?? (await getLastSelectedTaskType())?.data

return new Promise((resolve, reject) => {
if (OCA.Assistant.isAssistantDialogOpen) {
reject(new Error('Assistant dialog is already open'))
return
}
OCA.Assistant.isAssistantDialogOpen = true

let modalMountPoint
const content = document.querySelector('#content') ?? document.querySelector('#content-vue')

Expand Down Expand Up @@ -121,6 +125,7 @@ export async function openAssistantForm({
modalMountPoint.addEventListener('cancel', () => {
cancelTaskPolling()
app.unmount()
OCA.Assistant.isAssistantDialogOpen = false
reject(new Error('User cancellation'))
})
const syncSubmit = (inputs, taskTypeId, newTaskCustomId = '') => {
Expand All @@ -144,6 +149,7 @@ export async function openAssistantForm({
if (finishedTask.status === TASK_STATUS_STRING.successful) {
if (closeOnResult) {
app.unmount()
OCA.Assistant.isAssistantDialogOpen = false
} else {
view.outputs = finishedTask?.output
}
Expand Down Expand Up @@ -305,6 +311,7 @@ export async function openAssistantForm({
data.detail.button.onClick(lastTask)
}
app.unmount()
OCA.Assistant.isAssistantDialogOpen = false
})
})
}
Expand Down Expand Up @@ -487,7 +494,9 @@ export function handleNotification(event) {
async function showAssistantTaskResult(taskId) {
getTask(taskId).then(response => {
console.debug('showing results for task', response.data?.ocs?.data?.task)
openAssistantTask(response.data?.ocs?.data?.task, {})
openAssistantTask(response.data?.ocs?.data?.task, {}).catch(error => {
console.error(error.message)
})
}).catch(error => {
if (error.response?.status === 401) {
showError(t('assistant', 'Please log in to view the task result'))
Expand Down Expand Up @@ -516,6 +525,11 @@ export async function openAssistantTask(
actionButtons = undefined,
mountPoint = null,
} = {}) {
if (OCA.Assistant.isAssistantDialogOpen) {
throw new Error('Assistant dialog is already open')
}
OCA.Assistant.isAssistantDialogOpen = true

const { createApp } = await import('vue')
const { default: AssistantTextProcessingModal } = await import('./components/AssistantTextProcessingModal.vue')

Expand Down Expand Up @@ -567,6 +581,7 @@ export async function openAssistantTask(
modalMountPoint.addEventListener('cancel', () => {
cancelTaskPolling()
app.unmount()
OCA.Assistant.isAssistantDialogOpen = false
})
modalMountPoint.addEventListener('submit', (data) => {
scheduleTask(task.appId, task.identifier ?? '', data.detail.selectedTaskTypeId, data.detail.inputs)
Expand All @@ -575,6 +590,7 @@ export async function openAssistantTask(
})
.catch(error => {
app.unmount()
OCA.Assistant.isAssistantDialogOpen = false
console.error('Assistant scheduling error', error)
showError(
t('assistant', 'Assistant failed to schedule your task')
Expand Down Expand Up @@ -754,6 +770,7 @@ export async function openAssistantTask(
data.detail.button.onClick(lastTask)
}
app.unmount()
OCA.Assistant.isAssistantDialogOpen = false
})
}

Expand Down
Loading