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

* fix issue creation by using appropriate stores

* add comments

* change useIssuesStore hook to use useIssueStoreType
This commit is contained in:
rahulramesha 2024-07-08 18:52:10 +05:30 committed by GitHub
parent fb586c58d2
commit a623456e63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 33 additions and 13 deletions

View file

@ -17,14 +17,14 @@ import { CreateProjectModal } from "@/components/project";
import { CreateUpdateProjectViewModal } from "@/components/views"; import { CreateUpdateProjectViewModal } from "@/components/views";
// constants // constants
import { ISSUE_DETAILS } from "@/constants/fetch-keys"; import { ISSUE_DETAILS } from "@/constants/fetch-keys";
import { EIssuesStoreType } from "@/constants/issue";
import { EUserProjectRoles } from "@/constants/project"; import { EUserProjectRoles } from "@/constants/project";
import { EUserWorkspaceRoles } from "@/constants/workspace"; import { EUserWorkspaceRoles } from "@/constants/workspace";
// helpers // helpers
import { copyTextToClipboard } from "@/helpers/string.helper"; import { copyTextToClipboard } from "@/helpers/string.helper";
// hooks // 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 { useAppRouter } from "@/hooks/use-app-router";
import { useIssuesStore } from "@/hooks/use-issue-layout-store";
import { usePlatformOS } from "@/hooks/use-platform-os"; import { usePlatformOS } from "@/hooks/use-platform-os";
// services // services
import { IssueService } from "@/services/issue"; import { IssueService } from "@/services/issue";
@ -49,7 +49,7 @@ export const CommandPalette: FC = observer(() => {
} = useUser(); } = useUser();
const { const {
issues: { removeIssue }, issues: { removeIssue },
} = useIssues(EIssuesStoreType.PROJECT); } = useIssuesStore();
const { const {
toggleCommandPaletteModal, toggleCommandPaletteModal,
isCreateIssueModalOpen, isCreateIssueModalOpen,
@ -71,7 +71,6 @@ export const CommandPalette: FC = observer(() => {
isDeleteIssueModalOpen, isDeleteIssueModalOpen,
toggleDeleteIssueModal, toggleDeleteIssueModal,
isAnyModalOpen, isAnyModalOpen,
createIssueStoreType,
} = useCommandPalette(); } = useCommandPalette();
const { data: issueDetails } = useSWR( const { data: issueDetails } = useSWR(
@ -317,7 +316,6 @@ export const CommandPalette: FC = observer(() => {
isOpen={isCreateIssueModalOpen} isOpen={isCreateIssueModalOpen}
onClose={() => toggleCreateIssueModal(false)} onClose={() => toggleCreateIssueModal(false)}
data={cycleId ? { cycle_id: cycleId.toString() } : moduleId ? { module_ids: [moduleId.toString()] } : undefined} data={cycleId ? { cycle_id: cycleId.toString() } : moduleId ? { module_ids: [moduleId.toString()] } : undefined}
storeType={createIssueStoreType}
isDraft={isDraftIssue} isDraft={isDraftIssue}
/> />

View file

@ -152,7 +152,7 @@ export const AllIssueQuickActions: React.FC<IQuickActionProps> = observer((props
onSubmit={async (data) => { onSubmit={async (data) => {
if (issueToEdit && handleUpdate) await handleUpdate(data); if (issueToEdit && handleUpdate) await handleUpdate(data);
}} }}
storeType={EIssuesStoreType.PROJECT} storeType={EIssuesStoreType.GLOBAL}
/> />
<ContextMenu parentRef={parentRef} items={MENU_ITEMS} /> <ContextMenu parentRef={parentRef} items={MENU_ITEMS} />
<CustomMenu <CustomMenu

View file

@ -104,7 +104,7 @@ export const DraftIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
onSubmit={async (data) => { onSubmit={async (data) => {
if (issueToEdit && handleUpdate) await handleUpdate(data); if (issueToEdit && handleUpdate) await handleUpdate(data);
}} }}
storeType={EIssuesStoreType.PROJECT} storeType={EIssuesStoreType.DRAFT}
isDraft isDraft
/> />
<ContextMenu parentRef={parentRef} items={MENU_ITEMS} /> <ContextMenu parentRef={parentRef} items={MENU_ITEMS} />

View file

@ -13,6 +13,7 @@ import { ISSUE_CREATED, ISSUE_UPDATED } from "@/constants/event-tracker";
import { EIssuesStoreType } from "@/constants/issue"; import { EIssuesStoreType } from "@/constants/issue";
// hooks // hooks
import { useEventTracker, useCycle, useIssues, useModule, useProject, useIssueDetail } from "@/hooks/store"; 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 { useIssuesActions } from "@/hooks/use-issues-actions";
import useLocalStorage from "@/hooks/use-local-storage"; import useLocalStorage from "@/hooks/use-local-storage";
// components // components
@ -36,9 +37,12 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((prop
onClose, onClose,
onSubmit, onSubmit,
withDraftIssueWrapper = true, withDraftIssueWrapper = true,
storeType = EIssuesStoreType.PROJECT, storeType: issueStoreFromProps,
isDraft = false, isDraft = false,
} = props; } = props;
const issueStoreType = useIssueStoreType();
const storeType = issueStoreFromProps ?? issueStoreType;
// ref // ref
const issueTitleRef = useRef<HTMLInputElement>(null); const issueTitleRef = useRef<HTMLInputElement>(null);
// states // states

View file

@ -7,7 +7,6 @@ import { TIssue } from "@plane/types";
// components // components
import { CreateUpdateIssueModal } from "@/components/issues"; import { CreateUpdateIssueModal } from "@/components/issues";
// constants // constants
import { EIssuesStoreType } from "@/constants/issue";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
@ -90,7 +89,7 @@ export const SidebarQuickActions = observer(() => {
)} )}
onClick={() => { onClick={() => {
setTrackElement("APP_SIDEBAR_QUICK_ACTIONS"); setTrackElement("APP_SIDEBAR_QUICK_ACTIONS");
toggleCreateIssueModal(true, EIssuesStoreType.PROJECT); toggleCreateIssueModal(true);
}} }}
disabled={disabled} disabled={disabled}
> >

View file

@ -1,17 +1,36 @@
import { createContext, useContext } from "react"; import { createContext, useContext } from "react";
import { useParams } from "next/navigation";
import { EIssuesStoreType } from "@/constants/issue"; import { EIssuesStoreType } from "@/constants/issue";
import { useIssues } from "./store"; import { useIssues } from "./store";
export const IssuesStoreContext = createContext<EIssuesStoreType>(EIssuesStoreType.PROJECT); export const IssuesStoreContext = createContext<EIssuesStoreType | undefined>(undefined);
export const useIssueStoreType = () => { export const useIssueStoreType = () => {
const storeType = useContext(IssuesStoreContext); 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 = () => { export const useIssuesStore = () => {
const storeType = useContext(IssuesStoreContext); const storeType = useIssueStoreType();
return useIssues(storeType); return useIssues(storeType);
}; };