From ebf79ee2aaa0a4be8e62770ba5830892577facae Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Fri, 29 Sep 2023 20:02:56 +0530
Subject: [PATCH] fix: workspace view add issue mutation fix (#2317)
---
web/components/issues/modal.tsx | 49 ++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/web/components/issues/modal.tsx b/web/components/issues/modal.tsx
index 608cf4fd1..cf6f811f6 100644
--- a/web/components/issues/modal.tsx
+++ b/web/components/issues/modal.tsx
@@ -20,6 +20,7 @@ import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
import useProjects from "hooks/use-projects";
import useMyIssues from "hooks/my-issues/use-my-issues";
import useLocalStorage from "hooks/use-local-storage";
+import { useWorkspaceView } from "hooks/use-workspace-view";
// components
import { IssueForm, ConfirmIssueDiscard } from "components/issues";
// types
@@ -37,6 +38,7 @@ import {
VIEW_ISSUES,
INBOX_ISSUES,
PROJECT_DRAFT_ISSUES_LIST_WITH_PARAMS,
+ WORKSPACE_VIEW_ISSUES,
} from "constants/fetch-keys";
// constants
import { INBOX_ISSUE_SOURCE } from "constants/inbox";
@@ -81,7 +83,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
const [prePopulateData, setPreloadedData] = useState<Partial<IIssue>>({});
const router = useRouter();
- const { workspaceSlug, projectId, cycleId, moduleId, viewId, inboxId } = router.query;
+ const { workspaceSlug, projectId, cycleId, moduleId, viewId, globalViewId, inboxId } =
+ router.query;
const { displayFilters, params } = useIssuesView();
const { params: calendarParams } = useCalendarIssuesView();
@@ -94,6 +97,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
const { groupedIssues, mutateMyIssues } = useMyIssues(workspaceSlug?.toString());
+ const { params: globalViewParams } = useWorkspaceView();
+
const { setValue: setValueInLocalStorage, clearValue: clearLocalStorageValue } =
useLocalStorage<any>("draftedIssue", {});
@@ -276,6 +281,40 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
});
};
+ const workspaceIssuesPath = [
+ {
+ params: {
+ sub_issue: false,
+ },
+ path: "workspace-views/all-issues",
+ },
+ {
+ params: {
+ assignees: user?.id ?? undefined,
+ sub_issue: false,
+ },
+ path: "workspace-views/assigned",
+ },
+ {
+ params: {
+ created_by: user?.id ?? undefined,
+ sub_issue: false,
+ },
+ path: "workspace-views/created",
+ },
+ {
+ params: {
+ subscriber: user?.id ?? undefined,
+ sub_issue: false,
+ },
+ path: "workspace-views/subscribed",
+ },
+ ];
+
+ const currentWorkspaceIssuePath = workspaceIssuesPath.find((path) =>
+ router.pathname.includes(path.path)
+ );
+
const calendarFetchKey = cycleId
? CYCLE_ISSUES_WITH_PARAMS(cycleId.toString(), calendarParams)
: moduleId
@@ -332,6 +371,14 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
mutate(USER_ISSUE(workspaceSlug as string));
if (payload.parent && payload.parent !== "") mutate(SUB_ISSUES(payload.parent));
+
+ if (globalViewId)
+ mutate(WORKSPACE_VIEW_ISSUES(globalViewId.toString(), globalViewParams));
+
+ if (currentWorkspaceIssuePath)
+ mutate(
+ WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), currentWorkspaceIssuePath?.params)
+ );
})
.catch(() => {
setToastAlert({