π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-3410] fix: work item permission and validation (#6621)
Anmol Singh Bhatiaa9aeeb6707e0
diff --git a/web/ce/components/command-palette/modals/issue-level.tsx b/web/ce/components/command-palette/modals/issue-level.tsxindex 84a7dddc64..316ff9f218 100644--- a/web/ce/components/command-palette/modals/issue-level.tsx+++ b/web/ce/components/command-palette/modals/issue-level.tsx@@ -5,27 +5,22 @@ import useSWR from "swr";import { BulkDeleteIssuesModal } from "@/components/core";import { CreateUpdateIssueModal, DeleteIssueModal } from "@/components/issues";// constants-import { ISSUE_DETAILS } from "@/constants/fetch-keys";// hooks-import { useCommandPalette, useUser } from "@/hooks/store";+import { useCommandPalette, useIssueDetail, useUser } from "@/hooks/store";import { useAppRouter } from "@/hooks/use-app-router";import { useIssuesStore } from "@/hooks/use-issue-layout-store";-// services-import { IssueService } from "@/services/issue";--// services-const issueService = new IssueService();export const IssueLevelModals = observer(() => {// routerconst pathname = usePathname();- const { workspaceSlug, projectId, issueId, cycleId, moduleId } = useParams();+ const { workspaceSlug, projectId: paramsProjectId, workItem, cycleId, moduleId } = useParams();const router = useAppRouter();// store hooksconst { data: currentUser } = useUser();const {issues: { removeIssue },} = useIssuesStore();+ const { fetchIssueWithIdentifier } = useIssueDetail();const {isCreateIssueModalOpen,toggleCreateIssueModal,@@ -37,13 +32,19 @@ export const IssueLevelModals = observer(() => {// derived valuesconst isDraftIssue = pathname?.includes("draft-issues") || false;+ const projectIdentifier = workItem?.toString().split("-")[0];+ const sequence_id = workItem?.toString().split("-")[1];+const { data: issueDetails } = useSWR(- workspaceSlug && projectId && issueId ? ISSUE_DETAILS(issueId as string) : null,- workspaceSlug && projectId && issueId- ? () => issueService.retrieve(workspaceSlug as string, projectId as string, issueId as string)+ workspaceSlug && workItem ? `ISSUE_DETAIL_${workspaceSlug}_${projectIdentifier}_${sequence_id}` : null,+ workspaceSlug && workItem+ ? () => fetchIssueWithIdentifier(workspaceSlug.toString(), projectIdentifier, sequence_id): null);+ const issueId = issueDetails?.id;+ const projectId = paramsProjectId ?? issueDetails?.project_id;+return (<><CreateUpdateIssueModaldiff --git a/web/core/components/command-palette/actions/issue-actions/actions-list.tsx b/web/core/components/command-palette/actions/issue-actions/actions-list.tsxindex 5d15365bab..6fa28cdceb 100644--- a/web/core/components/command-palette/actions/issue-actions/actions-list.tsx+++ b/web/core/components/command-palette/actions/issue-actions/actions-list.tsx@@ -24,11 +24,14 @@ type Props = {export const CommandPaletteIssueActions: React.FC<Props> = observer((props) => {const { closePalette, issueDetails, pages, setPages, setPlaceholder, setSearchTerm } = props;// router- const { workspaceSlug, projectId, issueId } = useParams();+ const { workspaceSlug } = useParams();// hooksconst { updateIssue } = useIssueDetail();const { toggleCommandPaletteModal, toggleDeleteIssueModal } = useCommandPalette();const { data: currentUser } = useUser();+ // derived values+ const issueId = issueDetails?.id;+ const projectId = issueDetails?.project_id;const handleUpdateIssue = async (formData: Partial<TIssue>) => {if (!workspaceSlug || !projectId || !issueDetails) return;diff --git a/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx b/web/core/components/command-palette/actions/issue-actions/change-assignee.tsxindex 2b8e2af1e1..4e43ef8876 100644--- a/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx+++ b/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx@@ -18,12 +18,15 @@ type Props = { closePalette: () => void; issue: TIssue };export const ChangeIssueAssignee: React.FC<Props> = observer((props) => {const { closePalette, issue } = props;// router params- const { workspaceSlug, projectId } = useParams();+ const { workspaceSlug } = useParams();// storeconst { updateIssue } = useIssueDetail();const {- project: { projectMemberIds, getProjectMemberDetails },+ project: { getProjectMemberIds, getProjectMemberDetails },} = useMember();+ // derived values+ const projectId = issue?.project_id ?? "";+ const projectMemberIds = getProjectMemberIds(projectId);const options =projectMemberIdsdiff --git a/web/core/components/command-palette/actions/issue-actions/change-priority.tsx b/web/core/components/command-palette/actions/issue-actions/change-priority.tsxindex 2d4752d24c..9e2a874a20 100644--- a/web/core/components/command-palette/actions/issue-actions/change-priority.tsx+++ b/web/core/components/command-palette/actions/issue-actions/change-priority.tsx@@ -20,8 +20,11 @@ type Props = { closePalette: () => void; issue: TIssue };export const ChangeIssuePriority: React.FC<Props> = observer((props) => {const { closePalette, issue } = props;// router params- const { workspaceSlug, projectId } = useParams();+ const { workspaceSlug } = useParams();+ // store hooksconst { updateIssue } = useIssueDetail();+ // derived values+ const projectId = issue?.project_id;const submitChanges = async (formData: Partial<TIssue>) => {if (!workspaceSlug || !projectId || !issue) return;diff --git a/web/core/components/command-palette/actions/issue-actions/change-state.tsx b/web/core/components/command-palette/actions/issue-actions/change-state.tsxindex c6e9061261..d848c2a767 100644--- a/web/core/components/command-palette/actions/issue-actions/change-state.tsx+++ b/web/core/components/command-palette/actions/issue-actions/change-state.tsx@@ -17,10 +17,13 @@ type Props = { closePalette: () => void; issue: TIssue };export const ChangeIssueState: React.FC<Props> = observer((props) => {const { closePalette, issue } = props;// router params- const { workspaceSlug, projectId } = useParams();+ const { workspaceSlug } = useParams();// store hooksconst { updateIssue } = useIssueDetail();- const { projectStates } = useProjectState();+ const { getProjectStates } = useProjectState();+ // derived values+ const projectId = issue?.project_id;+ const projectStates = getProjectStates(projectId);const submitChanges = async (formData: Partial<TIssue>) => {if (!workspaceSlug || !projectId || !issue) return;diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsxindex fb2b51821c..4bbbcbc2ee 100644--- a/web/core/components/command-palette/command-palette.tsx+++ b/web/core/components/command-palette/command-palette.tsx@@ -30,7 +30,7 @@ import {export const CommandPalette: FC = observer(() => {// router params- const { workspaceSlug, projectId, issueId } = useParams();+ const { workspaceSlug, projectId, workItem } = useParams();// store hooksconst { toggleSidebar } = useAppTheme();const { setTrackElement } = useEventTracker();@@ -51,7 +51,7 @@ export const CommandPalette: FC = observer(() => {const canPerformProjectAdminActions = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT);const copyIssueUrlToClipboard = useCallback(() => {- if (!issueId) return;+ if (!workItem) return;const url = new URL(window.location.href);copyTextToClipboard(url.href)@@ -67,7 +67,7 @@ export const CommandPalette: FC = observer(() => {title: "Some error occurred",});});- }, [issueId]);+ }, [workItem]);// authconst performProjectCreateActions = useCallback(diff --git a/web/core/components/issues/delete-issue-modal.tsx b/web/core/components/issues/delete-issue-modal.tsxindex 22e3e81862..233eb47982 100644--- a/web/core/components/issues/delete-issue-modal.tsx+++ b/web/core/components/issues/delete-issue-modal.tsx@@ -2,7 +2,7 @@import { useEffect, useState } from "react";// types-import { PROJECT_ERROR_MESSAGES ,EUserPermissions, EUserPermissionsLevel } from "@plane/constants";+import { PROJECT_ERROR_MESSAGES, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";import { useTranslation } from "@plane/i18n";import { TDeDupeIssue, TIssue } from "@plane/types";// uidiff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsxindex 2864350a41..bd0e49c3bc 100644--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx@@ -14,9 +14,11 @@ export const IssueLabelActivity: FC<TIssueLabelActivity> = observer((props) => {const {activity: { getActivityById },} = useIssueDetail();- const { projectLabels } = useLabel();+ const { getLabelById } = useLabel();const activity = getActivityById(activityId);+ const oldLabelColor = getLabelById(activity?.old_identifier ?? "")?.color;+ const newLabelColor = getLabelById(activity?.new_identifier ?? "")?.color;if (!activity) return <></>;return (@@ -29,11 +31,7 @@ export const IssueLabelActivity: FC<TIssueLabelActivity> = observer((props) => {{activity.old_value === "" ? `added a new label ` : `removed the label `}<LabelActivityChipname={activity.old_value === "" ? activity.new_value : activity.old_value}- color={- activity.old_value === ""- ? projectLabels?.find((l) => l.id === activity.new_identifier)?.color- : projectLabels?.find((l) => l.id === activity.old_identifier)?.color- }+ color={activity.old_value === "" ? newLabelColor : oldLabelColor}/>{showIssue && (activity.old_value === "" ? ` to ` : ` from `)}{showIssue && <IssueLink activityId={activityId} />}diff --git a/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx b/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsxindex f7c3564f31..6bf4bf7576 100644--- a/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx+++ b/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx@@ -170,10 +170,17 @@ export const IssueDetailQuickActions: FC<Props> = observer((props) => {};// auth- const isEditable = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER], EUserPermissionsLevel.PROJECT);+ const isEditable = allowPermissions(+ [EUserPermissions.ADMIN, EUserPermissions.MEMBER],+ EUserPermissionsLevel.PROJECT,+ workspaceSlug,+ projectId+ );const canRestoreIssue = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER],- EUserPermissionsLevel.PROJECT+ EUserPermissionsLevel.PROJECT,+ workspaceSlug,+ projectId);const isArchivingAllowed = !issue?.archived_at && isEditable;const isInArchivableGroup = !!stateDetails && ARCHIVABLE_STATE_GROUPS.includes(stateDetails?.group);