fix: merge card position (#709)

xgeekshq · Dec 19, 2022 · 0bd563d · 0bd563d
1 parent ec36c98
commit 0bd563d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -49,7 +49,7 @@
 		"react-hook-form": "^7.29.0",
 		"react-query": "^3.34.19",
 		"react-select": "^5.3.0",
-		"recoil": "^0.7.0",
+		"recoil": "^0.7.6",
 		"socket.io-client": "^4.4.1",
 		"webpack": "^5.71.0"
 	},

diff --git a/frontend/src/components/Board/DragDropArea/index.tsx b/frontend/src/components/Board/DragDropArea/index.tsx
@@ -40,6 +40,7 @@ const DragDropArea: React.FC<Props> = ({ userId, board, socketId }) => {
     sourceDroppableId: string,
     draggableId: string,
     sourceIndex: number,
+    sorted: boolean,
   ) => {
     if (!board.hideCards) {
       const changes: MergeCardsDto = {
@@ -51,6 +52,7 @@ const DragDropArea: React.FC<Props> = ({ userId, board, socketId }) => {
         socketId,
         userId,
         cardPosition: sourceIndex,
+        sorted,
       };
 
       mergeCards.mutate(changes);
@@ -78,6 +80,7 @@ const DragDropArea: React.FC<Props> = ({ userId, board, socketId }) => {
         sourceDroppableId,
         draggableId,
         sourceIndex,
+        filteredColumns.includes(sourceDroppableId),
       );
     }
 

diff --git a/frontend/src/helper/board/transformBoard.tsx b/frontend/src/helper/board/transformBoard.tsx
@@ -77,24 +77,22 @@ export const handleUpdateCardPosition = (board: BoardType, changes: UpdateCardPo
 export const handleMergeCard = (board: BoardType, changes: MergeCardsDto) => {
   const boardData = removeReadOnly(board);
 
-  const { cardGroupId, cardId, colIdOfCardGroup } = changes;
-  const column = boardData.columns.find((col) => col._id === colIdOfCardGroup);
-  const cardGroup = column?.cards.find((card) => card._id === cardGroupId);
-  const selectedCard = column?.cards.find((card) => card._id === cardId);
+  const { cardGroupId, cardId, colIdOfCardGroup, columnIdOfCard, cardPosition, sorted } = changes;
+  let currentCardPosition: number | undefined = cardPosition;
+  const targetColumn = boardData.columns.find((col) => col._id === colIdOfCardGroup);
+  const cardGroup = targetColumn?.cards.find((card) => card._id === cardGroupId);
+  const sourceColumn = boardData.columns.find((col) => col._id === columnIdOfCard);
+  const selectedCard = sourceColumn?.cards.find((card) => card._id === cardId);
 
-  if (column && cardGroup && selectedCard) {
+  if (sorted) {
+    currentCardPosition = sourceColumn?.cards.findIndex((card) => card._id === cardId);
+  }
+
+  if (cardGroup && selectedCard && sourceColumn && currentCardPosition !== undefined) {
+    sourceColumn.cards = removeElementAtIndex(sourceColumn.cards, currentCardPosition);
     cardGroup.items = addElementAtIndex(cardGroup.items, cardGroup.items.length, {
-      _id: selectedCard._id,
-      text: selectedCard.text,
-      comments: selectedCard.comments,
-      votes: selectedCard.votes,
-      createdBy: selectedCard.createdBy,
-      createdByTeam: selectedCard.createdByTeam,
-      anonymous: selectedCard.anonymous,
+      ...selectedCard,
     });
-
-    const index = column.cards.findIndex((idxCard) => idxCard === selectedCard);
-    column.cards = removeElementAtIndex(column.cards, index);
   }
 
   return boardData;

diff --git a/frontend/src/types/board/mergeCard.dto.ts b/frontend/src/types/board/mergeCard.dto.ts
@@ -14,4 +14,6 @@ export default interface MergeCardsDto {
   userId: string;
 
   cardPosition: number;
+
+  sorted: boolean;
 }