From b8f488145ccb0ca35891ebe1a2d8dbc975686889 Mon Sep 17 00:00:00 2001
From: Uwe Ilgenstein <uwe.ilgenstein@dataport.de>
Date: Tue, 7 Nov 2023 17:30:06 +0100
Subject: [PATCH] BC-5508: fix v-list

---
 .../molecules/vImportUsersMatchSearch.vue     | 22 ++++----
 .../organisms/administration/SchoolPolicy.vue | 42 +++++++---------
 .../organisms/administration/SchoolTerms.vue  | 40 +++++++--------
 src/components/topbar/StatusAlerts.vue        | 50 +++++++++----------
 4 files changed, 73 insertions(+), 81 deletions(-)

diff --git a/src/components/molecules/vImportUsersMatchSearch.vue b/src/components/molecules/vImportUsersMatchSearch.vue
index 0ce8167662..1c33598462 100644
--- a/src/components/molecules/vImportUsersMatchSearch.vue
+++ b/src/components/molecules/vImportUsersMatchSearch.vue
@@ -34,7 +34,7 @@
 					<v-col class="md-6">
 						<v-card-title>{{ ldapSource }}</v-card-title>
 						<v-list-item>
-							<v-list-item-content data-testid="edited-item">
+							<div data-testid="edited-item">
 								<v-list-item-title data-testid="edited-item-fullname"
 									>{{ `${editedItem.firstName} ${editedItem.lastName}` }}
 								</v-list-item-title>
@@ -57,13 +57,13 @@
 										}`
 									}}
 								</v-list-item-subtitle>
-							</v-list-item-content>
+							</div>
 						</v-list-item>
 					</v-col>
 					<v-col class="md-6">
 						<v-card-title>{{ $theme.name }}</v-card-title>
 						<v-list-item>
-							<v-list-item-content v-if="selectedItem">
+							<div v-if="selectedItem">
 								<v-list-item-title>
 									{{ `${selectedItem.firstName} ${selectedItem.lastName}` }}
 								</v-list-item-title>
@@ -77,8 +77,8 @@
 										}`
 									}}
 								</v-list-item-subtitle>
-							</v-list-item-content>
-							<v-list-item-content v-else-if="editedItem.match">
+							</div>
+							<div v-else-if="editedItem.match">
 								<v-list-item-title>
 									{{
 										`${editedItem.match.firstName} ${editedItem.match.lastName}`
@@ -94,10 +94,10 @@
 										}`
 									}}
 								</v-list-item-subtitle>
-							</v-list-item-content>
-							<v-list-item-content v-else>{{
-								$t("components.molecules.importUsersMatch.unMatched")
-							}}</v-list-item-content>
+							</div>
+							<div v-else>
+								{{ $t("components.molecules.importUsersMatch.unMatched") }}
+							</div>
 						</v-list-item>
 						<v-autocomplete
 							v-model="selectedItem"
@@ -135,7 +135,7 @@
 								</v-chip>
 							</template>
 							<template #item="{ item }">
-								<v-list-item-content max-width="450px">
+								<div style="max-width: 450px">
 									<v-list-item-title>
 										{{ item.firstName }} {{ item.lastName }}
 									</v-list-item-title>
@@ -149,7 +149,7 @@
 											)}: ${item.loginName}`
 										}}
 									</v-list-item-subtitle>
-								</v-list-item-content>
+								</div>
 							</template>
 							<template #append-item>
 								<div v-intersect="endIntersect" class="pa-2" />
diff --git a/src/components/organisms/administration/SchoolPolicy.vue b/src/components/organisms/administration/SchoolPolicy.vue
index fa596793c1..b771c502bc 100644
--- a/src/components/organisms/administration/SchoolPolicy.vue
+++ b/src/components/organisms/administration/SchoolPolicy.vue
@@ -30,30 +30,26 @@
 				:class="{ 'item-no-action': !privacyPolicy }"
 				:ripple="privacyPolicy !== null"
 			>
-				<v-list-item-icon class="me-4">
+				<template v-slot:prepend>
 					<v-icon>$file_pdf_outline</v-icon>
-				</v-list-item-icon>
-				<v-list-item-content>
-					<v-list-item-title class="text-body-1 text-black mb-2">
-						{{ t("pages.administration.school.index.schoolPolicy.fileName") }}
-					</v-list-item-title>
-					<v-list-item-subtitle class="text-body-2">
-						<template v-if="privacyPolicy">
-							{{
-								t("pages.administration.school.index.schoolPolicy.uploadedOn", {
-									date: formatDate(privacyPolicy.publishedAt),
-								})
-							}}
-						</template>
-						<template v-else>
-							{{
-								t(
-									"pages.administration.school.index.schoolPolicy.notUploadedYet"
-								)
-							}}
-						</template>
-					</v-list-item-subtitle>
-				</v-list-item-content>
+				</template>
+				<v-list-item-title class="text-body-1 text-black mb-2">
+					{{ t("pages.administration.school.index.schoolPolicy.fileName") }}
+				</v-list-item-title>
+				<v-list-item-subtitle class="text-body-2">
+					<template v-if="privacyPolicy">
+						{{
+							t("pages.administration.school.index.schoolPolicy.uploadedOn", {
+								date: formatDate(privacyPolicy.publishedAt),
+							})
+						}}
+					</template>
+					<template v-else>
+						{{
+							t("pages.administration.school.index.schoolPolicy.notUploadedYet")
+						}}
+					</template>
+				</v-list-item-subtitle>
 				<v-list-item-action
 					v-if="hasSchoolEditPermission"
 					data-testid="edit-button"
diff --git a/src/components/organisms/administration/SchoolTerms.vue b/src/components/organisms/administration/SchoolTerms.vue
index 4499a99349..134a9d7579 100644
--- a/src/components/organisms/administration/SchoolTerms.vue
+++ b/src/components/organisms/administration/SchoolTerms.vue
@@ -30,28 +30,26 @@
 				:class="{ 'item-no-action': !termsOfUse }"
 				:ripple="termsOfUse !== null"
 			>
-				<v-list-item-icon class="me-4">
+				<template v-slot:prepend>
 					<v-icon>$file_pdf_outline</v-icon>
-				</v-list-item-icon>
-				<v-list-item-content>
-					<v-list-item-title class="text-body-1 text-black mb-2">
-						{{ t("pages.administration.school.index.termsOfUse.fileName") }}
-					</v-list-item-title>
-					<v-list-item-subtitle class="text-body-2">
-						<template v-if="termsOfUse">
-							{{
-								t("pages.administration.school.index.termsOfUse.uploadedOn", {
-									date: formatDate(termsOfUse.publishedAt),
-								})
-							}}
-						</template>
-						<template v-else>
-							{{
-								t("pages.administration.school.index.termsOfUse.notUploadedYet")
-							}}
-						</template>
-					</v-list-item-subtitle>
-				</v-list-item-content>
+				</template>
+				<v-list-item-title class="text-body-1 text-black mb-2">
+					{{ t("pages.administration.school.index.termsOfUse.fileName") }}
+				</v-list-item-title>
+				<v-list-item-subtitle class="text-body-2">
+					<template v-if="termsOfUse">
+						{{
+							t("pages.administration.school.index.termsOfUse.uploadedOn", {
+								date: formatDate(termsOfUse.publishedAt),
+							})
+						}}
+					</template>
+					<template v-else>
+						{{
+							t("pages.administration.school.index.termsOfUse.notUploadedYet")
+						}}
+					</template>
+				</v-list-item-subtitle>
 				<v-list-item-action
 					v-if="hasSchoolEditPermission"
 					data-testid="edit-button"
diff --git a/src/components/topbar/StatusAlerts.vue b/src/components/topbar/StatusAlerts.vue
index 67dbb3f0cf..e2bbda22a7 100644
--- a/src/components/topbar/StatusAlerts.vue
+++ b/src/components/topbar/StatusAlerts.vue
@@ -12,37 +12,35 @@
 			:data-test-id="`alert-item-${index}`"
 			class="alert-item"
 		>
-			<v-list-item-icon class="mt-3 mr-3">
+			<template v-slot:prepend="">
 				<v-icon
 					:color="`rgba(var(--v-theme-${getIconTag(item.status).color}))`"
 				>
 					{{ getIconTag(item.status).icon }}
 				</v-icon>
-			</v-list-item-icon>
-			<v-list-item-content>
-				<v-list-item-title
-					:data-testid="`alert-title-${index}`"
-					class="subtitle-1 ma-0"
-				>
-					{{ item.title }}
-				</v-list-item-title>
-				<v-list-item-subtitle
-					:data-testid="`alert-text-${index}`"
-					class="subtitle-2 text--primary ma-0 mt-1"
-				>
-					{{ item.text }}
-				</v-list-item-subtitle>
-				<v-list-item-subtitle
-					class="text-left text-caption d-flex flex-row alert-date text--secondary mt-0 mt-2"
-					:data-testid="`alert-date-${index}`"
-				>
-					<template v-if="item.timestamp !== item.createdAt">
-						{{ $t("common.labels.updateAt") }}
-						{{ formatDate(item.timestamp) }} |
-					</template>
-					{{ $t("common.labels.createAt") }} {{ formatDate(item.createdAt) }}
-				</v-list-item-subtitle>
-			</v-list-item-content>
+			</template>
+			<v-list-item-title
+				:data-testid="`alert-title-${index}`"
+				class="text-subtitle-1 ma-0"
+			>
+				{{ item.title }}
+			</v-list-item-title>
+			<v-list-item-subtitle
+				:data-testid="`alert-text-${index}`"
+				class="text-subtitle-2 text--primary ma-0 mt-1"
+			>
+				{{ item.text }}
+			</v-list-item-subtitle>
+			<v-list-item-subtitle
+				class="text-left text-caption d-flex flex-row alert-date text--secondary mt-0 mt-2"
+				:data-testid="`alert-date-${index}`"
+			>
+				<template v-if="item.timestamp !== item.createdAt">
+					{{ $t("common.labels.updateAt") }}
+					{{ formatDate(item.timestamp) }} |
+				</template>
+				{{ $t("common.labels.createAt") }} {{ formatDate(item.createdAt) }}
+			</v-list-item-subtitle>
 		</v-list-item>
 	</v-list>
 </template>