From 2b620b07718592bb392b82db5f278a18f1c1d454 Mon Sep 17 00:00:00 2001
From: Florian <florian.steffens@nextcloud.com>
Date: Wed, 13 Sep 2023 21:48:16 +0200
Subject: [PATCH] fix(design): correct show share icon (#555)

- only show if hasShares and you are the owner
- don't show hasShares if shared with you

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 lib/Service/TableService.php                        |  6 +++++-
 .../navigation/partials/NavigationTableItem.vue     |  8 ++------
 .../navigation/partials/NavigationViewItem.vue      | 13 +++++++------
 src/modules/navigation/sections/Navigation.vue      | 11 ++++-------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
index 599cdd3ef..01cbbbf60 100644
--- a/lib/Service/TableService.php
+++ b/lib/Service/TableService.php
@@ -5,7 +5,6 @@
 use DateTime;
 use Exception;
 
-use OCA\Tables\Db\Share;
 use OCA\Tables\Db\Table;
 use OCA\Tables\Db\TableMapper;
 use OCA\Tables\Errors\InternalError;
@@ -118,6 +117,11 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 			foreach ($allTables as $table) {
 				/** @var string $userId */
 				$this->enhanceTable($table, $userId);
+				// if the table is shared with me, there are no other shares
+				// will avoid showing the shared icon in the FE nav
+				if($table->getIsShared()) {
+					$table->setHasShares(false);
+				}
 			}
 		}
 
diff --git a/src/modules/navigation/partials/NavigationTableItem.vue b/src/modules/navigation/partials/NavigationTableItem.vue
index 0e18c7984..799fe0f85 100644
--- a/src/modules/navigation/partials/NavigationTableItem.vue
+++ b/src/modules/navigation/partials/NavigationTableItem.vue
@@ -19,7 +19,7 @@
 			<NcCounterBubble v-if="canReadData(table)">
 				{{ n('tables', '%n row', '%n rows', table.rowsCount, {}) }}
 			</NcCounterBubble>
-			<NcActionButton v-if="!isSharedItem" icon="icon-share" :class="{'margin-right': !(activeTable && table.id === activeTable.id)}" @click="actionShowShare" />
+			<NcActionButton v-if="table.hasShares" icon="icon-share" :class="{'margin-right': !(activeTable && table.id === activeTable.id)}" @click="actionShowShare" />
 			<div v-if="table.isShared && table.ownership !== userId" class="margin-left">
 				<NcAvatar :user="table.ownership" />
 			</div>
@@ -74,7 +74,7 @@
 		<NavigationViewItem v-for="view in getViews"
 			:key="'view'+view.id"
 			:view="view"
-			:is-shared-item="true" />
+			:show-share-sender="false" />
 	</NcAppNavigationItem>
 </template>
 <script>
@@ -128,10 +128,6 @@ export default {
 			type: String,
 			default: '',
 		},
-		isSharedItem: {
-		      type: Boolean,
-		      default: false,
-		    },
 	},
 
 	data() {
diff --git a/src/modules/navigation/partials/NavigationViewItem.vue b/src/modules/navigation/partials/NavigationViewItem.vue
index 855dc5404..d3a52fe4c 100644
--- a/src/modules/navigation/partials/NavigationViewItem.vue
+++ b/src/modules/navigation/partials/NavigationViewItem.vue
@@ -16,8 +16,8 @@
 			<NcCounterBubble v-if="canReadData(view)">
 				{{ n('tables', '%n row', '%n rows', view.rowsCount, {}) }}
 			</NcCounterBubble>
-			<NcActionButton v-if="!isSharedItem" icon="icon-share" :class="{'margin-right': !(activeView && view.id === activeView.id)}" @click="actionShowShare" />
-			<div v-if="view.isShared && view.ownership !== userId && !canManageTable(view)" class="margin-left">
+			<NcActionButton v-if="view.hasShares" icon="icon-share" :class="{'margin-right': !(activeView && view.id === activeView.id)}" @click="actionShowShare" />
+			<div v-if="view.isShared && view.ownership !== userId && !canManageTable(view) && showShareSender" class="margin-left">
 				<NcAvatar :user="view.ownership" />
 			</div>
 		</template>
@@ -116,10 +116,11 @@ export default {
 			type: Object,
 			default: null,
 		},
-		isSharedItem: {
-			type: Boolean,
-			default: false,
-		},
+		// this is good if you show the share sender via the table and show this as children
+		showShareSender: {
+		      type: Boolean,
+		      default: true,
+		    },
 	},
 
 	data() {
diff --git a/src/modules/navigation/sections/Navigation.vue b/src/modules/navigation/sections/Navigation.vue
index 8d1edba90..57366667d 100644
--- a/src/modules/navigation/sections/Navigation.vue
+++ b/src/modules/navigation/sections/Navigation.vue
@@ -24,18 +24,15 @@
 					:filter-string="filterString"
 					:table="table" />
 
-				<NcAppNavigationCaption v-if="getSharedTables.length > 0"
+				<NcAppNavigationCaption v-if="getSharedTables.length > 0 || getSharedViews.length > 0"
 					:title="t('tables', 'Shared')" />
 				<NavigationTableItem v-for="table in getSharedTables"
 					:key="table.id"
 					:filter-string="filterString"
-					:table="table"
-					:is-shared-item="true" />
-				<NavigationViewItem
-					v-for="view in getSharedViews"
+					:table="table" />
+				<NavigationViewItem v-for="view in getSharedViews"
 					:key="'view'+view.id"
-					:view="view"
-					:is-shared-item="true" />
+					:view="view" />
 			</ul>
 
 			<div v-if="filterString !== ''" class="search-info">