Merge pull request #44918 from nextcloud/backport/44839/stable29

fix(sharingDetails): Show correct share target
nextcloud · Apr 25, 2024 · eb58f8e · eb58f8e
2 parents 73d1a10 + 547d584
commit eb58f8e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 14 deletions.
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -340,20 +340,30 @@ export default {
 			switch (this.share.type) {
 			case this.SHARE_TYPES.SHARE_TYPE_USER:
 				return t('files_sharing', 'Share with {userName}', { userName: this.share.shareWithDisplayName })
+			case this.SHARE_TYPES.SHARE_TYPE_EMAIL:
+			    return t('files_sharing', 'Share with email {email}', { email: this.share.shareWith })
 			case this.SHARE_TYPES.SHARE_TYPE_LINK:
 				return t('files_sharing', 'Share link')
 			case this.SHARE_TYPES.SHARE_TYPE_GROUP:
 				return t('files_sharing', 'Share with group')
 			case this.SHARE_TYPES.SHARE_TYPE_ROOM:
 				return t('files_sharing', 'Share in conversation')
-			case this.SHARE_TYPES.SHARE_TYPE_REMOTE:
-				return t('files_sharing', 'Share with remote')
+			case this.SHARE_TYPES.SHARE_TYPE_REMOTE: {
+				const [user, server] = this.share.shareWith.split('@')
+				return t('files_sharing', 'Share with {user} on remote server {server}', { user, server })
+			}
 			case this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP:
 				return t('files_sharing', 'Share with remote group')
 			case this.SHARE_TYPES.SHARE_TYPE_GUEST:
 				return t('files_sharing', 'Share with guest')
-			default:
-				return t('files_sharing', 'Share with')
+			default: {
+			        if (this.share.id) {
+					    // Share already exists
+					    return t('files_sharing', 'Update share')
+				    } else {
+					    return t('files_sharing', 'Create share')
+				    }
+			}
 			}
 		},
 		/**

diff --git a/dist/4997-4997.js b/dist/4997-4997.js
diff --git a/dist/4997-4997.js.map b/dist/4997-4997.js.map
diff --git a/dist/6364-6364.js b/dist/6364-6364.js
diff --git a/dist/4997-4997.js.LICENSE.txt → dist/6364-6364.js.LICENSE.txt b/dist/4997-4997.js.LICENSE.txt → dist/6364-6364.js.LICENSE.txt
diff --git a/dist/6364-6364.js.map b/dist/6364-6364.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map