Skip to content

Fix: project settings pages permissions #6649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sriramveeraghanta merged 6 commits into from
Feb 19, 2025
Merged

Fix: project settings pages permissions #6649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5683d94
fix: Handled workspace switcher closing on click
gakshita Feb 11, 2025
a75275f
Merge branch 'preview' of https://github.com/makeplane/plane into pre…
gakshita Feb 17, 2025
6e8983e
Merge branch 'preview' of https://github.com/makeplane/plane into pre…
gakshita Feb 18, 2025
e54351b
Merge branch 'preview' of https://github.com/makeplane/plane into pre…
gakshita Feb 18, 2025
7ea9288
Merge branch 'preview' of https://github.com/makeplane/plane into pre…
gakshita Feb 19, 2025
777992a
fix: permissions for labels dnd + issue state creation
gakshita Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion web/core/components/labels/label-drag-n-drop-HOC.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -58,11 +60,14 @@ export const LabelDndHOC = observer((props: Props) => {
const labelRef = useRef<HTMLDivElement | null>(null);
const dragHandleRef = useRef<HTMLButtonElement | null>(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({
Expand Down
10 changes: 7 additions & 3 deletions web/core/components/project-states/group-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,16 @@ export const GroupItem: FC<TGroupItem> = observer((props) => {
</div>
<div className="text-base font-medium text-custom-text-200 capitalize px-1">{groupKey}</div>
</div>
<div
className="flex-shrink-0 w-6 h-6 rounded flex justify-center items-center overflow-hidden transition-colors hover:bg-custom-background-80 cursor-pointer text-custom-primary-100/80 hover:text-custom-primary-100"
<button
className={cn(
"flex-shrink-0 w-6 h-6 rounded flex justify-center items-center overflow-hidden transition-colors hover:bg-custom-background-80 cursor-pointer text-custom-primary-100/80 hover:text-custom-primary-100",
!isEditable && "cursor-not-allowed text-custom-text-400 hover:text-custom-text-400"
)}
onClick={() => !createState && setCreateState(true)}
disabled={!isEditable}
>
<Plus className="w-4 h-4" />
</div>
</button>
</div>

{shouldShowEmptyState && (
Expand Down