Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-1890] fix: issue creation by using appropriate stores (#5072)

rahulrameshaa623456e6325
diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsx
index 619cdd9208..7bd4339f23 100644
--- a/web/core/components/command-palette/command-palette.tsx
+++ b/web/core/components/command-palette/command-palette.tsx
@@ -17,14 +17,14 @@ import { CreateProjectModal } from "@/components/project";
import { CreateUpdateProjectViewModal } from "@/components/views";
// constants
import { ISSUE_DETAILS } from "@/constants/fetch-keys";
-import { EIssuesStoreType } from "@/constants/issue";
import { EUserProjectRoles } from "@/constants/project";
import { EUserWorkspaceRoles } from "@/constants/workspace";
// helpers
import { copyTextToClipboard } from "@/helpers/string.helper";
// hooks
-import { useEventTracker, useIssues, useUser, useAppTheme, useCommandPalette } from "@/hooks/store";
+import { useEventTracker, useUser, useAppTheme, useCommandPalette } from "@/hooks/store";
import { useAppRouter } from "@/hooks/use-app-router";
+import { useIssuesStore } from "@/hooks/use-issue-layout-store";
import { usePlatformOS } from "@/hooks/use-platform-os";
// services
import { IssueService } from "@/services/issue";
@@ -49,7 +49,7 @@ export const CommandPalette: FC = observer(() => {
} = useUser();
const {
issues: { removeIssue },
- } = useIssues(EIssuesStoreType.PROJECT);
+ } = useIssuesStore();
const {
toggleCommandPaletteModal,
isCreateIssueModalOpen,
@@ -71,7 +71,6 @@ export const CommandPalette: FC = observer(() => {
isDeleteIssueModalOpen,
toggleDeleteIssueModal,
isAnyModalOpen,
- createIssueStoreType,
} = useCommandPalette();
const { data: issueDetails } = useSWR(
@@ -317,7 +316,6 @@ export const CommandPalette: FC = observer(() => {
isOpen={isCreateIssueModalOpen}
onClose={() => toggleCreateIssueModal(false)}
data={cycleId ? { cycle_id: cycleId.toString() } : moduleId ? { module_ids: [moduleId.toString()] } : undefined}
- storeType={createIssueStoreType}
isDraft={isDraftIssue}
/>
diff --git a/web/core/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx b/web/core/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
index da41fc92ba..cc1f9d1fb3 100644
--- a/web/core/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
+++ b/web/core/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
@@ -152,7 +152,7 @@ export const AllIssueQuickActions: React.FC<IQuickActionProps> = observer((props
onSubmit={async (data) => {
if (issueToEdit && handleUpdate) await handleUpdate(data);
}}
- storeType={EIssuesStoreType.PROJECT}
+ storeType={EIssuesStoreType.GLOBAL}
/>
<ContextMenu parentRef={parentRef} items={MENU_ITEMS} />
<CustomMenu
diff --git a/web/core/components/issues/issue-layouts/quick-action-dropdowns/draft-issue.tsx b/web/core/components/issues/issue-layouts/quick-action-dropdowns/draft-issue.tsx
index 70fb245889..cdf5c4bc6a 100644
--- a/web/core/components/issues/issue-layouts/quick-action-dropdowns/draft-issue.tsx
+++ b/web/core/components/issues/issue-layouts/quick-action-dropdowns/draft-issue.tsx
@@ -104,7 +104,7 @@ export const DraftIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
onSubmit={async (data) => {
if (issueToEdit && handleUpdate) await handleUpdate(data);
}}
- storeType={EIssuesStoreType.PROJECT}
+ storeType={EIssuesStoreType.DRAFT}
isDraft
/>
<ContextMenu parentRef={parentRef} items={MENU_ITEMS} />
diff --git a/web/core/components/issues/issue-modal/modal.tsx b/web/core/components/issues/issue-modal/modal.tsx
index 87b007f15a..1520ec767b 100644
--- a/web/core/components/issues/issue-modal/modal.tsx
+++ b/web/core/components/issues/issue-modal/modal.tsx
@@ -13,6 +13,7 @@ import { ISSUE_CREATED, ISSUE_UPDATED } from "@/constants/event-tracker";
import { EIssuesStoreType } from "@/constants/issue";
// hooks
import { useEventTracker, useCycle, useIssues, useModule, useProject, useIssueDetail } from "@/hooks/store";
+import { useIssueStoreType } from "@/hooks/use-issue-layout-store";
import { useIssuesActions } from "@/hooks/use-issues-actions";
import useLocalStorage from "@/hooks/use-local-storage";
// components
@@ -36,9 +37,12 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
onClose,
onSubmit,
withDraftIssueWrapper = true,
- storeType = EIssuesStoreType.PROJECT,
+ storeType: issueStoreFromProps,
isDraft = false,
} = props;
+ const issueStoreType = useIssueStoreType();
+
+ const storeType = issueStoreFromProps ?? issueStoreType;
// ref
const issueTitleRef = useRef<HTMLInputElement>(null);
// states
diff --git a/web/core/components/workspace/sidebar/quick-actions.tsx b/web/core/components/workspace/sidebar/quick-actions.tsx
index 1d6bc683fe..30f20e4da2 100644
--- a/web/core/components/workspace/sidebar/quick-actions.tsx
+++ b/web/core/components/workspace/sidebar/quick-actions.tsx
@@ -7,7 +7,6 @@ import { TIssue } from "@plane/types";
// components
import { CreateUpdateIssueModal } from "@/components/issues";
// constants
-import { EIssuesStoreType } from "@/constants/issue";
// helpers
import { cn } from "@/helpers/common.helper";
// hooks
@@ -90,7 +89,7 @@ export const SidebarQuickActions = observer(() => {
)}
onClick={() => {
setTrackElement("APP_SIDEBAR_QUICK_ACTIONS");
- toggleCreateIssueModal(true, EIssuesStoreType.PROJECT);
+ toggleCreateIssueModal(true);
}}
disabled={disabled}
>
diff --git a/web/core/hooks/use-issue-layout-store.ts b/web/core/hooks/use-issue-layout-store.ts
index bb12e576b7..17187d8837 100644
--- a/web/core/hooks/use-issue-layout-store.ts
+++ b/web/core/hooks/use-issue-layout-store.ts
@@ -1,17 +1,36 @@
import { createContext, useContext } from "react";
+import { useParams } from "next/navigation";
import { EIssuesStoreType } from "@/constants/issue";
import { useIssues } from "./store";
-export const IssuesStoreContext = createContext<EIssuesStoreType>(EIssuesStoreType.PROJECT);
+export const IssuesStoreContext = createContext<EIssuesStoreType | undefined>(undefined);
export const useIssueStoreType = () => {
const storeType = useContext(IssuesStoreContext);
- return storeType;
+ const { globalViewId, viewId, projectId, cycleId, moduleId, userId } = useParams();
+
+ // If store type exists in context, use that store type
+ if (storeType) return storeType;
+
+ // else check the router params to determine the issue store
+ if (globalViewId) return EIssuesStoreType.GLOBAL;
+
+ if (userId) return EIssuesStoreType.PROFILE;
+
+ if (viewId) return EIssuesStoreType.PROJECT_VIEW;
+
+ if (cycleId) return EIssuesStoreType.CYCLE;
+
+ if (moduleId) return EIssuesStoreType.MODULE;
+
+ if (projectId) return EIssuesStoreType.PROJECT;
+
+ return EIssuesStoreType.PROJECT;
};
export const useIssuesStore = () => {
- const storeType = useContext(IssuesStoreContext);
+ const storeType = useIssueStoreType();
return useIssues(storeType);
};