Merge pull request #11916 from nextcloud/backport/11868/stable28

[stable28] fix(SharedItems): fetch after page reload + fix(Conversation): set warnings on max length
nextcloud · Mar 25, 2024 · 4251bba · 4251bba
2 parents af8e823 + 2a5ad19
commit 4251bba
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 7 deletions.
diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -188,6 +188,8 @@ export default {
 		top: 0;
 		width: var(--avatar-size);
 		height: var(--avatar-size);
+		max-height: var(--avatar-size);
+		max-width: var(--avatar-size);
 		line-height: var(--avatar-size);
 		font-size: calc(var(--avatar-size) / 2);
 		border-radius: 50%;

diff --git a/src/components/ConversationSettings/BasicInfo.vue b/src/components/ConversationSettings/BasicInfo.vue
@@ -30,6 +30,7 @@
 			:loading="isNameLoading"
 			:placeholder="t('spreed', 'Enter a name for this conversation')"
 			:edit-button-aria-label="t('spreed', 'Edit conversation name')"
+			:max-length="CONVERSATION.MAX_NAME_LENGTH"
 			@submit-text="handleUpdateName"
 			@update:editing="handleEditName" />
 		<template v-if="!isOneToOne">
@@ -42,6 +43,7 @@
 				:loading="isDescriptionLoading"
 				:edit-button-aria-label="t('spreed', 'Edit conversation description')"
 				:placeholder="t('spreed', 'Enter a description for this conversation')"
+				:max-length="CONVERSATION.MAX_DESCRIPTION_LENGTH"
 				multiline
 				use-markdown
 				@submit-text="handleUpdateDescription"
@@ -92,7 +94,10 @@ export default {
 	},
 
 	setup() {
-		return { supportsAvatar }
+		return {
+			supportsAvatar,
+			CONVERSATION,
+		}
 	},
 
 	data() {

diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
@@ -37,12 +37,20 @@
 						v-model="conversationName"
 						:placeholder="t('spreed', 'Enter a name for this conversation')"
 						:label="t('spreed', 'Name')"
+						:error="!!nameErrorLabel"
 						label-visible
 						@keydown.enter="handleEnter" />
+					<span v-if="nameErrorLabel" class="new-group-conversation__error">
+						{{ nameErrorLabel }}
+					</span>
 					<NcTextArea v-model="conversationDescription"
 						:placeholder="t('spreed', 'Enter a description for this conversation')"
 						:label="t('spreed', 'Description')"
+						:error="!!descriptionErrorLabel"
 						label-visible />
+					<span v-if="descriptionErrorLabel" class="new-group-conversation__error">
+						{{ descriptionErrorLabel }}
+					</span>
 
 					<template v-if="supportsAvatar">
 						<label class="avatar-editor__label">
@@ -276,9 +284,20 @@ export default {
 		// Controls the disabled/enabled state of the first page's button.
 		disabled() {
 			return this.conversationNameTrimmed === '' || (this.passwordProtect && this.password === '')
+				|| this.conversationNameTrimmed.length > CONVERSATION.MAX_NAME_LENGTH
+				|| this.conversationDescription.length > CONVERSATION.MAX_DESCRIPTION_LENGTH
 		},
-		selectedParticipants() {
-			return this.$store.getters.selectedParticipants
+		nameErrorLabel() {
+			if (this.conversationNameTrimmed.length <= CONVERSATION.MAX_NAME_LENGTH) {
+				return
+			}
+			return t('spreed', 'Maximum length exceeded ({maxlength} characters)', { maxlength: CONVERSATION.MAX_NAME_LENGTH })
+		},
+		descriptionErrorLabel() {
+			if (this.conversationDescription.length <= CONVERSATION.MAX_DESCRIPTION_LENGTH) {
+				return
+			}
+			return t('spreed', 'Maximum length exceeded ({maxlength} characters)', { maxlength: CONVERSATION.MAX_DESCRIPTION_LENGTH })
 		},
 	},
 
@@ -532,6 +551,10 @@ export default {
 	&__button {
 		margin-left: auto;
 	}
+
+	&__error {
+		color: var(--color-error);
+	}
 }
 
 .conversation-form :deep(.modal-wrapper) {

diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -185,9 +185,12 @@ export default {
 	},
 
 	watch: {
-		sharedItemsIdentifier() {
-			if (this.token && this.active && this.isSidebarOpen) {
-				this.sharedItemsStore.getSharedItemsOverview(this.token)
+		sharedItemsIdentifier: {
+			immediate: true,
+			handler() {
+				if (this.token && this.active && this.isSidebarOpen) {
+					this.sharedItemsStore.getSharedItemsOverview(this.token)
+				}
 			}
 		},
 	},

diff --git a/src/constants.js b/src/constants.js
@@ -103,7 +103,10 @@ export const CONVERSATION = {
 		VIDEO_VERIFICATION: 'share:password',
 		BREAKOUT_ROOM: 'room',
 		DEFAULT: '',
-	}
+	},
+
+	MAX_NAME_LENGTH: 255,
+	MAX_DESCRIPTION_LENGTH: 500,
 }
 export const ATTENDEE = {
 	ACTOR_TYPE: {