From 16b491c6d2e475e94103a71617402670debaa7e5 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Wed, 5 Nov 2025 09:21:08 +0100
Subject: [PATCH 1/3]  fix(assistant): move assitant button to menubar

* Fixes: #7453
* Fixes: #7272
* Fixes: #7817

Also removes superfluous extra translate button from menubar.

Signed-off-by: Jonas <jonas@freesources.org>
---
 src/components/Editor.vue                     |   3 -
 .../AssistantAction.vue}                      | 273 +++++++-----------
 src/components/Menu/MenuBar.vue               |  13 +-
 src/components/Menu/TranslateButton.vue       |  41 ---
 src/components/Menu/entries.js                |  26 +-
 .../components/Menu/TranslateButton.spec.ts   |  59 ----
 6 files changed, 130 insertions(+), 285 deletions(-)
 rename src/components/{Assistant.vue => Menu/AssistantAction.vue} (67%)
 delete mode 100644 src/components/Menu/TranslateButton.vue
 delete mode 100644 src/tests/components/Menu/TranslateButton.spec.ts

diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 7e8d08c63fd..48d9f39a05e 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -71,7 +71,6 @@
 			:sync-error="syncError"
 			:has-connection-issue="requireReconnect"
 			@reconnect="reconnect" />
-		<Assistant v-if="editor" />
 		<Translate
 			:show="translateModal"
 			:content="translateContent"
@@ -121,7 +120,6 @@ import markdownit from './../markdownit/index.js'
 import isMobile from './../mixins/isMobile.js'
 import AttachmentResolver from './../services/AttachmentResolver.js'
 import createSyncServiceProvider from './../services/SyncServiceProvider.js'
-import Assistant from './Assistant.vue'
 import CollisionResolveDialog from './CollisionResolveDialog.vue'
 import ContentContainer from './Editor/ContentContainer.vue'
 import DocumentStatus from './Editor/DocumentStatus.vue'
@@ -146,7 +144,6 @@ export default defineComponent({
 		MenuBar,
 		Reader: () => import(/* webpackChunkName: "editor" */ './Reader.vue'),
 		Status,
-		Assistant,
 		Translate,
 		SuggestionsBar,
 	},
diff --git a/src/components/Assistant.vue b/src/components/Menu/AssistantAction.vue
similarity index 67%
rename from src/components/Assistant.vue
rename to src/components/Menu/AssistantAction.vue
index 49d4881b572..b0bf415b0a7 100644
--- a/src/components/Assistant.vue
+++ b/src/components/Menu/AssistantAction.vue
@@ -1,76 +1,81 @@
 <!--
-  - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div v-if="showAssistant" class="text-assistant">
-		<FloatingMenu
-			v-if="editor"
-			plugin-key="assistantMenu"
-			:editor="editor"
-			:tippy-options="floatingOptions()"
-			:should-show="floatingShow"
-			class="floating-menu"
-			data-cy="assistantMenu">
-			<NcActions :title="t('text', 'Nextcloud Assistant')" :type="'secondary'">
+	<div class="assistant-action">
+		<NcActions
+			class="entry-action entry-action__assistant"
+			:title="actionEntry.label"
+			:aria-label="actionEntry.label"
+			:container="menuIDSelector"
+			:data-text-action-entry="actionEntry.key"
+			:name="actionEntry.label"
+			:open="menuOpen"
+			force-menu
+			@update:open="
+				(open) => {
+					menuOpen = menuOpen || open
+				}
+			">
+			<template #icon>
+				<NcAssistantIcon :size="20" class="assistant-icon" />
+			</template>
+			<NcActionButton
+				v-for="type in taskTypes"
+				:key="type.id"
+				close-after-click
+				@click="openAssistantForm(type.id)">
 				<template #icon>
-					<CreationOutlineIcon :size="20" class="icon" />
+					<PencilOutlineIcon
+						v-if="type.id == 'core:text2text'"
+						:size="20" />
+					<FormatHeader1
+						v-else-if="type.id == 'core:text2text:headline'"
+						:size="20" />
+					<Shuffle
+						v-else-if="type.id == 'core:text2text:reformulation'"
+						:size="20" />
+					<TextShort
+						v-else-if="type.id == 'core:text2text:summary'"
+						:size="20" />
+					<NcAssistantIcon v-else />
 				</template>
-				<NcActionButton
-					v-for="type in taskTypes"
-					:key="type.id"
-					close-after-click
-					@click="openAssistantForm(type.id)">
-					<template #icon>
-						<PencilOutlineIcon
-							v-if="type.id == 'core:text2text'"
-							:size="20" />
-						<FormatHeader1
-							v-else-if="type.id == 'core:text2text:headline'"
-							:size="20" />
-						<Shuffle
-							v-else-if="type.id == 'core:text2text:reformulation'"
-							:size="20" />
-						<TextShort
-							v-else-if="type.id == 'core:text2text:summary'"
-							:size="20" />
-						<CreationOutlineIcon v-else />
-					</template>
-					{{ type.name }}
-				</NcActionButton>
-				<NcActionButton
-					v-if="canTranslate"
-					data-cy="open-translate"
-					close-after-click
-					@click="openTranslateDialog">
-					<template #icon>
-						<TranslateVariant :size="20" />
-					</template>
-					{{ t('text', 'Translate') }}
-				</NcActionButton>
-				<NcActionSeparator />
-				<NcActionButton
-					:disabled="tasks.length < 1"
-					close-after-click
-					@click="showTaskList = true">
-					<template #icon>
-						<CreationOutlineIcon :size="20" />
-					</template>
-					{{ t('text', 'Show assistant results') }}
-				</NcActionButton>
-			</NcActions>
-			<component
-				:is="badgeStateIcon"
-				v-if="badgeStateIcon"
-				:size="16"
-				class="floating-menu--badge" />
-		</FloatingMenu>
+				{{ type.name }}
+			</NcActionButton>
+			<NcActionButton
+				v-if="canTranslate"
+				data-cy="open-translate"
+				close-after-click
+				@click="openTranslateDialog">
+				<template #icon>
+					<TranslateVariant :size="20" />
+				</template>
+				{{ t('text', 'Translate') }}
+			</NcActionButton>
+			<NcActionSeparator />
+			<NcActionButton
+				:disabled="tasks.length < 1"
+				close-after-click
+				@click="showTaskList = true">
+				<template #icon>
+					<NcAssistantIcon :size="20" class="assistant-icon" />
+				</template>
+				{{ t('text', 'Show assistant results') }}
+			</NcActionButton>
+		</NcActions>
+		<component
+			:is="badgeStateIcon"
+			v-if="badgeStateIcon"
+			fill-color="var(--color-text-maxcontrast)"
+			:size="16"
+			class="assistant-action--badge" />
 
 		<NcModal :show.sync="showTaskList" :name="t('text', 'Assistant results')">
 			<div class="task-list">
 				<h4 v-if="tasks.length > 0">
 					<span class="assistant-bubble">
-						<CreationOutlineIcon :size="16" class="icon" />
+						<NcAssistantIcon :size="20" class="assistant-icon" />
 						<span>{{ t('text', 'Nextcloud Assistant') }}</span>
 					</span>
 				</h4>
@@ -115,7 +120,9 @@
 								:title="task.output.output"
 								@click.stop="() => openResult(task)">
 								<template #icon>
-									<CreationOutlineIcon :size="20" />
+									<NcAssistantIcon
+										:size="20"
+										class="assistant-icon" />
 								</template>
 								{{ t('text', 'Show result') }}
 							</NcActionButton>
@@ -141,6 +148,7 @@
 		</NcModal>
 	</div>
 </template>
+
 <script>
 import axios from '@nextcloud/axios'
 import { showError, showSuccess } from '@nextcloud/dialogs'
@@ -151,15 +159,13 @@ import { generateOcsUrl } from '@nextcloud/router'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 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 NcModal from '@nextcloud/vue/components/NcModal'
-import { posToDOMRect } from '@tiptap/core'
-import { FloatingMenu } from '@tiptap/vue-2'
 import ErrorOutlineIcon from 'vue-material-design-icons/AlertCircleOutline.vue'
 import CheckCircleOutlineIcon from 'vue-material-design-icons/CheckCircleOutline.vue'
 import ClipboardTextOutlineIcon from 'vue-material-design-icons/ClipboardTextOutline.vue'
 import ClockOutline from 'vue-material-design-icons/ClockOutline.vue'
-import CreationOutlineIcon from 'vue-material-design-icons/CreationOutline.vue'
 import FormatHeader1 from 'vue-material-design-icons/FormatHeader1.vue'
 import PencilOutlineIcon from 'vue-material-design-icons/PencilOutline.vue'
 import Shuffle from 'vue-material-design-icons/Shuffle.vue'
@@ -167,15 +173,12 @@ import TextBoxPlusOutlineIcon from 'vue-material-design-icons/TextBoxPlusOutline
 import TextShort from 'vue-material-design-icons/TextShort.vue'
 import TranslateVariant from 'vue-material-design-icons/Translate.vue'
 import DeleteOutlineIcon from 'vue-material-design-icons/TrashCanOutline.vue'
-import { useEditor } from '../composables/useEditor.ts'
-import { useEditorFlags } from '../composables/useEditorFlags.ts'
-import markdownit from '../markdownit/index.js'
-import shouldInterpretAsMarkdown from '../markdownit/shouldInterpretAsMarkdown.js'
-import { useFileMixin } from './Editor.provider.ts'
-
-const limitInRange = (num, min, max) => {
-	return Math.min(Math.max(parseInt(num), parseInt(min)), parseInt(max))
-}
+import { useEditor } from '../../composables/useEditor.ts'
+import markdownit from '../../markdownit/index.js'
+import shouldInterpretAsMarkdown from '../../markdownit/shouldInterpretAsMarkdown.js'
+import { useFileMixin } from '../Editor.provider.ts'
+import { BaseActionEntry } from './BaseActionEntry.js'
+import { useMenuIDMixin } from './MenuBar.provider.js'
 
 // https://github.com/nextcloud/server/blob/master/lib/public/TaskProcessing/Task.php#L366-L371
 const STATUS_FAILED = 'STATUS_FAILED'
@@ -185,11 +188,10 @@ const STATUS_SCHEDULED = 'STATUS_SCHEDULED'
 const STATUS_UNKNOWN = 'STATUS_UNKNOWN'
 
 export default {
-	name: 'Assistant',
+	name: 'AssistantAction',
 	components: {
-		FloatingMenu,
 		ErrorOutlineIcon,
-		CreationOutlineIcon,
+		NcAssistantIcon,
 		ClockOutline,
 		CheckCircleOutlineIcon,
 		DeleteOutlineIcon,
@@ -206,14 +208,15 @@ export default {
 		NcListItem,
 		NcModal,
 	},
-	mixins: [useFileMixin],
+	extends: BaseActionEntry,
+	mixins: [useFileMixin, useMenuIDMixin],
 	setup() {
 		const { editor } = useEditor()
-		const { isPublic, isRichWorkspace } = useEditorFlags()
-		return { editor, isPublic, isRichWorkspace }
+		return { editor }
 	},
 	data() {
 		return {
+			menuOpen: false,
 			taskTypes: OCP.InitialState.loadState('text', 'taskprocessing'),
 			selection: '',
 			tasks: [],
@@ -230,13 +233,6 @@ export default {
 		}
 	},
 	computed: {
-		showAssistant() {
-			return (
-				!this.isRichWorkspace
-				&& !this.isPublic
-				&& window.OCA.Assistant?.openAssistantForm
-			)
-		},
 		identifier() {
 			return 'text-file:' + this.$file.fileId
 		},
@@ -267,19 +263,11 @@ export default {
 		},
 	},
 	beforeMount() {
-		if (!this.showAssistant) {
-			return
-		}
-
 		this.editor.on('selectionUpdate', this.onSelection)
 		this.fetchTasks()
 		subscribe('notifications:notification:received', this.checkNotification)
 	},
 	beforeDestroy() {
-		if (!this.showAssistant) {
-			return
-		}
-
 		this.editor.off('selectionUpdate', this.onSelection)
 		unsubscribe('notifications:notification:received', this.checkNotification)
 	},
@@ -328,7 +316,7 @@ export default {
 				closeOnResult: false,
 				actionButtons: [
 					{
-						type: 'primary',
+						variant: 'primary',
 						title: t('text', 'Insert result'),
 						label: t('text', 'Insert result'),
 						onClick: (lastTask) => {
@@ -341,17 +329,22 @@ export default {
 			})
 		},
 		openTranslateDialog() {
+			let selectAll = false
 			if (!this.selection.trim().length) {
 				this.editor.commands.selectAll()
+				selectAll = true
 			}
 			emit('text:translate-modal:show', { content: this.selection || '' })
+			if (selectAll) {
+				this.editor.commands.setTextSelection(0)
+			}
 		},
 		async openResult(task) {
 			window.OCA.Assistant.openAssistantTask(task, {
 				isInsideViewer: true,
 				actionButtons: [
 					{
-						type: 'primary',
+						variant: 'primary',
 						title: t('text', 'Insert result'),
 						label: t('text', 'Insert result'),
 						onClick: (lastTask) => {
@@ -390,69 +383,14 @@ export default {
 				this.$delete(this.tasks, taskIndex)
 			}
 		},
-		floatingOptions() {
-			const buttonSize = 34
-			const topSpacing = 0
-			const bottomSpacing = 50 + 22
-			return {
-				placement: 'right',
-				getReferenceClientRect: () => {
-					const editorRect = this.$parent.$el
-						.querySelector('.ProseMirror')
-						.getBoundingClientRect()
-					const pos = posToDOMRect(
-						this.editor.view,
-						this.editor.state.selection.from,
-						this.editor.state.selection.to,
-					)
-					let rightSpacing = 0
-
-					if (editorRect.width < 890) {
-						rightSpacing = 66
-					}
-
-					return {
-						...pos,
-						width: editorRect.width - rightSpacing,
-						height: limitInRange(
-							pos.height,
-							buttonSize,
-							window.innerHeight,
-						),
-						top: limitInRange(
-							pos.top,
-							topSpacing,
-							window.innerHeight - bottomSpacing,
-						),
-						left: editorRect.left,
-						right: editorRect.right,
-						bottom:
-							limitInRange(
-								pos.top + buttonSize,
-								bottomSpacing,
-								window.innerHeight - topSpacing,
-							) + 22,
-					}
-				},
-			}
-		},
-		floatingShow() {
-			return true
-		},
 		t,
 	},
 }
 </script>
 
 <style scoped lang="scss">
-.text-assistant {
-	position: fixed;
-	top: calc(2 * var(--header-height));
-	right: 0;
-	margin: calc(var(--default-grid-baseline) * 3);
-	overflow: auto;
-	width: 250px;
-	max-height: 200px;
+.assistant-action {
+	position: relative;
 }
 
 .task-list {
@@ -470,13 +408,11 @@ h4 {
 .assistant-bubble {
 	display: flex;
 	gap: 8px;
-	background-color: var(--color-primary-element-light);
-	border-radius: var(--border-radius-rounded);
 	padding: 2px 8px;
-
-	.icon {
-		color: var(--color-primary);
-	}
+	background: var(--color-main-text);
+	background-image: var(--color-element-assistant-icon);
+	color: transparent;
+	background-clip: text;
 }
 
 ul {
@@ -492,13 +428,16 @@ ul {
 	}
 }
 
-.floating-menu {
-	position: relative;
+.assistant-action--badge {
+	position: absolute;
+	bottom: -2px;
+	right: -2px;
+}
 
-	&--badge {
-		position: absolute;
-		bottom: -2px;
-		right: -2px;
+:deep(.assistant-icon) {
+	svg {
+		// Temporary fix for icon size inconsistency
+		max-width: 20px;
 	}
 }
 
diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index 76f35ca71aa..5d2be4bb1f3 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -51,7 +51,6 @@
 				:force-enabled="true"
 				@click="activeMenuEntry = 'remain'">
 				<template #lastAction="{ visible }">
-					<TranslateButton />
 					<WidthToggle />
 					<ActionFormattingHelp @click="showHelp" />
 					<NcActionSeparator />
@@ -80,10 +79,9 @@ import ActionFormattingHelp from './ActionFormattingHelp.vue'
 import ActionList from './ActionList.vue'
 import ActionSingle from './ActionSingle.vue'
 import CharacterCount from './CharacterCount.vue'
-import { MenuEntries, ReadOnlyDoneEntries } from './entries.js'
+import { AssistantMenuEntries, MenuEntries, ReadOnlyDoneEntries } from './entries.js'
 import { MENU_ID } from './MenuBar.provider.js'
 import ToolBarLogic from './ToolBarLogic.js'
-import TranslateButton from './TranslateButton.vue'
 import WidthToggle from './WidthToggle.vue'
 
 export default {
@@ -95,7 +93,6 @@ export default {
 		HelpModal,
 		NcActionSeparator,
 		CharacterCount,
-		TranslateButton,
 		WidthToggle,
 	},
 	extends: ToolBarLogic,
@@ -124,17 +121,19 @@ export default {
 
 	setup() {
 		const editor = useEditor()
-		const { isRichEditor, isRichWorkspace } = useEditorFlags()
+		const { isPublic, isRichEditor, isRichWorkspace } = useEditorFlags()
 		const menubar = ref()
 		const { width } = useElementSize(menubar)
-		return { editor, isRichEditor, isRichWorkspace, menubar, width }
+		return { editor, isPublic, isRichEditor, isRichWorkspace, menubar, width }
 	},
 
 	data() {
 		return {
 			entries: this.openReadOnly
 				? [...ReadOnlyDoneEntries, ...MenuEntries]
-				: [...MenuEntries],
+				: this.isPublic || this.isRichWorkSpace
+					? [...MenuEntries]
+					: [...MenuEntries, ...AssistantMenuEntries],
 			randomID: `menu-bar-${Math.ceil(Math.random() * 10000 + 500).toString(16)}`,
 			displayHelp: false,
 			isReady: false,
diff --git a/src/components/Menu/TranslateButton.vue b/src/components/Menu/TranslateButton.vue
deleted file mode 100644
index 85a0dc90444..00000000000
--- a/src/components/Menu/TranslateButton.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<template>
-	<NcActionButton v-if="canTranslate" close-after-click @click="showTranslate">
-		<template #icon>
-			<TranslateVariant />
-		</template>
-		{{ t('text', 'Translate') }}
-	</NcActionButton>
-</template>
-
-<script setup>
-import { emit } from '@nextcloud/event-bus'
-import { loadState } from '@nextcloud/initial-state'
-import { t } from '@nextcloud/l10n'
-import NcActionButton from '@nextcloud/vue/components/NcActionButton'
-import { useEditor } from '../../composables/useEditor.ts'
-import { TranslateVariant } from '../icons.js'
-
-const { editor } = useEditor()
-const languages = loadState('text', 'translation_languages', {})
-console.debug(languages)
-const canTranslate = Boolean(languages.from?.length)
-
-const showTranslate = () => {
-	const {
-		commands,
-		view: { state },
-	} = editor.value
-	const { from, to } = state.selection
-	let selectedText = state.doc.textBetween(from, to, ' ')
-	if (!selectedText.trim().length) {
-		commands.selectAll()
-		selectedText = state.doc.textContent
-	}
-	emit('text:translate-modal:show', { content: selectedText })
-}
-</script>
diff --git a/src/components/Menu/entries.js b/src/components/Menu/entries.js
index 1d93865b608..58b5713a348 100644
--- a/src/components/Menu/entries.js
+++ b/src/components/Menu/entries.js
@@ -39,6 +39,7 @@ import {
 } from '../icons.js'
 import ActionAttachmentUpload from './ActionAttachmentUpload.vue'
 import ActionInsertLink from './ActionInsertLink.vue'
+import AssistantAction from './AssistantAction.vue'
 import EmojiPickerAction from './EmojiPickerAction.vue'
 
 import { t } from '@nextcloud/l10n'
@@ -86,7 +87,7 @@ export const MenuEntries = [
 		keyModifiers: [MODIFIERS.Mod],
 		icon: Undo,
 		action: (command) => command.undo(),
-		priority: 7,
+		priority: 8,
 	},
 	{
 		key: 'redo',
@@ -95,7 +96,7 @@ export const MenuEntries = [
 		keyModifiers: [MODIFIERS.Mod],
 		icon: Redo,
 		action: (command) => command.redo(),
-		priority: 10,
+		priority: 11,
 	},
 	{
 		key: 'headings',
@@ -204,7 +205,7 @@ export const MenuEntries = [
 		action: (command) => {
 			return command.toggleBold()
 		},
-		priority: 8,
+		priority: 9,
 	},
 	{
 		key: 'italic',
@@ -216,7 +217,7 @@ export const MenuEntries = [
 		action: (command) => {
 			return command.toggleItalic()
 		},
-		priority: 9,
+		priority: 10,
 	},
 	{
 		key: 'underline',
@@ -228,7 +229,7 @@ export const MenuEntries = [
 		action: (command) => {
 			return command.toggleUnderline()
 		},
-		priority: 11,
+		priority: 12,
 	},
 	{
 		key: 'strikethrough',
@@ -240,7 +241,7 @@ export const MenuEntries = [
 		action: (command) => {
 			return command.toggleStrike()
 		},
-		priority: 12,
+		priority: 13,
 	},
 	{
 		key: 'lists',
@@ -393,7 +394,7 @@ export const MenuEntries = [
 		action: (command) => {
 			return command.insertTable()
 		},
-		priority: 13,
+		priority: 14,
 	},
 	{
 		key: 'details',
@@ -403,7 +404,7 @@ export const MenuEntries = [
 		action: (command) => {
 			return command.toggleDetails()
 		},
-		priority: 14,
+		priority: 15,
 	},
 	{
 		key: 'insert-link',
@@ -436,3 +437,12 @@ if (!isMobileDevice) {
 		priority: 6,
 	})
 }
+
+export const AssistantMenuEntries = [
+	{
+		key: 'assistant',
+		label: t('text', 'Nextcloud Assistant'),
+		component: AssistantAction,
+		priority: 7,
+	},
+]
diff --git a/src/tests/components/Menu/TranslateButton.spec.ts b/src/tests/components/Menu/TranslateButton.spec.ts
deleted file mode 100644
index fda320599b7..00000000000
--- a/src/tests/components/Menu/TranslateButton.spec.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { subscribe } from '@nextcloud/event-bus'
-import { loadState } from '@nextcloud/initial-state'
-import type { Editor } from '@tiptap/core'
-import { mount } from '@vue/test-utils'
-import { beforeEach, expect, test, vi } from 'vitest'
-import { nextTick, shallowRef } from 'vue'
-import TranslateButton from '../../../components/Menu/TranslateButton.vue'
-import { editorKey } from '../../../composables/useEditor'
-import Heading from '../../../nodes/Heading.js'
-import createCustomEditor from '../../testHelpers/createCustomEditor'
-
-const text = 'Level 1 heading'
-const content = `<h1>${text}</h1>`
-
-const createEditor = (content = '') => createCustomEditor(content, [Heading])
-const mountWithEditor = (editor: Editor) => {
-	return mount(TranslateButton, {
-		provide: {
-			[editorKey as symbol]: shallowRef(editor),
-		},
-	})
-}
-
-beforeEach(() => {
-	vi.mock('@nextcloud/initial-state')
-})
-
-test('does not render without state', async () => {
-	vi.mocked(loadState).mockReturnValue({ from: [], to: [] })
-	const editor = createEditor(content)
-	const wrapper = mountWithEditor(editor)
-	await nextTick()
-	expect(wrapper.find('button').exists()).toBe(false)
-})
-
-test('does render with translations', async () => {
-	vi.mocked(loadState).mockReturnValue({ from: ['en'], to: ['fr'] })
-	const editor = createEditor(content)
-	const wrapper = mountWithEditor(editor)
-	await nextTick()
-	expect(wrapper.find('button').exists()).toBe(true)
-})
-
-test('emits the full content when clicked', async () => {
-	vi.mocked(loadState).mockReturnValue({ from: ['en'], to: ['fr'] })
-	const listen = vi.fn()
-	subscribe('text:translate-modal:show', listen)
-	const editor = createEditor(content)
-	const wrapper = mountWithEditor(editor)
-	await nextTick()
-	wrapper.find('button').trigger('click')
-	await nextTick()
-	expect(listen).toHaveBeenCalledWith({ content: text })
-})

From 4755149c9826ca433ef2a7da2f410ccae1f6a497 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Sat, 1 Nov 2025 23:31:12 +0100
Subject: [PATCH 2/3] test(cy): Adjust assistant cypress tests

Signed-off-by: Jonas <jonas@freesources.org>
---
 cypress/e2e/Assistant.spec.js | 38 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/cypress/e2e/Assistant.spec.js b/cypress/e2e/Assistant.spec.js
index 4011cd9db14..6f3f7bf032d 100644
--- a/cypress/e2e/Assistant.spec.js
+++ b/cypress/e2e/Assistant.spec.js
@@ -27,22 +27,13 @@ describe('Assistant', () => {
 
 		cy.getContent().click({ force: true })
 
-		cy.get('[data-cy="assistantMenu"]').should('be.visible')
-
-		cy.get('[data-cy="assistantMenu"]').click()
-
-		cy.get('.action-item__popper ul')
-			.children()
-			.should(($children) => {
-				const entries = $children
-					.find('button')
-					.map((i, el) => el.innerText)
-					.get()
-				expect(entries.length).to.be.greaterThan(0)
-				expect('Free text to text prompt').to.be.oneOf(entries)
-				expect('Translate').to.be.oneOf(entries)
-				expect('Show assistant results').to.be.oneOf(entries)
-			})
+		cy.getActionEntry('assistant').should('be.visible')
+
+		cy.getActionEntry('assistant').click()
+
+		cy.get('.action-button').contains('Free text to text prompt')
+		cy.get('.action-button').contains('Translate')
+		cy.get('.action-button').contains('Show assistant results')
 	})
 
 	it('Send free prompt request', () => {
@@ -52,10 +43,8 @@ describe('Assistant', () => {
 		cy.openFile(fileName, { force: true })
 
 		cy.getContent().click({ force: true })
-		cy.get('[data-cy="assistantMenu"]').click()
-		cy.get('.action-item__popper li')
-			.contains('Free text to text prompt')
-			.click()
+		cy.getActionEntry('assistant').click()
+		cy.get('.action-button').contains('Free text to text prompt').click()
 
 		cy.get('.assistant-modal--content #input-input').should('be.visible')
 
@@ -72,8 +61,8 @@ describe('Assistant', () => {
 		)
 
 		cy.get('.assistant-modal--content .close-button').click()
-		cy.get('[data-cy="assistantMenu"]').click()
-		cy.get('.action-item__popper ul li').last().click()
+		cy.getActionEntry('assistant').click()
+		cy.get('.action-button').contains('Show assistant results').click()
 
 		cy.get('.modal-container__content .task-list')
 			.should('be.visible')
@@ -86,9 +75,8 @@ describe('Assistant', () => {
 		})
 		cy.openFile(fileName, { force: true })
 
-		cy.getContent().click({ force: true })
-		cy.get('[data-cy="assistantMenu"]').click()
-		cy.get('[data-cy="open-translate"]').should('be.visible').click()
+		cy.getActionEntry('assistant').click()
+		cy.get('.action-button').contains('Translate').click()
 
 		// eslint-disable-next-line cypress/no-unnecessary-waiting
 		cy.wait(1000)

From 7f0a0e93b94e13a9702e38b62f1311dd26614a2d Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Mon, 3 Nov 2025 12:45:27 +0100
Subject: [PATCH 3/3] fix(MenuBar): display as much entries as `iconsLimit`
 allows

So far, we got all entries with priority smaller or equals to
`iconsLimit`. Since entries can be conditional (emoji picker,
assistant), this led to less entries in `visiblEntries` than wanted.
Since we still want to keep the order of entries from `entries.js` we
cannot just sort them by priority and need this slightly more complex
filter logic.

Signed-off-by: Jonas <jonas@freesources.org>
---
 src/components/Menu/MenuBar.vue | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index 5d2be4bb1f3..aef44644d25 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -141,18 +141,23 @@ export default {
 		}
 	},
 	computed: {
+		visibleEntryKeys() {
+			// if entry has no priority, we assume it always will be visible (priority: 0)
+			return this.entries
+				.toSorted((a, b) => (a.priority ?? 0) - (b.priority ?? 0))
+				.map((e) => e.key)
+				.slice(0, this.iconsLimit)
+		},
 		visibleEntries() {
-			const list = this.entries.filter(({ priority }) => {
-				// if entry has no priority, we assume it always will be visible
-				return priority === undefined || priority <= this.iconsLimit
+			// only entries from `visibleEntryKeys but in original order
+			return this.entries.filter((entry) => {
+				return this.visibleEntryKeys.includes(entry.key)
 			})
-
-			return list
 		},
 		hiddenEntries() {
-			const remainingEntries = this.entries.filter(({ priority }) => {
+			const remainingEntries = this.entries.filter((entry) => {
 				// reverse logic from visibleEntries
-				return priority !== undefined && priority > this.iconsLimit
+				return !this.visibleEntryKeys.includes(entry.key)
 			})
 			const entries = remainingEntries.reduce((acc, entry, index) => {
 				// If entry has children, merge them into list. Otherwise keep entry itself.