From f6dfca4fdc4c0aaf46435c5dd192900334246b29 Mon Sep 17 00:00:00 2001 From: Akshita Goyal <36129505+gakshita@users.noreply.github.com> Date: Wed, 19 Feb 2025 18:05:43 +0530 Subject: [PATCH] Fix: project settings pages permissions (#6649) * fix: Handled workspace switcher closing on click * fix: permissions for labels dnd + issue state creation --- web/core/components/labels/label-drag-n-drop-HOC.tsx | 7 ++++++- web/core/components/project-states/group-item.tsx | 10 +++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/web/core/components/labels/label-drag-n-drop-HOC.tsx b/web/core/components/labels/label-drag-n-drop-HOC.tsx index 57e1b3a14..8cc87d4c6 100644 --- a/web/core/components/labels/label-drag-n-drop-HOC.tsx +++ b/web/core/components/labels/label-drag-n-drop-HOC.tsx @@ -9,10 +9,12 @@ import { attachInstruction } from "@atlaskit/pragmatic-drag-and-drop-hitbox/tree import { observer } from "mobx-react"; import { createRoot } from "react-dom/client"; // types +import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants"; import { IIssueLabel, InstructionType } from "@plane/types"; // ui import { DropIndicator } from "@plane/ui"; // components +import { useUserPermissions } from "@/hooks/store"; import { LabelName } from "./label-block/label-name"; import { TargetData, getCanDrop, getInstructionFromPayload } from "./label-utils"; @@ -58,11 +60,14 @@ export const LabelDndHOC = observer((props: Props) => { const labelRef = useRef(null); const dragHandleRef = useRef(null); + const { allowPermissions } = useUserPermissions(); + const isEditable = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT); + useEffect(() => { const element = labelRef.current; const dragHandleElement = dragHandleRef.current; - if (!element) return; + if (!element || !isEditable) return; return combine( draggable({ diff --git a/web/core/components/project-states/group-item.tsx b/web/core/components/project-states/group-item.tsx index 6b766dacf..fe9fcad15 100644 --- a/web/core/components/project-states/group-item.tsx +++ b/web/core/components/project-states/group-item.tsx @@ -75,12 +75,16 @@ export const GroupItem: FC = observer((props) => {
{groupKey}
-
!createState && setCreateState(true)} + disabled={!isEditable} > -
+ {shouldShowEmptyState && (