BC-8513 - Fix infos for sharing and importing (#3482)

* Add conditional rendering for alert info in ImportModal and ShareModal * Add whiteboards in share and import alert list --------- Co-authored-by: Franz Schuenzel <[email protected]> Co-authored-by: Martin Schuhmacher <[email protected]>
hpi-schul-cloud · Dec 20, 2024 · 7953f45 · 7953f45
1 parent d780877
commit 7953f45
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 40 deletions.
diff --git a/src/components/share/ImportModal.vue b/src/components/share/ImportModal.vue
@@ -18,20 +18,47 @@
 
 		<template #content>
 			<div>
-				<div class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5">
+				<div
+					class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5"
+					v-if="showAlertInfo"
+				>
 					<div class="mx-2">
 						<v-icon color="info" :icon="mdiInformation" />
 					</div>
 					<div data-testid="import-options-table-header">
 						{{ t("components.molecules.import.options.tableHeader.InfoText") }}
 						<ul class="ml-6">
-							<li data-testid="import-options-personal-data-text">
+							<li
+								data-testid="import-options-personal-data-text"
+								v-if="showCourseInfo"
+							>
 								{{
 									t(
 										"components.molecules.shareImport.options.restrictions.infoText.personalData"
 									)
 								}}
 							</li>
+							<li v-if="showCourseInfo || showLessonInfo">
+								{{
+									t(
+										"components.molecules.shareImport.options.restrictions.infoText.geogebra"
+									)
+								}}
+							</li>
+							<li v-if="showCourseInfo || showBoardInfo || showLessonInfo">
+								{{
+									t(
+										"components.molecules.shareImport.options.restrictions.infoText.etherpad"
+									)
+								}}
+							</li>
+							<li v-if="showCourseInfo || showBoardInfo">
+								{{
+									t(
+										"components.molecules.shareImport.options.restrictions.infoText.whiteboard"
+									)
+								}}
+							</li>
 							<li
 								v-if="showCtlToolsInfo"
 								data-testid="import-modal-external-tools-info"
@@ -52,28 +79,18 @@
 									)
 								}}
 							</li>
-							<li data-testid="import-modal-coursefiles-info">
+							<li
+								data-testid="import-modal-coursefiles-info"
+								v-if="showCourseInfo"
+							>
 								{{
 									t(
 										"components.molecules.shareImport.options.restrictions.infoText.courseFiles"
 									)
 								}}
 							</li>
-							<li>
-								{{
-									t(
-										"components.molecules.shareImport.options.restrictions.infoText.etherpad"
-									)
-								}}
-							</li>
-							<li>
-								{{
-									t(
-										"components.molecules.shareImport.options.restrictions.infoText.geogebra"
-									)
-								}}
-							</li>
-							<li>
+
+							<li v-if="showCourseInfo">
 								{{
 									t(
 										"components.molecules.shareImport.options.restrictions.infoText.courseGroups"
@@ -138,4 +155,24 @@ const showCtlToolsInfo = computed(() => {
 		(props.parentType === "courses" || props.parentType === "columnBoard")
 	);
 });
+
+const showAlertInfo = computed(() => {
+	return (
+		props.parentType === "courses" ||
+		props.parentType === "columnBoard" ||
+		props.parentType === "lessons"
+	);
+});
+
+const showCourseInfo = computed(() => {
+	return props.parentType === "courses";
+});
+
+const showBoardInfo = computed(() => {
+	return props.parentType === "columnBoard";
+});
+
+const showLessonInfo = computed(() => {
+	return props.parentType === "lessons";
+});
 </script>
diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
@@ -21,20 +21,47 @@
 					<p data-testid="share-options-info-text">
 						{{ t(`components.molecules.share.${type}.options.infoText`) }}
 					</p>
-					<div class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5">
+					<div
+						class="d-flex flex-row pa-2 mb-4 rounded bg-blue-lighten-5"
+						v-if="showAlertInfo"
+					>
 						<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 data-testid="share-options-personal-data-text">
+								<li
+									data-testid="share-options-personal-data-text"
+									v-if="showCourseInfo"
+								>
 									{{
 										t(
 											"components.molecules.shareImport.options.restrictions.infoText.personalData"
 										)
 									}}
 								</li>
+								<li v-if="showCourseInfo || showLessonInfo">
+									{{
+										t(
+											"components.molecules.shareImport.options.restrictions.infoText.geogebra"
+										)
+									}}
+								</li>
+								<li v-if="showCourseInfo || showBoardInfo || showLessonInfo">
+									{{
+										t(
+											"components.molecules.shareImport.options.restrictions.infoText.etherpad"
+										)
+									}}
+								</li>
+								<li v-if="showCourseInfo || showBoardInfo">
+									{{
+										t(
+											"components.molecules.shareImport.options.restrictions.infoText.whiteboard"
+										)
+									}}
+								</li>
 								<li
 									v-if="showCtlToolsInfo"
 									data-testid="share-modal-external-tools-info"
@@ -55,28 +82,17 @@
 										)
 									}}
 								</li>
-								<li data-testid="share-modal-coursefiles-info">
+								<li
+									data-testid="share-modal-coursefiles-info"
+									v-if="showCourseInfo"
+								>
 									{{
 										t(
 											"components.molecules.shareImport.options.restrictions.infoText.courseFiles"
 										)
 									}}
 								</li>
-								<li>
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.etherpad"
-										)
-									}}
-								</li>
-								<li>
-									{{
-										t(
-											"components.molecules.shareImport.options.restrictions.infoText.geogebra"
-										)
-									}}
-								</li>
-								<li>
+								<li v-if="showCourseInfo">
 									{{
 										t(
 											"components.molecules.shareImport.options.restrictions.infoText.courseGroups"
@@ -195,4 +211,23 @@ const showCtlToolsInfo = computed(() => {
 		(props.type === "courses" || props.type === "columnBoard")
 	);
 });
+
+const showAlertInfo = computed(() => {
+	return (
+		props.type === "courses" ||
+		props.type === "columnBoard" ||
+		props.type === "lessons"
+	);
+});
+
+const showCourseInfo = computed(() => {
+	return props.type === "courses";
+});
+
+const showBoardInfo = computed(() => {
+	return props.type === "columnBoard";
+});
+const showLessonInfo = computed(() => {
+	return props.type === "lessons";
+});
 </script>
diff --git a/src/locales/de.ts b/src/locales/de.ts
@@ -683,8 +683,10 @@ export default {
 		"Dateien unter Kurs-Dateien",
 	"components.molecules.shareImport.options.restrictions.infoText.etherpad":
 		"Inhalte aus Etherpads",
+	"components.molecules.shareImport.options.restrictions.infoText.whiteboard":
+		"Inhalte aus Whiteboards",
 	"components.molecules.shareImport.options.restrictions.infoText.geogebra":
-		"Geogebra IDs und",
+		"Geogebra IDs",
 	"components.molecules.shareImport.options.restrictions.infoText.courseGroups":
 		"Kursgruppen",
 	"components.molecules.share.options.tableHeader.InfoText":

diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -665,8 +665,10 @@ export default {
 		"Files under Course Files",
 	"components.molecules.shareImport.options.restrictions.infoText.etherpad":
 		"Content from Etherpads",
+	"components.molecules.shareImport.options.restrictions.infoText.whiteboard":
+		"Content from Whiteboards",
 	"components.molecules.shareImport.options.restrictions.infoText.geogebra":
-		"Geogebra IDs and",
+		"Geogebra IDs",
 	"components.molecules.shareImport.options.restrictions.infoText.courseGroups":
 		"Course groups",
 	"components.molecules.share.options.tableHeader.InfoText":

diff --git a/src/locales/es.ts b/src/locales/es.ts
@@ -688,8 +688,10 @@ export default {
 		"Archivos en Archivos de curso",
 	"components.molecules.shareImport.options.restrictions.infoText.etherpad":
 		"Contenido de Etherpads",
+	"components.molecules.shareImport.options.restrictions.infoText.whiteboard":
+		"Contenido de Whiteboards",
 	"components.molecules.shareImport.options.restrictions.infoText.geogebra":
-		"ID de Geogebra y",
+		"ID de Geogebra",
 	"components.molecules.shareImport.options.restrictions.infoText.courseGroups":
 		"Grupos de cursos",
 	"components.molecules.share.options.tableHeader.InfoText":

diff --git a/src/locales/uk.ts b/src/locales/uk.ts
@@ -686,8 +686,10 @@ export default {
 		"Файли в розділі Файли курсу",
 	"components.molecules.shareImport.options.restrictions.infoText.etherpad":
 		"Вміст із Etherpads",
+	"components.molecules.shareImport.options.restrictions.infoText.whiteboard":
+		"Вміст із Whiteboards",
 	"components.molecules.shareImport.options.restrictions.infoText.geogebra":
-		"Ідентифікатори Geogebra та",
+		"Ідентифікатори Geogebra",
 	"components.molecules.shareImport.options.restrictions.infoText.courseGroups":
 		"Групи курсів",
 	"components.molecules.share.options.tableHeader.InfoText":