update title/name props

Signed-off-by: Maksim Sukharev <[email protected]>
nextcloud · Oct 2, 2023 · c43a994 · c43a994
1 parent 593b9f5
commit c43a994
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 52 deletions.
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
@@ -71,7 +71,7 @@
 			<NcActions v-if="hasSelected"
 				type="primary"
 				:container="container"
-				:menu-title="t('spreed', 'Assign')">
+				:menu-name="t('spreed', 'Assign')">
 				<NcActionButton v-for="(item, index) in assignments"
 					:key="index"
 					:close-after-click="true"

diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue
@@ -22,22 +22,22 @@
 <template>
 	<NcAppSettingsDialog role="dialog"
 		:aria-label="t('spreed', 'Conversation settings')"
-		:title="t('spreed', 'Conversation settings')"
+		:name="t('spreed', 'Conversation settings')"
 		:open.sync="showSettings"
 		:show-navigation="true"
 		:container="container">
 		<!-- description -->
 		<NcAppSettingsSection v-if="showDescription"
 			id="basic-info"
-			:title="t('spreed', 'Basic Info')">
+			:name="t('spreed', 'Basic Info')">
 			<BasicInfo :conversation="conversation"
 				:can-full-moderate="canFullModerate" />
 		</NcAppSettingsSection>
 
 		<template v-if="!isBreakoutRoom">
 			<!-- Notifications settings and devices preview screen -->
 			<NcAppSettingsSection id="notifications"
-				:title="t('spreed', 'Personal')">
+				:name="t('spreed', 'Personal')">
 				<NcCheckboxRadioSwitch :checked.sync="showMediaSettings"
 					type="switch">
 					{{ t('spreed', 'Always show the device preview screen before joining a call in this conversation.') }}
@@ -48,57 +48,57 @@
 
 			<NcAppSettingsSection v-if="canFullModerate"
 				id="conversation-settings"
-				:title="t('spreed', 'Moderation')">
+				:name="t('spreed', 'Moderation')">
 				<ListableSettings :token="token" />
 				<LinkShareSettings ref="linkShareSettings" />
 				<ExpirationSettings :token="token" can-full-moderate />
 			</NcAppSettingsSection>
 			<NcAppSettingsSection v-else
 				id="conversation-settings"
-				:title="t('spreed', 'Setup summary')">
+				:name="t('spreed', 'Setup summary')">
 				<ExpirationSettings :token="token" />
 			</NcAppSettingsSection>
 
 			<!-- Meeting: lobby and sip -->
 			<NcAppSettingsSection v-if="canFullModerate"
 				id="meeting"
-				:title="t('spreed', 'Meeting')">
+				:name="t('spreed', 'Meeting')">
 				<LobbySettings :token="token" />
 				<SipSettings v-if="canUserEnableSIP" />
 			</NcAppSettingsSection>
 
 			<!-- Conversation permissions -->
 			<NcAppSettingsSection v-if="canFullModerate"
 				id="permissions"
-				:title="t('spreed', 'Permissions')">
+				:name="t('spreed', 'Permissions')">
 				<ConversationPermissionsSettings :token="token" />
 			</NcAppSettingsSection>
 
 			<!-- Breakout rooms -->
 			<NcAppSettingsSection v-if="canConfigureBreakoutRooms"
 				id="breakout-rooms"
-				:title="t('spreed', 'Breakout Rooms')">
+				:name="t('spreed', 'Breakout Rooms')">
 				<BreakoutRoomsSettings :token="token" />
 			</NcAppSettingsSection>
 
 			<!-- Matterbridge settings -->
 			<NcAppSettingsSection v-if="canFullModerate && matterbridgeEnabled"
 				id="matterbridge"
-				:title="t('spreed', 'Matterbridge')">
+				:name="t('spreed', 'Matterbridge')">
 				<MatterbridgeSettings />
 			</NcAppSettingsSection>
 
 			<!-- Bots settings -->
 			<NcAppSettingsSection v-if="selfIsOwnerOrModerator && hasBotV1API"
 				id="bots"
-				:title="t('spreed', 'Bots')">
+				:name="t('spreed', 'Bots')">
 				<BotsSettings :token="token" />
 			</NcAppSettingsSection>
 
 			<!-- Destructive actions -->
 			<NcAppSettingsSection v-if="canLeaveConversation || canDeleteConversation"
 				id="dangerzone"
-				:title="t('spreed', 'Danger zone')">
+				:name="t('spreed', 'Danger zone')">
 				<LockingSettings :token="token" />
 				<DangerZone :conversation="conversation"
 					:can-leave-conversation="canLeaveConversation"

diff --git a/src/components/ConversationSettings/Matterbridge/BridgePart.vue b/src/components/ConversationSettings/Matterbridge/BridgePart.vue
@@ -42,9 +42,10 @@
 				placement="bottom">
 				<NcActionLink icon="icon-info"
 					target="_blank"
-					:title="t('spreed', 'More information')"
 					:href="type.infoTarget"
-					:close-after-click="true" />
+					close-after-click>
+					{{ t('spreed', 'More information') }}
+				</NcActionLink>
 				<NcActionButton v-if="editable"
 					icon="icon-delete"
 					:close-after-click="true"

diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -21,7 +21,7 @@
 
 <template>
 	<NcListItem ref="listItem"
-		:title="item.displayName"
+		:name="item.displayName"
 		class="conversation-item"
 		:class="{'unread-mention-conversation': item.unreadMention}"
 		:data-nav-id="`conversation_${item.token}`"
@@ -34,7 +34,7 @@
 		<template #icon>
 			<ConversationIcon :item="item" :hide-favorite="false" :hide-call="false" />
 		</template>
-		<template #subtitle>
+		<template #subname>
 			<strong v-if="item.unreadMessages"
 				class="subtitle">
 				{{ conversationInformation }}

diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
@@ -133,18 +133,18 @@
 					<template v-else-if="isSearching">
 						<!-- Create a new conversation -->
 						<NcListItem v-if="searchResultsConversationList.length === 0 && canStartConversations"
-							:title="t('spreed', 'Create a new conversation')"
+							:name="t('spreed', 'Create a new conversation')"
 							@click="createConversation(searchText)">
 							<template #icon>
 								<ChatPlus :size="30" />
 							</template>
-							<template #subtitle>
+							<template #subname>
 								{{ searchText }}
 							</template>
 						</NcListItem>
 
 						<!-- Search results: user's conversations -->
-						<NcAppNavigationCaption :title="t('spreed', 'Conversations')" />
+						<NcAppNavigationCaption :name="t('spreed', 'Conversations')" />
 						<Conversation v-for="item of searchResultsConversationList"
 							:key="`conversation_${item.id}`"
 							:ref="`conversation-${item.token}`"
@@ -154,7 +154,7 @@
 
 						<!-- Search results: listed (open) conversations -->
 						<template v-if="!listedConversationsLoading && searchResultsListedConversations.length !== 0">
-							<NcAppNavigationCaption :title="t('spreed', 'Open conversations')" />
+							<NcAppNavigationCaption :name="t('spreed', 'Open conversations')" />
 							<Conversation v-for="item of searchResultsListedConversations"
 								:key="`open-conversation_${item.id}`"
 								:item="item"
@@ -164,11 +164,11 @@
 
 						<!-- Search results: users -->
 						<template v-if="searchResultsUsers.length !== 0">
-							<NcAppNavigationCaption :title="t('spreed', 'Users')" />
+							<NcAppNavigationCaption :name="t('spreed', 'Users')" />
 							<NcListItem v-for="item of searchResultsUsers"
 								:key="`user_${item.id}`"
 								:data-nav-id="`user_${item.id}`"
-								:title="item.label"
+								:name="item.label"
 								@click="createAndJoinConversation(item)">
 								<template #icon>
 									<ConversationIcon :item="iconData(item)" />
@@ -180,11 +180,11 @@
 						<template v-if="canStartConversations">
 							<!-- New conversations: Groups -->
 							<template v-if="searchResultsGroups.length !== 0">
-								<NcAppNavigationCaption :title="t('spreed', 'Groups')" />
+								<NcAppNavigationCaption :name="t('spreed', 'Groups')" />
 								<NcListItem v-for="item of searchResultsGroups"
 									:key="`group_${item.id}`"
 									:data-nav-id="`group_${item.id}`"
-									:title="item.label"
+									:name="item.label"
 									@click="createAndJoinConversation(item)">
 									<template #icon>
 										<ConversationIcon :item="iconData(item)" />
@@ -194,11 +194,11 @@
 
 							<!-- New conversations: Circles -->
 							<template v-if="searchResultsCircles.length !== 0">
-								<NcAppNavigationCaption :title="t('spreed', 'Circles')" />
+								<NcAppNavigationCaption :name="t('spreed', 'Circles')" />
 								<NcListItem v-for="item of searchResultsCircles"
 									:key="`circle_${item.id}`"
 									:data-nav-id="`circle_${item.id}`"
-									:title="item.label"
+									:name="item.label"
 									@click="createAndJoinConversation(item)">
 									<template #icon>
 										<ConversationIcon :item="iconData(item)" />
@@ -208,7 +208,7 @@
 						</template>
 
 						<!-- Search results: no results (yet) -->
-						<NcAppNavigationCaption v-if="sourcesWithoutResults" :title="sourcesWithoutResultsList" />
+						<NcAppNavigationCaption v-if="sourcesWithoutResults" :name="sourcesWithoutResultsList" />
 						<Hint v-if="contactsLoading" :hint="t('spreed', 'Loading')" />
 						<Hint v-else :hint="t('spreed', 'No search results')" />
 					</template>

diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
@@ -56,7 +56,7 @@ get the messagesList array and loop through the list to generate the messages.
 				:count="15" />
 		</template>
 		<NcEmptyContent v-else-if="showEmptyContent"
-			:title="t('spreed', 'No messages')"
+			:name="t('spreed', 'No messages')"
 			:description="t('spreed', 'All messages have expired or have been deleted.')">
 			<template #icon>
 				<Message :size="64" />

diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
@@ -706,6 +706,11 @@ export default {
 			const possibleMentions = response.data.ocs.data
 
 			possibleMentions.forEach(possibleMention => {
+				// TODO fix backend for userMention
+				if (!possibleMention.title && possibleMention.label) {
+					possibleMention.title = possibleMention.label
+				}
+
 				// Set icon for candidate mentions that are not for users.
 				if (possibleMention.source === 'calls') {
 					possibleMention.icon = 'icon-user-forced-white'

diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
@@ -71,6 +71,7 @@
 					<template #icon>
 						<Send :size="20" />
 					</template>
+					{{ sendMessageLabel }}
 				</NcActionButton>
 				<NcActionButton v-if="canModerate"
 					:title="manageBreakoutRoomsTitle"
@@ -79,6 +80,7 @@
 					<template #icon>
 						<Cog :size="20" />
 					</template>
+					{{ manageBreakoutRoomsTitle }}
 				</NcActionButton>
 			</NcActions>
 		</div>

diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
@@ -38,7 +38,7 @@
 				</BreakoutRoomItem>
 			</template>
 		</ul>
-		<NcEmptyContent v-else :title="t('spreed', 'Breakout rooms are not started')">
+		<NcEmptyContent v-else :name="t('spreed', 'Breakout rooms are not started')">
 			<template #icon>
 				<DotsCircle :size="20" />
 			</template>

diff --git a/...ponents/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue b/...ponents/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue
@@ -23,32 +23,32 @@
 	<div class="participants-search-results"
 		:class="{'scrollable': scrollable }">
 		<template v-if="addableUsers.length !== 0">
-			<NcAppNavigationCaption :title="t('spreed', 'Add users')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Add users')" />
 			<ParticipantsList :items="addableUsers"
 				@click="handleClickParticipant" />
 		</template>
 
 		<template v-if="addableGroups.length !== 0">
-			<NcAppNavigationCaption :title="t('spreed', 'Add groups')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Add groups')" />
 			<ParticipantsList :items="addableGroups"
 				@click="handleClickParticipant" />
 		</template>
 
 		<template v-if="addableEmails.length !== 0">
-			<NcAppNavigationCaption :title="t('spreed', 'Add emails')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Add emails')" />
 			<ParticipantsList :items="addableEmails"
 				@click="handleClickParticipant" />
 		</template>
 
 		<template v-if="addableCircles.length !== 0">
-			<NcAppNavigationCaption :title="t('spreed', 'Add circles')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Add circles')" />
 			<ParticipantsList :items="addableCircles"
 				@click="handleClickParticipant" />
 		</template>
 
 		<!-- integrations -->
 		<template v-if="integrations.length !== 0">
-			<NcAppNavigationCaption :title="t('spreed', 'Integrations')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Integrations')" />
 			<ul>
 				<NcButton v-for="(integration, index) in integrations"
 					:key="'integration' + index"
@@ -64,12 +64,11 @@
 		</template>
 
 		<template v-if="addableRemotes.length !== 0">
-			<NcAppNavigationCaption :title="t('spreed', 'Add federated users')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Add federated users')" />
 			<ParticipantsList :items="addableRemotes"
 				@click="handleClickParticipant" />
 		</template>
-		<NcAppNavigationCaption v-if="sourcesWithoutResults"
-			:title="sourcesWithoutResultsList" />
+		<NcAppNavigationCaption v-if="sourcesWithoutResults" :name="sourcesWithoutResultsList" />
 		<Hint v-if="contactsLoading" :hint="t('spreed', 'Searching …')" />
 		<Hint v-if="!contactsLoading && sourcesWithoutResults" :hint="t('spreed', 'No search results')" />
 		<template v-if="isNewGroupConversation">

diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -33,7 +33,7 @@
 			:loading="!participantsInitialised" />
 
 		<div v-else class="scroller">
-			<NcAppNavigationCaption v-if="canAdd" :title="t('spreed', 'Participants')" />
+			<NcAppNavigationCaption v-if="canAdd" :name="t('spreed', 'Participants')" />
 
 			<ParticipantsList v-if="filteredParticipants.length"
 				:items="filteredParticipants"

diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
@@ -22,7 +22,7 @@
 
 <template>
 	<NcAppSidebar v-show="opened"
-		:title="title"
+		:name="title"
 		:title-tooltip="title"
 		:active="activeTab"
 		:class="'active-tab-' + activeTab"

diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -25,7 +25,7 @@
 		<!-- Shared items grouped by type -->
 		<template v-for="type in sharedItemsOrder">
 			<div v-if="sharedItems[type]" :key="type">
-				<NcAppNavigationCaption :title="sharedItemTitle[type] || sharedItemTitle.default" />
+				<NcAppNavigationCaption :name="sharedItemTitle[type] || sharedItemTitle.default" />
 				<SharedItems :type="type"
 					:token="token"
 					tab-view
@@ -52,7 +52,7 @@
 
 		<!-- Shared from "Projects" app -->
 		<template v-if="projectsEnabled">
-			<NcAppNavigationCaption :title="t('spreed', 'Projects')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Projects')" />
 			<CollectionList v-if="getUserId && token"
 				:id="token"
 				type="room"
@@ -61,8 +61,7 @@
 		</template>
 
 		<!-- No shared content -->
-		<NcEmptyContent v-else-if="!hasSharedItems && !hasRelatedResources"
-			:title="t('spreed', 'No shared items')">
+		<NcEmptyContent v-else-if="!hasSharedItems && !hasRelatedResources" :name="t('spreed', 'No shared items')">
 			<template #icon>
 				<FolderMultipleImage :size="20" />
 			</template>