From 7224770f0b3254e69dc959a90c333197b666980b Mon Sep 17 00:00:00 2001
From: Uwe Ilgenstein <uwe.ilgenstein@dataport.de>
Date: Tue, 17 Oct 2023 16:43:10 +0200
Subject: [PATCH] BC-5506: fix ldap sections v-model

---
 .../organisms/Ldap/LdapClassesSection.vue     | 32 +++++++-------
 .../organisms/Ldap/LdapConnectionSection.vue  | 28 ++++++-------
 .../organisms/Ldap/LdapRolesSection.vue       | 42 ++++++++++---------
 .../organisms/Ldap/LdapUsersSection.vue       | 40 +++++++++---------
 4 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/src/components/organisms/Ldap/LdapClassesSection.vue b/src/components/organisms/Ldap/LdapClassesSection.vue
index b7521922e0..fbed240a18 100644
--- a/src/components/organisms/Ldap/LdapClassesSection.vue
+++ b/src/components/organisms/Ldap/LdapClassesSection.vue
@@ -22,10 +22,10 @@
 			:placeholder="$t('pages.administration.ldap.classes.path.title')"
 			:label="$t('pages.administration.ldap.classes.path.title')"
 			:info="$t('pages.administration.ldap.classes.path.info')"
-			:validation-model="v$.value.classPath"
+			:validation-model="v$.modelValue.classPath"
 			:validation-messages="classPathValidationMessage"
 			datatest-id="ldapDataClassesclassPath"
-			@update:modelValue="$emit('input', { ...value, classPath: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, classPath: $event })"
 		>
 			<template #icon>
 				<v-icon :color="classesActivatedColor">$mdiFileTreeOutline</v-icon>
@@ -36,15 +36,17 @@
 		</p>
 		<base-input
 			data-testid="ldapDataClassesNameAttribute"
-			:modelValue="value.nameAttribute"
+			:modelValue="modelValue.nameAttribute"
 			:disabled="checked === false"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.classes.notice.title')"
-			:validation-model="v$.value.nameAttribute"
+			:validation-model="v$.modelValue.nameAttribute"
 			:validation-messages="classesValidationMessage"
 			datatest-id="ldapDataClassesNameAttribute"
-			@update:modelValue="$emit('input', { ...value, nameAttribute: $event })"
+			@update:modelValue="
+				$emit('input', { ...modelValue, nameAttribute: $event })
+			"
 		>
 			<template #icon>
 				<v-icon :color="classesActivatedColor" class="custom-icon"
@@ -54,16 +56,16 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataClassesNameparticipantAttribute"
-			:modelValue="value.participantAttribute"
+			:modelValue="modelValue.participantAttribute"
 			:disabled="checked === false"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.classes.participant.title')"
-			:validation-model="v$.value.participantAttribute"
+			:validation-model="v$.modelValue.participantAttribute"
 			:validation-messages="classesValidationMessage"
 			datatest-id="ldapDataClassesParticipantsAttribute"
 			@update:modelValue="
-				$emit('input', { ...value, participantAttribute: $event })
+				$emit('input', { ...modelValue, participantAttribute: $event })
 			"
 		>
 			<template #icon>
@@ -84,7 +86,7 @@ export default defineComponent({
 		return { v$: useVuelidate() };
 	},
 	props: {
-		value: {
+		modelValue: {
 			type: Object,
 			default() {
 				return {};
@@ -115,10 +117,10 @@ export default defineComponent({
 			if (this.checked === false) {
 				return "";
 			}
-			return this.value.classPath;
+			return this.modelValue.classPath;
 		},
 		classPathChanged() {
-			return this.value.classPath;
+			return this.modelValue.classPath;
 		},
 	},
 	watch: {
@@ -136,16 +138,16 @@ export default defineComponent({
 			}
 		},
 		classPathChanged: function () {
-			this.checked = !!this.value.classPath;
+			this.checked = !!this.modelValue.classPath;
 		},
 	},
 	beforeMount() {
-		if (this.value.classPath) this.checked = true;
+		if (this.modelValue.classPath) this.checked = true;
 	},
 	validations() {
 		if (this.checked === true) {
 			return {
-				value: {
+				modelValue: {
 					classPath: {
 						required,
 						ldapPathRegexValidator: ldapPathRegexValidator,
@@ -156,7 +158,7 @@ export default defineComponent({
 			};
 		}
 		return {
-			value: {},
+			modelValue: {},
 		};
 	},
 });
diff --git a/src/components/organisms/Ldap/LdapConnectionSection.vue b/src/components/organisms/Ldap/LdapConnectionSection.vue
index ed9068b8ad..a6a374babd 100644
--- a/src/components/organisms/Ldap/LdapConnectionSection.vue
+++ b/src/components/organisms/Ldap/LdapConnectionSection.vue
@@ -6,15 +6,15 @@
 
 		<base-input
 			data-testid="ldapDataConnectionUrl"
-			:modelValue="value.url"
+			:modelValue="modelValue.url"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.connection.server.url')"
 			:placeholder="$t('pages.administration.ldap.connection.server.url')"
 			:info="$t('pages.administration.ldap.connection.server.info')"
-			:validation-model="v$.value.url"
+			:validation-model="v$.modelValue.url"
 			:validation-messages="urlValidationMessages"
-			@update:modelValue="$emit('input', { ...value, url: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, url: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiDnsOutline</v-icon>
@@ -22,15 +22,15 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataConnectionBasisPath"
-			:modelValue="value.basisPath"
+			:modelValue="modelValue.basisPath"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.connection.basis.path')"
 			:placeholder="$t('pages.administration.ldap.connection.basis.path')"
 			:info="$t('pages.administration.ldap.connection.basis.path.info')"
-			:validation-model="v$.value.basisPath"
+			:validation-model="v$.modelValue.basisPath"
 			:validation-messages="pathSearchValidationMessages"
-			@update:modelValue="$emit('input', { ...value, basisPath: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, basisPath: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiFileTreeOutline</v-icon>
@@ -38,15 +38,15 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataConnectionSearchUser"
-			:modelValue="value.searchUser"
+			:modelValue="modelValue.searchUser"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.connection.search.user')"
 			:placeholder="$t('pages.administration.ldap.connection.search.user')"
 			:info="$t('pages.administration.ldap.connection.search.user.info')"
-			:validation-model="v$.value.searchUser"
+			:validation-model="v$.modelValue.searchUser"
 			:validation-messages="pathSearchValidationMessages"
-			@update:modelValue="$emit('input', { ...value, searchUser: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, searchUser: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiAccountCircleOutline</v-icon>
@@ -54,17 +54,17 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataConnectionSearchUserPassword"
-			:modelValue="value.searchUserPassword"
+			:modelValue="modelValue.searchUserPassword"
 			type="password"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.connection.search.user.password')"
 			:placeholder="
 				$t('pages.administration.ldap.connection.search.user.password')
 			"
-			:validation-model="v$.value.searchUserPassword"
+			:validation-model="v$.modelValue.searchUserPassword"
 			:validation-messages="passwordValidationMessages"
 			@update:modelValue="
-				$emit('input', { ...value, searchUserPassword: $event })
+				$emit('input', { ...modelValue, searchUserPassword: $event })
 			"
 			><template #icon>
 				<v-icon :color="fillColor">$mdiLockOutline</v-icon>
@@ -88,7 +88,7 @@ export default defineComponent({
 		return { v$: useVuelidate() };
 	},
 	props: {
-		value: {
+		modelValue: {
 			type: Object,
 			default() {
 				return {};
@@ -134,7 +134,7 @@ export default defineComponent({
 	},
 	validations() {
 		return {
-			value: {
+			modelValue: {
 				url: {
 					required,
 					ldapURLValidator: this.insecureLDAPURLAllowed
diff --git a/src/components/organisms/Ldap/LdapRolesSection.vue b/src/components/organisms/Ldap/LdapRolesSection.vue
index 7bd6b76012..ebb3d1b69b 100644
--- a/src/components/organisms/Ldap/LdapRolesSection.vue
+++ b/src/components/organisms/Ldap/LdapRolesSection.vue
@@ -18,7 +18,9 @@
 				name="group"
 				style="margin-right: var(--space-sm)"
 				value="group"
-				@update:modelValue="$emit('input', { ...value, groupOption: $event })"
+				@update:modelValue="
+					$emit('input', { ...modelValue, groupOption: $event })
+				"
 			>
 			</base-input>
 			<base-input
@@ -29,7 +31,9 @@
 				"
 				name="group"
 				value="user_attribute"
-				@update:modelValue="$emit('input', { ...value, groupOption: $event })"
+				@update:modelValue="
+					$emit('input', { ...modelValue, groupOption: $event })
+				"
 			>
 			</base-input>
 			<p class="text-sm" style="margin-top: var(--space-xs)">
@@ -37,7 +41,7 @@
 			</p>
 		</div>
 		<base-input
-			:modelValue="value.member"
+			:modelValue="modelValue.member"
 			:disabled="groupOption === 'group'"
 			type="text"
 			:label="$t('pages.administration.ldapEdit.roles.labels.member')"
@@ -45,17 +49,17 @@
 				$t('pages.administration.ldapEdit.roles.placeholder.member')
 			"
 			style="margin-bottom: var(--space-xl)"
-			:validation-model="v$.value.member"
+			:validation-model="v$.modelValue.member"
 			:validation-messages="memberValidationMessages"
 			data-testid="ldapDataRolesMember"
-			@update:modelValue="$emit('input', { ...value, member: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, member: $event })"
 		>
 			<template #icon>
 				<v-icon :color="ldapActivatedColor">$mdiAccountOutline</v-icon>
 			</template>
 		</base-input>
 		<base-input
-			:modelValue="value.student"
+			:modelValue="modelValue.student"
 			type="text"
 			v-bind="$attrs"
 			:label="$t('pages.administration.ldapEdit.roles.labels.student')"
@@ -63,55 +67,55 @@
 				$t('pages.administration.ldapEdit.roles.placeholder.student')
 			"
 			:info="$t('pages.administration.ldapEdit.roles.info.student')"
-			:validation-model="v$.value.student"
+			:validation-model="v$.modelValue.student"
 			:validation-messages="rolesValidationMessages"
 			data-testid="ldapDataRolesStudent"
-			@update:modelValue="$emit('input', { ...value, student: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, student: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiAccountSchoolOutline</v-icon>
 			</template>
 		</base-input>
 		<base-input
-			:modelValue="value.teacher"
+			:modelValue="modelValue.teacher"
 			type="text"
 			:label="$t('pages.administration.ldapEdit.roles.labels.teacher')"
 			:placeholder="
 				$t('pages.administration.ldapEdit.roles.placeholder.teacher')
 			"
 			:info="$t('pages.administration.ldapEdit.roles.info.teacher')"
-			:validation-model="v$.value.teacher"
+			:validation-model="v$.modelValue.teacher"
 			:validation-messages="rolesValidationMessages"
 			data-testid="ldapDataRolesTeacher"
-			@update:modelValue="$emit('input', { ...value, teacher: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, teacher: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor" class="custom-icon">$teacher</v-icon>
 			</template>
 		</base-input>
 		<base-input
-			:modelValue="value.admin"
+			:modelValue="modelValue.admin"
 			type="text"
 			:label="$t('pages.administration.ldapEdit.roles.labels.admin')"
 			:placeholder="$t('pages.administration.ldapEdit.roles.placeholder.admin')"
 			:info="$t('pages.administration.ldapEdit.roles.info.admin')"
-			:validation-model="v$.value.admin"
+			:validation-model="v$.modelValue.admin"
 			:validation-messages="rolesValidationMessages"
 			data-testid="ldapDataRolesAdmin"
-			@update:modelValue="$emit('input', { ...value, admin: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, admin: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiShieldAccountVariantOutline</v-icon>
 			</template>
 		</base-input>
 		<base-input
-			:modelValue="value.user"
+			:modelValue="modelValue.user"
 			type="text"
 			:label="$t('pages.administration.ldapEdit.roles.labels.user')"
 			:placeholder="$t('pages.administration.ldapEdit.roles.placeholder.user')"
 			:info="$t('pages.administration.ldapEdit.roles.info.user')"
 			data-testid="ldapDataRolesUser"
-			@update:modelValue="$emit('input', { ...value, user: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, user: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiAccountOffOutline</v-icon>
@@ -131,7 +135,7 @@ export default defineComponent({
 		return { v$: useVuelidate() };
 	},
 	props: {
-		value: {
+		modelValue: {
 			type: Object,
 			default() {
 				return {};
@@ -157,7 +161,7 @@ export default defineComponent({
 	},
 	computed: {
 		groupOption() {
-			return this.value.groupOption || "undefined";
+			return this.modelValue.groupOption || "undefined";
 		},
 
 		fillColor() {
@@ -180,7 +184,7 @@ export default defineComponent({
 	validations() {
 		if (this.groupOption === "group") {
 			return {
-				value: {
+				modelValue: {
 					member: { required },
 					student: { ldapPathRegexValidator },
 					teacher: { ldapPathRegexValidator },
diff --git a/src/components/organisms/Ldap/LdapUsersSection.vue b/src/components/organisms/Ldap/LdapUsersSection.vue
index 53ccd06f64..3b955d6f17 100644
--- a/src/components/organisms/Ldap/LdapUsersSection.vue
+++ b/src/components/organisms/Ldap/LdapUsersSection.vue
@@ -9,16 +9,16 @@
 
 		<base-input
 			data-testid="ldapDataUsersUserPath"
-			:modelValue="value.userPath"
+			:modelValue="modelValue.userPath"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.users.path.title')"
 			:placeholder="$t('pages.administration.ldap.users.path.title')"
 			:info="$t('pages.administration.ldap.classes.path.info')"
-			:validation-model="v$.value.userPath"
+			:validation-model="v$.modelValue.userPath"
 			:validation-messages="userPathValidationMessage"
 			datatest-id="ldapDataUsersUserPath"
-			@update:modelValue="$emit('input', { ...value, userPath: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, userPath: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiFileTreeOutline</v-icon>
@@ -29,14 +29,14 @@
 		</p>
 		<base-input
 			data-testid="ldapDataUsersFirstName"
-			:modelValue="value.firstName"
+			:modelValue="modelValue.firstName"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.users.path.firstname')"
-			:validation-model="v$.value.firstName"
+			:validation-model="v$.modelValue.firstName"
 			:validation-messages="usersValidationMessage"
 			datatest-id="ldapDataUsersFirstName"
-			@update:modelValue="$emit('input', { ...value, firstName: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, firstName: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiAccountCircleOutline</v-icon>
@@ -44,14 +44,14 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataUsersFamilyName"
-			:modelValue="value.familyName"
+			:modelValue="modelValue.familyName"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.users.path.lastname')"
-			:validation-model="v$.value.familyName"
+			:validation-model="v$.modelValue.familyName"
 			:validation-messages="usersValidationMessage"
 			datatest-id="ldapDataUsersFamilyName"
-			@update:modelValue="$emit('input', { ...value, familyName: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, familyName: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiAccountCircleOutline</v-icon>
@@ -59,14 +59,14 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataUsersEmail"
-			:modelValue="value.email"
+			:modelValue="modelValue.email"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.users.path.email')"
-			:validation-model="v$.value.email"
+			:validation-model="v$.modelValue.email"
 			:validation-messages="usersValidationMessage"
 			datatest-id="ldapDataUsersEmail"
-			@update:modelValue="$emit('input', { ...value, email: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, email: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiEmailOutline</v-icon>
@@ -74,15 +74,15 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataUsersUid"
-			:modelValue="value.uid"
+			:modelValue="modelValue.uid"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.users.uid.title')"
 			:info="$t('pages.administration.ldap.users.uid.info')"
-			:validation-model="v$.value.uid"
+			:validation-model="v$.modelValue.uid"
 			:validation-messages="usersValidationMessage"
 			datatest-id="ldapDataUsersUid"
-			@update:modelValue="$emit('input', { ...value, uid: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, uid: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiCardAccountDetailsOutline</v-icon>
@@ -90,15 +90,15 @@
 		</base-input>
 		<base-input
 			data-testid="ldapDataUsersUuid"
-			:modelValue="value.uuid"
+			:modelValue="modelValue.uuid"
 			type="text"
 			class="mt--xl"
 			:label="$t('pages.administration.ldap.users.uuid.title')"
 			:info="$t('pages.administration.ldap.users.uuid.info')"
-			:validation-model="v$.value.uuid"
+			:validation-model="v$.modelValue.uuid"
 			:validation-messages="usersValidationMessage"
 			datatest-id="ldapDataUsersUuid"
-			@update:modelValue="$emit('input', { ...value, uuid: $event })"
+			@update:modelValue="$emit('input', { ...modelValue, uuid: $event })"
 		>
 			<template #icon>
 				<v-icon :color="fillColor">$mdiAccountBoxOutline</v-icon>
@@ -118,7 +118,7 @@ export default defineComponent({
 		return { v$: useVuelidate() };
 	},
 	props: {
-		value: {
+		modelValue: {
 			type: Object,
 			default() {
 				return {};
@@ -155,7 +155,7 @@ export default defineComponent({
 	},
 	validations() {
 		return {
-			value: {
+			modelValue: {
 				userPath: { required, ldapPathRegexValidator },
 				firstName: { required },
 				familyName: { required },