From 83139989c26076d64212e081b8cf3ead468d8b8d Mon Sep 17 00:00:00 2001
From: rahulramesha <71900764+rahulramesha@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:11:20 +0530
Subject: [PATCH] fix: sort order in the same list for Kanban (#3651)

* fixing kanban dnd by stooping the modification of the original array by spreading to change the array reference

* fix sort order in the same list

* minor change in condition
---
 .../issues/issue-layouts/kanban/utils.ts          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/components/issues/issue-layouts/kanban/utils.ts b/web/components/issues/issue-layouts/kanban/utils.ts
index 064b4c23fdf..61759852439 100644
--- a/web/components/issues/issue-layouts/kanban/utils.ts
+++ b/web/components/issues/issue-layouts/kanban/utils.ts
@@ -67,10 +67,13 @@ export const handleDragDrop = async (
 
   let updateIssue: any = {};
 
-  const sourceColumnId = (source?.droppableId && source?.droppableId.split("__")) || null;
-  const destinationColumnId = (destination?.droppableId && destination?.droppableId.split("__")) || null;
+  const sourceDroppableId = source?.droppableId;
+  const destinationDroppableId = destination?.droppableId;
 
-  if (!sourceColumnId || !destinationColumnId) return;
+  const sourceColumnId = (sourceDroppableId && sourceDroppableId.split("__")) || null;
+  const destinationColumnId = (destinationDroppableId && destinationDroppableId.split("__")) || null;
+
+  if (!sourceColumnId || !destinationColumnId || !sourceDroppableId || !destinationDroppableId) return;
 
   const sourceGroupByColumnId = sourceColumnId[0] || null;
   const destinationGroupByColumnId = destinationColumnId[0] || null;
@@ -123,7 +126,11 @@ export const handleDragDrop = async (
     // for both horizontal and vertical dnd
     updateIssue = {
       ...updateIssue,
-      ...handleSortOrder(destinationIssues, destination.index, issueMap),
+      ...handleSortOrder(
+        sourceDroppableId === destinationDroppableId ? sourceIssues : destinationIssues,
+        destination.index,
+        issueMap
+      ),
     };
 
     if (subGroupBy && sourceSubGroupByColumnId && destinationSubGroupByColumnId) {