From 7eb111fe3ab37914b5a94809a6cd3947cd031972 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Tue, 27 Aug 2024 18:57:32 +0530
Subject: [PATCH 1/2] fix: dashboard peekoverview issue fetch

---
 web/core/components/issues/peek-overview/root.tsx   | 12 ++++++++++--
 .../components/page-views/workspace-dashboard.tsx   |  2 +-
 web/core/store/issue/issue-details/issue.store.ts   | 13 ++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/web/core/components/issues/peek-overview/root.tsx b/web/core/components/issues/peek-overview/root.tsx
index a55b0d5464f..3685767fd2a 100644
--- a/web/core/components/issues/peek-overview/root.tsx
+++ b/web/core/components/issues/peek-overview/root.tsx
@@ -20,10 +20,17 @@ interface IIssuePeekOverview {
   embedRemoveCurrentNotification?: () => void;
   is_archived?: boolean;
   is_draft?: boolean;
+  shouldReplaceIssueOnFetch?: boolean;
 }
 
 export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
-  const { embedIssue = false, embedRemoveCurrentNotification, is_archived = false, is_draft = false } = props;
+  const {
+    embedIssue = false,
+    embedRemoveCurrentNotification,
+    is_archived = false,
+    is_draft = false,
+    shouldReplaceIssueOnFetch = true,
+  } = props;
   // router
   const pathname = usePathname();
   const {
@@ -60,7 +67,8 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
             workspaceSlug,
             projectId,
             issueId,
-            is_archived ? "ARCHIVED" : is_draft ? "DRAFT" : "DEFAULT"
+            is_archived ? "ARCHIVED" : is_draft ? "DRAFT" : "DEFAULT",
+            shouldReplaceIssueOnFetch
           );
           setLoader(false);
           setError(false);
diff --git a/web/core/components/page-views/workspace-dashboard.tsx b/web/core/components/page-views/workspace-dashboard.tsx
index 165bce60a7a..d986d191411 100644
--- a/web/core/components/page-views/workspace-dashboard.tsx
+++ b/web/core/components/page-views/workspace-dashboard.tsx
@@ -64,7 +64,7 @@ export const WorkspaceDashboardView = observer(() => {
         <>
           {joinedProjectIds.length > 0 || loader ? (
             <>
-              <IssuePeekOverview />
+              <IssuePeekOverview shouldReplaceIssueOnFetch={false} />
               <div
                 className={cn(
                   "space-y-7 md:p-7 p-3 bg-custom-background-90 h-full w-full flex flex-col overflow-y-auto",
diff --git a/web/core/store/issue/issue-details/issue.store.ts b/web/core/store/issue/issue-details/issue.store.ts
index 500d8e034b8..186fab50903 100644
--- a/web/core/store/issue/issue-details/issue.store.ts
+++ b/web/core/store/issue/issue-details/issue.store.ts
@@ -13,7 +13,8 @@ export interface IIssueStoreActions {
     workspaceSlug: string,
     projectId: string,
     issueId: string,
-    issueType?: "DEFAULT" | "DRAFT" | "ARCHIVED"
+    issueType?: "DEFAULT" | "DRAFT" | "ARCHIVED",
+    shouldReplace?: boolean
   ) => Promise<TIssue>;
   updateIssue: (workspaceSlug: string, projectId: string, issueId: string, data: Partial<TIssue>) => Promise<void>;
   removeIssue: (workspaceSlug: string, projectId: string, issueId: string) => Promise<void>;
@@ -61,7 +62,13 @@ export class IssueStore implements IIssueStore {
   });
 
   // actions
-  fetchIssue = async (workspaceSlug: string, projectId: string, issueId: string, issueType = "DEFAULT") => {
+  fetchIssue = async (
+    workspaceSlug: string,
+    projectId: string,
+    issueId: string,
+    issueType = "DEFAULT",
+    shouldReplace = true
+  ) => {
     const query = {
       expand: "issue_reactions,issue_attachment,issue_link,parent",
     };
@@ -107,7 +114,7 @@ export class IssueStore implements IIssueStore {
       is_subscribed: issue?.is_subscribed,
     };
 
-    this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload], true);
+    this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload], shouldReplace);
 
     // store handlers from issue detail
     // parent

From 37d29c2ee0ed929fe4c38ef7034f930125016344 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Tue, 27 Aug 2024 19:15:40 +0530
Subject: [PATCH 2/2] fix: intake issue modal remove parent issue action

---
 .../inbox/modals/create-edit-modal/issue-properties.tsx   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/core/components/inbox/modals/create-edit-modal/issue-properties.tsx b/web/core/components/inbox/modals/create-edit-modal/issue-properties.tsx
index 737f8e52c19..fed488332a2 100644
--- a/web/core/components/inbox/modals/create-edit-modal/issue-properties.tsx
+++ b/web/core/components/inbox/modals/create-edit-modal/issue-properties.tsx
@@ -179,7 +179,13 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
                 <CustomMenu.MenuItem className="!p-1" onClick={() => setParentIssueModalOpen(true)}>
                   Change parent issue
                 </CustomMenu.MenuItem>
-                <CustomMenu.MenuItem className="!p-1" onClick={() => handleData("parent_id", "")}>
+                <CustomMenu.MenuItem
+                  className="!p-1"
+                  onClick={() => {
+                    handleData("parent_id", "");
+                    setSelectedParentIssue(undefined);
+                  }}
+                >
                   Remove parent issue
                 </CustomMenu.MenuItem>
               </>