From 33c10e1ef069f33f6362acc0f388e952daa3ac50 Mon Sep 17 00:00:00 2001
From: Thomas Lehmann <t.lehmann@strato.de>
Date: Thu, 7 Nov 2024 19:53:13 +0100
Subject: [PATCH 1/5] refactor(files_sharing): move deprecated projects
 component

Primarily to move it out of the way for changes in the source location.

The feature was deprecated in version 25 (#28320), five versions ago.

Refs: #48925
---
 apps/files_sharing/src/views/SharingTab.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index 69735018ccd40..e3cbe50974f10 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -54,12 +54,6 @@
 
 			<!-- internal link copy -->
 			<SharingEntryInternal :file-info="fileInfo" />
-
-			<!-- projects -->
-			<CollectionList v-if="projectsEnabled && fileInfo"
-				:id="`${fileInfo.id}`"
-				type="file"
-				:name="fileInfo.name" />
 		</div>
 
 		<!-- additional entries, use it with cautious -->
@@ -71,6 +65,15 @@
 			<component :is="section($refs['section-'+index], fileInfo)" :file-info="fileInfo" />
 		</div>
 
+		<!-- projects (deprecated as of NC25 (replaced by related_resources) - see instance config "projects.enabled" ; ignore this / remove it / move into own section) -->
+		<div v-show="!showSharingDetailsView && projectsEnabled && fileInfo"
+			 class="sharingTab__additionalContent">
+			<CollectionList
+				:id="`${fileInfo.id}`"
+				type="file"
+				:name="fileInfo.name" />
+		</div>
+
 		<!-- share details -->
 		<SharingDetailsTab v-if="showSharingDetailsView"
 			:file-info="shareDetailsData.fileInfo"

From 544b80a9f1a924bc09553ad77e06bee1ed1810ea Mon Sep 17 00:00:00 2001
From: Thomas Lehmann <t.lehmann@strato.de>
Date: Wed, 7 Aug 2024 19:14:34 +0200
Subject: [PATCH 2/5] refactor(files_sharing): split internal/external share
 (relayout)

According to screen designs.

* Elements and lists reordered
* Headlines and separators introduced

Intermediate step: components need to be dissolved in the following
commits.

Refs: #48925
---
 .../src/components/SharingInput.vue           |  1 -
 .../src/views/SharingDetailsTab.vue           |  2 +-
 apps/files_sharing/src/views/SharingTab.vue   | 37 +++++++++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index f8949920772c4..7bf4aaccf66c7 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -5,7 +5,6 @@
 
 <template>
 	<div class="sharing-search">
-		<label for="sharing-search-input">{{ t('files_sharing', 'Search for share recipients') }}</label>
 		<NcSelect ref="select"
 			v-model="value"
 			input-id="sharing-search-input"
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
index f50a533eeeb44..b89db9ac5d97b 100644
--- a/apps/files_sharing/src/views/SharingDetailsTab.vue
+++ b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -1124,7 +1124,7 @@ export default {
 	&__wrapper {
 		position: relative;
 		overflow: scroll;
-		flex-shrink: 1;
+		flex: 1 0 auto;
 		padding: 4px;
 		padding-inline-end: 12px;
 	}
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index e3cbe50974f10..bd2487338db6e 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -25,6 +25,7 @@
 				</SharingEntrySimple>
 			</ul>
 
+			<h3>Internal shares</h3>
 			<!-- add new share input -->
 			<SharingInput v-if="!loading"
 				:can-reshare="canReshare"
@@ -34,13 +35,14 @@
 				:shares="shares"
 				@open-sharing-details="toggleShareDetailsView" />
 
-			<!-- link shares list -->
-			<SharingLinkList v-if="!loading"
-				ref="linkShareList"
-				:can-reshare="canReshare"
-				:file-info="fileInfo"
-				:shares="linkShares"
-				@open-sharing-details="toggleShareDetailsView" />
+			<!-- will move _into_ the dropdown component -->
+			<div style="border-top: 1px dotted grey;"></div>
+
+			<!-- internal link copy -->
+			<SharingEntryInternal :file-info="fileInfo" />
+
+			<div style="border-top: 1px dotted grey;"></div>
+			<!-- will move _into_ the dropdown component -->
 
 			<!-- other shares list -->
 			<SharingList v-if="!loading"
@@ -52,8 +54,16 @@
 			<!-- inherited shares -->
 			<SharingInherited v-if="canReshare && !loading" :file-info="fileInfo" />
 
-			<!-- internal link copy -->
-			<SharingEntryInternal :file-info="fileInfo" />
+			<hr>
+			<h3>External shares</h3>
+
+			<!-- link shares list -->
+			<SharingLinkList v-if="!loading"
+				ref="linkShareList"
+				:can-reshare="canReshare"
+				:file-info="fileInfo"
+				:shares="linkShares"
+				@open-sharing-details="toggleShareDetailsView" />
 		</div>
 
 		<!-- additional entries, use it with cautious -->
@@ -67,9 +77,8 @@
 
 		<!-- projects (deprecated as of NC25 (replaced by related_resources) - see instance config "projects.enabled" ; ignore this / remove it / move into own section) -->
 		<div v-show="!showSharingDetailsView && projectsEnabled && fileInfo"
-			 class="sharingTab__additionalContent">
-			<CollectionList
-				:id="`${fileInfo.id}`"
+			class="sharingTab__additionalContent">
+			<CollectionList :id="`${fileInfo.id}`"
 				type="file"
 				:name="fileInfo.name" />
 		</div>
@@ -434,4 +443,8 @@ export default {
 		margin: 44px 0;
 	}
 }
+
+h3 {
+	font-weight: bold;
+}
 </style>

From 0139e57669e532d714044802a428df8a02715d9b Mon Sep 17 00:00:00 2001
From: Thomas Lehmann <t.lehmann@strato.de>
Date: Thu, 7 Nov 2024 18:26:51 +0100
Subject: [PATCH 3/5] refactor(files_sharing): add another user search input in
 external share section

Allow share creation in the newly differentiated share section.

Intermediate change: to preserve functionality; this needs to be
differentiated with the next commits.

Refs: #48925
---
 apps/files_sharing/src/views/SharingTab.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index bd2487338db6e..91be81912a7bf 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -26,6 +26,8 @@
 			</ul>
 
 			<h3>Internal shares</h3>
+
+			<!-- TODO: component must either be configurable or diffentiated into two -->
 			<!-- add new share input -->
 			<SharingInput v-if="!loading"
 				:can-reshare="canReshare"
@@ -64,6 +66,22 @@
 				:file-info="fileInfo"
 				:shares="linkShares"
 				@open-sharing-details="toggleShareDetailsView" />
+
+			<!-- TODO: component must either be configurable or diffentiated into two -->
+			<!-- add new email/federated share input -->
+			<SharingInput v-if="!loading"
+				:can-reshare="canReshare"
+				:file-info="fileInfo"
+				:link-shares="linkShares"
+				:reshare="reshare"
+				:shares="shares"
+				@open-sharing-details="toggleShareDetailsView" />
+
+			<!-- projects -->
+			<CollectionList v-if="projectsEnabled && fileInfo"
+				:id="`${fileInfo.id}`"
+				type="file"
+				:name="fileInfo.name" />
 		</div>
 
 		<!-- additional entries, use it with cautious -->

From d22bc0475a79cb163c06c313e1ccdc8d14e1681a Mon Sep 17 00:00:00 2001
From: Thomas Lehmann <t.lehmann@strato.de>
Date: Thu, 7 Nov 2024 19:47:13 +0100
Subject: [PATCH 4/5] refactor(files_sharing): dissolve component
 SharingEntryLink into SharingTab

According to #48925 screen designs we've to split this into

1. Link (creation) and
2. List (of created share links)

Intermediate step.

Refs: #48925
---
 apps/files_sharing/src/views/SharingTab.vue | 53 ++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index 91be81912a7bf..b64b3087c23f5 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -59,13 +59,12 @@
 			<hr>
 			<h3>External shares</h3>
 
-			<!-- link shares list -->
-			<SharingLinkList v-if="!loading"
-				ref="linkShareList"
+			<!-- ***** DISSOLVED OUT FROM ShareLinkList ***** -->
+			<SharingEntryLink v-if="!hasLinkShares && canReshare"
 				:can-reshare="canReshare"
 				:file-info="fileInfo"
-				:shares="linkShares"
-				@open-sharing-details="toggleShareDetailsView" />
+				@add:share="addShare" />
+			<!-- ***** DISSOLVED OUT FROM ShareLinkList ***** -->
 
 			<!-- TODO: component must either be configurable or diffentiated into two -->
 			<!-- add new email/federated share input -->
@@ -77,7 +76,22 @@
 				:shares="shares"
 				@open-sharing-details="toggleShareDetailsView" />
 
-			<!-- projects -->
+			<!-- ***** DISSOLVED OUT FROM ShareLinkList ***** -->
+			<template v-if="hasShares">
+				<!-- using shares[index] to work with .sync -->
+				<SharingEntryLink v-for="(share, index) in shares"
+					:key="share.id"
+					:index="shares.length > 1 ? index + 1 : null"
+					:can-reshare="canReshare"
+					:share.sync="shares[index]"
+					:file-info="fileInfo"
+					@add:share="addShare(...arguments)"
+					@update:share="awaitForShare(...arguments)"
+					@remove:share="removeShare"
+					@open-sharing-details="openSharingDetails(share)" />
+			</template>
+			<!-- ***** DISSOLVED OUT FROM ShareLinkList ***** -->
+
 			<CollectionList v-if="projectsEnabled && fileInfo"
 				:id="`${fileInfo.id}`"
 				type="file"
@@ -135,11 +149,15 @@ import SharingInherited from './SharingInherited.vue'
 import SharingLinkList from './SharingLinkList.vue'
 import SharingList from './SharingList.vue'
 import SharingDetailsTab from './SharingDetailsTab.vue'
+import { getCapabilities } from '@nextcloud/capabilities'
+import SharingEntryLink from '../components/SharingEntryLink.vue'
+import ShareDetails from '../mixins/ShareDetails.js'
 
 export default {
 	name: 'SharingTab',
 
 	components: {
+		SharingEntryLink,
 		NcAvatar,
 		CollectionList,
 		SharingEntryInternal,
@@ -151,6 +169,8 @@ export default {
 		SharingDetailsTab,
 	},
 
+	mixins: [ShareDetails],
+
 	data() {
 		return {
 			config: new Config(),
@@ -172,6 +192,7 @@ export default {
 			showSharingDetailsView: false,
 			shareDetailsData: {},
 			returnFocusElement: null,
+			canLinkShare: getCapabilities().files_sharing.public.enabled,
 		}
 	},
 
@@ -189,6 +210,26 @@ export default {
 			return !!(this.fileInfo.permissions & OC.PERMISSION_SHARE)
 				|| !!(this.reshare && this.reshare.hasSharePermission && this.config.isResharingAllowed)
 		},
+
+		/**
+		 * Do we have link shares?
+		 * Using this to still show the `new link share`
+		 * button regardless of mail shares
+		 *
+		 * @return {Array}
+		 */
+		hasLinkShares() {
+			return this.shares.filter(share => share.type === ShareType.Link).length > 0
+		},
+
+		/**
+		 * Do we have any link or email shares?
+		 *
+		 * @return {boolean}
+		 */
+		hasShares() {
+			return this.shares.length > 0
+		},
 	},
 
 	methods: {

From c28b24234de97d5d0918f0fa8a8d5a9a9af0bbc8 Mon Sep 17 00:00:00 2001
From: Thomas Lehmann <t.lehmann@strato.de>
Date: Wed, 13 Nov 2024 13:23:40 +0100
Subject: [PATCH 5/5] [WIP] Note: work in progress