Merge branch 'main' into EW-1070

hpi-schul-cloud · Dec 13, 2024 · 805acbc · 805acbc
2 parents 81b8ad5 + 3319a03
commit 805acbc
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/src/locales/de.ts b/src/locales/de.ts
@@ -324,6 +324,7 @@ export default {
 	"components.base.showPassword": "Passwort anzeigen",
 	"components.board.action.addCard": "Karte hinzufügen",
 	"components.board.action.delete": "Löschen",
+	"components.board.action.deleteFromSection": "Aus Abschnitt entfernen",
 	"components.board.action.detail-view": "Detailansicht",
 	"components.board.action.download": "Herunterladen",
 	"components.board.action.moveDown": "Nach unten verschieben",

diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -322,6 +322,7 @@ export default {
 	"components.base.showPassword": "Show password",
 	"components.board.action.addCard": "Add card",
 	"components.board.action.delete": "Delete",
+	"components.board.action.deleteFromSection": "Remove from section",
 	"components.board.action.detail-view": "Detail view",
 	"components.board.action.download": "Download",
 	"components.board.action.moveDown": "Move down",

diff --git a/src/locales/es.ts b/src/locales/es.ts
@@ -327,6 +327,7 @@ export default {
 	"components.base.showPassword": "Mostrar contraseña",
 	"components.board.action.addCard": "Añadir tarjeta",
 	"components.board.action.delete": "Eliminar",
+	"components.board.action.deleteFromSection": "Quitar de la sección",
 	"components.board.action.detail-view": "Vista detallada",
 	"components.board.action.download": "Descargar",
 	"components.board.action.moveDown": "Bajar",

diff --git a/src/locales/uk.ts b/src/locales/uk.ts
@@ -330,6 +330,7 @@ export default {
 	"components.base.showPassword": "Показати пароль",
 	"components.board.action.addCard": "Додати картка",
 	"components.board.action.delete": "Видалити",
+	"components.board.action.deleteFromSection": "Видалити з розділу",
 	"components.board.action.detail-view": "Детальний вигляд",
 	"components.board.action.download": "Завантажити",
 	"components.board.action.moveDown": "Рухатися вниз",

diff --git a/src/modules/feature/media-shelf/MediaBoard.vue b/src/modules/feature/media-shelf/MediaBoard.vue
@@ -53,15 +53,13 @@
 				v-if="board.lines.length < lineLimit"
 				@create:line="createLine"
 			/>
-			<ConfirmationDialog />
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { MediaAvailableLineResponse, MediaBoardResponse } from "@/serverApi/v3";
 import { DeviceMediaQuery } from "@/types/enum/device-media-query.enum";
-import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { extractDataAttribute, useSharedEditMode } from "@util-board";
 import { useMediaQuery } from "@vueuse/core";
 import { SortableEvent } from "sortablejs";

diff --git a/src/modules/feature/media-shelf/MediaBoardExternalToolDeletedElement.unit.ts b/src/modules/feature/media-shelf/MediaBoardExternalToolDeletedElement.unit.ts
@@ -1,15 +1,15 @@
+import { deletedElementResponseFactory } from "@@/tests/test-utils";
 import {
 	createTestingI18n,
 	createTestingVuetify,
 } from "@@/tests/test-utils/setup";
-import { deletedElementResponseFactory } from "@@/tests/test-utils";
+import { BoardMenuAction } from "@ui-board";
 import { mount } from "@vue/test-utils";
-import { BoardMenuActionDelete } from "@ui-board";
 import { nextTick } from "vue";
 import { ComponentProps } from "vue-component-type-helpers";
 import { VBtn } from "vuetify/lib/components/index.mjs";
-import MediaBoardExternalToolElementMenu from "./MediaBoardExternalToolElementMenu.vue";
 import MediaBoardDeletedElement from "./MediaBoardExternalToolDeletedElement.vue";
+import MediaBoardExternalToolElementMenu from "./MediaBoardExternalToolElementMenu.vue";
 
 describe("MediaBoardDeletedElement", () => {
 	const getWrapper = (
@@ -68,7 +68,7 @@ describe("MediaBoardDeletedElement", () => {
 					.getComponent(VBtn);
 				await menuBtn.trigger("click");
 
-				const deleteAction = wrapper.findComponent(BoardMenuActionDelete);
+				const deleteAction = wrapper.findComponent(BoardMenuAction);
 
 				expect(deleteAction.exists()).toEqual(true);
 			});

diff --git a/src/modules/feature/media-shelf/MediaBoardExternalToolElementMenu.unit.ts b/src/modules/feature/media-shelf/MediaBoardExternalToolElementMenu.unit.ts
@@ -2,7 +2,7 @@ import {
 	createTestingI18n,
 	createTestingVuetify,
 } from "@@/tests/test-utils/setup";
-import { BoardMenuActionDelete } from "@ui-board";
+import { BoardMenuAction } from "@ui-board";
 import { shallowMount } from "@vue/test-utils";
 import MediaBoardExternalToolElementMenu from "./MediaBoardExternalToolElementMenu.vue";
 
@@ -27,15 +27,15 @@ describe("MediaBoardExternalToolElementMenu", () => {
 		it("should have a menu option to delete", () => {
 			const { wrapper } = getWrapper();
 
-			const menuItem = wrapper.findComponent(BoardMenuActionDelete);
+			const menuItem = wrapper.findComponent(BoardMenuAction);
 
 			expect(menuItem.exists()).toEqual(true);
 		});
 
 		it("should emit the delete event on click", async () => {
 			const { wrapper } = getWrapper();
 
-			const menuItem = wrapper.findComponent(BoardMenuActionDelete);
+			const menuItem = wrapper.findComponent(BoardMenuAction);
 
 			await menuItem.trigger("click");
 

diff --git a/src/modules/feature/media-shelf/MediaBoardExternalToolElementMenu.vue b/src/modules/feature/media-shelf/MediaBoardExternalToolElementMenu.vue
@@ -5,21 +5,21 @@
 		has-background
 		data-testid="deleted-element-menu-btn"
 	>
-		<BoardMenuActionDelete @click="onDelete" />
+		<BoardMenuAction
+			:icon="mdiTrashCanOutline"
+			data-testid="board-menu-action-delete"
+			@click="$emit('delete:element')"
+		>
+			{{ $t("components.board.action.deleteFromSection") }}
+		</BoardMenuAction>
 	</BoardMenu>
 </template>
 
 <script setup lang="ts">
-import { BoardMenu, BoardMenuActionDelete, BoardMenuScope } from "@ui-board";
+import { mdiTrashCanOutline } from "@icons/material";
+import { BoardMenu, BoardMenuAction, BoardMenuScope } from "@ui-board";
 
-const emit = defineEmits<{
+defineEmits<{
 	(e: "delete:element"): void;
 }>();
-
-const onDelete = async (confirmation: Promise<boolean>) => {
-	const shouldDelete = await confirmation;
-	if (shouldDelete) {
-		emit("delete:element");
-	}
-};
 </script>