From 8ecde5c698e5d3b47b17672ba2c392bb0eae9fac Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 10:46:58 +0100
Subject: [PATCH 001/100] Add too large chip

---
 src/locales/de.ts                                    |  1 +
 src/locales/en.ts                                    |  1 +
 src/locales/es.ts                                    |  1 +
 src/locales/uk.ts                                    |  1 +
 src/modules/feature/folder/file-table/FileStatus.vue | 12 +++++++++++-
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index ad128d1f45..99a0d67c6a 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -45,6 +45,7 @@ export default {
 	"common.file": "Datei",
 	"common.file.exceedsCollaboraEditableFileSize":
 		"Dokumente größer als {sizeInMb} können online nicht bearbeitet werden.",
+	"common.file.exceedsCollaboraEditableFileSize.short": "Online Bearbeitung nicht möglich",
 	"common.files": "Dateien",
 	"common.instructions.orderBy.arrowKeys": "Die Elemente dieser Liste können per Pfeiltaste verschoben werden.",
 	"common.labels.admin": "Admin(s)",
diff --git a/src/locales/en.ts b/src/locales/en.ts
index b9e6d8209c..b05e1b9d4a 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -43,6 +43,7 @@ export default {
 	"common.file.virusDetected.short": "Virus suspected",
 	"common.file": "file",
 	"common.file.exceedsCollaboraEditableFileSize": "Documents larger than {sizeInMb} cannot be edited online.",
+	"common.file.exceedsCollaboraEditableFileSize.short": "Online editing not possible",
 	"common.files": "files",
 	"common.instructions.orderBy.arrowKeys": "The items in this list can be moved using the arrow keys.",
 	"common.labels.admin": "",
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 5146a88b1b..bfda36e03d 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -45,6 +45,7 @@ export default {
 	"common.file": "Archivo",
 	"common.file.exceedsCollaboraEditableFileSize":
 		"Los documentos que superen los {sizeInMb} no se pueden editar en línea.",
+	"common.file.exceedsCollaboraEditableFileSize.short": "Edición en línea no posible",
 	"common.files": "Archivos",
 	"common.instructions.orderBy.arrowKeys": "Los elementos de esta lista se pueden mover con las teclas de flecha.",
 	"common.labels.admin": "Admin(s)",
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index 6827467be5..78841213f7 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -45,6 +45,7 @@ export default {
 	"common.file": "Файл",
 	"common.file.exceedsCollaboraEditableFileSize":
 		"Документи розміром більше {sizeInMb} не можуть бути оброблені онлайн.",
+	"common.file.exceedsCollaboraEditableFileSize.short": "Онлайн редагування неможливе",
 	"common.instructions.orderBy.arrowKeys": "Елементи цього списку можна переміщати за допомогою клавіш зі стрілками.",
 	"common.files": "Файли",
 	"common.labels.admin": "адміністратор(и)",
diff --git a/src/modules/feature/folder/file-table/FileStatus.vue b/src/modules/feature/folder/file-table/FileStatus.vue
index 598ba9b981..2d750da701 100644
--- a/src/modules/feature/folder/file-table/FileStatus.vue
+++ b/src/modules/feature/folder/file-table/FileStatus.vue
@@ -3,6 +3,15 @@
 		<span class="d-sr-only">{{ t("common.labels.status") }}</span>
 		{{ t("common.file.awaitingScan.short") }}
 	</InfoChip>
+	<InfoChip
+		v-if="exceedsCollaboraEditableFileSize"
+		class="ms-2"
+		:icon="mdiPencilOffOutline"
+		data-testid="file-status-exceeds-collabora-editable-file-size"
+	>
+		<span class="d-sr-only">{{ t("common.labels.status") }}</span>
+		{{ t("common.file.exceedsCollaboraEditableFileSize.short") }}
+	</InfoChip>
 	<WarningChip
 		v-if="isScanStatusWontCheck"
 		class="ms-2"
@@ -30,7 +39,7 @@ import {
 	isScanStatusPending as isScanStatusPendingFn,
 	isScanStatusWontCheck as isScanStatusWontCheckFn,
 } from "@/utils/fileHelper";
-import { mdiClockTimeFour, mdiEyeOffOutline } from "@icons/material";
+import { mdiClockTimeFour, mdiEyeOffOutline, mdiPencilOffOutline } from "@icons/material";
 import { ErrorChip, InfoChip, WarningChip } from "@ui-chip";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
@@ -47,4 +56,5 @@ const isScanStatusPending = computed(() => isScanStatusPendingFn(props.fileRecor
 const isScanStatusWontCheck = computed(() => isScanStatusWontCheckFn(props.fileRecord.previewStatus));
 const isScanStatusError = computed(() => isScanStatusErrorFn(props.fileRecord.previewStatus));
 const isScanStatusBlocked = computed(() => isScanStatusBlockedFn(props.fileRecord.securityCheckStatus));
+const exceedsCollaboraEditableFileSize = computed(() => props.fileRecord.exceedsCollaboraEditableFileSize);
 </script>

From fbec8646260d0ccccd7a152a8099b4ada22bbf00 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 10:47:16 +0100
Subject: [PATCH 002/100] Add crossed pencil icon

---
 src/components/icons/material/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/icons/material/index.ts b/src/components/icons/material/index.ts
index 6cff6d3128..2bd173f0f5 100644
--- a/src/components/icons/material/index.ts
+++ b/src/components/icons/material/index.ts
@@ -118,6 +118,7 @@ import {
 	mdiOpenInNew,
 	mdiPalette,
 	mdiPause,
+	mdiPencilOffOutline,
 	mdiPencilOutline,
 	mdiPencilPlusOutline,
 	mdiPhone,
@@ -279,6 +280,7 @@ export {
 	mdiOpenInNew,
 	mdiPalette,
 	mdiPause,
+	mdiPencilOffOutline,
 	mdiPencilOutline,
 	mdiPencilPlusOutline,
 	mdiPhone,

From 16db24f58ee8dd8de9a256c3d95fd849b19696e8 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 10:48:29 +0100
Subject: [PATCH 003/100] Add initial interaction handler

---
 .../folder/file-table/FileInteractionHandler.vue       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index ec969925ff..e65b994995 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -21,6 +21,7 @@ import {
 	isPreviewPossible,
 	isVideoMimeType,
 } from "@/utils/fileHelper";
+import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
@@ -40,7 +41,8 @@ const isInteractive = computed(
 		(isPreviewPossible(fileRecordItem.previewStatus) ||
 			isAudioMimeType(fileRecordItem.mimeType) ||
 			isVideoMimeType(fileRecordItem.mimeType) ||
-			isPdfMimeType(fileRecordItem.mimeType))
+			isPdfMimeType(fileRecordItem.mimeType) ||
+			(isCollaboraEnabled.value && fileRecordItem.isCollaboraEditable))
 );
 
 const handleClick = () => {
@@ -48,6 +50,7 @@ const handleClick = () => {
 	const isAudio = isAudioMimeType(fileRecordItem.mimeType);
 	const isVideo = isVideoMimeType(fileRecordItem.mimeType);
 	const isPdf = isPdfMimeType(fileRecordItem.mimeType);
+	const isCollabora = fileRecordItem.isCollaboraEditable;
 
 	if (isPdf) {
 		window.open(fileRecordItem.url, "_blank");
@@ -57,9 +60,14 @@ const handleClick = () => {
 		openAudioPlayerInLightbox();
 	} else if (isVideo) {
 		openVideoInLightbox();
+	} else if (isCollabora) {
+		// eslint-disable-next-line no-console
+		console.log("Open in Collabora");
 	}
 };
 
+const isCollaboraEnabled = computed(() => useEnvConfig().value.FEATURE_COLUMN_BOARD_COLLABORA_ENABLED);
+
 const openImageInLightbox = () => {
 	const previewUrl = convertDownloadToPreviewUrl(fileRecordItem.url);
 

From e18fc87e013f14b2265ce340bdcb193e33fd60d2 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 12:16:12 +0100
Subject: [PATCH 004/100] Move edit mode mapper

---
 .../mapper => util/board}/collabora-editor-mode.mapper.ts       | 0
 .../mapper => util/board}/collabora-editor-mode.mapper.unit.ts  | 0
 src/modules/util/board/index.ts                                 | 2 ++
 3 files changed, 2 insertions(+)
 rename src/modules/{feature/board-file-element/mapper => util/board}/collabora-editor-mode.mapper.ts (100%)
 rename src/modules/{feature/board-file-element/mapper => util/board}/collabora-editor-mode.mapper.unit.ts (100%)

diff --git a/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.ts b/src/modules/util/board/collabora-editor-mode.mapper.ts
similarity index 100%
rename from src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.ts
rename to src/modules/util/board/collabora-editor-mode.mapper.ts
diff --git a/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.unit.ts b/src/modules/util/board/collabora-editor-mode.mapper.unit.ts
similarity index 100%
rename from src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.unit.ts
rename to src/modules/util/board/collabora-editor-mode.mapper.unit.ts
diff --git a/src/modules/util/board/index.ts b/src/modules/util/board/index.ts
index 80486b8159..378c792853 100644
--- a/src/modules/util/board/index.ts
+++ b/src/modules/util/board/index.ts
@@ -1,4 +1,5 @@
 import { BOARD_IS_LIST_LAYOUT } from "./board-injection-tokens";
+import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
 import { useDragAndDrop } from "./dragAndDrop.composable";
 import {
 	type EditModePermissions,
@@ -17,6 +18,7 @@ export {
 	BOARD_IS_LIST_LAYOUT,
 	EditModePermissions,
 	extractDataAttribute,
+	mapEditBoardPermissionToEditorMode,
 	useCourseBoardEditMode,
 	useDragAndDrop,
 	useElementFocus,

From 82f6282596a78e9503ca3f6b016b7ba8f68ffd90 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 12:16:23 +0100
Subject: [PATCH 005/100] Cleanup

---
 src/modules/feature/board-file-element/mapper/index.ts | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/modules/feature/board-file-element/mapper/index.ts

diff --git a/src/modules/feature/board-file-element/mapper/index.ts b/src/modules/feature/board-file-element/mapper/index.ts
deleted file mode 100644
index d6cfa88701..0000000000
--- a/src/modules/feature/board-file-element/mapper/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./collabora-editor-mode.mapper";

From f736868b9d3296efead88a02f171ebf396477333 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 12:16:43 +0100
Subject: [PATCH 006/100] Adjust import

---
 src/modules/feature/board-file-element/FileContentElement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/feature/board-file-element/FileContentElement.vue b/src/modules/feature/board-file-element/FileContentElement.vue
index d6ef207ad7..e897dd83fa 100644
--- a/src/modules/feature/board-file-element/FileContentElement.vue
+++ b/src/modules/feature/board-file-element/FileContentElement.vue
@@ -57,7 +57,6 @@
 <script setup lang="ts">
 import { useFileAlerts } from "./content/alert/useFileAlerts.composable";
 import FileContent from "./content/FileContent.vue";
-import { mapEditBoardPermissionToEditorMode } from "./mapper";
 import { FileAlert } from "./shared/types/FileAlert.enum";
 import FileUpload from "./upload/FileUpload.vue";
 import { FileRecordParentType, PreviewWidth } from "@/fileStorageApi/v3";
@@ -70,6 +69,7 @@ import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { BoardMenuScope } from "@ui-board";
 import { KebabMenuActionDelete, KebabMenuActionMoveDown, KebabMenuActionMoveUp } from "@ui-kebab-menu";
+import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import { useDebounceFn } from "@vueuse/core";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";

From 262a65392fa04d188d457e55b518b1897e9b4ef1 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 12:17:00 +0100
Subject: [PATCH 007/100] Add collabora opening

---
 .../file-table/FileInteractionHandler.vue     | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index e65b994995..9a08f32151 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -21,10 +21,13 @@ import {
 	isPreviewPossible,
 	isVideoMimeType,
 } from "@/utils/fileHelper";
+import { useBoardPermissions } from "@data-board";
 import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
+import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
+import { useRouter } from "vue-router";
 
 const { fileRecordItem } = defineProps({
 	fileRecordItem: {
@@ -34,6 +37,8 @@ const { fileRecordItem } = defineProps({
 });
 
 const { t } = useI18n();
+const router = useRouter();
+const { hasEditPermission } = useBoardPermissions();
 
 const isInteractive = computed(
 	() =>
@@ -61,8 +66,7 @@ const handleClick = () => {
 	} else if (isVideo) {
 		openVideoInLightbox();
 	} else if (isCollabora) {
-		// eslint-disable-next-line no-console
-		console.log("Open in Collabora");
+		openCollabora();
 	}
 };
 
@@ -109,6 +113,22 @@ const openVideoInLightbox = () => {
 
 	open(options);
 };
+
+const openCollabora = () => {
+	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
+
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: fileRecordItem.id,
+		},
+		query: {
+			editorMode,
+		},
+	}).href;
+
+	window.open(url, "_blank");
+};
 </script>
 
 <style lang="scss" scoped>

From 08631c571ffa966ebbd832ec4089f1143124cb6b Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 12:42:51 +0100
Subject: [PATCH 008/100] Only one chip at a time

---
 src/modules/feature/folder/file-table/FileStatus.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/file-table/FileStatus.vue b/src/modules/feature/folder/file-table/FileStatus.vue
index 2d750da701..8cadeeec52 100644
--- a/src/modules/feature/folder/file-table/FileStatus.vue
+++ b/src/modules/feature/folder/file-table/FileStatus.vue
@@ -56,5 +56,7 @@ const isScanStatusPending = computed(() => isScanStatusPendingFn(props.fileRecor
 const isScanStatusWontCheck = computed(() => isScanStatusWontCheckFn(props.fileRecord.previewStatus));
 const isScanStatusError = computed(() => isScanStatusErrorFn(props.fileRecord.previewStatus));
 const isScanStatusBlocked = computed(() => isScanStatusBlockedFn(props.fileRecord.securityCheckStatus));
-const exceedsCollaboraEditableFileSize = computed(() => props.fileRecord.exceedsCollaboraEditableFileSize);
+const exceedsCollaboraEditableFileSize = computed(
+	() => props.fileRecord.exceedsCollaboraEditableFileSize && !isScanStatusBlocked.value
+);
 </script>

From bff0feedd2bba1c68a7dd170b60d165b886f6710 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 19 Nov 2025 16:28:55 +0100
Subject: [PATCH 009/100] Show updatef info

---
 src/locales/de.ts                                   |  1 +
 src/locales/en.ts                                   |  1 +
 src/locales/es.ts                                   |  1 +
 src/locales/uk.ts                                   |  1 +
 src/modules/feature/folder/file-table/FileTable.vue | 13 ++++++-------
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index 99a0d67c6a..dd2c3dcfaf 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -1988,6 +1988,7 @@ export default {
 	"pages.folder.title": "Ordner",
 	"pages.folder.columns.name": "Name",
 	"pages.folder.columns.createdat": "Erstellt am",
+	"pages.folder.columns.updatedat": "Zuletzt geändert",
 	"pages.folder.columns.size": "Größe",
 	"pages.folder.ariaLabels.menu": "Ordner Menü",
 	"pages.folder.ariaLabels.menu.action.edit": "Ordner umbenennen",
diff --git a/src/locales/en.ts b/src/locales/en.ts
index b05e1b9d4a..b3b00d0a78 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1954,6 +1954,7 @@ export default {
 	"pages.folder.title": "Folder",
 	"pages.folder.columns.name": "Name",
 	"pages.folder.columns.createdat": "Created on",
+	"pages.folder.columns.updatedat": "Last updated",
 	"pages.folder.columns.size": "Size",
 	"pages.folder.ariaLabels.menu": "Folder menu",
 	"pages.folder.ariaLabels.menu.action.edit": "Rename folder",
diff --git a/src/locales/es.ts b/src/locales/es.ts
index bfda36e03d..c83a737f44 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -2005,6 +2005,7 @@ export default {
 	"pages.folder.title": "Carpeta",
 	"pages.folder.columns.name": "Nombre",
 	"pages.folder.columns.createdat": "Creado el",
+	"pages.folder.columns.updatedat": "Última actualización",
 	"pages.folder.columns.size": "Talla",
 	"pages.folder.ariaLabels.menu": "Menú carpeta",
 	"pages.folder.ariaLabels.menu.action.edit": "Renombrar carpeta",
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index 78841213f7..c42f36f052 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -1975,6 +1975,7 @@ export default {
 	"pages.folder.title": "Папка",
 	"pages.folder.columns.name": "Ім'я",
 	"pages.folder.columns.createdat": "Створено на",
+	"pages.folder.columns.updatedat": "Останнє оновлення",
 	"pages.folder.columns.size": "Розмір",
 	"pages.folder.ariaLabels.menu": "Меню Папки",
 	"pages.folder.ariaLabels.menu.action.edit": "Перейменувати папку",
diff --git a/src/modules/feature/folder/file-table/FileTable.vue b/src/modules/feature/folder/file-table/FileTable.vue
index b7a21c6ab6..7e9b42d879 100644
--- a/src/modules/feature/folder/file-table/FileTable.vue
+++ b/src/modules/feature/folder/file-table/FileTable.vue
@@ -31,10 +31,10 @@
 						</span>
 					</FileInteractionHandler>
 				</template>
-				<template #[`item.createdAt`]="{ item }">
-					<span :data-testid="`created-at-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">{{
-						printDateFromStringUTC(item.createdAt)
-					}}</span>
+				<template #[`item.updatedAt`]="{ item }">
+					<span :data-testid="`updated-at-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">
+						{{ d(item.updatedAt) }}
+					</span>
 				</template>
 				<template #[`item.size`]="{ item }">
 					<span :data-testid="`size-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }"
@@ -116,7 +116,6 @@ import FileUploadProgress from "./FileUploadProgress.vue";
 import KebabMenuActionDeleteFiles from "./KebabMenuActionDeleteFiles.vue";
 import KebabMenuActionDownloadFiles from "./KebabMenuActionDownloadFiles.vue";
 import RenameFileDialog from "./RenameFileDialog.vue";
-import { printDateFromStringUTC } from "@/plugins/datetime";
 import { FileRecord } from "@/types/file/File";
 import { formatFileSize, getFileExtension, isScanStatusBlocked } from "@/utils/fileHelper";
 import { DataTable } from "@ui-data-table";
@@ -125,7 +124,7 @@ import { KebabMenu, KebabMenuActionRename } from "@ui-kebab-menu";
 import { computed, PropType, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
-const { t } = useI18n();
+const { t, d } = useI18n();
 
 const props = defineProps({
 	isLoading: {
@@ -168,7 +167,7 @@ const emit = defineEmits([
 const headers = [
 	{ title: "", key: "preview", sortable: false },
 	{ title: t("pages.folder.columns.name"), key: "name" },
-	{ title: t("pages.folder.columns.createdat"), key: "createdAt" },
+	{ title: t("pages.folder.columns.updatedat"), key: "updatedAt" },
 	{ title: t("pages.folder.columns.size"), key: "size" },
 	{
 		title: t("ui.actionMenu.actions"),

From c7fe920b320832ba421c6d3ecf1591944a4db424 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 10:21:03 +0100
Subject: [PATCH 010/100] Generate file storage API

---
 src/fileStorageApi/v3/models/file-record-response.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/fileStorageApi/v3/models/file-record-response.ts b/src/fileStorageApi/v3/models/file-record-response.ts
index 760bb220ff..a3dbeccc6c 100644
--- a/src/fileStorageApi/v3/models/file-record-response.ts
+++ b/src/fileStorageApi/v3/models/file-record-response.ts
@@ -119,6 +119,12 @@ export interface FileRecordResponse {
      * @memberof FileRecordResponse
      */
     updatedAt?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof FileRecordResponse
+     */
+    contentLastModifiedAt?: string;
 }
 
 

From 0ce39352359764e20211e191924c25972a379bda Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 10:21:27 +0100
Subject: [PATCH 011/100] Show content last modified info

---
 src/modules/feature/folder/file-table/FileTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/file-table/FileTable.vue b/src/modules/feature/folder/file-table/FileTable.vue
index 7e9b42d879..1469115a6f 100644
--- a/src/modules/feature/folder/file-table/FileTable.vue
+++ b/src/modules/feature/folder/file-table/FileTable.vue
@@ -33,7 +33,7 @@
 				</template>
 				<template #[`item.updatedAt`]="{ item }">
 					<span :data-testid="`updated-at-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">
-						{{ d(item.updatedAt) }}
+						{{ d(item.contentLastModifiedAt) }}
 					</span>
 				</template>
 				<template #[`item.size`]="{ item }">

From 36832aa2642353420d7d11985411aca009780e91 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 11:07:34 +0100
Subject: [PATCH 012/100] Adjust chip icons and text color

---
 src/components/icons/material/index.ts               | 6 ++++++
 src/modules/feature/folder/file-table/FileStatus.vue | 9 +++++++--
 src/modules/ui/chip/BaseChip.vue                     | 7 ++++++-
 src/modules/ui/chip/ErrorChip.vue                    | 4 ++--
 src/modules/ui/chip/InfoChip.vue                     | 4 ++--
 src/modules/ui/chip/WarningChip.vue                  | 4 ++--
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/components/icons/material/index.ts b/src/components/icons/material/index.ts
index 2bd173f0f5..ce0761e3a8 100644
--- a/src/components/icons/material/index.ts
+++ b/src/components/icons/material/index.ts
@@ -18,6 +18,7 @@ import {
 	mdiAccountSwitchOutline,
 	mdiAlert,
 	mdiAlertCircle,
+	mdiAlertCircleOutline,
 	mdiApplicationBracketsOutline,
 	mdiArchiveOutline,
 	mdiArrowCollapse,
@@ -48,6 +49,7 @@ import {
 	mdiCircleOutline,
 	mdiClockOutline,
 	mdiClockTimeFour,
+	mdiClockTimeFourOutline,
 	mdiClose,
 	mdiCloseCircle,
 	mdiCloudDownload,
@@ -94,6 +96,7 @@ import {
 	mdiImageOff,
 	mdiImport,
 	mdiInformation,
+	mdiInformationOutline,
 	mdiKeyboardReturn,
 	mdiLightbulbOnOutline,
 	mdiLink,
@@ -180,6 +183,7 @@ export {
 	mdiAccountSwitchOutline,
 	mdiAlert,
 	mdiAlertCircle,
+	mdiAlertCircleOutline,
 	mdiApplicationBracketsOutline,
 	mdiArchiveOutline,
 	mdiArrowCollapse,
@@ -210,6 +214,7 @@ export {
 	mdiCircleOutline,
 	mdiClockOutline,
 	mdiClockTimeFour,
+	mdiClockTimeFourOutline,
 	mdiClose,
 	mdiCloseCircle,
 	mdiCloudDownload,
@@ -256,6 +261,7 @@ export {
 	mdiImageOff,
 	mdiImport,
 	mdiInformation,
+	mdiInformationOutline,
 	mdiKeyboardReturn,
 	mdiLightbulbOnOutline,
 	mdiLink,
diff --git a/src/modules/feature/folder/file-table/FileStatus.vue b/src/modules/feature/folder/file-table/FileStatus.vue
index 8cadeeec52..1cd0d606e0 100644
--- a/src/modules/feature/folder/file-table/FileStatus.vue
+++ b/src/modules/feature/folder/file-table/FileStatus.vue
@@ -1,5 +1,10 @@
 <template>
-	<InfoChip v-if="isScanStatusPending" class="ms-2" :icon="mdiClockTimeFour" data-testid="file-status-scan-pending">
+	<InfoChip
+		v-if="isScanStatusPending"
+		class="ms-2"
+		:icon="mdiClockTimeFourOutline"
+		data-testid="file-status-scan-pending"
+	>
 		<span class="d-sr-only">{{ t("common.labels.status") }}</span>
 		{{ t("common.file.awaitingScan.short") }}
 	</InfoChip>
@@ -39,7 +44,7 @@ import {
 	isScanStatusPending as isScanStatusPendingFn,
 	isScanStatusWontCheck as isScanStatusWontCheckFn,
 } from "@/utils/fileHelper";
-import { mdiClockTimeFour, mdiEyeOffOutline, mdiPencilOffOutline } from "@icons/material";
+import { mdiClockTimeFourOutline, mdiEyeOffOutline, mdiPencilOffOutline } from "@icons/material";
 import { ErrorChip, InfoChip, WarningChip } from "@ui-chip";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
diff --git a/src/modules/ui/chip/BaseChip.vue b/src/modules/ui/chip/BaseChip.vue
index f58e4bdcde..e31b7953f1 100644
--- a/src/modules/ui/chip/BaseChip.vue
+++ b/src/modules/ui/chip/BaseChip.vue
@@ -1,6 +1,6 @@
 <template>
 	<VChip :color="color" :prepend-icon="icon" size="small" variant="tonal">
-		<slot />
+		<div class="chip-content"><slot /></div>
 	</VChip>
 </template>
 
@@ -21,3 +21,8 @@ defineProps({
 	},
 });
 </script>
+<style scoped>
+.chip-content {
+	color: rgba(var(--v-theme-on-background), var(--v-high-emphasis-opacity));
+}
+</style>
diff --git a/src/modules/ui/chip/ErrorChip.vue b/src/modules/ui/chip/ErrorChip.vue
index 936ecdddaf..18ccaa4118 100644
--- a/src/modules/ui/chip/ErrorChip.vue
+++ b/src/modules/ui/chip/ErrorChip.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
 import BaseChip from "./BaseChip.vue";
-import { mdiAlertCircle } from "@icons/material";
+import { mdiAlertCircleOutline } from "@icons/material";
 import { PropType } from "vue";
 import { IconProps } from "vuetify";
 
@@ -12,7 +12,7 @@ defineProps({
 	icon: {
 		type: String as PropType<IconProps["icon"]>,
 		required: false,
-		default: mdiAlertCircle,
+		default: mdiAlertCircleOutline,
 	},
 });
 </script>
diff --git a/src/modules/ui/chip/InfoChip.vue b/src/modules/ui/chip/InfoChip.vue
index 4354ed5f95..3cdd46e28f 100644
--- a/src/modules/ui/chip/InfoChip.vue
+++ b/src/modules/ui/chip/InfoChip.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
 import BaseChip from "./BaseChip.vue";
-import { mdiInformation } from "@icons/material";
+import { mdiInformationOutline } from "@icons/material";
 import { PropType } from "vue";
 import { IconProps } from "vuetify";
 
@@ -12,7 +12,7 @@ defineProps({
 	icon: {
 		type: String as PropType<IconProps["icon"]>,
 		required: false,
-		default: mdiInformation,
+		default: mdiInformationOutline,
 	},
 });
 </script>
diff --git a/src/modules/ui/chip/WarningChip.vue b/src/modules/ui/chip/WarningChip.vue
index 5c8e3787a2..b1a29b634b 100644
--- a/src/modules/ui/chip/WarningChip.vue
+++ b/src/modules/ui/chip/WarningChip.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
 import BaseChip from "./BaseChip.vue";
-import { mdiAlertCircle } from "@icons/material";
+import { mdiAlertCircleOutline } from "@icons/material";
 import { PropType } from "vue";
 import { IconProps } from "vuetify";
 
@@ -12,7 +12,7 @@ defineProps({
 	icon: {
 		type: String as PropType<IconProps["icon"]>,
 		required: false,
-		default: mdiAlertCircle,
+		default: mdiAlertCircleOutline,
 	},
 });
 </script>

From dcbdb2cdc9154388cc3f1d750b59af5f603c7595 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 12:13:22 +0100
Subject: [PATCH 013/100] Adjust language key

---
 src/locales/de.ts                                   | 2 +-
 src/locales/en.ts                                   | 2 +-
 src/locales/es.ts                                   | 2 +-
 src/locales/uk.ts                                   | 2 +-
 src/modules/feature/folder/file-table/FileTable.vue | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index dd2c3dcfaf..c837089ee8 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -1988,7 +1988,7 @@ export default {
 	"pages.folder.title": "Ordner",
 	"pages.folder.columns.name": "Name",
 	"pages.folder.columns.createdat": "Erstellt am",
-	"pages.folder.columns.updatedat": "Zuletzt geändert",
+	"pages.folder.columns.lastModifiedAt": "Zuletzt geändert",
 	"pages.folder.columns.size": "Größe",
 	"pages.folder.ariaLabels.menu": "Ordner Menü",
 	"pages.folder.ariaLabels.menu.action.edit": "Ordner umbenennen",
diff --git a/src/locales/en.ts b/src/locales/en.ts
index b3b00d0a78..94f81be1d1 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1954,7 +1954,7 @@ export default {
 	"pages.folder.title": "Folder",
 	"pages.folder.columns.name": "Name",
 	"pages.folder.columns.createdat": "Created on",
-	"pages.folder.columns.updatedat": "Last updated",
+	"pages.folder.columns.lastModifiedAt": "Last updated",
 	"pages.folder.columns.size": "Size",
 	"pages.folder.ariaLabels.menu": "Folder menu",
 	"pages.folder.ariaLabels.menu.action.edit": "Rename folder",
diff --git a/src/locales/es.ts b/src/locales/es.ts
index c83a737f44..1b828f189c 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -2005,7 +2005,7 @@ export default {
 	"pages.folder.title": "Carpeta",
 	"pages.folder.columns.name": "Nombre",
 	"pages.folder.columns.createdat": "Creado el",
-	"pages.folder.columns.updatedat": "Última actualización",
+	"pages.folder.columns.lastModifiedAt": "Última actualización",
 	"pages.folder.columns.size": "Talla",
 	"pages.folder.ariaLabels.menu": "Menú carpeta",
 	"pages.folder.ariaLabels.menu.action.edit": "Renombrar carpeta",
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index c42f36f052..ca093ac2ef 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -1975,7 +1975,7 @@ export default {
 	"pages.folder.title": "Папка",
 	"pages.folder.columns.name": "Ім'я",
 	"pages.folder.columns.createdat": "Створено на",
-	"pages.folder.columns.updatedat": "Останнє оновлення",
+	"pages.folder.columns.lastModifiedAt": "Останнє оновлення",
 	"pages.folder.columns.size": "Розмір",
 	"pages.folder.ariaLabels.menu": "Меню Папки",
 	"pages.folder.ariaLabels.menu.action.edit": "Перейменувати папку",
diff --git a/src/modules/feature/folder/file-table/FileTable.vue b/src/modules/feature/folder/file-table/FileTable.vue
index 1469115a6f..de93a884b6 100644
--- a/src/modules/feature/folder/file-table/FileTable.vue
+++ b/src/modules/feature/folder/file-table/FileTable.vue
@@ -31,8 +31,8 @@
 						</span>
 					</FileInteractionHandler>
 				</template>
-				<template #[`item.updatedAt`]="{ item }">
-					<span :data-testid="`updated-at-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">
+				<template #[`item.contentLastModifiedAt`]="{ item }">
+					<span :data-testid="`content-modified-at-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">
 						{{ d(item.contentLastModifiedAt) }}
 					</span>
 				</template>
@@ -167,7 +167,7 @@ const emit = defineEmits([
 const headers = [
 	{ title: "", key: "preview", sortable: false },
 	{ title: t("pages.folder.columns.name"), key: "name" },
-	{ title: t("pages.folder.columns.updatedat"), key: "updatedAt" },
+	{ title: t("pages.folder.columns.lastModifiedAt"), key: "contentLastModifiedAt" },
 	{ title: t("pages.folder.columns.size"), key: "size" },
 	{
 		title: t("ui.actionMenu.actions"),

From 09a7d00f019125e9c6731b418a0460efd05efdf3 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 12:13:36 +0100
Subject: [PATCH 014/100] Add contentLastModifiedAt

---
 tests/test-utils/factory/filerecordResponse.factory.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/test-utils/factory/filerecordResponse.factory.ts b/tests/test-utils/factory/filerecordResponse.factory.ts
index 9bffaf082f..c4ca28de02 100644
--- a/tests/test-utils/factory/filerecordResponse.factory.ts
+++ b/tests/test-utils/factory/filerecordResponse.factory.ts
@@ -1,9 +1,4 @@
-import {
-	FilePreviewStatus,
-	FileRecord,
-	FileRecordParent,
-	FileRecordVirusScanStatus,
-} from "@/types/file/File";
+import { FilePreviewStatus, FileRecord, FileRecordParent, FileRecordVirusScanStatus } from "@/types/file/File";
 import { Factory } from "fishery";
 
 export const fileRecordFactory = Factory.define<FileRecord>(({ sequence }) => {
@@ -25,5 +20,6 @@ export const fileRecordFactory = Factory.define<FileRecord>(({ sequence }) => {
 		createdAt: new Date().toISOString(),
 		isCollaboraEditable: false,
 		exceedsCollaboraEditableFileSize: false,
+		contentLastModifiedAt: new Date().toISOString(),
 	};
 });

From c11dc2bfdbb497c977095385ab127421ae99ffc0 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 12:14:19 +0100
Subject: [PATCH 015/100] Adjust existing tests

---
 .../file-table/FileInteractionHandler.unit.ts | 33 +++++++++++++++++--
 .../folder/file-table/FileTable.unit.ts       | 17 ++++------
 src/modules/ui/chip/ErrorChip.unit.ts         |  4 +--
 src/modules/ui/chip/InfoChip.unit.ts          |  4 +--
 src/modules/ui/chip/WarningChip.unit.ts       |  4 +--
 5 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
index 0b4ac81ea5..b56aad5f79 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
@@ -2,11 +2,17 @@ import { FileRecordItem } from "../types/filerecord-item";
 import FileInteractionHandler from "./FileInteractionHandler.vue";
 import { FilePreviewStatus } from "@/types/file/File";
 import { fileRecordFactory } from "@@/tests/test-utils";
+import { createTestEnvStore } from "@@/tests/test-utils";
 import { createTestingI18n } from "@@/tests/test-utils/setup";
+import { useBoardPermissions } from "@data-board";
+import { createMock } from "@golevelup/ts-vitest";
+import { createTestingPinia } from "@pinia/testing";
 import { useLightBox } from "@ui-light-box";
+import { setActivePinia } from "pinia";
 import { ref } from "vue";
 
 vi.mock("@ui-light-box");
+vi.mock("@data-board");
 
 describe("FileInteractionHandler", () => {
 	const setupMocks = () => {
@@ -18,6 +24,12 @@ describe("FileInteractionHandler", () => {
 			lightBoxOptions: ref(),
 		});
 
+		const useBoardPermissionsMockFn = vi.mocked(useBoardPermissions);
+		const useBoardPermissionsMockReturn = createMock<ReturnType<typeof useBoardPermissions>>({
+			hasEditPermission: ref(true),
+		});
+		useBoardPermissionsMockFn.mockReturnValueOnce(useBoardPermissionsMockReturn);
+
 		return { useLightBoxMock };
 	};
 
@@ -34,7 +46,10 @@ describe("FileInteractionHandler", () => {
 	};
 
 	describe("when file is selectable", () => {
-		const setup = (props: { previewStatus?: FilePreviewStatus; mimeType?: string }) => {
+		const setup = (
+			props: { previewStatus?: FilePreviewStatus; mimeType?: string },
+			options?: { isCollaboraEnabled?: boolean }
+		) => {
 			const fileRecord = fileRecordFactory.build({
 				previewStatus: props.previewStatus,
 				mimeType: props.mimeType,
@@ -44,9 +59,15 @@ describe("FileInteractionHandler", () => {
 				isSelectable: true,
 			};
 
-			const { wrapper } = setupWrapper(fileRecordItem);
 			const { useLightBoxMock } = setupMocks();
 
+			setActivePinia(createTestingPinia());
+			createTestEnvStore({
+				FEATURE_COLUMN_BOARD_COLLABORA_ENABLED: options?.isCollaboraEnabled ?? false,
+			});
+
+			const { wrapper } = setupWrapper(fileRecordItem);
+
 			return { wrapper, useLightBoxMock, fileRecordItem };
 		};
 		describe("when preview is possible", () => {
@@ -152,7 +173,7 @@ describe("FileInteractionHandler", () => {
 	});
 
 	describe("when file is not selectable", () => {
-		const setup = () => {
+		const setup = (options?: { isCollaboraEnabled?: boolean }) => {
 			const fileRecord = fileRecordFactory.build({
 				previewStatus: FilePreviewStatus.PREVIEW_POSSIBLE,
 			});
@@ -161,6 +182,12 @@ describe("FileInteractionHandler", () => {
 				isSelectable: false,
 			};
 
+			setupMocks();
+			setActivePinia(createTestingPinia());
+			createTestEnvStore({
+				FEATURE_COLUMN_BOARD_COLLABORA_ENABLED: options?.isCollaboraEnabled ?? false,
+			});
+
 			const { wrapper } = setupWrapper(fileRecordItem);
 
 			return { wrapper };
diff --git a/src/modules/feature/folder/file-table/FileTable.unit.ts b/src/modules/feature/folder/file-table/FileTable.unit.ts
index 79fd8b4418..4f41a1da4c 100644
--- a/src/modules/feature/folder/file-table/FileTable.unit.ts
+++ b/src/modules/feature/folder/file-table/FileTable.unit.ts
@@ -1,7 +1,6 @@
 import FilePreview from "./FilePreview.vue";
 import FileTable from "./FileTable.vue";
 import FileUploadProgress from "./FileUploadProgress.vue";
-import { printDateFromStringUTC } from "@/plugins/datetime";
 import { RoleName } from "@/serverApi/v3";
 import { FileRecord, FileRecordVirusScanStatus } from "@/types/file/File";
 import { createTestAppStoreWithRole, fileRecordFactory } from "@@/tests/test-utils";
@@ -116,7 +115,7 @@ describe("FileTable", () => {
 			expect(wrapper.findComponent(FilePreview).exists()).toBe(true);
 		});
 
-		it("should render created at column", () => {
+		it("should render content modified column", () => {
 			const fileRecord = fileRecordFactory.build();
 			const { wrapper } = setupWrapper({
 				isLoading: false,
@@ -125,10 +124,8 @@ describe("FileTable", () => {
 				uploadProgress: { uploaded: 1, total: 2 },
 			});
 
-			const createdAt = wrapper.find(`[data-testid='created-at-${fileRecord.name}']`);
-
-			const date = printDateFromStringUTC(fileRecord.createdAt);
-			expect(createdAt.text()).toContain(date);
+			const contentLastModifiedAt = wrapper.find(`[data-testid='content-modified-at-${fileRecord.name}']`);
+			expect(contentLastModifiedAt.exists()).toBe(true);
 		});
 
 		it("should render file name column", () => {
@@ -194,8 +191,8 @@ describe("FileTable", () => {
 			const nameColumn = wrapper.find(`[data-testid='name-${fileRecord.name}']`);
 			expect(nameColumn.classes()).toContain("text-disabled");
 
-			const createdAtColumn = wrapper.find(`[data-testid='created-at-${fileRecord.name}']`);
-			expect(createdAtColumn.classes()).toContain("text-disabled");
+			const contentLastModifiedAt = wrapper.find(`[data-testid='content-modified-at-${fileRecord.name}']`);
+			expect(contentLastModifiedAt.classes()).toContain("text-disabled");
 
 			const sizeColumn = wrapper.find(`[data-testid='size-${fileRecord.name}']`);
 			expect(sizeColumn.classes()).toContain("text-disabled");
@@ -219,8 +216,8 @@ describe("FileTable", () => {
 			const nameColumn = wrapper.find(`[data-testid='name-${fileRecord.name}']`);
 			expect(nameColumn.classes()).not.toContain("text-disabled");
 
-			const createdAtColumn = wrapper.find(`[data-testid='created-at-${fileRecord.name}']`);
-			expect(createdAtColumn.classes()).not.toContain("text-disabled");
+			const contentLastModifiedAt = wrapper.find(`[data-testid='content-modified-at-${fileRecord.name}']`);
+			expect(contentLastModifiedAt.classes()).not.toContain("text-disabled");
 
 			const sizeColumn = wrapper.find(`[data-testid='size-${fileRecord.name}']`);
 			expect(sizeColumn.classes()).not.toContain("text-disabled");
diff --git a/src/modules/ui/chip/ErrorChip.unit.ts b/src/modules/ui/chip/ErrorChip.unit.ts
index f8d2f21c1f..7df2b72fa5 100644
--- a/src/modules/ui/chip/ErrorChip.unit.ts
+++ b/src/modules/ui/chip/ErrorChip.unit.ts
@@ -1,7 +1,7 @@
 import BaseChip from "./BaseChip.vue";
 import ErrorChip from "./ErrorChip.vue";
 import { createTestingVuetify } from "@@/tests/test-utils/setup";
-import { mdiAlertCircle } from "@icons/material";
+import { mdiAlertCircleOutline } from "@icons/material";
 import { VChip } from "vuetify/components";
 
 describe("ErrorChip", () => {
@@ -61,7 +61,7 @@ describe("ErrorChip", () => {
 
 			const chip = wrapper.findComponent(BaseChip);
 
-			expect(chip.props("icon")).toBe(mdiAlertCircle);
+			expect(chip.props("icon")).toBe(mdiAlertCircleOutline);
 		});
 	});
 
diff --git a/src/modules/ui/chip/InfoChip.unit.ts b/src/modules/ui/chip/InfoChip.unit.ts
index 25ca2a70f2..02200a653a 100644
--- a/src/modules/ui/chip/InfoChip.unit.ts
+++ b/src/modules/ui/chip/InfoChip.unit.ts
@@ -1,7 +1,7 @@
 import BaseChip from "./BaseChip.vue";
 import InfoChip from "./InfoChip.vue";
 import { createTestingVuetify } from "@@/tests/test-utils/setup";
-import { mdiInformation } from "@icons/material";
+import { mdiInformationOutline } from "@icons/material";
 import { VChip } from "vuetify/components";
 
 describe("InfoChip", () => {
@@ -61,7 +61,7 @@ describe("InfoChip", () => {
 
 			const chip = wrapper.findComponent(BaseChip);
 
-			expect(chip.props("icon")).toBe(mdiInformation);
+			expect(chip.props("icon")).toBe(mdiInformationOutline);
 		});
 	});
 
diff --git a/src/modules/ui/chip/WarningChip.unit.ts b/src/modules/ui/chip/WarningChip.unit.ts
index 87ae9463a2..607a890dd8 100644
--- a/src/modules/ui/chip/WarningChip.unit.ts
+++ b/src/modules/ui/chip/WarningChip.unit.ts
@@ -1,7 +1,7 @@
 import BaseChip from "./BaseChip.vue";
 import WarningChip from "./WarningChip.vue";
 import { createTestingVuetify } from "@@/tests/test-utils/setup";
-import { mdiAlertCircle } from "@icons/material";
+import { mdiAlertCircleOutline } from "@icons/material";
 import { VChip } from "vuetify/components";
 
 describe("WarningChip", () => {
@@ -61,7 +61,7 @@ describe("WarningChip", () => {
 
 			const chip = wrapper.findComponent(BaseChip);
 
-			expect(chip.props("icon")).toBe(mdiAlertCircle);
+			expect(chip.props("icon")).toBe(mdiAlertCircleOutline);
 		});
 	});
 

From 3d8b5bb0c2fee89d4989c49ead982ea841322c72 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 13:23:33 +0100
Subject: [PATCH 016/100] Add file state tests

---
 .../folder/file-table/FileStatus.unit.ts      | 26 +++++++++++++++++++
 .../feature/folder/file-table/FileStatus.vue  |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/file-table/FileStatus.unit.ts b/src/modules/feature/folder/file-table/FileStatus.unit.ts
index d2551ed4c9..b375f85cc5 100644
--- a/src/modules/feature/folder/file-table/FileStatus.unit.ts
+++ b/src/modules/feature/folder/file-table/FileStatus.unit.ts
@@ -74,4 +74,30 @@ describe("FileStatus", () => {
 			expect(wrapper.findComponent('[data-testid="file-status-scan-virus-detected"]').exists()).toBe(true);
 		});
 	});
+
+	describe("when collabora file size is exceeded", () => {
+		it("should show correct chip", () => {
+			const fileRecord = fileRecordFactory.build({
+				exceedsCollaboraEditableFileSize: true,
+			});
+
+			const { wrapper } = setupWrapper(fileRecord);
+
+			expect(wrapper.findComponent('[data-testid="file-status-collabora-file-size-exceeded"]').exists()).toBe(true);
+		});
+	});
+
+	describe("when collabora file size is exceeded and virus detected", () => {
+		it("should only show virus info chip", () => {
+			const fileRecord = fileRecordFactory.build({
+				exceedsCollaboraEditableFileSize: true,
+				securityCheckStatus: FileRecordScanStatus.BLOCKED,
+			});
+
+			const { wrapper } = setupWrapper(fileRecord);
+
+			expect(wrapper.findComponent('[data-testid="file-status-scan-virus-detected"]').exists()).toBe(true);
+			expect(wrapper.findComponent('[data-testid="file-status-collabora-file-size-exceeded"]').exists()).toBe(false);
+		});
+	});
 });
diff --git a/src/modules/feature/folder/file-table/FileStatus.vue b/src/modules/feature/folder/file-table/FileStatus.vue
index 1cd0d606e0..c99559b463 100644
--- a/src/modules/feature/folder/file-table/FileStatus.vue
+++ b/src/modules/feature/folder/file-table/FileStatus.vue
@@ -12,7 +12,7 @@
 		v-if="exceedsCollaboraEditableFileSize"
 		class="ms-2"
 		:icon="mdiPencilOffOutline"
-		data-testid="file-status-exceeds-collabora-editable-file-size"
+		data-testid="file-status-collabora-file-size-exceeded"
 	>
 		<span class="d-sr-only">{{ t("common.labels.status") }}</span>
 		{{ t("common.file.exceedsCollaboraEditableFileSize.short") }}

From 28cc37ba40e62a31cf1be7b36f16601d30a8d866 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 13:52:01 +0100
Subject: [PATCH 017/100] Add file interaction tests

---
 .../file-table/FileInteractionHandler.unit.ts | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
index b56aad5f79..9ba4d5a344 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
@@ -9,11 +9,16 @@ import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useLightBox } from "@ui-light-box";
 import { setActivePinia } from "pinia";
+import { Mock } from "vitest";
 import { ref } from "vue";
+import { Router, useRouter } from "vue-router";
 
+vi.mock("vue-router");
 vi.mock("@ui-light-box");
 vi.mock("@data-board");
 
+const useRouterMock = <Mock>useRouter;
+
 describe("FileInteractionHandler", () => {
 	const setupMocks = () => {
 		const useLightBoxMock = vi.mocked(useLightBox);
@@ -24,6 +29,9 @@ describe("FileInteractionHandler", () => {
 			lightBoxOptions: ref(),
 		});
 
+		const router = createMock<Router>({});
+		useRouterMock.mockReturnValue(router);
+
 		const useBoardPermissionsMockFn = vi.mocked(useBoardPermissions);
 		const useBoardPermissionsMockReturn = createMock<ReturnType<typeof useBoardPermissions>>({
 			hasEditPermission: ref(true),
@@ -47,12 +55,13 @@ describe("FileInteractionHandler", () => {
 
 	describe("when file is selectable", () => {
 		const setup = (
-			props: { previewStatus?: FilePreviewStatus; mimeType?: string },
+			props: { previewStatus?: FilePreviewStatus; mimeType?: string; isCollaboraEditable?: boolean },
 			options?: { isCollaboraEnabled?: boolean }
 		) => {
 			const fileRecord = fileRecordFactory.build({
 				previewStatus: props.previewStatus,
 				mimeType: props.mimeType,
+				isCollaboraEditable: props.isCollaboraEditable,
 			});
 			const fileRecordItem = {
 				...fileRecord,
@@ -156,6 +165,32 @@ describe("FileInteractionHandler", () => {
 			});
 		});
 
+		describe("when file is a collabora document", () => {
+			it("should render button", () => {
+				const { wrapper } = setup(
+					{ mimeType: "application/msword", isCollaboraEditable: true },
+					{ isCollaboraEnabled: true }
+				);
+				const button = wrapper.find("button");
+				expect(button.exists()).toBe(true);
+			});
+
+			it("should call open function", () => {
+				const { wrapper } = setup(
+					{ mimeType: "application/msword", isCollaboraEditable: true },
+					{ isCollaboraEnabled: true }
+				);
+
+				const windowOpenSpy = vi.fn();
+				window.open = windowOpenSpy;
+
+				const button = wrapper.find("button");
+				button.trigger("click");
+
+				expect(windowOpenSpy).toHaveBeenCalledTimes(1);
+			});
+		});
+
 		describe("when preview is not possible and mimeType is not audio or video", () => {
 			it("should render div instead of button", () => {
 				const { wrapper } = setup({

From a246178751b4e6cd2e1c38bda9f3a496fe1fa961 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 14:08:35 +0100
Subject: [PATCH 018/100] Improve imports

---
 .../feature/folder/file-table/FileInteractionHandler.unit.ts   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
index 9ba4d5a344..c28c88fb45 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
@@ -1,8 +1,7 @@
 import { FileRecordItem } from "../types/filerecord-item";
 import FileInteractionHandler from "./FileInteractionHandler.vue";
 import { FilePreviewStatus } from "@/types/file/File";
-import { fileRecordFactory } from "@@/tests/test-utils";
-import { createTestEnvStore } from "@@/tests/test-utils";
+import { createTestEnvStore, fileRecordFactory } from "@@/tests/test-utils";
 import { createTestingI18n } from "@@/tests/test-utils/setup";
 import { useBoardPermissions } from "@data-board";
 import { createMock } from "@golevelup/ts-vitest";

From cb5b4b986e6970864d8a9c946d5d4fb965a1ef2a Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 20:42:17 +0100
Subject: [PATCH 019/100] Pass edit permission as prop

---
 .../folder/file-table/FileInteractionHandler.unit.ts   |  9 +--------
 .../folder/file-table/FileInteractionHandler.vue       | 10 ++++++----
 src/modules/feature/folder/file-table/FileTable.vue    |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
index c28c88fb45..ff614ef940 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
@@ -3,7 +3,6 @@ import FileInteractionHandler from "./FileInteractionHandler.vue";
 import { FilePreviewStatus } from "@/types/file/File";
 import { createTestEnvStore, fileRecordFactory } from "@@/tests/test-utils";
 import { createTestingI18n } from "@@/tests/test-utils/setup";
-import { useBoardPermissions } from "@data-board";
 import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useLightBox } from "@ui-light-box";
@@ -14,7 +13,6 @@ import { Router, useRouter } from "vue-router";
 
 vi.mock("vue-router");
 vi.mock("@ui-light-box");
-vi.mock("@data-board");
 
 const useRouterMock = <Mock>useRouter;
 
@@ -31,12 +29,6 @@ describe("FileInteractionHandler", () => {
 		const router = createMock<Router>({});
 		useRouterMock.mockReturnValue(router);
 
-		const useBoardPermissionsMockFn = vi.mocked(useBoardPermissions);
-		const useBoardPermissionsMockReturn = createMock<ReturnType<typeof useBoardPermissions>>({
-			hasEditPermission: ref(true),
-		});
-		useBoardPermissionsMockFn.mockReturnValueOnce(useBoardPermissionsMockReturn);
-
 		return { useLightBoxMock };
 	};
 
@@ -47,6 +39,7 @@ describe("FileInteractionHandler", () => {
 			},
 			props: {
 				fileRecordItem,
+				hasEditPermission: true,
 			},
 		});
 		return { wrapper };
diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index 9a08f32151..7b0315900b 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -21,7 +21,6 @@ import {
 	isPreviewPossible,
 	isVideoMimeType,
 } from "@/utils/fileHelper";
-import { useBoardPermissions } from "@data-board";
 import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
 import { mapEditBoardPermissionToEditorMode } from "@util-board";
@@ -29,16 +28,19 @@ import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 
-const { fileRecordItem } = defineProps({
+const { fileRecordItem, hasEditPermission } = defineProps({
 	fileRecordItem: {
 		type: Object as PropType<FileRecordItem>,
 		required: true,
 	},
+	hasEditPermission: {
+		type: Boolean,
+		required: true,
+	},
 });
 
 const { t } = useI18n();
 const router = useRouter();
-const { hasEditPermission } = useBoardPermissions();
 
 const isInteractive = computed(
 	() =>
@@ -115,7 +117,7 @@ const openVideoInLightbox = () => {
 };
 
 const openCollabora = () => {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
+	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
 
 	const url = router.resolve({
 		name: "collabora",
diff --git a/src/modules/feature/folder/file-table/FileTable.vue b/src/modules/feature/folder/file-table/FileTable.vue
index de93a884b6..228ed6da92 100644
--- a/src/modules/feature/folder/file-table/FileTable.vue
+++ b/src/modules/feature/folder/file-table/FileTable.vue
@@ -15,7 +15,7 @@
 		<div class="mt-2">
 			<DataTable :table-headers="headers" :items="fileRecordItems" :show-select="true">
 				<template #[`item.preview`]="{ item }">
-					<FileInteractionHandler :file-record-item="item">
+					<FileInteractionHandler :file-record-item="item" :has-edit-permission="props.hasEditPermission">
 						<FilePreview
 							:file-record="item"
 							:data-testid="`file-preview-${item.name}`"
@@ -24,7 +24,7 @@
 					</FileInteractionHandler>
 				</template>
 				<template #[`item.name`]="{ item }">
-					<FileInteractionHandler :file-record-item="item">
+					<FileInteractionHandler :file-record-item="item" :has-edit-permission="props.hasEditPermission">
 						<span :data-testid="`name-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">
 							{{ item.name }}
 							<FileStatus :file-record="item" />

From 5cf19ae4aea96e3194f4fc7118443c0367757a8a Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 20 Nov 2025 20:59:17 +0100
Subject: [PATCH 020/100] Add check if board in store belongs to folder

---
 src/modules/feature/folder/Folder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 4c82ba6b05..926744eaf9 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -224,7 +224,7 @@ onMounted(async () => {
 
 	await fetchFileFolderElement(props.folderId);
 	await fetchFiles(folderId.value, FileRecordParent.BOARDNODES);
-	if (!boardStore.board) {
+	if (!boardStore.board || boardStore.board.id !== parent.value.id) {
 		await boardStore.fetchBoardRequest({ boardId: parent.value.id });
 	}
 

From d31a9eb0c4f13b5995fa20ad00bcb59c8869c927 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 21 Nov 2025 08:37:10 +0100
Subject: [PATCH 021/100] Undo change

---
 src/modules/feature/folder/Folder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 926744eaf9..4c82ba6b05 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -224,7 +224,7 @@ onMounted(async () => {
 
 	await fetchFileFolderElement(props.folderId);
 	await fetchFiles(folderId.value, FileRecordParent.BOARDNODES);
-	if (!boardStore.board || boardStore.board.id !== parent.value.id) {
+	if (!boardStore.board) {
 		await boardStore.fetchBoardRequest({ boardId: parent.value.id });
 	}
 

From 21b93ba2a65b5f3ac2b33c77bbdf67711b79f750 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 21 Nov 2025 11:26:49 +0100
Subject: [PATCH 022/100] Add check if board in store is correct

---
 src/modules/feature/folder/Folder.unit.ts | 46 ++++++++++++++++++-----
 src/modules/feature/folder/Folder.vue     |  2 +-
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 06def3e410..eacca67996 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -10,7 +10,12 @@ import { useBoardStore } from "@/modules/data/board/Board.store";
 import { ParentNodeInfo, ParentNodeType } from "@/types/board/ContentElement";
 import { FileRecordParent } from "@/types/file/File";
 import * as FileHelper from "@/utils/fileHelper";
-import { fileRecordFactory, mockedPiniaStoreTyping, parentNodeInfoFactory } from "@@/tests/test-utils";
+import {
+	boardResponseFactory,
+	fileRecordFactory,
+	mockedPiniaStoreTyping,
+	parentNodeInfoFactory,
+} from "@@/tests/test-utils";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import * as BoardApi from "@data-board";
 import * as FileStorageApi from "@data-file";
@@ -76,7 +81,7 @@ describe("Folder.vue", () => {
 	describe("when user has board edit permission", () => {
 		describe("when folder contains no files", () => {
 			describe("when component is loaded", () => {
-				const setup = async () => {
+				const setup = async (boardInStoreUndefined = false, boardInStoreIsParent = true) => {
 					const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
 					vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
 
@@ -107,6 +112,10 @@ describe("Folder.vue", () => {
 
 					const { wrapper } = setupWrapper();
 					const useBoardStoreMock = mockedPiniaStoreTyping(useBoardStore);
+					const board = boardResponseFactory.build({
+						id: boardInStoreIsParent ? parent.id : "different-board-id",
+					});
+					useBoardStoreMock.board = boardInStoreUndefined ? undefined : board;
 
 					await nextTick();
 					await nextTick();
@@ -135,14 +144,6 @@ describe("Folder.vue", () => {
 					expect(fileStorageApiMock.fetchFiles).toHaveBeenCalled();
 				});
 
-				it("should call fetchBoardRequest", async () => {
-					const { useBoardStoreMock, parent } = await setup();
-
-					expect(useBoardStoreMock.fetchBoardRequest).toHaveBeenCalledWith({
-						boardId: parent.id,
-					});
-				});
-
 				it("should not show the loading spinner", async () => {
 					const { wrapper } = await setup();
 
@@ -164,6 +165,31 @@ describe("Folder.vue", () => {
 					expect(includesFolderName).toBe(true);
 				});
 
+				describe("when board is not in store", () => {
+					it("should call fetchBoardRequest", async () => {
+						const { useBoardStoreMock, parent } = await setup(true);
+
+						expect(useBoardStoreMock.fetchBoardRequest).toHaveBeenCalledWith({
+							boardId: parent.id,
+						});
+					});
+				});
+				describe("when board in store is not the same as parent", () => {
+					it("should call fetchBoardRequest", async () => {
+						const { useBoardStoreMock, parent } = await setup(false, false);
+
+						expect(useBoardStoreMock.fetchBoardRequest).toHaveBeenCalledWith({
+							boardId: parent.id,
+						});
+					});
+				});
+				describe("when board in store is the same as parent", () => {
+					it("should not call fetchBoardRequest", async () => {
+						const { useBoardStoreMock } = await setup(false, true);
+
+						expect(useBoardStoreMock.fetchBoardRequest).not.toHaveBeenCalled();
+					});
+				});
 				describe("when folder is board", () => {
 					it("should call createPageInformation with the correct parentId", async () => {
 						const { boardState, parent } = await setup();
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 4c82ba6b05..926744eaf9 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -224,7 +224,7 @@ onMounted(async () => {
 
 	await fetchFileFolderElement(props.folderId);
 	await fetchFiles(folderId.value, FileRecordParent.BOARDNODES);
-	if (!boardStore.board) {
+	if (!boardStore.board || boardStore.board.id !== parent.value.id) {
 		await boardStore.fetchBoardRequest({ boardId: parent.value.id });
 	}
 

From af29afa2da418809f4361fa797f4a002e7996080 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 21 Nov 2025 15:05:47 +0100
Subject: [PATCH 023/100] Add fab items

---
 src/components/icons/material/index.ts |  2 ++
 src/modules/feature/folder/Folder.vue  | 46 ++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/components/icons/material/index.ts b/src/components/icons/material/index.ts
index 6cff6d3128..c0aebbf420 100644
--- a/src/components/icons/material/index.ts
+++ b/src/components/icons/material/index.ts
@@ -69,6 +69,7 @@ import {
 	mdiEyeOutline,
 	mdiFileCertificateOutline,
 	mdiFileDocumentOutline,
+	mdiFileDocumentPlusOutline,
 	mdiFileMusicOutline,
 	mdiFileQuestionOutline,
 	mdiFileReplaceOutline,
@@ -230,6 +231,7 @@ export {
 	mdiEyeOutline,
 	mdiFileCertificateOutline,
 	mdiFileDocumentOutline,
+	mdiFileDocumentPlusOutline,
 	mdiFileMusicOutline,
 	mdiFileQuestionOutline,
 	mdiFileReplaceOutline,
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 4c82ba6b05..72bdd8db0b 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -1,5 +1,10 @@
 <template>
-	<DefaultWireframe max-width="full" :breadcrumbs="breadcrumbs" :fab-items="fabAction" @fab:clicked="fabClickHandler">
+	<DefaultWireframe
+		max-width="full"
+		:breadcrumbs="breadcrumbs"
+		:fab-items="fabAction"
+		@on-fab-item-click="fabItemClickHandler"
+	>
 		<template #header>
 			<div class="d-flex align-center">
 				<h1 data-testid="folder-title">
@@ -55,7 +60,7 @@ import { buildPageTitle } from "@/utils/pageTitle";
 import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board";
 import { useFileStorageApi } from "@data-file";
 import { useFolderState } from "@data-folder";
-import { mdiPlus } from "@icons/material";
+import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
 import dayjs from "dayjs";
@@ -75,6 +80,11 @@ const props = defineProps({
 	},
 });
 
+const enum FabEvent {
+	CREATE_DOCUMENT = "CREATE_DOCUMENT",
+	UPLOAD_FILE = "UPLOAD_FILE",
+}
+
 const emit = defineEmits<{
 	(update: "update:folder-name", pageTitle: string): void;
 }>();
@@ -99,11 +109,29 @@ const isRenameDialogOpen = ref(false);
 const fabAction = computed(() => {
 	if (!hasEditPermission.value) return;
 
+	const actions = [
+		{
+			icon: mdiFileDocumentPlusOutline,
+			label: "Dokument erstellen",
+			ariaLabel: "Dokument erstellen",
+			dataTestId: "fab_button_create_document",
+			customEvent: FabEvent.CREATE_DOCUMENT,
+		},
+		{
+			icon: mdiTrayArrowUp,
+			label: "Datei hochladen",
+			ariaLabel: "Datei hochladen",
+			dataTestId: "fab_button_upload_file",
+			customEvent: FabEvent.UPLOAD_FILE,
+		},
+	];
+
 	return {
 		icon: mdiPlus,
 		title: t("pages.folder.fab.title"),
 		ariaLabel: t("pages.folder.fab.title"),
 		dataTestId: "fab-add-files",
+		actions: actions,
 	};
 });
 
@@ -118,11 +146,15 @@ const runningUploads = ref<number>(0);
 
 const uploadedFileRecords = computed(() => fileRecords.value.filter((fileRecord) => !fileRecord.isUploading));
 
-const fabClickHandler = () => {
-	if (fileInput.value) {
-		// Reset the file input to allow re-uploading the same file
-		fileInput.value.value = "";
-		fileInput.value.click();
+const fabItemClickHandler = (event: string | undefined): void => {
+	if (event === FabEvent.UPLOAD_FILE) {
+		if (fileInput.value) {
+			// Reset the file input to allow re-uploading the same file
+			fileInput.value.value = "";
+			fileInput.value.click();
+		}
+	} else if (event === FabEvent.CREATE_DOCUMENT) {
+		// Handle document creation logic here
 	}
 };
 

From 4b5e86fb1b9eb018db95c19f6be48249ac1ae7f6 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 21 Nov 2025 15:53:43 +0100
Subject: [PATCH 024/100] Initial add doc dialog

---
 .../feature/folder/AddCollaboraFileDialog.vue | 79 +++++++++++++++++
 src/modules/feature/folder/Folder.vue         | 26 +++---
 .../folder/add-collabora-file.composable.ts   | 86 +++++++++++++++++++
 3 files changed, 181 insertions(+), 10 deletions(-)
 create mode 100644 src/modules/feature/folder/AddCollaboraFileDialog.vue
 create mode 100644 src/modules/feature/folder/add-collabora-file.composable.ts

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
new file mode 100644
index 0000000000..59eacdb202
--- /dev/null
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -0,0 +1,79 @@
+<template>
+	<Dialog
+		v-model:is-dialog-open="isCollaboraFileDialogOpen"
+		:message="t('components.elementTypeSelection.elements.collabora.subtitle')"
+		confirm-btn-lang-key="common.actions.create"
+		data-testid="collabora-element-dialog"
+		@cancel="onCancel"
+		@confirm="onConfirm"
+	>
+		<template #content>
+			<VForm id="officeFileForm" ref="form" data-testid="collabora-element-form" @submit.prevent="onConfirm">
+				<!-- Attach the select to the form so that we can use focusTrap in the dialog -->
+				<VSelect
+					v-model="selectedDocType"
+					:items="collaboraFileSelectionOptions"
+					item-title="label"
+					item-value="id"
+					persistent-hint
+					:label="t('components.cardElement.fileElement.collaboraFile.types')"
+					:rules="docTypeRules"
+					:menu-props="{ attach: '#officeFileForm' }"
+					data-testid="collabora-element-form-type"
+				/>
+				<VTextField
+					v-model="fileName"
+					:label="t('common.labels.fileName')"
+					:rules="fileNameRules"
+					:placeholder="t('components.cardElement.fileElement.collaboraFile.untitled')"
+					data-testid="collabora-element-form-filename"
+				/>
+			</VForm>
+		</template>
+	</Dialog>
+</template>
+<script setup lang="ts">
+import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import { Dialog } from "@ui-dialog";
+import { isRequired, useOpeningTagValidator } from "@util-validators";
+import { ref } from "vue";
+import { useI18n } from "vue-i18n";
+
+type VuetifyForm = {
+	validate: () => Promise<{ valid: boolean }>;
+};
+
+const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = useAddCollaboraFile();
+const { validateOnOpeningTag } = useOpeningTagValidator();
+
+const { t } = useI18n();
+
+const form = ref<VuetifyForm | null>(null);
+
+const selectedDocType = ref<string | null>(null);
+const fileName = ref<string>("");
+
+const docTypeRules = [isRequired(t("common.validation.required2"))];
+const fileNameRules = [(value: string) => validateOnOpeningTag(value), isRequired(t("common.validation.required2"))];
+
+const resetForm = () => {
+	selectedDocType.value = null;
+	fileName.value = "";
+};
+
+const onCancel = () => {
+	resetForm();
+	closeCollaboraFileDialog();
+};
+
+const onConfirm = async () => {
+	if (!form?.value) return;
+
+	const { valid } = await form.value.validate();
+	if (!valid) return;
+
+	closeCollaboraFileDialog();
+	await collaboraFileSelectionOptions.find((item) => item.id === selectedDocType.value)?.action(fileName.value);
+	resetForm();
+};
+</script>
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 72bdd8db0b..2118844f29 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -41,9 +41,12 @@
 	/>
 	<input ref="fileInput" type="file" multiple hidden data-testid="input-folder-fileupload" aria-hidden="true" />
 	<LightBox />
+	<AddCollaboraFileDialog />
 </template>
 
 <script setup lang="ts">
+import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import FileTable from "./file-table/FileTable.vue";
 import FolderMenu from "./FolderMenu.vue";
 import RenameFolderDialog from "./RenameFolderDialog.vue";
@@ -68,11 +71,6 @@ import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 
-const boardApi = useBoardApi();
-
-const { t } = useI18n();
-const router = useRouter();
-
 const props = defineProps({
 	folderId: {
 		type: String,
@@ -80,14 +78,23 @@ const props = defineProps({
 	},
 });
 
+const emit = defineEmits<{
+	(update: "update:folder-name", pageTitle: string): void;
+}>();
+
 const enum FabEvent {
 	CREATE_DOCUMENT = "CREATE_DOCUMENT",
 	UPLOAD_FILE = "UPLOAD_FILE",
 }
 
-const emit = defineEmits<{
-	(update: "update:folder-name", pageTitle: string): void;
-}>();
+const folderId = toRef(props, "folderId");
+
+const boardApi = useBoardApi();
+const { openCollaboraFileDialog, setFolderId } = useAddCollaboraFile();
+setFolderId(folderId.value);
+
+const { t } = useI18n();
+const router = useRouter();
 
 const { breadcrumbs, folderName, fetchFileFolderElement, parent, mapNodeTypeToPathType, renameFolder } =
 	useFolderState();
@@ -101,7 +108,6 @@ const boardStore = useBoardStore();
 const { hasEditPermission } = useBoardPermissions();
 const { handleError, notifyWithTemplate } = useErrorHandler();
 
-const folderId = toRef(props, "folderId");
 const fileRecords = computed(() => getFileRecordsByParentId(folderId.value));
 const fileInput = ref<HTMLInputElement | null>(null);
 const isRenameDialogOpen = ref(false);
@@ -154,7 +160,7 @@ const fabItemClickHandler = (event: string | undefined): void => {
 			fileInput.value.click();
 		}
 	} else if (event === FabEvent.CREATE_DOCUMENT) {
-		// Handle document creation logic here
+		openCollaboraFileDialog();
 	}
 };
 
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
new file mode 100644
index 0000000000..7a43c4002b
--- /dev/null
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -0,0 +1,86 @@
+import { FileRecordParentType } from "@/fileStorageApi/v3";
+import { getFileExtension } from "@/utils/fileHelper";
+import { useFileStorageApi } from "@data-file";
+import { createSharedComposable } from "@vueuse/core";
+import { ref } from "vue";
+import { useI18n } from "vue-i18n";
+
+export enum CollaboraFileType {
+	Text,
+	Spreadsheet,
+	Presentation,
+}
+
+export const useAddCollaboraFile = createSharedComposable(() => {
+	const { t } = useI18n();
+	const { uploadFromUrl } = useFileStorageApi();
+
+	const isCollaboraFileDialogOpen = ref<boolean>(false);
+
+	const closeCollaboraFileDialog = () => {
+		isCollaboraFileDialogOpen.value = false;
+	};
+
+	const openCollaboraFileDialog = () => {
+		isCollaboraFileDialogOpen.value = true;
+	};
+
+	const folderId = ref("");
+	const setFolderId = (folderIdParam: string) => {
+		folderId.value = folderIdParam;
+	};
+
+	const getAssetUrl = (collaboraFileType: CollaboraFileType): string => {
+		const base = `${window.location.origin}/collabora`;
+
+		if (collaboraFileType === CollaboraFileType.Text) {
+			return `${base}/doc.docx`;
+		}
+		if (collaboraFileType === CollaboraFileType.Spreadsheet) {
+			return `${base}/spreadsheet.xlsx`;
+		}
+
+		return `${base}/presentation.pptx`;
+	};
+
+	const uploadCollaboraFile = async (type: CollaboraFileType, fileName: string) => {
+		const assetUrl = getAssetUrl(type);
+		const fileExtension = getFileExtension(assetUrl);
+
+		try {
+			const fullFileName = fileExtension ? `${fileName}.${fileExtension}` : fileName;
+			await uploadFromUrl(assetUrl, folderId.value, FileRecordParentType.BOARDNODES, fullFileName);
+		} catch {
+			// Handle error appropriately
+		} finally {
+			closeCollaboraFileDialog();
+		}
+	};
+
+	const collaboraFileSelectionOptions = [
+		{
+			id: "1",
+			label: t("components.elementTypeSelection.elements.collabora.option.text"),
+			action: async (fileName: string) => uploadCollaboraFile(CollaboraFileType.Text, fileName),
+		},
+		{
+			id: "2",
+			label: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
+			action: async (fileName: string) => uploadCollaboraFile(CollaboraFileType.Spreadsheet, fileName),
+		},
+		{
+			id: "3",
+			label: t("components.elementTypeSelection.elements.collabora.option.presentation"),
+			action: async (fileName: string) => uploadCollaboraFile(CollaboraFileType.Presentation, fileName),
+		},
+	];
+
+	return {
+		collaboraFileSelectionOptions,
+		isCollaboraFileDialogOpen,
+		openCollaboraFileDialog,
+		closeCollaboraFileDialog,
+		getAssetUrl,
+		setFolderId,
+	};
+});

From 98a343885ca7440dc05a36a361e3fe4bf26eb80a Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 09:04:35 +0100
Subject: [PATCH 025/100] Move collabora enum to global structure

---
 .../feature/board/shared/add-collabora-file.composable.ts  | 7 +------
 .../board/shared/add-collabora-file.composable.unit.ts     | 3 ++-
 .../feature/folder/add-collabora-file.composable.ts        | 7 +------
 src/types/enum/Collabora.ts                                | 5 +++++
 4 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 src/types/enum/Collabora.ts

diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
index 7f113c7f26..13842ef244 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.ts
@@ -2,6 +2,7 @@ import { FileRecordParentType } from "@/fileStorageApi/v3";
 import { ContentElementType } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
+import { CollaboraFileType } from "@/types/enum/Collabora";
 import { getFileExtension } from "@/utils/fileHelper";
 import { type CreateElementRequestPayload, useCardStore } from "@data-board";
 import { useFileStorageApi } from "@data-file";
@@ -10,12 +11,6 @@ import { createSharedComposable } from "@vueuse/core";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
-export enum CollaboraFileType {
-	Text,
-	Spreadsheet,
-	Presentation,
-}
-
 type CreateElementRequestFn = (payload: CreateElementRequestPayload) => Promise<AnyContentElement | undefined>;
 
 export const useAddCollaboraFile = createSharedComposable(() => {
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
index b33fe03a89..4cc81fc9f5 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
@@ -1,7 +1,8 @@
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { setupFileSelectMock } from "../../../util/board/test-utils/file-select-mock";
-import { CollaboraFileType, useAddCollaboraFile } from "./add-collabora-file.composable";
+import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import { AnyContentElement, ContentElementType } from "@/types/board/ContentElement";
+import { CollaboraFileType } from "@/types/enum/Collabora";
 import { fileElementResponseFactory, mockedPiniaStoreTyping } from "@@/tests/test-utils";
 import { useCardStore } from "@data-board";
 import * as FileStorageApi from "@data-file";
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index 7a43c4002b..476a3ace7f 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -1,16 +1,11 @@
 import { FileRecordParentType } from "@/fileStorageApi/v3";
+import { CollaboraFileType } from "@/types/enum/Collabora";
 import { getFileExtension } from "@/utils/fileHelper";
 import { useFileStorageApi } from "@data-file";
 import { createSharedComposable } from "@vueuse/core";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
-export enum CollaboraFileType {
-	Text,
-	Spreadsheet,
-	Presentation,
-}
-
 export const useAddCollaboraFile = createSharedComposable(() => {
 	const { t } = useI18n();
 	const { uploadFromUrl } = useFileStorageApi();
diff --git a/src/types/enum/Collabora.ts b/src/types/enum/Collabora.ts
new file mode 100644
index 0000000000..0b7ae656fa
--- /dev/null
+++ b/src/types/enum/Collabora.ts
@@ -0,0 +1,5 @@
+export enum CollaboraFileType {
+	Text,
+	Spreadsheet,
+	Presentation,
+}

From b7112df0f4189ef2482fe79f4b5d4d9bae3b7ad4 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 09:19:21 +0100
Subject: [PATCH 026/100] Move collabora asset function to helper

---
 .../shared/add-collabora-file.composable.ts   | 17 ++-------------
 .../add-collabora-file.composable.unit.ts     | 14 -------------
 .../test-utils/add-collabora-file-mock.ts     |  2 --
 .../folder/add-collabora-file.composable.ts   | 17 ++-------------
 src/utils/collaboraHelper.ts                  | 14 +++++++++++++
 src/utils/collaboraHelper.unit.ts             | 21 +++++++++++++++++++
 6 files changed, 39 insertions(+), 46 deletions(-)
 create mode 100644 src/utils/collaboraHelper.ts
 create mode 100644 src/utils/collaboraHelper.unit.ts

diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
index 13842ef244..1d7c7aabfd 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.ts
@@ -3,6 +3,7 @@ import { ContentElementType } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
 import { CollaboraFileType } from "@/types/enum/Collabora";
+import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
 import { getFileExtension } from "@/utils/fileHelper";
 import { type CreateElementRequestPayload, useCardStore } from "@data-board";
 import { useFileStorageApi } from "@data-file";
@@ -50,19 +51,6 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		await cardStore.updateElementRequest({ element });
 	};
 
-	const getAssetUrl = (collaboraFileType: CollaboraFileType): string => {
-		const base = `${window.location.origin}/collabora`;
-
-		if (collaboraFileType === CollaboraFileType.Text) {
-			return `${base}/doc.docx`;
-		}
-		if (collaboraFileType === CollaboraFileType.Spreadsheet) {
-			return `${base}/spreadsheet.xlsx`;
-		}
-
-		return `${base}/presentation.pptx`;
-	};
-
 	const createFileElementWithCollaboraFile = async (type: CollaboraFileType, fileName: string, caption: string) => {
 		const element = await createElementRequestFn.value({
 			type: ContentElementType.File,
@@ -72,7 +60,7 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 			return;
 		}
 
-		const assetUrl = getAssetUrl(type);
+		const assetUrl = getCollaboraAssetUrl(type);
 		const fileExtension = getFileExtension(assetUrl);
 
 		try {
@@ -115,7 +103,6 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		isCollaboraFileDialogOpen,
 		openCollaboraFileDialog,
 		closeCollaboraFileDialog,
-		getAssetUrl,
 		setCardId,
 		setCreateElementRequestFn,
 	};
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
index 4cc81fc9f5..cd638a6314 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
@@ -2,7 +2,6 @@
 import { setupFileSelectMock } from "../../../util/board/test-utils/file-select-mock";
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import { AnyContentElement, ContentElementType } from "@/types/board/ContentElement";
-import { CollaboraFileType } from "@/types/enum/Collabora";
 import { fileElementResponseFactory, mockedPiniaStoreTyping } from "@@/tests/test-utils";
 import { useCardStore } from "@data-board";
 import * as FileStorageApi from "@data-file";
@@ -46,7 +45,6 @@ describe("AddCollaboraFileComposable", () => {
 			closeCollaboraFileDialog,
 			setCardId,
 			setCreateElementRequestFn,
-			getAssetUrl,
 			collaboraFileSelectionOptions,
 			isCollaboraFileDialogOpen,
 			cardId,
@@ -70,7 +68,6 @@ describe("AddCollaboraFileComposable", () => {
 			closeCollaboraFileDialog,
 			setCardId,
 			cardId,
-			getAssetUrl,
 			cardStore,
 		};
 	};
@@ -122,17 +119,6 @@ describe("AddCollaboraFileComposable", () => {
 		});
 	});
 
-	describe("getAssetUrl", () => {
-		it("returns correct URL for collabora types", () => {
-			const { getAssetUrl } = setup();
-			const origin = window.location.origin;
-
-			expect(getAssetUrl(CollaboraFileType.Text)).toBe(`${origin}/collabora/doc.docx`);
-			expect(getAssetUrl(CollaboraFileType.Spreadsheet)).toBe(`${origin}/collabora/spreadsheet.xlsx`);
-			expect(getAssetUrl(CollaboraFileType.Presentation)).toBe(`${origin}/collabora/presentation.pptx`);
-		});
-	});
-
 	describe("collaboraFileSelectionOptions", () => {
 		it("provides options for collabora file types", () => {
 			const { collaboraFileSelectionOptions } = setup();
diff --git a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
index 4bb1674158..06c44cb20a 100644
--- a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
+++ b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
@@ -22,7 +22,6 @@ export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
 	const isCollaboraFileDialogOpen = ref(false);
 	const collaboraFileSelectionOptions: Array<CollaboraFileSelectionOptions> =
 		collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
-	const getAssetUrl = vi.fn();
 	const setCardId = setCardIdMock ?? vi.fn();
 	const setCreateElementRequestFn = vi.fn();
 	const cardId = ref("");
@@ -33,7 +32,6 @@ export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
 		isCollaboraFileDialogOpen,
 		openCollaboraFileDialog,
 		closeCollaboraFileDialog,
-		getAssetUrl,
 		setCardId,
 		setCreateElementRequestFn,
 	};
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index 476a3ace7f..acab871f56 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -1,5 +1,6 @@
 import { FileRecordParentType } from "@/fileStorageApi/v3";
 import { CollaboraFileType } from "@/types/enum/Collabora";
+import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
 import { getFileExtension } from "@/utils/fileHelper";
 import { useFileStorageApi } from "@data-file";
 import { createSharedComposable } from "@vueuse/core";
@@ -25,21 +26,8 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		folderId.value = folderIdParam;
 	};
 
-	const getAssetUrl = (collaboraFileType: CollaboraFileType): string => {
-		const base = `${window.location.origin}/collabora`;
-
-		if (collaboraFileType === CollaboraFileType.Text) {
-			return `${base}/doc.docx`;
-		}
-		if (collaboraFileType === CollaboraFileType.Spreadsheet) {
-			return `${base}/spreadsheet.xlsx`;
-		}
-
-		return `${base}/presentation.pptx`;
-	};
-
 	const uploadCollaboraFile = async (type: CollaboraFileType, fileName: string) => {
-		const assetUrl = getAssetUrl(type);
+		const assetUrl = getCollaboraAssetUrl(type);
 		const fileExtension = getFileExtension(assetUrl);
 
 		try {
@@ -75,7 +63,6 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		isCollaboraFileDialogOpen,
 		openCollaboraFileDialog,
 		closeCollaboraFileDialog,
-		getAssetUrl,
 		setFolderId,
 	};
 });
diff --git a/src/utils/collaboraHelper.ts b/src/utils/collaboraHelper.ts
new file mode 100644
index 0000000000..c6e78d5310
--- /dev/null
+++ b/src/utils/collaboraHelper.ts
@@ -0,0 +1,14 @@
+import { CollaboraFileType } from "@/types/enum/Collabora";
+
+export function getCollaboraAssetUrl(collaboraFileType: CollaboraFileType): string {
+	const base = `${window.location.origin}/collabora`;
+
+	if (collaboraFileType === CollaboraFileType.Text) {
+		return `${base}/doc.docx`;
+	}
+	if (collaboraFileType === CollaboraFileType.Spreadsheet) {
+		return `${base}/spreadsheet.xlsx`;
+	}
+
+	return `${base}/presentation.pptx`;
+}
diff --git a/src/utils/collaboraHelper.unit.ts b/src/utils/collaboraHelper.unit.ts
new file mode 100644
index 0000000000..3fed641dd2
--- /dev/null
+++ b/src/utils/collaboraHelper.unit.ts
@@ -0,0 +1,21 @@
+import { CollaboraFileType } from "@/types/enum/Collabora";
+import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
+
+describe("@/utils/collaboraHelper", () => {
+	describe("getCollaboraAssetUrl", () => {
+		it("should return correct URL for CollaboraFileType.Text", () => {
+			const url = getCollaboraAssetUrl(CollaboraFileType.Text);
+			expect(url).toBe(`${window.location.origin}/collabora/doc.docx`);
+		});
+
+		it("should return correct URL for CollaboraFileType.Spreadsheet", () => {
+			const url = getCollaboraAssetUrl(CollaboraFileType.Spreadsheet);
+			expect(url).toBe(`${window.location.origin}/collabora/spreadsheet.xlsx`);
+		});
+
+		it("should return correct URL for CollaboraFileType.Presentation", () => {
+			const url = getCollaboraAssetUrl(CollaboraFileType.Presentation);
+			expect(url).toBe(`${window.location.origin}/collabora/presentation.pptx`);
+		});
+	});
+});

From ebb7695fea6d0299b9b027133f4f31ca340905cc Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 10:12:51 +0100
Subject: [PATCH 027/100] Refactor composable

---
 .../feature/folder/AddCollaboraFileDialog.vue | 11 ++++++-
 src/modules/feature/folder/Folder.vue         | 30 +++++++++----------
 .../folder/add-collabora-file.composable.ts   | 19 +++++-------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index 59eacdb202..3697b6a540 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -39,6 +39,13 @@ import { isRequired, useOpeningTagValidator } from "@util-validators";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
+const props = defineProps({
+	folderId: {
+		type: String,
+		required: true,
+	},
+});
+
 type VuetifyForm = {
 	validate: () => Promise<{ valid: boolean }>;
 };
@@ -73,7 +80,9 @@ const onConfirm = async () => {
 	if (!valid) return;
 
 	closeCollaboraFileDialog();
-	await collaboraFileSelectionOptions.find((item) => item.id === selectedDocType.value)?.action(fileName.value);
+	await collaboraFileSelectionOptions
+		.find((item) => item.id === selectedDocType.value)
+		?.action(props.folderId, fileName.value);
 	resetForm();
 };
 </script>
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 2118844f29..12658d4919 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -41,7 +41,7 @@
 	/>
 	<input ref="fileInput" type="file" multiple hidden data-testid="input-folder-fileupload" aria-hidden="true" />
 	<LightBox />
-	<AddCollaboraFileDialog />
+	<AddCollaboraFileDialog :folder-id="folderId" />
 </template>
 
 <script setup lang="ts">
@@ -71,6 +71,11 @@ import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 
+const boardApi = useBoardApi();
+
+const { t } = useI18n();
+const router = useRouter();
+
 const props = defineProps({
 	folderId: {
 		type: String,
@@ -82,20 +87,6 @@ const emit = defineEmits<{
 	(update: "update:folder-name", pageTitle: string): void;
 }>();
 
-const enum FabEvent {
-	CREATE_DOCUMENT = "CREATE_DOCUMENT",
-	UPLOAD_FILE = "UPLOAD_FILE",
-}
-
-const folderId = toRef(props, "folderId");
-
-const boardApi = useBoardApi();
-const { openCollaboraFileDialog, setFolderId } = useAddCollaboraFile();
-setFolderId(folderId.value);
-
-const { t } = useI18n();
-const router = useRouter();
-
 const { breadcrumbs, folderName, fetchFileFolderElement, parent, mapNodeTypeToPathType, renameFolder } =
 	useFolderState();
 
@@ -108,10 +99,19 @@ const boardStore = useBoardStore();
 const { hasEditPermission } = useBoardPermissions();
 const { handleError, notifyWithTemplate } = useErrorHandler();
 
+const { openCollaboraFileDialog } = useAddCollaboraFile();
+
+const folderId = toRef(props, "folderId");
 const fileRecords = computed(() => getFileRecordsByParentId(folderId.value));
+
 const fileInput = ref<HTMLInputElement | null>(null);
 const isRenameDialogOpen = ref(false);
 
+const enum FabEvent {
+	CREATE_DOCUMENT = "CREATE_DOCUMENT",
+	UPLOAD_FILE = "UPLOAD_FILE",
+}
+
 const fabAction = computed(() => {
 	if (!hasEditPermission.value) return;
 
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index acab871f56..8aeb295432 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -21,18 +21,13 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		isCollaboraFileDialogOpen.value = true;
 	};
 
-	const folderId = ref("");
-	const setFolderId = (folderIdParam: string) => {
-		folderId.value = folderIdParam;
-	};
-
-	const uploadCollaboraFile = async (type: CollaboraFileType, fileName: string) => {
+	const uploadCollaboraFile = async (type: CollaboraFileType, folderId: string, fileName: string) => {
 		const assetUrl = getCollaboraAssetUrl(type);
 		const fileExtension = getFileExtension(assetUrl);
 
 		try {
 			const fullFileName = fileExtension ? `${fileName}.${fileExtension}` : fileName;
-			await uploadFromUrl(assetUrl, folderId.value, FileRecordParentType.BOARDNODES, fullFileName);
+			await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
 		} catch {
 			// Handle error appropriately
 		} finally {
@@ -44,17 +39,20 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		{
 			id: "1",
 			label: t("components.elementTypeSelection.elements.collabora.option.text"),
-			action: async (fileName: string) => uploadCollaboraFile(CollaboraFileType.Text, fileName),
+			action: async (folderId: string, fileName: string) =>
+				uploadCollaboraFile(CollaboraFileType.Text, folderId, fileName),
 		},
 		{
 			id: "2",
 			label: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
-			action: async (fileName: string) => uploadCollaboraFile(CollaboraFileType.Spreadsheet, fileName),
+			action: async (folderId: string, fileName: string) =>
+				uploadCollaboraFile(CollaboraFileType.Spreadsheet, folderId, fileName),
 		},
 		{
 			id: "3",
 			label: t("components.elementTypeSelection.elements.collabora.option.presentation"),
-			action: async (fileName: string) => uploadCollaboraFile(CollaboraFileType.Presentation, fileName),
+			action: async (folderId: string, fileName: string) =>
+				uploadCollaboraFile(CollaboraFileType.Presentation, folderId, fileName),
 		},
 	];
 
@@ -63,6 +61,5 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		isCollaboraFileDialogOpen,
 		openCollaboraFileDialog,
 		closeCollaboraFileDialog,
-		setFolderId,
 	};
 });

From 8096c4ee6eb7c062fc24474685150b791650c5ff Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 10:37:40 +0100
Subject: [PATCH 028/100] Add missing tests for non-interactive files

---
 .../file-table/FileInteractionHandler.unit.ts | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
index ff614ef940..e0c656246a 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.unit.ts
@@ -183,6 +183,36 @@ describe("FileInteractionHandler", () => {
 			});
 		});
 
+		describe("when collabora is not enabled", () => {
+			it("should render div instead of button", () => {
+				const { wrapper } = setup(
+					{ mimeType: "application/msword", isCollaboraEditable: true },
+					{ isCollaboraEnabled: false }
+				);
+
+				const div = wrapper.find("div");
+				const button = wrapper.find("button");
+
+				expect(div.exists()).toBe(true);
+				expect(button.exists()).toBe(false);
+			});
+		});
+
+		describe("when collabora file is not editable", () => {
+			it("should render div instead of button", () => {
+				const { wrapper } = setup(
+					{ mimeType: "application/msword", isCollaboraEditable: false },
+					{ isCollaboraEnabled: true }
+				);
+
+				const div = wrapper.find("div");
+				const button = wrapper.find("button");
+
+				expect(div.exists()).toBe(true);
+				expect(button.exists()).toBe(false);
+			});
+		});
+
 		describe("when preview is not possible and mimeType is not audio or video", () => {
 			it("should render div instead of button", () => {
 				const { wrapper } = setup({

From 7941a0789686fc3d01c61c71a695c3281955a8e3 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 14:26:49 +0100
Subject: [PATCH 029/100] Add tests

---
 .../folder/AddCollaboraFileDialog.unit.ts     | 280 ++++++++++++++++++
 .../feature/folder/AddCollaboraFileDialog.vue |  26 +-
 .../add-collabora-file.composable.unit.ts     |  96 ++++++
 3 files changed, 399 insertions(+), 3 deletions(-)
 create mode 100644 src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
 create mode 100644 src/modules/feature/folder/add-collabora-file.composable.unit.ts

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
new file mode 100644
index 0000000000..67a2ac87e3
--- /dev/null
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -0,0 +1,280 @@
+import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
+import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
+import { Dialog } from "@ui-dialog";
+import { flushPromises, mount } from "@vue/test-utils";
+import { nextTick, ref } from "vue";
+import { VForm, VSelect } from "vuetify/lib/components/index";
+
+vi.mock("./add-collabora-file.composable");
+const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
+
+interface CollaboraFileSelectionOptions {
+	id: string;
+	label: string;
+	action: (fileName: string, caption: string) => Promise<void>;
+}
+
+const collaboraFileSelectionOptionsFactory = {
+	createCollaboraFileSelectionOptionsList: () => [
+		{
+			id: "1",
+			label: "Text Document",
+			action: vi.fn(),
+		},
+		{
+			id: "2",
+			label: "Table Document",
+			action: vi.fn(),
+		},
+		{
+			id: "3",
+			label: "Presentation Document",
+			action: vi.fn(),
+		},
+	],
+};
+const openCollaboraFileDialog = vi.fn();
+const closeCollaboraFileDialog = vi.fn();
+const isCollaboraFileDialogOpen = ref(false);
+const collaboraFileSelectionOptions: Array<CollaboraFileSelectionOptions> =
+	collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
+
+const mocks = {
+	collaboraFileSelectionOptions,
+	isCollaboraFileDialogOpen,
+	openCollaboraFileDialog,
+	closeCollaboraFileDialog,
+};
+
+mockedCollaboraFileSelection.mockReturnValue(mocks);
+
+describe("CollaboraFileDialog", () => {
+	const setupMocks = () => {
+		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen, collaboraFileSelectionOptions } =
+			mockedCollaboraFileSelection();
+
+		return {
+			isCollaboraFileDialogOpen,
+			closeCollaboraFileDialog,
+			collaboraFileSelectionOptions,
+		};
+	};
+
+	describe("when isCollaboraFileDialogOpen is false", () => {
+		const setup = () => {
+			document.body.setAttribute("data-app", "true");
+
+			vi.clearAllMocks();
+			setupMocks();
+
+			const wrapper = mount(AddCollaboraFileDialog, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+					stubs: { UseFocusTrap: true },
+				},
+				props: {
+					folderId: "folder-id",
+				},
+			});
+
+			return { wrapper };
+		};
+
+		it("should be found in dom", () => {
+			const { wrapper } = setup();
+
+			expect(wrapper.exists()).toBe(true);
+		});
+
+		it("the modal should not be visible", () => {
+			const { wrapper } = setup();
+
+			expect(wrapper.findComponent(VForm).exists()).toBe(false);
+		});
+	});
+
+	describe("when isCollaboraFileDialogOpen is changed from false to true", () => {
+		const setup = async () => {
+			document.body.setAttribute("data-app", "true");
+
+			vi.clearAllMocks();
+			setupMocks();
+
+			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = setupMocks();
+
+			const wrapper = mount(AddCollaboraFileDialog, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+					stubs: { UseFocusTrap: true },
+				},
+				props: {
+					folderId: "folder-id",
+				},
+				attachTo: document.body,
+			});
+
+			isCollaboraFileDialogOpen.value = true;
+			await nextTick();
+
+			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions, wrapper };
+		};
+
+		it("should make modal visible", async () => {
+			const { wrapper } = await setup();
+
+			expect(wrapper.findComponent(VForm).exists()).toBe(true);
+			expect(wrapper.findComponent(VForm).isVisible()).toBe(true);
+		});
+
+		it("should have confirm button disabled initially", async () => {
+			const { wrapper } = await setup();
+
+			const dialog = wrapper.findComponent(Dialog);
+			expect(dialog.props("confirmBtnDisabled")).toBe(true);
+		});
+
+		it("should render options", async () => {
+			const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+			const typeSelect = wrapper.findComponent(VSelect);
+			expect(typeSelect.props("items")).toBe(collaboraFileSelectionOptions);
+		});
+
+		describe("when form is valid", () => {
+			it("should call item action", async () => {
+				const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+				const selectOption = collaboraFileSelectionOptions[0];
+				const FILENAME = "myDocument";
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await nextTick();
+				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
+				await nextTick();
+
+				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+				expect(selectOption.action).toHaveBeenCalled();
+				expect(selectOption.action).toHaveBeenCalledWith("folder-id", FILENAME);
+			});
+
+			it("should have confirm button enabled", async () => {
+				const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+				const selectOption = collaboraFileSelectionOptions[0];
+				const FILENAME = "myDocument";
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await nextTick();
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(false);
+			});
+		});
+
+		describe("when filetype is not selected", () => {
+			it("should not call item action", async () => {
+				const { collaboraFileSelectionOptions, wrapper } = await setup();
+				const selectOption = collaboraFileSelectionOptions[0];
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue("myDocument");
+				await nextTick();
+
+				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+				expect(selectOption.action).toHaveBeenCalledTimes(0);
+			});
+
+			it("should have confirm button disabled", async () => {
+				const { wrapper } = await setup();
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue("myDocument");
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(true);
+			});
+		});
+
+		describe("when filename is empty", () => {
+			it("should not call item action", async () => {
+				const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+				const selectOption = collaboraFileSelectionOptions[0];
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await nextTick();
+				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
+				expect(fileNameInput.element.value).toBe("");
+
+				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+				expect(selectOption.action).toHaveBeenCalledTimes(0);
+			});
+
+			it("should have confirm button disabled", async () => {
+				const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+				const selectOption = collaboraFileSelectionOptions[0];
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(true);
+			});
+		});
+
+		describe("when filename contains invalid characters", () => {
+			it("should have confirm button disabled", async () => {
+				const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+				const selectOption = collaboraFileSelectionOptions[0];
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await nextTick();
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue("invalid/filename");
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(true);
+			});
+		});
+
+		it("should close modal on close button click", async () => {
+			const { closeCollaboraFileDialog, wrapper } = await setup();
+
+			const dialog = wrapper.findComponent(Dialog);
+			dialog.vm.$emit("cancel");
+
+			await nextTick();
+
+			expect(closeCollaboraFileDialog).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index 3697b6a540..efb4972549 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -2,6 +2,7 @@
 	<Dialog
 		v-model:is-dialog-open="isCollaboraFileDialogOpen"
 		:message="t('components.elementTypeSelection.elements.collabora.subtitle')"
+		:confirm-btn-disabled="!isFormValid"
 		confirm-btn-lang-key="common.actions.create"
 		data-testid="collabora-element-dialog"
 		@cancel="onCancel"
@@ -35,8 +36,8 @@
 <script setup lang="ts">
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import { Dialog } from "@ui-dialog";
-import { isRequired, useOpeningTagValidator } from "@util-validators";
-import { ref } from "vue";
+import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
+import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
 const props = defineProps({
@@ -52,6 +53,7 @@ type VuetifyForm = {
 
 const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = useAddCollaboraFile();
 const { validateOnOpeningTag } = useOpeningTagValidator();
+const { validateInvalidCharacters } = useInvalidCharactersValidator();
 
 const { t } = useI18n();
 
@@ -61,7 +63,25 @@ const selectedDocType = ref<string | null>(null);
 const fileName = ref<string>("");
 
 const docTypeRules = [isRequired(t("common.validation.required2"))];
-const fileNameRules = [(value: string) => validateOnOpeningTag(value), isRequired(t("common.validation.required2"))];
+
+const fileNameRules = [
+	(value: string) => validateOnOpeningTag(value),
+	isRequired(t("common.validation.required2")),
+	(value: string) => validateInvalidCharacters(value, ["/"]),
+];
+
+const passesAllRules = (value: string, rules: ((value: string) => true | string)[]): boolean =>
+	rules.every((rule) => rule(value) === true);
+
+const isFormValid = computed(() => {
+	if (!selectedDocType.value) {
+		return false;
+	}
+
+	const isFileNameValid = passesAllRules(fileName.value, fileNameRules);
+
+	return isFileNameValid;
+});
 
 const resetForm = () => {
 	selectedDocType.value = null;
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
new file mode 100644
index 0000000000..ebf41c133f
--- /dev/null
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -0,0 +1,96 @@
+import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import * as FileStorageApi from "@data-file";
+import { createMock } from "@golevelup/ts-vitest";
+import { createTestingPinia } from "@pinia/testing";
+import { setActivePinia } from "pinia";
+
+vi.mock("vue-i18n", () => ({
+	useI18n: vi.fn().mockReturnValue({
+		t: vi.fn().mockImplementation((key: string) => key),
+		n: vi.fn().mockImplementation((key: string) => key),
+	}),
+}));
+
+const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValue(fileStorageApiMock);
+
+describe("AddCollaboraFileComposable", () => {
+	const setup = () => {
+		const {
+			openCollaboraFileDialog,
+			closeCollaboraFileDialog,
+			collaboraFileSelectionOptions,
+			isCollaboraFileDialogOpen,
+		} = useAddCollaboraFile();
+
+		return {
+			collaboraFileSelectionOptions,
+			openCollaboraFileDialog,
+			isCollaboraFileDialogOpen,
+			closeCollaboraFileDialog,
+		};
+	};
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe("openCollaboraFileDialog", () => {
+		it("should set isCollaboraFileDialogOpen to true", () => {
+			const { openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
+
+			isCollaboraFileDialogOpen.value = false;
+			expect(isCollaboraFileDialogOpen.value).toBe(false);
+
+			openCollaboraFileDialog();
+
+			expect(isCollaboraFileDialogOpen.value).toBe(true);
+		});
+	});
+
+	describe("closeCollaboraFileDialog", () => {
+		it("should set isCollaboraFileDialogOpen to false", () => {
+			const { closeCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
+
+			isCollaboraFileDialogOpen.value = true;
+			expect(isCollaboraFileDialogOpen.value).toBe(true);
+
+			closeCollaboraFileDialog();
+
+			expect(isCollaboraFileDialogOpen.value).toBe(false);
+		});
+	});
+
+	describe("collaboraFileSelectionOptions", () => {
+		it("provides options for collabora file types", () => {
+			const { collaboraFileSelectionOptions } = setup();
+
+			expect(collaboraFileSelectionOptions).toHaveLength(3);
+			expect(collaboraFileSelectionOptions[0].label).toBe(
+				"components.elementTypeSelection.elements.collabora.option.text"
+			);
+			expect(collaboraFileSelectionOptions[1].label).toBe(
+				"components.elementTypeSelection.elements.collabora.option.spreadsheet"
+			);
+			expect(collaboraFileSelectionOptions[2].label).toBe(
+				"components.elementTypeSelection.elements.collabora.option.presentation"
+			);
+		});
+
+		describe("action of collaboraFileSelectionOptions", () => {
+			it("should upload collabora file", async () => {
+				const { collaboraFileSelectionOptions } = setup();
+
+				for (const option of collaboraFileSelectionOptions) {
+					await option.action("test-office-file", "");
+				}
+
+				expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
+			});
+		});
+	});
+});

From 2884d816ee2c98cb5adc6fda064adb50d5c3ae4a Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 15:51:04 +0100
Subject: [PATCH 030/100] Add test

---
 .../feature/folder/add-collabora-file.composable.ts  | 12 ++++--------
 .../folder/add-collabora-file.composable.unit.ts     | 11 +++++++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index 8aeb295432..57a6555f7e 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -24,15 +24,11 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 	const uploadCollaboraFile = async (type: CollaboraFileType, folderId: string, fileName: string) => {
 		const assetUrl = getCollaboraAssetUrl(type);
 		const fileExtension = getFileExtension(assetUrl);
+		const fullFileName = `${fileName}.${fileExtension}`;
 
-		try {
-			const fullFileName = fileExtension ? `${fileName}.${fileExtension}` : fileName;
-			await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
-		} catch {
-			// Handle error appropriately
-		} finally {
-			closeCollaboraFileDialog();
-		}
+		await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
+
+		closeCollaboraFileDialog();
 	};
 
 	const collaboraFileSelectionOptions = [
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index ebf41c133f..c625ce38ba 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -91,6 +91,17 @@ describe("AddCollaboraFileComposable", () => {
 
 				expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
 			});
+
+			it("should set isCollaboraFileDialogOpen to false", async () => {
+				const { collaboraFileSelectionOptions, closeCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
+
+				for (const option of collaboraFileSelectionOptions) {
+					await option.action("test-office-file", "");
+				}
+
+				expect(closeCollaboraFileDialog).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
+				expect(isCollaboraFileDialogOpen.value).toBe(false);
+			});
 		});
 	});
 });

From 8e28b27e0dfcf0325998039fd409d0ffcbb76726 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 24 Nov 2025 16:10:21 +0100
Subject: [PATCH 031/100] fix test

---
 .../folder/add-collabora-file.composable.unit.ts   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index c625ce38ba..49744fbbc5 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -86,20 +86,20 @@ describe("AddCollaboraFileComposable", () => {
 				const { collaboraFileSelectionOptions } = setup();
 
 				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
+					await option.action("folder-id", "test-office-file");
 				}
 
 				expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
 			});
 
-			it("should set isCollaboraFileDialogOpen to false", async () => {
-				const { collaboraFileSelectionOptions, closeCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
+			it("should finally close dialog", async () => {
+				const { collaboraFileSelectionOptions, openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
 
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
+				openCollaboraFileDialog();
+				expect(isCollaboraFileDialogOpen.value).toBe(true);
+
+				await collaboraFileSelectionOptions[0].action("folder-id", "test-office-file");
 
-				expect(closeCollaboraFileDialog).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
 				expect(isCollaboraFileDialogOpen.value).toBe(false);
 			});
 		});

From c2a53123493674c24d6ba384c3d182bcb8afe2b4 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 08:08:50 +0100
Subject: [PATCH 032/100] Add return uploaded file record info

---
 src/modules/data/file/FileStorageApi.composable.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index 4787019025..c464dcf9fa 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -1,6 +1,12 @@
 import { useFileRecordsStore } from "./FileRecords.state";
 import { useParentStatisticsStore } from "./ParentStatistics.state";
-import { FileApiFactory, FileApiInterface, WopiApiFactory, WopiApiInterface } from "@/fileStorageApi/v3";
+import {
+	FileApiFactory,
+	FileApiInterface,
+	FileRecordResponse,
+	WopiApiFactory,
+	WopiApiInterface,
+} from "@/fileStorageApi/v3";
 import {
 	EditorMode,
 	FileRecord,
@@ -74,7 +80,7 @@ export const useFileStorageApi = () => {
 		parentId: string,
 		parentType: FileRecordParent,
 		fileName?: string
-	): Promise<void> => {
+	): Promise<FileRecordResponse | void> => {
 		try {
 			const { pathname } = new URL(imageUrl);
 			fileName = fileName ?? pathname.substring(pathname.lastIndexOf("/") + 1);
@@ -93,6 +99,8 @@ export const useFileStorageApi = () => {
 			);
 
 			upsertFileRecords([response.data]);
+
+			return response.data;
 		} catch (error) {
 			showError(error);
 		}

From 9ec873b4dc533733be8ad87206737b3754d7e04b Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 08:09:10 +0100
Subject: [PATCH 033/100] Add opening new doc in tab

---
 .../folder/AddCollaboraFileDialog.unit.ts     |  3 ++
 src/modules/feature/folder/Folder.vue         | 28 ++++++++++++++++++-
 .../folder/add-collabora-file.composable.ts   |  7 +++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index 67a2ac87e3..9a8ed500ff 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -1,5 +1,6 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
+import { FileRecordResponse } from "@/fileStorageApi/v3";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
@@ -37,6 +38,7 @@ const collaboraFileSelectionOptionsFactory = {
 const openCollaboraFileDialog = vi.fn();
 const closeCollaboraFileDialog = vi.fn();
 const isCollaboraFileDialogOpen = ref(false);
+const latestAddedCollaboraFile = ref<FileRecordResponse | null>(null);
 const collaboraFileSelectionOptions: Array<CollaboraFileSelectionOptions> =
 	collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
 
@@ -45,6 +47,7 @@ const mocks = {
 	isCollaboraFileDialogOpen,
 	openCollaboraFileDialog,
 	closeCollaboraFileDialog,
+	latestAddedCollaboraFile,
 };
 
 mockedCollaboraFileSelection.mockReturnValue(mocks);
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 12658d4919..642976c1cd 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -52,6 +52,7 @@ import FolderMenu from "./FolderMenu.vue";
 import RenameFolderDialog from "./RenameFolderDialog.vue";
 import { useErrorHandler } from "@/components/error-handling/ErrorHandler.composable";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
+import { FileRecordResponse } from "@/fileStorageApi/v3";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store"; // FIX_CIRCULAR_DEPENDENCY
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
@@ -99,7 +100,7 @@ const boardStore = useBoardStore();
 const { hasEditPermission } = useBoardPermissions();
 const { handleError, notifyWithTemplate } = useErrorHandler();
 
-const { openCollaboraFileDialog } = useAddCollaboraFile();
+const { openCollaboraFileDialog, latestAddedCollaboraFile } = useAddCollaboraFile();
 
 const folderId = toRef(props, "folderId");
 const fileRecords = computed(() => getFileRecordsByParentId(folderId.value));
@@ -141,6 +142,31 @@ const fabAction = computed(() => {
 	};
 });
 
+watch(
+	() => latestAddedCollaboraFile.value,
+	(newFile) => {
+		if (!hasEditPermission.value) return;
+
+		if (newFile) {
+			openCollabora(newFile);
+		}
+	}
+);
+
+const openCollabora = (newFile: FileRecordResponse) => {
+	const editorMode = "edit";
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: newFile.id,
+		},
+		query: {
+			editorMode,
+		},
+	}).href;
+	window.open(url, "_blank");
+};
+
 const uploadProgress = ref({
 	uploaded: 0,
 	total: 0,
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index 57a6555f7e..cd99bdf6a4 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -1,4 +1,4 @@
-import { FileRecordParentType } from "@/fileStorageApi/v3";
+import { FileRecordParentType, FileRecordResponse } from "@/fileStorageApi/v3";
 import { CollaboraFileType } from "@/types/enum/Collabora";
 import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
 import { getFileExtension } from "@/utils/fileHelper";
@@ -12,6 +12,7 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 	const { uploadFromUrl } = useFileStorageApi();
 
 	const isCollaboraFileDialogOpen = ref<boolean>(false);
+	const latestAddedCollaboraFile = ref<FileRecordResponse | null>(null);
 
 	const closeCollaboraFileDialog = () => {
 		isCollaboraFileDialogOpen.value = false;
@@ -26,7 +27,8 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		const fileExtension = getFileExtension(assetUrl);
 		const fullFileName = `${fileName}.${fileExtension}`;
 
-		await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
+		const fileRecordResponse = await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
+		latestAddedCollaboraFile.value = fileRecordResponse ?? null;
 
 		closeCollaboraFileDialog();
 	};
@@ -57,5 +59,6 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		isCollaboraFileDialogOpen,
 		openCollaboraFileDialog,
 		closeCollaboraFileDialog,
+		latestAddedCollaboraFile,
 	};
 });

From f22b7060f89f9fc6ac2c13524c2933e9c4655685 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 11:08:17 +0100
Subject: [PATCH 034/100] Move openCollabora to helpers

---
 .../board-file-element/FileContentElement.vue | 21 ++---------
 .../shared/add-collabora-file.composable.ts   |  2 +-
 src/modules/feature/folder/Folder.vue         | 18 +--------
 .../folder/add-collabora-file.composable.ts   |  2 +-
 src/modules/util/collabora/helpers.ts         | 37 +++++++++++++++++++
 .../util/collabora/helpers.unit.ts}           |  2 +-
 src/modules/util/collabora/index.ts           |  3 ++
 src/utils/collaboraHelper.ts                  | 14 -------
 tsconfig.json                                 |  1 +
 9 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 src/modules/util/collabora/helpers.ts
 rename src/{utils/collaboraHelper.unit.ts => modules/util/collabora/helpers.unit.ts} (92%)
 create mode 100644 src/modules/util/collabora/index.ts
 delete mode 100644 src/utils/collaboraHelper.ts

diff --git a/src/modules/feature/board-file-element/FileContentElement.vue b/src/modules/feature/board-file-element/FileContentElement.vue
index d6ef207ad7..9688d842f8 100644
--- a/src/modules/feature/board-file-element/FileContentElement.vue
+++ b/src/modules/feature/board-file-element/FileContentElement.vue
@@ -57,7 +57,6 @@
 <script setup lang="ts">
 import { useFileAlerts } from "./content/alert/useFileAlerts.composable";
 import FileContent from "./content/FileContent.vue";
-import { mapEditBoardPermissionToEditorMode } from "./mapper";
 import { FileAlert } from "./shared/types/FileAlert.enum";
 import FileUpload from "./upload/FileUpload.vue";
 import { FileRecordParentType, PreviewWidth } from "@/fileStorageApi/v3";
@@ -70,6 +69,7 @@ import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { BoardMenuScope } from "@ui-board";
 import { KebabMenuActionDelete, KebabMenuActionMoveDown, KebabMenuActionMoveUp } from "@ui-kebab-menu";
+import { openCollabora } from "@util-collabora";
 import { useDebounceFn } from "@vueuse/core";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -213,22 +213,9 @@ const cardAriaLabel = computed(() => {
 	return undefined;
 });
 const onCardInteraction = () => {
-	if (isCollaboraEnabled.value && isCollaboraEditable.value) openCollabora();
-};
-const openCollabora = () => {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
-
-	const url = router.resolve({
-		name: "collabora",
-		params: {
-			id: fileRecord.value.id,
-		},
-		query: {
-			editorMode,
-		},
-	}).href;
-
-	window.open(url, "_blank");
+	if (isCollaboraEnabled.value && isCollaboraEditable.value) {
+		openCollabora(router, fileRecord.value, hasEditPermission.value);
+	}
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
index 1d7c7aabfd..a40745a0ea 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.ts
@@ -3,11 +3,11 @@ import { ContentElementType } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
 import { CollaboraFileType } from "@/types/enum/Collabora";
-import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
 import { getFileExtension } from "@/utils/fileHelper";
 import { type CreateElementRequestPayload, useCardStore } from "@data-board";
 import { useFileStorageApi } from "@data-file";
 import { useSharedFileSelect } from "@util-board";
+import { getCollaboraAssetUrl } from "@util-collabora";
 import { createSharedComposable } from "@vueuse/core";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 642976c1cd..2e050f7580 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -52,7 +52,6 @@ import FolderMenu from "./FolderMenu.vue";
 import RenameFolderDialog from "./RenameFolderDialog.vue";
 import { useErrorHandler } from "@/components/error-handling/ErrorHandler.composable";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
-import { FileRecordResponse } from "@/fileStorageApi/v3";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store"; // FIX_CIRCULAR_DEPENDENCY
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
@@ -67,6 +66,7 @@ import { useFolderState } from "@data-folder";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
+import { openCollabora } from "@util-collabora";
 import dayjs from "dayjs";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -148,25 +148,11 @@ watch(
 		if (!hasEditPermission.value) return;
 
 		if (newFile) {
-			openCollabora(newFile);
+			openCollabora(router, newFile, hasEditPermission.value);
 		}
 	}
 );
 
-const openCollabora = (newFile: FileRecordResponse) => {
-	const editorMode = "edit";
-	const url = router.resolve({
-		name: "collabora",
-		params: {
-			id: newFile.id,
-		},
-		query: {
-			editorMode,
-		},
-	}).href;
-	window.open(url, "_blank");
-};
-
 const uploadProgress = ref({
 	uploaded: 0,
 	total: 0,
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index cd99bdf6a4..3af6977ef1 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -1,8 +1,8 @@
 import { FileRecordParentType, FileRecordResponse } from "@/fileStorageApi/v3";
 import { CollaboraFileType } from "@/types/enum/Collabora";
-import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
 import { getFileExtension } from "@/utils/fileHelper";
 import { useFileStorageApi } from "@data-file";
+import { getCollaboraAssetUrl } from "@util-collabora";
 import { createSharedComposable } from "@vueuse/core";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
diff --git a/src/modules/util/collabora/helpers.ts b/src/modules/util/collabora/helpers.ts
new file mode 100644
index 0000000000..59f5bbfc73
--- /dev/null
+++ b/src/modules/util/collabora/helpers.ts
@@ -0,0 +1,37 @@
+import { FileRecordResponse } from "@/fileStorageApi/v3";
+import { CollaboraFileType } from "@/types/enum/Collabora";
+import { EditorMode } from "@/types/file/File";
+import { Router } from "vue-router";
+
+export function mapEditBoardPermissionToEditorMode(hasEditPermission: boolean): string {
+	const editorMode = hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW;
+
+	return editorMode;
+}
+
+export function getCollaboraAssetUrl(collaboraFileType: CollaboraFileType): string {
+	const base = `${window.location.origin}/collabora`;
+
+	if (collaboraFileType === CollaboraFileType.Text) {
+		return `${base}/doc.docx`;
+	}
+	if (collaboraFileType === CollaboraFileType.Spreadsheet) {
+		return `${base}/spreadsheet.xlsx`;
+	}
+
+	return `${base}/presentation.pptx`;
+}
+
+export function openCollabora(router: Router, collaboraFile: FileRecordResponse, hasEditPermission: boolean): void {
+	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: collaboraFile.id,
+		},
+		query: {
+			editorMode,
+		},
+	}).href;
+	window.open(url, "_blank");
+}
diff --git a/src/utils/collaboraHelper.unit.ts b/src/modules/util/collabora/helpers.unit.ts
similarity index 92%
rename from src/utils/collaboraHelper.unit.ts
rename to src/modules/util/collabora/helpers.unit.ts
index 3fed641dd2..10f8b77c21 100644
--- a/src/utils/collaboraHelper.unit.ts
+++ b/src/modules/util/collabora/helpers.unit.ts
@@ -1,5 +1,5 @@
+import { getCollaboraAssetUrl } from "./helpers";
 import { CollaboraFileType } from "@/types/enum/Collabora";
-import { getCollaboraAssetUrl } from "@/utils/collaboraHelper";
 
 describe("@/utils/collaboraHelper", () => {
 	describe("getCollaboraAssetUrl", () => {
diff --git a/src/modules/util/collabora/index.ts b/src/modules/util/collabora/index.ts
new file mode 100644
index 0000000000..70b181f670
--- /dev/null
+++ b/src/modules/util/collabora/index.ts
@@ -0,0 +1,3 @@
+import { getCollaboraAssetUrl, openCollabora } from "./helpers";
+
+export { getCollaboraAssetUrl, openCollabora };
diff --git a/src/utils/collaboraHelper.ts b/src/utils/collaboraHelper.ts
deleted file mode 100644
index c6e78d5310..0000000000
--- a/src/utils/collaboraHelper.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { CollaboraFileType } from "@/types/enum/Collabora";
-
-export function getCollaboraAssetUrl(collaboraFileType: CollaboraFileType): string {
-	const base = `${window.location.origin}/collabora`;
-
-	if (collaboraFileType === CollaboraFileType.Text) {
-		return `${base}/doc.docx`;
-	}
-	if (collaboraFileType === CollaboraFileType.Spreadsheet) {
-		return `${base}/spreadsheet.xlsx`;
-	}
-
-	return `${base}/presentation.pptx`;
-}
diff --git a/tsconfig.json b/tsconfig.json
index e170731d55..07fa96b414 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -103,6 +103,7 @@
 			"@util-device-detection": ["src/modules/util/device-detection"],
 			"@util-error-notification": ["src/modules/util/error-notification"],
 			"@util-logger": ["src/modules/util/logger"],
+			"@util-collabora": ["src/modules/util/collabora"],
 			"@page-board": ["src/modules/page/board"],
 			"@page-class-members": ["src/modules/page/class-members"],
 			"@page-media-shelf": ["src/modules/page/media-shelf"],

From fbf3bd4fa0deb8c95b751d2918dc1a6695a77750 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 12:50:50 +0100
Subject: [PATCH 035/100] Add tests

---
 src/modules/util/collabora/helpers.unit.ts | 87 ++++++++++++++++++----
 1 file changed, 74 insertions(+), 13 deletions(-)

diff --git a/src/modules/util/collabora/helpers.unit.ts b/src/modules/util/collabora/helpers.unit.ts
index 10f8b77c21..ff1515024f 100644
--- a/src/modules/util/collabora/helpers.unit.ts
+++ b/src/modules/util/collabora/helpers.unit.ts
@@ -1,21 +1,82 @@
-import { getCollaboraAssetUrl } from "./helpers";
+import { getCollaboraAssetUrl, mapEditBoardPermissionToEditorMode, openCollabora } from "./helpers";
 import { CollaboraFileType } from "@/types/enum/Collabora";
+import { EditorMode } from "@/types/file/File";
+import { fileRecordFactory } from "@@/tests/test-utils/factory/filerecordResponse.factory";
+import { createMock } from "@golevelup/ts-vitest";
+import { Router } from "vue-router";
 
-describe("@/utils/collaboraHelper", () => {
-	describe("getCollaboraAssetUrl", () => {
-		it("should return correct URL for CollaboraFileType.Text", () => {
-			const url = getCollaboraAssetUrl(CollaboraFileType.Text);
-			expect(url).toBe(`${window.location.origin}/collabora/doc.docx`);
-		});
+vi.mock("vue-router");
+
+describe("getCollaboraAssetUrl", () => {
+	it("should return correct URL for CollaboraFileType.Text", () => {
+		const url = getCollaboraAssetUrl(CollaboraFileType.Text);
+		expect(url).toBe(`${window.location.origin}/collabora/doc.docx`);
+	});
+
+	it("should return correct URL for CollaboraFileType.Spreadsheet", () => {
+		const url = getCollaboraAssetUrl(CollaboraFileType.Spreadsheet);
+		expect(url).toBe(`${window.location.origin}/collabora/spreadsheet.xlsx`);
+	});
+
+	it("should return correct URL for CollaboraFileType.Presentation", () => {
+		const url = getCollaboraAssetUrl(CollaboraFileType.Presentation);
+		expect(url).toBe(`${window.location.origin}/collabora/presentation.pptx`);
+	});
+});
+
+describe("mapEditBoardPermissionToEditorMode", () => {
+	it("returns EDIT when hasEditPermission is true", () => {
+		const result = mapEditBoardPermissionToEditorMode(true);
+
+		expect(result).toBe(EditorMode.EDIT);
+	});
 
-		it("should return correct URL for CollaboraFileType.Spreadsheet", () => {
-			const url = getCollaboraAssetUrl(CollaboraFileType.Spreadsheet);
-			expect(url).toBe(`${window.location.origin}/collabora/spreadsheet.xlsx`);
+	it("returns VIEW when hasEditPermission is false", () => {
+		const result = mapEditBoardPermissionToEditorMode(false);
+
+		expect(result).toBe(EditorMode.VIEW);
+	});
+});
+
+describe("openCollabora", () => {
+	const setup = (hasEditPermission: boolean) => {
+		const fileRecordResponse = fileRecordFactory.build();
+
+		const router = createMock<Router>();
+		const collaboraPageUrl =
+			"/collabora/" + fileRecordResponse.id + "?editorMode=" + (hasEditPermission ? "edit" : "view");
+		router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
+
+		return { fileRecordResponse, router };
+	};
+
+	it("opens collabora in edit mode when hasEditPermission is true", () => {
+		const { fileRecordResponse, router } = setup(true);
+		const windowOpenMock = vi.fn();
+		const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+
+		openCollabora(router, fileRecordResponse, true);
+		expect(router.resolve).toHaveBeenCalledWith({
+			name: "collabora",
+			params: { id: fileRecordResponse.id },
+			query: { editorMode: EditorMode.EDIT },
 		});
+		expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
+		windowOpenSpy.mockRestore();
+	});
+
+	it("opens collabora in view mode when hasEditPermission is false", () => {
+		const { fileRecordResponse, router } = setup(false);
+		const windowOpenMock = vi.fn();
+		const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
-		it("should return correct URL for CollaboraFileType.Presentation", () => {
-			const url = getCollaboraAssetUrl(CollaboraFileType.Presentation);
-			expect(url).toBe(`${window.location.origin}/collabora/presentation.pptx`);
+		openCollabora(router, fileRecordResponse, false);
+		expect(router.resolve).toHaveBeenCalledWith({
+			name: "collabora",
+			params: { id: fileRecordResponse.id },
+			query: { editorMode: EditorMode.VIEW },
 		});
+		expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=view`, "_blank");
+		windowOpenSpy.mockRestore();
 	});
 });

From f147b736deb873a436e89e8fa6d6ed088479ca9d Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 13:12:50 +0100
Subject: [PATCH 036/100] Adjust tests

---
 .../FileContentElement.unit.ts                | 179 ++++++------------
 1 file changed, 60 insertions(+), 119 deletions(-)

diff --git a/src/modules/feature/board-file-element/FileContentElement.unit.ts b/src/modules/feature/board-file-element/FileContentElement.unit.ts
index 73c7d21e86..9c80105c6f 100644
--- a/src/modules/feature/board-file-element/FileContentElement.unit.ts
+++ b/src/modules/feature/board-file-element/FileContentElement.unit.ts
@@ -15,6 +15,7 @@ import { useBoardPermissions, useContentElementState } from "@data-board";
 import * as FileStorageApi from "@data-file";
 import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
+import * as utilCollabora from "@util-collabora";
 import { shallowMount } from "@vue/test-utils";
 import { setActivePinia } from "pinia";
 import { Mock } from "vitest";
@@ -162,11 +163,12 @@ describe("FileContentElement", () => {
 					isCollaboraEditable: props?.isCollaboraEditable ?? false,
 				});
 
-				const collaboraPageUrl = "/collabora/" + fileRecordResponse.id + "?editorMode=edit";
 				const router = createMock<Router>();
 				const useRouterMock = <Mock>useRouter;
 				useRouterMock.mockReturnValue(router);
-				router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
+
+				const windowOpenMock = vi.fn();
+				vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -214,6 +216,7 @@ describe("FileContentElement", () => {
 					menu,
 					addAlertMock,
 					fileStorageApiMock,
+					router,
 				};
 			};
 
@@ -392,41 +395,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -446,41 +441,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -500,41 +487,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -554,41 +533,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -602,11 +573,12 @@ describe("FileContentElement", () => {
 					const element = fileElementResponseFactory.build();
 					document.body.setAttribute("data-app", "true");
 
-					const collaboraPageUrl = "/collabora/" + "123" + "?editorMode=edit";
 					const router = createMock<Router>();
 					const useRouterMock = <Mock>useRouter;
 					useRouterMock.mockReturnValue(router);
-					router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
+
+					const windowOpenMock = vi.fn();
+					vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 					const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 					vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -785,12 +757,12 @@ describe("FileContentElement", () => {
 					isCollaboraEditable: props?.isCollaboraEditable ?? false,
 				});
 
-				const collaboraPageUrl = "/collabora/" + fileRecordResponse.id + "?editorMode=edit";
 				const router = createMock<Router>();
 				const useRouterMock = <Mock>useRouter;
-
 				useRouterMock.mockReturnValue(router);
-				router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
+
+				const windowOpenMock = vi.fn();
+				vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -837,6 +809,7 @@ describe("FileContentElement", () => {
 					element,
 					expectedFileProperties,
 					menu,
+					router,
 				};
 			};
 
@@ -1001,41 +974,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -1055,41 +1020,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -1109,41 +1066,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});
@@ -1163,41 +1112,33 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						card.trigger("click");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse } = setup({
+						const { wrapper, fileRecordResponse, router } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
-
 						const card = wrapper.findComponent(VCard);
-
-						const windowOpenMock = vi.fn();
-						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
 						await card.trigger("keydown.enter");
 
-						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
-
-						windowOpenSpy.mockRestore();
+						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
 					});
 				});
 			});

From 6364ac5c290fc2c5491e3669e85f6cf4435ab80b Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 15:05:08 +0100
Subject: [PATCH 037/100] Add tests

---
 .../add-collabora-file.composable.unit.ts     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index 49744fbbc5..8ac47cce55 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -1,4 +1,5 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import { fileRecordFactory } from "@@/tests/test-utils";
 import * as FileStorageApi from "@data-file";
 import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
@@ -21,6 +22,7 @@ describe("AddCollaboraFileComposable", () => {
 			closeCollaboraFileDialog,
 			collaboraFileSelectionOptions,
 			isCollaboraFileDialogOpen,
+			latestAddedCollaboraFile,
 		} = useAddCollaboraFile();
 
 		return {
@@ -28,6 +30,7 @@ describe("AddCollaboraFileComposable", () => {
 			openCollaboraFileDialog,
 			isCollaboraFileDialogOpen,
 			closeCollaboraFileDialog,
+			latestAddedCollaboraFile,
 		};
 	};
 
@@ -92,6 +95,23 @@ describe("AddCollaboraFileComposable", () => {
 				expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
 			});
 
+			it("should set latestAddedCollaboraFile to new file record", async () => {
+				const { collaboraFileSelectionOptions, latestAddedCollaboraFile } = setup();
+				const fileRecordResponse = fileRecordFactory.build();
+				fileStorageApiMock.uploadFromUrl.mockReturnValue(fileRecordResponse);
+
+				await collaboraFileSelectionOptions[0].action("folder-id", "test-office-file");
+				expect(latestAddedCollaboraFile.value).toEqual(fileRecordResponse);
+			});
+
+			it("should set latestAddedCollaboraFile to null if uploadFromUrl fails", async () => {
+				const { collaboraFileSelectionOptions, latestAddedCollaboraFile } = setup();
+				fileStorageApiMock.uploadFromUrl.mockReturnValue();
+
+				await collaboraFileSelectionOptions[0].action("folder-id", "test-office-file");
+				expect(latestAddedCollaboraFile.value).toBeNull();
+			});
+
 			it("should finally close dialog", async () => {
 				const { collaboraFileSelectionOptions, openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
 

From 4504f5d072978881c623ab8dd16160bf1d3fbfd9 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 15:29:40 +0100
Subject: [PATCH 038/100] Use own lang keys

---
 src/locales/de.ts                                           | 6 ++++++
 src/locales/en.ts                                           | 6 ++++++
 src/locales/es.ts                                           | 6 ++++++
 src/locales/uk.ts                                           | 6 ++++++
 src/modules/feature/folder/AddCollaboraFileDialog.vue       | 6 +++---
 src/modules/feature/folder/add-collabora-file.composable.ts | 6 +++---
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index e73c879d31..1a560f899e 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -1998,4 +1998,10 @@ export default {
 	"pages.folder.delete-confirmation": "Datei {name} wirklich löschen?",
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "Der Dateiname existiert bereits.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Der Dateiname enthält ungültige Zeichen.",
+	"pages.folder.add-collabora-file-dialog.title": "Dokument erstellen",
+	"pages.folder.add-collabora-file-dialog.doc-types": "Dokumententyp",
+	"pages.folder.add-collabora-file-dialog.untitled-file": "Unbenanntes Dokument",
+	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Text)",
+	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Tabelle)",
+	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Präsentation)",
 };
diff --git a/src/locales/en.ts b/src/locales/en.ts
index b5c18fb970..e0a2d285a3 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1964,4 +1964,10 @@ export default {
 	"pages.folder.delete-confirmation": "Do you really want to delete file {name}?",
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "The file name already exists.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "The file name contains invalid characters.",
+	"pages.folder.add-collabora-file-dialog.title": "Create document",
+	"pages.folder.add-collabora-file-dialog.doc-types": "Document type",
+	"pages.folder.add-collabora-file-dialog.untitled-file": "Untitled document",
+	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Text)",
+	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Spreadsheet)",
+	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Presentation)",
 };
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 298b7431c0..bc32d256d5 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -2016,4 +2016,10 @@ export default {
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "El nombre del archivo ya existe.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters":
 		"El nombre del archivo contiene caracteres no válidos.",
+	"pages.folder.add-collabora-file-dialog.title": "Crear documento",
+	"pages.folder.add-collabora-file-dialog.doc-types": "Tipo de documento",
+	"pages.folder.add-collabora-file-dialog.untitled-file": "Documento sin título",
+	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Texto)",
+	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Hoja de cálculo)",
+	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Presentación)",
 };
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index 94a44ca810..4c68c04208 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -1985,4 +1985,10 @@ export default {
 	"pages.folder.delete-confirmation": "Дійсно видалити файл {name}?",
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "Ім'я файлу вже існує.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Ім'я файлу містить недопустимі символи.",
+	"pages.folder.add-collabora-file-dialog.title": "Створити документ",
+	"pages.folder.add-collabora-file-dialog.doc-types": "Тип документа",
+	"pages.folder.add-collabora-file-dialog.untitled-file": "Без назви документ",
+	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Документ)",
+	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Таблиця)",
+	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Презентація)",
 };
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index efb4972549..f4e6b029b1 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -1,7 +1,7 @@
 <template>
 	<Dialog
 		v-model:is-dialog-open="isCollaboraFileDialogOpen"
-		:message="t('components.elementTypeSelection.elements.collabora.subtitle')"
+		:message="t('pages.folder.add-collabora-file-dialog.title')"
 		:confirm-btn-disabled="!isFormValid"
 		confirm-btn-lang-key="common.actions.create"
 		data-testid="collabora-element-dialog"
@@ -17,7 +17,7 @@
 					item-title="label"
 					item-value="id"
 					persistent-hint
-					:label="t('components.cardElement.fileElement.collaboraFile.types')"
+					:label="t('pages.folder.add-collabora-file-dialog.doc-types')"
 					:rules="docTypeRules"
 					:menu-props="{ attach: '#officeFileForm' }"
 					data-testid="collabora-element-form-type"
@@ -26,7 +26,7 @@
 					v-model="fileName"
 					:label="t('common.labels.fileName')"
 					:rules="fileNameRules"
-					:placeholder="t('components.cardElement.fileElement.collaboraFile.untitled')"
+					:placeholder="t('pages.folder.add-collabora-file-dialog.untitled-file')"
 					data-testid="collabora-element-form-filename"
 				/>
 			</VForm>
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index 3af6977ef1..ceedb4782f 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -36,19 +36,19 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 	const collaboraFileSelectionOptions = [
 		{
 			id: "1",
-			label: t("components.elementTypeSelection.elements.collabora.option.text"),
+			label: t("pages.folder.add-collabora-file-dialog.option.text"),
 			action: async (folderId: string, fileName: string) =>
 				uploadCollaboraFile(CollaboraFileType.Text, folderId, fileName),
 		},
 		{
 			id: "2",
-			label: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
+			label: t("pages.folder.add-collabora-file-dialog.option.spreadsheet"),
 			action: async (folderId: string, fileName: string) =>
 				uploadCollaboraFile(CollaboraFileType.Spreadsheet, folderId, fileName),
 		},
 		{
 			id: "3",
-			label: t("components.elementTypeSelection.elements.collabora.option.presentation"),
+			label: t("pages.folder.add-collabora-file-dialog.option.presentation"),
 			action: async (folderId: string, fileName: string) =>
 				uploadCollaboraFile(CollaboraFileType.Presentation, folderId, fileName),
 		},

From 958a5b63feff39018e55a6ba6254d39386c49d7c Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 16:49:22 +0100
Subject: [PATCH 039/100] add test, adjust test

---
 src/modules/feature/folder/Folder.unit.ts     | 78 ++++++++++++++++++-
 src/modules/feature/folder/Folder.vue         |  4 +-
 .../add-collabora-file.composable.unit.ts     | 12 +--
 3 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 06def3e410..5db3674a5d 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1,3 +1,4 @@
+import * as AddCollaboraFile from "./add-collabora-file.composable";
 import DeleteFileDialog from "./file-table/DeleteFileDialog.vue";
 import EmptyFolderSvg from "./file-table/EmptyFolderSvg.vue";
 import KebabMenuActionDeleteFiles from "./file-table/KebabMenuActionDeleteFiles.vue";
@@ -5,6 +6,7 @@ import KebabMenuActionDownloadFiles from "./file-table/KebabMenuActionDownloadFi
 import RenameFileDialog from "./file-table/RenameFileDialog.vue";
 import Folder from "./Folder.vue";
 import FolderMenu from "./FolderMenu.vue";
+import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store";
 import { ParentNodeInfo, ParentNodeType } from "@/types/board/ContentElement";
@@ -33,6 +35,13 @@ const useRouterMock = <Mock>useRouter;
 vi.mock("@data-board/BoardApi.composable");
 const mockedUseBoardApi = vi.mocked(BoardApi.useBoardApi);
 
+vi.mock("./add-collabora-file.composable");
+
+const enum FabEvent {
+	CREATE_DOCUMENT = "CREATE_DOCUMENT",
+	UPLOAD_FILE = "UPLOAD_FILE",
+}
+
 describe("Folder.vue", () => {
 	enableAutoUnmount(afterEach);
 
@@ -105,6 +114,14 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
+						openCollaboraFileDialog: vi.fn(),
+						closeCollaboraFileDialog: vi.fn(),
+						collaboraFileSelectionOptions: [],
+						isCollaboraFileDialogOpen: ref(false),
+						latestAddedCollaboraFile: ref(null),
+					});
+
 					const { wrapper } = setupWrapper();
 					const useBoardStoreMock = mockedPiniaStoreTyping(useBoardStore);
 
@@ -1091,7 +1108,65 @@ describe("Folder.vue", () => {
 			});
 		});
 
-		describe("when fab button is clicked, files are selected and upload succeed", () => {
+		describe("when fab button is clicked and add collabora file is chosen", () => {
+			const setup = async () => {
+				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
+				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
+
+				const folderName = "Test Folder" as unknown as ComputedRef<string>;
+				folderStateMock.folderName = folderName;
+				folderStateMock.breadcrumbs = ref([]) as unknown as ComputedRef;
+
+				const parent = parentNodeInfoFactory.build();
+				folderStateMock.parent = ref(parent) as unknown as ComputedRef;
+
+				const boardState = createMock<ReturnType<typeof BoardApi.useSharedBoardPageInformation>>({});
+				vi.spyOn(BoardApi, "useSharedBoardPageInformation").mockReturnValueOnce(boardState);
+
+				const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
+				mockedUseBoardApi.mockReturnValue(boardApiMock);
+
+				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+
+				fileStorageApiMock.getFileRecordsByParentId.mockReturnValueOnce([]);
+
+				const useBoardStoreMock = createMock<ReturnType<typeof BoardApi.useBoardStore>>();
+				vi.spyOn(BoardApi, "useBoardStore").mockReturnValueOnce(useBoardStoreMock);
+
+				const useBoardPermissionsMock = createMock<ReturnType<typeof BoardApi.useBoardPermissions>>({
+					hasEditPermission: ref(true),
+				});
+				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
+
+				const mockOpenCollaboraFileDialog = vi.fn();
+				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
+					openCollaboraFileDialog: mockOpenCollaboraFileDialog,
+					closeCollaboraFileDialog: vi.fn(),
+					collaboraFileSelectionOptions: [],
+					isCollaboraFileDialogOpen: ref(false),
+					latestAddedCollaboraFile: ref(null),
+				});
+
+				const { wrapper } = setupWrapper();
+
+				return {
+					wrapper,
+					mockOpenCollaboraFileDialog,
+				};
+			};
+
+			it("should open collabora file dialog", async () => {
+				const { wrapper, mockOpenCollaboraFileDialog } = await setup();
+
+				const defaultWireframe = wrapper.findComponent(DefaultWireframe);
+				defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CREATE_DOCUMENT);
+
+				expect(mockOpenCollaboraFileDialog).toHaveBeenCalled();
+			});
+		});
+
+		describe("when fab button is clicked, file upload is chosen, files are selected and upload succeed", () => {
 			const setup = async () => {
 				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
 				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
@@ -1146,6 +1221,7 @@ describe("Folder.vue", () => {
 
 				const fabButton = wrapper.find("[data-testid='fab-add-files']");
 				await fabButton.trigger("click");
+				await nextTick();
 
 				const file1 = new File(["content"], "filename.txt", {
 					type: "text/plain",
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 2e050f7580..b2ca0a19fe 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -121,14 +121,14 @@ const fabAction = computed(() => {
 			icon: mdiFileDocumentPlusOutline,
 			label: "Dokument erstellen",
 			ariaLabel: "Dokument erstellen",
-			dataTestId: "fab_button_create_document",
+			dataTestId: "fab-button-create-document",
 			customEvent: FabEvent.CREATE_DOCUMENT,
 		},
 		{
 			icon: mdiTrayArrowUp,
 			label: "Datei hochladen",
 			ariaLabel: "Datei hochladen",
-			dataTestId: "fab_button_upload_file",
+			dataTestId: "fab-button-upload-file",
 			customEvent: FabEvent.UPLOAD_FILE,
 		},
 	];
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index 8ac47cce55..2f4b07c79c 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -73,15 +73,9 @@ describe("AddCollaboraFileComposable", () => {
 			const { collaboraFileSelectionOptions } = setup();
 
 			expect(collaboraFileSelectionOptions).toHaveLength(3);
-			expect(collaboraFileSelectionOptions[0].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.text"
-			);
-			expect(collaboraFileSelectionOptions[1].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.spreadsheet"
-			);
-			expect(collaboraFileSelectionOptions[2].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.presentation"
-			);
+			expect(collaboraFileSelectionOptions[0].label).toBe("pages.folder.add-collabora-file-dialog.option.text");
+			expect(collaboraFileSelectionOptions[1].label).toBe("pages.folder.add-collabora-file-dialog.option.spreadsheet");
+			expect(collaboraFileSelectionOptions[2].label).toBe("pages.folder.add-collabora-file-dialog.option.presentation");
 		});
 
 		describe("action of collaboraFileSelectionOptions", () => {

From 9b9cd8d7beed5dfd989fc3733d9b502c7bdd0fe3 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Tue, 25 Nov 2025 17:29:40 +0100
Subject: [PATCH 040/100] Cover upload file reset

---
 src/modules/feature/folder/Folder.unit.ts | 34 +++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 5db3674a5d..473409c6cb 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1108,7 +1108,7 @@ describe("Folder.vue", () => {
 			});
 		});
 
-		describe("when fab button is clicked and add collabora file is chosen", () => {
+		describe("when fab button is clicked", () => {
 			const setup = async () => {
 				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
 				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
@@ -1156,13 +1156,35 @@ describe("Folder.vue", () => {
 				};
 			};
 
-			it("should open collabora file dialog", async () => {
-				const { wrapper, mockOpenCollaboraFileDialog } = await setup();
+			describe("and file upload is chosen", () => {
+				it("should reset input field", async () => {
+					const { wrapper } = await setup();
+
+					const file1 = new File(["content"], "filename.txt", {
+						type: "text/plain",
+					});
+					const input = wrapper.find("input[type='file']");
+					Object.defineProperty(input.element, "files", {
+						value: [file1],
+						writable: false,
+					});
+
+					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
+					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.UPLOAD_FILE);
 
-				const defaultWireframe = wrapper.findComponent(DefaultWireframe);
-				defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CREATE_DOCUMENT);
+					expect((input.element as HTMLInputElement).value).toBe("");
+				});
+			});
+
+			describe("and create document is chosen", () => {
+				it("should open collabora file dialog", async () => {
+					const { wrapper, mockOpenCollaboraFileDialog } = await setup();
 
-				expect(mockOpenCollaboraFileDialog).toHaveBeenCalled();
+					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
+					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CREATE_DOCUMENT);
+
+					expect(mockOpenCollaboraFileDialog).toHaveBeenCalled();
+				});
 			});
 		});
 

From 124f6cb4a42bd2d7b8144de0a6194f7ee6aa8257 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 08:37:13 +0100
Subject: [PATCH 041/100] Fix missing contentModifiedAt

---
 .../folder/file-table/FileTable.unit.ts       | 33 +++++++++++++++++++
 .../feature/folder/file-table/FileTable.vue   | 12 ++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/file-table/FileTable.unit.ts b/src/modules/feature/folder/file-table/FileTable.unit.ts
index 4f41a1da4c..2e76a526c5 100644
--- a/src/modules/feature/folder/file-table/FileTable.unit.ts
+++ b/src/modules/feature/folder/file-table/FileTable.unit.ts
@@ -128,6 +128,39 @@ describe("FileTable", () => {
 			expect(contentLastModifiedAt.exists()).toBe(true);
 		});
 
+		describe("when contentLastModifiedAt is set", () => {
+			it("should render content modified column with contentLastModifiedAt", () => {
+				const fileRecord = fileRecordFactory.build();
+				fileRecord.contentLastModifiedAt = new Date().toISOString();
+				const { wrapper } = setupWrapper({
+					isLoading: false,
+					isEmpty: false,
+					fileRecords: [fileRecord],
+					uploadProgress: { uploaded: 1, total: 2 },
+				});
+
+				const contentLastModifiedAt = wrapper.find(`[data-testid='content-modified-at-${fileRecord.name}']`);
+				expect(contentLastModifiedAt.text()).toContain(wrapper.vm.$d(new Date(fileRecord.contentLastModifiedAt)));
+			});
+		});
+
+		describe("when contentLastModifiedAt is not existing", () => {
+			it("should render content modified column with createdAt", () => {
+				const fileRecord = fileRecordFactory.build();
+				delete fileRecord.contentLastModifiedAt;
+				fileRecord.createdAt = new Date().toISOString();
+				const { wrapper } = setupWrapper({
+					isLoading: false,
+					isEmpty: false,
+					fileRecords: [fileRecord],
+					uploadProgress: { uploaded: 1, total: 2 },
+				});
+
+				const contentLastModifiedAt = wrapper.find(`[data-testid='content-modified-at-${fileRecord.name}']`);
+				expect(contentLastModifiedAt.text()).toContain(wrapper.vm.$d(new Date(fileRecord.createdAt)));
+			});
+		});
+
 		it("should render file name column", () => {
 			const fileRecord = fileRecordFactory.build();
 			const { wrapper } = setupWrapper({
diff --git a/src/modules/feature/folder/file-table/FileTable.vue b/src/modules/feature/folder/file-table/FileTable.vue
index 228ed6da92..e683e34920 100644
--- a/src/modules/feature/folder/file-table/FileTable.vue
+++ b/src/modules/feature/folder/file-table/FileTable.vue
@@ -33,7 +33,7 @@
 				</template>
 				<template #[`item.contentLastModifiedAt`]="{ item }">
 					<span :data-testid="`content-modified-at-${item.name}`" :class="{ 'text-disabled': !item.isSelectable }">
-						{{ d(item.contentLastModifiedAt) }}
+						{{ getLastModifiedDate(item) }}
 					</span>
 				</template>
 				<template #[`item.size`]="{ item }">
@@ -189,6 +189,16 @@ const fileRecordItems = computed(() =>
 	}))
 );
 
+const getLastModifiedDate = (item: FileRecord): string => {
+	if (item.contentLastModifiedAt) {
+		return d(item.contentLastModifiedAt);
+	}
+	if (item.createdAt) {
+		return d(item.createdAt);
+	}
+	return "";
+};
+
 const onDownloadFile = (selectedIds: string[]) => {
 	emit("download-file", selectedIds);
 };

From 79dfaa2073912cbd87fd424e7342d90e8cb39eae Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 08:55:03 +0100
Subject: [PATCH 042/100] Add test for tab opening

---
 src/modules/feature/folder/Folder.unit.ts | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 473409c6cb..5bddabc76a 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -7,6 +7,7 @@ import RenameFileDialog from "./file-table/RenameFileDialog.vue";
 import Folder from "./Folder.vue";
 import FolderMenu from "./FolderMenu.vue";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
+import { FileRecordResponse } from "@/fileStorageApi/v3";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store";
 import { ParentNodeInfo, ParentNodeType } from "@/types/board/ContentElement";
@@ -21,6 +22,7 @@ import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import * as ConfirmationDialog from "@ui-confirmation-dialog";
 import { KebabMenuActionDelete, KebabMenuActionRename } from "@ui-kebab-menu";
+import * as utilCollabora from "@util-collabora";
 import { enableAutoUnmount, flushPromises } from "@vue/test-utils";
 import dayjs from "dayjs";
 import { setActivePinia } from "pinia"; // FIX_CIRCULAR_DEPENDENCY
@@ -1188,6 +1190,70 @@ describe("Folder.vue", () => {
 			});
 		});
 
+		describe("when collabora file was created", () => {
+			const setup = async () => {
+				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
+				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
+
+				const folderName = "Test Folder" as unknown as ComputedRef<string>;
+				folderStateMock.folderName = folderName;
+				folderStateMock.breadcrumbs = ref([]) as unknown as ComputedRef;
+
+				const parent = parentNodeInfoFactory.build();
+				folderStateMock.parent = ref(parent) as unknown as ComputedRef;
+
+				const boardState = createMock<ReturnType<typeof BoardApi.useSharedBoardPageInformation>>({});
+				vi.spyOn(BoardApi, "useSharedBoardPageInformation").mockReturnValueOnce(boardState);
+
+				const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
+				mockedUseBoardApi.mockReturnValue(boardApiMock);
+
+				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+
+				fileStorageApiMock.getFileRecordsByParentId.mockReturnValueOnce([]);
+
+				const useBoardStoreMock = createMock<ReturnType<typeof BoardApi.useBoardStore>>();
+				vi.spyOn(BoardApi, "useBoardStore").mockReturnValueOnce(useBoardStoreMock);
+
+				const useBoardPermissionsMock = createMock<ReturnType<typeof BoardApi.useBoardPermissions>>({
+					hasEditPermission: ref(true),
+				});
+				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
+
+				const latestAddedCollaboraFile = ref<FileRecordResponse | null>(null);
+
+				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
+					openCollaboraFileDialog: vi.fn(),
+					closeCollaboraFileDialog: vi.fn(),
+					collaboraFileSelectionOptions: [],
+					isCollaboraFileDialogOpen: ref(false),
+					latestAddedCollaboraFile,
+				});
+
+				const { wrapper } = setupWrapper();
+
+				await nextTick();
+				await nextTick();
+				await nextTick();
+
+				return {
+					wrapper,
+					latestAddedCollaboraFile,
+				};
+			};
+
+			it("should show open collabora file in new tab", async () => {
+				const { latestAddedCollaboraFile } = await setup();
+				const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+				latestAddedCollaboraFile.value = fileRecordFactory.build();
+				await nextTick();
+
+				expect(openCollaboraSpy).toHaveBeenCalled();
+			});
+		});
+
 		describe("when fab button is clicked, file upload is chosen, files are selected and upload succeed", () => {
 			const setup = async () => {
 				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();

From 8e692ce910add25b64dcaea540de46e5f1279b5f Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 08:58:34 +0100
Subject: [PATCH 043/100] Add test for non existing createdAt

---
 .../feature/folder/file-table/FileTable.unit.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/modules/feature/folder/file-table/FileTable.unit.ts b/src/modules/feature/folder/file-table/FileTable.unit.ts
index 2e76a526c5..68edc53944 100644
--- a/src/modules/feature/folder/file-table/FileTable.unit.ts
+++ b/src/modules/feature/folder/file-table/FileTable.unit.ts
@@ -161,6 +161,23 @@ describe("FileTable", () => {
 			});
 		});
 
+		describe("when contentLastModifiedAt and createdAt are not existing", () => {
+			it("should render content modified column with empty string", () => {
+				const fileRecord = fileRecordFactory.build();
+				delete fileRecord.contentLastModifiedAt;
+				delete fileRecord.createdAt;
+				const { wrapper } = setupWrapper({
+					isLoading: false,
+					isEmpty: false,
+					fileRecords: [fileRecord],
+					uploadProgress: { uploaded: 1, total: 2 },
+				});
+
+				const contentLastModifiedAt = wrapper.find(`[data-testid='content-modified-at-${fileRecord.name}']`);
+				expect(contentLastModifiedAt.text()).toBe("");
+			});
+		});
+
 		it("should render file name column", () => {
 			const fileRecord = fileRecordFactory.build();
 			const { wrapper } = setupWrapper({

From 0ee728d50971f0669aff321ad483287853c5445f Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 09:13:34 +0100
Subject: [PATCH 044/100] Adjust watcher

---
 src/modules/feature/folder/Folder.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index b2ca0a19fe..bba46f59c8 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -145,8 +145,6 @@ const fabAction = computed(() => {
 watch(
 	() => latestAddedCollaboraFile.value,
 	(newFile) => {
-		if (!hasEditPermission.value) return;
-
 		if (newFile) {
 			openCollabora(router, newFile, hasEditPermission.value);
 		}

From fe3375388576671d18544b84faba69ae0d2712df Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 10:06:25 +0100
Subject: [PATCH 045/100] Adjust test ids

---
 src/modules/feature/folder/AddCollaboraFileDialog.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index f4e6b029b1..9ecfd3b1d8 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -4,12 +4,12 @@
 		:message="t('pages.folder.add-collabora-file-dialog.title')"
 		:confirm-btn-disabled="!isFormValid"
 		confirm-btn-lang-key="common.actions.create"
-		data-testid="collabora-element-dialog"
+		data-testid="collabora-file-dialog"
 		@cancel="onCancel"
 		@confirm="onConfirm"
 	>
 		<template #content>
-			<VForm id="officeFileForm" ref="form" data-testid="collabora-element-form" @submit.prevent="onConfirm">
+			<VForm id="collaboraFileForm" ref="form" data-testid="collabora-file-form" @submit.prevent="onConfirm">
 				<!-- Attach the select to the form so that we can use focusTrap in the dialog -->
 				<VSelect
 					v-model="selectedDocType"
@@ -19,15 +19,15 @@
 					persistent-hint
 					:label="t('pages.folder.add-collabora-file-dialog.doc-types')"
 					:rules="docTypeRules"
-					:menu-props="{ attach: '#officeFileForm' }"
-					data-testid="collabora-element-form-type"
+					:menu-props="{ attach: '#collaboraFileForm' }"
+					data-testid="collabora-file-type"
 				/>
 				<VTextField
 					v-model="fileName"
 					:label="t('common.labels.fileName')"
 					:rules="fileNameRules"
 					:placeholder="t('pages.folder.add-collabora-file-dialog.untitled-file')"
-					data-testid="collabora-element-form-filename"
+					data-testid="collabora-file-name"
 				/>
 			</VForm>
 		</template>

From b13fb7237d0b7ce4669e2b2aa0588879198a4c08 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 10:10:59 +0100
Subject: [PATCH 046/100] Adjust test ids

---
 .../folder/AddCollaboraFileDialog.unit.ts      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index 9a8ed500ff..a4734e6996 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -156,11 +156,11 @@ describe("CollaboraFileDialog", () => {
 				await nextTick();
 				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
@@ -178,7 +178,7 @@ describe("CollaboraFileDialog", () => {
 				typeSelect.vm.$emit("update:modelValue", selectOption.id);
 				await nextTick();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
@@ -192,11 +192,11 @@ describe("CollaboraFileDialog", () => {
 				const { collaboraFileSelectionOptions, wrapper } = await setup();
 				const selectOption = collaboraFileSelectionOptions[0];
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue("myDocument");
 				await nextTick();
 
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
@@ -206,7 +206,7 @@ describe("CollaboraFileDialog", () => {
 			it("should have confirm button disabled", async () => {
 				const { wrapper } = await setup();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue("myDocument");
 				await nextTick();
 
@@ -226,10 +226,10 @@ describe("CollaboraFileDialog", () => {
 				await nextTick();
 				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']").find("input");
 				expect(fileNameInput.element.value).toBe("");
 
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
@@ -260,7 +260,7 @@ describe("CollaboraFileDialog", () => {
 				typeSelect.vm.$emit("update:modelValue", selectOption.id);
 				await nextTick();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue("invalid/filename");
 				await nextTick();
 

From ba4bf6e6f23dc495f8c87b7add26647f8b1e823d Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 10:35:46 +0100
Subject: [PATCH 047/100] Move factory to test-utils

---
 .../test-utils/add-collabora-file-mock.ts     | 10 +---
 .../folder/AddCollaboraFileDialog.unit.ts     | 50 +++----------------
 ...ollabora-file-selection-options.factory.ts |  0
 tests/test-utils/factory/index.ts             |  1 +
 4 files changed, 11 insertions(+), 50 deletions(-)
 rename {src/modules/feature/board/test-utils => tests/test-utils/factory}/collabora-file-selection-options.factory.ts (100%)

diff --git a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
index 06c44cb20a..e8bcbb057d 100644
--- a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
+++ b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
@@ -1,5 +1,5 @@
 import { useAddCollaboraFile } from "../shared/add-collabora-file.composable";
-import { collaboraFileSelectionOptionsFactory } from "../test-utils/collabora-file-selection-options.factory";
+import { collaboraFileSelectionOptionsFactory } from "@@/tests/test-utils";
 import { Mock } from "vitest";
 import { ref } from "vue";
 
@@ -7,11 +7,6 @@ interface Props {
 	openCollaboraFileDialogMock?: Mock;
 	setCardIdMock?: Mock;
 }
-interface CollaboraFileSelectionOptions {
-	id: string;
-	label: string;
-	action: (fileName: string, caption: string) => Promise<void>;
-}
 
 export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
 	const { setCardIdMock, openCollaboraFileDialogMock } = props;
@@ -20,8 +15,7 @@ export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
 	const openCollaboraFileDialog = openCollaboraFileDialogMock ?? vi.fn();
 	const closeCollaboraFileDialog = vi.fn();
 	const isCollaboraFileDialogOpen = ref(false);
-	const collaboraFileSelectionOptions: Array<CollaboraFileSelectionOptions> =
-		collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
+	const collaboraFileSelectionOptions = collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
 	const setCardId = setCardIdMock ?? vi.fn();
 	const setCreateElementRequestFn = vi.fn();
 	const cardId = ref("");
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index a4734e6996..e0baee428c 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -1,6 +1,7 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import { FileRecordResponse } from "@/fileStorageApi/v3";
+import { collaboraFileSelectionOptionsFactory } from "@@/tests/test-utils";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
@@ -9,48 +10,13 @@ import { VForm, VSelect } from "vuetify/lib/components/index";
 
 vi.mock("./add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
-
-interface CollaboraFileSelectionOptions {
-	id: string;
-	label: string;
-	action: (fileName: string, caption: string) => Promise<void>;
-}
-
-const collaboraFileSelectionOptionsFactory = {
-	createCollaboraFileSelectionOptionsList: () => [
-		{
-			id: "1",
-			label: "Text Document",
-			action: vi.fn(),
-		},
-		{
-			id: "2",
-			label: "Table Document",
-			action: vi.fn(),
-		},
-		{
-			id: "3",
-			label: "Presentation Document",
-			action: vi.fn(),
-		},
-	],
-};
-const openCollaboraFileDialog = vi.fn();
-const closeCollaboraFileDialog = vi.fn();
-const isCollaboraFileDialogOpen = ref(false);
-const latestAddedCollaboraFile = ref<FileRecordResponse | null>(null);
-const collaboraFileSelectionOptions: Array<CollaboraFileSelectionOptions> =
-	collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
-
-const mocks = {
-	collaboraFileSelectionOptions,
-	isCollaboraFileDialogOpen,
-	openCollaboraFileDialog,
-	closeCollaboraFileDialog,
-	latestAddedCollaboraFile,
-};
-
-mockedCollaboraFileSelection.mockReturnValue(mocks);
+mockedCollaboraFileSelection.mockReturnValue({
+	collaboraFileSelectionOptions: collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList(),
+	isCollaboraFileDialogOpen: ref(false),
+	openCollaboraFileDialog: vi.fn(),
+	closeCollaboraFileDialog: vi.fn(),
+	latestAddedCollaboraFile: ref<FileRecordResponse | null>(null),
+});
 
 describe("CollaboraFileDialog", () => {
 	const setupMocks = () => {
diff --git a/src/modules/feature/board/test-utils/collabora-file-selection-options.factory.ts b/tests/test-utils/factory/collabora-file-selection-options.factory.ts
similarity index 100%
rename from src/modules/feature/board/test-utils/collabora-file-selection-options.factory.ts
rename to tests/test-utils/factory/collabora-file-selection-options.factory.ts
diff --git a/tests/test-utils/factory/index.ts b/tests/test-utils/factory/index.ts
index a609b97760..5944c29a00 100644
--- a/tests/test-utils/factory/index.ts
+++ b/tests/test-utils/factory/index.ts
@@ -12,6 +12,7 @@ export * from "./cardSkeletonResponseFactory";
 export * from "./classInfoFactory";
 export * from "./classInfoResponseFactory";
 export * from "./classInfoSearchListResponseFactory";
+export * from "./collabora-file-selection-options.factory";
 export * from "./collaborativeTextEditorElementResponseFactory";
 export * from "./columnResponseFactory";
 export * from "./contextExternalToolConfigurationStatusFactory";

From eadbb56134369441d41a954dd96c01961c214415 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 10:42:40 +0100
Subject: [PATCH 048/100] Test return value

---
 src/modules/data/file/FileStorageApi.composable.unit.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/modules/data/file/FileStorageApi.composable.unit.ts b/src/modules/data/file/FileStorageApi.composable.unit.ts
index 0b422c233f..04127c91dd 100644
--- a/src/modules/data/file/FileStorageApi.composable.unit.ts
+++ b/src/modules/data/file/FileStorageApi.composable.unit.ts
@@ -445,6 +445,15 @@ describe("FileStorageApi Composable", () => {
 				expect(fileRecord).toStrictEqual([fileRecordResponse]);
 			});
 
+			it("should return created file record", async () => {
+				const { parentId, parentType, imageUrl, fileRecordResponse } = setup();
+				const { uploadFromUrl } = useFileStorageApi();
+
+				const createdFileRecord = await uploadFromUrl(imageUrl, parentId, parentType);
+
+				expect(createdFileRecord).toStrictEqual(fileRecordResponse);
+			});
+
 			describe("when file name is empty", () => {
 				it("should upload file with default filename", async () => {
 					const emptyFileName = "";

From a1204c6b120f1d0329182c0780da8e4a953c4874 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 11:03:56 +0100
Subject: [PATCH 049/100] Cleanup

---
 .../mapper/collabora-editor-mode.mapper.ts       |  7 -------
 .../mapper/collabora-editor-mode.mapper.unit.ts  | 16 ----------------
 .../feature/board-file-element/mapper/index.ts   |  1 -
 3 files changed, 24 deletions(-)
 delete mode 100644 src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.ts
 delete mode 100644 src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.unit.ts
 delete mode 100644 src/modules/feature/board-file-element/mapper/index.ts

diff --git a/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.ts b/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.ts
deleted file mode 100644
index 9c0a285a8a..0000000000
--- a/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { EditorMode } from "@/types/file/File";
-
-export function mapEditBoardPermissionToEditorMode(hasEditPermission: boolean): string {
-	const editorMode = hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW;
-
-	return editorMode;
-}
diff --git a/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.unit.ts b/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.unit.ts
deleted file mode 100644
index cd872101b3..0000000000
--- a/src/modules/feature/board-file-element/mapper/collabora-editor-mode.mapper.unit.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
-import { EditorMode } from "@/types/file/File";
-
-describe("mapEditBoardPermissionToEditorMode", () => {
-	it("returns EDIT when hasEditPermission is true", () => {
-		const result = mapEditBoardPermissionToEditorMode(true);
-
-		expect(result).toBe(EditorMode.EDIT);
-	});
-
-	it("returns VIEW when hasEditPermission is false", () => {
-		const result = mapEditBoardPermissionToEditorMode(false);
-
-		expect(result).toBe(EditorMode.VIEW);
-	});
-});
diff --git a/src/modules/feature/board-file-element/mapper/index.ts b/src/modules/feature/board-file-element/mapper/index.ts
deleted file mode 100644
index d6cfa88701..0000000000
--- a/src/modules/feature/board-file-element/mapper/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./collabora-editor-mode.mapper";

From 2ab69c1003e1e40694ac1dab0fea4c3bca320656 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 11:40:47 +0100
Subject: [PATCH 050/100] Adjust enum style

---
 src/modules/feature/folder/Folder.unit.ts |  8 ++++----
 src/modules/feature/folder/Folder.vue     | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 5bddabc76a..46f8618146 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -40,8 +40,8 @@ const mockedUseBoardApi = vi.mocked(BoardApi.useBoardApi);
 vi.mock("./add-collabora-file.composable");
 
 const enum FabEvent {
-	CREATE_DOCUMENT = "CREATE_DOCUMENT",
-	UPLOAD_FILE = "UPLOAD_FILE",
+	CreateDocument = "CREATE_DOCUMENT",
+	UploadFile = "UPLOAD_FILE",
 }
 
 describe("Folder.vue", () => {
@@ -1172,7 +1172,7 @@ describe("Folder.vue", () => {
 					});
 
 					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
-					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.UPLOAD_FILE);
+					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.UploadFile);
 
 					expect((input.element as HTMLInputElement).value).toBe("");
 				});
@@ -1183,7 +1183,7 @@ describe("Folder.vue", () => {
 					const { wrapper, mockOpenCollaboraFileDialog } = await setup();
 
 					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
-					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CREATE_DOCUMENT);
+					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CreateDocument);
 
 					expect(mockOpenCollaboraFileDialog).toHaveBeenCalled();
 				});
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index bba46f59c8..7cc65db176 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -109,8 +109,8 @@ const fileInput = ref<HTMLInputElement | null>(null);
 const isRenameDialogOpen = ref(false);
 
 const enum FabEvent {
-	CREATE_DOCUMENT = "CREATE_DOCUMENT",
-	UPLOAD_FILE = "UPLOAD_FILE",
+	CreateDocument = "CREATE_DOCUMENT",
+	UploadFile = "UPLOAD_FILE",
 }
 
 const fabAction = computed(() => {
@@ -122,14 +122,14 @@ const fabAction = computed(() => {
 			label: "Dokument erstellen",
 			ariaLabel: "Dokument erstellen",
 			dataTestId: "fab-button-create-document",
-			customEvent: FabEvent.CREATE_DOCUMENT,
+			customEvent: FabEvent.CreateDocument,
 		},
 		{
 			icon: mdiTrayArrowUp,
 			label: "Datei hochladen",
 			ariaLabel: "Datei hochladen",
 			dataTestId: "fab-button-upload-file",
-			customEvent: FabEvent.UPLOAD_FILE,
+			customEvent: FabEvent.UploadFile,
 		},
 	];
 
@@ -163,13 +163,13 @@ const runningUploads = ref<number>(0);
 const uploadedFileRecords = computed(() => fileRecords.value.filter((fileRecord) => !fileRecord.isUploading));
 
 const fabItemClickHandler = (event: string | undefined): void => {
-	if (event === FabEvent.UPLOAD_FILE) {
+	if (event === FabEvent.UploadFile) {
 		if (fileInput.value) {
 			// Reset the file input to allow re-uploading the same file
 			fileInput.value.value = "";
 			fileInput.value.click();
 		}
-	} else if (event === FabEvent.CREATE_DOCUMENT) {
+	} else if (event === FabEvent.CreateDocument) {
 		openCollaboraFileDialog();
 	}
 };

From c8bfc583beb08b15a1afe30f2d4710292db7532c Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 11:46:01 +0100
Subject: [PATCH 051/100] Remove unneeded mock

---
 src/modules/feature/folder/add-collabora-file.composable.unit.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index 2f4b07c79c..8c1d946af8 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -8,7 +8,6 @@ import { setActivePinia } from "pinia";
 vi.mock("vue-i18n", () => ({
 	useI18n: vi.fn().mockReturnValue({
 		t: vi.fn().mockImplementation((key: string) => key),
-		n: vi.fn().mockImplementation((key: string) => key),
 	}),
 }));
 

From b0338f8536697779d1bd7c675512b0843a7031c0 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 11:55:14 +0100
Subject: [PATCH 052/100] Export all helpers

---
 src/modules/util/collabora/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/util/collabora/index.ts b/src/modules/util/collabora/index.ts
index 70b181f670..acabbfda4b 100644
--- a/src/modules/util/collabora/index.ts
+++ b/src/modules/util/collabora/index.ts
@@ -1,3 +1,3 @@
-import { getCollaboraAssetUrl, openCollabora } from "./helpers";
+import { getCollaboraAssetUrl, mapEditBoardPermissionToEditorMode, openCollabora } from "./helpers";
 
-export { getCollaboraAssetUrl, openCollabora };
+export { getCollaboraAssetUrl, mapEditBoardPermissionToEditorMode, openCollabora };

From a10480ff253813c1aa84ad812a64d208ef7e419f Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 12:49:42 +0100
Subject: [PATCH 053/100] simplify mocking

---
 .../test-utils/add-collabora-file-mock.ts     | 14 +++++++++++--
 .../folder/AddCollaboraFileDialog.unit.ts     | 14 +++++++++++--
 ...ollabora-file-selection-options.factory.ts | 21 -------------------
 tests/test-utils/factory/index.ts             |  1 -
 4 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 tests/test-utils/factory/collabora-file-selection-options.factory.ts

diff --git a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
index e8bcbb057d..a7a27d3e6c 100644
--- a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
+++ b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
@@ -1,5 +1,4 @@
 import { useAddCollaboraFile } from "../shared/add-collabora-file.composable";
-import { collaboraFileSelectionOptionsFactory } from "@@/tests/test-utils";
 import { Mock } from "vitest";
 import { ref } from "vue";
 
@@ -15,7 +14,18 @@ export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
 	const openCollaboraFileDialog = openCollaboraFileDialogMock ?? vi.fn();
 	const closeCollaboraFileDialog = vi.fn();
 	const isCollaboraFileDialogOpen = ref(false);
-	const collaboraFileSelectionOptions = collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList();
+	const collaboraFileSelectionOptions = [
+		{
+			id: "1",
+			label: "Text Document",
+			action: vi.fn(),
+		},
+		{
+			id: "2",
+			label: "Table Document",
+			action: vi.fn(),
+		},
+	];
 	const setCardId = setCardIdMock ?? vi.fn();
 	const setCreateElementRequestFn = vi.fn();
 	const cardId = ref("");
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index e0baee428c..ec11c02b08 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -1,7 +1,6 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import { FileRecordResponse } from "@/fileStorageApi/v3";
-import { collaboraFileSelectionOptionsFactory } from "@@/tests/test-utils";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
@@ -11,7 +10,18 @@ import { VForm, VSelect } from "vuetify/lib/components/index";
 vi.mock("./add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
 mockedCollaboraFileSelection.mockReturnValue({
-	collaboraFileSelectionOptions: collaboraFileSelectionOptionsFactory.createCollaboraFileSelectionOptionsList(),
+	collaboraFileSelectionOptions: [
+		{
+			id: "1",
+			label: "Text Document",
+			action: vi.fn(),
+		},
+		{
+			id: "2",
+			label: "Table Document",
+			action: vi.fn(),
+		},
+	],
 	isCollaboraFileDialogOpen: ref(false),
 	openCollaboraFileDialog: vi.fn(),
 	closeCollaboraFileDialog: vi.fn(),
diff --git a/tests/test-utils/factory/collabora-file-selection-options.factory.ts b/tests/test-utils/factory/collabora-file-selection-options.factory.ts
deleted file mode 100644
index d8d06d15a3..0000000000
--- a/tests/test-utils/factory/collabora-file-selection-options.factory.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { vi } from "vitest";
-
-export const collaboraFileSelectionOptionsFactory = {
-	createCollaboraFileSelectionOptionsList: () => [
-		{
-			id: "1",
-			label: "Text Document",
-			action: vi.fn(),
-		},
-		{
-			id: "2",
-			label: "Table Document",
-			action: vi.fn(),
-		},
-		{
-			id: "3",
-			label: "Presentation Document",
-			action: vi.fn(),
-		},
-	],
-};
diff --git a/tests/test-utils/factory/index.ts b/tests/test-utils/factory/index.ts
index 5944c29a00..a609b97760 100644
--- a/tests/test-utils/factory/index.ts
+++ b/tests/test-utils/factory/index.ts
@@ -12,7 +12,6 @@ export * from "./cardSkeletonResponseFactory";
 export * from "./classInfoFactory";
 export * from "./classInfoResponseFactory";
 export * from "./classInfoSearchListResponseFactory";
-export * from "./collabora-file-selection-options.factory";
 export * from "./collaborativeTextEditorElementResponseFactory";
 export * from "./columnResponseFactory";
 export * from "./contextExternalToolConfigurationStatusFactory";

From 6d548b134b25e4cb1b4e1feaed5e3e1dcfc75f59 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 14:48:55 +0100
Subject: [PATCH 054/100] Cleanup after merge

---
 src/modules/util/board/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/util/board/index.ts b/src/modules/util/board/index.ts
index 378c792853..80486b8159 100644
--- a/src/modules/util/board/index.ts
+++ b/src/modules/util/board/index.ts
@@ -1,5 +1,4 @@
 import { BOARD_IS_LIST_LAYOUT } from "./board-injection-tokens";
-import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
 import { useDragAndDrop } from "./dragAndDrop.composable";
 import {
 	type EditModePermissions,
@@ -18,7 +17,6 @@ export {
 	BOARD_IS_LIST_LAYOUT,
 	EditModePermissions,
 	extractDataAttribute,
-	mapEditBoardPermissionToEditorMode,
 	useCourseBoardEditMode,
 	useDragAndDrop,
 	useElementFocus,

From 1c734cff4269e7263140c172253107a875bd73a1 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 26 Nov 2025 14:49:11 +0100
Subject: [PATCH 055/100] Use helper

---
 .../file-table/FileInteractionHandler.vue     | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index 7b0315900b..5597f54d5d 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -23,7 +23,7 @@ import {
 } from "@/utils/fileHelper";
 import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
-import { mapEditBoardPermissionToEditorMode } from "@util-board";
+import { openCollabora } from "@util-collabora";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
@@ -68,7 +68,7 @@ const handleClick = () => {
 	} else if (isVideo) {
 		openVideoInLightbox();
 	} else if (isCollabora) {
-		openCollabora();
+		openCollabora(router, fileRecordItem, hasEditPermission);
 	}
 };
 
@@ -115,22 +115,6 @@ const openVideoInLightbox = () => {
 
 	open(options);
 };
-
-const openCollabora = () => {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
-
-	const url = router.resolve({
-		name: "collabora",
-		params: {
-			id: fileRecordItem.id,
-		},
-		query: {
-			editorMode,
-		},
-	}).href;
-
-	window.open(url, "_blank");
-};
 </script>
 
 <style lang="scss" scoped>

From 9811dc18bd2a74aa4eeaad3b9adb30534da2438d Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 28 Nov 2025 10:27:02 +0100
Subject: [PATCH 056/100] Add fab action keys

---
 src/locales/de.ts | 2 ++
 src/locales/en.ts | 2 ++
 src/locales/es.ts | 2 ++
 src/locales/uk.ts | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index e8d40120f5..054490154b 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -2007,6 +2007,8 @@ export default {
 	"pages.folder.delete-confirmation": "Datei {name} wirklich löschen?",
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "Der Dateiname existiert bereits.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Der Dateiname enthält ungültige Zeichen.",
+	"pages.folder.fab.upload-file": "Datei hochladen",
+	"pages.folder.fab.create-document": "Dokument erstellen",
 	"pages.folder.add-collabora-file-dialog.title": "Dokument erstellen",
 	"pages.folder.add-collabora-file-dialog.doc-types": "Dokumententyp",
 	"pages.folder.add-collabora-file-dialog.untitled-file": "Unbenanntes Dokument",
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 66d4f0f9f7..019b200d7a 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1972,6 +1972,8 @@ export default {
 	"pages.folder.delete-confirmation": "Do you really want to delete file {name}?",
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "The file name already exists.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "The file name contains invalid characters.",
+	"pages.folder.fab.upload-file": "Upload file",
+	"pages.folder.fab.create-document": "Create document",
 	"pages.folder.add-collabora-file-dialog.title": "Create document",
 	"pages.folder.add-collabora-file-dialog.doc-types": "Document type",
 	"pages.folder.add-collabora-file-dialog.untitled-file": "Untitled document",
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 1e9b31603d..7523576085 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -2023,6 +2023,8 @@ export default {
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "El nombre del archivo ya existe.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters":
 		"El nombre del archivo contiene caracteres no válidos.",
+	"pages.folder.fab.upload-file": "Subir archivo",
+	"pages.folder.fab.create-document": "Crear documento",
 	"pages.folder.add-collabora-file-dialog.title": "Crear documento",
 	"pages.folder.add-collabora-file-dialog.doc-types": "Tipo de documento",
 	"pages.folder.add-collabora-file-dialog.untitled-file": "Documento sin título",
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index ff445ea983..979cbaedda 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -1992,6 +1992,8 @@ export default {
 	"pages.folder.delete-confirmation": "Дійсно видалити файл {name}?",
 	"pages.folder.rename-file-dialog.validation.duplicate-file-name": "Ім'я файлу вже існує.",
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Ім'я файлу містить недопустимі символи.",
+	"pages.folder.fab.upload-file": "Завантажити файл",
+	"pages.folder.fab.create-document": "Створити документ",
 	"pages.folder.add-collabora-file-dialog.title": "Створити документ",
 	"pages.folder.add-collabora-file-dialog.doc-types": "Тип документа",
 	"pages.folder.add-collabora-file-dialog.untitled-file": "Без назви документ",

From 7e7c1851051f61236d29c3988ae62eca14606157 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 28 Nov 2025 10:27:12 +0100
Subject: [PATCH 057/100] Add feature flag check

---
 src/modules/feature/folder/Folder.unit.ts | 58 ++++++++++++++++++++++-
 src/modules/feature/folder/Folder.vue     | 24 ++++++----
 2 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index de2707571c..6b5d558e0b 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -15,6 +15,7 @@ import { FileRecordParent } from "@/types/file/File";
 import * as FileHelper from "@/utils/fileHelper";
 import {
 	boardResponseFactory,
+	createTestEnvStore,
 	fileRecordFactory,
 	mockedPiniaStoreTyping,
 	parentNodeInfoFactory,
@@ -27,6 +28,7 @@ import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import * as ConfirmationDialog from "@ui-confirmation-dialog";
 import { KebabMenuActionDelete, KebabMenuActionRename } from "@ui-kebab-menu";
+import { SpeedDialMenu, SpeedDialMenuAction } from "@ui-speed-dial-menu";
 import * as utilCollabora from "@util-collabora";
 import { enableAutoUnmount, flushPromises } from "@vue/test-utils";
 import dayjs from "dayjs";
@@ -35,6 +37,7 @@ import { Mock } from "vitest";
 import { ComputedRef, nextTick, ref } from "vue";
 import { Router, useRouter } from "vue-router";
 import { VCard, VSkeletonLoader } from "vuetify/lib/components/index";
+import { VBtn } from "vuetify/lib/components/index";
 
 vi.mock("vue-router");
 const useRouterMock = <Mock>useRouter;
@@ -136,6 +139,9 @@ describe("Folder.vue", () => {
 					});
 					useBoardStoreMock.board = boardInStoreUndefined ? undefined : board;
 
+					const windowOpenMock = vi.fn();
+					vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+
 					await nextTick();
 					await nextTick();
 					await nextTick();
@@ -1137,7 +1143,7 @@ describe("Folder.vue", () => {
 		});
 
 		describe("when fab button is clicked", () => {
-			const setup = async () => {
+			const setup = async (collaboraEnabled = false) => {
 				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
 				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
 
@@ -1176,6 +1182,13 @@ describe("Folder.vue", () => {
 					latestAddedCollaboraFile: ref(null),
 				});
 
+				createTestEnvStore({
+					FEATURE_COLUMN_BOARD_COLLABORA_ENABLED: collaboraEnabled,
+				});
+
+				const windowOpenMock = vi.fn();
+				vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+
 				const { wrapper } = setupWrapper();
 
 				return {
@@ -1184,6 +1197,49 @@ describe("Folder.vue", () => {
 				};
 			};
 
+			it("should render fab item", async () => {
+				const { wrapper } = await setup();
+
+				const fabComponent = wrapper.findComponent(SpeedDialMenu);
+
+				expect(fabComponent.exists()).toBe(true);
+			});
+
+			describe("when collabora is not enabled", () => {
+				it("should render fab action for upload file", async () => {
+					const { wrapper } = await setup();
+
+					const fabComponent = wrapper.findComponent(SpeedDialMenu);
+					await fabComponent.findComponent(VBtn).trigger("click");
+
+					const fabActions = wrapper.findAllComponents(SpeedDialMenuAction);
+
+					expect(fabActions.length).toBe(1);
+
+					const uploadFileAction = fabActions[0];
+					expect(uploadFileAction.props("dataTestId")).toBe("fab-button-upload-file");
+				});
+			});
+
+			describe("when collabora is enabled", () => {
+				it("should render fab actions for upload file and collabora creating", async () => {
+					const { wrapper } = await setup(true);
+
+					const fabComponent = wrapper.findComponent(SpeedDialMenu);
+					await fabComponent.findComponent(VBtn).trigger("click");
+
+					const fabActions = wrapper.findAllComponents(SpeedDialMenuAction);
+
+					expect(fabActions.length).toBe(2);
+
+					const uploadFileAction = fabActions[0];
+					expect(uploadFileAction.props("dataTestId")).toBe("fab-button-upload-file");
+
+					const createDocumentAction = fabActions[1];
+					expect(createDocumentAction.props("dataTestId")).toBe("fab-button-create-document");
+				});
+			});
+
 			describe("and file upload is chosen", () => {
 				it("should reset input field", async () => {
 					const { wrapper } = await setup();
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 74c775952a..11ed16b9f3 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -61,6 +61,7 @@ import { FileRecord, FileRecordParent } from "@/types/file/File";
 import { downloadFile, downloadFilesAsArchive } from "@/utils/fileHelper";
 import { buildPageTitle } from "@/utils/pageTitle";
 import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board";
+import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { useFolderState } from "@data-folder";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
@@ -113,26 +114,31 @@ const enum FabEvent {
 	UploadFile = "UPLOAD_FILE",
 }
 
+const isCollaboraEnabled = computed(() => useEnvConfig().value.FEATURE_COLUMN_BOARD_COLLABORA_ENABLED);
+
 const fabAction = computed(() => {
 	if (!hasEditPermission.value) return;
 
 	const actions = [
-		{
-			icon: mdiFileDocumentPlusOutline,
-			label: "Dokument erstellen",
-			ariaLabel: "Dokument erstellen",
-			dataTestId: "fab-button-create-document",
-			customEvent: FabEvent.CreateDocument,
-		},
 		{
 			icon: mdiTrayArrowUp,
-			label: "Datei hochladen",
-			ariaLabel: "Datei hochladen",
+			label: t("pages.folder.fab.upload-file"),
+			ariaLabel: t("pages.folder.fab.upload-file"),
 			dataTestId: "fab-button-upload-file",
 			customEvent: FabEvent.UploadFile,
 		},
 	];
 
+	if (isCollaboraEnabled.value) {
+		actions.push({
+			icon: mdiFileDocumentPlusOutline,
+			label: t("pages.folder.fab.create-document"),
+			ariaLabel: t("pages.folder.fab.create-document"),
+			dataTestId: "fab-button-create-document",
+			customEvent: FabEvent.CreateDocument,
+		});
+	}
+
 	return {
 		icon: mdiPlus,
 		title: t("pages.folder.fab.title"),

From 19db9b24c13878d8eeace20e91a004af28c5b820 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 28 Nov 2025 10:47:01 +0100
Subject: [PATCH 058/100] Fix import issue

---
 src/modules/feature/folder/Folder.unit.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 6b5d558e0b..ce37dabc7e 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -36,8 +36,7 @@ import { setActivePinia } from "pinia"; // FIX_CIRCULAR_DEPENDENCY
 import { Mock } from "vitest";
 import { ComputedRef, nextTick, ref } from "vue";
 import { Router, useRouter } from "vue-router";
-import { VCard, VSkeletonLoader } from "vuetify/lib/components/index";
-import { VBtn } from "vuetify/lib/components/index";
+import { VBtn, VCard, VSkeletonLoader } from "vuetify/lib/components/index";
 
 vi.mock("vue-router");
 const useRouterMock = <Mock>useRouter;

From 5dee272404330f2475cbeedffe7c2e9b8ab24526 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 12:38:12 +0100
Subject: [PATCH 059/100] Adjust type

---
 src/modules/data/file/FileStorageApi.composable.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index c464dcf9fa..5f36dde09e 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -1,12 +1,6 @@
 import { useFileRecordsStore } from "./FileRecords.state";
 import { useParentStatisticsStore } from "./ParentStatistics.state";
-import {
-	FileApiFactory,
-	FileApiInterface,
-	FileRecordResponse,
-	WopiApiFactory,
-	WopiApiInterface,
-} from "@/fileStorageApi/v3";
+import { FileApiFactory, FileApiInterface, WopiApiFactory, WopiApiInterface } from "@/fileStorageApi/v3";
 import {
 	EditorMode,
 	FileRecord,
@@ -80,7 +74,7 @@ export const useFileStorageApi = () => {
 		parentId: string,
 		parentType: FileRecordParent,
 		fileName?: string
-	): Promise<FileRecordResponse | void> => {
+	): Promise<FileRecord | void> => {
 		try {
 			const { pathname } = new URL(imageUrl);
 			fileName = fileName ?? pathname.substring(pathname.lastIndexOf("/") + 1);

From 24b8ae773fae321590b5b999192b7e3847e79ac7 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 12:40:00 +0100
Subject: [PATCH 060/100] Use emit instead watcher

---
 src/modules/feature/folder/Folder.unit.ts |  6 ------
 src/modules/feature/folder/Folder.vue     | 15 +++++----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index ce37dabc7e..7d86431e8e 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -126,9 +126,7 @@ describe("Folder.vue", () => {
 					vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
 						openCollaboraFileDialog: vi.fn(),
 						closeCollaboraFileDialog: vi.fn(),
-						collaboraFileSelectionOptions: [],
 						isCollaboraFileDialogOpen: ref(false),
-						latestAddedCollaboraFile: ref(null),
 					});
 
 					const { wrapper } = setupWrapper();
@@ -1176,9 +1174,7 @@ describe("Folder.vue", () => {
 				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
 					openCollaboraFileDialog: mockOpenCollaboraFileDialog,
 					closeCollaboraFileDialog: vi.fn(),
-					collaboraFileSelectionOptions: [],
 					isCollaboraFileDialogOpen: ref(false),
-					latestAddedCollaboraFile: ref(null),
 				});
 
 				createTestEnvStore({
@@ -1307,9 +1303,7 @@ describe("Folder.vue", () => {
 				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
 					openCollaboraFileDialog: vi.fn(),
 					closeCollaboraFileDialog: vi.fn(),
-					collaboraFileSelectionOptions: [],
 					isCollaboraFileDialogOpen: ref(false),
-					latestAddedCollaboraFile,
 				});
 
 				const { wrapper } = setupWrapper();
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 11ed16b9f3..17ac4d07fe 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -41,7 +41,7 @@
 	/>
 	<input ref="fileInput" type="file" multiple hidden data-testid="input-folder-fileupload" aria-hidden="true" />
 	<LightBox />
-	<AddCollaboraFileDialog :folder-id="folderId" />
+	<AddCollaboraFileDialog :folder-id="folderId" @collabora-file-added="collaboraFileAddedHandler" />
 </template>
 
 <script setup lang="ts">
@@ -101,7 +101,7 @@ const boardStore = useBoardStore();
 const { hasEditPermission } = useBoardPermissions();
 const { handleError, notifyWithTemplate } = useErrorHandler();
 
-const { openCollaboraFileDialog, latestAddedCollaboraFile } = useAddCollaboraFile();
+const { openCollaboraFileDialog } = useAddCollaboraFile();
 
 const folderId = toRef(props, "folderId");
 const fileRecords = computed(() => getFileRecordsByParentId(folderId.value));
@@ -148,14 +148,9 @@ const fabAction = computed(() => {
 	};
 });
 
-watch(
-	() => latestAddedCollaboraFile.value,
-	(newFile) => {
-		if (newFile) {
-			openCollabora(router, newFile, hasEditPermission.value);
-		}
-	}
-);
+const collaboraFileAddedHandler = (newFile: FileRecord) => {
+	openCollabora(router, newFile, hasEditPermission.value);
+};
 
 const uploadProgress = ref({
 	uploaded: 0,

From 22fee2efc1c037a62f114dbdc625adae5161a3c4 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 12:40:29 +0100
Subject: [PATCH 061/100] Move options and upload to component

---
 .../folder/AddCollaboraFileDialog.unit.ts     |  2 -
 .../feature/folder/AddCollaboraFileDialog.vue | 53 +++++++++++++++-
 .../folder/add-collabora-file.composable.ts   | 44 -------------
 .../add-collabora-file.composable.unit.ts     | 62 +------------------
 4 files changed, 52 insertions(+), 109 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index ec11c02b08..7850fc3713 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -1,6 +1,5 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
-import { FileRecordResponse } from "@/fileStorageApi/v3";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
@@ -25,7 +24,6 @@ mockedCollaboraFileSelection.mockReturnValue({
 	isCollaboraFileDialogOpen: ref(false),
 	openCollaboraFileDialog: vi.fn(),
 	closeCollaboraFileDialog: vi.fn(),
-	latestAddedCollaboraFile: ref<FileRecordResponse | null>(null),
 });
 
 describe("CollaboraFileDialog", () => {
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index 9ecfd3b1d8..e5553af0a9 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -35,7 +35,13 @@
 </template>
 <script setup lang="ts">
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import { FileRecordParentType } from "@/fileStorageApi/v3";
+import { CollaboraFileType } from "@/types/enum/Collabora";
+import { FileRecord } from "@/types/file/File";
+import { getFileExtension } from "@/utils/fileHelper";
+import { useFileStorageApi } from "@data-file";
 import { Dialog } from "@ui-dialog";
+import { getCollaboraAssetUrl } from "@util-collabora";
 import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
 import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
@@ -47,11 +53,17 @@ const props = defineProps({
 	},
 });
 
+const emit = defineEmits<{
+	(collaboraFileAdded: "collabora-file-added", newFile: FileRecord): void;
+}>();
+
 type VuetifyForm = {
 	validate: () => Promise<{ valid: boolean }>;
 };
 
-const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = useAddCollaboraFile();
+const { uploadFromUrl } = useFileStorageApi();
+
+const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = useAddCollaboraFile();
 const { validateOnOpeningTag } = useOpeningTagValidator();
 const { validateInvalidCharacters } = useInvalidCharactersValidator();
 
@@ -62,6 +74,39 @@ const form = ref<VuetifyForm | null>(null);
 const selectedDocType = ref<string | null>(null);
 const fileName = ref<string>("");
 
+const uploadCollaboraFile = async (type: CollaboraFileType, folderId: string, fileName: string) => {
+	const assetUrl = getCollaboraAssetUrl(type);
+	const fileExtension = getFileExtension(assetUrl);
+	const fullFileName = `${fileName}.${fileExtension}`;
+
+	const fileRecord = await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
+
+	closeCollaboraFileDialog();
+
+	return fileRecord;
+};
+
+const collaboraFileSelectionOptions = [
+	{
+		id: "1",
+		label: t("pages.folder.add-collabora-file-dialog.option.text"),
+		action: async (folderId: string, fileName: string) =>
+			uploadCollaboraFile(CollaboraFileType.Text, folderId, fileName),
+	},
+	{
+		id: "2",
+		label: t("pages.folder.add-collabora-file-dialog.option.spreadsheet"),
+		action: async (folderId: string, fileName: string) =>
+			uploadCollaboraFile(CollaboraFileType.Spreadsheet, folderId, fileName),
+	},
+	{
+		id: "3",
+		label: t("pages.folder.add-collabora-file-dialog.option.presentation"),
+		action: async (folderId: string, fileName: string) =>
+			uploadCollaboraFile(CollaboraFileType.Presentation, folderId, fileName),
+	},
+];
+
 const docTypeRules = [isRequired(t("common.validation.required2"))];
 
 const fileNameRules = [
@@ -100,9 +145,13 @@ const onConfirm = async () => {
 	if (!valid) return;
 
 	closeCollaboraFileDialog();
-	await collaboraFileSelectionOptions
+	const newFile = await collaboraFileSelectionOptions
 		.find((item) => item.id === selectedDocType.value)
 		?.action(props.folderId, fileName.value);
+
+	if (newFile) {
+		emit("collabora-file-added", newFile);
+	}
 	resetForm();
 };
 </script>
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/folder/add-collabora-file.composable.ts
index ceedb4782f..ba8006ff97 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.ts
@@ -1,18 +1,8 @@
-import { FileRecordParentType, FileRecordResponse } from "@/fileStorageApi/v3";
-import { CollaboraFileType } from "@/types/enum/Collabora";
-import { getFileExtension } from "@/utils/fileHelper";
-import { useFileStorageApi } from "@data-file";
-import { getCollaboraAssetUrl } from "@util-collabora";
 import { createSharedComposable } from "@vueuse/core";
 import { ref } from "vue";
-import { useI18n } from "vue-i18n";
 
 export const useAddCollaboraFile = createSharedComposable(() => {
-	const { t } = useI18n();
-	const { uploadFromUrl } = useFileStorageApi();
-
 	const isCollaboraFileDialogOpen = ref<boolean>(false);
-	const latestAddedCollaboraFile = ref<FileRecordResponse | null>(null);
 
 	const closeCollaboraFileDialog = () => {
 		isCollaboraFileDialogOpen.value = false;
@@ -22,43 +12,9 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 		isCollaboraFileDialogOpen.value = true;
 	};
 
-	const uploadCollaboraFile = async (type: CollaboraFileType, folderId: string, fileName: string) => {
-		const assetUrl = getCollaboraAssetUrl(type);
-		const fileExtension = getFileExtension(assetUrl);
-		const fullFileName = `${fileName}.${fileExtension}`;
-
-		const fileRecordResponse = await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
-		latestAddedCollaboraFile.value = fileRecordResponse ?? null;
-
-		closeCollaboraFileDialog();
-	};
-
-	const collaboraFileSelectionOptions = [
-		{
-			id: "1",
-			label: t("pages.folder.add-collabora-file-dialog.option.text"),
-			action: async (folderId: string, fileName: string) =>
-				uploadCollaboraFile(CollaboraFileType.Text, folderId, fileName),
-		},
-		{
-			id: "2",
-			label: t("pages.folder.add-collabora-file-dialog.option.spreadsheet"),
-			action: async (folderId: string, fileName: string) =>
-				uploadCollaboraFile(CollaboraFileType.Spreadsheet, folderId, fileName),
-		},
-		{
-			id: "3",
-			label: t("pages.folder.add-collabora-file-dialog.option.presentation"),
-			action: async (folderId: string, fileName: string) =>
-				uploadCollaboraFile(CollaboraFileType.Presentation, folderId, fileName),
-		},
-	];
-
 	return {
-		collaboraFileSelectionOptions,
 		isCollaboraFileDialogOpen,
 		openCollaboraFileDialog,
 		closeCollaboraFileDialog,
-		latestAddedCollaboraFile,
 	};
 });
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index 8c1d946af8..e98d0a7ccd 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -1,5 +1,4 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { fileRecordFactory } from "@@/tests/test-utils";
 import * as FileStorageApi from "@data-file";
 import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
@@ -16,20 +15,12 @@ vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValue(fileStorageApiMock
 
 describe("AddCollaboraFileComposable", () => {
 	const setup = () => {
-		const {
-			openCollaboraFileDialog,
-			closeCollaboraFileDialog,
-			collaboraFileSelectionOptions,
-			isCollaboraFileDialogOpen,
-			latestAddedCollaboraFile,
-		} = useAddCollaboraFile();
+		const { openCollaboraFileDialog, closeCollaboraFileDialog, isCollaboraFileDialogOpen } = useAddCollaboraFile();
 
 		return {
-			collaboraFileSelectionOptions,
 			openCollaboraFileDialog,
 			isCollaboraFileDialogOpen,
 			closeCollaboraFileDialog,
-			latestAddedCollaboraFile,
 		};
 	};
 
@@ -66,55 +57,4 @@ describe("AddCollaboraFileComposable", () => {
 			expect(isCollaboraFileDialogOpen.value).toBe(false);
 		});
 	});
-
-	describe("collaboraFileSelectionOptions", () => {
-		it("provides options for collabora file types", () => {
-			const { collaboraFileSelectionOptions } = setup();
-
-			expect(collaboraFileSelectionOptions).toHaveLength(3);
-			expect(collaboraFileSelectionOptions[0].label).toBe("pages.folder.add-collabora-file-dialog.option.text");
-			expect(collaboraFileSelectionOptions[1].label).toBe("pages.folder.add-collabora-file-dialog.option.spreadsheet");
-			expect(collaboraFileSelectionOptions[2].label).toBe("pages.folder.add-collabora-file-dialog.option.presentation");
-		});
-
-		describe("action of collaboraFileSelectionOptions", () => {
-			it("should upload collabora file", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("folder-id", "test-office-file");
-				}
-
-				expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-			});
-
-			it("should set latestAddedCollaboraFile to new file record", async () => {
-				const { collaboraFileSelectionOptions, latestAddedCollaboraFile } = setup();
-				const fileRecordResponse = fileRecordFactory.build();
-				fileStorageApiMock.uploadFromUrl.mockReturnValue(fileRecordResponse);
-
-				await collaboraFileSelectionOptions[0].action("folder-id", "test-office-file");
-				expect(latestAddedCollaboraFile.value).toEqual(fileRecordResponse);
-			});
-
-			it("should set latestAddedCollaboraFile to null if uploadFromUrl fails", async () => {
-				const { collaboraFileSelectionOptions, latestAddedCollaboraFile } = setup();
-				fileStorageApiMock.uploadFromUrl.mockReturnValue();
-
-				await collaboraFileSelectionOptions[0].action("folder-id", "test-office-file");
-				expect(latestAddedCollaboraFile.value).toBeNull();
-			});
-
-			it("should finally close dialog", async () => {
-				const { collaboraFileSelectionOptions, openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
-
-				openCollaboraFileDialog();
-				expect(isCollaboraFileDialogOpen.value).toBe(true);
-
-				await collaboraFileSelectionOptions[0].action("folder-id", "test-office-file");
-
-				expect(isCollaboraFileDialogOpen.value).toBe(false);
-			});
-		});
-	});
 });

From eeb5744b723614793d5d2d82fa9bdfc5215be3a0 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 14:38:49 +0100
Subject: [PATCH 062/100] Restructure helpers, global enum

---
 .../data/file/FileStorageApi.composable.ts    |  31 +++
 src/modules/data/file/index.ts                |   2 +-
 .../FileContentElement.unit.ts                | 179 ++++++++++++------
 .../board-file-element/FileContentElement.vue |  19 +-
 .../shared/add-collabora-file.composable.ts   |  14 +-
 .../folder/AddCollaboraFileDialog.unit.ts     |  20 +-
 .../feature/folder/AddCollaboraFileDialog.vue |  26 +--
 src/modules/feature/folder/Folder.unit.ts     |  15 +-
 src/modules/feature/folder/Folder.vue         |  19 +-
 .../file-table/FileInteractionHandler.vue     |  17 +-
 src/modules/util/collabora/helpers.ts         |  37 ----
 src/modules/util/collabora/helpers.unit.ts    |  82 --------
 src/modules/util/collabora/index.ts           |   3 -
 src/types/enum/Collabora.ts                   |   5 -
 tsconfig.json                                 |   1 -
 15 files changed, 215 insertions(+), 255 deletions(-)
 delete mode 100644 src/modules/util/collabora/helpers.ts
 delete mode 100644 src/modules/util/collabora/helpers.unit.ts
 delete mode 100644 src/modules/util/collabora/index.ts
 delete mode 100644 src/types/enum/Collabora.ts

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index 5f36dde09e..22d46446be 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -11,6 +11,7 @@ import {
 } from "@/types/file/File";
 import { $axios, mapAxiosErrorToResponseError } from "@/utils/api";
 import { formatFileSize } from "@/utils/fileHelper";
+import { getFileExtension } from "@/utils/fileHelper";
 import { notifyError, useAppStore } from "@data-app";
 import { useEnvFileConfig } from "@data-env";
 import { useI18n } from "vue-i18n";
@@ -26,6 +27,12 @@ export enum ErrorType {
 	Forbidden = "Forbidden",
 }
 
+export enum CollaboraFileType {
+	Text,
+	Spreadsheet,
+	Presentation,
+}
+
 export const useFileStorageApi = () => {
 	const { t } = useI18n();
 	const fileApi: FileApiInterface = FileApiFactory(undefined, "/v3", $axios);
@@ -69,6 +76,29 @@ export const useFileStorageApi = () => {
 		}
 	};
 
+	const getCollaboraAssetUrl = (collaboraFileType: CollaboraFileType): string => {
+		const base = `${window.location.origin}/collabora`;
+
+		if (collaboraFileType === CollaboraFileType.Text) {
+			return `${base}/doc.docx`;
+		}
+		if (collaboraFileType === CollaboraFileType.Spreadsheet) {
+			return `${base}/spreadsheet.xlsx`;
+		}
+
+		return `${base}/presentation.pptx`;
+	};
+
+	const uploadCollaboraFile = async (type: CollaboraFileType, parentId: string, fileName: string) => {
+		const assetUrl = getCollaboraAssetUrl(type);
+		const fileExtension = getFileExtension(assetUrl);
+		const fullFileName = `${fileName}.${fileExtension}`;
+
+		const fileRecord = await uploadFromUrl(assetUrl, parentId, FileRecordParent.BOARDNODES, fullFileName);
+
+		return fileRecord;
+	};
+
 	const uploadFromUrl = async (
 		imageUrl: string,
 		parentId: string,
@@ -197,5 +227,6 @@ export const useFileStorageApi = () => {
 		tryGetParentStatisticFromApi: fetchFileStatistic,
 		getAuthorizedCollaboraDocumentUrl,
 		fetchFileById,
+		uploadCollaboraFile,
 	};
 };
diff --git a/src/modules/data/file/index.ts b/src/modules/data/file/index.ts
index 241c0a4828..61ae00719c 100644
--- a/src/modules/data/file/index.ts
+++ b/src/modules/data/file/index.ts
@@ -1,2 +1,2 @@
 export * from "./FileRecords.state";
-export { useFileStorageApi } from "./FileStorageApi.composable";
+export { CollaboraFileType, useFileStorageApi } from "./FileStorageApi.composable";
diff --git a/src/modules/feature/board-file-element/FileContentElement.unit.ts b/src/modules/feature/board-file-element/FileContentElement.unit.ts
index 9c80105c6f..73c7d21e86 100644
--- a/src/modules/feature/board-file-element/FileContentElement.unit.ts
+++ b/src/modules/feature/board-file-element/FileContentElement.unit.ts
@@ -15,7 +15,6 @@ import { useBoardPermissions, useContentElementState } from "@data-board";
 import * as FileStorageApi from "@data-file";
 import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
-import * as utilCollabora from "@util-collabora";
 import { shallowMount } from "@vue/test-utils";
 import { setActivePinia } from "pinia";
 import { Mock } from "vitest";
@@ -163,12 +162,11 @@ describe("FileContentElement", () => {
 					isCollaboraEditable: props?.isCollaboraEditable ?? false,
 				});
 
+				const collaboraPageUrl = "/collabora/" + fileRecordResponse.id + "?editorMode=edit";
 				const router = createMock<Router>();
 				const useRouterMock = <Mock>useRouter;
 				useRouterMock.mockReturnValue(router);
-
-				const windowOpenMock = vi.fn();
-				vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+				router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
 
 				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -216,7 +214,6 @@ describe("FileContentElement", () => {
 					menu,
 					addAlertMock,
 					fileStorageApiMock,
-					router,
 				};
 			};
 
@@ -395,33 +392,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -441,33 +446,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -487,33 +500,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -533,33 +554,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -573,12 +602,11 @@ describe("FileContentElement", () => {
 					const element = fileElementResponseFactory.build();
 					document.body.setAttribute("data-app", "true");
 
+					const collaboraPageUrl = "/collabora/" + "123" + "?editorMode=edit";
 					const router = createMock<Router>();
 					const useRouterMock = <Mock>useRouter;
 					useRouterMock.mockReturnValue(router);
-
-					const windowOpenMock = vi.fn();
-					vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+					router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
 
 					const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 					vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -757,12 +785,12 @@ describe("FileContentElement", () => {
 					isCollaboraEditable: props?.isCollaboraEditable ?? false,
 				});
 
+				const collaboraPageUrl = "/collabora/" + fileRecordResponse.id + "?editorMode=edit";
 				const router = createMock<Router>();
 				const useRouterMock = <Mock>useRouter;
-				useRouterMock.mockReturnValue(router);
 
-				const windowOpenMock = vi.fn();
-				vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+				useRouterMock.mockReturnValue(router);
+				router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
 
 				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -809,7 +837,6 @@ describe("FileContentElement", () => {
 					element,
 					expectedFileProperties,
 					menu,
-					router,
 				};
 			};
 
@@ -974,33 +1001,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -1020,33 +1055,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/vnd.oasis.opendocument.text",
 							isCollaboraEditable: true,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -1066,33 +1109,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: true,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
@@ -1112,33 +1163,41 @@ describe("FileContentElement", () => {
 
 				describe("when card is clicked", () => {
 					it("should not open collabora url in new tab", () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						card.trigger("click");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+						windowOpenSpy.mockRestore();
 					});
 				});
 
 				describe("when card is focused and enter is pressed", () => {
 					it("should not open collabora url in new tab", async () => {
-						const { wrapper, fileRecordResponse, router } = setup({
+						const { wrapper, fileRecordResponse } = setup({
 							isCollaboraEnabled: false,
 							mimeType: "application/pdf",
 							isCollaboraEditable: false,
 						});
+
 						const card = wrapper.findComponent(VCard);
-						const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+
+						const windowOpenMock = vi.fn();
+						const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
 
 						await card.trigger("keydown.enter");
 
-						expect(openCollaboraSpy).not.toHaveBeenCalledWith(router, fileRecordResponse, true);
+						expect(windowOpenSpy).not.toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}`, "_blank");
+
+						windowOpenSpy.mockRestore();
 					});
 				});
 			});
diff --git a/src/modules/feature/board-file-element/FileContentElement.vue b/src/modules/feature/board-file-element/FileContentElement.vue
index 9688d842f8..30d6c55711 100644
--- a/src/modules/feature/board-file-element/FileContentElement.vue
+++ b/src/modules/feature/board-file-element/FileContentElement.vue
@@ -63,13 +63,13 @@ import { FileRecordParentType, PreviewWidth } from "@/fileStorageApi/v3";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import BoardMenu from "@/modules/ui/board/BoardMenu.vue"; // FIX_CIRCULAR_DEPENDENCY
 import { FileElementResponse } from "@/serverApi/v3";
+import { EditorMode } from "@/types/file/File";
 import { convertDownloadToPreviewUrl, isPreviewPossible, isScanStatusBlocked } from "@/utils/fileHelper";
 import { useBoardFocusHandler, useBoardPermissions, useContentElementState } from "@data-board";
 import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { BoardMenuScope } from "@ui-board";
 import { KebabMenuActionDelete, KebabMenuActionMoveDown, KebabMenuActionMoveUp } from "@ui-kebab-menu";
-import { openCollabora } from "@util-collabora";
 import { useDebounceFn } from "@vueuse/core";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -213,9 +213,20 @@ const cardAriaLabel = computed(() => {
 	return undefined;
 });
 const onCardInteraction = () => {
-	if (isCollaboraEnabled.value && isCollaboraEditable.value) {
-		openCollabora(router, fileRecord.value, hasEditPermission.value);
-	}
+	if (isCollaboraEnabled.value && isCollaboraEditable.value) openCollabora();
+};
+const openCollabora = () => {
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: fileRecord.value.id,
+		},
+		query: {
+			editorMode: hasEditPermission.value ? EditorMode.EDIT : EditorMode.VIEW,
+		},
+	}).href;
+
+	window.open(url, "_blank");
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
index a40745a0ea..a6b026ea96 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.ts
@@ -1,13 +1,9 @@
-import { FileRecordParentType } from "@/fileStorageApi/v3";
 import { ContentElementType } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
-import { CollaboraFileType } from "@/types/enum/Collabora";
-import { getFileExtension } from "@/utils/fileHelper";
 import { type CreateElementRequestPayload, useCardStore } from "@data-board";
-import { useFileStorageApi } from "@data-file";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { useSharedFileSelect } from "@util-board";
-import { getCollaboraAssetUrl } from "@util-collabora";
 import { createSharedComposable } from "@vueuse/core";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
@@ -17,7 +13,7 @@ type CreateElementRequestFn = (payload: CreateElementRequestPayload) => Promise<
 export const useAddCollaboraFile = createSharedComposable(() => {
 	const { t } = useI18n();
 	const { disableFileSelectOnMount, resetFileSelectOnMountEnabled } = useSharedFileSelect();
-	const { uploadFromUrl } = useFileStorageApi();
+	const { uploadCollaboraFile } = useFileStorageApi();
 	const cardStore = useCardStore();
 
 	const cardId = ref("");
@@ -60,13 +56,9 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 			return;
 		}
 
-		const assetUrl = getCollaboraAssetUrl(type);
-		const fileExtension = getFileExtension(assetUrl);
-
 		try {
 			disableFileSelectOnMount();
-			const fullFileName = fileExtension ? `${fileName}.${fileExtension}` : fileName;
-			await uploadFromUrl(assetUrl, element.id, FileRecordParentType.BOARDNODES, fullFileName);
+			await uploadCollaboraFile(type, element.id, fileName);
 			await updateFileElementCaption(element, caption.trim());
 		} catch {
 			await cardStore.deleteElementRequest({ elementId: element.id, cardId: cardId.value });
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index 7850fc3713..00da1cf902 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -9,18 +9,6 @@ import { VForm, VSelect } from "vuetify/lib/components/index";
 vi.mock("./add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
 mockedCollaboraFileSelection.mockReturnValue({
-	collaboraFileSelectionOptions: [
-		{
-			id: "1",
-			label: "Text Document",
-			action: vi.fn(),
-		},
-		{
-			id: "2",
-			label: "Table Document",
-			action: vi.fn(),
-		},
-	],
 	isCollaboraFileDialogOpen: ref(false),
 	openCollaboraFileDialog: vi.fn(),
 	closeCollaboraFileDialog: vi.fn(),
@@ -28,13 +16,11 @@ mockedCollaboraFileSelection.mockReturnValue({
 
 describe("CollaboraFileDialog", () => {
 	const setupMocks = () => {
-		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen, collaboraFileSelectionOptions } =
-			mockedCollaboraFileSelection();
+		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen } = mockedCollaboraFileSelection();
 
 		return {
 			isCollaboraFileDialogOpen,
 			closeCollaboraFileDialog,
-			collaboraFileSelectionOptions,
 		};
 	};
 
@@ -78,7 +64,7 @@ describe("CollaboraFileDialog", () => {
 			vi.clearAllMocks();
 			setupMocks();
 
-			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = setupMocks();
+			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = setupMocks();
 
 			const wrapper = mount(AddCollaboraFileDialog, {
 				global: {
@@ -94,7 +80,7 @@ describe("CollaboraFileDialog", () => {
 			isCollaboraFileDialogOpen.value = true;
 			await nextTick();
 
-			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions, wrapper };
+			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, wrapper };
 		};
 
 		it("should make modal visible", async () => {
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index e5553af0a9..58f8535ee2 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -35,13 +35,9 @@
 </template>
 <script setup lang="ts">
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { FileRecordParentType } from "@/fileStorageApi/v3";
-import { CollaboraFileType } from "@/types/enum/Collabora";
 import { FileRecord } from "@/types/file/File";
-import { getFileExtension } from "@/utils/fileHelper";
-import { useFileStorageApi } from "@data-file";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { Dialog } from "@ui-dialog";
-import { getCollaboraAssetUrl } from "@util-collabora";
 import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
 import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
@@ -61,26 +57,18 @@ type VuetifyForm = {
 	validate: () => Promise<{ valid: boolean }>;
 };
 
-const { uploadFromUrl } = useFileStorageApi();
-
+const { uploadCollaboraFile } = useFileStorageApi();
 const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = useAddCollaboraFile();
 const { validateOnOpeningTag } = useOpeningTagValidator();
 const { validateInvalidCharacters } = useInvalidCharactersValidator();
-
 const { t } = useI18n();
 
 const form = ref<VuetifyForm | null>(null);
-
 const selectedDocType = ref<string | null>(null);
 const fileName = ref<string>("");
 
-const uploadCollaboraFile = async (type: CollaboraFileType, folderId: string, fileName: string) => {
-	const assetUrl = getCollaboraAssetUrl(type);
-	const fileExtension = getFileExtension(assetUrl);
-	const fullFileName = `${fileName}.${fileExtension}`;
-
-	const fileRecord = await uploadFromUrl(assetUrl, folderId, FileRecordParentType.BOARDNODES, fullFileName);
-
+const uploadCollaboraFileFn = async (type: CollaboraFileType, folderId: string, fileName: string) => {
+	const fileRecord = await uploadCollaboraFile(type, folderId, fileName);
 	closeCollaboraFileDialog();
 
 	return fileRecord;
@@ -91,19 +79,19 @@ const collaboraFileSelectionOptions = [
 		id: "1",
 		label: t("pages.folder.add-collabora-file-dialog.option.text"),
 		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFile(CollaboraFileType.Text, folderId, fileName),
+			uploadCollaboraFileFn(CollaboraFileType.Text, folderId, fileName),
 	},
 	{
 		id: "2",
 		label: t("pages.folder.add-collabora-file-dialog.option.spreadsheet"),
 		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFile(CollaboraFileType.Spreadsheet, folderId, fileName),
+			uploadCollaboraFileFn(CollaboraFileType.Spreadsheet, folderId, fileName),
 	},
 	{
 		id: "3",
 		label: t("pages.folder.add-collabora-file-dialog.option.presentation"),
 		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFile(CollaboraFileType.Presentation, folderId, fileName),
+			uploadCollaboraFileFn(CollaboraFileType.Presentation, folderId, fileName),
 	},
 ];
 
diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 7d86431e8e..82bfa51187 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -29,7 +29,6 @@ import { createTestingPinia } from "@pinia/testing";
 import * as ConfirmationDialog from "@ui-confirmation-dialog";
 import { KebabMenuActionDelete, KebabMenuActionRename } from "@ui-kebab-menu";
 import { SpeedDialMenu, SpeedDialMenuAction } from "@ui-speed-dial-menu";
-import * as utilCollabora from "@util-collabora";
 import { enableAutoUnmount, flushPromises } from "@vue/test-utils";
 import dayjs from "dayjs";
 import { setActivePinia } from "pinia"; // FIX_CIRCULAR_DEPENDENCY
@@ -1318,15 +1317,15 @@ describe("Folder.vue", () => {
 				};
 			};
 
-			it("should show open collabora file in new tab", async () => {
-				const { latestAddedCollaboraFile } = await setup();
-				const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+			// it("should show open collabora file in new tab", async () => {
+			// 	const { latestAddedCollaboraFile } = await setup();
+			// 	const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
 
-				latestAddedCollaboraFile.value = fileRecordFactory.build();
-				await nextTick();
+			// 	latestAddedCollaboraFile.value = fileRecordFactory.build();
+			// 	await nextTick();
 
-				expect(openCollaboraSpy).toHaveBeenCalled();
-			});
+			// 	expect(openCollaboraSpy).toHaveBeenCalled();
+			// });
 		});
 
 		describe("when fab button is clicked, file upload is chosen, files are selected and upload succeed", () => {
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 17ac4d07fe..317825b0d7 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -58,6 +58,7 @@ import { useBoardStore } from "@/modules/data/board/Board.store"; // FIX_CIRCULA
 import { useBoardApi } from "@/modules/data/board/BoardApi.composable"; // FIX_CIRCULAR_DEPENDENCY
 import { ParentNodeType } from "@/types/board/ContentElement";
 import { FileRecord, FileRecordParent } from "@/types/file/File";
+import { EditorMode } from "@/types/file/File";
 import { downloadFile, downloadFilesAsArchive } from "@/utils/fileHelper";
 import { buildPageTitle } from "@/utils/pageTitle";
 import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board";
@@ -67,7 +68,6 @@ import { useFolderState } from "@data-folder";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
-import { openCollabora } from "@util-collabora";
 import dayjs from "dayjs";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -148,10 +148,6 @@ const fabAction = computed(() => {
 	};
 });
 
-const collaboraFileAddedHandler = (newFile: FileRecord) => {
-	openCollabora(router, newFile, hasEditPermission.value);
-};
-
 const uploadProgress = ref({
 	uploaded: 0,
 	total: 0,
@@ -175,6 +171,19 @@ const fabItemClickHandler = (event: string | undefined): void => {
 	}
 };
 
+const collaboraFileAddedHandler = (newFile: FileRecord) => {
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: newFile.id,
+		},
+		query: {
+			editorMode: hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW,
+		},
+	}).href;
+	window.open(url, "_blank");
+};
+
 const onDelete = async (confirmation: Promise<boolean>) => {
 	const shouldDelete = await confirmation;
 
diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index 5597f54d5d..7fd81fae4f 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -14,6 +14,7 @@
 
 <script setup lang="ts">
 import { FileRecordItem } from "../types/filerecord-item";
+import { EditorMode, FileRecord } from "@/types/file/File";
 import {
 	convertDownloadToPreviewUrl,
 	isAudioMimeType,
@@ -23,7 +24,6 @@ import {
 } from "@/utils/fileHelper";
 import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
-import { openCollabora } from "@util-collabora";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
@@ -68,7 +68,7 @@ const handleClick = () => {
 	} else if (isVideo) {
 		openVideoInLightbox();
 	} else if (isCollabora) {
-		openCollabora(router, fileRecordItem, hasEditPermission);
+		openCollabora(fileRecordItem, hasEditPermission);
 	}
 };
 
@@ -115,6 +115,19 @@ const openVideoInLightbox = () => {
 
 	open(options);
 };
+
+const openCollabora = (fileRecord: FileRecord, hasEditPermission: boolean) => {
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: fileRecord.id,
+		},
+		query: {
+			editorMode: hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW,
+		},
+	}).href;
+	window.open(url, "_blank");
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/modules/util/collabora/helpers.ts b/src/modules/util/collabora/helpers.ts
deleted file mode 100644
index 59f5bbfc73..0000000000
--- a/src/modules/util/collabora/helpers.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { FileRecordResponse } from "@/fileStorageApi/v3";
-import { CollaboraFileType } from "@/types/enum/Collabora";
-import { EditorMode } from "@/types/file/File";
-import { Router } from "vue-router";
-
-export function mapEditBoardPermissionToEditorMode(hasEditPermission: boolean): string {
-	const editorMode = hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW;
-
-	return editorMode;
-}
-
-export function getCollaboraAssetUrl(collaboraFileType: CollaboraFileType): string {
-	const base = `${window.location.origin}/collabora`;
-
-	if (collaboraFileType === CollaboraFileType.Text) {
-		return `${base}/doc.docx`;
-	}
-	if (collaboraFileType === CollaboraFileType.Spreadsheet) {
-		return `${base}/spreadsheet.xlsx`;
-	}
-
-	return `${base}/presentation.pptx`;
-}
-
-export function openCollabora(router: Router, collaboraFile: FileRecordResponse, hasEditPermission: boolean): void {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
-	const url = router.resolve({
-		name: "collabora",
-		params: {
-			id: collaboraFile.id,
-		},
-		query: {
-			editorMode,
-		},
-	}).href;
-	window.open(url, "_blank");
-}
diff --git a/src/modules/util/collabora/helpers.unit.ts b/src/modules/util/collabora/helpers.unit.ts
deleted file mode 100644
index ff1515024f..0000000000
--- a/src/modules/util/collabora/helpers.unit.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { getCollaboraAssetUrl, mapEditBoardPermissionToEditorMode, openCollabora } from "./helpers";
-import { CollaboraFileType } from "@/types/enum/Collabora";
-import { EditorMode } from "@/types/file/File";
-import { fileRecordFactory } from "@@/tests/test-utils/factory/filerecordResponse.factory";
-import { createMock } from "@golevelup/ts-vitest";
-import { Router } from "vue-router";
-
-vi.mock("vue-router");
-
-describe("getCollaboraAssetUrl", () => {
-	it("should return correct URL for CollaboraFileType.Text", () => {
-		const url = getCollaboraAssetUrl(CollaboraFileType.Text);
-		expect(url).toBe(`${window.location.origin}/collabora/doc.docx`);
-	});
-
-	it("should return correct URL for CollaboraFileType.Spreadsheet", () => {
-		const url = getCollaboraAssetUrl(CollaboraFileType.Spreadsheet);
-		expect(url).toBe(`${window.location.origin}/collabora/spreadsheet.xlsx`);
-	});
-
-	it("should return correct URL for CollaboraFileType.Presentation", () => {
-		const url = getCollaboraAssetUrl(CollaboraFileType.Presentation);
-		expect(url).toBe(`${window.location.origin}/collabora/presentation.pptx`);
-	});
-});
-
-describe("mapEditBoardPermissionToEditorMode", () => {
-	it("returns EDIT when hasEditPermission is true", () => {
-		const result = mapEditBoardPermissionToEditorMode(true);
-
-		expect(result).toBe(EditorMode.EDIT);
-	});
-
-	it("returns VIEW when hasEditPermission is false", () => {
-		const result = mapEditBoardPermissionToEditorMode(false);
-
-		expect(result).toBe(EditorMode.VIEW);
-	});
-});
-
-describe("openCollabora", () => {
-	const setup = (hasEditPermission: boolean) => {
-		const fileRecordResponse = fileRecordFactory.build();
-
-		const router = createMock<Router>();
-		const collaboraPageUrl =
-			"/collabora/" + fileRecordResponse.id + "?editorMode=" + (hasEditPermission ? "edit" : "view");
-		router.resolve.mockReturnValueOnce({ href: collaboraPageUrl });
-
-		return { fileRecordResponse, router };
-	};
-
-	it("opens collabora in edit mode when hasEditPermission is true", () => {
-		const { fileRecordResponse, router } = setup(true);
-		const windowOpenMock = vi.fn();
-		const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
-
-		openCollabora(router, fileRecordResponse, true);
-		expect(router.resolve).toHaveBeenCalledWith({
-			name: "collabora",
-			params: { id: fileRecordResponse.id },
-			query: { editorMode: EditorMode.EDIT },
-		});
-		expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=edit`, "_blank");
-		windowOpenSpy.mockRestore();
-	});
-
-	it("opens collabora in view mode when hasEditPermission is false", () => {
-		const { fileRecordResponse, router } = setup(false);
-		const windowOpenMock = vi.fn();
-		const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
-
-		openCollabora(router, fileRecordResponse, false);
-		expect(router.resolve).toHaveBeenCalledWith({
-			name: "collabora",
-			params: { id: fileRecordResponse.id },
-			query: { editorMode: EditorMode.VIEW },
-		});
-		expect(windowOpenSpy).toHaveBeenCalledWith(`/collabora/${fileRecordResponse.id}?editorMode=view`, "_blank");
-		windowOpenSpy.mockRestore();
-	});
-});
diff --git a/src/modules/util/collabora/index.ts b/src/modules/util/collabora/index.ts
deleted file mode 100644
index acabbfda4b..0000000000
--- a/src/modules/util/collabora/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { getCollaboraAssetUrl, mapEditBoardPermissionToEditorMode, openCollabora } from "./helpers";
-
-export { getCollaboraAssetUrl, mapEditBoardPermissionToEditorMode, openCollabora };
diff --git a/src/types/enum/Collabora.ts b/src/types/enum/Collabora.ts
deleted file mode 100644
index 0b7ae656fa..0000000000
--- a/src/types/enum/Collabora.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum CollaboraFileType {
-	Text,
-	Spreadsheet,
-	Presentation,
-}
diff --git a/tsconfig.json b/tsconfig.json
index 07fa96b414..e170731d55 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -103,7 +103,6 @@
 			"@util-device-detection": ["src/modules/util/device-detection"],
 			"@util-error-notification": ["src/modules/util/error-notification"],
 			"@util-logger": ["src/modules/util/logger"],
-			"@util-collabora": ["src/modules/util/collabora"],
 			"@page-board": ["src/modules/page/board"],
 			"@page-class-members": ["src/modules/page/class-members"],
 			"@page-media-shelf": ["src/modules/page/media-shelf"],

From df8bd517f8ed4f7573c85d218c974d0a434030e2 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 14:48:12 +0100
Subject: [PATCH 063/100] Adjust tests

---
 .../board/shared/add-collabora-file.composable.unit.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
index cd638a6314..8b6f2cf538 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
@@ -167,7 +167,7 @@ describe("AddCollaboraFileComposable", () => {
 					await option.action("test-office-file", "");
 				}
 
-				expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
+				expect(fileStorageApiMock.uploadCollaboraFile).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
 			});
 
 			describe("when a caption is provided", () => {
@@ -207,7 +207,7 @@ describe("AddCollaboraFileComposable", () => {
 			describe("when file upload fails", () => {
 				it("should delete the created file element", async () => {
 					const { collaboraFileSelectionOptions } = setup();
-					fileStorageApiMock.uploadFromUrl.mockRejectedValue(new Error("Upload failed"));
+					fileStorageApiMock.uploadCollaboraFile.mockRejectedValue(new Error("Upload failed"));
 
 					for (const option of collaboraFileSelectionOptions) {
 						await option.action("test-office-file", "");

From eace8ecbedbb3761fea8698d72b5c07643d40d85 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 15:02:31 +0100
Subject: [PATCH 064/100] Adjust test and check for emit

---
 src/modules/feature/folder/Folder.unit.ts | 26 ++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 82bfa51187..ece787ecd7 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1,4 +1,5 @@
 import * as AddCollaboraFile from "./add-collabora-file.composable";
+import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import DeleteFileDialog from "./file-table/DeleteFileDialog.vue";
 import EmptyFolderSvg from "./file-table/EmptyFolderSvg.vue";
 import KebabMenuActionDeleteFiles from "./file-table/KebabMenuActionDeleteFiles.vue";
@@ -7,11 +8,10 @@ import RenameFileDialog from "./file-table/RenameFileDialog.vue";
 import Folder from "./Folder.vue";
 import FolderMenu from "./FolderMenu.vue";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
-import { FileRecordResponse } from "@/fileStorageApi/v3";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store";
 import { ParentNodeInfo, ParentNodeType } from "@/types/board/ContentElement";
-import { FileRecordParent } from "@/types/file/File";
+import { FileRecord, FileRecordParent } from "@/types/file/File";
 import * as FileHelper from "@/utils/fileHelper";
 import {
 	boardResponseFactory,
@@ -20,6 +20,7 @@ import {
 	mockedPiniaStoreTyping,
 	parentNodeInfoFactory,
 } from "@@/tests/test-utils";
+import { fileRecordFactory } from "@@/tests/test-utils";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import * as BoardApi from "@data-board";
 import * as FileStorageApi from "@data-file";
@@ -1297,14 +1298,15 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-				const latestAddedCollaboraFile = ref<FileRecordResponse | null>(null);
-
 				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
 					openCollaboraFileDialog: vi.fn(),
 					closeCollaboraFileDialog: vi.fn(),
 					isCollaboraFileDialogOpen: ref(false),
 				});
 
+				const windowOpenMock = vi.fn();
+				const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
+
 				const { wrapper } = setupWrapper();
 
 				await nextTick();
@@ -1313,19 +1315,19 @@ describe("Folder.vue", () => {
 
 				return {
 					wrapper,
-					latestAddedCollaboraFile,
+					windowOpenSpy,
 				};
 			};
 
-			// it("should show open collabora file in new tab", async () => {
-			// 	const { latestAddedCollaboraFile } = await setup();
-			// 	const openCollaboraSpy = vi.spyOn(utilCollabora, "openCollabora");
+			it("should show open collabora file in new tab", async () => {
+				const { wrapper, windowOpenSpy } = await setup();
 
-			// 	latestAddedCollaboraFile.value = fileRecordFactory.build();
-			// 	await nextTick();
+				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+				const newFile: FileRecord = fileRecordFactory.build();
+				await collaboraFileDialog.vm.$emit("collabora-file-added", newFile);
 
-			// 	expect(openCollaboraSpy).toHaveBeenCalled();
-			// });
+				expect(windowOpenSpy).toHaveBeenCalled();
+			});
 		});
 
 		describe("when fab button is clicked, file upload is chosen, files are selected and upload succeed", () => {

From 29deb9d6c77f6c109f25e8413a60d6483ada7311 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 15:10:41 +0100
Subject: [PATCH 065/100] Readd mapper

---
 .../board-file-element/FileContentElement.vue    |  5 +++--
 src/modules/feature/folder/Folder.vue            |  6 ++++--
 .../folder/file-table/FileInteractionHandler.vue |  7 +++++--
 .../util/board/collabora-editor-mode.mapper.ts   |  7 +++++++
 .../board/collabora-editor-mode.mapper.unit.ts   | 16 ++++++++++++++++
 src/modules/util/board/index.ts                  |  2 ++
 6 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 src/modules/util/board/collabora-editor-mode.mapper.ts
 create mode 100644 src/modules/util/board/collabora-editor-mode.mapper.unit.ts

diff --git a/src/modules/feature/board-file-element/FileContentElement.vue b/src/modules/feature/board-file-element/FileContentElement.vue
index 30d6c55711..e4b687c845 100644
--- a/src/modules/feature/board-file-element/FileContentElement.vue
+++ b/src/modules/feature/board-file-element/FileContentElement.vue
@@ -63,13 +63,13 @@ import { FileRecordParentType, PreviewWidth } from "@/fileStorageApi/v3";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import BoardMenu from "@/modules/ui/board/BoardMenu.vue"; // FIX_CIRCULAR_DEPENDENCY
 import { FileElementResponse } from "@/serverApi/v3";
-import { EditorMode } from "@/types/file/File";
 import { convertDownloadToPreviewUrl, isPreviewPossible, isScanStatusBlocked } from "@/utils/fileHelper";
 import { useBoardFocusHandler, useBoardPermissions, useContentElementState } from "@data-board";
 import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { BoardMenuScope } from "@ui-board";
 import { KebabMenuActionDelete, KebabMenuActionMoveDown, KebabMenuActionMoveUp } from "@ui-kebab-menu";
+import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import { useDebounceFn } from "@vueuse/core";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -216,13 +216,14 @@ const onCardInteraction = () => {
 	if (isCollaboraEnabled.value && isCollaboraEditable.value) openCollabora();
 };
 const openCollabora = () => {
+	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
 	const url = router.resolve({
 		name: "collabora",
 		params: {
 			id: fileRecord.value.id,
 		},
 		query: {
-			editorMode: hasEditPermission.value ? EditorMode.EDIT : EditorMode.VIEW,
+			editorMode,
 		},
 	}).href;
 
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 317825b0d7..ccc167de50 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -58,7 +58,6 @@ import { useBoardStore } from "@/modules/data/board/Board.store"; // FIX_CIRCULA
 import { useBoardApi } from "@/modules/data/board/BoardApi.composable"; // FIX_CIRCULAR_DEPENDENCY
 import { ParentNodeType } from "@/types/board/ContentElement";
 import { FileRecord, FileRecordParent } from "@/types/file/File";
-import { EditorMode } from "@/types/file/File";
 import { downloadFile, downloadFilesAsArchive } from "@/utils/fileHelper";
 import { buildPageTitle } from "@/utils/pageTitle";
 import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board";
@@ -68,6 +67,7 @@ import { useFolderState } from "@data-folder";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
+import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import dayjs from "dayjs";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -172,13 +172,15 @@ const fabItemClickHandler = (event: string | undefined): void => {
 };
 
 const collaboraFileAddedHandler = (newFile: FileRecord) => {
+	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
+
 	const url = router.resolve({
 		name: "collabora",
 		params: {
 			id: newFile.id,
 		},
 		query: {
-			editorMode: hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW,
+			editorMode,
 		},
 	}).href;
 	window.open(url, "_blank");
diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index 7fd81fae4f..1ad8d2296a 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -14,7 +14,7 @@
 
 <script setup lang="ts">
 import { FileRecordItem } from "../types/filerecord-item";
-import { EditorMode, FileRecord } from "@/types/file/File";
+import { FileRecord } from "@/types/file/File";
 import {
 	convertDownloadToPreviewUrl,
 	isAudioMimeType,
@@ -24,6 +24,7 @@ import {
 } from "@/utils/fileHelper";
 import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
+import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
@@ -117,13 +118,15 @@ const openVideoInLightbox = () => {
 };
 
 const openCollabora = (fileRecord: FileRecord, hasEditPermission: boolean) => {
+	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
+
 	const url = router.resolve({
 		name: "collabora",
 		params: {
 			id: fileRecord.id,
 		},
 		query: {
-			editorMode: hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW,
+			editorMode,
 		},
 	}).href;
 	window.open(url, "_blank");
diff --git a/src/modules/util/board/collabora-editor-mode.mapper.ts b/src/modules/util/board/collabora-editor-mode.mapper.ts
new file mode 100644
index 0000000000..9c0a285a8a
--- /dev/null
+++ b/src/modules/util/board/collabora-editor-mode.mapper.ts
@@ -0,0 +1,7 @@
+import { EditorMode } from "@/types/file/File";
+
+export function mapEditBoardPermissionToEditorMode(hasEditPermission: boolean): string {
+	const editorMode = hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW;
+
+	return editorMode;
+}
diff --git a/src/modules/util/board/collabora-editor-mode.mapper.unit.ts b/src/modules/util/board/collabora-editor-mode.mapper.unit.ts
new file mode 100644
index 0000000000..cd872101b3
--- /dev/null
+++ b/src/modules/util/board/collabora-editor-mode.mapper.unit.ts
@@ -0,0 +1,16 @@
+import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
+import { EditorMode } from "@/types/file/File";
+
+describe("mapEditBoardPermissionToEditorMode", () => {
+	it("returns EDIT when hasEditPermission is true", () => {
+		const result = mapEditBoardPermissionToEditorMode(true);
+
+		expect(result).toBe(EditorMode.EDIT);
+	});
+
+	it("returns VIEW when hasEditPermission is false", () => {
+		const result = mapEditBoardPermissionToEditorMode(false);
+
+		expect(result).toBe(EditorMode.VIEW);
+	});
+});
diff --git a/src/modules/util/board/index.ts b/src/modules/util/board/index.ts
index 80486b8159..378c792853 100644
--- a/src/modules/util/board/index.ts
+++ b/src/modules/util/board/index.ts
@@ -1,4 +1,5 @@
 import { BOARD_IS_LIST_LAYOUT } from "./board-injection-tokens";
+import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
 import { useDragAndDrop } from "./dragAndDrop.composable";
 import {
 	type EditModePermissions,
@@ -17,6 +18,7 @@ export {
 	BOARD_IS_LIST_LAYOUT,
 	EditModePermissions,
 	extractDataAttribute,
+	mapEditBoardPermissionToEditorMode,
 	useCourseBoardEditMode,
 	useDragAndDrop,
 	useElementFocus,

From 3bb56feced29d8811f369d83ce42a3795bb89ea3 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:11:05 +0100
Subject: [PATCH 066/100] Fix double import

---
 src/modules/feature/folder/Folder.unit.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index ece787ecd7..4baced3b32 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -20,7 +20,6 @@ import {
 	mockedPiniaStoreTyping,
 	parentNodeInfoFactory,
 } from "@@/tests/test-utils";
-import { fileRecordFactory } from "@@/tests/test-utils";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import * as BoardApi from "@data-board";
 import * as FileStorageApi from "@data-file";

From f1e7d61c391695755f4c55032a4ac25918242a89 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:11:18 +0100
Subject: [PATCH 067/100] Adjust tests

---
 .../folder/AddCollaboraFileDialog.unit.ts     | 72 ++++++++-----------
 .../add-collabora-file.composable.unit.ts     | 21 ------
 2 files changed, 31 insertions(+), 62 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index 00da1cf902..a380844f22 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -1,11 +1,14 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
+import { useFileStorageApi } from "@data-file";
+import { createMock } from "@golevelup/ts-vitest";
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
 import { nextTick, ref } from "vue";
 import { VForm, VSelect } from "vuetify/lib/components/index";
 
+vi.mock("@data-file");
 vi.mock("./add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
 mockedCollaboraFileSelection.mockReturnValue({
@@ -13,6 +16,8 @@ mockedCollaboraFileSelection.mockReturnValue({
 	openCollaboraFileDialog: vi.fn(),
 	closeCollaboraFileDialog: vi.fn(),
 });
+const mockFileStorageApi = createMock<ReturnType<typeof useFileStorageApi>>();
+vi.mocked(useFileStorageApi).mockReturnValue(mockFileStorageApi);
 
 describe("CollaboraFileDialog", () => {
 	const setupMocks = () => {
@@ -97,25 +102,15 @@ describe("CollaboraFileDialog", () => {
 			expect(dialog.props("confirmBtnDisabled")).toBe(true);
 		});
 
-		it("should render options", async () => {
-			const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-			const typeSelect = wrapper.findComponent(VSelect);
-			expect(typeSelect.props("items")).toBe(collaboraFileSelectionOptions);
-		});
-
 		describe("when form is valid", () => {
 			it("should call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-				const FILENAME = "myDocument";
+				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await typeSelect.setValue("1");
 				await nextTick();
-				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
 
+				const FILENAME = "myDocument";
 				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
@@ -124,20 +119,18 @@ describe("CollaboraFileDialog", () => {
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalled();
-				expect(selectOption.action).toHaveBeenCalledWith("folder-id", FILENAME);
+
+				expect(mockFileStorageApi.uploadCollaboraFile).toHaveBeenCalled();
 			});
 
 			it("should have confirm button enabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-				const FILENAME = "myDocument";
+				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await typeSelect.setValue("1");
 				await nextTick();
 
+				const FILENAME = "myDocument";
 				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
@@ -149,18 +142,19 @@ describe("CollaboraFileDialog", () => {
 
 		describe("when filetype is not selected", () => {
 			it("should not call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-				const selectOption = collaboraFileSelectionOptions[0];
+				const { wrapper } = await setup();
 
+				const FILENAME = "myDocument";
 				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue("myDocument");
+				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
 				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalledTimes(0);
+
+				expect(mockFileStorageApi.uploadCollaboraFile).not.toHaveBeenCalled();
 			});
 
 			it("should have confirm button disabled", async () => {
@@ -177,34 +171,32 @@ describe("CollaboraFileDialog", () => {
 
 		describe("when filename is empty", () => {
 			it("should not call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
+				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await typeSelect.setValue("1");
 				await nextTick();
-				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']").find("input");
-				expect(fileNameInput.element.value).toBe("");
 
 				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalledTimes(0);
+
+				expect(mockFileStorageApi.uploadCollaboraFile).not.toHaveBeenCalled();
 			});
 
 			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
+				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await typeSelect.setValue("1");
 				await nextTick();
 
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+
 				const dialog = wrapper.findComponent(Dialog);
 				expect(dialog.props("confirmBtnDisabled")).toBe(true);
 			});
@@ -212,12 +204,10 @@ describe("CollaboraFileDialog", () => {
 
 		describe("when filename contains invalid characters", () => {
 			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
+				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
+				await typeSelect.setValue("1");
 				await nextTick();
 
 				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
index e98d0a7ccd..3fddd2f4f6 100644
--- a/src/modules/feature/folder/add-collabora-file.composable.unit.ts
+++ b/src/modules/feature/folder/add-collabora-file.composable.unit.ts
@@ -1,17 +1,4 @@
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import * as FileStorageApi from "@data-file";
-import { createMock } from "@golevelup/ts-vitest";
-import { createTestingPinia } from "@pinia/testing";
-import { setActivePinia } from "pinia";
-
-vi.mock("vue-i18n", () => ({
-	useI18n: vi.fn().mockReturnValue({
-		t: vi.fn().mockImplementation((key: string) => key),
-	}),
-}));
-
-const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValue(fileStorageApiMock);
 
 describe("AddCollaboraFileComposable", () => {
 	const setup = () => {
@@ -24,14 +11,6 @@ describe("AddCollaboraFileComposable", () => {
 		};
 	};
 
-	beforeEach(() => {
-		setActivePinia(createTestingPinia());
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
 	describe("openCollaboraFileDialog", () => {
 		it("should set isCollaboraFileDialogOpen to true", () => {
 			const { openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();

From b987bc1052e84b109b91811f0495e11d6280b69e Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:16:03 +0100
Subject: [PATCH 068/100] Undo changes

---
 .../feature/folder/file-table/FileInteractionHandler.vue   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index 1ad8d2296a..dc95cff028 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -14,7 +14,6 @@
 
 <script setup lang="ts">
 import { FileRecordItem } from "../types/filerecord-item";
-import { FileRecord } from "@/types/file/File";
 import {
 	convertDownloadToPreviewUrl,
 	isAudioMimeType,
@@ -69,7 +68,7 @@ const handleClick = () => {
 	} else if (isVideo) {
 		openVideoInLightbox();
 	} else if (isCollabora) {
-		openCollabora(fileRecordItem, hasEditPermission);
+		openCollabora();
 	}
 };
 
@@ -117,13 +116,13 @@ const openVideoInLightbox = () => {
 	open(options);
 };
 
-const openCollabora = (fileRecord: FileRecord, hasEditPermission: boolean) => {
+const openCollabora = () => {
 	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
 
 	const url = router.resolve({
 		name: "collabora",
 		params: {
-			id: fileRecord.id,
+			id: fileRecordItem.id,
 		},
 		query: {
 			editorMode,

From ee2cb643c9b050bfddcc5906ddd4156ee83209df Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:16:36 +0100
Subject: [PATCH 069/100] Undo changes

---
 src/modules/feature/folder/file-table/FileInteractionHandler.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index dc95cff028..7b0315900b 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -128,6 +128,7 @@ const openCollabora = () => {
 			editorMode,
 		},
 	}).href;
+
 	window.open(url, "_blank");
 };
 </script>

From c263acfa2eacbf15cf976f8c32b41124b426c310 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:17:36 +0100
Subject: [PATCH 070/100] Undo changes

---
 src/modules/feature/board-file-element/FileContentElement.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/feature/board-file-element/FileContentElement.vue b/src/modules/feature/board-file-element/FileContentElement.vue
index e4b687c845..e897dd83fa 100644
--- a/src/modules/feature/board-file-element/FileContentElement.vue
+++ b/src/modules/feature/board-file-element/FileContentElement.vue
@@ -217,6 +217,7 @@ const onCardInteraction = () => {
 };
 const openCollabora = () => {
 	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
+
 	const url = router.resolve({
 		name: "collabora",
 		params: {

From 522f7b98e3847ab2e6db1872999595693041b687 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:30:38 +0100
Subject: [PATCH 071/100] Cleanup imports

---
 src/modules/data/file/FileStorageApi.composable.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index 22d46446be..8b575c5753 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -10,8 +10,7 @@ import {
 	StorageLocation,
 } from "@/types/file/File";
 import { $axios, mapAxiosErrorToResponseError } from "@/utils/api";
-import { formatFileSize } from "@/utils/fileHelper";
-import { getFileExtension } from "@/utils/fileHelper";
+import { formatFileSize, getFileExtension } from "@/utils/fileHelper";
 import { notifyError, useAppStore } from "@data-app";
 import { useEnvFileConfig } from "@data-env";
 import { useI18n } from "vue-i18n";

From df9a49c9192ce91ad2eb83b32de6687063768333 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 16:43:02 +0100
Subject: [PATCH 072/100] Test all options

---
 .../folder/AddCollaboraFileDialog.unit.ts     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
index a380844f22..cf4df1fda4 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
@@ -106,21 +106,27 @@ describe("CollaboraFileDialog", () => {
 			it("should call item action", async () => {
 				const { wrapper } = await setup();
 
-				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
-				await nextTick();
-
 				const FILENAME = "myDocument";
 				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
+				const typeSelect = wrapper.findComponent(VSelect);
+				const typeOptions = typeSelect.props("items") as Array<{ id: string; label: string; action: () => void }>;
+				expect(typeOptions.length).toBe(3);
+
 				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-				await form.trigger("submit");
-				await nextTick();
+
+				typeOptions.forEach(async (option) => {
+					await typeSelect.setValue(option.id);
+					await nextTick();
+
+					await form.trigger("submit");
+					await nextTick();
+				});
 				await flushPromises();
 
-				expect(mockFileStorageApi.uploadCollaboraFile).toHaveBeenCalled();
+				expect(mockFileStorageApi.uploadCollaboraFile).toHaveBeenCalledTimes(typeOptions.length);
 			});
 
 			it("should have confirm button enabled", async () => {

From e055173ef01ea0e3b7a800778165c1db2fa76fe1 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 17:13:52 +0100
Subject: [PATCH 073/100] Refactor editMode mapper

---
 .../board-file-element/FileContentElement.vue    |  5 +----
 src/modules/feature/folder/Folder.vue            |  5 +----
 .../folder/file-table/FileInteractionHandler.vue |  5 +----
 .../page/collabora/Collabora.page.unit.ts        | 10 +++++-----
 src/modules/page/collabora/Collabora.page.vue    |  6 ++++--
 .../util/board/collabora-editor-mode.mapper.ts   |  7 -------
 .../board/collabora-editor-mode.mapper.unit.ts   | 16 ----------------
 src/modules/util/board/index.ts                  |  2 --
 src/router/routes.ts                             |  2 +-
 9 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 src/modules/util/board/collabora-editor-mode.mapper.ts
 delete mode 100644 src/modules/util/board/collabora-editor-mode.mapper.unit.ts

diff --git a/src/modules/feature/board-file-element/FileContentElement.vue b/src/modules/feature/board-file-element/FileContentElement.vue
index e897dd83fa..1147139838 100644
--- a/src/modules/feature/board-file-element/FileContentElement.vue
+++ b/src/modules/feature/board-file-element/FileContentElement.vue
@@ -69,7 +69,6 @@ import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { BoardMenuScope } from "@ui-board";
 import { KebabMenuActionDelete, KebabMenuActionMoveDown, KebabMenuActionMoveUp } from "@ui-kebab-menu";
-import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import { useDebounceFn } from "@vueuse/core";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -216,15 +215,13 @@ const onCardInteraction = () => {
 	if (isCollaboraEnabled.value && isCollaboraEditable.value) openCollabora();
 };
 const openCollabora = () => {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
-
 	const url = router.resolve({
 		name: "collabora",
 		params: {
 			id: fileRecord.value.id,
 		},
 		query: {
-			editorMode,
+			edit: hasEditPermission.value.toString(),
 		},
 	}).href;
 
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index ccc167de50..96e016618a 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -67,7 +67,6 @@ import { useFolderState } from "@data-folder";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
-import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import dayjs from "dayjs";
 import { computed, onMounted, ref, toRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -172,15 +171,13 @@ const fabItemClickHandler = (event: string | undefined): void => {
 };
 
 const collaboraFileAddedHandler = (newFile: FileRecord) => {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission.value);
-
 	const url = router.resolve({
 		name: "collabora",
 		params: {
 			id: newFile.id,
 		},
 		query: {
-			editorMode,
+			edit: hasEditPermission.value.toString(),
 		},
 	}).href;
 	window.open(url, "_blank");
diff --git a/src/modules/feature/folder/file-table/FileInteractionHandler.vue b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
index 7b0315900b..49b5691aff 100644
--- a/src/modules/feature/folder/file-table/FileInteractionHandler.vue
+++ b/src/modules/feature/folder/file-table/FileInteractionHandler.vue
@@ -23,7 +23,6 @@ import {
 } from "@/utils/fileHelper";
 import { useEnvConfig } from "@data-env";
 import { LightBoxContentType, useLightBox } from "@ui-light-box";
-import { mapEditBoardPermissionToEditorMode } from "@util-board";
 import { computed, PropType } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
@@ -117,15 +116,13 @@ const openVideoInLightbox = () => {
 };
 
 const openCollabora = () => {
-	const editorMode = mapEditBoardPermissionToEditorMode(hasEditPermission);
-
 	const url = router.resolve({
 		name: "collabora",
 		params: {
 			id: fileRecordItem.id,
 		},
 		query: {
-			editorMode,
+			edit: hasEditPermission.toString(),
 		},
 	}).href;
 
diff --git a/src/modules/page/collabora/Collabora.page.unit.ts b/src/modules/page/collabora/Collabora.page.unit.ts
index 9166e71353..24669bc2e5 100644
--- a/src/modules/page/collabora/Collabora.page.unit.ts
+++ b/src/modules/page/collabora/Collabora.page.unit.ts
@@ -54,7 +54,7 @@ describe("Collabora.page", () => {
 
 	const setup = () => {
 		const fileRecordId = ObjectIdMock();
-		const editorMode = EditorMode.EDIT;
+		const edit = "true";
 		const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
 
 		const { mockedMe } = createTestAppStoreWithUser("user-id");
@@ -82,14 +82,14 @@ describe("Collabora.page", () => {
 			},
 			propsData: {
 				fileRecordId,
-				editorMode,
+				edit,
 			},
 		});
 
 		return {
 			wrapper,
 			authorizedCollaboraDocumentUrlResponse,
-			editorMode,
+			edit,
 			fileStorageApiMock,
 			fileRecordId,
 			mockedMe,
@@ -97,11 +97,11 @@ describe("Collabora.page", () => {
 	};
 
 	it("should call getAuthorizedCollaboraDocumentUrl with correct parameters", () => {
-		const { fileStorageApiMock, fileRecordId, editorMode, mockedMe } = setup();
+		const { fileStorageApiMock, fileRecordId, edit, mockedMe } = setup();
 
 		expect(fileStorageApiMock.getAuthorizedCollaboraDocumentUrl).toHaveBeenCalledWith(
 			fileRecordId,
-			editorMode,
+			edit === "true" ? EditorMode.EDIT : EditorMode.VIEW,
 			`${mockedMe.user.firstName} ${mockedMe.user.lastName}`
 		);
 	});
diff --git a/src/modules/page/collabora/Collabora.page.vue b/src/modules/page/collabora/Collabora.page.vue
index 6e5b3551d6..9d05721169 100644
--- a/src/modules/page/collabora/Collabora.page.vue
+++ b/src/modules/page/collabora/Collabora.page.vue
@@ -22,7 +22,7 @@ import { computed, onMounted, ref } from "vue";
 
 interface Props {
 	fileRecordId: string;
-	editorMode?: EditorMode;
+	edit?: string;
 }
 
 const props = defineProps<Props>();
@@ -35,6 +35,8 @@ const { getElementWithParentHierarchyCall } = useBoardApi();
 const { user, locale } = useAppStoreRefs();
 const { handleApplicationError } = useAppStore();
 
+const editorMode = computed(() => (props.edit === "true" ? EditorMode.EDIT : EditorMode.VIEW));
+
 const userName = computed(() => {
 	const firstName = user.value?.firstName;
 	const lastName = user.value?.lastName;
@@ -87,7 +89,7 @@ const tryGetCollaboraUrl = async (): Promise<string | undefined> => {
 	try {
 		const collaboraUrl = await getAuthorizedCollaboraDocumentUrl(
 			props.fileRecordId,
-			props.editorMode ?? EditorMode.VIEW,
+			editorMode.value ?? EditorMode.VIEW,
 			userName.value
 		);
 
diff --git a/src/modules/util/board/collabora-editor-mode.mapper.ts b/src/modules/util/board/collabora-editor-mode.mapper.ts
deleted file mode 100644
index 9c0a285a8a..0000000000
--- a/src/modules/util/board/collabora-editor-mode.mapper.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { EditorMode } from "@/types/file/File";
-
-export function mapEditBoardPermissionToEditorMode(hasEditPermission: boolean): string {
-	const editorMode = hasEditPermission ? EditorMode.EDIT : EditorMode.VIEW;
-
-	return editorMode;
-}
diff --git a/src/modules/util/board/collabora-editor-mode.mapper.unit.ts b/src/modules/util/board/collabora-editor-mode.mapper.unit.ts
deleted file mode 100644
index cd872101b3..0000000000
--- a/src/modules/util/board/collabora-editor-mode.mapper.unit.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
-import { EditorMode } from "@/types/file/File";
-
-describe("mapEditBoardPermissionToEditorMode", () => {
-	it("returns EDIT when hasEditPermission is true", () => {
-		const result = mapEditBoardPermissionToEditorMode(true);
-
-		expect(result).toBe(EditorMode.EDIT);
-	});
-
-	it("returns VIEW when hasEditPermission is false", () => {
-		const result = mapEditBoardPermissionToEditorMode(false);
-
-		expect(result).toBe(EditorMode.VIEW);
-	});
-});
diff --git a/src/modules/util/board/index.ts b/src/modules/util/board/index.ts
index 378c792853..80486b8159 100644
--- a/src/modules/util/board/index.ts
+++ b/src/modules/util/board/index.ts
@@ -1,5 +1,4 @@
 import { BOARD_IS_LIST_LAYOUT } from "./board-injection-tokens";
-import { mapEditBoardPermissionToEditorMode } from "./collabora-editor-mode.mapper";
 import { useDragAndDrop } from "./dragAndDrop.composable";
 import {
 	type EditModePermissions,
@@ -18,7 +17,6 @@ export {
 	BOARD_IS_LIST_LAYOUT,
 	EditModePermissions,
 	extractDataAttribute,
-	mapEditBoardPermissionToEditorMode,
 	useCourseBoardEditMode,
 	useDragAndDrop,
 	useElementFocus,
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 5dbaea1d2a..c3e3aa5aed 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -155,7 +155,7 @@ export const routes: Readonly<RouteRecordRaw>[] = [
 		name: "collabora",
 		props: (route: RouteLocationNormalized) => ({
 			fileRecordId: route.params.id,
-			editorMode: route.query.editorMode,
+			edit: route.query.edit,
 		}),
 		meta: {
 			layout: Layouts.BORDERLESS,

From 3912e6c98b166973e1f37a209bddd6d3b5d78967 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 17:55:52 +0100
Subject: [PATCH 074/100] Remove unneeded check

---
 src/modules/page/collabora/Collabora.page.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/modules/page/collabora/Collabora.page.vue b/src/modules/page/collabora/Collabora.page.vue
index 9d05721169..1f5b2d2b45 100644
--- a/src/modules/page/collabora/Collabora.page.vue
+++ b/src/modules/page/collabora/Collabora.page.vue
@@ -87,11 +87,7 @@ const setPageTitle = async () => {
 
 const tryGetCollaboraUrl = async (): Promise<string | undefined> => {
 	try {
-		const collaboraUrl = await getAuthorizedCollaboraDocumentUrl(
-			props.fileRecordId,
-			editorMode.value ?? EditorMode.VIEW,
-			userName.value
-		);
+		const collaboraUrl = await getAuthorizedCollaboraDocumentUrl(props.fileRecordId, editorMode.value, userName.value);
 
 		return collaboraUrl;
 	} catch (error) {

From 2789ab313b6b64299a6b827ee3f978fde5dd814e Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 18:19:02 +0100
Subject: [PATCH 075/100] Add tests

---
 .../data/file/FileStorageApi.composable.ts    |  1 +
 .../file/FileStorageApi.composable.unit.ts    | 54 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index 8b575c5753..a4be20b3f3 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -227,5 +227,6 @@ export const useFileStorageApi = () => {
 		getAuthorizedCollaboraDocumentUrl,
 		fetchFileById,
 		uploadCollaboraFile,
+		getCollaboraAssetUrl,
 	};
 };
diff --git a/src/modules/data/file/FileStorageApi.composable.unit.ts b/src/modules/data/file/FileStorageApi.composable.unit.ts
index 04127c91dd..257b1a69cf 100644
--- a/src/modules/data/file/FileStorageApi.composable.unit.ts
+++ b/src/modules/data/file/FileStorageApi.composable.unit.ts
@@ -1,4 +1,4 @@
-import { ErrorType, useFileStorageApi } from "./FileStorageApi.composable";
+import { CollaboraFileType, ErrorType, useFileStorageApi } from "./FileStorageApi.composable";
 import * as serverApi from "@/fileStorageApi/v3/api/file-api";
 import * as wopiApi from "@/fileStorageApi/v3/api/wopi-api";
 import {
@@ -815,4 +815,56 @@ describe("FileStorageApi Composable", () => {
 			});
 		});
 	});
+
+	describe("uploadCollaboraFile", () => {
+		const setup = (fileName: string) => {
+			const parentId = ObjectIdMock();
+			const parentType = FileRecordParent.BOARDNODES;
+			const fileRecordResponse = fileRecordFactory.build({
+				parentId,
+				parentType,
+				name: fileName + ".docx",
+			});
+			const response = createMock<AxiosResponse<FileRecord, unknown>>({
+				data: fileRecordResponse,
+			});
+
+			const fileApi = createMock<serverApi.FileApiInterface>();
+			vi.spyOn(serverApi, "FileApiFactory").mockReturnValueOnce(fileApi);
+			fileApi.uploadFromUrl.mockResolvedValueOnce(response);
+
+			const { uploadCollaboraFile, uploadFromUrl } = useFileStorageApi();
+
+			return {
+				uploadCollaboraFile,
+				uploadFromUrl,
+			};
+		};
+
+		it("calls uploadFromUrl", async () => {
+			const fileName = "newFile";
+			const { uploadCollaboraFile } = setup(fileName);
+			const newFile = await uploadCollaboraFile(CollaboraFileType.Text, "parentId", fileName);
+
+			expect(newFile?.name).toBe(fileName + ".docx");
+		});
+	});
+
+	describe("getCollaboraAssetUrl", () => {
+		const setup = () => {
+			const { getCollaboraAssetUrl } = useFileStorageApi();
+			return {
+				getCollaboraAssetUrl,
+			};
+		};
+
+		it("returns correct URL for collabora types", () => {
+			const { getCollaboraAssetUrl } = setup();
+			const origin = window.location.origin;
+
+			expect(getCollaboraAssetUrl(CollaboraFileType.Text)).toBe(`${origin}/collabora/doc.docx`);
+			expect(getCollaboraAssetUrl(CollaboraFileType.Spreadsheet)).toBe(`${origin}/collabora/spreadsheet.xlsx`);
+			expect(getCollaboraAssetUrl(CollaboraFileType.Presentation)).toBe(`${origin}/collabora/presentation.pptx`);
+		});
+	});
 });

From 09656dac0ef869ff0030c8f20acf6f4fb485b610 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 1 Dec 2025 18:59:20 +0100
Subject: [PATCH 076/100] Adjust test wording

---
 src/modules/data/file/FileStorageApi.composable.unit.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/data/file/FileStorageApi.composable.unit.ts b/src/modules/data/file/FileStorageApi.composable.unit.ts
index 257b1a69cf..774d694a66 100644
--- a/src/modules/data/file/FileStorageApi.composable.unit.ts
+++ b/src/modules/data/file/FileStorageApi.composable.unit.ts
@@ -841,7 +841,7 @@ describe("FileStorageApi Composable", () => {
 			};
 		};
 
-		it("calls uploadFromUrl", async () => {
+		it("returns created file record", async () => {
 			const fileName = "newFile";
 			const { uploadCollaboraFile } = setup(fileName);
 			const newFile = await uploadCollaboraFile(CollaboraFileType.Text, "parentId", fileName);

From 8b9f5a3e2fa9d78fd8260d31fafad489df343d34 Mon Sep 17 00:00:00 2001
From: Max Bischof <106820326+bischofmax@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:29:10 +0100
Subject: [PATCH 077/100] BC-10468-max (#3986)

* Remove export of getCollaboraAssetUrl

* Add unit tests for file storage api

* Add parentType as param to uploadCollaboraFile
---
 .../data/file/FileStorageApi.composable.ts    |  10 +-
 .../file/FileStorageApi.composable.unit.ts    | 213 +++++++++++++++---
 .../shared/add-collabora-file.composable.ts   |   3 +-
 .../feature/folder/AddCollaboraFileDialog.vue |   4 +-
 .../factory/fileUrlParamsFactory.ts           |  10 +
 5 files changed, 199 insertions(+), 41 deletions(-)
 create mode 100644 tests/test-utils/factory/fileUrlParamsFactory.ts

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index a4be20b3f3..cc6315a81f 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -88,12 +88,17 @@ export const useFileStorageApi = () => {
 		return `${base}/presentation.pptx`;
 	};
 
-	const uploadCollaboraFile = async (type: CollaboraFileType, parentId: string, fileName: string) => {
+	const uploadCollaboraFile = async (
+		type: CollaboraFileType,
+		parentId: string,
+		parentType: FileRecordParent,
+		fileName: string
+	) => {
 		const assetUrl = getCollaboraAssetUrl(type);
 		const fileExtension = getFileExtension(assetUrl);
 		const fullFileName = `${fileName}.${fileExtension}`;
 
-		const fileRecord = await uploadFromUrl(assetUrl, parentId, FileRecordParent.BOARDNODES, fullFileName);
+		const fileRecord = await uploadFromUrl(assetUrl, parentId, parentType, fullFileName);
 
 		return fileRecord;
 	};
@@ -227,6 +232,5 @@ export const useFileStorageApi = () => {
 		getAuthorizedCollaboraDocumentUrl,
 		fetchFileById,
 		uploadCollaboraFile,
-		getCollaboraAssetUrl,
 	};
 };
diff --git a/src/modules/data/file/FileStorageApi.composable.unit.ts b/src/modules/data/file/FileStorageApi.composable.unit.ts
index 774d694a66..d7bb9c7858 100644
--- a/src/modules/data/file/FileStorageApi.composable.unit.ts
+++ b/src/modules/data/file/FileStorageApi.composable.unit.ts
@@ -18,6 +18,7 @@ import {
 import { apiResponseErrorFactory } from "@@/tests/test-utils/factory/apiResponseErrorFactory";
 import { axiosErrorFactory } from "@@/tests/test-utils/factory/axiosErrorFactory";
 import { fileRecordFactory } from "@@/tests/test-utils/factory/filerecordResponse.factory";
+import { fileUrlParamsFactory } from "@@/tests/test-utils/factory/fileUrlParamsFactory";
 import { ObjectIdMock } from "@@/tests/test-utils/ObjectIdMock";
 import { useNotificationStore } from "@data-app";
 import { createMock } from "@golevelup/ts-vitest";
@@ -817,54 +818,196 @@ describe("FileStorageApi Composable", () => {
 	});
 
 	describe("uploadCollaboraFile", () => {
-		const setup = (fileName: string) => {
-			const parentId = ObjectIdMock();
-			const parentType = FileRecordParent.BOARDNODES;
-			const fileRecordResponse = fileRecordFactory.build({
-				parentId,
-				parentType,
-				name: fileName + ".docx",
+		describe("when uploading a collabora text file", () => {
+			const setup = () => {
+				const fileName = "newCollaboraFile";
+				const parentId = ObjectIdMock();
+				const parentType = FileRecordParent.BOARDNODES;
+				const fileRecordResponse = fileRecordFactory.build({
+					parentId,
+					parentType,
+					name: fileName + ".docx",
+				});
+				const response = createMock<AxiosResponse<FileRecord, unknown>>({
+					data: fileRecordResponse,
+				});
+
+				const fileApi = createMock<serverApi.FileApiInterface>();
+				vi.spyOn(serverApi, "FileApiFactory").mockReturnValueOnce(fileApi);
+				fileApi.uploadFromUrl.mockResolvedValueOnce(response);
+
+				const { uploadCollaboraFile } = useFileStorageApi();
+
+				const fileParams = fileUrlParamsFactory.build({
+					fileName: `${fileName}.docx`,
+					headers: {
+						"User-Agent": "Embed Request User Agent",
+					},
+					url: `http://localhost:3000/collabora/doc.docx`,
+				});
+
+				return {
+					uploadCollaboraFile,
+					fileRecordResponse,
+					fileName,
+					fileApi,
+					fileParams,
+				};
+			};
+
+			it("returns created file record", async () => {
+				const { uploadCollaboraFile, fileRecordResponse, fileName } = setup();
+				const newFile = await uploadCollaboraFile(
+					CollaboraFileType.Text,
+					"parentId",
+					FileRecordParent.BOARDNODES,
+					fileName
+				);
+
+				expect(newFile).toBe(fileRecordResponse);
 			});
-			const response = createMock<AxiosResponse<FileRecord, unknown>>({
-				data: fileRecordResponse,
+
+			it("calls uploadFromUrl with correct params", async () => {
+				const { uploadCollaboraFile, fileName, fileApi, fileParams } = setup();
+
+				await uploadCollaboraFile(CollaboraFileType.Text, "parentId", FileRecordParent.BOARDNODES, fileName);
+
+				expect(fileApi.uploadFromUrl).toHaveBeenCalledWith(
+					"schoolId",
+					StorageLocation.SCHOOL,
+					"parentId",
+					FileRecordParent.BOARDNODES,
+					fileParams
+				);
 			});
+		});
+
+		describe("when uploading a collabora spreadsheet file", () => {
+			const setup = () => {
+				const fileName = "newCollaboraFile";
+				const parentId = ObjectIdMock();
+				const parentType = FileRecordParent.BOARDNODES;
+				const fileRecordResponse = fileRecordFactory.build({
+					parentId,
+					parentType,
+					name: fileName + ".xlsx",
+				});
+				const response = createMock<AxiosResponse<FileRecord, unknown>>({
+					data: fileRecordResponse,
+				});
+
+				const fileApi = createMock<serverApi.FileApiInterface>();
+				vi.spyOn(serverApi, "FileApiFactory").mockReturnValueOnce(fileApi);
+				fileApi.uploadFromUrl.mockResolvedValueOnce(response);
 
-			const fileApi = createMock<serverApi.FileApiInterface>();
-			vi.spyOn(serverApi, "FileApiFactory").mockReturnValueOnce(fileApi);
-			fileApi.uploadFromUrl.mockResolvedValueOnce(response);
+				const { uploadCollaboraFile } = useFileStorageApi();
 
-			const { uploadCollaboraFile, uploadFromUrl } = useFileStorageApi();
+				const fileParams = fileUrlParamsFactory.build({
+					fileName: `${fileName}.xlsx`,
+					headers: {
+						"User-Agent": "Embed Request User Agent",
+					},
+					url: `http://localhost:3000/collabora/spreadsheet.xlsx`,
+				});
 
-			return {
-				uploadCollaboraFile,
-				uploadFromUrl,
+				return {
+					uploadCollaboraFile,
+					fileRecordResponse,
+					fileName,
+					fileApi,
+					fileParams,
+				};
 			};
-		};
 
-		it("returns created file record", async () => {
-			const fileName = "newFile";
-			const { uploadCollaboraFile } = setup(fileName);
-			const newFile = await uploadCollaboraFile(CollaboraFileType.Text, "parentId", fileName);
+			it("returns created file record", async () => {
+				const { uploadCollaboraFile, fileRecordResponse, fileName } = setup();
+				const newFile = await uploadCollaboraFile(
+					CollaboraFileType.Spreadsheet,
+					"parentId",
+					FileRecordParent.BOARDNODES,
+					fileName
+				);
 
-			expect(newFile?.name).toBe(fileName + ".docx");
+				expect(newFile).toBe(fileRecordResponse);
+			});
+
+			it("calls uploadFromUrl with correct params", async () => {
+				const { uploadCollaboraFile, fileName, fileApi, fileParams } = setup();
+
+				await uploadCollaboraFile(CollaboraFileType.Spreadsheet, "parentId", FileRecordParent.BOARDNODES, fileName);
+
+				expect(fileApi.uploadFromUrl).toHaveBeenCalledWith(
+					"schoolId",
+					StorageLocation.SCHOOL,
+					"parentId",
+					FileRecordParent.BOARDNODES,
+					fileParams
+				);
+			});
 		});
-	});
 
-	describe("getCollaboraAssetUrl", () => {
-		const setup = () => {
-			const { getCollaboraAssetUrl } = useFileStorageApi();
-			return {
-				getCollaboraAssetUrl,
+		describe("when uploading a collabora presentation file", () => {
+			const setup = () => {
+				const fileName = "newCollaboraFile";
+				const parentId = ObjectIdMock();
+				const parentType = FileRecordParent.BOARDNODES;
+				const fileRecordResponse = fileRecordFactory.build({
+					parentId,
+					parentType,
+					name: fileName + ".pptx",
+				});
+				const response = createMock<AxiosResponse<FileRecord, unknown>>({
+					data: fileRecordResponse,
+				});
+
+				const fileApi = createMock<serverApi.FileApiInterface>();
+				vi.spyOn(serverApi, "FileApiFactory").mockReturnValueOnce(fileApi);
+				fileApi.uploadFromUrl.mockResolvedValueOnce(response);
+
+				const { uploadCollaboraFile } = useFileStorageApi();
+
+				const fileParams = fileUrlParamsFactory.build({
+					fileName: `${fileName}.pptx`,
+					headers: {
+						"User-Agent": "Embed Request User Agent",
+					},
+					url: `http://localhost:3000/collabora/presentation.pptx`,
+				});
+
+				return {
+					uploadCollaboraFile,
+					fileRecordResponse,
+					fileName,
+					fileApi,
+					fileParams,
+				};
 			};
-		};
 
-		it("returns correct URL for collabora types", () => {
-			const { getCollaboraAssetUrl } = setup();
-			const origin = window.location.origin;
+			it("returns created file record", async () => {
+				const { uploadCollaboraFile, fileRecordResponse, fileName } = setup();
+				const newFile = await uploadCollaboraFile(
+					CollaboraFileType.Presentation,
+					"parentId",
+					FileRecordParent.BOARDNODES,
+					fileName
+				);
+
+				expect(newFile).toBe(fileRecordResponse);
+			});
+
+			it("calls uploadFromUrl with correct params", async () => {
+				const { uploadCollaboraFile, fileName, fileApi, fileParams } = setup();
 
-			expect(getCollaboraAssetUrl(CollaboraFileType.Text)).toBe(`${origin}/collabora/doc.docx`);
-			expect(getCollaboraAssetUrl(CollaboraFileType.Spreadsheet)).toBe(`${origin}/collabora/spreadsheet.xlsx`);
-			expect(getCollaboraAssetUrl(CollaboraFileType.Presentation)).toBe(`${origin}/collabora/presentation.pptx`);
+				await uploadCollaboraFile(CollaboraFileType.Presentation, "parentId", FileRecordParent.BOARDNODES, fileName);
+
+				expect(fileApi.uploadFromUrl).toHaveBeenCalledWith(
+					"schoolId",
+					StorageLocation.SCHOOL,
+					"parentId",
+					FileRecordParent.BOARDNODES,
+					fileParams
+				);
+			});
 		});
 	});
 });
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
index a6b026ea96..afb8cb4fb5 100644
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ b/src/modules/feature/board/shared/add-collabora-file.composable.ts
@@ -1,6 +1,7 @@
 import { ContentElementType } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
+import { FileRecordParent } from "@/types/file/File";
 import { type CreateElementRequestPayload, useCardStore } from "@data-board";
 import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { useSharedFileSelect } from "@util-board";
@@ -58,7 +59,7 @@ export const useAddCollaboraFile = createSharedComposable(() => {
 
 		try {
 			disableFileSelectOnMount();
-			await uploadCollaboraFile(type, element.id, fileName);
+			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
 			await updateFileElementCaption(element, caption.trim());
 		} catch {
 			await cardStore.deleteElementRequest({ elementId: element.id, cardId: cardId.value });
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
index 58f8535ee2..101eb03690 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/folder/AddCollaboraFileDialog.vue
@@ -35,7 +35,7 @@
 </template>
 <script setup lang="ts">
 import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { FileRecord } from "@/types/file/File";
+import { FileRecord, FileRecordParent } from "@/types/file/File";
 import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { Dialog } from "@ui-dialog";
 import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
@@ -68,7 +68,7 @@ const selectedDocType = ref<string | null>(null);
 const fileName = ref<string>("");
 
 const uploadCollaboraFileFn = async (type: CollaboraFileType, folderId: string, fileName: string) => {
-	const fileRecord = await uploadCollaboraFile(type, folderId, fileName);
+	const fileRecord = await uploadCollaboraFile(type, folderId, FileRecordParent.BOARDNODES, fileName);
 	closeCollaboraFileDialog();
 
 	return fileRecord;
diff --git a/tests/test-utils/factory/fileUrlParamsFactory.ts b/tests/test-utils/factory/fileUrlParamsFactory.ts
new file mode 100644
index 0000000000..1c5efc7f83
--- /dev/null
+++ b/tests/test-utils/factory/fileUrlParamsFactory.ts
@@ -0,0 +1,10 @@
+import { FileUrlParams } from "@/fileStorageApi/v3";
+import { Factory } from "fishery";
+
+export const fileUrlParamsFactory = Factory.define<FileUrlParams>(({ sequence }) => ({
+	url: `https://example.com/file${sequence}`,
+	fileName: `file${sequence}.txt`,
+	headers: {
+		"User-Agent": "Embed Request User Agent",
+	},
+}));

From 91ff51c50e3a06809a29a620b471277db8ad67e3 Mon Sep 17 00:00:00 2001
From: Max Bischof <maximilian.bischof@dataport.de>
Date: Tue, 2 Dec 2025 16:38:18 +0100
Subject: [PATCH 078/100] Implement Collabora editor component and move logic
 from page

---
 .../components/CollaboraEditor.unit.ts        | 357 +++++++++++++
 .../collabora/components/CollaboraEditor.vue  |  82 +++
 .../CollaboraPostMessageApi.composable.ts     |   6 +-
 ...CollaboraPostMessageApi.composable.unit.ts |   0
 src/modules/feature/collabora/index.ts        |   3 +
 .../schemas}/CollaboraPostMessage.schema.ts   |   0
 .../page/collabora/Collabora.page.unit.ts     | 497 ++++--------------
 src/modules/page/collabora/Collabora.page.vue |  70 +--
 tsconfig.json                                 |   1 +
 9 files changed, 548 insertions(+), 468 deletions(-)
 create mode 100644 src/modules/feature/collabora/components/CollaboraEditor.unit.ts
 create mode 100644 src/modules/feature/collabora/components/CollaboraEditor.vue
 rename src/modules/{page/collabora => feature/collabora/composables}/CollaboraPostMessageApi.composable.ts (95%)
 rename src/modules/{page/collabora => feature/collabora/composables}/CollaboraPostMessageApi.composable.unit.ts (100%)
 create mode 100644 src/modules/feature/collabora/index.ts
 rename src/modules/{page/collabora => feature/collabora/schemas}/CollaboraPostMessage.schema.ts (100%)

diff --git a/src/modules/feature/collabora/components/CollaboraEditor.unit.ts b/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
new file mode 100644
index 0000000000..17736bbd15
--- /dev/null
+++ b/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
@@ -0,0 +1,357 @@
+import CollaboraEditor from "./CollaboraEditor.vue";
+import { HttpStatusCode } from "@/store/types/http-status-code.enum";
+import { EditorMode } from "@/types/file/File";
+import {
+	authorizedCollaboraDocumentUrlResponseFactory,
+	axiosErrorFactory,
+	createTestAppStoreWithUser,
+	expectNotification,
+	ObjectIdMock,
+} from "@@/tests/test-utils";
+import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
+import { useAppStore } from "@data-app";
+import * as FileStorageApi from "@data-file";
+import { createMock } from "@golevelup/ts-vitest";
+import { createTestingPinia } from "@pinia/testing";
+import { flushPromises, mount } from "@vue/test-utils";
+import { setActivePinia } from "pinia";
+
+describe("CollaboraEditor", () => {
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+		vi.resetAllMocks();
+	});
+
+	describe("when isEditable prop is true", () => {
+		const setup = () => {
+			const fileRecordId = ObjectIdMock();
+			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
+
+			const { mockedMe } = createTestAppStoreWithUser("user-id");
+
+			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+			);
+
+			const wrapper = mount(CollaboraEditor, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+				},
+				props: {
+					fileRecordId,
+					isEditable: true,
+				},
+			});
+
+			return {
+				wrapper,
+				fileStorageApiMock,
+				fileRecordId,
+				mockedMe,
+				authorizedCollaboraDocumentUrlResponse,
+			};
+		};
+
+		it("should call getAuthorizedCollaboraDocumentUrl with correct parameters", () => {
+			const { fileStorageApiMock, fileRecordId, mockedMe } = setup();
+
+			expect(fileStorageApiMock.getAuthorizedCollaboraDocumentUrl).toHaveBeenCalledWith(
+				fileRecordId,
+				EditorMode.EDIT,
+				`${mockedMe.user.firstName} ${mockedMe.user.lastName}`
+			);
+		});
+
+		it("should render Collabora editor iframe", async () => {
+			const { wrapper, authorizedCollaboraDocumentUrlResponse } = setup();
+
+			await flushPromises();
+
+			expect(wrapper.find("iframe").exists()).toBe(true);
+			expect(wrapper.find("iframe").attributes("src")).toEqual(
+				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl + `?lang=${useAppStore().locale}`
+			);
+		});
+
+		it("should use EDIT mode when isEditable is true", async () => {
+			const { fileStorageApiMock, fileRecordId, mockedMe } = setup();
+
+			await flushPromises();
+
+			expect(fileStorageApiMock.getAuthorizedCollaboraDocumentUrl).toHaveBeenCalledWith(
+				fileRecordId,
+				EditorMode.EDIT,
+				`${mockedMe.user.firstName} ${mockedMe.user.lastName}`
+			);
+		});
+	});
+
+	describe("when isEditable prop is false", () => {
+		const setup = () => {
+			const fileRecordId = ObjectIdMock();
+			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
+
+			const { mockedMe } = createTestAppStoreWithUser("user-id");
+
+			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+			);
+
+			const wrapper = mount(CollaboraEditor, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+				},
+				props: {
+					fileRecordId,
+					isEditable: false,
+				},
+			});
+
+			return {
+				wrapper,
+				fileStorageApiMock,
+				fileRecordId,
+				mockedMe,
+			};
+		};
+
+		it("should use EDIT mode when isEditable is true", async () => {
+			const { fileStorageApiMock, fileRecordId, mockedMe } = setup();
+
+			await flushPromises();
+
+			expect(fileStorageApiMock.getAuthorizedCollaboraDocumentUrl).toHaveBeenCalledWith(
+				fileRecordId,
+				EditorMode.VIEW,
+				`${mockedMe.user.firstName} ${mockedMe.user.lastName}`
+			);
+		});
+	});
+
+	describe("when iframe emits message", () => {
+		const setup = () => {
+			const fileRecordId = ObjectIdMock();
+			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
+
+			createTestAppStoreWithUser("user-id");
+
+			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+			);
+
+			const wrapper = mount(CollaboraEditor, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+				},
+				props: {
+					fileRecordId,
+					isEditable: true,
+				},
+			});
+
+			return {
+				wrapper,
+			};
+		};
+
+		describe("when message is not a collabora message", () => {
+			describe("when MessageId is missing", () => {
+				it("should show notification", () => {
+					setup();
+
+					const message = `{
+						"SendTime": 1755591627240,
+						"Values": { }
+					}`;
+					const messageEvent = new MessageEvent("message", {
+						data: message,
+					});
+					window.dispatchEvent(messageEvent);
+
+					expectNotification("error");
+				});
+			});
+
+			describe("when MessageId is not string", () => {
+				it("should show notification", () => {
+					setup();
+
+					const message = `{
+						"MessageId": 1,
+						"SendTime": 1755591627240,
+						"Values": { }
+					}`;
+					const messageEvent = new MessageEvent("message", {
+						data: message,
+					});
+					window.dispatchEvent(messageEvent);
+
+					expectNotification("error");
+				});
+			});
+
+			describe("when Values is missing", () => {
+				it("should show notification", () => {
+					setup();
+
+					const message = `{
+						"MessageId": "Some_Other_Message",
+						"SendTime": 1755591627240
+					}`;
+					const messageEvent = new MessageEvent("message", {
+						data: message,
+					});
+					window.dispatchEvent(messageEvent);
+
+					expectNotification("error");
+				});
+			});
+		});
+
+		describe("when message is not valid json", () => {
+			it("should show notification ", () => {
+				setup();
+
+				const modifiedMessage = `{
+					sdf
+				}`;
+				const messageEvent = new MessageEvent("message", {
+					data: modifiedMessage,
+				});
+				window.dispatchEvent(messageEvent);
+
+				expectNotification("error");
+			});
+		});
+	});
+
+	describe("when getAuthorizedCollaboraDocumentUrl rejects with 403 Forbidden", () => {
+		const setup = () => {
+			const fileRecordId = ObjectIdMock();
+			const axiosError = axiosErrorFactory.withStatusCode(HttpStatusCode.Forbidden).build();
+
+			createTestAppStoreWithUser("user-id");
+			const appStore = useAppStore();
+			const handleApplicationErrorSpy = vi.spyOn(appStore, "handleApplicationError");
+
+			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockRejectedValueOnce(axiosError);
+
+			const wrapper = mount(CollaboraEditor, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+				},
+				props: {
+					fileRecordId,
+					isEditable: true,
+				},
+			});
+
+			return {
+				wrapper,
+				handleApplicationErrorSpy,
+			};
+		};
+
+		it("should call handleApplicationError with correct parameters", async () => {
+			const { handleApplicationErrorSpy } = setup();
+
+			await flushPromises();
+
+			expect(handleApplicationErrorSpy).toHaveBeenCalledWith(HttpStatusCode.Forbidden);
+		});
+	});
+
+	describe("when getAuthorizedCollaboraDocumentUrl rejects with other error", () => {
+		const setup = () => {
+			const fileRecordId = ObjectIdMock();
+			const axiosError = axiosErrorFactory.withStatusCode(HttpStatusCode.InternalServerError).build();
+
+			createTestAppStoreWithUser("user-id");
+			const appStore = useAppStore();
+			const handleApplicationErrorSpy = vi.spyOn(appStore, "handleApplicationError");
+
+			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockRejectedValueOnce(axiosError);
+
+			const wrapper = mount(CollaboraEditor, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+				},
+				props: {
+					fileRecordId,
+					isEditable: true,
+				},
+			});
+
+			return {
+				wrapper,
+				handleApplicationErrorSpy,
+			};
+		};
+
+		it("should call handleApplicationError with correct parameters", async () => {
+			const { handleApplicationErrorSpy } = setup();
+
+			await flushPromises();
+
+			expect(handleApplicationErrorSpy).toHaveBeenCalledWith(HttpStatusCode.InternalServerError);
+		});
+	});
+
+	describe("iframe attributes", () => {
+		const setup = () => {
+			const fileRecordId = ObjectIdMock();
+			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
+
+			createTestAppStoreWithUser("user-id");
+
+			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+			);
+
+			const wrapper = mount(CollaboraEditor, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+				},
+				props: {
+					fileRecordId,
+					isEditable: true,
+				},
+			});
+
+			return {
+				wrapper,
+			};
+		};
+
+		it("should have correct security attributes", async () => {
+			const { wrapper } = setup();
+
+			await flushPromises();
+
+			const iframe = wrapper.find("iframe");
+			expect(iframe.attributes("allow")).toBe("clipboard-read *; clipboard-write *");
+			expect(iframe.attributes("allowfullscreen")).toBeDefined();
+		});
+
+		it("should have correct title", async () => {
+			const { wrapper } = setup();
+
+			await flushPromises();
+
+			const iframe = wrapper.find("iframe");
+			expect(iframe.attributes("title")).toBe("pages.collabora.iframeTitle");
+		});
+	});
+});
diff --git a/src/modules/feature/collabora/components/CollaboraEditor.vue b/src/modules/feature/collabora/components/CollaboraEditor.vue
new file mode 100644
index 0000000000..b075348c90
--- /dev/null
+++ b/src/modules/feature/collabora/components/CollaboraEditor.vue
@@ -0,0 +1,82 @@
+<template>
+	<iframe
+		ref="iframeRef"
+		allow="clipboard-read *; clipboard-write *"
+		allowfullscreen
+		:src="url.toString()"
+		style="width: 100%; height: 100%; position: absolute"
+		:title="$t('pages.collabora.iframeTitle')"
+	/>
+</template>
+
+<script setup lang="ts">
+import { useCollaboraPostMessageApi } from "../composables/CollaboraPostMessageApi.composable";
+import { EditorMode } from "@/types/file/File";
+import { mapAxiosErrorToResponseError } from "@/utils/api";
+import { useAppStore, useAppStoreRefs } from "@data-app";
+import { useFileStorageApi } from "@data-file";
+import { computed, onMounted, ref } from "vue";
+
+interface Props {
+	fileRecordId: string;
+	isEditable?: boolean;
+}
+
+const props = defineProps<Props>();
+
+const editorMode = computed(() => (props.isEditable ? EditorMode.EDIT : EditorMode.VIEW));
+
+const url = ref<URL>(new URL("about:blank"));
+const iframeRef = ref<HTMLIFrameElement>();
+const { getAuthorizedCollaboraDocumentUrl } = useFileStorageApi();
+const { setupPostMessageAPI } = useCollaboraPostMessageApi();
+
+const { user, locale } = useAppStoreRefs();
+const { handleApplicationError } = useAppStore();
+
+const userName = computed(() => {
+	const firstName = user.value?.firstName;
+	const lastName = user.value?.lastName;
+
+	if (firstName && lastName) {
+		return `${firstName} ${lastName}`;
+	}
+
+	return "User Name";
+});
+
+onMounted(async () => {
+	await setCollaboraUrl();
+
+	if (iframeRef.value) {
+		setupPostMessageAPI(iframeRef.value, url.value.origin);
+	}
+});
+
+const setCollaboraUrl = async () => {
+	const responseCollaboraUrl = await tryGetCollaboraUrl();
+
+	if (!responseCollaboraUrl) return;
+
+	const collaboraUrl = new URL(responseCollaboraUrl);
+	collaboraUrl.searchParams.set("lang", locale.value);
+
+	url.value = collaboraUrl;
+};
+
+const tryGetCollaboraUrl = async (): Promise<string | undefined> => {
+	try {
+		const collaboraUrl = await getAuthorizedCollaboraDocumentUrl(props.fileRecordId, editorMode.value, userName.value);
+
+		return collaboraUrl;
+	} catch (error) {
+		handleError(error);
+		return undefined;
+	}
+};
+
+const handleError = (error: unknown) => {
+	const responseError = mapAxiosErrorToResponseError(error);
+	handleApplicationError(responseError.code);
+};
+</script>
diff --git a/src/modules/page/collabora/CollaboraPostMessageApi.composable.ts b/src/modules/feature/collabora/composables/CollaboraPostMessageApi.composable.ts
similarity index 95%
rename from src/modules/page/collabora/CollaboraPostMessageApi.composable.ts
rename to src/modules/feature/collabora/composables/CollaboraPostMessageApi.composable.ts
index ae1e108058..5d1158833a 100644
--- a/src/modules/page/collabora/CollaboraPostMessageApi.composable.ts
+++ b/src/modules/feature/collabora/composables/CollaboraPostMessageApi.composable.ts
@@ -1,4 +1,8 @@
-import { appLoadingStatusValueSchema, CollaboraMessage, collaboraMessageSchema } from "./CollaboraPostMessage.schema";
+import {
+	appLoadingStatusValueSchema,
+	CollaboraMessage,
+	collaboraMessageSchema,
+} from "../schemas/CollaboraPostMessage.schema";
 import { notifyError } from "@data-app";
 import { useI18n } from "vue-i18n";
 
diff --git a/src/modules/page/collabora/CollaboraPostMessageApi.composable.unit.ts b/src/modules/feature/collabora/composables/CollaboraPostMessageApi.composable.unit.ts
similarity index 100%
rename from src/modules/page/collabora/CollaboraPostMessageApi.composable.unit.ts
rename to src/modules/feature/collabora/composables/CollaboraPostMessageApi.composable.unit.ts
diff --git a/src/modules/feature/collabora/index.ts b/src/modules/feature/collabora/index.ts
new file mode 100644
index 0000000000..cf082ff5e9
--- /dev/null
+++ b/src/modules/feature/collabora/index.ts
@@ -0,0 +1,3 @@
+import CollaboraEditor from "./components/CollaboraEditor.vue";
+
+export { CollaboraEditor };
diff --git a/src/modules/page/collabora/CollaboraPostMessage.schema.ts b/src/modules/feature/collabora/schemas/CollaboraPostMessage.schema.ts
similarity index 100%
rename from src/modules/page/collabora/CollaboraPostMessage.schema.ts
rename to src/modules/feature/collabora/schemas/CollaboraPostMessage.schema.ts
diff --git a/src/modules/page/collabora/Collabora.page.unit.ts b/src/modules/page/collabora/Collabora.page.unit.ts
index 24669bc2e5..54369a5416 100644
--- a/src/modules/page/collabora/Collabora.page.unit.ts
+++ b/src/modules/page/collabora/Collabora.page.unit.ts
@@ -1,28 +1,20 @@
 import CollaboraPage from "./Collabora.page.vue";
 import * as serverApi from "@/serverApi/v3/api";
-import { HttpStatusCode } from "@/store/types/http-status-code.enum";
-import { EditorMode } from "@/types/file/File";
 import { buildPageTitle } from "@/utils/pageTitle";
 import {
-	authorizedCollaboraDocumentUrlResponseFactory,
-	axiosErrorFactory,
-	createTestAppStoreWithUser,
-	expectNotification,
 	fileElementResponseFactory,
 	fileRecordFactory,
 	ObjectIdMock,
 	parentNodeInfoFactory,
 } from "@@/tests/test-utils";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
-import { useAppStore } from "@data-app";
 import * as FileStorageApi from "@data-file";
 import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
-import { flushPromises, mount } from "@vue/test-utils";
+import { flushPromises, shallowMount } from "@vue/test-utils";
 import { useTitle } from "@vueuse/core";
 import { AxiosPromise } from "axios";
 import { setActivePinia } from "pinia";
-import { beforeEach } from "vitest";
 
 // Mock useTitle from @vueuse/core
 vi.mock("@vueuse/core", async (importOriginal) => {
@@ -52,284 +44,95 @@ describe("Collabora.page", () => {
 		mockBuildPageTitle.mockClear();
 	});
 
-	const setup = () => {
-		const fileRecordId = ObjectIdMock();
-		const edit = "true";
-		const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-		const { mockedMe } = createTestAppStoreWithUser("user-id");
-
-		const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-		vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-		fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-			authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
-		);
-
-		const fileElement = fileElementResponseFactory.build();
-		const parentNodeInfos = parentNodeInfoFactory.build();
-		const boardApi = createMock<serverApi.BoardElementApiInterface>();
-		boardApi.elementControllerGetElementWithParentHierarchy.mockReturnValueOnce({
-			data: {
-				element: fileElement,
-				parentHierarchy: parentNodeInfos,
-			},
-		} as unknown as AxiosPromise);
-		vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
-
-		const wrapper = mount(CollaboraPage, {
-			global: {
-				plugins: [createTestingVuetify(), createTestingI18n()],
-			},
-			propsData: {
-				fileRecordId,
-				edit,
-			},
-		});
-
-		return {
-			wrapper,
-			authorizedCollaboraDocumentUrlResponse,
-			edit,
-			fileStorageApiMock,
-			fileRecordId,
-			mockedMe,
-		};
-	};
-
-	it("should call getAuthorizedCollaboraDocumentUrl with correct parameters", () => {
-		const { fileStorageApiMock, fileRecordId, edit, mockedMe } = setup();
-
-		expect(fileStorageApiMock.getAuthorizedCollaboraDocumentUrl).toHaveBeenCalledWith(
-			fileRecordId,
-			edit === "true" ? EditorMode.EDIT : EditorMode.VIEW,
-			`${mockedMe.user.firstName} ${mockedMe.user.lastName}`
-		);
-	});
-
-	it("should render Collabora editor iframe", async () => {
-		const { wrapper, authorizedCollaboraDocumentUrlResponse } = setup();
-
-		await flushPromises();
-
-		expect(wrapper.find("iframe").exists()).toBe(true);
-		expect(wrapper.find("iframe").attributes("src")).toEqual(
-			authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl + `?lang=${useAppStore().locale}`
-		);
-	});
-
-	describe("when editor mode prop is undefined", () => {
-		const setup = () => {
-			const fileRecordId = ObjectIdMock();
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			const { mockedMe } = createTestAppStoreWithUser("user-id");
-
+	describe("when file record exists in store", () => {
+		const setup = (edit?: string) => {
 			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+
+			const fileRecord = fileRecordFactory.build({ name: "test-file.xlsx" });
+			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(fileRecord);
 			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+				"https://collabora.example.com/wopi/files/123"
 			);
 
+			const parentNodeInfos = parentNodeInfoFactory.build({ name: "Course Board" });
 			const fileElement = fileElementResponseFactory.build();
-			const parentNodeInfos = parentNodeInfoFactory.build();
 			const boardApi = createMock<serverApi.BoardElementApiInterface>();
-			boardApi.elementControllerGetElementWithParentHierarchy.mockReturnValueOnce({
+			boardApi.elementControllerGetElementWithParentHierarchy.mockResolvedValueOnce({
 				data: {
 					element: fileElement,
-					parentHierarchy: parentNodeInfos,
+					parentHierarchy: [parentNodeInfos],
 				},
 			} as unknown as AxiosPromise);
 			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
 
-			const wrapper = mount(CollaboraPage, {
+			mockBuildPageTitle.mockReturnValue("test-file.xlsx - Course Board - Instance Title");
+
+			const wrapper = shallowMount(CollaboraPage, {
 				global: {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 				},
-				propsData: {
-					fileRecordId,
-					editorMode: undefined,
+				props: {
+					fileRecordId: fileRecord.id,
+					edit,
 				},
 			});
 
 			return {
 				wrapper,
-				authorizedCollaboraDocumentUrlResponse,
-				editorMode,
-				fileStorageApiMock,
-				fileRecordId,
-				mockedMe,
+				fileRecord,
 			};
 		};
 
-		it("should render Collabora editor iframe with view mode", async () => {
-			const { wrapper, authorizedCollaboraDocumentUrlResponse, fileStorageApiMock, fileRecordId, mockedMe } =
-				await setup();
-
-			await flushPromises();
-
-			expect(fileStorageApiMock.getAuthorizedCollaboraDocumentUrl).toHaveBeenCalledWith(
-				fileRecordId,
-				EditorMode.VIEW,
-				`${mockedMe.user.firstName} ${mockedMe.user.lastName}`
-			);
+		it("should render CollaboraEditor component with correct props", () => {
+			const { wrapper, fileRecord } = setup("true");
 
-			expect(wrapper.find("iframe").exists()).toBe(true);
-			expect(wrapper.find("iframe").attributes("src")).toEqual(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl + `?lang=${useAppStore().locale}`
-			);
+			const collaboraEditor = wrapper.findComponent({ name: "CollaboraEditor" });
+			expect(collaboraEditor.exists()).toBe(true);
+			expect(collaboraEditor.props("fileRecordId")).toBe(fileRecord.id);
+			expect(collaboraEditor.props("isEditable")).toBe(true);
 		});
-	});
-
-	describe("when iframe emits message", () => {
-		describe("when message is not a collabora message", () => {
-			describe("when MessageId is missing", () => {
-				it("should show notification", () => {
-					setup();
-
-					const message = `{
-					"SendTime": 1755591627240,
-					"Values": { }
-				}`;
-					const messageEvent = new MessageEvent("message", {
-						data: message,
-					});
-					window.dispatchEvent(messageEvent);
-
-					expectNotification("error");
-				});
-			});
 
-			describe("when MessageId is not string", () => {
-				it("should show notification", () => {
-					setup();
-
-					const message = `{
-						"MessageId": 1,
-						"SendTime": 1755591627240,
-						"Values": { }
-					}`;
-					const messageEvent = new MessageEvent("message", {
-						data: message,
-					});
-					window.dispatchEvent(messageEvent);
-
-					expectNotification("error");
-				});
-			});
+		it("should pass isEditable as false when not editable", () => {
+			const { wrapper } = setup("false");
 
-			describe("when Values is missing", () => {
-				it("should show notification", () => {
-					setup();
-
-					const message = `{
-						"MessageId": "Some_Other_Message",
-						"SendTime": 1755591627240
-					}`;
-					const messageEvent = new MessageEvent("message", {
-						data: message,
-					});
-					window.dispatchEvent(messageEvent);
-
-					expectNotification("error");
-				});
-			});
+			const collaboraEditor = wrapper.findComponent({ name: "CollaboraEditor" });
+			expect(collaboraEditor.props("isEditable")).toBe(false);
 		});
 
-		describe("when message is not valid json", () => {
-			it("should show notification ", () => {
-				setup();
+		it("should pass isEditable as false when edit prop is undefined", () => {
+			const { wrapper } = setup(undefined);
 
-				const modifiedMessage = `{
-					sdf
-				}`;
-				const messageEvent = new MessageEvent("message", {
-					data: modifiedMessage,
-				});
-				window.dispatchEvent(messageEvent);
-
-				expectNotification("error");
-			});
+			const collaboraEditor = wrapper.findComponent({ name: "CollaboraEditor" });
+			expect(collaboraEditor.props("isEditable")).toBe(false);
 		});
-	});
-
-	describe("when file record exists in store", () => {
-		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			createTestAppStoreWithUser("user-id");
-
-			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
-			);
-
-			const fileRecord = fileRecordFactory.build();
-			fileStorageApiMock.getFileRecordById.mockReturnValue(fileRecord);
-
-			const fileElement = fileElementResponseFactory.build();
-			const parentNodeInfos = parentNodeInfoFactory.build();
-			const boardApi = createMock<serverApi.BoardElementApiInterface>();
-			boardApi.elementControllerGetElementWithParentHierarchy.mockReturnValueOnce({
-				data: {
-					element: fileElement,
-					parentHierarchy: [parentNodeInfos],
-				},
-			} as unknown as AxiosPromise);
-			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
-
-			mockBuildPageTitle.mockReturnValue("fetched-file.xlsx - Course Board - Instance Title");
-
-			mount(CollaboraPage, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-				},
-				propsData: {
-					fileRecordId: fileRecord.id,
-					editorMode,
-				},
-			});
-
-			return {
-				fileRecord,
-				parentNodeInfos,
-			};
-		};
 
 		it("should call useTitle with page title including file name and parent name", async () => {
-			const { fileRecord, parentNodeInfos } = setup();
+			setup("true");
 
 			await flushPromises();
 
-			expect(mockBuildPageTitle).toHaveBeenCalledWith(`${fileRecord.name} - ${parentNodeInfos.name}`);
-			expect(mockUseTitle).toHaveBeenCalledWith("fetched-file.xlsx - Course Board - Instance Title");
+			expect(mockBuildPageTitle).toHaveBeenCalledWith("test-file.xlsx - Course Board");
+			expect(mockUseTitle).toHaveBeenCalledWith("test-file.xlsx - Course Board - Instance Title");
 		});
 	});
 
 	describe("when file record needs to be fetched", () => {
 		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			createTestAppStoreWithUser("user-id");
-
 			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
-			);
 
-			const fileRecord = fileRecordFactory.build();
-			// First call returns null, then returns the file record after fetch
+			const fileRecord = fileRecordFactory.build({ name: "fetched-file.xlsx" });
 			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(undefined).mockReturnValueOnce(fileRecord);
 			fileStorageApiMock.fetchFileById.mockResolvedValueOnce(undefined);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				"https://collabora.example.com/wopi/files/123"
+			);
 
-			const fileElement = fileElementResponseFactory.build();
 			const parentNodeInfos = parentNodeInfoFactory.build({ name: "Course Board" });
+			const fileElement = fileElementResponseFactory.build();
 			const boardApi = createMock<serverApi.BoardElementApiInterface>();
-			boardApi.elementControllerGetElementWithParentHierarchy.mockReturnValueOnce({
+			boardApi.elementControllerGetElementWithParentHierarchy.mockResolvedValueOnce({
 				data: {
 					element: fileElement,
 					parentHierarchy: [parentNodeInfos],
@@ -339,75 +142,70 @@ describe("Collabora.page", () => {
 
 			mockBuildPageTitle.mockReturnValueOnce("fetched-file.xlsx - Course Board - Instance Title");
 
-			mount(CollaboraPage, {
+			const wrapper = shallowMount(CollaboraPage, {
 				global: {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 				},
-				propsData: {
+				props: {
 					fileRecordId: fileRecord.id,
-					editorMode,
+					isEditable: true,
 				},
 			});
 
 			return {
-				fileRecord,
+				wrapper,
 				fileStorageApiMock,
+				fileRecord,
 				parentNodeInfos,
 			};
 		};
 
 		it("should fetch file and call useTitle with correct parameters", async () => {
-			const { fileStorageApiMock, fileRecord, parentNodeInfos } = setup();
+			const { fileStorageApiMock, fileRecord } = setup();
 
 			await flushPromises();
 
-			expect(fileStorageApiMock.fetchFileById).toHaveBeenCalled();
-			expect(mockBuildPageTitle).toHaveBeenCalledWith(`${fileRecord.name} - ${parentNodeInfos.name}`);
+			expect(fileStorageApiMock.fetchFileById).toHaveBeenCalledWith(fileRecord.id);
+			expect(mockBuildPageTitle).toHaveBeenCalledWith("fetched-file.xlsx - Course Board");
 			expect(mockUseTitle).toHaveBeenCalledWith("fetched-file.xlsx - Course Board - Instance Title");
 		});
 	});
 
 	describe("when fetchFileById rejects", () => {
 		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			createTestAppStoreWithUser("user-id");
-
+			const fileRecordId = ObjectIdMock();
 			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
-			);
 
-			const fileRecord = fileRecordFactory.build();
-			// First call returns null, then returns the file record after fetch
 			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(undefined);
-			fileStorageApiMock.fetchFileById.mockRejectedValueOnce();
+			fileStorageApiMock.fetchFileById.mockRejectedValueOnce(new Error("Fetch failed"));
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				"https://collabora.example.com/wopi/files/123"
+			);
 
 			const boardApi = createMock<serverApi.BoardElementApiInterface>();
 			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
 
-			const expectedTitle = "standalone-file.pdf - Instance Title";
+			const expectedTitle = "Instance Title";
 			mockBuildPageTitle.mockReturnValueOnce(expectedTitle);
 
-			mount(CollaboraPage, {
+			const wrapper = shallowMount(CollaboraPage, {
 				global: {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 				},
-				propsData: {
-					fileRecordId: fileRecord.id,
-					editorMode,
+				props: {
+					fileRecordId,
+					isEditable: true,
 				},
 			});
 
 			return {
-				fileRecord,
+				wrapper,
 				expectedTitle,
 			};
 		};
 
-		it("should call useTitle with only file name", async () => {
+		it("should call useTitle with empty string", async () => {
 			const { expectedTitle } = setup();
 
 			await flushPromises();
@@ -417,184 +215,84 @@ describe("Collabora.page", () => {
 		});
 	});
 
-	describe("when getAuthorizedCollaboraDocumentUrl rejects with 403 Forbidden", () => {
-		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-
-			createTestAppStoreWithUser("user-id");
-
-			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-			const axiosError = axiosErrorFactory.withStatusCode(HttpStatusCode.Forbidden).build();
-			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockRejectedValueOnce(axiosError);
-
-			const fileRecord = fileRecordFactory.build();
-			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(fileRecord);
-
-			const boardApi = createMock<serverApi.BoardElementApiInterface>();
-			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
-
-			const expectedTitle = "standalone-file.pdf - Instance Title";
-			mockBuildPageTitle.mockReturnValueOnce(expectedTitle);
-
-			mount(CollaboraPage, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-				},
-				propsData: {
-					fileRecordId: fileRecord.id,
-					editorMode,
-				},
-			});
-
-			return {
-				fileRecord,
-				expectedTitle,
-			};
-		};
-
-		it("should call handleApplicationError with correct parameters", async () => {
-			setup();
-
-			await flushPromises();
-
-			expect(useAppStore().handleApplicationError).toHaveBeenCalledWith(HttpStatusCode.Forbidden);
-		});
-	});
-
-	describe("when getAuthorizedCollaboraDocumentUrl rejects with other error", () => {
+	describe("when getElementWithParentHierarchy rejects", () => {
 		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-
-			createTestAppStoreWithUser("user-id");
-
 			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-			const axiosError = axiosErrorFactory.withStatusCode(HttpStatusCode.InternalServerError).build();
-			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockRejectedValueOnce(axiosError);
+			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValue(fileStorageApiMock);
 
-			const fileRecord = fileRecordFactory.build();
+			const fileRecord = fileRecordFactory.build({ name: "standalone-file.pdf" });
 			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(fileRecord);
-
-			const boardApi = createMock<serverApi.BoardElementApiInterface>();
-			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
-
-			const expectedTitle = "standalone-file.pdf - Instance Title";
-			mockBuildPageTitle.mockReturnValueOnce(expectedTitle);
-
-			mount(CollaboraPage, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-				},
-				propsData: {
-					fileRecordId: fileRecord.id,
-					editorMode,
-				},
-			});
-
-			return {
-				fileRecord,
-				expectedTitle,
-			};
-		};
-
-		it("should call handleApplicationError with correct parameters", async () => {
-			setup();
-
-			await flushPromises();
-
-			expect(useAppStore().handleApplicationError).toHaveBeenCalledWith(HttpStatusCode.InternalServerError);
-		});
-	});
-
-	describe("when getElementWithParentHierarchy rejects", () => {
-		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			createTestAppStoreWithUser("user-id");
-
-			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
 			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+				"https://collabora.example.com/wopi/files/123"
 			);
 
-			const fileRecord = fileRecordFactory.build();
-			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(fileRecord);
-
 			const boardApi = createMock<serverApi.BoardElementApiInterface>();
 			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
-			boardApi.elementControllerGetElementWithParentHierarchy.mockRejectedValueOnce();
+			boardApi.elementControllerGetElementWithParentHierarchy.mockRejectedValue(new Error("Fetch parent failed"));
 
 			const expectedTitle = "standalone-file.pdf - Instance Title";
 			mockBuildPageTitle.mockReturnValueOnce(expectedTitle);
 
-			mount(CollaboraPage, {
+			const wrapper = shallowMount(CollaboraPage, {
 				global: {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 				},
-				propsData: {
+				props: {
 					fileRecordId: fileRecord.id,
-					editorMode,
+					isEditable: false,
 				},
 			});
 
 			return {
+				wrapper,
 				fileRecord,
 				expectedTitle,
 			};
 		};
 
 		it("should call useTitle with only file name", async () => {
-			const { fileRecord, expectedTitle } = setup();
+			const { expectedTitle } = setup();
 
 			await flushPromises();
 
-			expect(mockBuildPageTitle).toHaveBeenCalledWith(`${fileRecord.name}`);
+			expect(mockBuildPageTitle).toHaveBeenCalledWith("standalone-file.pdf");
 			expect(mockUseTitle).toHaveBeenCalledWith(expectedTitle);
 		});
 	});
 
 	describe("when file record has no name", () => {
 		const setup = () => {
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			createTestAppStoreWithUser("user-id");
-
 			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
-			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
-			);
 
-			const fileRecord = fileRecordFactory.build({
-				name: undefined,
-			});
+			const fileRecord = fileRecordFactory.build({ name: undefined });
 			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(undefined).mockReturnValueOnce(fileRecord);
+			fileStorageApiMock.fetchFileById.mockResolvedValueOnce(undefined);
+			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
+				"https://collabora.example.com/wopi/files/123"
+			);
 
+			const parentNodeInfos = parentNodeInfoFactory.build({ name: "Task Board" });
 			const fileElement = fileElementResponseFactory.build();
-			const parentNodeInfos = parentNodeInfoFactory.build();
 			const boardApi = createMock<serverApi.BoardElementApiInterface>();
-			boardApi.elementControllerGetElementWithParentHierarchy.mockReturnValueOnce({
+			boardApi.elementControllerGetElementWithParentHierarchy.mockResolvedValue({
 				data: {
 					element: fileElement,
 					parentHierarchy: [parentNodeInfos],
 				},
 			} as unknown as AxiosPromise);
-			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
+			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValue(boardApi);
 
 			const expectedTitle = "Task Board - Instance Title";
-			mockBuildPageTitle.mockReturnValue(expectedTitle);
+			mockBuildPageTitle.mockReturnValueOnce(expectedTitle);
 
-			const wrapper = mount(CollaboraPage, {
+			const wrapper = shallowMount(CollaboraPage, {
 				global: {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 				},
-				propsData: {
-					fileRecordId: ObjectIdMock(),
-					editorMode,
+				props: {
+					fileRecordId: fileRecord.id,
+					isEditable: true,
 				},
 			});
 
@@ -606,11 +304,11 @@ describe("Collabora.page", () => {
 		};
 
 		it("should call useTitle with only parent name when file name is missing", async () => {
-			const { parentNodeInfos, expectedTitle } = setup();
+			const { expectedTitle } = setup();
 
 			await flushPromises();
 
-			expect(mockBuildPageTitle).toHaveBeenCalledWith(`${parentNodeInfos.name}`);
+			expect(mockBuildPageTitle).toHaveBeenCalledWith("Task Board");
 			expect(mockUseTitle).toHaveBeenCalledWith(expectedTitle);
 		});
 	});
@@ -618,43 +316,38 @@ describe("Collabora.page", () => {
 	describe("when both file name and parent name are missing", () => {
 		const setup = () => {
 			const fileRecordId = ObjectIdMock();
-			const editorMode = EditorMode.EDIT;
-			const authorizedCollaboraDocumentUrlResponse = authorizedCollaboraDocumentUrlResponseFactory.build();
-
-			const { mockedMe } = createTestAppStoreWithUser("user-id");
-
 			const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 			vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
+
+			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(undefined);
+			fileStorageApiMock.fetchFileById.mockRejectedValueOnce(new Error());
 			fileStorageApiMock.getAuthorizedCollaboraDocumentUrl.mockResolvedValueOnce(
-				authorizedCollaboraDocumentUrlResponse.authorizedCollaboraDocumentUrl
+				"https://collabora.example.com/wopi/files/123"
 			);
 
-			fileStorageApiMock.getFileRecordById.mockReturnValueOnce(undefined).mockReturnValueOnce(undefined);
-
 			const boardApi = createMock<serverApi.BoardElementApiInterface>();
 			vi.spyOn(serverApi, "BoardElementApiFactory").mockReturnValueOnce(boardApi);
 
 			const instanceTitle = "Instance Title";
-			mockBuildPageTitle.mockReturnValue(instanceTitle);
+			mockBuildPageTitle.mockReturnValueOnce(instanceTitle);
 
-			const wrapper = mount(CollaboraPage, {
+			const wrapper = shallowMount(CollaboraPage, {
 				global: {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 				},
-				propsData: {
+				props: {
 					fileRecordId,
-					editorMode,
+					isEditable: false,
 				},
 			});
 
 			return {
 				wrapper,
-				mockedMe,
 				instanceTitle,
 			};
 		};
 
-		it("should call useTitle with empty string when both file name and parent name are missing", async () => {
+		it("should call useTitle with empty string", async () => {
 			const { instanceTitle } = setup();
 
 			await flushPromises();
diff --git a/src/modules/page/collabora/Collabora.page.vue b/src/modules/page/collabora/Collabora.page.vue
index 1f5b2d2b45..ff2a234348 100644
--- a/src/modules/page/collabora/Collabora.page.vue
+++ b/src/modules/page/collabora/Collabora.page.vue
@@ -1,24 +1,14 @@
 <template>
-	<iframe
-		ref="iframeRef"
-		allow="clipboard-read *; clipboard-write *"
-		allowfullscreen
-		:src="url.toString()"
-		style="width: 100%; height: 100%; position: absolute"
-		:title="$t('pages.collabora.iframeTitle')"
-	/>
+	<CollaboraEditor :file-record-id="fileRecordId" :is-editable="isEditable" />
 </template>
 
 <script setup lang="ts">
-import { useCollaboraPostMessageApi } from "./CollaboraPostMessageApi.composable";
-import { EditorMode } from "@/types/file/File";
-import { mapAxiosErrorToResponseError } from "@/utils/api";
 import { buildPageTitle } from "@/utils/pageTitle";
-import { useAppStore, useAppStoreRefs } from "@data-app";
 import { useBoardApi } from "@data-board";
 import { useFileStorageApi } from "@data-file";
+import { CollaboraEditor } from "@feature-collabora";
 import { useTitle } from "@vueuse/core";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted } from "vue";
 
 interface Props {
 	fileRecordId: string;
@@ -26,48 +16,14 @@ interface Props {
 }
 
 const props = defineProps<Props>();
-const url = ref<URL>(new URL("about:blank"));
-const iframeRef = ref<HTMLIFrameElement>();
-const { getAuthorizedCollaboraDocumentUrl, fetchFileById, getFileRecordById } = useFileStorageApi();
-const { setupPostMessageAPI } = useCollaboraPostMessageApi();
+const { fetchFileById, getFileRecordById } = useFileStorageApi();
 const { getElementWithParentHierarchyCall } = useBoardApi();
 
-const { user, locale } = useAppStoreRefs();
-const { handleApplicationError } = useAppStore();
-
-const editorMode = computed(() => (props.edit === "true" ? EditorMode.EDIT : EditorMode.VIEW));
-
-const userName = computed(() => {
-	const firstName = user.value?.firstName;
-	const lastName = user.value?.lastName;
-
-	if (firstName && lastName) {
-		return `${firstName} ${lastName}`;
-	}
-
-	return "User Name";
-});
-
 onMounted(async () => {
-	await setCollaboraUrl();
-
-	if (iframeRef.value) {
-		setupPostMessageAPI(iframeRef.value, url.value.origin);
-	}
-
 	await setPageTitle();
 });
 
-const setCollaboraUrl = async () => {
-	const responseCollaboraUrl = await tryGetCollaboraUrl();
-
-	if (!responseCollaboraUrl) return;
-
-	const collaboraUrl = new URL(responseCollaboraUrl);
-	collaboraUrl.searchParams.set("lang", locale.value);
-
-	url.value = collaboraUrl;
-};
+const isEditable = computed(() => props.edit === "true");
 
 const setPageTitle = async () => {
 	let fileRecord;
@@ -85,22 +41,6 @@ const setPageTitle = async () => {
 	useTitle(pageTitle);
 };
 
-const tryGetCollaboraUrl = async (): Promise<string | undefined> => {
-	try {
-		const collaboraUrl = await getAuthorizedCollaboraDocumentUrl(props.fileRecordId, editorMode.value, userName.value);
-
-		return collaboraUrl;
-	} catch (error) {
-		handleError(error);
-	}
-};
-
-const handleError = (error: unknown) => {
-	const responseError = mapAxiosErrorToResponseError(error);
-
-	handleApplicationError(responseError.code);
-};
-
 const getFileRecord = async (fileId: string) => {
 	let fileRecord = getFileRecordById(fileId);
 
diff --git a/tsconfig.json b/tsconfig.json
index e170731d55..5f86eb62c8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -68,6 +68,7 @@
 				"src/modules/feature/board-folder-element"
 			],
 			"@feature-folder": ["src/modules/feature/folder"],
+			"@feature-collabora": ["src/modules/feature/collabora"],
 			"@icons/*": ["src/components/icons/*"],
 			"@ui-alert": ["src/modules/ui/alert"],
 			"@ui-audio-player": ["src/modules/ui/audio-player"],

From ac68bacda1bd74a4bf7922bfe43526be726d2185 Mon Sep 17 00:00:00 2001
From: Max Bischof <maximilian.bischof@dataport.de>
Date: Wed, 3 Dec 2025 10:15:12 +0100
Subject: [PATCH 079/100] Refactor test descriptions for CollaboraEditor to
 improve clarity

---
 .../feature/collabora/components/CollaboraEditor.unit.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/feature/collabora/components/CollaboraEditor.unit.ts b/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
index 17736bbd15..36b25d6734 100644
--- a/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
+++ b/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
@@ -75,7 +75,7 @@ describe("CollaboraEditor", () => {
 			);
 		});
 
-		it("should use EDIT mode when isEditable is true", async () => {
+		it("should use EDIT mode", async () => {
 			const { fileStorageApiMock, fileRecordId, mockedMe } = setup();
 
 			await flushPromises();
@@ -119,7 +119,7 @@ describe("CollaboraEditor", () => {
 			};
 		};
 
-		it("should use EDIT mode when isEditable is true", async () => {
+		it("should use VIEW mode", async () => {
 			const { fileStorageApiMock, fileRecordId, mockedMe } = setup();
 
 			await flushPromises();

From a5dec65b5205d93e1b86bc8f39f5b28059cd59c4 Mon Sep 17 00:00:00 2001
From: Max Bischof <maximilian.bischof@dataport.de>
Date: Wed, 3 Dec 2025 10:23:43 +0100
Subject: [PATCH 080/100] Update Collabora iframe title localization keys for
 consistency

---
 src/locales/de.ts                                               | 2 +-
 src/locales/en.ts                                               | 2 +-
 src/locales/es.ts                                               | 2 +-
 src/locales/uk.ts                                               | 2 +-
 .../feature/collabora/components/CollaboraEditor.unit.ts        | 2 +-
 src/modules/feature/collabora/components/CollaboraEditor.vue    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index 054490154b..d0923628ff 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -1941,7 +1941,6 @@ export default {
 	"pages.videoConference.info.roomParent.notEnabledTeacher":
 		"Das Element ist nicht mehr verfügbar, da Videokonferenzen für die Schule deaktiviert wurden. Bitte an den Schul-Admin wenden.",
 	"pages.videoConference.title": "Videokonferenz BigBlueButton",
-	"pages.collabora.iframeTitle": "Office-Dokument Editor",
 	"pages.collabora.jsonError": "Json der Collabora Nachricht konnte nicht geparsed werden.",
 	"pages.collabora.messageError": "Collabora Nachricht ist nicht valide.",
 	"error.500": "Es gibt Probleme im System. Wir arbeiten daran, das Problem zu beheben. Bitte später erneut versuchen.",
@@ -1989,6 +1988,7 @@ export default {
 	"feature.media-shelf.availableLine.title": "Verfügbare Medien",
 	"feature.media-shelf.layout.list": "Zeilen",
 	"feature.media-shelf.layout.grid": "Raster",
+	"feature.collabora.iframeTitle": "Office-Dokument Editor",
 	"pages.folder.emptyState": "Aktuell gibt es hier noch keine Dateien",
 	"pages.folder.fab.title": "Datei hinzufügen",
 	"pages.folder.untitled": "Unbenannter Ordner",
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 019b200d7a..b4bdfa2f0b 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1906,7 +1906,6 @@ export default {
 	"pages.videoConference.info.roomParent.notEnabledTeacher":
 		"The element is no longer available as video conferencing has been disabled for the school. Please contact the school admin.",
 	"pages.videoConference.title": "Video conference BigBlueButton",
-	"pages.collabora.iframeTitle": "Office document editor",
 	"pages.collabora.jsonError": "Failed to parse JSON from Collabora message.",
 	"pages.collabora.messageError": "Collabora message is invalid.",
 	"error.500": "There are problems in the system. We are working on fixing the issue. Please try again later.",
@@ -1954,6 +1953,7 @@ export default {
 	"feature.media-shelf.availableLine.title": "Available media",
 	"feature.media-shelf.layout.list": "Lines",
 	"feature.media-shelf.layout.grid": "Grid",
+	"feature.collabora.iframeTitle": "Office document editor",
 	"pages.folder.emptyState": "There are currently no files here",
 	"pages.folder.fab.title": "Add file",
 	"pages.folder.untitled": "Untitled folder",
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 7523576085..653ee177a8 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -1955,7 +1955,6 @@ export default {
 	"pages.videoConference.info.roomParent.notEnabledTeacher":
 		"Este elemento ya no está disponible porque se ha desactivado la videoconferencia en la escuela. Póngase en contacto con el administrador de la escuela.",
 	"pages.videoConference.title": "Videoconferencia BigBlueButton",
-	"pages.collabora.iframeTitle": "Editor de documentos de Office",
 	"pages.collabora.jsonError": "No se pudo analizar el JSON del mensaje Collabora.",
 	"pages.collabora.messageError": "El mensaje de Collabora no es válido.",
 	"error.500":
@@ -2004,6 +2003,7 @@ export default {
 	"feature.media-shelf.availableLine.title": "Medios disponibles",
 	"feature.media-shelf.layout.list": "Líneas",
 	"feature.media-shelf.layout.grid": "Red",
+	"feature.collabora.iframeTitle": "Editor de documentos de Office",
 	"pages.folder.emptyState": "Actualmente no hay archivos aquí",
 	"pages.folder.fab.title": "Añadir archivo",
 	"pages.folder.untitled": "Carpeta sin título",
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index 979cbaedda..844e1b9129 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -1926,7 +1926,6 @@ export default {
 	"pages.videoConference.info.roomParent.notEnabledTeacher":
 		"Цей елемент більше не доступний, оскільки відеоконференції в школі вимкнено. Будь ласка, зверніться до адміністратора школи.",
 	"pages.videoConference.title": "Відеоконференція BigBlueButton",
-	"pages.collabora.iframeTitle": "Редактор документів Office",
 	"pages.collabora.jsonError": "Не вдалося проаналізувати Json повідомлення Collabora.",
 	"pages.collabora.messageError": "Повідомлення Collabora недійсне.",
 	"error.500": "Є проблеми в системі. Ми працюємо над усуненням проблеми. Будь ласка, спробуйте пізніше.",
@@ -1974,6 +1973,7 @@ export default {
 	"feature.media-shelf.availableLine.title": "Доступні медіа",
 	"feature.media-shelf.layout.list": "лінії",
 	"feature.media-shelf.layout.grid": "сітка",
+	"feature.collabora.iframeTitle": "Редактор документів Office",
 	"pages.folder.emptyState": "Наразі тут немає файлів",
 	"pages.folder.fab.title": "Додати файл",
 	"pages.folder.untitled": "Папка без назви",
diff --git a/src/modules/feature/collabora/components/CollaboraEditor.unit.ts b/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
index 36b25d6734..dbf8c56653 100644
--- a/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
+++ b/src/modules/feature/collabora/components/CollaboraEditor.unit.ts
@@ -351,7 +351,7 @@ describe("CollaboraEditor", () => {
 			await flushPromises();
 
 			const iframe = wrapper.find("iframe");
-			expect(iframe.attributes("title")).toBe("pages.collabora.iframeTitle");
+			expect(iframe.attributes("title")).toBe("feature.collabora.iframeTitle");
 		});
 	});
 });
diff --git a/src/modules/feature/collabora/components/CollaboraEditor.vue b/src/modules/feature/collabora/components/CollaboraEditor.vue
index b075348c90..faf560f58e 100644
--- a/src/modules/feature/collabora/components/CollaboraEditor.vue
+++ b/src/modules/feature/collabora/components/CollaboraEditor.vue
@@ -5,7 +5,7 @@
 		allowfullscreen
 		:src="url.toString()"
 		style="width: 100%; height: 100%; position: absolute"
-		:title="$t('pages.collabora.iframeTitle')"
+		:title="$t('feature.collabora.iframeTitle')"
 	/>
 </template>
 

From b99b3d2349e628d0645ffde0fbb3e85673803aa0 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Wed, 3 Dec 2025 16:04:33 +0100
Subject: [PATCH 081/100] Remove doubled dialog

---
 .../data/file/FileStorageApi.composable.ts    |   6 +-
 src/modules/feature/board/board/Board.vue     |  42 ++-
 .../shared/AddCollaboraFileDialog.unit.ts     | 252 ------------------
 .../shared/AddElementDialog.composable.ts     |   6 +-
 .../AddElementDialog.composable.unit.ts       |  37 +--
 .../shared/add-collabora-file.composable.ts   | 102 -------
 .../add-collabora-file.composable.unit.ts     | 221 ---------------
 .../test-utils/add-collabora-file-mock.ts     |  46 ----
 .../components/AddCollaboraFileDialog.unit.ts | 249 +++++++++++++++++
 .../components}/AddCollaboraFileDialog.vue    |  52 ++--
 .../add-collabora-file.composable.ts          |   0
 .../add-collabora-file.composable.unit.ts     |   0
 src/modules/feature/collabora/index.ts        |   4 +-
 .../folder/AddCollaboraFileDialog.unit.ts     | 239 -----------------
 .../feature/folder/AddCollaboraFileDialog.vue | 145 ----------
 src/modules/feature/folder/Folder.unit.ts     |  25 +-
 src/modules/feature/folder/Folder.vue         |  43 +--
 17 files changed, 372 insertions(+), 1097 deletions(-)
 delete mode 100644 src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts
 delete mode 100644 src/modules/feature/board/shared/add-collabora-file.composable.ts
 delete mode 100644 src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
 delete mode 100644 src/modules/feature/board/test-utils/add-collabora-file-mock.ts
 create mode 100644 src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
 rename src/modules/feature/{board/shared => collabora/components}/AddCollaboraFileDialog.vue (71%)
 rename src/modules/feature/{folder => collabora/composables}/add-collabora-file.composable.ts (100%)
 rename src/modules/feature/{folder => collabora/composables}/add-collabora-file.composable.unit.ts (100%)
 delete mode 100644 src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
 delete mode 100644 src/modules/feature/folder/AddCollaboraFileDialog.vue

diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index cc6315a81f..cb3031d1a4 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -27,9 +27,9 @@ export enum ErrorType {
 }
 
 export enum CollaboraFileType {
-	Text,
-	Spreadsheet,
-	Presentation,
+	Text = "TEXT",
+	Spreadsheet = "SPREADSHEET",
+	Presentation = "PRESENTATION",
 }
 
 export const useFileStorageApi = () => {
diff --git a/src/modules/feature/board/board/Board.vue b/src/modules/feature/board/board/Board.vue
index 887468c48a..b448bbfd3f 100644
--- a/src/modules/feature/board/board/Board.vue
+++ b/src/modules/feature/board/board/Board.vue
@@ -86,7 +86,7 @@
 				</div>
 				<ConfirmationDialog />
 				<AddElementDialog />
-				<AddCollaboraFileDialog />
+				<AddCollaboraFileDialog @create-collabora-file="onCreateCollaboraFile" />
 				<LightBox />
 				<CopyResultModal
 					:is-open="isCopyModalOpen"
@@ -113,7 +113,6 @@
 </template>
 
 <script setup lang="ts">
-import AddCollaboraFileDialog from "../shared/AddCollaboraFileDialog.vue";
 import AddElementDialog from "../shared/AddElementDialog.vue";
 import { useBodyScrolling } from "../shared/BodyScrolling.composable";
 import EditSettingsDialog from "../shared/EditSettingsDialog.vue";
@@ -129,14 +128,18 @@ import { useLoadingState } from "@/composables/loadingState";
 import { useBoardStore } from "@/modules/data/board/Board.store"; // FIX_CIRCULAR_DEPENDENCY
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useSharedEditMode } from "@/modules/util/board/editMode.composable"; // FIX_CIRCULAR_DEPENDENCY
-import { BoardLayout, ShareTokenBodyParamsParentTypeEnum, ToolContextType } from "@/serverApi/v3";
+import { BoardLayout, ContentElementType, ShareTokenBodyParamsParentTypeEnum, ToolContextType } from "@/serverApi/v3";
 import { CopyParamsTypeEnum } from "@/store/copy";
 import { HttpStatusCode } from "@/store/types/http-status-code.enum";
 import { ColumnMove } from "@/types/board/DragAndDrop";
+import { FileRecordParent } from "@/types/file/File";
 import { COPY_MODULE_KEY, injectStrict, SHARE_MODULE_KEY } from "@/utils/inject";
 import { useAppStore, useNotificationStore } from "@data-app";
 import { useBoardInactivity, useBoardPermissions, useCardStore, useSharedBoardPageInformation } from "@data-board";
 import { useEnvConfig } from "@data-env";
+import { CollaboraFileType } from "@data-file";
+import { useFileStorageApi } from "@data-file";
+import { AddCollaboraFileDialog } from "@feature-collabora";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
 import { SelectBoardLayoutDialog } from "@ui-room-details";
@@ -147,13 +150,23 @@ import { computed, onMounted, onUnmounted, provide, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 
+const { uploadCollaboraFile } = useFileStorageApi();
+
 const props = defineProps({
 	boardId: { type: String, required: true },
 });
 
 const { t } = useI18n();
-const { editModeId } = useSharedEditMode();
+const { editModeId, setEditModeId } = useSharedEditMode();
 const isEditMode = computed(() => editModeId.value !== undefined);
+
+let cardId: string | undefined = undefined;
+watch(editModeId, (newVal) => {
+	if (newVal) {
+		cardId = newVal;
+	}
+});
+
 const boardStore = useBoardStore();
 const cardStore = useCardStore();
 const board = computed(() => boardStore.board);
@@ -441,6 +454,27 @@ const onSaveEditBoardSettings = async (isEditableForEveryone: boolean) => {
 
 	isEditSettingsDialogOpen.value = false;
 };
+
+const onCreateCollaboraFile = async (payload: { type: CollaboraFileType; fileName: string }) => {
+	if (!cardId) {
+		return;
+	}
+
+	const element = await cardStore.createElementRequest({
+		type: ContentElementType.File,
+		cardId: cardId,
+	});
+	if (!element) {
+		return;
+	}
+
+	try {
+		await uploadCollaboraFile(payload.type, element.id, FileRecordParent.BOARDNODES, payload.fileName);
+		setEditModeId(cardId);
+	} catch {
+		await cardStore.deleteElementRequest({ elementId: element.id, cardId: cardId });
+	}
+};
 </script>
 
 <style scoped>
diff --git a/src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts b/src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts
deleted file mode 100644
index 9f52923ddf..0000000000
--- a/src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-import { setupCollaboraFileSelectionMock } from "../test-utils/add-collabora-file-mock";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
-import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
-import { Dialog } from "@ui-dialog";
-import { flushPromises, mount } from "@vue/test-utils";
-import { nextTick } from "vue";
-import { VForm, VSelect } from "vuetify/lib/components/index";
-
-vi.mock("./add-collabora-file.composable");
-
-describe("CollaboraFileDialog", () => {
-	const setupMocks = () => {
-		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen, collaboraFileSelectionOptions } =
-			setupCollaboraFileSelectionMock();
-
-		return {
-			isCollaboraFileDialogOpen,
-			closeCollaboraFileDialog,
-			collaboraFileSelectionOptions,
-		};
-	};
-
-	describe("when isCollaboraFileDialogOpen is false", () => {
-		const setup = () => {
-			document.body.setAttribute("data-app", "true");
-
-			setupMocks();
-
-			const wrapper = mount(AddCollaboraFileDialog, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					stubs: { UseFocusTrap: true },
-				},
-			});
-
-			return { wrapper };
-		};
-
-		it("should be found in dom", () => {
-			const { wrapper } = setup();
-
-			expect(wrapper.exists()).toBe(true);
-		});
-
-		it("the modal should not be visible", () => {
-			const { wrapper } = setup();
-
-			expect(wrapper.findComponent(VForm).exists()).toBe(false);
-		});
-	});
-
-	describe("when isCollaboraFileDialogOpen is changed from false to true", () => {
-		const setup = async () => {
-			document.body.setAttribute("data-app", "true");
-
-			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = setupMocks();
-
-			const wrapper = mount(AddCollaboraFileDialog, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					stubs: { UseFocusTrap: true },
-				},
-				attachTo: document.body,
-			});
-
-			isCollaboraFileDialogOpen.value = true;
-			await nextTick();
-
-			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions, wrapper };
-		};
-
-		it("should make modal visible", async () => {
-			const { wrapper } = await setup();
-
-			expect(wrapper.findComponent(VForm).exists()).toBe(true);
-			expect(wrapper.findComponent(VForm).isVisible()).toBe(true);
-		});
-
-		it("should have confirm button disabled initially", async () => {
-			const { wrapper } = await setup();
-
-			const dialog = wrapper.findComponent(Dialog);
-			expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		});
-
-		it("should render options", async () => {
-			const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-			const typeSelect = wrapper.findComponent(VSelect);
-			expect(typeSelect.props("items")).toBe(collaboraFileSelectionOptions);
-		});
-
-		describe("when form is valid", () => {
-			it("should call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-				const FILENAME = "myDocument";
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalled();
-				expect(selectOption.action).toHaveBeenCalledWith(FILENAME, "");
-			});
-
-			it("should have confirm button enabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-				const FILENAME = "myDocument";
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(false);
-			});
-		});
-
-		describe("when filetype is not selected", () => {
-			it("should not call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("myDocument");
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalledTimes(0);
-			});
-
-			it("should have confirm button disabled", async () => {
-				const { wrapper } = await setup();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("myDocument");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when filename is empty", () => {
-			it("should not call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
-				expect(fileNameInput.element.value).toBe("");
-
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalledTimes(0);
-			});
-
-			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when filename contains invalid characters", () => {
-			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("invalid/filename");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when caption contains opening tag", () => {
-			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("validFilename");
-				await nextTick();
-
-				const captionInput = wrapper.findComponent("[data-testid='collabora-element-form-caption']");
-				await captionInput.find("textarea").setValue("<script>alert('xss')</script>");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		it("should close modal on close button click", async () => {
-			const { closeCollaboraFileDialog, wrapper } = await setup();
-
-			const dialog = wrapper.findComponent(Dialog);
-			dialog.vm.$emit("cancel");
-
-			await nextTick();
-
-			expect(closeCollaboraFileDialog).toHaveBeenCalled();
-		});
-	});
-});
diff --git a/src/modules/feature/board/shared/AddElementDialog.composable.ts b/src/modules/feature/board/shared/AddElementDialog.composable.ts
index 0ae720b948..f4024c09dc 100644
--- a/src/modules/feature/board/shared/AddElementDialog.composable.ts
+++ b/src/modules/feature/board/shared/AddElementDialog.composable.ts
@@ -1,10 +1,10 @@
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import { ElementTypeSelectionOptions, useSharedElementTypeSelection } from "./SharedElementTypeSelection.composable";
 import { BoardFeature, ContentElementType, PreferredToolResponse } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { notifyInfo } from "@data-app";
 import { type CreateElementRequestPayload, useBoardFeatures, useBoardPermissions, useCardStore } from "@data-board";
 import { useEnvConfig } from "@data-env";
+import { useAddCollaboraFile } from "@feature-collabora";
 import {
 	mdiFileDocumentOutline,
 	mdiFolderOpenOutline,
@@ -35,8 +35,7 @@ export const useAddElementDialog = (createElementRequestFn: CreateElementRequest
 	const { isDialogOpen, isDialogLoading, closeDialog, staticElementTypeOptions, dynamicElementTypeOptions } =
 		useSharedElementTypeSelection();
 
-	const { openCollaboraFileDialog, setCardId, setCreateElementRequestFn } = useAddCollaboraFile();
-	setCreateElementRequestFn(createElementRequestFn);
+	const { openCollaboraFileDialog } = useAddCollaboraFile();
 
 	const onElementClick = async (elementType: ContentElementType) => {
 		closeDialog();
@@ -53,7 +52,6 @@ export const useAddElementDialog = (createElementRequestFn: CreateElementRequest
 	};
 
 	const onOfficeFileClick = async () => {
-		setCardId(cardId);
 		closeDialog();
 		openCollaboraFileDialog();
 	};
diff --git a/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts b/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
index 9fc40a52b1..be81c74b19 100644
--- a/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
+++ b/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
@@ -1,4 +1,3 @@
-import { setupCollaboraFileSelectionMock } from "../test-utils/add-collabora-file-mock";
 import { setupSharedElementTypeSelectionMock } from "../test-utils/sharedElementTypeSelectionMock";
 import { useAddElementDialog } from "./AddElementDialog.composable";
 import { ElementTypeSelectionOptions } from "./SharedElementTypeSelection.composable";
@@ -9,6 +8,7 @@ import { injectStrict } from "@/utils/inject";
 import { createTestEnvStore, expectNotification, mockedPiniaStoreTyping, ObjectIdMock } from "@@/tests/test-utils";
 import { useNotificationStore } from "@data-app";
 import { useBoardFeatures, useBoardPermissions, useCardStore } from "@data-board";
+import { useAddCollaboraFile } from "@feature-collabora";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedLastCreatedElement } from "@util-board";
 import { flushPromises } from "@vue/test-utils";
@@ -49,6 +49,15 @@ vi.mocked(useBoardFeatures).mockImplementation(() => ({
 	isFeatureEnabled: vi.fn().mockReturnValue(true),
 }));
 
+vi.mock("@feature-composable/add-collabora-file.composable");
+const mockedAddCollaboraFile = vi.mocked(useAddCollaboraFile);
+const openCollaboraFileDialogMock = vi.fn();
+mockedAddCollaboraFile.mockReturnValue({
+	isCollaboraFileDialogOpen: ref(false),
+	openCollaboraFileDialog: openCollaboraFileDialogMock,
+	closeCollaboraFileDialog: vi.fn(),
+});
+
 describe("ElementTypeSelection Composable", () => {
 	beforeEach(() => {
 		setActivePinia(createTestingPinia());
@@ -64,7 +73,6 @@ describe("ElementTypeSelection Composable", () => {
 				const cardId = "cardId";
 
 				setupSharedElementTypeSelectionMock();
-				setupCollaboraFileSelectionMock();
 
 				const addElementMock = vi.fn();
 				const elementType = ContentElementType.RichText;
@@ -194,8 +202,6 @@ describe("ElementTypeSelection Composable", () => {
 			const { isDialogOpen, isDialogLoading, staticElementTypeOptions, dynamicElementTypeOptions } =
 				setupSharedElementTypeSelectionMock();
 
-			setupCollaboraFileSelectionMock();
-
 			createTestEnvStore({
 				FEATURE_COLUMN_BOARD_SUBMISSIONS_ENABLED: true,
 				FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED: true,
@@ -355,12 +361,6 @@ describe("ElementTypeSelection Composable", () => {
 			const { staticElementTypeOptions } = setupSharedElementTypeSelectionMock({
 				closeDialogMock,
 			});
-			const openCollaboraFileDialogMock = vi.fn();
-			const setCardIdMock = vi.fn();
-			const { collaboraFileSelectionOptions } = setupCollaboraFileSelectionMock({
-				setCardIdMock,
-				openCollaboraFileDialogMock,
-			});
 
 			mockedUseBoardPermissions.mockReturnValue({
 				hasManageVideoConferencePermission: ref(hasManageVideoConferencePermission),
@@ -371,11 +371,8 @@ describe("ElementTypeSelection Composable", () => {
 
 			return {
 				elementTypeOptions: staticElementTypeOptions,
-				collaboraFileSelectionOptions,
 				addElementMock,
 				closeDialogMock,
-				openCollaboraFileDialogMock,
-				setCardIdMock,
 				cardId,
 			};
 		};
@@ -685,20 +682,8 @@ describe("ElementTypeSelection Composable", () => {
 				expect(closeDialogMock).toHaveBeenCalledTimes(1);
 			});
 
-			it("should set cardId", () => {
-				const { elementTypeOptions, addElementMock, cardId, setCardIdMock } = setup();
-				const { askType } = useAddElementDialog(addElementMock, cardId);
-
-				askType();
-
-				const option = elementTypeOptions.value.find((opt) => opt.testId === "create-element-file-with-collabora");
-				option?.action();
-
-				expect(setCardIdMock).toHaveBeenCalledTimes(1);
-			});
-
 			it("should set isCollaboraFileDialogOpen to true", () => {
-				const { elementTypeOptions, addElementMock, cardId, openCollaboraFileDialogMock } = setup();
+				const { elementTypeOptions, addElementMock, cardId } = setup();
 				const { askType } = useAddElementDialog(addElementMock, cardId);
 
 				askType();
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
deleted file mode 100644
index afb8cb4fb5..0000000000
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { ContentElementType } from "@/serverApi/v3";
-import { AnyContentElement } from "@/types/board/ContentElement";
-import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
-import { FileRecordParent } from "@/types/file/File";
-import { type CreateElementRequestPayload, useCardStore } from "@data-board";
-import { CollaboraFileType, useFileStorageApi } from "@data-file";
-import { useSharedFileSelect } from "@util-board";
-import { createSharedComposable } from "@vueuse/core";
-import { ref } from "vue";
-import { useI18n } from "vue-i18n";
-
-type CreateElementRequestFn = (payload: CreateElementRequestPayload) => Promise<AnyContentElement | undefined>;
-
-export const useAddCollaboraFile = createSharedComposable(() => {
-	const { t } = useI18n();
-	const { disableFileSelectOnMount, resetFileSelectOnMountEnabled } = useSharedFileSelect();
-	const { uploadCollaboraFile } = useFileStorageApi();
-	const cardStore = useCardStore();
-
-	const cardId = ref("");
-	const createElementRequestFn = ref<CreateElementRequestFn>(() => Promise.resolve(undefined));
-	const isCollaboraFileDialogOpen = ref<boolean>(false);
-
-	const closeCollaboraFileDialog = () => {
-		isCollaboraFileDialogOpen.value = false;
-	};
-
-	const openCollaboraFileDialog = () => {
-		isCollaboraFileDialogOpen.value = true;
-	};
-
-	const setCardId = (id: string) => {
-		cardId.value = id;
-	};
-
-	const setCreateElementRequestFn = (fn: CreateElementRequestFn) => {
-		createElementRequestFn.value = fn;
-	};
-
-	const updateFileElementCaption = async (element: AnyContentElement, caption: string) => {
-		if (!(caption && caption.trim().length > 0)) {
-			return;
-		}
-
-		const elementContent = FileElementContentSchema.parse(element.content);
-		elementContent.caption = caption;
-		element.content = elementContent;
-		await cardStore.updateElementRequest({ element });
-	};
-
-	const createFileElementWithCollaboraFile = async (type: CollaboraFileType, fileName: string, caption: string) => {
-		const element = await createElementRequestFn.value({
-			type: ContentElementType.File,
-			cardId: cardId.value,
-		});
-		if (!element) {
-			return;
-		}
-
-		try {
-			disableFileSelectOnMount();
-			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
-			await updateFileElementCaption(element, caption.trim());
-		} catch {
-			await cardStore.deleteElementRequest({ elementId: element.id, cardId: cardId.value });
-		} finally {
-			resetFileSelectOnMountEnabled();
-			closeCollaboraFileDialog();
-		}
-	};
-
-	const collaboraFileSelectionOptions = [
-		{
-			id: "1",
-			label: t("components.elementTypeSelection.elements.collabora.option.text"),
-			action: async (fileName: string, caption: string) =>
-				createFileElementWithCollaboraFile(CollaboraFileType.Text, fileName, caption),
-		},
-		{
-			id: "2",
-			label: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
-			action: async (fileName: string, caption: string) =>
-				createFileElementWithCollaboraFile(CollaboraFileType.Spreadsheet, fileName, caption),
-		},
-		{
-			id: "3",
-			label: t("components.elementTypeSelection.elements.collabora.option.presentation"),
-			action: async (fileName: string, caption: string) =>
-				createFileElementWithCollaboraFile(CollaboraFileType.Presentation, fileName, caption),
-		},
-	];
-
-	return {
-		cardId,
-		collaboraFileSelectionOptions,
-		isCollaboraFileDialogOpen,
-		openCollaboraFileDialog,
-		closeCollaboraFileDialog,
-		setCardId,
-		setCreateElementRequestFn,
-	};
-});
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
deleted file mode 100644
index 8b6f2cf538..0000000000
--- a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { setupFileSelectMock } from "../../../util/board/test-utils/file-select-mock";
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { AnyContentElement, ContentElementType } from "@/types/board/ContentElement";
-import { fileElementResponseFactory, mockedPiniaStoreTyping } from "@@/tests/test-utils";
-import { useCardStore } from "@data-board";
-import * as FileStorageApi from "@data-file";
-import { createMock } from "@golevelup/ts-vitest";
-import { createTestingPinia } from "@pinia/testing";
-import { setActivePinia } from "pinia";
-
-vi.mock("vue-i18n", () => ({
-	useI18n: vi.fn().mockReturnValue({
-		t: vi.fn().mockImplementation((key: string) => key),
-		n: vi.fn().mockImplementation((key: string) => key),
-	}),
-}));
-
-vi.mock("../../../util/board/file-select.composable");
-const disableFileSelectOnMountMock = vi.fn();
-const resetFileSelectOnMountEnabledMock = vi.fn();
-setupFileSelectMock({
-	disableFileSelectOnMountMock,
-	resetFileSelectOnMountEnabledMock,
-});
-
-const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValue(fileStorageApiMock);
-
-let cardStore: ReturnType<typeof useCardStore>;
-
-describe("AddCollaboraFileComposable", () => {
-	const newElement: AnyContentElement = fileElementResponseFactory.build({
-		id: "new-element-id",
-	});
-
-	const getOrInitialiseBoardStore = () => {
-		cardStore = cardStore ?? mockedPiniaStoreTyping(useCardStore);
-		return cardStore;
-	};
-
-	const setup = (failOnElementCreate = false) => {
-		const {
-			openCollaboraFileDialog,
-			closeCollaboraFileDialog,
-			setCardId,
-			setCreateElementRequestFn,
-			collaboraFileSelectionOptions,
-			isCollaboraFileDialogOpen,
-			cardId,
-		} = useAddCollaboraFile();
-
-		const createElementRequestFnMock = vi.fn().mockResolvedValue(newElement);
-		if (failOnElementCreate) {
-			createElementRequestFnMock.mockResolvedValue(undefined);
-		}
-
-		setCreateElementRequestFn(createElementRequestFnMock);
-		setCardId("test-card-id");
-
-		cardStore = getOrInitialiseBoardStore();
-
-		return {
-			collaboraFileSelectionOptions,
-			createElementRequestFnMock,
-			openCollaboraFileDialog,
-			isCollaboraFileDialogOpen,
-			closeCollaboraFileDialog,
-			setCardId,
-			cardId,
-			cardStore,
-		};
-	};
-
-	beforeEach(() => {
-		setActivePinia(createTestingPinia());
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	describe("openCollaboraFileDialog", () => {
-		it("should set isCollaboraFileDialogOpen to true", () => {
-			const { openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
-
-			isCollaboraFileDialogOpen.value = false;
-			expect(isCollaboraFileDialogOpen.value).toBe(false);
-
-			openCollaboraFileDialog();
-
-			expect(isCollaboraFileDialogOpen.value).toBe(true);
-		});
-	});
-
-	describe("closeCollaboraFileDialog", () => {
-		it("should set isCollaboraFileDialogOpen to false", () => {
-			const { closeCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
-
-			isCollaboraFileDialogOpen.value = true;
-			expect(isCollaboraFileDialogOpen.value).toBe(true);
-
-			closeCollaboraFileDialog();
-
-			expect(isCollaboraFileDialogOpen.value).toBe(false);
-		});
-	});
-
-	describe("setCardId", () => {
-		it("should set cardId", () => {
-			const { setCardId, cardId, isCollaboraFileDialogOpen } = setup();
-
-			isCollaboraFileDialogOpen.value = true;
-			expect(isCollaboraFileDialogOpen.value).toBe(true);
-
-			setCardId("test-card-id");
-
-			expect(cardId.value).toBe("test-card-id");
-		});
-	});
-
-	describe("collaboraFileSelectionOptions", () => {
-		it("provides options for collabora file types", () => {
-			const { collaboraFileSelectionOptions } = setup();
-
-			expect(collaboraFileSelectionOptions).toHaveLength(3);
-			expect(collaboraFileSelectionOptions[0].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.text"
-			);
-			expect(collaboraFileSelectionOptions[1].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.spreadsheet"
-			);
-			expect(collaboraFileSelectionOptions[2].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.presentation"
-			);
-		});
-
-		describe("action of collaboraFileSelectionOptions", () => {
-			it("should call createElementRequestFn with correct arguments", async () => {
-				const { collaboraFileSelectionOptions, createElementRequestFnMock } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-					expect(createElementRequestFnMock).toHaveBeenLastCalledWith({
-						type: ContentElementType.File,
-						cardId: "test-card-id",
-					});
-				}
-
-				expect(createElementRequestFnMock).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-			});
-
-			it("should disable file select on mount", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
-
-				expect(disableFileSelectOnMountMock).toHaveBeenCalled();
-			});
-
-			it("should upload collabora file", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
-
-				expect(fileStorageApiMock.uploadCollaboraFile).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-			});
-
-			describe("when a caption is provided", () => {
-				it("should update file element with caption", async () => {
-					const { collaboraFileSelectionOptions, cardStore } = setup();
-
-					for (const option of collaboraFileSelectionOptions) {
-						await option.action("test-office-file", "My Caption");
-					}
-
-					expect(cardStore.updateElementRequest).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-				});
-			});
-
-			it("should finally reset file select on mount", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
-
-				expect(resetFileSelectOnMountEnabledMock).toHaveBeenCalled();
-			});
-
-			describe("when element creation fails", () => {
-				it("should not upload collabora file", async () => {
-					const { collaboraFileSelectionOptions } = setup(true);
-
-					for (const option of collaboraFileSelectionOptions) {
-						await option.action("test-office-file", "");
-					}
-
-					expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(0);
-				});
-			});
-
-			describe("when file upload fails", () => {
-				it("should delete the created file element", async () => {
-					const { collaboraFileSelectionOptions } = setup();
-					fileStorageApiMock.uploadCollaboraFile.mockRejectedValue(new Error("Upload failed"));
-
-					for (const option of collaboraFileSelectionOptions) {
-						await option.action("test-office-file", "");
-					}
-
-					expect(cardStore.deleteElementRequest).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-				});
-			});
-		});
-	});
-});
diff --git a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
deleted file mode 100644
index a7a27d3e6c..0000000000
--- a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useAddCollaboraFile } from "../shared/add-collabora-file.composable";
-import { Mock } from "vitest";
-import { ref } from "vue";
-
-interface Props {
-	openCollaboraFileDialogMock?: Mock;
-	setCardIdMock?: Mock;
-}
-
-export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
-	const { setCardIdMock, openCollaboraFileDialogMock } = props;
-	const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
-
-	const openCollaboraFileDialog = openCollaboraFileDialogMock ?? vi.fn();
-	const closeCollaboraFileDialog = vi.fn();
-	const isCollaboraFileDialogOpen = ref(false);
-	const collaboraFileSelectionOptions = [
-		{
-			id: "1",
-			label: "Text Document",
-			action: vi.fn(),
-		},
-		{
-			id: "2",
-			label: "Table Document",
-			action: vi.fn(),
-		},
-	];
-	const setCardId = setCardIdMock ?? vi.fn();
-	const setCreateElementRequestFn = vi.fn();
-	const cardId = ref("");
-
-	const mocks = {
-		cardId,
-		collaboraFileSelectionOptions,
-		isCollaboraFileDialogOpen,
-		openCollaboraFileDialog,
-		closeCollaboraFileDialog,
-		setCardId,
-		setCreateElementRequestFn,
-	};
-
-	mockedCollaboraFileSelection.mockReturnValue(mocks);
-
-	return mocks;
-};
diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
new file mode 100644
index 0000000000..cefa2e89c7
--- /dev/null
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
@@ -0,0 +1,249 @@
+import { useAddCollaboraFile } from "../composables/add-collabora-file.composable";
+import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
+import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
+import { Dialog } from "@ui-dialog";
+import { mount } from "@vue/test-utils";
+import { nextTick, ref } from "vue";
+import { VForm } from "vuetify/lib/components/index";
+
+vi.mock("../composables/add-collabora-file.composable");
+const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
+mockedCollaboraFileSelection.mockReturnValue({
+	isCollaboraFileDialogOpen: ref(false),
+	openCollaboraFileDialog: vi.fn(),
+	closeCollaboraFileDialog: vi.fn(),
+});
+
+describe("CollaboraFileDialog", () => {
+	const setupMocks = () => {
+		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen } = mockedCollaboraFileSelection();
+
+		return {
+			isCollaboraFileDialogOpen,
+			closeCollaboraFileDialog,
+		};
+	};
+
+	describe("when isCollaboraFileDialogOpen is false", () => {
+		const setup = () => {
+			document.body.setAttribute("data-app", "true");
+
+			setupMocks();
+
+			const wrapper = mount(AddCollaboraFileDialog, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+					stubs: { UseFocusTrap: true },
+				},
+			});
+
+			return { wrapper };
+		};
+
+		it("should be found in dom", () => {
+			const { wrapper } = setup();
+
+			expect(wrapper.exists()).toBe(true);
+		});
+
+		it("the modal should not be visible", () => {
+			const { wrapper } = setup();
+
+			expect(wrapper.findComponent(VForm).exists()).toBe(false);
+		});
+	});
+
+	describe("when isCollaboraFileDialogOpen is changed from false to true", () => {
+		const setup = async () => {
+			document.body.setAttribute("data-app", "true");
+
+			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = setupMocks();
+
+			const wrapper = mount(AddCollaboraFileDialog, {
+				global: {
+					plugins: [createTestingVuetify(), createTestingI18n()],
+					stubs: { UseFocusTrap: true },
+				},
+				attachTo: document.body,
+			});
+
+			isCollaboraFileDialogOpen.value = true;
+			await nextTick();
+
+			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, wrapper };
+		};
+
+		it("should make modal visible", async () => {
+			const { wrapper } = await setup();
+
+			expect(wrapper.findComponent(VForm).exists()).toBe(true);
+			expect(wrapper.findComponent(VForm).isVisible()).toBe(true);
+		});
+
+		it("should have confirm button disabled initially", async () => {
+			const { wrapper } = await setup();
+
+			const dialog = wrapper.findComponent(Dialog);
+			expect(dialog.props("confirmBtnDisabled")).toBe(true);
+		});
+
+		// describe("when form is valid", () => {
+		// 	it("should call item action", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+		// 		const FILENAME = "myDocument";
+
+		// 		const typeSelect = wrapper.findComponent(VSelect);
+		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
+		// 		await nextTick();
+		// 		expect(typeSelect.find("input").element.value).toBe(selectOption.id);
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+		// 		await fileNameInput.find("input").setValue(FILENAME);
+		// 		await nextTick();
+
+		// 		const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+		// 		await form.trigger("submit");
+		// 		await nextTick();
+		// 		await flushPromises();
+		// 		expect(selectOption.action).toHaveBeenCalled();
+		// 		expect(selectOption.action).toHaveBeenCalledWith(FILENAME, "");
+		// 	});
+
+		// 	it("should have confirm button enabled", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+		// 		const FILENAME = "myDocument";
+
+		// 		const typeSelect = wrapper.findComponent(VSelect);
+		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
+		// 		await nextTick();
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+		// 		await fileNameInput.find("input").setValue(FILENAME);
+		// 		await nextTick();
+
+		// 		const dialog = wrapper.findComponent(Dialog);
+		// 		expect(dialog.props("confirmBtnDisabled")).toBe(false);
+		// 	});
+		// });
+
+		// describe("when filetype is not selected", () => {
+		// 	it("should not call item action", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+		// 		await fileNameInput.find("input").setValue("myDocument");
+		// 		await nextTick();
+
+		// 		const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+		// 		await form.trigger("submit");
+		// 		await nextTick();
+		// 		await flushPromises();
+		// 		expect(selectOption.action).toHaveBeenCalledTimes(0);
+		// 	});
+
+		// 	it("should have confirm button disabled", async () => {
+		// 		const { wrapper } = await setup();
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+		// 		await fileNameInput.find("input").setValue("myDocument");
+		// 		await nextTick();
+
+		// 		const dialog = wrapper.findComponent(Dialog);
+		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
+		// 	});
+		// });
+
+		// describe("when filename is empty", () => {
+		// 	it("should not call item action", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+
+		// 		const typeSelect = wrapper.findComponent(VSelect);
+		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
+		// 		await nextTick();
+		// 		expect(typeSelect.find("input").element.value).toBe(selectOption.id);
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
+		// 		expect(fileNameInput.element.value).toBe("");
+
+		// 		const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+		// 		await form.trigger("submit");
+		// 		await nextTick();
+		// 		await flushPromises();
+		// 		expect(selectOption.action).toHaveBeenCalledTimes(0);
+		// 	});
+
+		// 	it("should have confirm button disabled", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+
+		// 		const typeSelect = wrapper.findComponent(VSelect);
+		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
+		// 		await nextTick();
+
+		// 		const dialog = wrapper.findComponent(Dialog);
+		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
+		// 	});
+		// });
+
+		// describe("when filename contains invalid characters", () => {
+		// 	it("should have confirm button disabled", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+
+		// 		const typeSelect = wrapper.findComponent(VSelect);
+		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
+		// 		await nextTick();
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+		// 		await fileNameInput.find("input").setValue("invalid/filename");
+		// 		await nextTick();
+
+		// 		const dialog = wrapper.findComponent(Dialog);
+		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
+		// 	});
+		// });
+
+		// describe("when caption contains opening tag", () => {
+		// 	it("should have confirm button disabled", async () => {
+		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+
+		// 		const selectOption = collaboraFileSelectionOptions[0];
+
+		// 		const typeSelect = wrapper.findComponent(VSelect);
+		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
+		// 		await nextTick();
+
+		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+		// 		await fileNameInput.find("input").setValue("validFilename");
+		// 		await nextTick();
+
+		// 		const captionInput = wrapper.findComponent("[data-testid='collabora-element-form-caption']");
+		// 		await captionInput.find("textarea").setValue("<script>alert('xss')</script>");
+		// 		await nextTick();
+
+		// 		const dialog = wrapper.findComponent(Dialog);
+		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
+		// 	});
+		// });
+
+		it("should close modal on close button click", async () => {
+			const { closeCollaboraFileDialog, wrapper } = await setup();
+
+			const dialog = wrapper.findComponent(Dialog);
+			dialog.vm.$emit("cancel");
+
+			await nextTick();
+
+			expect(closeCollaboraFileDialog).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/src/modules/feature/board/shared/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
similarity index 71%
rename from src/modules/feature/board/shared/AddCollaboraFileDialog.vue
rename to src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index 3f82de20ba..da352e28f7 100644
--- a/src/modules/feature/board/shared/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -14,8 +14,6 @@
 				<VSelect
 					v-model="selectedDocType"
 					:items="collaboraFileSelectionOptions"
-					item-title="label"
-					item-value="id"
 					persistent-hint
 					:label="t('components.cardElement.fileElement.collaboraFile.types')"
 					:rules="docTypeRules"
@@ -29,40 +27,34 @@
 					:placeholder="t('components.cardElement.fileElement.collaboraFile.untitled')"
 					data-testid="collabora-element-form-filename"
 				/>
-				<VTextarea
-					v-model="caption"
-					rows="1"
-					:rules="captionRules"
-					auto-grow
-					:label="$t('components.cardElement.fileElement.caption')"
-					data-testid="collabora-element-form-caption"
-				/>
 			</VForm>
 		</template>
 	</Dialog>
 </template>
 <script setup lang="ts">
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import { useAddCollaboraFile } from "../composables/add-collabora-file.composable";
+import { CollaboraFileType } from "@data-file";
 import { Dialog } from "@ui-dialog";
 import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
 import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
+const emit = defineEmits<{
+	(e: "create-collabora-file", payload: { type: CollaboraFileType; fileName: string }): void;
+}>();
+
 type VuetifyForm = {
 	validate: () => Promise<{ valid: boolean }>;
 };
 
-const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = useAddCollaboraFile();
+const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = useAddCollaboraFile();
 const { validateOnOpeningTag } = useOpeningTagValidator();
 const { validateInvalidCharacters } = useInvalidCharactersValidator();
-
 const { t } = useI18n();
 
 const form = ref<VuetifyForm | null>(null);
-
-const selectedDocType = ref<string | null>(null);
+const selectedDocType = ref<CollaboraFileType | null>(null);
 const fileName = ref<string>("");
-const caption = ref<string>("");
 
 const docTypeRules = [isRequired(t("common.validation.required2"))];
 const fileNameRules = [
@@ -70,27 +62,36 @@ const fileNameRules = [
 	isRequired(t("common.validation.required2")),
 	(value: string) => validateInvalidCharacters(value, ["/"]),
 ];
-const captionRules = [(value: string) => validateOnOpeningTag(value)];
 
 const passesAllRules = (value: string, rules: ((value: string) => true | string)[]): boolean =>
 	rules.every((rule) => rule(value) === true);
 
+const collaboraFileSelectionOptions = [
+	{
+		title: t("components.elementTypeSelection.elements.collabora.option.text"),
+		value: CollaboraFileType.Text,
+	},
+	{
+		title: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
+		value: CollaboraFileType.Spreadsheet,
+	},
+	{
+		title: t("components.elementTypeSelection.elements.collabora.option.presentation"),
+		value: CollaboraFileType.Presentation,
+	},
+];
+
 const isFormValid = computed(() => {
 	if (!selectedDocType.value) {
 		return false;
 	}
 
-	const isFileNameValid = passesAllRules(fileName.value, fileNameRules);
-	const isCaptionValid = passesAllRules(caption.value, captionRules);
-	const isFormValid = isFileNameValid && isCaptionValid;
-
-	return isFormValid;
+	return passesAllRules(fileName.value, fileNameRules);
 });
 
 const resetForm = () => {
 	selectedDocType.value = null;
 	fileName.value = "";
-	caption.value = "";
 };
 
 const onCancel = () => {
@@ -100,14 +101,13 @@ const onCancel = () => {
 
 const onConfirm = async () => {
 	if (!form?.value) return;
+	if (!selectedDocType.value) return;
 
 	const { valid } = await form.value.validate();
 	if (!valid) return;
 
+	emit("create-collabora-file", { type: selectedDocType.value, fileName: fileName.value });
 	closeCollaboraFileDialog();
-	await collaboraFileSelectionOptions
-		.find((item) => item.id === selectedDocType.value)
-		?.action(fileName.value, caption.value);
 	resetForm();
 };
 </script>
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/collabora/composables/add-collabora-file.composable.ts
similarity index 100%
rename from src/modules/feature/folder/add-collabora-file.composable.ts
rename to src/modules/feature/collabora/composables/add-collabora-file.composable.ts
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/collabora/composables/add-collabora-file.composable.unit.ts
similarity index 100%
rename from src/modules/feature/folder/add-collabora-file.composable.unit.ts
rename to src/modules/feature/collabora/composables/add-collabora-file.composable.unit.ts
diff --git a/src/modules/feature/collabora/index.ts b/src/modules/feature/collabora/index.ts
index cf082ff5e9..bfdf16e0cc 100644
--- a/src/modules/feature/collabora/index.ts
+++ b/src/modules/feature/collabora/index.ts
@@ -1,3 +1,5 @@
+import AddCollaboraFileDialog from "./components/AddCollaboraFileDialog.vue";
 import CollaboraEditor from "./components/CollaboraEditor.vue";
+import { useAddCollaboraFile } from "./composables/add-collabora-file.composable";
 
-export { CollaboraEditor };
+export { AddCollaboraFileDialog, CollaboraEditor, useAddCollaboraFile };
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
deleted file mode 100644
index cf4df1fda4..0000000000
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
-import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
-import { useFileStorageApi } from "@data-file";
-import { createMock } from "@golevelup/ts-vitest";
-import { Dialog } from "@ui-dialog";
-import { flushPromises, mount } from "@vue/test-utils";
-import { nextTick, ref } from "vue";
-import { VForm, VSelect } from "vuetify/lib/components/index";
-
-vi.mock("@data-file");
-vi.mock("./add-collabora-file.composable");
-const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
-mockedCollaboraFileSelection.mockReturnValue({
-	isCollaboraFileDialogOpen: ref(false),
-	openCollaboraFileDialog: vi.fn(),
-	closeCollaboraFileDialog: vi.fn(),
-});
-const mockFileStorageApi = createMock<ReturnType<typeof useFileStorageApi>>();
-vi.mocked(useFileStorageApi).mockReturnValue(mockFileStorageApi);
-
-describe("CollaboraFileDialog", () => {
-	const setupMocks = () => {
-		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen } = mockedCollaboraFileSelection();
-
-		return {
-			isCollaboraFileDialogOpen,
-			closeCollaboraFileDialog,
-		};
-	};
-
-	describe("when isCollaboraFileDialogOpen is false", () => {
-		const setup = () => {
-			document.body.setAttribute("data-app", "true");
-
-			vi.clearAllMocks();
-			setupMocks();
-
-			const wrapper = mount(AddCollaboraFileDialog, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					stubs: { UseFocusTrap: true },
-				},
-				props: {
-					folderId: "folder-id",
-				},
-			});
-
-			return { wrapper };
-		};
-
-		it("should be found in dom", () => {
-			const { wrapper } = setup();
-
-			expect(wrapper.exists()).toBe(true);
-		});
-
-		it("the modal should not be visible", () => {
-			const { wrapper } = setup();
-
-			expect(wrapper.findComponent(VForm).exists()).toBe(false);
-		});
-	});
-
-	describe("when isCollaboraFileDialogOpen is changed from false to true", () => {
-		const setup = async () => {
-			document.body.setAttribute("data-app", "true");
-
-			vi.clearAllMocks();
-			setupMocks();
-
-			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = setupMocks();
-
-			const wrapper = mount(AddCollaboraFileDialog, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					stubs: { UseFocusTrap: true },
-				},
-				props: {
-					folderId: "folder-id",
-				},
-				attachTo: document.body,
-			});
-
-			isCollaboraFileDialogOpen.value = true;
-			await nextTick();
-
-			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, wrapper };
-		};
-
-		it("should make modal visible", async () => {
-			const { wrapper } = await setup();
-
-			expect(wrapper.findComponent(VForm).exists()).toBe(true);
-			expect(wrapper.findComponent(VForm).isVisible()).toBe(true);
-		});
-
-		it("should have confirm button disabled initially", async () => {
-			const { wrapper } = await setup();
-
-			const dialog = wrapper.findComponent(Dialog);
-			expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		});
-
-		describe("when form is valid", () => {
-			it("should call item action", async () => {
-				const { wrapper } = await setup();
-
-				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				const typeOptions = typeSelect.props("items") as Array<{ id: string; label: string; action: () => void }>;
-				expect(typeOptions.length).toBe(3);
-
-				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-
-				typeOptions.forEach(async (option) => {
-					await typeSelect.setValue(option.id);
-					await nextTick();
-
-					await form.trigger("submit");
-					await nextTick();
-				});
-				await flushPromises();
-
-				expect(mockFileStorageApi.uploadCollaboraFile).toHaveBeenCalledTimes(typeOptions.length);
-			});
-
-			it("should have confirm button enabled", async () => {
-				const { wrapper } = await setup();
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
-				await nextTick();
-
-				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(false);
-			});
-		});
-
-		describe("when filetype is not selected", () => {
-			it("should not call item action", async () => {
-				const { wrapper } = await setup();
-
-				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-
-				expect(mockFileStorageApi.uploadCollaboraFile).not.toHaveBeenCalled();
-			});
-
-			it("should have confirm button disabled", async () => {
-				const { wrapper } = await setup();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue("myDocument");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when filename is empty", () => {
-			it("should not call item action", async () => {
-				const { wrapper } = await setup();
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-
-				expect(mockFileStorageApi.uploadCollaboraFile).not.toHaveBeenCalled();
-			});
-
-			it("should have confirm button disabled", async () => {
-				const { wrapper } = await setup();
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when filename contains invalid characters", () => {
-			it("should have confirm button disabled", async () => {
-				const { wrapper } = await setup();
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue("invalid/filename");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		it("should close modal on close button click", async () => {
-			const { closeCollaboraFileDialog, wrapper } = await setup();
-
-			const dialog = wrapper.findComponent(Dialog);
-			dialog.vm.$emit("cancel");
-
-			await nextTick();
-
-			expect(closeCollaboraFileDialog).toHaveBeenCalled();
-		});
-	});
-});
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
deleted file mode 100644
index 101eb03690..0000000000
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-	<Dialog
-		v-model:is-dialog-open="isCollaboraFileDialogOpen"
-		:message="t('pages.folder.add-collabora-file-dialog.title')"
-		:confirm-btn-disabled="!isFormValid"
-		confirm-btn-lang-key="common.actions.create"
-		data-testid="collabora-file-dialog"
-		@cancel="onCancel"
-		@confirm="onConfirm"
-	>
-		<template #content>
-			<VForm id="collaboraFileForm" ref="form" data-testid="collabora-file-form" @submit.prevent="onConfirm">
-				<!-- Attach the select to the form so that we can use focusTrap in the dialog -->
-				<VSelect
-					v-model="selectedDocType"
-					:items="collaboraFileSelectionOptions"
-					item-title="label"
-					item-value="id"
-					persistent-hint
-					:label="t('pages.folder.add-collabora-file-dialog.doc-types')"
-					:rules="docTypeRules"
-					:menu-props="{ attach: '#collaboraFileForm' }"
-					data-testid="collabora-file-type"
-				/>
-				<VTextField
-					v-model="fileName"
-					:label="t('common.labels.fileName')"
-					:rules="fileNameRules"
-					:placeholder="t('pages.folder.add-collabora-file-dialog.untitled-file')"
-					data-testid="collabora-file-name"
-				/>
-			</VForm>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { FileRecord, FileRecordParent } from "@/types/file/File";
-import { CollaboraFileType, useFileStorageApi } from "@data-file";
-import { Dialog } from "@ui-dialog";
-import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
-import { computed, ref } from "vue";
-import { useI18n } from "vue-i18n";
-
-const props = defineProps({
-	folderId: {
-		type: String,
-		required: true,
-	},
-});
-
-const emit = defineEmits<{
-	(collaboraFileAdded: "collabora-file-added", newFile: FileRecord): void;
-}>();
-
-type VuetifyForm = {
-	validate: () => Promise<{ valid: boolean }>;
-};
-
-const { uploadCollaboraFile } = useFileStorageApi();
-const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = useAddCollaboraFile();
-const { validateOnOpeningTag } = useOpeningTagValidator();
-const { validateInvalidCharacters } = useInvalidCharactersValidator();
-const { t } = useI18n();
-
-const form = ref<VuetifyForm | null>(null);
-const selectedDocType = ref<string | null>(null);
-const fileName = ref<string>("");
-
-const uploadCollaboraFileFn = async (type: CollaboraFileType, folderId: string, fileName: string) => {
-	const fileRecord = await uploadCollaboraFile(type, folderId, FileRecordParent.BOARDNODES, fileName);
-	closeCollaboraFileDialog();
-
-	return fileRecord;
-};
-
-const collaboraFileSelectionOptions = [
-	{
-		id: "1",
-		label: t("pages.folder.add-collabora-file-dialog.option.text"),
-		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFileFn(CollaboraFileType.Text, folderId, fileName),
-	},
-	{
-		id: "2",
-		label: t("pages.folder.add-collabora-file-dialog.option.spreadsheet"),
-		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFileFn(CollaboraFileType.Spreadsheet, folderId, fileName),
-	},
-	{
-		id: "3",
-		label: t("pages.folder.add-collabora-file-dialog.option.presentation"),
-		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFileFn(CollaboraFileType.Presentation, folderId, fileName),
-	},
-];
-
-const docTypeRules = [isRequired(t("common.validation.required2"))];
-
-const fileNameRules = [
-	(value: string) => validateOnOpeningTag(value),
-	isRequired(t("common.validation.required2")),
-	(value: string) => validateInvalidCharacters(value, ["/"]),
-];
-
-const passesAllRules = (value: string, rules: ((value: string) => true | string)[]): boolean =>
-	rules.every((rule) => rule(value) === true);
-
-const isFormValid = computed(() => {
-	if (!selectedDocType.value) {
-		return false;
-	}
-
-	const isFileNameValid = passesAllRules(fileName.value, fileNameRules);
-
-	return isFileNameValid;
-});
-
-const resetForm = () => {
-	selectedDocType.value = null;
-	fileName.value = "";
-};
-
-const onCancel = () => {
-	resetForm();
-	closeCollaboraFileDialog();
-};
-
-const onConfirm = async () => {
-	if (!form?.value) return;
-
-	const { valid } = await form.value.validate();
-	if (!valid) return;
-
-	closeCollaboraFileDialog();
-	const newFile = await collaboraFileSelectionOptions
-		.find((item) => item.id === selectedDocType.value)
-		?.action(props.folderId, fileName.value);
-
-	if (newFile) {
-		emit("collabora-file-added", newFile);
-	}
-	resetForm();
-};
-</script>
diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 4baced3b32..cb4718f87f 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1,5 +1,3 @@
-import * as AddCollaboraFile from "./add-collabora-file.composable";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import DeleteFileDialog from "./file-table/DeleteFileDialog.vue";
 import EmptyFolderSvg from "./file-table/EmptyFolderSvg.vue";
 import KebabMenuActionDeleteFiles from "./file-table/KebabMenuActionDeleteFiles.vue";
@@ -24,6 +22,7 @@ import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/set
 import * as BoardApi from "@data-board";
 import * as FileStorageApi from "@data-file";
 import * as FolderState from "@data-folder";
+import { AddCollaboraFileDialog, useAddCollaboraFile } from "@feature-collabora";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import * as ConfirmationDialog from "@ui-confirmation-dialog";
@@ -43,7 +42,13 @@ const useRouterMock = <Mock>useRouter;
 vi.mock("@data-board/BoardApi.composable");
 const mockedUseBoardApi = vi.mocked(BoardApi.useBoardApi);
 
-vi.mock("./add-collabora-file.composable");
+vi.mock("@feature-collabora/add-collabora-file.composable");
+const mockedUseAddCollaboraFile = vi.mocked(useAddCollaboraFile);
+mockedUseAddCollaboraFile.mockReturnValue({
+	isCollaboraFileDialogOpen: ref(false),
+	openCollaboraFileDialog: vi.fn(),
+	closeCollaboraFileDialog: vi.fn(),
+});
 
 const enum FabEvent {
 	CreateDocument = "CREATE_DOCUMENT",
@@ -122,10 +127,10 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-					vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
+					mockedUseAddCollaboraFile.mockReturnValue({
+						isCollaboraFileDialogOpen: ref(false),
 						openCollaboraFileDialog: vi.fn(),
 						closeCollaboraFileDialog: vi.fn(),
-						isCollaboraFileDialogOpen: ref(false),
 					});
 
 					const { wrapper } = setupWrapper();
@@ -1170,10 +1175,10 @@ describe("Folder.vue", () => {
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
 				const mockOpenCollaboraFileDialog = vi.fn();
-				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
+				mockedUseAddCollaboraFile.mockReturnValue({
+					isCollaboraFileDialogOpen: ref(false),
 					openCollaboraFileDialog: mockOpenCollaboraFileDialog,
 					closeCollaboraFileDialog: vi.fn(),
-					isCollaboraFileDialogOpen: ref(false),
 				});
 
 				createTestEnvStore({
@@ -1256,12 +1261,12 @@ describe("Folder.vue", () => {
 
 			describe("and create document is chosen", () => {
 				it("should open collabora file dialog", async () => {
-					const { wrapper, mockOpenCollaboraFileDialog } = await setup();
+					const { wrapper } = await setup();
 
 					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
 					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CreateDocument);
 
-					expect(mockOpenCollaboraFileDialog).toHaveBeenCalled();
+					expect(mockedUseAddCollaboraFile).toHaveBeenCalled();
 				});
 			});
 		});
@@ -1297,7 +1302,7 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
+				mockedUseAddCollaboraFile.mockReturnValue({
 					openCollaboraFileDialog: vi.fn(),
 					closeCollaboraFileDialog: vi.fn(),
 					isCollaboraFileDialogOpen: ref(false),
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 96e016618a..0ebcb7cc49 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -41,12 +41,10 @@
 	/>
 	<input ref="fileInput" type="file" multiple hidden data-testid="input-folder-fileupload" aria-hidden="true" />
 	<LightBox />
-	<AddCollaboraFileDialog :folder-id="folderId" @collabora-file-added="collaboraFileAddedHandler" />
+	<AddCollaboraFileDialog @create-collabora-file="onCreateCollaboraFile" />
 </template>
 
 <script setup lang="ts">
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import FileTable from "./file-table/FileTable.vue";
 import FolderMenu from "./FolderMenu.vue";
 import RenameFolderDialog from "./RenameFolderDialog.vue";
@@ -62,8 +60,9 @@ import { downloadFile, downloadFilesAsArchive } from "@/utils/fileHelper";
 import { buildPageTitle } from "@/utils/pageTitle";
 import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board";
 import { useEnvConfig } from "@data-env";
-import { useFileStorageApi } from "@data-file";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { useFolderState } from "@data-folder";
+import { AddCollaboraFileDialog, useAddCollaboraFile } from "@feature-collabora";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
@@ -93,7 +92,7 @@ const { breadcrumbs, folderName, fetchFileFolderElement, parent, mapNodeTypeToPa
 
 const { createPageInformation } = useSharedBoardPageInformation();
 
-const { fetchFiles, upload, getFileRecordsByParentId, deleteFiles, rename } = useFileStorageApi();
+const { fetchFiles, upload, uploadCollaboraFile, getFileRecordsByParentId, deleteFiles, rename } = useFileStorageApi();
 
 const boardStore = useBoardStore();
 
@@ -170,19 +169,6 @@ const fabItemClickHandler = (event: string | undefined): void => {
 	}
 };
 
-const collaboraFileAddedHandler = (newFile: FileRecord) => {
-	const url = router.resolve({
-		name: "collabora",
-		params: {
-			id: newFile.id,
-		},
-		query: {
-			edit: hasEditPermission.value.toString(),
-		},
-	}).href;
-	window.open(url, "_blank");
-};
-
 const onDelete = async (confirmation: Promise<boolean>) => {
 	const shouldDelete = await confirmation;
 
@@ -250,6 +236,27 @@ const onRenameCancel = () => {
 	isRenameDialogOpen.value = false;
 };
 
+const onCreateCollaboraFile = async (payload: { type: CollaboraFileType; fileName: string }) => {
+	const newFile = await uploadCollaboraFile(
+		payload.type,
+		props.folderId,
+		FileRecordParent.BOARDNODES,
+		payload.fileName
+	);
+	if (!newFile) return;
+
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: newFile.id,
+		},
+		query: {
+			edit: hasEditPermission.value.toString(),
+		},
+	}).href;
+	window.open(url, "_blank");
+};
+
 const resetUploadProgress = () => {
 	uploadProgress.value = { uploaded: 0, total: 0 };
 };

From 22415065a108b2e899dc0934e6fe787ff7ca3387 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 11:38:06 +0100
Subject: [PATCH 082/100] Move logic to CardStore

---
 src/modules/data/board/Card.store.ts      | 33 +++++++++++++++++++++-
 src/modules/feature/board/board/Board.vue | 34 ++---------------------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/modules/data/board/Card.store.ts b/src/modules/data/board/Card.store.ts
index a0cb9bbdbb..4f85e0ccb7 100644
--- a/src/modules/data/board/Card.store.ts
+++ b/src/modules/data/board/Card.store.ts
@@ -15,11 +15,13 @@ import {
 import { useCardRestApi } from "./cardActions/cardRestApi.composable";
 import { useCardSocketApi } from "./cardActions/cardSocketApi.composable";
 import { CardResponse, ContentElementType, PreferredToolResponse, ToolContextType } from "@/serverApi/v3";
+import { FileRecordParent } from "@/types/file/File";
 import { notifyInfo } from "@data-app";
 import { useEnvConfig } from "@data-env";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
 import { defineStore } from "pinia";
-import { nextTick, Ref, ref } from "vue";
+import { nextTick, Ref, ref, watch } from "vue";
 
 export const useCardStore = defineStore("cardStore", () => {
 	const cards: Ref<Record<string, CardResponse>> = ref({});
@@ -35,6 +37,14 @@ export const useCardStore = defineStore("cardStore", () => {
 
 	const { setFocus, forceFocus } = useBoardFocusHandler();
 	const { setEditModeId, editModeId } = useSharedEditMode();
+	const { uploadCollaboraFile } = useFileStorageApi();
+
+	let latestEditModeId: string | undefined = undefined;
+	watch(editModeId, (newVal) => {
+		if (newVal) {
+			latestEditModeId = newVal;
+		}
+	});
 
 	const fetchCardRequest = socketOrRest.fetchCardRequest;
 
@@ -109,6 +119,26 @@ export const useCardStore = defineStore("cardStore", () => {
 
 	const createElementRequest = socketOrRest.createElementRequest;
 
+	const createFileElementWithCollabora = async (type: CollaboraFileType, fileName: string) => {
+		if (!latestEditModeId) {
+			return;
+		}
+
+		const element = await createElementRequest({
+			type: ContentElementType.File,
+			cardId: latestEditModeId,
+		});
+		if (!element) {
+			return;
+		}
+
+		try {
+			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
+		} catch {
+			await deleteElementRequest({ elementId: element.id, cardId: latestEditModeId });
+		}
+	};
+
 	const createPreferredElement = (payload: CreateElementRequestPayload, tool: PreferredToolResponse) => {
 		restApi.createPreferredElement(payload, tool);
 	};
@@ -265,5 +295,6 @@ export const useCardStore = defineStore("cardStore", () => {
 		preferredTools,
 		isPreferredToolsLoading,
 		disconnectSocketRequest,
+		createFileElementWithCollabora,
 	};
 });
diff --git a/src/modules/feature/board/board/Board.vue b/src/modules/feature/board/board/Board.vue
index b448bbfd3f..5e8ba35d48 100644
--- a/src/modules/feature/board/board/Board.vue
+++ b/src/modules/feature/board/board/Board.vue
@@ -128,17 +128,15 @@ import { useLoadingState } from "@/composables/loadingState";
 import { useBoardStore } from "@/modules/data/board/Board.store"; // FIX_CIRCULAR_DEPENDENCY
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useSharedEditMode } from "@/modules/util/board/editMode.composable"; // FIX_CIRCULAR_DEPENDENCY
-import { BoardLayout, ContentElementType, ShareTokenBodyParamsParentTypeEnum, ToolContextType } from "@/serverApi/v3";
+import { BoardLayout, ShareTokenBodyParamsParentTypeEnum, ToolContextType } from "@/serverApi/v3";
 import { CopyParamsTypeEnum } from "@/store/copy";
 import { HttpStatusCode } from "@/store/types/http-status-code.enum";
 import { ColumnMove } from "@/types/board/DragAndDrop";
-import { FileRecordParent } from "@/types/file/File";
 import { COPY_MODULE_KEY, injectStrict, SHARE_MODULE_KEY } from "@/utils/inject";
 import { useAppStore, useNotificationStore } from "@data-app";
 import { useBoardInactivity, useBoardPermissions, useCardStore, useSharedBoardPageInformation } from "@data-board";
 import { useEnvConfig } from "@data-env";
 import { CollaboraFileType } from "@data-file";
-import { useFileStorageApi } from "@data-file";
 import { AddCollaboraFileDialog } from "@feature-collabora";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
@@ -150,23 +148,14 @@ import { computed, onMounted, onUnmounted, provide, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 
-const { uploadCollaboraFile } = useFileStorageApi();
-
 const props = defineProps({
 	boardId: { type: String, required: true },
 });
 
 const { t } = useI18n();
-const { editModeId, setEditModeId } = useSharedEditMode();
+const { editModeId } = useSharedEditMode();
 const isEditMode = computed(() => editModeId.value !== undefined);
 
-let cardId: string | undefined = undefined;
-watch(editModeId, (newVal) => {
-	if (newVal) {
-		cardId = newVal;
-	}
-});
-
 const boardStore = useBoardStore();
 const cardStore = useCardStore();
 const board = computed(() => boardStore.board);
@@ -456,24 +445,7 @@ const onSaveEditBoardSettings = async (isEditableForEveryone: boolean) => {
 };
 
 const onCreateCollaboraFile = async (payload: { type: CollaboraFileType; fileName: string }) => {
-	if (!cardId) {
-		return;
-	}
-
-	const element = await cardStore.createElementRequest({
-		type: ContentElementType.File,
-		cardId: cardId,
-	});
-	if (!element) {
-		return;
-	}
-
-	try {
-		await uploadCollaboraFile(payload.type, element.id, FileRecordParent.BOARDNODES, payload.fileName);
-		setEditModeId(cardId);
-	} catch {
-		await cardStore.deleteElementRequest({ elementId: element.id, cardId: cardId });
-	}
+	cardStore.createFileElementWithCollabora(payload.type, payload.fileName);
 };
 </script>
 

From a8902fca04d41d9259d2ec80b8efe9dcaaea0349 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 11:56:23 +0100
Subject: [PATCH 083/100] Add editMode history

---
 src/modules/data/board/Board.store.unit.ts      |  1 +
 src/modules/data/board/Card.store.ts            | 17 +++++------------
 src/modules/data/board/Card.store.unit.ts       |  3 +++
 .../boardRestApi.composable.unit.ts             |  1 +
 .../board/boardActions/moveCardSuccess.unit.ts  |  1 +
 .../cardActions/cardRestApi.composable.unit.ts  |  1 +
 src/modules/feature/board/board/Board.unit.ts   |  1 +
 src/modules/feature/board/board/Board.vue       |  1 -
 src/modules/feature/board/card/CardHost.unit.ts |  1 +
 src/modules/util/board/editMode.composable.ts   |  5 +++++
 10 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/modules/data/board/Board.store.unit.ts b/src/modules/data/board/Board.store.unit.ts
index 808fa647ae..c0a5fc6592 100644
--- a/src/modules/data/board/Board.store.unit.ts
+++ b/src/modules/data/board/Board.store.unit.ts
@@ -95,6 +95,7 @@ describe("BoardStore", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
+			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/data/board/Card.store.ts b/src/modules/data/board/Card.store.ts
index 4f85e0ccb7..50e91a0f5e 100644
--- a/src/modules/data/board/Card.store.ts
+++ b/src/modules/data/board/Card.store.ts
@@ -21,7 +21,7 @@ import { useEnvConfig } from "@data-env";
 import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
 import { defineStore } from "pinia";
-import { nextTick, Ref, ref, watch } from "vue";
+import { nextTick, Ref, ref } from "vue";
 
 export const useCardStore = defineStore("cardStore", () => {
 	const cards: Ref<Record<string, CardResponse>> = ref({});
@@ -36,16 +36,9 @@ export const useCardStore = defineStore("cardStore", () => {
 	const socketOrRest = isSocketEnabled ? useCardSocketApi() : restApi;
 
 	const { setFocus, forceFocus } = useBoardFocusHandler();
-	const { setEditModeId, editModeId } = useSharedEditMode();
+	const { setEditModeId, editModeId, latestEditModeId } = useSharedEditMode();
 	const { uploadCollaboraFile } = useFileStorageApi();
 
-	let latestEditModeId: string | undefined = undefined;
-	watch(editModeId, (newVal) => {
-		if (newVal) {
-			latestEditModeId = newVal;
-		}
-	});
-
 	const fetchCardRequest = socketOrRest.fetchCardRequest;
 
 	const fetchCardSuccess = (payload: FetchCardSuccessPayload) => {
@@ -120,13 +113,13 @@ export const useCardStore = defineStore("cardStore", () => {
 	const createElementRequest = socketOrRest.createElementRequest;
 
 	const createFileElementWithCollabora = async (type: CollaboraFileType, fileName: string) => {
-		if (!latestEditModeId) {
+		if (!latestEditModeId.value) {
 			return;
 		}
 
 		const element = await createElementRequest({
 			type: ContentElementType.File,
-			cardId: latestEditModeId,
+			cardId: latestEditModeId.value,
 		});
 		if (!element) {
 			return;
@@ -135,7 +128,7 @@ export const useCardStore = defineStore("cardStore", () => {
 		try {
 			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
 		} catch {
-			await deleteElementRequest({ elementId: element.id, cardId: latestEditModeId });
+			await deleteElementRequest({ elementId: element.id, cardId: latestEditModeId.value });
 		}
 	};
 
diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 731902fb9e..544816cd3e 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -58,6 +58,7 @@ describe("CardStore", () => {
 	let mockedSharedLastCreatedElementActions: DeepMocked<ReturnType<typeof useSharedLastCreatedElement>>;
 	let setEditModeId: Mock;
 	let editModeId: Ref<string | undefined>;
+	let latestEditModeId: Ref<string | undefined>;
 	let mockedBoardFocusCalls: DeepMocked<ReturnType<typeof useBoardFocusHandler>>;
 
 	beforeEach(() => {
@@ -112,9 +113,11 @@ describe("CardStore", () => {
 
 		setEditModeId = vi.fn();
 		editModeId = ref(undefined);
+		latestEditModeId = ref(undefined);
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId,
+			latestEditModeId,
 			isInEditMode: computed(() => true),
 		});
 	});
diff --git a/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts b/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts
index 960af2d5ee..30edba2652 100644
--- a/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts
+++ b/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts
@@ -65,6 +65,7 @@ describe("boardRestApi", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
+			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/data/board/boardActions/moveCardSuccess.unit.ts b/src/modules/data/board/boardActions/moveCardSuccess.unit.ts
index bdcb6ccb4c..0af90ef060 100644
--- a/src/modules/data/board/boardActions/moveCardSuccess.unit.ts
+++ b/src/modules/data/board/boardActions/moveCardSuccess.unit.ts
@@ -90,6 +90,7 @@ describe("BoardStore - moveCardSuccess", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
+			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts b/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts
index 8b40b8a971..1420cfda1c 100644
--- a/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts
+++ b/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts
@@ -98,6 +98,7 @@ describe("useCardRestApi", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
+			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/feature/board/board/Board.unit.ts b/src/modules/feature/board/board/Board.unit.ts
index c5b5728e10..7b4d911f76 100644
--- a/src/modules/feature/board/board/Board.unit.ts
+++ b/src/modules/feature/board/board/Board.unit.ts
@@ -99,6 +99,7 @@ describe("Board", () => {
 		mockedUseSharedEditMode.mockReturnValue({
 			editModeId: ref(undefined),
 			setEditModeId: vi.fn(),
+			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/feature/board/board/Board.vue b/src/modules/feature/board/board/Board.vue
index 5e8ba35d48..b17eea09bd 100644
--- a/src/modules/feature/board/board/Board.vue
+++ b/src/modules/feature/board/board/Board.vue
@@ -155,7 +155,6 @@ const props = defineProps({
 const { t } = useI18n();
 const { editModeId } = useSharedEditMode();
 const isEditMode = computed(() => editModeId.value !== undefined);
-
 const boardStore = useBoardStore();
 const cardStore = useCardStore();
 const board = computed(() => boardStore.board);
diff --git a/src/modules/feature/board/card/CardHost.unit.ts b/src/modules/feature/board/card/CardHost.unit.ts
index 3263d206f6..229cf3cc45 100644
--- a/src/modules/feature/board/card/CardHost.unit.ts
+++ b/src/modules/feature/board/card/CardHost.unit.ts
@@ -50,6 +50,7 @@ describe("CardHost", () => {
 	beforeEach(() => {
 		mockedUseSharedEditMode.mockReturnValue({
 			editModeId: ref(undefined),
+			latestEditModeId: ref(undefined),
 			setEditModeId: vi.fn(),
 			isInEditMode: computed(() => true),
 		});
diff --git a/src/modules/util/board/editMode.composable.ts b/src/modules/util/board/editMode.composable.ts
index 9fd85ff626..7587a69453 100644
--- a/src/modules/util/board/editMode.composable.ts
+++ b/src/modules/util/board/editMode.composable.ts
@@ -54,15 +54,20 @@ const useEditMode = (id: string, permissions: EditModePermissions = { hasEditPer
  */
 const sharedEditMode = () => {
 	const editModeId: Ref<string | undefined> = ref(undefined);
+	const latestEditModeId: Ref<string | undefined> = ref(undefined);
 
 	const setEditModeId = (id: string | undefined): void => {
 		editModeId.value = id;
+		if (id) {
+			latestEditModeId.value = id;
+		}
 	};
 
 	const isInEditMode: ComputedRef<boolean> = computed(() => editModeId.value !== undefined);
 
 	return {
 		editModeId,
+		latestEditModeId,
 		setEditModeId,
 		isInEditMode,
 	};

From 01db8f2ff77aec71a498cc5f6415f2237ed0a38f Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 12:13:19 +0100
Subject: [PATCH 084/100] Add payload type

---
 src/modules/feature/board/board/Board.vue                   | 4 ++--
 .../feature/collabora/components/AddCollaboraFileDialog.vue | 3 ++-
 src/modules/feature/collabora/index.ts                      | 3 +++
 src/modules/feature/collabora/types/collabora-file.ts       | 6 ++++++
 src/modules/feature/folder/Folder.vue                       | 5 +++--
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 src/modules/feature/collabora/types/collabora-file.ts

diff --git a/src/modules/feature/board/board/Board.vue b/src/modules/feature/board/board/Board.vue
index b17eea09bd..961df8a256 100644
--- a/src/modules/feature/board/board/Board.vue
+++ b/src/modules/feature/board/board/Board.vue
@@ -136,7 +136,7 @@ import { COPY_MODULE_KEY, injectStrict, SHARE_MODULE_KEY } from "@/utils/inject"
 import { useAppStore, useNotificationStore } from "@data-app";
 import { useBoardInactivity, useBoardPermissions, useCardStore, useSharedBoardPageInformation } from "@data-board";
 import { useEnvConfig } from "@data-env";
-import { CollaboraFileType } from "@data-file";
+import type { CreateCollaboraFilePayload } from "@feature-collabora";
 import { AddCollaboraFileDialog } from "@feature-collabora";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
@@ -443,7 +443,7 @@ const onSaveEditBoardSettings = async (isEditableForEveryone: boolean) => {
 	isEditSettingsDialogOpen.value = false;
 };
 
-const onCreateCollaboraFile = async (payload: { type: CollaboraFileType; fileName: string }) => {
+const onCreateCollaboraFile = async (payload: CreateCollaboraFilePayload) => {
 	cardStore.createFileElementWithCollabora(payload.type, payload.fileName);
 };
 </script>
diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index da352e28f7..b11114adab 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -33,6 +33,7 @@
 </template>
 <script setup lang="ts">
 import { useAddCollaboraFile } from "../composables/add-collabora-file.composable";
+import type { CreateCollaboraFilePayload } from "../types/collabora-file";
 import { CollaboraFileType } from "@data-file";
 import { Dialog } from "@ui-dialog";
 import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
@@ -40,7 +41,7 @@ import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
 const emit = defineEmits<{
-	(e: "create-collabora-file", payload: { type: CollaboraFileType; fileName: string }): void;
+	(e: "create-collabora-file", payload: CreateCollaboraFilePayload): void;
 }>();
 
 type VuetifyForm = {
diff --git a/src/modules/feature/collabora/index.ts b/src/modules/feature/collabora/index.ts
index bfdf16e0cc..a8cd4d7929 100644
--- a/src/modules/feature/collabora/index.ts
+++ b/src/modules/feature/collabora/index.ts
@@ -1,5 +1,8 @@
 import AddCollaboraFileDialog from "./components/AddCollaboraFileDialog.vue";
 import CollaboraEditor from "./components/CollaboraEditor.vue";
 import { useAddCollaboraFile } from "./composables/add-collabora-file.composable";
+import type { CreateCollaboraFilePayload } from "./types/collabora-file";
 
 export { AddCollaboraFileDialog, CollaboraEditor, useAddCollaboraFile };
+
+export type { CreateCollaboraFilePayload };
diff --git a/src/modules/feature/collabora/types/collabora-file.ts b/src/modules/feature/collabora/types/collabora-file.ts
new file mode 100644
index 0000000000..5474c37cc4
--- /dev/null
+++ b/src/modules/feature/collabora/types/collabora-file.ts
@@ -0,0 +1,6 @@
+import { CollaboraFileType } from "@data-file";
+
+export type CreateCollaboraFilePayload = {
+	type: CollaboraFileType;
+	fileName: string;
+};
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 0ebcb7cc49..5d173432dd 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -60,8 +60,9 @@ import { downloadFile, downloadFilesAsArchive } from "@/utils/fileHelper";
 import { buildPageTitle } from "@/utils/pageTitle";
 import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board";
 import { useEnvConfig } from "@data-env";
-import { CollaboraFileType, useFileStorageApi } from "@data-file";
+import { useFileStorageApi } from "@data-file";
 import { useFolderState } from "@data-folder";
+import type { CreateCollaboraFilePayload } from "@feature-collabora";
 import { AddCollaboraFileDialog, useAddCollaboraFile } from "@feature-collabora";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
@@ -236,7 +237,7 @@ const onRenameCancel = () => {
 	isRenameDialogOpen.value = false;
 };
 
-const onCreateCollaboraFile = async (payload: { type: CollaboraFileType; fileName: string }) => {
+const onCreateCollaboraFile = async (payload: CreateCollaboraFilePayload) => {
 	const newFile = await uploadCollaboraFile(
 		payload.type,
 		props.folderId,

From 048d9adb00dbe0dad5d729f0540159a0f40558de Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 13:51:11 +0100
Subject: [PATCH 085/100] Adjust test

---
 src/modules/feature/folder/Folder.unit.ts | 125 +++++++++++++++++-----
 1 file changed, 98 insertions(+), 27 deletions(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index cb4718f87f..5abc02f9d9 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -9,7 +9,7 @@ import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store";
 import { ParentNodeInfo, ParentNodeType } from "@/types/board/ContentElement";
-import { FileRecord, FileRecordParent } from "@/types/file/File";
+import { FileRecordParent } from "@/types/file/File";
 import * as FileHelper from "@/utils/fileHelper";
 import {
 	boardResponseFactory,
@@ -21,6 +21,7 @@ import {
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import * as BoardApi from "@data-board";
 import * as FileStorageApi from "@data-file";
+import { CollaboraFileType } from "@data-file";
 import * as FolderState from "@data-folder";
 import { AddCollaboraFileDialog, useAddCollaboraFile } from "@feature-collabora";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
@@ -42,13 +43,8 @@ const useRouterMock = <Mock>useRouter;
 vi.mock("@data-board/BoardApi.composable");
 const mockedUseBoardApi = vi.mocked(BoardApi.useBoardApi);
 
-vi.mock("@feature-collabora/add-collabora-file.composable");
+vi.mock("@feature-collabora/composables/add-collabora-file.composable");
 const mockedUseAddCollaboraFile = vi.mocked(useAddCollaboraFile);
-mockedUseAddCollaboraFile.mockReturnValue({
-	isCollaboraFileDialogOpen: ref(false),
-	openCollaboraFileDialog: vi.fn(),
-	closeCollaboraFileDialog: vi.fn(),
-});
 
 const enum FabEvent {
 	CreateDocument = "CREATE_DOCUMENT",
@@ -127,11 +123,8 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-					mockedUseAddCollaboraFile.mockReturnValue({
-						isCollaboraFileDialogOpen: ref(false),
-						openCollaboraFileDialog: vi.fn(),
-						closeCollaboraFileDialog: vi.fn(),
-					});
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
 
 					const { wrapper } = setupWrapper();
 					const useBoardStoreMock = mockedPiniaStoreTyping(useBoardStore);
@@ -257,6 +250,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					setupWrapper();
 
 					await nextTick();
@@ -311,6 +307,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await nextTick();
@@ -377,6 +376,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -449,6 +451,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -512,6 +517,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -576,6 +584,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -663,6 +674,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -737,6 +751,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -801,6 +818,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -863,6 +883,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await nextTick();
@@ -934,6 +957,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -1001,6 +1027,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -1065,6 +1094,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await nextTick();
@@ -1130,6 +1162,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				return { wrapper };
@@ -1174,10 +1209,10 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-				const mockOpenCollaboraFileDialog = vi.fn();
+				const mockedOpenCollaboraFileDialog = vi.fn();
 				mockedUseAddCollaboraFile.mockReturnValue({
 					isCollaboraFileDialogOpen: ref(false),
-					openCollaboraFileDialog: mockOpenCollaboraFileDialog,
+					openCollaboraFileDialog: mockedOpenCollaboraFileDialog,
 					closeCollaboraFileDialog: vi.fn(),
 				});
 
@@ -1192,7 +1227,7 @@ describe("Folder.vue", () => {
 
 				return {
 					wrapper,
-					mockOpenCollaboraFileDialog,
+					mockedOpenCollaboraFileDialog,
 				};
 			};
 
@@ -1261,17 +1296,17 @@ describe("Folder.vue", () => {
 
 			describe("and create document is chosen", () => {
 				it("should open collabora file dialog", async () => {
-					const { wrapper } = await setup();
+					const { wrapper, mockedOpenCollaboraFileDialog } = await setup();
 
 					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
 					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CreateDocument);
 
-					expect(mockedUseAddCollaboraFile).toHaveBeenCalled();
+					expect(mockedOpenCollaboraFileDialog).toHaveBeenCalled();
 				});
 			});
 		});
 
-		describe("when collabora file was created", () => {
+		describe("when collabora file should be created", () => {
 			const setup = async () => {
 				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
 				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
@@ -1302,11 +1337,8 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-				mockedUseAddCollaboraFile.mockReturnValue({
-					openCollaboraFileDialog: vi.fn(),
-					closeCollaboraFileDialog: vi.fn(),
-					isCollaboraFileDialogOpen: ref(false),
-				});
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
 
 				const windowOpenMock = vi.fn();
 				const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
@@ -1320,15 +1352,30 @@ describe("Folder.vue", () => {
 				return {
 					wrapper,
 					windowOpenSpy,
+					fileStorageApiMock,
 				};
 			};
 
+			it("should upload collabora file", async () => {
+				const { wrapper, fileStorageApiMock } = await setup();
+
+				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+				await collaboraFileDialog.vm.$emit("create-collabora-file", {
+					type: CollaboraFileType.Text,
+					fileName: "myDoc",
+				});
+
+				expect(fileStorageApiMock.uploadCollaboraFile).toHaveBeenCalled();
+			});
+
 			it("should show open collabora file in new tab", async () => {
 				const { wrapper, windowOpenSpy } = await setup();
 
 				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
-				const newFile: FileRecord = fileRecordFactory.build();
-				await collaboraFileDialog.vm.$emit("collabora-file-added", newFile);
+				await collaboraFileDialog.vm.$emit("create-collabora-file", {
+					type: CollaboraFileType.Text,
+					fileName: "myDoc",
+				});
 
 				expect(windowOpenSpy).toHaveBeenCalled();
 			});
@@ -1381,6 +1428,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper, parentId } = setupWrapper();
 
 				await nextTick();
@@ -1511,6 +1561,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper, parentId } = setupWrapper();
 
 				await nextTick();
@@ -1610,6 +1663,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await flushPromises();
@@ -1667,6 +1723,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await flushPromises();
@@ -1714,8 +1773,8 @@ describe("Folder.vue", () => {
 				folderStateMock.folderName = folderName;
 				folderStateMock.breadcrumbs = ref([]) as unknown as ComputedRef;
 
-				const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
-				mockedUseBoardApi.mockReturnValue(boardApiMock);
+				const boardState = createMock<ReturnType<typeof BoardApi.useSharedBoardPageInformation>>({});
+				vi.spyOn(BoardApi, "useSharedBoardPageInformation").mockReturnValueOnce(boardState);
 
 				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -1724,6 +1783,9 @@ describe("Folder.vue", () => {
 				const fileRecord2 = fileRecordFactory.build();
 				fileStorageApiMock.getFileRecordsByParentId.mockReturnValueOnce([fileRecord1, fileRecord2]);
 
+				const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
+				mockedUseBoardApi.mockReturnValue(boardApiMock);
+
 				const useBoardStoreMock = createMock<ReturnType<typeof BoardApi.useBoardStore>>();
 				vi.spyOn(BoardApi, "useBoardStore").mockReturnValueOnce(useBoardStoreMock);
 
@@ -1732,6 +1794,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await flushPromises();
@@ -1800,6 +1865,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -1863,6 +1931,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
 					mockedUseBoardApi.mockReturnValue(boardApiMock);
 

From 33ff814e26598941cc1a6ab2b87b228c9d0ffc84 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 13:59:15 +0100
Subject: [PATCH 086/100] Add missing mock

---
 src/modules/data/board/Card.store.unit.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 544816cd3e..0240c26b22 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -19,6 +19,7 @@ import { cardResponseFactory } from "@@/tests/test-utils/factory/cardResponseFac
 import { drawingElementResponseFactory } from "@@/tests/test-utils/factory/drawingElementResponseFactory";
 import { useNotificationStore } from "@data-app";
 import { CreateElementRequestPayload, useCardStore, useSocketConnection } from "@data-board";
+import { useFileStorageApi } from "@data-file";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
@@ -49,6 +50,9 @@ const mockedUseSocketConnection = vi.mocked(useSocketConnection);
 vi.mock("./BoardFocusHandler.composable");
 const mockedBoardFocusHandler = vi.mocked(useBoardFocusHandler);
 
+vi.mock("@data-file");
+const mockedUseFileStorageApi = vi.mocked(useFileStorageApi);
+
 describe("CardStore", () => {
 	let mockedBoardApiCalls: DeepMocked<ReturnType<typeof useBoardApi>>;
 	let mockedErrorHandlerCalls: DeepMocked<ReturnType<typeof useErrorHandler>>;
@@ -60,6 +64,7 @@ describe("CardStore", () => {
 	let editModeId: Ref<string | undefined>;
 	let latestEditModeId: Ref<string | undefined>;
 	let mockedBoardFocusCalls: DeepMocked<ReturnType<typeof useBoardFocusHandler>>;
+	let mockedFileStorageApi: DeepMocked<ReturnType<typeof useFileStorageApi>>;
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
@@ -111,6 +116,9 @@ describe("CardStore", () => {
 		mockedBoardFocusCalls = createMock<ReturnType<typeof useBoardFocusHandler>>();
 		mockedBoardFocusHandler.mockReturnValue(mockedBoardFocusCalls);
 
+		mockedFileStorageApi = createMock<ReturnType<typeof useFileStorageApi>>();
+		mockedUseFileStorageApi.mockReturnValue(mockedFileStorageApi);
+
 		setEditModeId = vi.fn();
 		editModeId = ref(undefined);
 		latestEditModeId = ref(undefined);

From 29648b6ed65b4bddae3d85135cafba4c35f2d2f7 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 14:03:39 +0100
Subject: [PATCH 087/100] Fix mock

---
 .../board/shared/AddElementDialog.composable.unit.ts        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts b/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
index be81c74b19..1fe66f2ba3 100644
--- a/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
+++ b/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
@@ -49,10 +49,10 @@ vi.mocked(useBoardFeatures).mockImplementation(() => ({
 	isFeatureEnabled: vi.fn().mockReturnValue(true),
 }));
 
-vi.mock("@feature-composable/add-collabora-file.composable");
-const mockedAddCollaboraFile = vi.mocked(useAddCollaboraFile);
+vi.mock("@feature-collabora/composables/add-collabora-file.composable");
+const mockedUseAddCollaboraFile = vi.mocked(useAddCollaboraFile);
 const openCollaboraFileDialogMock = vi.fn();
-mockedAddCollaboraFile.mockReturnValue({
+mockedUseAddCollaboraFile.mockReturnValue({
 	isCollaboraFileDialogOpen: ref(false),
 	openCollaboraFileDialog: openCollaboraFileDialogMock,
 	closeCollaboraFileDialog: vi.fn(),

From 106806e3246219029aeb5abfa4641059fdea857c Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 14:39:29 +0100
Subject: [PATCH 088/100] Adjust dialog tests

---
 .../components/AddCollaboraFileDialog.unit.ts | 251 ++++++++----------
 1 file changed, 111 insertions(+), 140 deletions(-)

diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
index cefa2e89c7..65b3e2bab3 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
@@ -2,9 +2,9 @@ import { useAddCollaboraFile } from "../composables/add-collabora-file.composabl
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import { Dialog } from "@ui-dialog";
-import { mount } from "@vue/test-utils";
+import { flushPromises, mount } from "@vue/test-utils";
 import { nextTick, ref } from "vue";
-import { VForm } from "vuetify/lib/components/index";
+import { VForm, VSelect } from "vuetify/lib/components/index";
 
 vi.mock("../composables/add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
@@ -87,153 +87,124 @@ describe("CollaboraFileDialog", () => {
 			expect(dialog.props("confirmBtnDisabled")).toBe(true);
 		});
 
-		// describe("when form is valid", () => {
-		// 	it("should call item action", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-		// 		const FILENAME = "myDocument";
-
-		// 		const typeSelect = wrapper.findComponent(VSelect);
-		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
-		// 		await nextTick();
-		// 		expect(typeSelect.find("input").element.value).toBe(selectOption.id);
+		describe("when form is valid", () => {
+			it("should call emit event", async () => {
+				const { wrapper } = await setup();
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
+				await nextTick();
+				expect(typeSelect.find("input").element.value).toBe(selectOptions[0].value);
+
+				const FILENAME = "myDocument";
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
+				await nextTick();
+
+				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+				expect(wrapper.emitted("create-collabora-file")).toBeTruthy();
+			});
+
+			it("should have confirm button enabled", async () => {
+				const { wrapper } = await setup();
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
+				await nextTick();
+
+				const FILENAME = "myDocument";
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(false);
+			});
+		});
+
+		describe("when filetype is not selected", () => {
+			it("should not emit event", async () => {
+				const { wrapper } = await setup();
 
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-		// 		await fileNameInput.find("input").setValue(FILENAME);
-		// 		await nextTick();
+				const FILENAME = "myDocument";
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
+				await nextTick();
 
-		// 		const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-		// 		await form.trigger("submit");
-		// 		await nextTick();
-		// 		await flushPromises();
-		// 		expect(selectOption.action).toHaveBeenCalled();
-		// 		expect(selectOption.action).toHaveBeenCalledWith(FILENAME, "");
-		// 	});
-
-		// 	it("should have confirm button enabled", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-		// 		const FILENAME = "myDocument";
+				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+				expect(wrapper.emitted("create-collabora-file")).toBeFalsy();
+			});
 
-		// 		const typeSelect = wrapper.findComponent(VSelect);
-		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
-		// 		await nextTick();
+			it("should have confirm button disabled", async () => {
+				const { wrapper } = await setup();
 
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-		// 		await fileNameInput.find("input").setValue(FILENAME);
-		// 		await nextTick();
+				const FILENAME = "myDocument";
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
+				await nextTick();
 
-		// 		const dialog = wrapper.findComponent(Dialog);
-		// 		expect(dialog.props("confirmBtnDisabled")).toBe(false);
-		// 	});
-		// });
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(true);
+			});
+		});
 
-		// describe("when filetype is not selected", () => {
-		// 	it("should not call item action", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-		// 		await fileNameInput.find("input").setValue("myDocument");
-		// 		await nextTick();
-
-		// 		const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-		// 		await form.trigger("submit");
-		// 		await nextTick();
-		// 		await flushPromises();
-		// 		expect(selectOption.action).toHaveBeenCalledTimes(0);
-		// 	});
-
-		// 	it("should have confirm button disabled", async () => {
-		// 		const { wrapper } = await setup();
-
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-		// 		await fileNameInput.find("input").setValue("myDocument");
-		// 		await nextTick();
-
-		// 		const dialog = wrapper.findComponent(Dialog);
-		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		// 	});
-		// });
-
-		// describe("when filename is empty", () => {
-		// 	it("should not call item action", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-
-		// 		const typeSelect = wrapper.findComponent(VSelect);
-		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
-		// 		await nextTick();
-		// 		expect(typeSelect.find("input").element.value).toBe(selectOption.id);
-
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
-		// 		expect(fileNameInput.element.value).toBe("");
-
-		// 		const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-		// 		await form.trigger("submit");
-		// 		await nextTick();
-		// 		await flushPromises();
-		// 		expect(selectOption.action).toHaveBeenCalledTimes(0);
-		// 	});
-
-		// 	it("should have confirm button disabled", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-
-		// 		const typeSelect = wrapper.findComponent(VSelect);
-		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
-		// 		await nextTick();
-
-		// 		const dialog = wrapper.findComponent(Dialog);
-		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		// 	});
-		// });
-
-		// describe("when filename contains invalid characters", () => {
-		// 	it("should have confirm button disabled", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-
-		// 		const typeSelect = wrapper.findComponent(VSelect);
-		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
-		// 		await nextTick();
-
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-		// 		await fileNameInput.find("input").setValue("invalid/filename");
-		// 		await nextTick();
-
-		// 		const dialog = wrapper.findComponent(Dialog);
-		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		// 	});
-		// });
+		describe("when filename is empty", () => {
+			it("should not emit event", async () => {
+				const { wrapper } = await setup();
 
-		// describe("when caption contains opening tag", () => {
-		// 	it("should have confirm button disabled", async () => {
-		// 		const { collaboraFileSelectionOptions, wrapper } = await setup();
+				const typeSelect = wrapper.findComponent(VSelect);
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
+				await nextTick();
 
-		// 		const selectOption = collaboraFileSelectionOptions[0];
-
-		// 		const typeSelect = wrapper.findComponent(VSelect);
-		// 		typeSelect.vm.$emit("update:modelValue", selectOption.id);
-		// 		await nextTick();
-
-		// 		const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-		// 		await fileNameInput.find("input").setValue("validFilename");
-		// 		await nextTick();
-
-		// 		const captionInput = wrapper.findComponent("[data-testid='collabora-element-form-caption']");
-		// 		await captionInput.find("textarea").setValue("<script>alert('xss')</script>");
-		// 		await nextTick();
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
+				expect(fileNameInput.element.value).toBe("");
 
-		// 		const dialog = wrapper.findComponent(Dialog);
-		// 		expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		// 	});
-		// });
+				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				await form.trigger("submit");
+				await nextTick();
+				await flushPromises();
+				expect(wrapper.emitted("create-collabora-file")).toBeFalsy();
+			});
+
+			it("should have confirm button disabled", async () => {
+				const { wrapper } = await setup();
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(true);
+			});
+		});
+
+		describe("when filename contains invalid characters", () => {
+			it("should have confirm button disabled", async () => {
+				const { wrapper } = await setup();
+
+				const typeSelect = wrapper.findComponent(VSelect);
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
+				await nextTick();
+
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				await fileNameInput.find("input").setValue("invalid/filename");
+				await nextTick();
+
+				const dialog = wrapper.findComponent(Dialog);
+				expect(dialog.props("confirmBtnDisabled")).toBe(true);
+			});
+		});
 
 		it("should close modal on close button click", async () => {
 			const { closeCollaboraFileDialog, wrapper } = await setup();

From 4999476df0a5aedf85d4180e2ff644f45c4ba417 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 14:57:48 +0100
Subject: [PATCH 089/100] Cleanup lang keys

---
 src/locales/de.ts                              | 18 ++++++------------
 src/locales/en.ts                              | 18 ++++++------------
 src/locales/es.ts                              | 18 ++++++------------
 src/locales/uk.ts                              | 18 ++++++------------
 .../components/AddCollaboraFileDialog.vue      | 12 ++++++------
 5 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index 8afd1dee37..599cc0578c 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -539,8 +539,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Hier ist ein Bild mit folgendem Namen",
 	"components.cardElement.fileElement.pdfAlt": "Vorschaubild für ",
 	"components.cardElement.fileElement.collaboraFile": "Dokument",
-	"components.cardElement.fileElement.collaboraFile.types": "Dokumententyp",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Unbenanntes Dokument",
 	"components.cardElement.fileElement.previewError": "Laden der Vorschau fehlgeschlagen.",
 	"components.cardElement.fileElement.reloadStatus": "Status aktualisieren",
 	"components.cardElement.fileElement.videoFormatError":
@@ -591,10 +589,6 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Text",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Videokonferenz",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Interaktives Lernelement",
-	"components.elementTypeSelection.elements.collabora.subtitle": "Dokument erstellen",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (Text)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (Tabelle)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (Präsentation)",
 	"components.externalTools.status.deactivated": "Deaktiviert",
 	"components.externalTools.status.incomplete": "Unvollständig",
 	"components.externalTools.status.latest": "Aktuell",
@@ -2012,6 +2006,12 @@ export default {
 	"feature.media-shelf.layout.list": "Zeilen",
 	"feature.media-shelf.layout.grid": "Raster",
 	"feature.collabora.iframeTitle": "Office-Dokument Editor",
+	"feature.collabora.add-collabora-file-dialog.title": "Dokument erstellen",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Dokumententyp",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Unbenanntes Dokument",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Text)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Tabelle)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Präsentation)",
 	"pages.folder.emptyState": "Aktuell gibt es hier noch keine Dateien",
 	"pages.folder.fab.title": "Datei hinzufügen",
 	"pages.folder.untitled": "Unbenannter Ordner",
@@ -2032,10 +2032,4 @@ export default {
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Der Dateiname enthält ungültige Zeichen.",
 	"pages.folder.fab.upload-file": "Datei hochladen",
 	"pages.folder.fab.create-document": "Dokument erstellen",
-	"pages.folder.add-collabora-file-dialog.title": "Dokument erstellen",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Dokumententyp",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Unbenanntes Dokument",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Text)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Tabelle)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Präsentation)",
 };
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 46481ed183..c44b4fa87d 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -525,8 +525,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Here is an image with the following name",
 	"components.cardElement.fileElement.pdfAlt": "Preview image for ",
 	"components.cardElement.fileElement.collaboraFile": "Document",
-	"components.cardElement.fileElement.collaboraFile.types": "Document type",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Untitled document",
 	"components.cardElement.fileElement.previewError": "Failed to load the preview.",
 	"components.cardElement.fileElement.reloadStatus": "Update status",
 	"components.cardElement.fileElement.videoFormatError":
@@ -578,10 +576,6 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Text",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Video conference",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Interactive learning element",
-	"components.elementTypeSelection.elements.collabora.subtitle": "Create document",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (text)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (spreadsheet)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (presentation)",
 	"components.externalTools.status.deactivated": "Deactivated",
 	"components.externalTools.status.incomplete": "Configuration incomplete",
 	"components.externalTools.status.latest": "Latest",
@@ -1977,6 +1971,12 @@ export default {
 	"feature.media-shelf.layout.list": "Lines",
 	"feature.media-shelf.layout.grid": "Grid",
 	"feature.collabora.iframeTitle": "Office document editor",
+	"feature.collabora.add-collabora-file-dialog.title": "Create document",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Document type",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Untitled document",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Text)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Spreadsheet)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Presentation)",
 	"pages.folder.emptyState": "There are currently no files here",
 	"pages.folder.fab.title": "Add file",
 	"pages.folder.untitled": "Untitled folder",
@@ -1997,10 +1997,4 @@ export default {
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "The file name contains invalid characters.",
 	"pages.folder.fab.upload-file": "Upload file",
 	"pages.folder.fab.create-document": "Create document",
-	"pages.folder.add-collabora-file-dialog.title": "Create document",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Document type",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Untitled document",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Text)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Spreadsheet)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Presentation)",
 };
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 3af3e3aba5..2f78c1f508 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -534,8 +534,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Aquí tenéis una imagen con el siguiente nombre",
 	"components.cardElement.fileElement.pdfAlt": "Imagen de vista previa para ",
 	"components.cardElement.fileElement.collaboraFile": "Archivo",
-	"components.cardElement.fileElement.collaboraFile.types": "Tipo de documento",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Documento sin título",
 	"components.cardElement.fileElement.previewError": "No se ha podido cargar la vista previa.",
 	"components.cardElement.fileElement.reloadStatus": "Estado de actualización",
 	"components.cardElement.fileElement.videoFormatError":
@@ -587,10 +585,6 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Texto",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Videoconferencia",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Elemento de aprendizaje interactivo",
-	"components.elementTypeSelection.elements.collabora.subtitle": "Crear documento",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (Texto)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (Hoja de cálculo)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (Presentación)",
 	"components.externalTools.status.deactivated": "Desactivado",
 	"components.externalTools.status.incomplete": "Configuración incompleta",
 	"components.externalTools.status.latest": "Actual",
@@ -2027,6 +2021,12 @@ export default {
 	"feature.media-shelf.layout.list": "Líneas",
 	"feature.media-shelf.layout.grid": "Red",
 	"feature.collabora.iframeTitle": "Editor de documentos de Office",
+	"feature.collabora.add-collabora-file-dialog.title": "Crear documento",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Tipo de documento",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Documento sin título",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Texto)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Hoja de cálculo)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Presentación)",
 	"pages.folder.emptyState": "Actualmente no hay archivos aquí",
 	"pages.folder.fab.title": "Añadir archivo",
 	"pages.folder.untitled": "Carpeta sin título",
@@ -2048,10 +2048,4 @@ export default {
 		"El nombre del archivo contiene caracteres no válidos.",
 	"pages.folder.fab.upload-file": "Subir archivo",
 	"pages.folder.fab.create-document": "Crear documento",
-	"pages.folder.add-collabora-file-dialog.title": "Crear documento",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Tipo de documento",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Documento sin título",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Texto)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Hoja de cálculo)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Presentación)",
 };
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index 02105bc8c5..02a1b59e1b 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -534,8 +534,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Ось зображення з такою назвою",
 	"components.cardElement.fileElement.pdfAlt": "попередній перегляд зображення для ",
 	"components.cardElement.fileElement.collaboraFile": "Документ",
-	"components.cardElement.fileElement.collaboraFile.types": "Тип документа",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Без назви документ",
 	"components.cardElement.fileElement.previewError": "Не вдалося завантажити попередній перегляд.",
 	"components.cardElement.fileElement.reloadStatus": "Статус оновлення",
 	"components.cardElement.fileElement.videoFormatError":
@@ -587,10 +585,6 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Текст",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Відеоконференція",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Інтерактивний елемент навчання",
-	"components.elementTypeSelection.elements.collabora.subtitle": "Створити документ",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (Документ)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (Таблиця)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (Презентація)",
 	"components.externalTools.status.deactivated": "Деактивовано",
 	"components.externalTools.status.incomplete": "Конфігурація не завершена",
 	"components.externalTools.status.latest": "Останній",
@@ -1996,6 +1990,12 @@ export default {
 	"feature.media-shelf.layout.list": "лінії",
 	"feature.media-shelf.layout.grid": "сітка",
 	"feature.collabora.iframeTitle": "Редактор документів Office",
+	"feature.collabora.add-collabora-file-dialog.title": "Створити документ",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Тип документа",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Без назви документ",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Документ)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Таблиця)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Презентація)",
 	"pages.folder.emptyState": "Наразі тут немає файлів",
 	"pages.folder.fab.title": "Додати файл",
 	"pages.folder.untitled": "Папка без назви",
@@ -2016,10 +2016,4 @@ export default {
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Ім'я файлу містить недопустимі символи.",
 	"pages.folder.fab.upload-file": "Завантажити файл",
 	"pages.folder.fab.create-document": "Створити документ",
-	"pages.folder.add-collabora-file-dialog.title": "Створити документ",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Тип документа",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Без назви документ",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Документ)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Таблиця)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Презентація)",
 };
diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index b11114adab..1bc8cbc37d 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -1,7 +1,7 @@
 <template>
 	<Dialog
 		v-model:is-dialog-open="isCollaboraFileDialogOpen"
-		:message="t('components.elementTypeSelection.elements.collabora.subtitle')"
+		:message="t('feature.collabora.add-collabora-file-dialog.title')"
 		:confirm-btn-disabled="!isFormValid"
 		confirm-btn-lang-key="common.actions.create"
 		data-testid="collabora-element-dialog"
@@ -15,7 +15,7 @@
 					v-model="selectedDocType"
 					:items="collaboraFileSelectionOptions"
 					persistent-hint
-					:label="t('components.cardElement.fileElement.collaboraFile.types')"
+					:label="t('feature.collabora.add-collabora-file-dialog.doc-types')"
 					:rules="docTypeRules"
 					:menu-props="{ attach: '#officeFileForm' }"
 					data-testid="collabora-element-form-type"
@@ -24,7 +24,7 @@
 					v-model="fileName"
 					:label="t('common.labels.fileName')"
 					:rules="fileNameRules"
-					:placeholder="t('components.cardElement.fileElement.collaboraFile.untitled')"
+					:placeholder="t('feature.collabora.add-collabora-file-dialog.untitled-file')"
 					data-testid="collabora-element-form-filename"
 				/>
 			</VForm>
@@ -69,15 +69,15 @@ const passesAllRules = (value: string, rules: ((value: string) => true | string)
 
 const collaboraFileSelectionOptions = [
 	{
-		title: t("components.elementTypeSelection.elements.collabora.option.text"),
+		title: t("feature.collabora.add-collabora-file-dialog.option.text"),
 		value: CollaboraFileType.Text,
 	},
 	{
-		title: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
+		title: t("feature.collabora.add-collabora-file-dialog.option.spreadsheet"),
 		value: CollaboraFileType.Spreadsheet,
 	},
 	{
-		title: t("components.elementTypeSelection.elements.collabora.option.presentation"),
+		title: t("feature.collabora.add-collabora-file-dialog.option.presentation"),
 		value: CollaboraFileType.Presentation,
 	},
 ];

From 7383534491db129fc3a6c2e1b8f06ff2c363abdf Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 15:03:41 +0100
Subject: [PATCH 090/100] Add test for failing upload

---
 src/modules/feature/folder/Folder.unit.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 5abc02f9d9..cf96b8a434 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1379,6 +1379,22 @@ describe("Folder.vue", () => {
 
 				expect(windowOpenSpy).toHaveBeenCalled();
 			});
+
+			describe("and upload fails", () => {
+				it("should not open new tab", async () => {
+					const { wrapper, windowOpenSpy, fileStorageApiMock } = await setup();
+
+					fileStorageApiMock.uploadCollaboraFile.mockRejectedValueOnce(new Error("Upload failed"));
+
+					const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+					await collaboraFileDialog.vm.$emit("create-collabora-file", {
+						type: CollaboraFileType.Text,
+						fileName: "myDoc",
+					});
+
+					expect(windowOpenSpy).not.toHaveBeenCalled();
+				});
+			});
 		});
 
 		describe("when fab button is clicked, file upload is chosen, files are selected and upload succeed", () => {

From 0cf703a1d7b047d7ab26ad750835cf6e294c48e0 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 15:11:07 +0100
Subject: [PATCH 091/100] Add @onCreateCollaboraFile test

---
 src/modules/feature/board/board/Board.unit.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/modules/feature/board/board/Board.unit.ts b/src/modules/feature/board/board/Board.unit.ts
index 7b4d911f76..0c1397904c 100644
--- a/src/modules/feature/board/board/Board.unit.ts
+++ b/src/modules/feature/board/board/Board.unit.ts
@@ -36,6 +36,8 @@ import {
 	useCardStore,
 	useSharedBoardPageInformation,
 } from "@data-board";
+import { CollaboraFileType } from "@data-file";
+import { AddCollaboraFileDialog } from "@feature-collabora";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { SelectBoardLayoutDialog } from "@ui-room-details";
@@ -1045,6 +1047,20 @@ describe("Board", () => {
 				);
 			});
 		});
+
+		describe("@onCreateCollaboraFile", () => {
+			it("should call createFileElementWithCollabora method", async () => {
+				const { wrapper, cardStore } = setup();
+
+				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+				await collaboraFileDialog.vm.$emit("create-collabora-file", {
+					type: CollaboraFileType.Text,
+					fileName: "myDoc",
+				});
+
+				expect(cardStore.createFileElementWithCollabora).toHaveBeenCalled();
+			});
+		});
 	});
 
 	describe("Change board layout", () => {

From 4463721cf7aca7b4d545a598128ff1f9a2ac633f Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 15:39:41 +0100
Subject: [PATCH 092/100] Testing failing upload

---
 src/modules/feature/folder/Folder.unit.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index cf96b8a434..1ee957aaba 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1384,7 +1384,7 @@ describe("Folder.vue", () => {
 				it("should not open new tab", async () => {
 					const { wrapper, windowOpenSpy, fileStorageApiMock } = await setup();
 
-					fileStorageApiMock.uploadCollaboraFile.mockRejectedValueOnce(new Error("Upload failed"));
+					fileStorageApiMock.uploadCollaboraFile.mockReturnValueOnce(undefined);
 
 					const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
 					await collaboraFileDialog.vm.$emit("create-collabora-file", {

From 1041d88b57cda49bd53698d101b3ba92f27b3601 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Thu, 4 Dec 2025 16:23:54 +0100
Subject: [PATCH 093/100] Add card store tests

---
 src/modules/data/board/Card.store.unit.ts | 37 ++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 0240c26b22..9c6c559966 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -19,7 +19,7 @@ import { cardResponseFactory } from "@@/tests/test-utils/factory/cardResponseFac
 import { drawingElementResponseFactory } from "@@/tests/test-utils/factory/drawingElementResponseFactory";
 import { useNotificationStore } from "@data-app";
 import { CreateElementRequestPayload, useCardStore, useSocketConnection } from "@data-board";
-import { useFileStorageApi } from "@data-file";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
@@ -64,7 +64,7 @@ describe("CardStore", () => {
 	let editModeId: Ref<string | undefined>;
 	let latestEditModeId: Ref<string | undefined>;
 	let mockedBoardFocusCalls: DeepMocked<ReturnType<typeof useBoardFocusHandler>>;
-	let mockedFileStorageApi: DeepMocked<ReturnType<typeof useFileStorageApi>>;
+	let mockedFileStorageActions: DeepMocked<ReturnType<typeof useFileStorageApi>>;
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
@@ -116,8 +116,10 @@ describe("CardStore", () => {
 		mockedBoardFocusCalls = createMock<ReturnType<typeof useBoardFocusHandler>>();
 		mockedBoardFocusHandler.mockReturnValue(mockedBoardFocusCalls);
 
-		mockedFileStorageApi = createMock<ReturnType<typeof useFileStorageApi>>();
-		mockedUseFileStorageApi.mockReturnValue(mockedFileStorageApi);
+		mockedFileStorageActions = createMock<ReturnType<typeof useFileStorageApi>>({
+			uploadCollaboraFile: vi.fn(),
+		});
+		mockedUseFileStorageApi.mockReturnValue(mockedFileStorageActions);
 
 		setEditModeId = vi.fn();
 		editModeId = ref(undefined);
@@ -981,4 +983,31 @@ describe("CardStore", () => {
 			});
 		});
 	});
+
+	describe("createFileElementWithCollabora", () => {
+		it("should call createElementRequest", () => {
+			const { cardStore } = setup(false);
+
+			latestEditModeId.value = "cardId";
+			cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+			expect(mockedCardRestApiActions.createElementRequest).toHaveBeenCalled();
+		});
+
+		it("should call uploadCollaboraFile", async () => {
+			const { cardStore } = setup(false);
+
+			latestEditModeId.value = "cardId";
+			mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
+				Promise.resolve({
+					id: "elementId",
+					type: ContentElementType.File,
+					content: {},
+				})
+			);
+			await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+			expect(mockedFileStorageActions.uploadCollaboraFile).toHaveBeenCalled();
+		});
+	});
 });

From 36d8179b4add2456e2e82f55db26e1c61217311f Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 5 Dec 2025 08:28:26 +0100
Subject: [PATCH 094/100] Readd lang key

---
 src/locales/de.ts | 1 +
 src/locales/en.ts | 1 +
 src/locales/es.ts | 1 +
 src/locales/uk.ts | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/locales/de.ts b/src/locales/de.ts
index 599cc0578c..097f837c55 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -589,6 +589,7 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Text",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Videokonferenz",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Interaktives Lernelement",
+	"components.elementTypeSelection.elements.collabora.subtitle": "Dokument erstellen",
 	"components.externalTools.status.deactivated": "Deaktiviert",
 	"components.externalTools.status.incomplete": "Unvollständig",
 	"components.externalTools.status.latest": "Aktuell",
diff --git a/src/locales/en.ts b/src/locales/en.ts
index c44b4fa87d..ff1b43992b 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -576,6 +576,7 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Text",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Video conference",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Interactive learning element",
+	"components.elementTypeSelection.elements.collabora.subtitle": "Create document",
 	"components.externalTools.status.deactivated": "Deactivated",
 	"components.externalTools.status.incomplete": "Configuration incomplete",
 	"components.externalTools.status.latest": "Latest",
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 2f78c1f508..c4f5a0aa42 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -585,6 +585,7 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Texto",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Videoconferencia",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Elemento de aprendizaje interactivo",
+	"components.elementTypeSelection.elements.collabora.subtitle": "Crear documento",
 	"components.externalTools.status.deactivated": "Desactivado",
 	"components.externalTools.status.incomplete": "Configuración incompleta",
 	"components.externalTools.status.latest": "Actual",
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index 02a1b59e1b..a44887b332 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -585,6 +585,7 @@ export default {
 	"components.elementTypeSelection.elements.textElement.subtitle": "Текст",
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Відеоконференція",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Інтерактивний елемент навчання",
+	"components.elementTypeSelection.elements.collabora.subtitle": "Створити документ",
 	"components.externalTools.status.deactivated": "Деактивовано",
 	"components.externalTools.status.incomplete": "Конфігурація не завершена",
 	"components.externalTools.status.latest": "Останній",

From 37a6909135005fcf52b0144c411c765fa4ea3efd Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 5 Dec 2025 08:28:38 +0100
Subject: [PATCH 095/100] Fix click behaviour

---
 src/modules/data/board/Board.store.unit.ts                | 1 -
 src/modules/data/board/Card.store.ts                      | 8 ++++----
 src/modules/data/board/Card.store.unit.ts                 | 7 ++-----
 .../board/boardActions/boardRestApi.composable.unit.ts    | 1 -
 .../data/board/boardActions/moveCardSuccess.unit.ts       | 1 -
 .../data/board/cardActions/cardRestApi.composable.unit.ts | 1 -
 src/modules/feature/board/board/Board.unit.ts             | 1 -
 src/modules/feature/board/card/CardHost.unit.ts           | 1 -
 .../collabora/components/AddCollaboraFileDialog.vue       | 1 +
 src/modules/util/board/editMode.composable.ts             | 5 -----
 10 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/modules/data/board/Board.store.unit.ts b/src/modules/data/board/Board.store.unit.ts
index c0a5fc6592..808fa647ae 100644
--- a/src/modules/data/board/Board.store.unit.ts
+++ b/src/modules/data/board/Board.store.unit.ts
@@ -95,7 +95,6 @@ describe("BoardStore", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
-			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/data/board/Card.store.ts b/src/modules/data/board/Card.store.ts
index 50e91a0f5e..454aa4550c 100644
--- a/src/modules/data/board/Card.store.ts
+++ b/src/modules/data/board/Card.store.ts
@@ -36,7 +36,7 @@ export const useCardStore = defineStore("cardStore", () => {
 	const socketOrRest = isSocketEnabled ? useCardSocketApi() : restApi;
 
 	const { setFocus, forceFocus } = useBoardFocusHandler();
-	const { setEditModeId, editModeId, latestEditModeId } = useSharedEditMode();
+	const { setEditModeId, editModeId } = useSharedEditMode();
 	const { uploadCollaboraFile } = useFileStorageApi();
 
 	const fetchCardRequest = socketOrRest.fetchCardRequest;
@@ -113,13 +113,13 @@ export const useCardStore = defineStore("cardStore", () => {
 	const createElementRequest = socketOrRest.createElementRequest;
 
 	const createFileElementWithCollabora = async (type: CollaboraFileType, fileName: string) => {
-		if (!latestEditModeId.value) {
+		if (!editModeId.value) {
 			return;
 		}
 
 		const element = await createElementRequest({
 			type: ContentElementType.File,
-			cardId: latestEditModeId.value,
+			cardId: editModeId.value,
 		});
 		if (!element) {
 			return;
@@ -128,7 +128,7 @@ export const useCardStore = defineStore("cardStore", () => {
 		try {
 			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
 		} catch {
-			await deleteElementRequest({ elementId: element.id, cardId: latestEditModeId.value });
+			await deleteElementRequest({ elementId: element.id, cardId: editModeId.value });
 		}
 	};
 
diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 9c6c559966..96d6c367f1 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -62,7 +62,6 @@ describe("CardStore", () => {
 	let mockedSharedLastCreatedElementActions: DeepMocked<ReturnType<typeof useSharedLastCreatedElement>>;
 	let setEditModeId: Mock;
 	let editModeId: Ref<string | undefined>;
-	let latestEditModeId: Ref<string | undefined>;
 	let mockedBoardFocusCalls: DeepMocked<ReturnType<typeof useBoardFocusHandler>>;
 	let mockedFileStorageActions: DeepMocked<ReturnType<typeof useFileStorageApi>>;
 
@@ -123,11 +122,9 @@ describe("CardStore", () => {
 
 		setEditModeId = vi.fn();
 		editModeId = ref(undefined);
-		latestEditModeId = ref(undefined);
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId,
-			latestEditModeId,
 			isInEditMode: computed(() => true),
 		});
 	});
@@ -988,7 +985,7 @@ describe("CardStore", () => {
 		it("should call createElementRequest", () => {
 			const { cardStore } = setup(false);
 
-			latestEditModeId.value = "cardId";
+			editModeId.value = "cardId";
 			cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
 			expect(mockedCardRestApiActions.createElementRequest).toHaveBeenCalled();
@@ -997,7 +994,7 @@ describe("CardStore", () => {
 		it("should call uploadCollaboraFile", async () => {
 			const { cardStore } = setup(false);
 
-			latestEditModeId.value = "cardId";
+			editModeId.value = "cardId";
 			mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
 				Promise.resolve({
 					id: "elementId",
diff --git a/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts b/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts
index 30edba2652..960af2d5ee 100644
--- a/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts
+++ b/src/modules/data/board/boardActions/boardRestApi.composable.unit.ts
@@ -65,7 +65,6 @@ describe("boardRestApi", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
-			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/data/board/boardActions/moveCardSuccess.unit.ts b/src/modules/data/board/boardActions/moveCardSuccess.unit.ts
index 0af90ef060..bdcb6ccb4c 100644
--- a/src/modules/data/board/boardActions/moveCardSuccess.unit.ts
+++ b/src/modules/data/board/boardActions/moveCardSuccess.unit.ts
@@ -90,7 +90,6 @@ describe("BoardStore - moveCardSuccess", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
-			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts b/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts
index 1420cfda1c..8b40b8a971 100644
--- a/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts
+++ b/src/modules/data/board/cardActions/cardRestApi.composable.unit.ts
@@ -98,7 +98,6 @@ describe("useCardRestApi", () => {
 		mockedSharedEditMode.mockReturnValue({
 			setEditModeId,
 			editModeId: ref(undefined),
-			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/feature/board/board/Board.unit.ts b/src/modules/feature/board/board/Board.unit.ts
index 0c1397904c..43ac835df6 100644
--- a/src/modules/feature/board/board/Board.unit.ts
+++ b/src/modules/feature/board/board/Board.unit.ts
@@ -101,7 +101,6 @@ describe("Board", () => {
 		mockedUseSharedEditMode.mockReturnValue({
 			editModeId: ref(undefined),
 			setEditModeId: vi.fn(),
-			latestEditModeId: ref(undefined),
 			isInEditMode: computed(() => true),
 		});
 
diff --git a/src/modules/feature/board/card/CardHost.unit.ts b/src/modules/feature/board/card/CardHost.unit.ts
index 229cf3cc45..3263d206f6 100644
--- a/src/modules/feature/board/card/CardHost.unit.ts
+++ b/src/modules/feature/board/card/CardHost.unit.ts
@@ -50,7 +50,6 @@ describe("CardHost", () => {
 	beforeEach(() => {
 		mockedUseSharedEditMode.mockReturnValue({
 			editModeId: ref(undefined),
-			latestEditModeId: ref(undefined),
 			setEditModeId: vi.fn(),
 			isInEditMode: computed(() => true),
 		});
diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index 1bc8cbc37d..20638c1abe 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -7,6 +7,7 @@
 		data-testid="collabora-element-dialog"
 		@cancel="onCancel"
 		@confirm="onConfirm"
+		@click.stop
 	>
 		<template #content>
 			<VForm id="officeFileForm" ref="form" data-testid="collabora-element-form" @submit.prevent="onConfirm">
diff --git a/src/modules/util/board/editMode.composable.ts b/src/modules/util/board/editMode.composable.ts
index 7587a69453..9fd85ff626 100644
--- a/src/modules/util/board/editMode.composable.ts
+++ b/src/modules/util/board/editMode.composable.ts
@@ -54,20 +54,15 @@ const useEditMode = (id: string, permissions: EditModePermissions = { hasEditPer
  */
 const sharedEditMode = () => {
 	const editModeId: Ref<string | undefined> = ref(undefined);
-	const latestEditModeId: Ref<string | undefined> = ref(undefined);
 
 	const setEditModeId = (id: string | undefined): void => {
 		editModeId.value = id;
-		if (id) {
-			latestEditModeId.value = id;
-		}
 	};
 
 	const isInEditMode: ComputedRef<boolean> = computed(() => editModeId.value !== undefined);
 
 	return {
 		editModeId,
-		latestEditModeId,
 		setEditModeId,
 		isInEditMode,
 	};

From c56b5a069e60c7bda8be30d67b4ee09ba4963c61 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 5 Dec 2025 09:24:32 +0100
Subject: [PATCH 096/100] Improve event handling

---
 .../components/AddCollaboraFileDialog.unit.ts | 38 ++++++++++++++++++-
 .../components/AddCollaboraFileDialog.vue     |  1 +
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
index 65b3e2bab3..d1c0e7ad11 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
@@ -4,7 +4,7 @@ import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/set
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
 import { nextTick, ref } from "vue";
-import { VForm, VSelect } from "vuetify/lib/components/index";
+import { VForm, VSelect, VTextField } from "vuetify/lib/components/index";
 
 vi.mock("../composables/add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
@@ -216,5 +216,41 @@ describe("CollaboraFileDialog", () => {
 
 			expect(closeCollaboraFileDialog).toHaveBeenCalled();
 		});
+
+		it("should stop click event propagation", async () => {
+			const { wrapper } = await setup();
+			const textField = wrapper.findComponent(VTextField);
+
+			const parent = document.createElement("div");
+			document.body.appendChild(parent);
+			parent.appendChild(wrapper.element);
+
+			let bubbled = false;
+			parent.addEventListener("click", () => {
+				bubbled = true;
+			});
+
+			await textField.trigger("click");
+			expect(bubbled).toBe(false);
+		});
+
+		it("should stop keydown enter event propagation", async () => {
+			const { wrapper } = await setup();
+			const textField = wrapper.findComponent(VTextField);
+
+			const parent = document.createElement("div");
+			document.body.appendChild(parent);
+			parent.appendChild(wrapper.element);
+
+			let bubbled = false;
+			parent.addEventListener("keydown", (e) => {
+				if (e.key === "Enter") {
+					bubbled = true;
+				}
+			});
+
+			await textField.trigger("keydown", { key: "Enter" });
+			expect(bubbled).toBe(false);
+		});
 	});
 });
diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index 20638c1abe..82654904a7 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -8,6 +8,7 @@
 		@cancel="onCancel"
 		@confirm="onConfirm"
 		@click.stop
+		@keydown.enter.stop
 	>
 		<template #content>
 			<VForm id="officeFileForm" ref="form" data-testid="collabora-element-form" @submit.prevent="onConfirm">

From 9f4c430ba3bb10841ef152ae2225ea2c510a33e3 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 5 Dec 2025 10:28:11 +0100
Subject: [PATCH 097/100] Cleanup test

---
 .../components/AddCollaboraFileDialog.unit.ts | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
index d1c0e7ad11..65b3e2bab3 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
@@ -4,7 +4,7 @@ import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/set
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
 import { nextTick, ref } from "vue";
-import { VForm, VSelect, VTextField } from "vuetify/lib/components/index";
+import { VForm, VSelect } from "vuetify/lib/components/index";
 
 vi.mock("../composables/add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
@@ -216,41 +216,5 @@ describe("CollaboraFileDialog", () => {
 
 			expect(closeCollaboraFileDialog).toHaveBeenCalled();
 		});
-
-		it("should stop click event propagation", async () => {
-			const { wrapper } = await setup();
-			const textField = wrapper.findComponent(VTextField);
-
-			const parent = document.createElement("div");
-			document.body.appendChild(parent);
-			parent.appendChild(wrapper.element);
-
-			let bubbled = false;
-			parent.addEventListener("click", () => {
-				bubbled = true;
-			});
-
-			await textField.trigger("click");
-			expect(bubbled).toBe(false);
-		});
-
-		it("should stop keydown enter event propagation", async () => {
-			const { wrapper } = await setup();
-			const textField = wrapper.findComponent(VTextField);
-
-			const parent = document.createElement("div");
-			document.body.appendChild(parent);
-			parent.appendChild(wrapper.element);
-
-			let bubbled = false;
-			parent.addEventListener("keydown", (e) => {
-				if (e.key === "Enter") {
-					bubbled = true;
-				}
-			});
-
-			await textField.trigger("keydown", { key: "Enter" });
-			expect(bubbled).toBe(false);
-		});
 	});
 });

From 13e510e14c36bfbcaf88d8bef511eb69231a9aa3 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 5 Dec 2025 11:02:46 +0100
Subject: [PATCH 098/100] Cover errors in tests

---
 src/modules/data/board/Card.store.ts      |   5 +-
 src/modules/data/board/Card.store.unit.ts | 109 ++++++++++++++++++----
 2 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/src/modules/data/board/Card.store.ts b/src/modules/data/board/Card.store.ts
index 454aa4550c..adaaa51545 100644
--- a/src/modules/data/board/Card.store.ts
+++ b/src/modules/data/board/Card.store.ts
@@ -125,9 +125,8 @@ export const useCardStore = defineStore("cardStore", () => {
 			return;
 		}
 
-		try {
-			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
-		} catch {
+		const uploadedCollaboraFile = await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
+		if (!uploadedCollaboraFile) {
 			await deleteElementRequest({ elementId: element.id, cardId: editModeId.value });
 		}
 	};
diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 96d6c367f1..00ec78f016 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -23,6 +23,7 @@ import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
+import { flushPromises } from "@vue/test-utils";
 import { cloneDeep } from "lodash-es";
 import { createPinia, setActivePinia } from "pinia";
 import type { Mock } from "vitest";
@@ -51,7 +52,7 @@ vi.mock("./BoardFocusHandler.composable");
 const mockedBoardFocusHandler = vi.mocked(useBoardFocusHandler);
 
 vi.mock("@data-file");
-const mockedUseFileStorageApi = vi.mocked(useFileStorageApi);
+const mockedFileStorageApi = vi.mocked(useFileStorageApi);
 
 describe("CardStore", () => {
 	let mockedBoardApiCalls: DeepMocked<ReturnType<typeof useBoardApi>>;
@@ -118,7 +119,7 @@ describe("CardStore", () => {
 		mockedFileStorageActions = createMock<ReturnType<typeof useFileStorageApi>>({
 			uploadCollaboraFile: vi.fn(),
 		});
-		mockedUseFileStorageApi.mockReturnValue(mockedFileStorageActions);
+		mockedFileStorageApi.mockReturnValue(mockedFileStorageActions);
 
 		setEditModeId = vi.fn();
 		editModeId = ref(undefined);
@@ -982,29 +983,97 @@ describe("CardStore", () => {
 	});
 
 	describe("createFileElementWithCollabora", () => {
-		it("should call createElementRequest", () => {
-			const { cardStore } = setup(false);
+		describe("when a card is in edit mode", () => {
+			it("should call createElementRequest", () => {
+				const { cardStore } = setup(false);
+
+				editModeId.value = "cardId";
+				mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
+					Promise.resolve({
+						id: "elementId",
+						type: ContentElementType.File,
+						content: {},
+					})
+				);
+				mockedFileStorageActions.uploadCollaboraFile.mockReturnValueOnce(Promise.resolve({ id: "fileId" }));
+				cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedCardRestApiActions.createElementRequest).toHaveBeenCalled();
+			});
+
+			it("should call uploadCollaboraFile", async () => {
+				const { cardStore } = setup(false);
+
+				editModeId.value = "cardId";
+				mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
+					Promise.resolve({
+						id: "elementId",
+						type: ContentElementType.File,
+						content: {},
+					})
+				);
+				mockedFileStorageActions.uploadCollaboraFile.mockReturnValueOnce(Promise.resolve({ id: "fileId" }));
+				await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedFileStorageActions.uploadCollaboraFile).toHaveBeenCalled();
+			});
+
+			describe("when element creation fails", () => {
+				it("should not call uploadCollaboraFile", async () => {
+					const { cardStore } = setup(false);
+
+					editModeId.value = "cardId";
+					mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(undefined);
+					await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
-			editModeId.value = "cardId";
-			cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+					expect(mockedFileStorageActions.uploadCollaboraFile).not.toHaveBeenCalled();
+				});
+			});
 
-			expect(mockedCardRestApiActions.createElementRequest).toHaveBeenCalled();
+			describe("when uploading collabora file fails", () => {
+				it("should delete created element", async () => {
+					const { cardStore } = setup(false);
+
+					editModeId.value = "cardId";
+					mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
+						Promise.resolve({
+							id: "elementId",
+							type: ContentElementType.File,
+							content: {},
+						})
+					);
+					mockedFileStorageActions.uploadCollaboraFile.mockReturnValueOnce(Promise.resolve(undefined));
+					await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+					await flushPromises();
+
+					expect(mockedCardRestApiActions.deleteElementRequest).toHaveBeenCalled();
+				});
+			});
 		});
 
-		it("should call uploadCollaboraFile", async () => {
-			const { cardStore } = setup(false);
+		describe("when no card is in edit mode", () => {
+			it("should not call createElementRequest", () => {
+				const { cardStore } = setup(false);
+
+				cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
-			editModeId.value = "cardId";
-			mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
-				Promise.resolve({
-					id: "elementId",
-					type: ContentElementType.File,
-					content: {},
-				})
-			);
-			await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
-
-			expect(mockedFileStorageActions.uploadCollaboraFile).toHaveBeenCalled();
+				expect(mockedCardRestApiActions.createElementRequest).not.toHaveBeenCalled();
+			});
+
+			it("should not call uploadCollaboraFile", async () => {
+				const { cardStore } = setup(false);
+
+				mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
+					Promise.resolve({
+						id: "elementId",
+						type: ContentElementType.File,
+						content: {},
+					})
+				);
+				await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedFileStorageActions.uploadCollaboraFile).not.toHaveBeenCalled();
+			});
 		});
 	});
 });

From c385c1d7f0831878eb2133a7ecf8cd7fc315ca92 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Fri, 5 Dec 2025 11:50:37 +0100
Subject: [PATCH 099/100] Adjust wordings and ids

---
 .../components/AddCollaboraFileDialog.unit.ts | 20 +++++++++----------
 .../components/AddCollaboraFileDialog.vue     | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
index 65b3e2bab3..c20e3a8d26 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
@@ -88,7 +88,7 @@ describe("CollaboraFileDialog", () => {
 		});
 
 		describe("when form is valid", () => {
-			it("should call emit event", async () => {
+			it("should emit event", async () => {
 				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
@@ -98,11 +98,11 @@ describe("CollaboraFileDialog", () => {
 				expect(typeSelect.find("input").element.value).toBe(selectOptions[0].value);
 
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
@@ -118,7 +118,7 @@ describe("CollaboraFileDialog", () => {
 				await nextTick();
 
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
@@ -132,11 +132,11 @@ describe("CollaboraFileDialog", () => {
 				const { wrapper } = await setup();
 
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
@@ -147,7 +147,7 @@ describe("CollaboraFileDialog", () => {
 				const { wrapper } = await setup();
 
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
@@ -165,10 +165,10 @@ describe("CollaboraFileDialog", () => {
 				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
 				await nextTick();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']").find("input");
 				expect(fileNameInput.element.value).toBe("");
 
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
+				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
@@ -197,7 +197,7 @@ describe("CollaboraFileDialog", () => {
 				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
 				await nextTick();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue("invalid/filename");
 				await nextTick();
 
diff --git a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index 82654904a7..ce3e848b26 100644
--- a/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -4,14 +4,14 @@
 		:message="t('feature.collabora.add-collabora-file-dialog.title')"
 		:confirm-btn-disabled="!isFormValid"
 		confirm-btn-lang-key="common.actions.create"
-		data-testid="collabora-element-dialog"
+		data-testid="collabora-file-dialog"
 		@cancel="onCancel"
 		@confirm="onConfirm"
 		@click.stop
 		@keydown.enter.stop
 	>
 		<template #content>
-			<VForm id="officeFileForm" ref="form" data-testid="collabora-element-form" @submit.prevent="onConfirm">
+			<VForm id="collaboraFileForm" ref="form" data-testid="collabora-file-form" @submit.prevent="onConfirm">
 				<!-- Attach the select to the form so that we can use focusTrap in the dialog -->
 				<VSelect
 					v-model="selectedDocType"
@@ -19,15 +19,15 @@
 					persistent-hint
 					:label="t('feature.collabora.add-collabora-file-dialog.doc-types')"
 					:rules="docTypeRules"
-					:menu-props="{ attach: '#officeFileForm' }"
-					data-testid="collabora-element-form-type"
+					:menu-props="{ attach: '#collaboraFileForm' }"
+					data-testid="collabora-file-form-type"
 				/>
 				<VTextField
 					v-model="fileName"
 					:label="t('common.labels.fileName')"
 					:rules="fileNameRules"
 					:placeholder="t('feature.collabora.add-collabora-file-dialog.untitled-file')"
-					data-testid="collabora-element-form-filename"
+					data-testid="collabora-file-form-filename"
 				/>
 			</VForm>
 		</template>

From 309c3711e3ba1e08e77bb98268729962bdb03a41 Mon Sep 17 00:00:00 2001
From: Christian Darsow <hello@darsow.io>
Date: Mon, 8 Dec 2025 08:29:44 +0100
Subject: [PATCH 100/100] Improve test setup

---
 src/modules/data/board/Card.store.unit.ts | 74 +++++++++--------------
 1 file changed, 30 insertions(+), 44 deletions(-)

diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 00ec78f016..b086a2f277 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -23,7 +23,6 @@ import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
-import { flushPromises } from "@vue/test-utils";
 import { cloneDeep } from "lodash-es";
 import { createPinia, setActivePinia } from "pinia";
 import type { Mock } from "vitest";
@@ -983,36 +982,42 @@ describe("CardStore", () => {
 	});
 
 	describe("createFileElementWithCollabora", () => {
-		describe("when a card is in edit mode", () => {
-			it("should call createElementRequest", () => {
-				const { cardStore } = setup(false);
+		const setupCreateFileElementWithCollabora = (editMode = false, createElementFails = false, uploadFails = false) => {
+			const { cardStore } = setup(false);
 
-				editModeId.value = "cardId";
-				mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
-					Promise.resolve({
+			editModeId.value = editMode ? "cardId" : undefined;
+
+			const createElementRequestReturnValue = createElementFails
+				? Promise.resolve(undefined)
+				: Promise.resolve({
 						id: "elementId",
 						type: ContentElementType.File,
 						content: {},
-					})
-				);
-				mockedFileStorageActions.uploadCollaboraFile.mockReturnValueOnce(Promise.resolve({ id: "fileId" }));
+					});
+			mockedCardRestApiActions.createElementRequest.mockReturnValue(createElementRequestReturnValue);
+
+			const uploadCollaboraFileReturnValue = uploadFails
+				? Promise.resolve(undefined)
+				: Promise.resolve({ id: "fileId" });
+			mockedFileStorageActions.uploadCollaboraFile.mockReturnValue(uploadCollaboraFileReturnValue);
+
+			return {
+				cardStore,
+			};
+		};
+
+		describe("when a card is in edit mode", () => {
+			it("should call createElementRequest", () => {
+				const { cardStore } = setupCreateFileElementWithCollabora(true, false, false);
+
 				cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
 				expect(mockedCardRestApiActions.createElementRequest).toHaveBeenCalled();
 			});
 
 			it("should call uploadCollaboraFile", async () => {
-				const { cardStore } = setup(false);
+				const { cardStore } = setupCreateFileElementWithCollabora(true, false, false);
 
-				editModeId.value = "cardId";
-				mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
-					Promise.resolve({
-						id: "elementId",
-						type: ContentElementType.File,
-						content: {},
-					})
-				);
-				mockedFileStorageActions.uploadCollaboraFile.mockReturnValueOnce(Promise.resolve({ id: "fileId" }));
 				await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
 				expect(mockedFileStorageActions.uploadCollaboraFile).toHaveBeenCalled();
@@ -1020,10 +1025,8 @@ describe("CardStore", () => {
 
 			describe("when element creation fails", () => {
 				it("should not call uploadCollaboraFile", async () => {
-					const { cardStore } = setup(false);
+					const { cardStore } = setupCreateFileElementWithCollabora(true, true, false);
 
-					editModeId.value = "cardId";
-					mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(undefined);
 					await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
 					expect(mockedFileStorageActions.uploadCollaboraFile).not.toHaveBeenCalled();
@@ -1032,19 +1035,9 @@ describe("CardStore", () => {
 
 			describe("when uploading collabora file fails", () => {
 				it("should delete created element", async () => {
-					const { cardStore } = setup(false);
-
-					editModeId.value = "cardId";
-					mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
-						Promise.resolve({
-							id: "elementId",
-							type: ContentElementType.File,
-							content: {},
-						})
-					);
-					mockedFileStorageActions.uploadCollaboraFile.mockReturnValueOnce(Promise.resolve(undefined));
+					const { cardStore } = setupCreateFileElementWithCollabora(true, false, true);
+
 					await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
-					await flushPromises();
 
 					expect(mockedCardRestApiActions.deleteElementRequest).toHaveBeenCalled();
 				});
@@ -1053,7 +1046,7 @@ describe("CardStore", () => {
 
 		describe("when no card is in edit mode", () => {
 			it("should not call createElementRequest", () => {
-				const { cardStore } = setup(false);
+				const { cardStore } = setupCreateFileElementWithCollabora(false, false, false);
 
 				cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
@@ -1061,15 +1054,8 @@ describe("CardStore", () => {
 			});
 
 			it("should not call uploadCollaboraFile", async () => {
-				const { cardStore } = setup(false);
+				const { cardStore } = setupCreateFileElementWithCollabora(false, false, false);
 
-				mockedCardRestApiActions.createElementRequest.mockReturnValueOnce(
-					Promise.resolve({
-						id: "elementId",
-						type: ContentElementType.File,
-						content: {},
-					})
-				);
 				await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
 
 				expect(mockedFileStorageActions.uploadCollaboraFile).not.toHaveBeenCalled();