Merge pull request #33037 from nextcloud/backport/31345/stable22

nextcloud · Jul 7, 2022 · 28259ad · 28259ad
2 parents 92154d0 + 57c2a8a
commit 28259ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/apps/settings/js/vue-settings-personal-info.js b/apps/settings/js/vue-settings-personal-info.js
diff --git a/apps/settings/js/vue-settings-personal-info.js.map b/apps/settings/js/vue-settings-personal-info.js.map
diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue b/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue
@@ -50,7 +50,6 @@
 				<Actions
 					class="actions-email"
 					:aria-label="t('settings', 'Email options')"
-					:disabled="deleteDisabled"
 					:force-menu="true">
 					<ActionButton
 						:aria-label="deleteEmailLabel"

diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
@@ -41,8 +41,9 @@
 		<span v-else>
 			{{ primaryEmail.value || t('settings', 'No email address set') }}
 		</span>
+		<!-- TODO use unique key for additional email when uniqueness can be guaranteed, see https://github.com/nextcloud/server/issues/26866 -->
 		<Email v-for="(additionalEmail, index) in additionalEmails"
-			:key="index"
+			:key="additionalEmail.key"
 			:index="index"
 			:scope.sync="additionalEmail.scope"
 			:email.sync="additionalEmail.value"
@@ -77,7 +78,7 @@ export default {
 
 	data() {
 		return {
-			additionalEmails,
+			additionalEmails: additionalEmails.map(properties => ({ ...properties, key: this.generateUniqueKey() })),
 			displayNameChangeSupported,
 			primaryEmail,
 			isValidForm: true,
@@ -110,7 +111,7 @@ export default {
 	methods: {
 		onAddAdditionalEmail() {
 			if (this.$refs.form?.checkValidity()) {
-				this.additionalEmails.push({ value: '', scope: DEFAULT_ADDITIONAL_EMAIL_SCOPE })
+				this.additionalEmails.push({ value: '', scope: DEFAULT_ADDITIONAL_EMAIL_SCOPE, key: this.generateUniqueKey() })
 				this.$nextTick(() => this.updateFormValidity())
 			}
 		},
@@ -172,6 +173,10 @@ export default {
 		updateFormValidity() {
 			this.isValidForm = this.$refs.form?.checkValidity()
 		},
+
+		generateUniqueKey() {
+			return Math.random().toString(36).substring(2)
+		},
 	},
 }
 </script>