fix: Rearrange the mainactivity to left (#894)

When main activity is dropped on top of other main activities to the left. The activities should change the order. https://github.com/user-attachments/assets/693dc142-6157-41ca-b37e-a95248ff3ac5
equinor · Feb 13, 2025 · 494d14c · 494d14c
1 parent 9a96ffd
commit 494d14c
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/components/canvas/hooks/useNodeDrag.tsx b/components/canvas/hooks/useNodeDrag.tsx
@@ -1,4 +1,8 @@
-import { moveVertice, moveVerticeRightOfTarget } from "@/services/graphApi";
+import {
+  moveVertice,
+  moveVerticeLeftOfTarget,
+  moveVerticeRightOfTarget,
+} from "@/services/graphApi";
 import { notifyOthers } from "@/services/notifyOthers";
 import { NodeDataCommon } from "@/types/NodeData";
 import { NodeTypes } from "@/types/NodeTypes";
@@ -77,11 +81,7 @@ export const useNodeDrag = () => {
       moveNode.mutate({
         nodeId: node.id,
         targetId: target?.id ?? "",
-        position:
-          node.type === NodeTypes.mainActivity &&
-          target?.type === NodeTypes.mainActivity
-            ? Position.Right
-            : Position.Bottom,
+        position: target ? getPosition(node, target) : Position.Bottom,
         includeChildren: target ? includeChildren(node, target) : false,
       });
       setTarget(undefined);
@@ -111,13 +111,25 @@ export const useNodeDrag = () => {
       includeChildren: boolean;
     }) => {
       dispatch.setSnackMessage("⏳ Moving card...");
-      return position === Position.Bottom
-        ? moveVertice(
-            { vertexToMoveId: nodeId, vertexDestinationParentId: targetId },
-            projectId,
-            includeChildren
-          )
-        : moveVerticeRightOfTarget({ vertexId: nodeId }, targetId, projectId);
+      if (position === Position.Right) {
+        return moveVerticeRightOfTarget(
+          { vertexId: nodeId },
+          targetId,
+          projectId
+        );
+      }
+      if (position === Position.Left) {
+        return moveVerticeLeftOfTarget(
+          { vertexId: nodeId },
+          targetId,
+          projectId
+        );
+      }
+      return moveVertice(
+        { vertexToMoveId: nodeId, vertexDestinationParentId: targetId },
+        projectId,
+        includeChildren
+      );
     },
     {
       onSuccess: () => {
@@ -145,6 +157,21 @@ export const useNodeDrag = () => {
     return false;
   };
 
+  const getPosition = (
+    source: Node<NodeDataCommon>,
+    target: Node<NodeDataCommon>
+  ) => {
+    if (
+      source.type === NodeTypes.mainActivity &&
+      target?.type === NodeTypes.mainActivity
+    ) {
+      return (source.data?.order ?? 0) > (target.data?.order ?? 0)
+        ? Position.Left
+        : Position.Right;
+    }
+    return Position.Bottom;
+  };
+
   return {
     onNodeDragStart,
     onNodeDrag,

diff --git a/services/graphApi.ts b/services/graphApi.ts
@@ -83,6 +83,16 @@ export const moveVerticeRightOfTarget = (
     data
   ).then((r) => r.data);
 
+export const moveVerticeLeftOfTarget = (
+  data: { vertexId: string },
+  targetId: string,
+  projectId: string
+): Promise<unknown> =>
+  BaseAPIServices.put(
+    `${baseUrl}/graph/${projectId}/vertices/${targetId}/left`,
+    data
+  ).then((r) => r.data);
+
 export const mergeVertices = (
   data: { fromVertexId: string; toVertexId: string },
   projectId: string