From e906138d8da5908917fb523cb3e3484372cea16b Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 3 Dec 2020 16:02:47 +0100
Subject: Let sharees endpoint properly handle deck shares
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/src/components/SharingInput.vue | 1 +
 apps/files_sharing/src/index.js                    | 1 +
 apps/files_sharing/src/mixins/ShareTypes.js        | 1 +
 3 files changed, 3 insertions(+)

(limited to 'apps/files_sharing/src')

diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 588ed634166..5326eaf01d3 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -186,6 +186,7 @@ export default {
 				this.SHARE_TYPES.SHARE_TYPE_CIRCLE,
 				this.SHARE_TYPES.SHARE_TYPE_ROOM,
 				this.SHARE_TYPES.SHARE_TYPE_GUEST,
+				this.SHARE_TYPES.SHARE_TYPE_DECK,
 			]
 
 			if (OC.getCapabilities().files_sharing.public.enabled === true) {
diff --git a/apps/files_sharing/src/index.js b/apps/files_sharing/src/index.js
index 786b648aea1..3c0d0e65c8f 100644
--- a/apps/files_sharing/src/index.js
+++ b/apps/files_sharing/src/index.js
@@ -32,5 +32,6 @@ Object.assign(OC, {
 		SHARE_TYPE_GUEST: 8,
 		SHARE_TYPE_REMOTE_GROUP: 9,
 		SHARE_TYPE_ROOM: 10,
+		SHARE_TYPE_DECK: 12,
 	},
 })
diff --git a/apps/files_sharing/src/mixins/ShareTypes.js b/apps/files_sharing/src/mixins/ShareTypes.js
index b84dbf96d98..6e9524ce952 100644
--- a/apps/files_sharing/src/mixins/ShareTypes.js
+++ b/apps/files_sharing/src/mixins/ShareTypes.js
@@ -31,6 +31,7 @@ export default {
 				SHARE_TYPE_REMOTE: OC.Share.SHARE_TYPE_REMOTE,
 				SHARE_TYPE_CIRCLE: OC.Share.SHARE_TYPE_CIRCLE,
 				SHARE_TYPE_GUEST: OC.Share.SHARE_TYPE_GUEST,
+				SHARE_TYPE_DECK: OC.Share.SHARE_TYPE_DECK,
 				SHARE_TYPE_REMOTE_GROUP: OC.Share.SHARE_TYPE_REMOTE_GROUP,
 				SHARE_TYPE_ROOM: OC.Share.SHARE_TYPE_ROOM,
 			},
-- 
cgit v1.2.3


From f1a54cb6aad8dcb9c98f0070ba4d74b4941aefe3 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 8 Dec 2020 13:00:43 +0100
Subject: Add share type deck to search results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/src/components/SharingInput.vue | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apps/files_sharing/src')

diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 5326eaf01d3..c1331146eef 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -366,6 +366,8 @@ export default {
 				return 'icon-circle'
 			case this.SHARE_TYPES.SHARE_TYPE_ROOM:
 				return 'icon-room'
+			case this.SHARE_TYPES.SHARE_TYPE_DECK:
+				return 'icon-deck'
 
 			default:
 				return ''
-- 
cgit v1.2.3


From 8131965b740377cad5c64910ea76070cbf81868a Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 8 Dec 2020 13:01:29 +0100
Subject: Allow share results to have a detailed description and share entries
 to have a link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/src/components/SharingEntry.vue |  7 +++++--
 apps/files_sharing/src/components/SharingInput.vue |  2 ++
 apps/files_sharing/src/models/Share.js             | 11 +++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'apps/files_sharing/src')

diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
index 55bdbb8fdcb..407221037dc 100644
--- a/apps/files_sharing/src/components/SharingEntry.vue
+++ b/apps/files_sharing/src/components/SharingEntry.vue
@@ -29,13 +29,16 @@
 			:tooltip-message="share.type === SHARE_TYPES.SHARE_TYPE_USER ? share.shareWith : ''"
 			:menu-position="'left'"
 			:url="share.shareWithAvatar" />
-		<div v-tooltip.auto="tooltip" class="sharing-entry__desc">
+		<component :is="share.shareWithLink ? 'a' : 'div'"
+			:href="share.shareWithLink"
+			v-tooltip.auto="tooltip"
+			class="sharing-entry__desc">
 			<h5>{{ title }}</h5>
 			<p v-if="hasStatus">
 				<span>{{ share.status.icon || '' }}</span>
 				<span>{{ share.status.message || '' }}</span>
 			</p>
-		</div>
+		</component>
 		<Actions
 			menu-align="right"
 			class="sharing-entry__actions"
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index c1331146eef..c8373c6c0ae 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -387,6 +387,8 @@ export default {
 				desc = t('files_sharing', 'on {server}', { server: result.value.server })
 			} else if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_EMAIL) {
 				desc = result.value.shareWith
+			} else {
+				desc = result.shareWithDescription ?? ''
 			}
 
 			return {
diff --git a/apps/files_sharing/src/models/Share.js b/apps/files_sharing/src/models/Share.js
index 07f74652a44..d36484f064a 100644
--- a/apps/files_sharing/src/models/Share.js
+++ b/apps/files_sharing/src/models/Share.js
@@ -150,6 +150,17 @@ export default class Share {
 			|| this.#share.share_with
 	}
 
+	/**
+	 * Get the share with entity link
+	 *
+	 * @returns {string}
+	 * @readonly
+	 * @memberof Share
+	 */
+	get shareWithLink() {
+		return this.#share.share_with_link
+	}
+
 	/**
 	 * Get the share with avatar if any
 	 *
-- 
cgit v1.2.3


From 49a997bc870f098fed3ee2da48b2cc0c7b5fb317 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 8 Dec 2020 16:45:56 +0100
Subject: Indicate deck shares as shared in the file list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/src/share.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apps/files_sharing/src')

diff --git a/apps/files_sharing/src/share.js b/apps/files_sharing/src/share.js
index 7d5aeec4224..47c57e70b6c 100644
--- a/apps/files_sharing/src/share.js
+++ b/apps/files_sharing/src/share.js
@@ -161,6 +161,8 @@ import escapeHTML from 'escape-html'
 								hasShares = true
 							} else if (shareType === OC.Share.SHARE_TYPE_ROOM) {
 								hasShares = true
+							} else if (shareType === OC.Share.SHARE_TYPE_DECK) {
+								hasShares = true
 							}
 						})
 						OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink)
-- 
cgit v1.2.3