From 50fa85b73926fe8a9c471dc33b0ebc78b5e15b48 Mon Sep 17 00:00:00 2001 From: sharma01ketan Date: Fri, 11 Oct 2024 13:00:47 +0530 Subject: [PATCH 1/3] change the rendering logic --- web/core/components/views/quick-actions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/core/components/views/quick-actions.tsx b/web/core/components/views/quick-actions.tsx index 1a9cfa60730..ee6ea53f83f 100644 --- a/web/core/components/views/quick-actions.tsx +++ b/web/core/components/views/quick-actions.tsx @@ -38,7 +38,7 @@ export const ViewQuickActions: React.FC = observer((props) => { const { isPublishModalOpen, setPublishModalOpen, publishContextMenu } = useViewPublish( !!view.anchor, - isAdmin || isOwner + isOwner ); const viewLink = `${workspaceSlug}/projects/${projectId}/views/${view.id}`; From 0780bda19c69c715cc4c17f0142f94a1b71f3c6b Mon Sep 17 00:00:00 2001 From: sharma01ketan Date: Mon, 21 Oct 2024 16:14:45 +0530 Subject: [PATCH 2/3] fix --- web/core/components/views/quick-actions.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/core/components/views/quick-actions.tsx b/web/core/components/views/quick-actions.tsx index ee6ea53f83f..4d691ab2458 100644 --- a/web/core/components/views/quick-actions.tsx +++ b/web/core/components/views/quick-actions.tsx @@ -34,6 +34,10 @@ export const ViewQuickActions: React.FC = observer((props) => { const { allowPermissions } = useUserPermissions(); // auth const isOwner = view?.owned_by === data?.id; + const canPublishView = allowPermissions( + [EUserPermissions.ADMIN, EUserPermissions.MEMBER], + EUserPermissionsLevel.PROJECT + ); const isAdmin = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId); const { isPublishModalOpen, setPublishModalOpen, publishContextMenu } = useViewPublish( @@ -98,6 +102,7 @@ export const ViewQuickActions: React.FC = observer((props) => { {MENU_ITEMS.map((item) => { if (item.shouldRender === false) return null; + if (item.key === "publish" && !canPublishView) return null; return ( Date: Mon, 21 Oct 2024 16:18:20 +0530 Subject: [PATCH 3/3] clean code --- web/core/components/views/quick-actions.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/core/components/views/quick-actions.tsx b/web/core/components/views/quick-actions.tsx index 4d691ab2458..cd38ae0221c 100644 --- a/web/core/components/views/quick-actions.tsx +++ b/web/core/components/views/quick-actions.tsx @@ -40,10 +40,7 @@ export const ViewQuickActions: React.FC = observer((props) => { ); const isAdmin = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId); - const { isPublishModalOpen, setPublishModalOpen, publishContextMenu } = useViewPublish( - !!view.anchor, - isOwner - ); + const { isPublishModalOpen, setPublishModalOpen, publishContextMenu } = useViewPublish(!!view.anchor, isOwner); const viewLink = `${workspaceSlug}/projects/${projectId}/views/${view.id}`; const handleCopyText = () =>