Merge branch 'main' into BC-6867-optimize-list-board

hpi-schul-cloud · Apr 26, 2024 · cb0d1b2 · cb0d1b2
2 parents 096aa88 + 81cc205
commit cb0d1b2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 22 deletions.
diff --git a/...es/feature/board-collaborative-text-editor-element/CollaborativeTextEditorElement.unit.ts b/...es/feature/board-collaborative-text-editor-element/CollaborativeTextEditorElement.unit.ts
@@ -207,7 +207,7 @@ describe("CollaborativeTextEditorElement", () => {
 				const boardMenu = wrapper.findComponent(
 					CollaborativeTextEditorElementMenu
 				);
-				boardMenu.vm.$emit("delete:element", Promise.resolve(true));
+				boardMenu.vm.$emit("delete:element");
 				await nextTick();
 
 				expect(wrapper.emitted("delete:element")).toBeTruthy();

diff --git a/...odules/feature/board-collaborative-text-editor-element/CollaborativeTextEditorElement.vue b/...odules/feature/board-collaborative-text-editor-element/CollaborativeTextEditorElement.vue
@@ -88,13 +88,8 @@ const onKeydownArrow = (event: KeyboardEvent) => {
 		emit("move-keyboard:edit", event);
 	}
 };
-const onDelete = async (confirmation: Promise<boolean>) => {
-	const shouldDelete = await confirmation;
-	if (shouldDelete) {
-		emit("delete:element", props.element.id);
-	}
-};
 
+const onDelete = () => emit("delete:element", props.element.id);
 const onMoveUp = () => emit("move-up:edit");
 const onMoveDown = () => emit("move-down:edit");
 </script>
diff --git a/src/modules/feature/board/board/BoardColumnGhost.unit.ts b/src/modules/feature/board/board/BoardColumnGhost.unit.ts
@@ -13,6 +13,9 @@ describe("BoardColumnGhost", () => {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
 			},
+			props: {
+				isListBoard: false,
+			},
 		});
 
 		return { wrapper };

diff --git a/src/modules/feature/board/board/BoardColumnGhost.vue b/src/modules/feature/board/board/BoardColumnGhost.vue
@@ -1,8 +1,9 @@
 <template>
 	<div ref="ghostColumnRef" :class="{ 'pl-2': !isListBoard }">
 		<BoardColumnGhostHeader
+			:label="title"
 			:isColumnActive="isColumnHovered"
-			:isListBoard="isListBoard"
+			:centred="isListBoard"
 			@add-column="onAddColumn"
 			data-testid="add-column"
 			:class="{ 'px-4': isListBoard }"
@@ -39,6 +40,7 @@
 import { useElementHover } from "@vueuse/core";
 import { Sortable } from "sortablejs-vue3";
 import { computed, ref } from "vue";
+import { useI18n } from "vue-i18n";
 import { useDragAndDrop } from "../shared/DragAndDrop.composable";
 import BoardColumnGhostHeader from "./BoardColumnGhostHeader.vue";
 
@@ -75,6 +77,14 @@ const sortableGhostClasses = computed(() => {
 	}
 	return classes;
 });
+
+const { t } = useI18n();
+
+const title = computed(() =>
+	props.isListBoard
+		? t("components.board.column.ghost.list.placeholder")
+		: t("components.board.column.ghost.column.placeholder")
+);
 </script>
 
 <style scoped>

diff --git a/src/modules/feature/board/board/BoardColumnGhostHeader.unit.ts b/src/modules/feature/board/board/BoardColumnGhostHeader.unit.ts
@@ -15,6 +15,7 @@ describe("BoardColumnGhostHeader", () => {
 			},
 			propsData: {
 				isColumnActive: true,
+				isListBoard: false,
 				label: "Add column",
 			},
 		});

diff --git a/src/modules/feature/board/board/BoardColumnGhostHeader.vue b/src/modules/feature/board/board/BoardColumnGhostHeader.vue
@@ -2,7 +2,7 @@
 	<div class="mb-4" ref="headerRef">
 		<div
 			class="d-flex flex-column justify-space-between pt-2"
-			:class="isListBoard ? 'center' : 'align-start'"
+			:class="centred ? 'center' : 'align-start'"
 		>
 			<VBtn
 				elevation="0"
@@ -11,7 +11,7 @@
 				:color="isColumnActive ? '' : 'grey-darken-2'"
 				@click="onAddColumn"
 			>
-				<VIcon>{{ mdiPlus }}</VIcon> {{ title }}
+				<VIcon>{{ mdiPlus }}</VIcon> {{ label }}
 			</VBtn>
 		</div>
 		<VDivider aria-hidden="true" class="border-opacity-100" />
@@ -20,30 +20,24 @@
 
 <script setup lang="ts">
 import { mdiPlus } from "@mdi/js";
-import { computed } from "vue";
-import { useI18n } from "vue-i18n";
 
-const props = defineProps({
+defineProps({
 	isColumnActive: {
 		type: Boolean,
 		required: true,
 	},
-	isListBoard: { type: Boolean, required: true },
+	label: {
+		type: String,
+		required: true,
+	},
+	centred: { type: Boolean },
 });
 
 const emit = defineEmits(["add-column"]);
 
-const { t } = useI18n();
-
 const onAddColumn = () => {
 	emit("add-column");
 };
-
-const title = computed(() =>
-	props.isListBoard
-		? t("components.board.column.ghost.list.placeholder")
-		: t("components.board.column.ghost.column.placeholder")
-);
 </script>
 
 <style scoped>