From 2fea27dc94dc88cd8a33b29993aa34e7a61b9a7e Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Mon, 18 Aug 2025 14:59:52 +0200
Subject: [PATCH 01/13] add focus trap to board layout dialog

---
 .../SelectBoardLayoutDialog.unit.ts           |  3 +-
 .../room-details/SelectBoardLayoutDialog.vue  | 61 ++++++++++---------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts b/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts
index f92ff9a868..2104ac2d8f 100644
--- a/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts
+++ b/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts
@@ -11,6 +11,8 @@ describe("@ui-room-details/SelectBoardLayoutDialog", () => {
 		const wrapper = mount(SelectBoardLayoutDialog, {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
+				stubs: { UseFocusTrap: true }, // unfortuantely it is not as straightward to test the focus trap
+				renderStubDefaultSlot: true,
 			},
 			props: {
 				modelValue: true,
@@ -23,7 +25,6 @@ describe("@ui-room-details/SelectBoardLayoutDialog", () => {
 
 	it("should be rendered correctly", async () => {
 		const { wrapper } = setup();
-
 		expect(wrapper.exists()).toBe(true);
 	});
 
diff --git a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
index 848b7d200a..bf557a8eb3 100644
--- a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
+++ b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
@@ -1,35 +1,37 @@
 <template>
 	<VDialog v-model="isOpen" width="360">
-		<VCard data-testid="board-layout-dialog">
-			<VCardTitle
-				class="text-h4 text-break px-6 pt-4"
-				data-testid="board-layout-dialog-title"
-			>
-				{{ $t("pages.room.dialog.boardLayout.title") }}
-			</VCardTitle>
-			<VCardText
-				class="d-flex flex-row flex-wrap align-items-center justify-space-around"
-			>
-				<ExtendedIconBtn
-					v-for="(item, key) in boardLayouts"
-					:key="key"
-					:data-testid="item.dataTestId"
-					:icon="item.icon"
-					:label="item.label"
-					:class="{ selected: currentLayout === item.type }"
-					@click.stop="$emit('select', item.type)"
-				/>
-			</VCardText>
-			<VCardActions class="mb-2 px-6">
-				<VBtn
-					data-testid="dialog-close"
-					variant="outlined"
-					@click="$emit('update:modelValue', false)"
+		<UseFocusTrap :options="{ immediate: true }">
+			<VCard data-testid="board-layout-dialog">
+				<VCardTitle
+					class="text-h4 text-break px-6 pt-4"
+					data-testid="board-layout-dialog-title"
 				>
-					{{ $t("common.labels.close") }}
-				</VBtn>
-			</VCardActions>
-		</VCard>
+					{{ $t("pages.room.dialog.boardLayout.title") }}
+				</VCardTitle>
+				<VCardText
+					class="d-flex flex-row flex-wrap align-items-center justify-space-around"
+				>
+					<ExtendedIconBtn
+						v-for="(item, key) in boardLayouts"
+						:key="key"
+						:data-testid="item.dataTestId"
+						:icon="item.icon"
+						:label="item.label"
+						:class="{ selected: currentLayout === item.type }"
+						@click.stop="$emit('select', item.type)"
+					/>
+				</VCardText>
+				<VCardActions class="mb-2 px-6">
+					<VBtn
+						data-testid="dialog-close"
+						variant="outlined"
+						@click="$emit('update:modelValue', false)"
+					>
+						{{ $t("common.labels.close") }}
+					</VBtn>
+				</VCardActions>
+			</VCard>
+		</UseFocusTrap>
 	</VDialog>
 </template>
 
@@ -40,6 +42,7 @@ import { ExtendedIconBtn } from "@ui-extended-icon-btn";
 import { PropType } from "vue";
 import { useI18n } from "vue-i18n";
 import { PickerOption } from "./types";
+import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
 
 const isOpen = defineModel({
 	type: Boolean,

From c59c520b8f648ef42f41bb9b81bcfb173c01690f Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Tue, 19 Aug 2025 13:36:59 +0200
Subject: [PATCH 02/13] replace legacy usage of $t with t for i18n

---
 src/modules/ui/room-details/SelectBoardLayoutDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
index bf557a8eb3..56373764cd 100644
--- a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
+++ b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
@@ -6,7 +6,7 @@
 					class="text-h4 text-break px-6 pt-4"
 					data-testid="board-layout-dialog-title"
 				>
-					{{ $t("pages.room.dialog.boardLayout.title") }}
+					{{ t("pages.room.dialog.boardLayout.title") }}
 				</VCardTitle>
 				<VCardText
 					class="d-flex flex-row flex-wrap align-items-center justify-space-around"
@@ -27,7 +27,7 @@
 						variant="outlined"
 						@click="$emit('update:modelValue', false)"
 					>
-						{{ $t("common.labels.close") }}
+						{{ t("common.labels.close") }}
 					</VBtn>
 				</VCardActions>
 			</VCard>

From 922c82b24edc50d6065941badc51816d69ebbf8a Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Tue, 19 Aug 2025 13:39:00 +0200
Subject: [PATCH 03/13] fix keyboard handling in Roop Copy Info Dialog

---
 src/modules/feature/room/RoomCopyFlow.vue     |  11 +-
 .../feature/room/RoomCopyInfoDialog.vue       | 109 +++++++++---------
 2 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/src/modules/feature/room/RoomCopyFlow.vue b/src/modules/feature/room/RoomCopyFlow.vue
index f244c96a4a..1b869b2b09 100644
--- a/src/modules/feature/room/RoomCopyFlow.vue
+++ b/src/modules/feature/room/RoomCopyFlow.vue
@@ -3,6 +3,7 @@
 		v-if="isRoomCopyInfoDialogOpen"
 		@copy:cancel="onCancelCopy"
 		@copy:confirm="onConfirmCopy"
+		@copy:close="onClose"
 	/>
 </template>
 
@@ -42,14 +43,18 @@ onMounted(() => {
 	isLoadingDialogOpen.value = false;
 });
 
-const onCancelCopy = () => {
+const onClose = () => {
 	isRoomCopyInfoDialogOpen.value = false;
-	emit("copy:cancel");
 	emit("copy:ended");
 };
 
+const onCancelCopy = () => {
+	emit("copy:cancel");
+	onClose();
+};
+
 const onConfirmCopy = async () => {
-	isRoomCopyInfoDialogOpen.value = false;
+	onClose();
 	isLoadingDialogOpen.value = true;
 
 	try {
diff --git a/src/modules/feature/room/RoomCopyInfoDialog.vue b/src/modules/feature/room/RoomCopyInfoDialog.vue
index e626584cc1..28ba5f8727 100644
--- a/src/modules/feature/room/RoomCopyInfoDialog.vue
+++ b/src/modules/feature/room/RoomCopyInfoDialog.vue
@@ -1,64 +1,67 @@
 <template>
-	<v-dialog v-model="isOpen" max-width="520">
+	<v-dialog v-model="isOpen" max-width="520" @after-leave="$emit('copy:close')">
 		<v-card data-testid="copy-info-dialog">
-			<v-card-title
-				class="text-h4 text-break px-6 pt-4"
-				data-testid="copy-info-dialog-title"
-			>
-				{{ $t("feature-room.CopyInfoDialog.title") }}
-			</v-card-title>
-			<v-card-text class="pt-2">
-				<p>
-					{{ $t("feature-room.CopyInfoDialog.text.nextStep") }}
-				</p>
-				<InfoAlert>
-					<p class="mb-1">
-						{{ t("feature-room.CopyInfoDialog.text.alert.followingContent") }}
-					</p>
-					<ul class="ml-6">
-						<li>
-							{{
-								t("feature-room.CopyInfoDialog.text.alert.membersPermissions")
-							}}
-						</li>
-						<li>
-							{{ t("feature-room.CopyInfoDialog.text.alert.Etherpad") }}
-						</li>
-						<li>
-							{{ t("feature-room.CopyInfoDialog.text.alert.whiteboard") }}
-						</li>
-						<li>
-							{{
-								t("feature-room.CopyInfoDialog.text.alert.protectedSettings")
-							}}
-						</li>
-					</ul>
-				</InfoAlert>
-			</v-card-text>
-			<v-card-actions class="px-6 pb-4">
-				<v-spacer />
-				<v-btn
-					variant="text"
-					data-testid="copy-info-dialog-cancel"
-					@click="$emit('copy:cancel')"
-				>
-					{{ $t("common.actions.cancel") }}
-				</v-btn>
-				<v-btn
-					variant="flat"
-					color="primary"
-					data-testid="copy-info-dialog-confirm"
-					@click="$emit('copy:confirm')"
+			<UseFocusTrap>
+				<v-card-title
+					class="text-h4 text-break px-6 pt-4"
+					data-testid="copy-info-dialog-title"
 				>
-					{{ $t("common.actions.duplicate") }}
-				</v-btn>
-			</v-card-actions>
+					{{ t("feature-room.CopyInfoDialog.title") }}
+				</v-card-title>
+				<v-card-text class="pt-2">
+					<p>
+						{{ t("feature-room.CopyInfoDialog.text.nextStep") }}
+					</p>
+					<InfoAlert>
+						<p class="mb-1">
+							{{ t("feature-room.CopyInfoDialog.text.alert.followingContent") }}
+						</p>
+						<ul class="ml-6">
+							<li>
+								{{
+									t("feature-room.CopyInfoDialog.text.alert.membersPermissions")
+								}}
+							</li>
+							<li>
+								{{ t("feature-room.CopyInfoDialog.text.alert.Etherpad") }}
+							</li>
+							<li>
+								{{ t("feature-room.CopyInfoDialog.text.alert.whiteboard") }}
+							</li>
+							<li>
+								{{
+									t("feature-room.CopyInfoDialog.text.alert.protectedSettings")
+								}}
+							</li>
+						</ul>
+					</InfoAlert>
+				</v-card-text>
+				<v-card-actions class="px-6 pb-4">
+					<v-spacer />
+					<v-btn
+						variant="text"
+						data-testid="copy-info-dialog-cancel"
+						@click="$emit('copy:cancel')"
+					>
+						{{ t("common.actions.cancel") }}
+					</v-btn>
+					<v-btn
+						variant="flat"
+						color="primary"
+						data-testid="copy-info-dialog-confirm"
+						@click="$emit('copy:confirm')"
+					>
+						{{ $t("common.actions.duplicate") }}
+					</v-btn>
+				</v-card-actions>
+			</UseFocusTrap>
 		</v-card>
 	</v-dialog>
 </template>
 
 <script setup lang="ts">
 import { InfoAlert } from "@ui-alert";
+import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
@@ -66,5 +69,5 @@ const { t } = useI18n();
 
 const isOpen = ref(true);
 
-defineEmits(["copy:cancel", "copy:confirm"]);
+defineEmits(["copy:cancel", "copy:confirm", "copy:close"]);
 </script>

From 09c30ec7e0a559f98dbfbbf59fe89affffb01099 Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Tue, 19 Aug 2025 15:03:25 +0200
Subject: [PATCH 04/13] use v-for for list items

---
 .../feature/room/RoomCopyInfoDialog.vue       | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/modules/feature/room/RoomCopyInfoDialog.vue b/src/modules/feature/room/RoomCopyInfoDialog.vue
index 28ba5f8727..4b1a999a71 100644
--- a/src/modules/feature/room/RoomCopyInfoDialog.vue
+++ b/src/modules/feature/room/RoomCopyInfoDialog.vue
@@ -17,21 +17,8 @@
 							{{ t("feature-room.CopyInfoDialog.text.alert.followingContent") }}
 						</p>
 						<ul class="ml-6">
-							<li>
-								{{
-									t("feature-room.CopyInfoDialog.text.alert.membersPermissions")
-								}}
-							</li>
-							<li>
-								{{ t("feature-room.CopyInfoDialog.text.alert.Etherpad") }}
-							</li>
-							<li>
-								{{ t("feature-room.CopyInfoDialog.text.alert.whiteboard") }}
-							</li>
-							<li>
-								{{
-									t("feature-room.CopyInfoDialog.text.alert.protectedSettings")
-								}}
+							<li v-for="bulletPoint in infoListItems" :key="bulletPoint">
+								{{ bulletPoint }}
 							</li>
 						</ul>
 					</InfoAlert>
@@ -51,7 +38,7 @@
 						data-testid="copy-info-dialog-confirm"
 						@click="$emit('copy:confirm')"
 					>
-						{{ $t("common.actions.duplicate") }}
+						{{ t("common.actions.duplicate") }}
 					</v-btn>
 				</v-card-actions>
 			</UseFocusTrap>
@@ -69,5 +56,12 @@ const { t } = useI18n();
 
 const isOpen = ref(true);
 
+const infoListItems = [
+	"feature-room.CopyInfoDialog.text.alert.membersPermissions",
+	"feature-room.CopyInfoDialog.text.alert.Etherpad",
+	"feature-room.CopyInfoDialog.text.alert.whiteboard",
+	"feature-room.CopyInfoDialog.text.alert.protectedSettings",
+].map(t);
+
 defineEmits(["copy:cancel", "copy:confirm", "copy:close"]);
 </script>

From f849f592ff0ebb49ef3426f4c7db585cb3e90d92 Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Tue, 19 Aug 2025 17:04:32 +0200
Subject: [PATCH 05/13] WIP: refactor ShareModal

---
 src/components/organisms/vCustomDialog.vue    |  12 +-
 src/components/share/ShareModal.vue           | 191 +++++++-----------
 .../feature/room/RoomCopyInfoDialog.vue       |   2 +-
 3 files changed, 80 insertions(+), 125 deletions(-)

diff --git a/src/components/organisms/vCustomDialog.vue b/src/components/organisms/vCustomDialog.vue
index 2af86be4b1..58ed5c85e1 100644
--- a/src/components/organisms/vCustomDialog.vue
+++ b/src/components/organisms/vCustomDialog.vue
@@ -83,6 +83,14 @@
 <script setup lang="ts">
 import { ModelRef, PropType } from "vue";
 
+export type VCustomDialogButton =
+	| "back"
+	| "edit"
+	| "cancel"
+	| "confirm"
+	| "close"
+	| "next";
+
 const props = defineProps({
 	size: {
 		type: Number,
@@ -110,9 +118,7 @@ const props = defineProps({
 		type: Boolean,
 	},
 	buttons: {
-		type: Array as PropType<
-			("back" | "edit" | "cancel" | "confirm" | "close" | "next")[]
-		>,
+		type: Array as PropType<VCustomDialogButton[]>,
 		default: () => ["cancel", "confirm"],
 	},
 });
diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index 6760358b66..e8044108e2 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -17,7 +17,7 @@
 		<template #content>
 			<!--Fade-out animation ensures that the dialog shows the last visible step while closing-->
 			<v-fade-transition>
-				<div v-if="step === 'firstStep' && isOpen">
+				<div v-if="step === 'firstStep'">
 					<p data-testid="share-options-info-text">
 						{{ t(`components.molecules.share.${type}.options.infoText`) }}
 					</p>
@@ -32,89 +32,11 @@
 							{{ t("components.molecules.share.options.tableHeader.InfoText") }}
 							<ul class="ml-6">
 								<li
-									v-if="showCourseInfo"
-									data-testid="share-options-personal-data-text"
+									v-for="bulletPoint in listItems"
+									:key="bulletPoint.translation"
+									:data-testId="bulletPoint.testId"
 								>
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.personalData"
-										)
-									}}
-								</li>
-								<li
-									v-if="showRoomInfo"
-									data-testid="share-options-room-memberships-data-text"
-								>
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.roomMembershipsData"
-										)
-									}}
-								</li>
-								<li v-if="showCourseInfo || showLessonInfo">
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.geogebra"
-										)
-									}}
-								</li>
-								<li
-									v-if="
-										showCourseInfo ||
-										showRoomInfo ||
-										showBoardInfo ||
-										showLessonInfo
-									"
-								>
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.etherpad"
-										)
-									}}
-								</li>
-								<li v-if="showCourseInfo || showRoomInfo || showBoardInfo">
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.whiteboard"
-										)
-									}}
-								</li>
-								<li
-									v-if="showCourseInfo || showRoomInfo || showBoardInfo"
-									data-testid="share-modal-external-tools-info"
-								>
-									{{
-										t(
-											"components.molecules.shareImport.options.ctlTools.infoText.unavailable"
-										)
-									}}
-								</li>
-								<li
-									v-if="showCourseInfo || showRoomInfo || showBoardInfo"
-									data-testid="share-modal-external-tools-protected-parameter-info"
-								>
-									{{
-										t(
-											"components.molecules.shareImport.options.ctlTools.infoText.protected"
-										)
-									}}
-								</li>
-								<li
-									v-if="showCourseInfo"
-									data-testid="share-modal-coursefiles-info"
-								>
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.courseFiles"
-										)
-									}}
-								</li>
-								<li v-if="showCourseInfo">
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.courseGroups"
-										)
-									}}
+									{{ t(bulletPoint.translation) }}
 								</li>
 							</ul>
 						</div>
@@ -125,7 +47,7 @@
 					/>
 				</div>
 
-				<div v-if="step === 'secondStep' && isOpen">
+				<div v-else-if="step === 'secondStep'">
 					<share-modal-result
 						:share-url="shareUrl"
 						:type="type"
@@ -139,7 +61,9 @@
 </template>
 
 <script setup lang="ts">
-import VCustomDialog from "@/components/organisms/vCustomDialog.vue";
+import VCustomDialog, {
+	VCustomDialogButton,
+} from "@/components/organisms/vCustomDialog.vue";
 import ShareModalOptionsForm from "@/components/share/ShareModalOptionsForm.vue";
 import ShareModalResult from "@/components/share/ShareModalResult.vue";
 import { ShareTokenBodyParamsParentTypeEnum } from "@/serverApi/v3/api";
@@ -153,14 +77,6 @@ import { mdiInformation } from "@icons/material";
 import { computed, PropType, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
-type VDialogButtonActions =
-	| "back"
-	| "edit"
-	| "cancel"
-	| "confirm"
-	| "close"
-	| "next";
-
 const props = defineProps({
 	type: {
 		type: String as PropType<ShareTokenBodyParamsParentTypeEnum>,
@@ -171,11 +87,10 @@ const props = defineProps({
 const { t } = useI18n();
 const notifier = injectStrict(NOTIFIER_MODULE_KEY);
 const shareModule = injectStrict(SHARE_MODULE_KEY);
-const isOpen = computed({
-	get: () =>
-		shareModule.getIsShareModalOpen && shareModule.getParentType === props.type,
-	set: () => shareModule.resetShareFlow(),
-});
+const isOpen = computed(
+	() =>
+		shareModule.getIsShareModalOpen && shareModule.getParentType === props.type
+);
 
 type ShareModalStep = "firstStep" | "secondStep";
 
@@ -185,7 +100,7 @@ const step = computed<ShareModalStep>(() =>
 
 const modalOptions: Record<
 	ShareModalStep,
-	{ title: string; actionButtons: VDialogButtonActions[] }
+	{ title: string; actionButtons: VCustomDialogButton[] }
 > = {
 	firstStep: {
 		title: t("components.molecules.share.options.title"),
@@ -229,28 +144,62 @@ const onCopy = () => {
 	});
 };
 
-const showAlertInfo = computed(() => {
-	return (
-		props.type === "courses" ||
-		props.type === "columnBoard" ||
-		props.type === "lessons" ||
-		props.type === "room"
-	);
-});
-
-const showCourseInfo = computed(() => {
-	return props.type === "courses";
-});
-
-const showBoardInfo = computed(() => {
-	return props.type === "columnBoard";
-});
-
-const showLessonInfo = computed(() => {
-	return props.type === "lessons";
-});
+const showAlertInfo = computed(() =>
+	["course", "columnBoard", "lessons", "room"].includes(props.type)
+);
 
-const showRoomInfo = computed(() => {
-	return props.type === "room";
+const listItems = computed(() => {
+	return [
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.personalData",
+			type: ["course"],
+			testId: "share-options-personal-data-text",
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.roomMembershipsData",
+			type: ["room"],
+			testId: "share-options-room-memberships-data-text",
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.geogebra",
+			type: ["course", "lessons"],
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.etherpad",
+			type: ["course", "room", "columnBoard", "lessons"],
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.whiteboard",
+			type: ["course", "room", "columnBoard"],
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.ctlTools.infoText.unavailable",
+			type: ["course", "room", "columnBoard"],
+			testId: "share-modal-external-tools-info",
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.ctlTools.infoText.protected",
+			type: ["course", "room", "columnBoard"],
+			testId: "share-modal-external-tools-protected-parameter-info",
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.courseFiles",
+			type: ["course"],
+			testId: "share-modal-coursefiles-info",
+		},
+		{
+			translation:
+				"components.molecules.shareImport.options.restrictions.infoText.courseGroups",
+			type: ["course"],
+		},
+	].filter(({ type }) => type.includes(props.type));
 });
 </script>
diff --git a/src/modules/feature/room/RoomCopyInfoDialog.vue b/src/modules/feature/room/RoomCopyInfoDialog.vue
index 4b1a999a71..b3b05792ab 100644
--- a/src/modules/feature/room/RoomCopyInfoDialog.vue
+++ b/src/modules/feature/room/RoomCopyInfoDialog.vue
@@ -8,7 +8,7 @@
 				>
 					{{ t("feature-room.CopyInfoDialog.title") }}
 				</v-card-title>
-				<v-card-text class="pt-2">
+				<v-card-text class="pt-2 px-6">
 					<p>
 						{{ t("feature-room.CopyInfoDialog.text.nextStep") }}
 					</p>

From d5d1d8dd34b9aa6cc299f7dd6d6da5426db4c51b Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Tue, 19 Aug 2025 18:15:02 +0200
Subject: [PATCH 06/13] WIP: remove Custom Dialog usage from Sahre Modal

---
 src/components/share/ShareModal.vue | 158 ++++++++++++++--------------
 1 file changed, 78 insertions(+), 80 deletions(-)

diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index e8044108e2..3607853951 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -1,73 +1,86 @@
 <template>
-	<v-custom-dialog
-		:is-open="isOpen"
-		data-testid="share-dialog"
-		:size="480"
-		has-buttons
-		:buttons="isOpen ? actionButtons : []"
-		@dialog-closed="onCloseDialog"
-		@next="onNext()"
+	<v-dialog
+		v-model="isOpen"
+		data-testid="sharedialog"
+		max-width="480"
+		@after-leave="onCloseDialog"
 	>
-		<template #title>
-			<div ref="textTitle" class="text-h4 my-2 text-break">
-				{{ modalTitle }}
-			</div>
-		</template>
-
-		<template #content>
-			<!--Fade-out animation ensures that the dialog shows the last visible step while closing-->
-			<v-fade-transition>
-				<div v-if="step === 'firstStep'">
-					<p data-testid="share-options-info-text">
-						{{ t(`components.molecules.share.${type}.options.infoText`) }}
-					</p>
-					<div
-						v-if="showAlertInfo"
-						class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5"
-					>
-						<div class="mx-2">
-							<v-icon color="info" :icon="mdiInformation" />
-						</div>
-						<div data-testid="share-options-table-header">
-							{{ t("components.molecules.share.options.tableHeader.InfoText") }}
-							<ul class="ml-6">
-								<li
-									v-for="bulletPoint in listItems"
-									:key="bulletPoint.translation"
-									:data-testId="bulletPoint.testId"
-								>
-									{{ t(bulletPoint.translation) }}
-								</li>
-							</ul>
+		<v-fade-transition>
+			<v-card data-testid="copy-info-dialog">
+				<UseFocusTrap>
+					<v-card-title class="text-h4 my-2 text-break px-6 pt-4">
+						{{ modalTitle }}
+					</v-card-title>
+					<v-card-text class="pt-2 px-6">
+						<div v-if="step === 'firstStep'">
+							<p data-testid="share-options-info-text">
+								{{ t(`components.molecules.share.${type}.options.infoText`) }}
+							</p>
+							<div
+								v-if="showAlertInfo"
+								class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5"
+							>
+								<div class="mx-2">
+									<v-icon color="info" :icon="mdiInformation" />
+								</div>
+								<div data-testid="share-options-table-header">
+									{{
+										t("components.molecules.share.options.tableHeader.InfoText")
+									}}
+									<ul class="ml-6">
+										<li
+											v-for="bulletPoint in listItems"
+											:key="bulletPoint.translation"
+											:data-testId="bulletPoint.testId"
+										>
+											{{ t(bulletPoint.translation) }}
+										</li>
+									</ul>
+								</div>
+							</div>
+							<share-modal-options-form
+								:type="type"
+								@share-options-change="onShareOptionsChange"
+							/>
 						</div>
-					</div>
-					<share-modal-options-form
-						:type="type"
-						@share-options-change="onShareOptionsChange"
-					/>
-				</div>
 
-				<div v-else-if="step === 'secondStep'">
-					<share-modal-result
-						:share-url="shareUrl"
-						:type="type"
-						@done="onDone"
-						@copied="onCopy"
-					/>
-				</div>
-			</v-fade-transition>
-		</template>
-	</v-custom-dialog>
+						<div v-else-if="step === 'secondStep'">
+							<share-modal-result
+								:share-url="shareUrl"
+								:type="type"
+								@done="onDone"
+								@copied="onCopy"
+							/>
+						</div>
+					</v-card-text>
+					<v-card-actions class="px-6 pb-4">
+						<v-spacer />
+						<template v-if="step === 'firstStep'">
+							<v-btn variant="text" @click="onCloseDialog">
+								{{ t("common.actions.cancel") }}
+							</v-btn>
+							<v-btn variant="flat" color="primary" @click="onNext()">
+								{{ t("common.actions.continue") }}
+							</v-btn>
+						</template>
+						<template v-else-if="step === 'secondStep'">
+							<v-btn variant="flat" color="primary" @click="onCloseDialog()">
+								{{ t("common.labels.close") }}
+							</v-btn>
+						</template>
+					</v-card-actions>
+				</UseFocusTrap>
+			</v-card>
+		</v-fade-transition>
+	</v-dialog>
 </template>
 
 <script setup lang="ts">
-import VCustomDialog, {
-	VCustomDialogButton,
-} from "@/components/organisms/vCustomDialog.vue";
 import ShareModalOptionsForm from "@/components/share/ShareModalOptionsForm.vue";
 import ShareModalResult from "@/components/share/ShareModalResult.vue";
 import { ShareTokenBodyParamsParentTypeEnum } from "@/serverApi/v3/api";
 import { ShareOptions } from "@/store/share";
+import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
 import {
 	injectStrict,
 	NOTIFIER_MODULE_KEY,
@@ -98,29 +111,15 @@ const step = computed<ShareModalStep>(() =>
 	shareModule.getShareUrl === undefined ? "firstStep" : "secondStep"
 );
 
-const modalOptions: Record<
-	ShareModalStep,
-	{ title: string; actionButtons: VCustomDialogButton[] }
-> = {
-	firstStep: {
-		title: t("components.molecules.share.options.title"),
-		actionButtons: ["cancel", "next"],
-	},
-	secondStep: {
-		title: t("components.molecules.share.result.title"),
-		actionButtons: ["close"],
-	},
-};
-
 const shareUrl = computed(() => shareModule.getShareUrl ?? "");
 
-const actionButtons = computed(() => {
-	return modalOptions[step.value].actionButtons ?? [];
-});
-
 const shareOptions = ref<ShareOptions>();
 
-const modalTitle = computed(() => modalOptions[step.value].title ?? "");
+const modalTitle = computed(() =>
+	step.value === "firstStep"
+		? t("components.molecules.share.options.title")
+		: t("components.molecules.share.result.title")
+);
 
 const onShareOptionsChange = (newValue: ShareOptions) => {
 	shareOptions.value = newValue;
@@ -134,13 +133,12 @@ const onNext = () => {
 	}
 };
 const onDone = () => {
-	shareModule.resetShareFlow();
+	// shareModule.resetShareFlow();
 };
 const onCopy = () => {
 	notifier.show({
 		text: t("common.words.copiedToClipboard"),
 		status: "success",
-		timeout: 5000,
 	});
 };
 

From 00032c6a3800e59bf2566b9efaae93f2d997df37 Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Wed, 20 Aug 2025 08:22:26 +0200
Subject: [PATCH 07/13] fix displaying step 1 before share dialog is fully
 closed

---
 src/components/share/ShareModal.vue | 72 ++++++++++++++---------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index 3607853951..0234391475 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -3,14 +3,14 @@
 		v-model="isOpen"
 		data-testid="sharedialog"
 		max-width="480"
-		@after-leave="onCloseDialog"
+		@after-leave="onCleanUp"
 	>
-		<v-fade-transition>
-			<v-card data-testid="copy-info-dialog">
-				<UseFocusTrap>
-					<v-card-title class="text-h4 my-2 text-break px-6 pt-4">
-						{{ modalTitle }}
-					</v-card-title>
+		<v-card data-testid="copy-info-dialog">
+			<UseFocusTrap>
+				<v-card-title class="text-h4 my-2 text-break px-6 pt-4">
+					{{ modalTitle }}
+				</v-card-title>
+				<v-fade-transition>
 					<v-card-text class="pt-2 px-6">
 						<div v-if="step === 'firstStep'">
 							<p data-testid="share-options-info-text">
@@ -48,30 +48,30 @@
 							<share-modal-result
 								:share-url="shareUrl"
 								:type="type"
-								@done="onDone"
+								@done="onCloseDialogOrDone"
 								@copied="onCopy"
 							/>
 						</div>
 					</v-card-text>
-					<v-card-actions class="px-6 pb-4">
-						<v-spacer />
-						<template v-if="step === 'firstStep'">
-							<v-btn variant="text" @click="onCloseDialog">
-								{{ t("common.actions.cancel") }}
-							</v-btn>
-							<v-btn variant="flat" color="primary" @click="onNext()">
-								{{ t("common.actions.continue") }}
-							</v-btn>
-						</template>
-						<template v-else-if="step === 'secondStep'">
-							<v-btn variant="flat" color="primary" @click="onCloseDialog()">
-								{{ t("common.labels.close") }}
-							</v-btn>
-						</template>
-					</v-card-actions>
-				</UseFocusTrap>
-			</v-card>
-		</v-fade-transition>
+				</v-fade-transition>
+				<v-card-actions class="px-6 pb-4">
+					<v-spacer />
+					<template v-if="step === 'firstStep'">
+						<v-btn variant="text" @click="onCloseDialogOrDone">
+							{{ t("common.actions.cancel") }}
+						</v-btn>
+						<v-btn variant="flat" color="primary" @click="onNext">
+							{{ t("common.actions.continue") }}
+						</v-btn>
+					</template>
+					<template v-else-if="step === 'secondStep'">
+						<v-btn variant="flat" color="primary" @click="onCloseDialogOrDone">
+							{{ t("common.labels.close") }}
+						</v-btn>
+					</template>
+				</v-card-actions>
+			</UseFocusTrap>
+		</v-card>
 	</v-dialog>
 </template>
 
@@ -107,12 +107,8 @@ const isOpen = computed(
 
 type ShareModalStep = "firstStep" | "secondStep";
 
-const step = computed<ShareModalStep>(() =>
-	shareModule.getShareUrl === undefined ? "firstStep" : "secondStep"
-);
-
+const step = ref<ShareModalStep>("firstStep");
 const shareUrl = computed(() => shareModule.getShareUrl ?? "");
-
 const shareOptions = ref<ShareOptions>();
 
 const modalTitle = computed(() =>
@@ -124,17 +120,21 @@ const modalTitle = computed(() =>
 const onShareOptionsChange = (newValue: ShareOptions) => {
 	shareOptions.value = newValue;
 };
-const onCloseDialog = () => {
+const onCloseDialogOrDone = () => {
 	shareModule.resetShareFlow();
 };
+
+const onCleanUp = () => {
+	step.value = "firstStep";
+};
+
 const onNext = () => {
 	if (shareOptions.value) {
 		shareModule.createShareUrl(shareOptions.value);
+		step.value = "secondStep";
 	}
 };
-const onDone = () => {
-	// shareModule.resetShareFlow();
-};
+
 const onCopy = () => {
 	notifier.show({
 		text: t("common.words.copiedToClipboard"),

From 21870c4d8723d1e0329fa6ee86a7edf1b45224d5 Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Wed, 20 Aug 2025 17:09:20 +0200
Subject: [PATCH 08/13] WIP: adjust tests

---
 src/modules/feature/board/board/Board.unit.ts       |  3 ++-
 src/modules/feature/room/RoomCopyInfoDialog.unit.ts |  2 ++
 src/modules/page/room/RoomDetails.page.unit.ts      |  2 +-
 .../course-rooms/CourseRoomDetails.page.unit.ts     | 13 ++++++++++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/modules/feature/board/board/Board.unit.ts b/src/modules/feature/board/board/Board.unit.ts
index 1b406f3b80..6afec32179 100644
--- a/src/modules/feature/board/board/Board.unit.ts
+++ b/src/modules/feature/board/board/Board.unit.ts
@@ -308,7 +308,8 @@ describe("Board", () => {
 					[SCHOOL_EXTERNAL_TOOLS_MODULE_KEY.valueOf()]:
 						schoolExternalToolsModule,
 				},
-				stubs: { ShareModal: true },
+				stubs: { ShareModal: true, UseFocusTrap: true },
+				renderStubDefaultSlot: true,
 			},
 			propsData: { boardId: board.id },
 		});
diff --git a/src/modules/feature/room/RoomCopyInfoDialog.unit.ts b/src/modules/feature/room/RoomCopyInfoDialog.unit.ts
index 07e869b69f..3c5138390e 100644
--- a/src/modules/feature/room/RoomCopyInfoDialog.unit.ts
+++ b/src/modules/feature/room/RoomCopyInfoDialog.unit.ts
@@ -9,6 +9,8 @@ describe("@feature-room/RoomCopyInfoDialog", () => {
 		const wrapper = mount(RoomCopyInfoDialog, {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
+				stubs: { UseFocusTrap: true }, // unfortuantely it is not as straightward to test the focus trap
+				renderStubDefaultSlot: true,
 			},
 		});
 
diff --git a/src/modules/page/room/RoomDetails.page.unit.ts b/src/modules/page/room/RoomDetails.page.unit.ts
index 146783d800..b0848829e2 100644
--- a/src/modules/page/room/RoomDetails.page.unit.ts
+++ b/src/modules/page/room/RoomDetails.page.unit.ts
@@ -156,7 +156,7 @@ describe("@pages/RoomsDetails.page.vue", () => {
 						},
 					}),
 				],
-				stubs: { LeaveRoomProhibitedDialog: true },
+				stubs: { LeaveRoomProhibitedDialog: true, UseFocusTrap: true },
 				provide: {
 					[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
 					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
diff --git a/src/pages/course-rooms/CourseRoomDetails.page.unit.ts b/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
index 36078ca2cb..019b003336 100644
--- a/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
+++ b/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
@@ -206,6 +206,7 @@ const getWrapper = ({
 				RoomExternalToolsOverview: true,
 				EndCourseSyncDialog: true,
 				StartExistingCourseSyncDialog: true,
+				UseFocusTrap: true,
 			},
 		},
 	});
@@ -611,9 +612,15 @@ describe("@/pages/CourseRoomDetails.page.vue", () => {
 			const modalView = wrapper.findComponent({
 				name: "share-modal",
 			});
-			const shareDialog = modalView.findComponent({ name: "v-custom-dialog" });
-
-			expect(shareDialog.props("isOpen")).toBe(true);
+			const shareDialog = modalView.findComponent("[data-testid=sharedialog]");
+			// const shareDialog = modalView.findComponent({ name: "v-dialog" });
+			// const shareDialog = modalView.findComponent({ name: "v-dialog" });
+			// const shareDialog = modalView.get("[data-testid=sharedialog]");
+			expect(shareDialog).toBeTruthy(); // TODO how to select the dialog properly now...
+			shareDialog.isVisible()
+			// expect(shareDialog.isVisible()).toBeTruthy();
+
+			//expect(shareDialog.props("isOpen")).toBe(true);
 		});
 	});
 

From 70b8f968396174e33ead91a1fd45ea121cc58f9e Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Wed, 20 Aug 2025 18:37:13 +0200
Subject: [PATCH 09/13] WIP: fix tests

---
 .../course-rooms/CourseRoomDetails.page.unit.ts    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pages/course-rooms/CourseRoomDetails.page.unit.ts b/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
index 019b003336..94122cf6ba 100644
--- a/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
+++ b/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
@@ -34,7 +34,7 @@ import { createMock } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { SpeedDialMenu, SpeedDialMenuAction } from "@ui-speed-dial-menu";
 import { mount } from "@vue/test-utils";
-import { VBtn } from "vuetify/lib/components/index";
+import { VBtn, VDialog } from "vuetify/lib/components/index";
 import CourseRoomDetailsPage from "./CourseRoomDetails.page.vue";
 import RoomExternalToolsOverview from "./tools/RoomExternalToolsOverview.vue";
 import { nextTick } from "vue";
@@ -612,15 +612,9 @@ describe("@/pages/CourseRoomDetails.page.vue", () => {
 			const modalView = wrapper.findComponent({
 				name: "share-modal",
 			});
-			const shareDialog = modalView.findComponent("[data-testid=sharedialog]");
-			// const shareDialog = modalView.findComponent({ name: "v-dialog" });
-			// const shareDialog = modalView.findComponent({ name: "v-dialog" });
-			// const shareDialog = modalView.get("[data-testid=sharedialog]");
-			expect(shareDialog).toBeTruthy(); // TODO how to select the dialog properly now...
-			shareDialog.isVisible()
-			// expect(shareDialog.isVisible()).toBeTruthy();
-
-			//expect(shareDialog.props("isOpen")).toBe(true);
+			const shareDialog = modalView.findComponent(VDialog);
+
+			expect(shareDialog.isVisible()).toBeTruthy();
 		});
 	});
 

From 527766fc5ad559d3fb387c8a0535c410b911e04b Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Mon, 25 Aug 2025 17:08:52 +0200
Subject: [PATCH 10/13] wip: try to fix tests

---
 .../LernstoreCollectionDetailView.vue         |  1 -
 .../molecules/CommonCartridgeExportModal.vue  |  1 -
 .../administration/GeneralSettings.vue        |  1 -
 .../organisms/administration/SchoolPolicy.vue |  1 -
 .../administration/SchoolPolicyFormDialog.vue |  1 -
 .../organisms/administration/SchoolTerms.vue  |  1 -
 .../administration/SchoolTermsFormDialog.vue  |  1 -
 src/components/share/ImportFlow.vue           |  3 -
 src/components/share/ShareModal.unit.ts       | 25 +++---
 src/components/share/ShareModal.vue           | 80 +++++++++----------
 src/modules/feature/news-form/FormNews.vue    |  1 -
 .../dialogs/InviteMembersDialog.vue           |  1 -
 src/modules/page/room/Rooms.page.vue          |  1 -
 .../room-details/SelectBoardLayoutDialog.vue  |  2 +-
 src/pages/LernStoreOverview.page.vue          |  2 -
 src/pages/NewsCreate.page.vue                 |  2 -
 src/pages/NewsEdit.page.vue                   |  1 -
 src/pages/administration/LDAPConfig.page.vue  |  1 -
 .../administration/StudentConsent.page.vue    |  2 -
 .../administration/StudentCreate.page.vue     |  1 -
 .../administration/StudentOverview.page.vue   |  7 --
 .../administration/TeacherCreate.page.vue     |  1 -
 .../administration/TeacherOverview.page.vue   |  6 --
 .../course-rooms/CourseRoomOverview.page.vue  |  2 -
 src/pages/h5p/H5PEditor.page.vue              |  2 -
 25 files changed, 56 insertions(+), 91 deletions(-)

diff --git a/src/components/lern-store/LernstoreCollectionDetailView.vue b/src/components/lern-store/LernstoreCollectionDetailView.vue
index 7479b44cc8..ea41842209 100644
--- a/src/components/lern-store/LernstoreCollectionDetailView.vue
+++ b/src/components/lern-store/LernstoreCollectionDetailView.vue
@@ -271,7 +271,6 @@ export default defineComponent({
 				notifierModule.show({
 					text: this.$t("pages.content.notification.lernstoreNotAvailable"),
 					status: "error",
-					timeout: 5000,
 				});
 			}
 		},
diff --git a/src/components/molecules/CommonCartridgeExportModal.vue b/src/components/molecules/CommonCartridgeExportModal.vue
index 921b5471a6..15ddc7f485 100644
--- a/src/components/molecules/CommonCartridgeExportModal.vue
+++ b/src/components/molecules/CommonCartridgeExportModal.vue
@@ -320,7 +320,6 @@ async function onExport(): Promise<void> {
 	notifier.show({
 		text: t("common.words.export"),
 		status: "success",
-		timeout: 5000,
 	});
 
 	const topicIds: string[] = allTopics.value
diff --git a/src/components/organisms/administration/GeneralSettings.vue b/src/components/organisms/administration/GeneralSettings.vue
index 94ede5865a..ddb9ac8931 100644
--- a/src/components/organisms/administration/GeneralSettings.vue
+++ b/src/components/organisms/administration/GeneralSettings.vue
@@ -322,7 +322,6 @@ const save = async () => {
 	notifierModule.show({
 		text: t("pages.administration.school.index.generalSettings.save.success"),
 		status: "success",
-		timeout: 5000,
 	});
 
 	if (updatedSchool.logo) {
diff --git a/src/components/organisms/administration/SchoolPolicy.vue b/src/components/organisms/administration/SchoolPolicy.vue
index 09dc286ba0..ba83a21a02 100644
--- a/src/components/organisms/administration/SchoolPolicy.vue
+++ b/src/components/organisms/administration/SchoolPolicy.vue
@@ -184,7 +184,6 @@ const deleteFile = async () => {
 	notifierModule.show({
 		text: t("pages.administration.school.index.schoolPolicy.delete.success"),
 		status: "success",
-		timeout: 5000,
 	});
 };
 
diff --git a/src/components/organisms/administration/SchoolPolicyFormDialog.vue b/src/components/organisms/administration/SchoolPolicyFormDialog.vue
index d5e9081ba6..ae38fa8706 100644
--- a/src/components/organisms/administration/SchoolPolicyFormDialog.vue
+++ b/src/components/organisms/administration/SchoolPolicyFormDialog.vue
@@ -138,7 +138,6 @@ const submit = async () => {
 		notifierModule.show({
 			text: t("pages.administration.school.index.schoolPolicy.success"),
 			status: "success",
-			timeout: 5000,
 		});
 
 		resetForm();
diff --git a/src/components/organisms/administration/SchoolTerms.vue b/src/components/organisms/administration/SchoolTerms.vue
index 2765a1dc11..c27d851c33 100644
--- a/src/components/organisms/administration/SchoolTerms.vue
+++ b/src/components/organisms/administration/SchoolTerms.vue
@@ -176,7 +176,6 @@ const deleteFile = async () => {
 	notifierModule.show({
 		text: t("pages.administration.school.index.termsOfUse.delete.success"),
 		status: "success",
-		timeout: 5000,
 	});
 };
 
diff --git a/src/components/organisms/administration/SchoolTermsFormDialog.vue b/src/components/organisms/administration/SchoolTermsFormDialog.vue
index e46bca7f42..b2e88d862c 100644
--- a/src/components/organisms/administration/SchoolTermsFormDialog.vue
+++ b/src/components/organisms/administration/SchoolTermsFormDialog.vue
@@ -143,7 +143,6 @@ export default defineComponent({
 				notifierModule.show({
 					text: t("pages.administration.school.index.termsOfUse.success"),
 					status: "success",
-					timeout: 5000,
 				});
 
 				resetForm();
diff --git a/src/components/share/ImportFlow.vue b/src/components/share/ImportFlow.vue
index 20546393a5..499998899f 100644
--- a/src/components/share/ImportFlow.vue
+++ b/src/components/share/ImportFlow.vue
@@ -114,7 +114,6 @@ const showFailureBackend = (name: string) => {
 			name,
 		}),
 		status: "error",
-		timeout: 5000,
 	});
 	closeModals();
 };
@@ -123,7 +122,6 @@ const showFailureInvalidToken = () => {
 	notifier.show({
 		text: t("components.molecules.import.options.failure.invalidToken"),
 		status: "error",
-		timeout: 5000,
 	});
 	closeModals();
 };
@@ -132,7 +130,6 @@ const showFailurePermission = () => {
 	notifier.show({
 		text: t("components.molecules.import.options.failure.permissionError"),
 		status: "error",
-		timeout: 5000,
 	});
 	closeModals();
 };
diff --git a/src/components/share/ShareModal.unit.ts b/src/components/share/ShareModal.unit.ts
index 84869cca42..841f961a9b 100644
--- a/src/components/share/ShareModal.unit.ts
+++ b/src/components/share/ShareModal.unit.ts
@@ -1,4 +1,3 @@
-import vCustomDialog from "@/components/organisms/vCustomDialog.vue";
 import ShareModalOptionsForm from "@/components/share/ShareModalOptionsForm.vue";
 import ShareModalResult from "@/components/share/ShareModalResult.vue";
 import { ShareTokenBodyParamsParentTypeEnum } from "@/serverApi/v3";
@@ -12,6 +11,7 @@ import {
 } from "@@/tests/test-utils/setup";
 import { mount } from "@vue/test-utils";
 import ShareModal from "./ShareModal.vue";
+import { VDialog } from "vuetify/components/VDialog";
 
 describe("@/components/share/ShareModal", () => {
 	let shareModuleMock: ShareModule;
@@ -25,6 +25,7 @@ describe("@/components/share/ShareModal", () => {
 					[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
 					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModuleMock,
 				},
+				stubs: { UseFocusTrap: true },
 			},
 			props: {
 				type: ShareTokenBodyParamsParentTypeEnum.Courses,
@@ -57,27 +58,32 @@ describe("@/components/share/ShareModal", () => {
 
 	it("should have the correct title", () => {
 		const { wrapper } = setup();
-		const title = wrapper.vm.$refs.textTitle as HTMLElement;
+		const title = wrapper.findComponent({ name: "v-card-title" });
 
-		expect(title.textContent).toContain(
+		expect(title.text()).toContain(
 			"components.molecules.share.options.title"
 		);
 	});
 
 	it("should call 'createShareUrl' store method when next button clicked", () => {
 		const { wrapper } = setup();
-		const dialog = wrapper.findComponent(vCustomDialog);
+		const dialog = wrapper.findComponent(VDialog);
 
-		dialog.vm.$emit("next");
+		const buttons = dialog.findAllComponents({ name: "v-btn", props: {  variant: "flat" } });
+		expect(buttons.length).toBe(2);
+		expect(buttons[0].text()).toBe("common.actions.cancel");
+		expect(buttons[1].text()).toBe("common.actions.continue");
+
+		buttons[1].vm.$emit("click");
 
 		expect(shareModuleMock.createShareUrl).toHaveBeenCalled();
 	});
 
 	it("should call 'resetShareFlow' store method when dialog closed", () => {
 		const { wrapper } = setup();
-		const dialog = wrapper.findComponent(vCustomDialog);
+		const dialog = wrapper.findComponent("share-modal-result");
 
-		dialog.vm.$emit("dialog-closed");
+		dialog.vm.$emit("after-leave");
 
 		expect(shareModuleMock.resetShareFlow).toHaveBeenCalled();
 	});
@@ -125,9 +131,10 @@ describe("@/components/share/ShareModal", () => {
 		it("should have the correct title", () => {
 			const { wrapper } = setup();
 
-			const dialog = wrapper.findComponent(vCustomDialog);
-			const cardText = dialog.findComponent({ name: "v-card-text" });
+			// const dialog = wrapper.findComponent(VDialog);
+			const cardText = wrapper.findComponent({ name: "v-card-text" });
 
+			// woher kommst du denn?
 			const infotext = cardText.find(
 				`[data-testid="share-modal-external-tools-info"]`
 			);
diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index 0234391475..65d2ca19e8 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -10,50 +10,48 @@
 				<v-card-title class="text-h4 my-2 text-break px-6 pt-4">
 					{{ modalTitle }}
 				</v-card-title>
-				<v-fade-transition>
-					<v-card-text class="pt-2 px-6">
-						<div v-if="step === 'firstStep'">
-							<p data-testid="share-options-info-text">
-								{{ t(`components.molecules.share.${type}.options.infoText`) }}
-							</p>
-							<div
-								v-if="showAlertInfo"
-								class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5"
-							>
-								<div class="mx-2">
-									<v-icon color="info" :icon="mdiInformation" />
-								</div>
-								<div data-testid="share-options-table-header">
-									{{
-										t("components.molecules.share.options.tableHeader.InfoText")
-									}}
-									<ul class="ml-6">
-										<li
-											v-for="bulletPoint in listItems"
-											:key="bulletPoint.translation"
-											:data-testId="bulletPoint.testId"
-										>
-											{{ t(bulletPoint.translation) }}
-										</li>
-									</ul>
-								</div>
+				<v-card-text class="pt-2 px-6">
+					<div v-if="step === 'firstStep'">
+						<p data-testid="share-options-info-text">
+							{{ t(`components.molecules.share.${type}.options.infoText`) }}
+						</p>
+						<div
+							v-if="showAlertInfo"
+							class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5"
+						>
+							<div class="mx-2">
+								<v-icon color="info" :icon="mdiInformation" />
+							</div>
+							<div data-testid="share-options-table-header">
+								{{
+									t("components.molecules.share.options.tableHeader.InfoText")
+								}}
+								<ul class="ml-6">
+									<li
+										v-for="bulletPoint in listItems"
+										:key="bulletPoint.translation"
+										:data-testId="bulletPoint.testId"
+									>
+										{{ t(bulletPoint.translation) }}
+									</li>
+								</ul>
 							</div>
-							<share-modal-options-form
-								:type="type"
-								@share-options-change="onShareOptionsChange"
-							/>
 						</div>
+						<share-modal-options-form
+							:type="type"
+							@share-options-change="onShareOptionsChange()"
+						/>
+					</div>
 
-						<div v-else-if="step === 'secondStep'">
-							<share-modal-result
-								:share-url="shareUrl"
-								:type="type"
-								@done="onCloseDialogOrDone"
-								@copied="onCopy"
-							/>
-						</div>
-					</v-card-text>
-				</v-fade-transition>
+					<div v-else-if="step === 'secondStep'">
+						<share-modal-result
+							:share-url="shareUrl"
+							:type="type"
+							@done="onCloseDialogOrDone"
+							@copied="onCopy"
+						/>
+					</div>
+				</v-card-text>
 				<v-card-actions class="px-6 pb-4">
 					<v-spacer />
 					<template v-if="step === 'firstStep'">
diff --git a/src/modules/feature/news-form/FormNews.vue b/src/modules/feature/news-form/FormNews.vue
index a94d324435..c2f9fef54d 100644
--- a/src/modules/feature/news-form/FormNews.vue
+++ b/src/modules/feature/news-form/FormNews.vue
@@ -223,7 +223,6 @@ export default defineComponent({
 				notifierModule.show({
 					text: String(errors[0]),
 					status: "error",
-					timeout: 5000,
 				});
 				return errors[0];
 			}
diff --git a/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.vue b/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.vue
index d188aadd9a..83df22cc73 100644
--- a/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.vue
+++ b/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.vue
@@ -322,7 +322,6 @@ const onCopyLink = () => {
 	notifierModule.show({
 		text: t("common.words.copiedToClipboard"),
 		status: "success",
-		timeout: 5000,
 	});
 };
 
diff --git a/src/modules/page/room/Rooms.page.vue b/src/modules/page/room/Rooms.page.vue
index fb955ffb0d..da50202ae8 100644
--- a/src/modules/page/room/Rooms.page.vue
+++ b/src/modules/page/room/Rooms.page.vue
@@ -90,7 +90,6 @@ const showImportSuccess = (newName: string) => {
 			name: newName,
 		}),
 		status: "success",
-		timeout: 5000,
 	});
 };
 </script>
diff --git a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
index 56373764cd..df5e1ff2e7 100644
--- a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
+++ b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
@@ -1,6 +1,6 @@
 <template>
 	<VDialog v-model="isOpen" width="360">
-		<UseFocusTrap :options="{ immediate: true }">
+		<UseFocusTrap>
 			<VCard data-testid="board-layout-dialog">
 				<VCardTitle
 					class="text-h4 text-break px-6 pt-4"
diff --git a/src/pages/LernStoreOverview.page.vue b/src/pages/LernStoreOverview.page.vue
index 3155603136..5f5b9f846d 100644
--- a/src/pages/LernStoreOverview.page.vue
+++ b/src/pages/LernStoreOverview.page.vue
@@ -182,7 +182,6 @@ const searchContent = useDebounceFn(async () => {
 		notifierModule.show({
 			text: t("pages.content.notification.lernstoreNotAvailable"),
 			status: "error",
-			timeout: 5000,
 		});
 	}
 }, 500);
@@ -230,7 +229,6 @@ const addContent = async () => {
 		notifierModule.show({
 			text: t("pages.content.notification.lernstoreNotAvailable"),
 			status: "error",
-			timeout: 5000,
 		});
 	}
 };
diff --git a/src/pages/NewsCreate.page.vue b/src/pages/NewsCreate.page.vue
index 8872467d89..e470122de6 100644
--- a/src/pages/NewsCreate.page.vue
+++ b/src/pages/NewsCreate.page.vue
@@ -65,7 +65,6 @@ export default {
 					notifierModule.show({
 						text: this.$t("components.organisms.FormNews.success.create"),
 						status: "success",
-						timeout: 5000,
 					});
 					await this.$router.push({
 						path: `/news/${this.createdNews.id}`,
@@ -75,7 +74,6 @@ export default {
 				notifierModule.show({
 					text: this.$t("components.organisms.FormNews.errors.create"),
 					status: "error",
-					timeout: 5000,
 				});
 			}
 		},
diff --git a/src/pages/NewsEdit.page.vue b/src/pages/NewsEdit.page.vue
index 9207e0dbf4..70a5e9ad29 100644
--- a/src/pages/NewsEdit.page.vue
+++ b/src/pages/NewsEdit.page.vue
@@ -118,7 +118,6 @@ const showNotifier = (type: AlertStatus, method: "remove" | "patch") => {
 	notifierModule.show({
 		text: t(`components.organisms.FormNews.${type}.${method}`),
 		status: type,
-		timeout: 5000,
 	});
 };
 </script>
diff --git a/src/pages/administration/LDAPConfig.page.vue b/src/pages/administration/LDAPConfig.page.vue
index ac8802e540..94dc3ff38f 100644
--- a/src/pages/administration/LDAPConfig.page.vue
+++ b/src/pages/administration/LDAPConfig.page.vue
@@ -205,7 +205,6 @@ export default {
 						notifierModule.show({
 							text: this.$t("pages.administration.ldap.index.verified"),
 							status: "success",
-							timeout: 5000,
 						});
 						if (systemId) {
 							this.$router.push({
diff --git a/src/pages/administration/StudentConsent.page.vue b/src/pages/administration/StudentConsent.page.vue
index 91a4b309f5..ed56d146d1 100644
--- a/src/pages/administration/StudentConsent.page.vue
+++ b/src/pages/administration/StudentConsent.page.vue
@@ -541,7 +541,6 @@ export default {
 						"pages.administration.students.consent.steps.register.success"
 					),
 					status: "success",
-					timeout: 5000,
 				});
 				this.next();
 			}
@@ -602,7 +601,6 @@ export default {
 					notifierModule.show({
 						text: this.$t("pages.administration.students.consent.table.empty"),
 						status: "error",
-						timeout: 5000,
 					});
 
 					this.$router.push({
diff --git a/src/pages/administration/StudentCreate.page.vue b/src/pages/administration/StudentCreate.page.vue
index da48b7bc99..1c088bffac 100644
--- a/src/pages/administration/StudentCreate.page.vue
+++ b/src/pages/administration/StudentCreate.page.vue
@@ -102,7 +102,6 @@ export default {
 				notifierModule.show({
 					text: this.$t("pages.administration.students.new.success"),
 					status: "success",
-					timeout: 5000,
 				});
 				this.$router.push({
 					path: `/administration/students`,
diff --git a/src/pages/administration/StudentOverview.page.vue b/src/pages/administration/StudentOverview.page.vue
index 8c18072ec5..e73cfc95fe 100644
--- a/src/pages/administration/StudentOverview.page.vue
+++ b/src/pages/administration/StudentOverview.page.vue
@@ -565,20 +565,17 @@ export default {
 							rowIds.length
 						),
 						status: "success",
-						timeout: 5000,
 					});
 				} else {
 					notifierModule.show({
 						text: this.$t("pages.administration.sendMail.alreadyRegistered"),
 						status: "info",
-						timeout: 5000,
 					});
 				}
 			} catch {
 				notifierModule.show({
 					text: this.$t("pages.administration.sendMail.error", rowIds.length),
 					status: "error",
-					timeout: 5000,
 				});
 			}
 		},
@@ -595,14 +592,12 @@ export default {
 					notifierModule.show({
 						text: this.$t("pages.administration.printQr.emptyUser"),
 						status: "info",
-						timeout: 5000,
 					});
 				}
 			} catch {
 				notifierModule.show({
 					text: this.$t("pages.administration.printQr.error", rowIds.length),
 					status: "error",
-					timeout: 5000,
 				});
 			}
 		},
@@ -616,14 +611,12 @@ export default {
 					notifierModule.show({
 						text: this.$t("pages.administration.remove.success"),
 						status: "success",
-						timeout: 5000,
 					});
 					this.find();
 				} catch {
 					notifierModule.show({
 						text: this.$t("pages.administration.remove.error"),
 						status: "error",
-						timeout: 5000,
 					});
 				}
 			};
diff --git a/src/pages/administration/TeacherCreate.page.vue b/src/pages/administration/TeacherCreate.page.vue
index 334a92691e..2450c52faf 100644
--- a/src/pages/administration/TeacherCreate.page.vue
+++ b/src/pages/administration/TeacherCreate.page.vue
@@ -79,7 +79,6 @@ export default {
 					notifierModule.show({
 						text: this.$t("pages.administration.teachers.new.success"),
 						status: "success",
-						timeout: 5000,
 					});
 					this.$router.push({
 						path: `/administration/teachers`,
diff --git a/src/pages/administration/TeacherOverview.page.vue b/src/pages/administration/TeacherOverview.page.vue
index 0d49ac968a..a6a96d4eb3 100644
--- a/src/pages/administration/TeacherOverview.page.vue
+++ b/src/pages/administration/TeacherOverview.page.vue
@@ -517,13 +517,11 @@ export default {
 				notifierModule.show({
 					text: this.$t("pages.administration.sendMail.success", rowIds.length),
 					status: "success",
-					timeout: 5000,
 				});
 			} catch {
 				notifierModule.show({
 					text: this.$t("pages.administration.sendMail.error", rowIds.length),
 					status: "error",
-					timeout: 5000,
 				});
 			}
 		},
@@ -540,14 +538,12 @@ export default {
 					notifierModule.show({
 						text: this.$t("pages.administration.printQr.emptyUser"),
 						status: "info",
-						timeout: 5000,
 					});
 				}
 			} catch {
 				notifierModule.show({
 					text: this.$t("pages.administration.printQr.error", rowIds.length),
 					status: "error",
-					timeout: 5000,
 				});
 			}
 		},
@@ -561,14 +557,12 @@ export default {
 					notifierModule.show({
 						text: this.$t("pages.administration.remove.success"),
 						status: "success",
-						timeout: 5000,
 					});
 					this.find();
 				} catch {
 					notifierModule.show({
 						text: this.$t("pages.administration.remove.error"),
 						status: "error",
-						timeout: 5000,
 					});
 				}
 			};
diff --git a/src/pages/course-rooms/CourseRoomOverview.page.vue b/src/pages/course-rooms/CourseRoomOverview.page.vue
index 9d7379ad1b..792e9acbbe 100644
--- a/src/pages/course-rooms/CourseRoomOverview.page.vue
+++ b/src/pages/course-rooms/CourseRoomOverview.page.vue
@@ -404,7 +404,6 @@ export default defineComponent({
 					name,
 				}),
 				status: "success",
-				timeout: 5000,
 			});
 		},
 		initCoursePolling(started, count = 0) {
@@ -419,7 +418,6 @@ export default defineComponent({
 							text: this.$t("components.molecules.copyResult.timeoutSuccess"),
 							status: "success",
 							autoClose: true,
-							timeout: 5000,
 						});
 					}
 				},
diff --git a/src/pages/h5p/H5PEditor.page.vue b/src/pages/h5p/H5PEditor.page.vue
index 4a3c73ea2c..ea3cb07780 100644
--- a/src/pages/h5p/H5PEditor.page.vue
+++ b/src/pages/h5p/H5PEditor.page.vue
@@ -95,7 +95,6 @@ const save = async () => {
 			notifierModule.show({
 				text: t("pages.h5p.api.success.save"),
 				status: "success",
-				timeout: 5000,
 			});
 
 			notifyParent(
@@ -111,7 +110,6 @@ const save = async () => {
 			notifierModule.show({
 				text: t("common.validation.invalid"),
 				status: "error",
-				timeout: 5000,
 			});
 		}
 	}

From 8957ad37e2a543ab75a4bb96bb3b0bf6e17fe33f Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Tue, 26 Aug 2025 14:20:12 +0200
Subject: [PATCH 11/13] wip: modify tests

---
 src/components/share/ShareModal.unit.ts | 16 +++++++++++++++-
 src/components/share/ShareModal.vue     |  7 +++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/components/share/ShareModal.unit.ts b/src/components/share/ShareModal.unit.ts
index 841f961a9b..8a71d529c9 100644
--- a/src/components/share/ShareModal.unit.ts
+++ b/src/components/share/ShareModal.unit.ts
@@ -81,7 +81,7 @@ describe("@/components/share/ShareModal", () => {
 
 	it("should call 'resetShareFlow' store method when dialog closed", () => {
 		const { wrapper } = setup();
-		const dialog = wrapper.findComponent("share-modal-result");
+		const dialog = wrapper.findComponent(VDialog);
 
 		dialog.vm.$emit("after-leave");
 
@@ -120,7 +120,21 @@ describe("@/components/share/ShareModal", () => {
 			getParentType: ShareTokenBodyParamsParentTypeEnum.Courses,
 			getShareUrl: "http://example.com",
 		});
+		// need to mock the step two state on the dialog
 		const { wrapper } = setup();
+		/*
+		// const stepOneForm = wrapper.findComponent(ShareModalOptionsForm);
+		const dialog = wrapper.findComponent(VDialog);
+
+		const buttons = dialog.findAllComponents({ name: "v-btn", props: {  variant: "flat" } });
+		expect(buttons.length).toBe(2);
+		expect(buttons[0].text()).toBe("common.actions.cancel");
+		expect(buttons[1].text()).toBe("common.actions.continue");
+
+		buttons[1].vm.$emit("click");
+		wrapper.vm.$nextTick();
+		// stepOneform.vm.$emit("share-options-change", payload);
+		*/
 		const form = wrapper.findComponent(ShareModalResult);
 
 		form.vm.$emit("copied");
diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index 65d2ca19e8..63b66ebcdb 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -39,7 +39,7 @@
 						</div>
 						<share-modal-options-form
 							:type="type"
-							@share-options-change="onShareOptionsChange()"
+							@share-options-change="onShareOptionsChange"
 						/>
 					</div>
 
@@ -116,7 +116,8 @@ const modalTitle = computed(() =>
 );
 
 const onShareOptionsChange = (newValue: ShareOptions) => {
-	shareOptions.value = newValue;
+	shareOptions.value = { hasExpiryDate: newValue.hasExpiryDate, isSchoolInternal: newValue.isSchoolInternal };
+	console.log("now we should have the new value", newValue);
 };
 const onCloseDialogOrDone = () => {
 	shareModule.resetShareFlow();
@@ -127,6 +128,8 @@ const onCleanUp = () => {
 };
 
 const onNext = () => {
+		// shareModule.createShareUrl({ isSchoolInternal: false, hasExpiryDate: false });
+		// but why is there no value available here yet?
 	if (shareOptions.value) {
 		shareModule.createShareUrl(shareOptions.value);
 		step.value = "secondStep";

From ce78506f81c5510752bb0f1e53d503c09030d68f Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Wed, 27 Aug 2025 18:56:46 +0200
Subject: [PATCH 12/13] fix ShareModal unit tests

---
 src/components/share/ShareModal.unit.ts | 57 ++++++++++++++-----------
 src/components/share/ShareModal.vue     | 32 ++++++++------
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/src/components/share/ShareModal.unit.ts b/src/components/share/ShareModal.unit.ts
index 8a71d529c9..7928c2f3a8 100644
--- a/src/components/share/ShareModal.unit.ts
+++ b/src/components/share/ShareModal.unit.ts
@@ -12,6 +12,7 @@ import {
 import { mount } from "@vue/test-utils";
 import ShareModal from "./ShareModal.vue";
 import { VDialog } from "vuetify/components/VDialog";
+import { nextTick } from "vue";
 
 describe("@/components/share/ShareModal", () => {
 	let shareModuleMock: ShareModule;
@@ -60,16 +61,17 @@ describe("@/components/share/ShareModal", () => {
 		const { wrapper } = setup();
 		const title = wrapper.findComponent({ name: "v-card-title" });
 
-		expect(title.text()).toContain(
-			"components.molecules.share.options.title"
-		);
+		expect(title.text()).toContain("components.molecules.share.options.title");
 	});
 
 	it("should call 'createShareUrl' store method when next button clicked", () => {
 		const { wrapper } = setup();
 		const dialog = wrapper.findComponent(VDialog);
 
-		const buttons = dialog.findAllComponents({ name: "v-btn", props: {  variant: "flat" } });
+		const buttons = dialog.findAllComponents({
+			name: "v-btn",
+			props: { variant: "flat" },
+		});
 		expect(buttons.length).toBe(2);
 		expect(buttons[0].text()).toBe("common.actions.cancel");
 		expect(buttons[1].text()).toBe("common.actions.continue");
@@ -88,15 +90,34 @@ describe("@/components/share/ShareModal", () => {
 		expect(shareModuleMock.resetShareFlow).toHaveBeenCalled();
 	});
 
-	it("should call 'resetShareFlow' store method when sub component emits 'done'", () => {
+	it("should return the component state to firstStep when dialog closes", () => {
+		const { wrapper } = setup();
+		const dialog = wrapper.findComponent(VDialog);
+
+		expect((wrapper.vm as unknown as typeof ShareModal).step).toBe("firstStep");
+
+		(wrapper.vm as unknown as typeof ShareModal).onNext();
+		expect((wrapper.vm as unknown as typeof ShareModal).step).toBe(
+			"secondStep"
+		);
+
+		dialog.vm.$emit("after-leave");
+		wrapper.vm.$nextTick();
+		expect((wrapper.vm as unknown as typeof ShareModal).step).toBe("firstStep");
+	});
+
+	it("should call 'resetShareFlow' store method when sub component emits 'done'", async () => {
 		shareModuleMock = createModuleMocks(ShareModule, {
 			getIsShareModalOpen: true,
 			getParentType: ShareTokenBodyParamsParentTypeEnum.Courses,
 			getShareUrl: "http://example.com",
 		});
 		const { wrapper } = setup();
-		const form = wrapper.findComponent(ShareModalResult);
 
+		(wrapper.vm as unknown as typeof ShareModal).step = "secondStep";
+		await nextTick();
+
+		const form = wrapper.findComponent(ShareModalResult);
 		form.vm.$emit("done");
 
 		expect(shareModuleMock.resetShareFlow).toHaveBeenCalled();
@@ -114,27 +135,17 @@ describe("@/components/share/ShareModal", () => {
 		).toStrictEqual(payload);
 	});
 
-	it("should call 'onCopy' method when sub component emits 'copied'", async () => {
+	it("should call 'onCopy' method when 'onNext' is called'", async () => {
 		shareModuleMock = createModuleMocks(ShareModule, {
 			getIsShareModalOpen: true,
 			getParentType: ShareTokenBodyParamsParentTypeEnum.Courses,
 			getShareUrl: "http://example.com",
 		});
-		// need to mock the step two state on the dialog
 		const { wrapper } = setup();
-		/*
-		// const stepOneForm = wrapper.findComponent(ShareModalOptionsForm);
-		const dialog = wrapper.findComponent(VDialog);
 
-		const buttons = dialog.findAllComponents({ name: "v-btn", props: {  variant: "flat" } });
-		expect(buttons.length).toBe(2);
-		expect(buttons[0].text()).toBe("common.actions.cancel");
-		expect(buttons[1].text()).toBe("common.actions.continue");
+		(wrapper.vm as unknown as typeof ShareModal).onNext();
+		await wrapper.vm.$nextTick();
 
-		buttons[1].vm.$emit("click");
-		wrapper.vm.$nextTick();
-		// stepOneform.vm.$emit("share-options-change", payload);
-		*/
 		const form = wrapper.findComponent(ShareModalResult);
 
 		form.vm.$emit("copied");
@@ -142,19 +153,15 @@ describe("@/components/share/ShareModal", () => {
 	});
 
 	describe("ctl tool info", () => {
-		it("should have the correct title", () => {
+		it("should have the correct title", async () => {
 			const { wrapper } = setup();
 
-			// const dialog = wrapper.findComponent(VDialog);
 			const cardText = wrapper.findComponent({ name: "v-card-text" });
-
-			// woher kommst du denn?
 			const infotext = cardText.find(
 				`[data-testid="share-modal-external-tools-info"]`
 			);
 
-			expect(infotext.isVisible()).toBe(true);
-			expect(infotext.text()).toEqual(
+			expect(infotext.text()).toContain(
 				"components.molecules.shareImport.options.ctlTools.infoText.unavailable"
 			);
 		});
diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index 63b66ebcdb..cff75d10c9 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -30,7 +30,7 @@
 									<li
 										v-for="bulletPoint in listItems"
 										:key="bulletPoint.translation"
-										:data-testId="bulletPoint.testId"
+										:data-testid="bulletPoint.testId"
 									>
 										{{ t(bulletPoint.translation) }}
 									</li>
@@ -116,20 +116,24 @@ const modalTitle = computed(() =>
 );
 
 const onShareOptionsChange = (newValue: ShareOptions) => {
-	shareOptions.value = { hasExpiryDate: newValue.hasExpiryDate, isSchoolInternal: newValue.isSchoolInternal };
-	console.log("now we should have the new value", newValue);
+	shareOptions.value = {
+		hasExpiryDate: newValue.hasExpiryDate,
+		isSchoolInternal: newValue.isSchoolInternal,
+	};
 };
+
 const onCloseDialogOrDone = () => {
 	shareModule.resetShareFlow();
 };
 
 const onCleanUp = () => {
 	step.value = "firstStep";
+	shareModule.resetShareFlow();
 };
 
 const onNext = () => {
-		// shareModule.createShareUrl({ isSchoolInternal: false, hasExpiryDate: false });
-		// but why is there no value available here yet?
+	// shareModule.createShareUrl({ isSchoolInternal: false, hasExpiryDate: false });
+	// but why is there no value available here yet?
 	if (shareOptions.value) {
 		shareModule.createShareUrl(shareOptions.value);
 		step.value = "secondStep";
@@ -144,7 +148,7 @@ const onCopy = () => {
 };
 
 const showAlertInfo = computed(() =>
-	["course", "columnBoard", "lessons", "room"].includes(props.type)
+	["courses", "columnBoard", "lessons", "room"].includes(props.type)
 );
 
 const listItems = computed(() => {
@@ -152,7 +156,7 @@ const listItems = computed(() => {
 		{
 			translation:
 				"components.molecules.shareImport.options.restrictions.infoText.personalData",
-			type: ["course"],
+			type: ["courses"],
 			testId: "share-options-personal-data-text",
 		},
 		{
@@ -164,40 +168,40 @@ const listItems = computed(() => {
 		{
 			translation:
 				"components.molecules.shareImport.options.restrictions.infoText.geogebra",
-			type: ["course", "lessons"],
+			type: ["courses", "lessons"],
 		},
 		{
 			translation:
 				"components.molecules.shareImport.options.restrictions.infoText.etherpad",
-			type: ["course", "room", "columnBoard", "lessons"],
+			type: ["courses", "room", "columnBoard", "lessons"],
 		},
 		{
 			translation:
 				"components.molecules.shareImport.options.restrictions.infoText.whiteboard",
-			type: ["course", "room", "columnBoard"],
+			type: ["courses", "room", "columnBoard"],
 		},
 		{
 			translation:
 				"components.molecules.shareImport.options.ctlTools.infoText.unavailable",
-			type: ["course", "room", "columnBoard"],
+			type: ["courses", "room", "columnBoard"],
 			testId: "share-modal-external-tools-info",
 		},
 		{
 			translation:
 				"components.molecules.shareImport.options.ctlTools.infoText.protected",
-			type: ["course", "room", "columnBoard"],
+			type: ["courses", "room", "columnBoard"],
 			testId: "share-modal-external-tools-protected-parameter-info",
 		},
 		{
 			translation:
 				"components.molecules.shareImport.options.restrictions.infoText.courseFiles",
-			type: ["course"],
+			type: ["courses"],
 			testId: "share-modal-coursefiles-info",
 		},
 		{
 			translation:
 				"components.molecules.shareImport.options.restrictions.infoText.courseGroups",
-			type: ["course"],
+			type: ["courses"],
 		},
 	].filter(({ type }) => type.includes(props.type));
 });

From 39de9d2084c67a3ade10c11016fa0c854190ab8c Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebastian.mueller@dataport.de>
Date: Wed, 27 Aug 2025 19:20:05 +0200
Subject: [PATCH 13/13] fix more tests

---
 src/modules/feature/room/RoomCopyFlow.unit.ts                 | 1 +
 src/modules/feature/room/RoomCopyFlow.vue                     | 4 ++--
 .../room/roomMembers/dialogs/InviteMembersDialog.unit.ts      | 1 -
 src/pages/h5p/H5PEditor.page.unit.ts                          | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/modules/feature/room/RoomCopyFlow.unit.ts b/src/modules/feature/room/RoomCopyFlow.unit.ts
index 4ce1d25ae8..c7fd2da27f 100644
--- a/src/modules/feature/room/RoomCopyFlow.unit.ts
+++ b/src/modules/feature/room/RoomCopyFlow.unit.ts
@@ -56,6 +56,7 @@ describe("@feature-room/RoomCopyFlow", () => {
 					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModuleMock,
 					["loadingStateModule"]: loadingStateModuleMock,
 				},
+				stubs: { UseFocusTrap: true },
 			},
 			props: {
 				room,
diff --git a/src/modules/feature/room/RoomCopyFlow.vue b/src/modules/feature/room/RoomCopyFlow.vue
index 1b869b2b09..dad7fa6c3c 100644
--- a/src/modules/feature/room/RoomCopyFlow.vue
+++ b/src/modules/feature/room/RoomCopyFlow.vue
@@ -45,12 +45,12 @@ onMounted(() => {
 
 const onClose = () => {
 	isRoomCopyInfoDialogOpen.value = false;
-	emit("copy:ended");
 };
 
 const onCancelCopy = () => {
-	emit("copy:cancel");
 	onClose();
+	emit("copy:cancel");
+	emit("copy:ended");
 };
 
 const onConfirmCopy = async () => {
diff --git a/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.unit.ts b/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.unit.ts
index 60e3e35f7f..f660b86c7f 100644
--- a/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.unit.ts
+++ b/src/modules/feature/room/roomMembers/dialogs/InviteMembersDialog.unit.ts
@@ -319,7 +319,6 @@ describe("InviteMembersDialog", () => {
 					expect(notifierModule.show).toHaveBeenCalledWith({
 						text: "common.words.copiedToClipboard",
 						status: "success",
-						timeout: 5000,
 					});
 				});
 			});
diff --git a/src/pages/h5p/H5PEditor.page.unit.ts b/src/pages/h5p/H5PEditor.page.unit.ts
index 408fe9ef66..46be6ae29b 100644
--- a/src/pages/h5p/H5PEditor.page.unit.ts
+++ b/src/pages/h5p/H5PEditor.page.unit.ts
@@ -243,7 +243,6 @@ describe("H5PEditorPage", () => {
 				expect(notifierModule.show).toHaveBeenCalledWith({
 					text: "pages.h5p.api.success.save",
 					status: "success",
-					timeout: 5000,
 				});
 			});
 		});
@@ -292,7 +291,6 @@ describe("H5PEditorPage", () => {
 				expect(notifierModule.show).toHaveBeenCalledWith({
 					text: "common.validation.invalid",
 					status: "error",
-					timeout: 5000,
 				});
 			});
 		});
@@ -341,7 +339,6 @@ describe("H5PEditorPage", () => {
 				expect(notifierModule.show).toHaveBeenCalledWith({
 					text: "common.validation.invalid",
 					status: "error",
-					timeout: 5000,
 				});
 			});
 		});