From 0c8a8675659838ec239bea5278c3fe5bd04c9dde Mon Sep 17 00:00:00 2001
From: guru_sainath <gurusainath007@gmail.com>
Date: Mon, 6 Nov 2023 13:52:33 +0530
Subject: [PATCH] fix: handled drag and drop issue, gantt hover issue for issue
 peek overview (#2660)

---
 .../issues/issue-peek-overview/root.tsx       | 55 ++++++++++---------
 .../issues/issue-peek-overview/view.tsx       |  4 +-
 .../cycle/cycle_issue_kanban_view.store.ts    |  1 +
 web/store/issue/issue_kanban_view.store.ts    |  1 +
 .../module/module_issue_kanban_view.store.ts  |  1 +
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/web/components/issues/issue-peek-overview/root.tsx b/web/components/issues/issue-peek-overview/root.tsx
index 255e22929..6c8631b5b 100644
--- a/web/components/issues/issue-peek-overview/root.tsx
+++ b/web/components/issues/issue-peek-overview/root.tsx
@@ -1,4 +1,4 @@
-import { FC, ReactNode } from "react";
+import { FC, Fragment, ReactNode } from "react";
 import { useRouter } from "next/router";
 import useSWR from "swr";
 import { observer } from "mobx-react-lite";
@@ -112,6 +112,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
     else await issueStore.deleteIssue(workspaceSlug, projectId, issue!);
     const { query } = router;
     if (query.peekIssueId) {
+      issueDetailStore.setPeekId(null);
       delete query.peekIssueId;
       router.push({
         pathname: router.pathname,
@@ -123,30 +124,32 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
   const userRole = userStore.currentProjectRole ?? 5;
 
   return (
-    <IssueView
-      workspaceSlug={workspaceSlug}
-      projectId={projectId}
-      issueId={issueId}
-      issue={issue}
-      isLoading={isLoading}
-      isArchived={isArchived}
-      handleCopyText={handleCopyText}
-      redirectToIssueDetail={redirectToIssueDetail}
-      issueUpdate={issueUpdate}
-      issueReactionCreate={issueReactionCreate}
-      issueReactionRemove={issueReactionRemove}
-      issueCommentCreate={issueCommentCreate}
-      issueCommentUpdate={issueCommentUpdate}
-      issueCommentRemove={issueCommentRemove}
-      issueCommentReactionCreate={issueCommentReactionCreate}
-      issueCommentReactionRemove={issueCommentReactionRemove}
-      issueSubscriptionCreate={issueSubscriptionCreate}
-      issueSubscriptionRemove={issueSubscriptionRemove}
-      handleDeleteIssue={handleDeleteIssue}
-      disableUserActions={[5, 10].includes(userRole)}
-      showCommentAccessSpecifier={projectStore.currentProjectDetails?.is_deployed}
-    >
-      {children}
-    </IssueView>
+    <Fragment>
+      <IssueView
+        workspaceSlug={workspaceSlug}
+        projectId={projectId}
+        issueId={issueId}
+        issue={issue}
+        isLoading={isLoading}
+        isArchived={isArchived}
+        handleCopyText={handleCopyText}
+        redirectToIssueDetail={redirectToIssueDetail}
+        issueUpdate={issueUpdate}
+        issueReactionCreate={issueReactionCreate}
+        issueReactionRemove={issueReactionRemove}
+        issueCommentCreate={issueCommentCreate}
+        issueCommentUpdate={issueCommentUpdate}
+        issueCommentRemove={issueCommentRemove}
+        issueCommentReactionCreate={issueCommentReactionCreate}
+        issueCommentReactionRemove={issueCommentReactionRemove}
+        issueSubscriptionCreate={issueSubscriptionCreate}
+        issueSubscriptionRemove={issueSubscriptionRemove}
+        handleDeleteIssue={handleDeleteIssue}
+        disableUserActions={[5, 10].includes(userRole)}
+        showCommentAccessSpecifier={projectStore.currentProjectDetails?.is_deployed}
+      >
+        {children}
+      </IssueView>
+    </Fragment>
   );
 });
diff --git a/web/components/issues/issue-peek-overview/view.tsx b/web/components/issues/issue-peek-overview/view.tsx
index 509fe593a..a44fbedaf 100644
--- a/web/components/issues/issue-peek-overview/view.tsx
+++ b/web/components/issues/issue-peek-overview/view.tsx
@@ -97,6 +97,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {
 
   const updateRoutePeekId = () => {
     if (issueId != peekIssueId) {
+      issueDetailStore.setPeekId(issueId);
       const { query } = router;
       router.push({
         pathname: router.pathname,
@@ -107,6 +108,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {
   const removeRoutePeekId = () => {
     const { query } = router;
     if (query.peekIssueId) {
+      issueDetailStore.setPeekId(null);
       delete query.peekIssueId;
       router.push({
         pathname: router.pathname,
@@ -292,8 +294,6 @@ export const IssueView: FC<IIssueView> = observer((props) => {
                             issueReactionRemove={issueReactionRemove}
                           />
 
-                          <div className="border-t border-custom-border-400" />
-
                           <IssueComment
                             workspaceSlug={workspaceSlug}
                             projectId={projectId}
diff --git a/web/store/cycle/cycle_issue_kanban_view.store.ts b/web/store/cycle/cycle_issue_kanban_view.store.ts
index 0ffbd883b..b007e11ad 100644
--- a/web/store/cycle/cycle_issue_kanban_view.store.ts
+++ b/web/store/cycle/cycle_issue_kanban_view.store.ts
@@ -44,6 +44,7 @@ export class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore {
   }
 
   get canUserDragDrop() {
+    if (this.rootStore.issueDetail.peekId) return false;
     if (
       this.rootStore?.issueFilter?.userDisplayFilters?.order_by &&
       this.rootStore?.issueFilter?.userDisplayFilters?.order_by === "sort_order" &&
diff --git a/web/store/issue/issue_kanban_view.store.ts b/web/store/issue/issue_kanban_view.store.ts
index 9faf3190c..25d217b7f 100644
--- a/web/store/issue/issue_kanban_view.store.ts
+++ b/web/store/issue/issue_kanban_view.store.ts
@@ -44,6 +44,7 @@ export class IssueKanBanViewStore implements IIssueKanBanViewStore {
   }
 
   get canUserDragDrop() {
+    if (this.rootStore.issueDetail.peekId) return false;
     if (
       this.rootStore?.issueFilter?.userDisplayFilters?.order_by &&
       this.rootStore?.issueFilter?.userDisplayFilters?.order_by === "sort_order" &&
diff --git a/web/store/module/module_issue_kanban_view.store.ts b/web/store/module/module_issue_kanban_view.store.ts
index d06fbf02b..a8584a7ff 100644
--- a/web/store/module/module_issue_kanban_view.store.ts
+++ b/web/store/module/module_issue_kanban_view.store.ts
@@ -44,6 +44,7 @@ export class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore {
   }
 
   get canUserDragDrop() {
+    if (this.rootStore.issueDetail.peekId) return false;
     if (
       this.rootStore?.issueFilter?.userDisplayFilters?.order_by &&
       this.rootStore?.issueFilter?.userDisplayFilters?.order_by === "sort_order" &&