From 870a0b44101d817515f1dc51e030961d2dc6cdd2 Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <edoughtypapassideris@linagora.com>
Date: Thu, 24 Oct 2024 19:54:44 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20front:=20remove=20move=20context?=
 =?UTF-8?q?=20menu=20entry=20for=20shared=20link=20pages=20(and=20skip=20a?=
 =?UTF-8?q?=20separator=20when=20appropriate)=20(#484)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/client/body/drive/context-menu.tsx   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx b/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx
index fa0007a8..e0b04d38 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx
@@ -80,26 +80,28 @@ export const useOnBuildContextMenu = (
           //Add item related menus
           const upToDateItem = await DriveApiClient.get(item.company_id, item.id);
           const access = upToDateItem.access || 'none';
+          const hideShareItem = access === 'read' || getPublicLinkToken() || inTrash;
+          const hideManageAccessItem =
+            access === 'read'
+            || getPublicLinkToken()
+            || inTrash
+            || !FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_MANAGE_ACCESS);
           const newMenuActions = [
             {
               type: 'menu',
               icon: 'share-alt',
               text: Languages.t('components.item_context_menu.share'),
-              hide: access === 'read' || getPublicLinkToken() || inTrash,
+              hide: hideShareItem,
               onClick: () => setPublicLinkModalState({ open: true, id: item.id }),
             },
             {
               type: 'menu',
               icon: 'users-alt',
               text: Languages.t('components.item_context_menu.manage_access'),
-              hide:
-                access === 'read' ||
-                getPublicLinkToken() ||
-                inTrash ||
-                !FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_MANAGE_ACCESS),
+              hide: hideManageAccessItem,
               onClick: () => setAccessModalState({ open: true, id: item.id }),
             },
-            { type: 'separator', hide: inTrash },
+            { type: 'separator', hide: inTrash || (hideShareItem && hideManageAccessItem) },
             {
               type: 'menu',
               icon: 'download-alt',
@@ -130,7 +132,7 @@ export const useOnBuildContextMenu = (
               type: 'menu',
               icon: 'folder-question',
               text: Languages.t('components.item_context_menu.move'),
-              hide: access === 'read' || inTrash,
+              hide: access === 'read' || inTrash || inPublicSharing,
               onClick: () =>
                 setSelectorModalState({
                   open: true,