fix: Correctly construct URL by re-ordering portals (#3773)

theopensystemslab · Oct 9, 2024 · 7a5a4ba · 7a5a4ba
1 parent 313dbaf
commit 7a5a4ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/getURLForNode.test.ts b/editor.planx.uk/src/pages/FlowEditor/lib/__tests__/getURLForNode.test.ts
@@ -54,14 +54,14 @@ describe("constructing URLs for nodes", () => {
   test("a question node, deeply within internal portals", () => {
     const url = getURLForNode("tarantinoMovieQuestion");
     expect(url).toEqual(
-      "/testTeam/testFlow,tarantinoPortal,moviesPortal/nodes/tarantinoPortal/nodes/tarantinoMovieQuestion/edit",
+      "/testTeam/testFlow,moviesPortal,tarantinoPortal/nodes/tarantinoPortal/nodes/tarantinoMovieQuestion/edit",
     );
   });
 
   test("an answer node, deeply within internal portals", () => {
     const url = getURLForNode("reservoirDogsAnswer");
     expect(url).toEqual(
-      "/testTeam/testFlow,tarantinoPortal,moviesPortal/nodes/tarantinoPortal/nodes/tarantinoMovieQuestion/edit",
+      "/testTeam/testFlow,moviesPortal,tarantinoPortal/nodes/tarantinoPortal/nodes/tarantinoMovieQuestion/edit",
     );
   });
 

diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts
@@ -3,6 +3,7 @@ import { getPathForNode, sortFlow } from "@opensystemslab/planx-core";
 import {
   ComponentType,
   FlowGraph,
+  IndexedNode,
   NodeId,
   OrderedFlow,
 } from "@opensystemslab/planx-core/types";
@@ -521,8 +522,14 @@ export const editorStore: StateCreator<
     const [node, parent, grandparent] = path;
 
     // Construct the internal portal path if applicable
+    const mapPortalsToURLPath = (portals: ReturnType<typeof getPathForNode>) =>
+      portals
+        .reverse()
+        .map(({ id }) => id)
+        .join(",");
+
     const portalPath = internalPortals.length
-      ? "," + internalPortals.map(({ id }) => id).join(",")
+      ? "," + mapPortalsToURLPath(internalPortals)
       : "";
 
     // Determine node path based on the node type