Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions src/components/Menu/AssistantAction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
close-after-click
@click="showTaskList = true">
<template #icon>
<NcAssistantIcon :size="20" class="assistant-icon" />
<NcLoadingIcon v-if="loading" :size="20" />
<NcAssistantIcon v-else :size="20" class="assistant-icon" />
</template>
{{ t('text', 'Show assistant results') }}
</NcActionButton>
Expand Down Expand Up @@ -161,6 +162,7 @@ import NcActions from '@nextcloud/vue/components/NcActions'
import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
import NcAssistantIcon from '@nextcloud/vue/components/NcAssistantIcon'
import NcListItem from '@nextcloud/vue/components/NcListItem'
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
import NcModal from '@nextcloud/vue/components/NcModal'
import ErrorOutlineIcon from 'vue-material-design-icons/AlertCircleOutline.vue'
import CheckCircleOutlineIcon from 'vue-material-design-icons/CheckCircleOutline.vue'
Expand Down Expand Up @@ -206,6 +208,7 @@ export default {
NcActionButton,
NcActionSeparator,
NcListItem,
NcLoadingIcon,
NcModal,
},
extends: BaseActionEntry,
Expand All @@ -217,9 +220,10 @@ export default {
data() {
return {
menuOpen: false,
taskTypes: OCP.InitialState.loadState('text', 'taskprocessing'),
taskTypes: loadState('text', 'taskprocessing', []),
selection: '',
tasks: [],
loading: false,

STATUS_FAILED,
STATUS_RUNNING,
Expand Down Expand Up @@ -262,9 +266,17 @@ export default {
return this.taskTypes.map((type) => type.id)
},
},
watch: {
async menuOpen(isOpen) {
if (isOpen && this.tasks.length === 0) {
this.loading = true
await this.fetchTasks()
this.loading = false
}
},
},
beforeMount() {
this.editor.on('selectionUpdate', this.onSelection)
this.fetchTasks()
subscribe('notifications:notification:received', this.checkNotification)
},
beforeDestroy() {
Expand Down
5 changes: 3 additions & 2 deletions src/components/Menu/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,12 @@ export default {

data() {
return {
entries: this.openReadOnly
entries: (this.openReadOnly
? [...ReadOnlyDoneEntries, ...MenuEntries]
: this.isPublic || this.isRichWorkspace
? [...MenuEntries]
: [...MenuEntries, ...AssistantMenuEntries],
: [...MenuEntries, ...AssistantMenuEntries]
).filter((entry) => !!entry),
randomID: `menu-bar-${Math.ceil(Math.random() * 10000 + 500).toString(16)}`,
displayHelp: false,
isReady: false,
Expand Down
18 changes: 11 additions & 7 deletions src/components/Menu/entries.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import ActionInsertLink from './ActionInsertLink.vue'
import AssistantAction from './AssistantAction.vue'
import EmojiPickerAction from './EmojiPickerAction.vue'

import { loadState } from '@nextcloud/initial-state'
import { t } from '@nextcloud/l10n'
import { isMobileDevice } from '../../helpers/isMobileDevice.js'
import { MODIFIERS } from './keys.js'
Expand Down Expand Up @@ -465,12 +466,15 @@ if (!isMobileDevice) {
})
}

// TODO: Disable in rich workspace
const hasAssistantTaskTypes = loadState('text', 'taskprocessing', []).length > 0

export const AssistantMenuEntries = [
{
key: 'assistant',
label: t('text', 'Nextcloud Assistant'),
component: AssistantAction,
priority: 7,
},
hasAssistantTaskTypes
? {
key: 'assistant',
label: t('text', 'Nextcloud Assistant'),
component: AssistantAction,
priority: 7,
}
: undefined,
]
Loading