chore(VE-6750/redirection-url-without-query-string-vb): hash routing and query string combined logic and test cases added

Author: csAdityaPachauri

.talismanrc

@@ -11,5 +11,5 @@ fileignoreconfig:
     - filename: src/visualBuilder/components/Collab/ThreadPopup/__test__/CommentTextArea.test.tsx
       checksum: d0ef271ee5381d9feab06bda6e7e89bd0a882fee87495627bd811c1f0a5459c7
     - filename: src/visualBuilder/utils/__test__/getVisualBuilderRedirectionUrl.test.ts
-      checksum: 5a4ec2ca7f5cc6342b1d74c954637f6bab0b4a55f46696ea0a7f57f7f4b16457
+      checksum: c50dc0a34b3aeb8ff50ac36af38e4ace9b6ee137522faa3d82ae2309ee285040
 version: "1.0"

src/visualBuilder/utils/__test__/getVisualBuilderRedirectionUrl.test.ts

@@ -28,7 +28,7 @@ describe("getVisualBuilderRedirectionUrl", () => {
 
         const result = getVisualBuilderRedirectionUrl();
         expect(result.toString()).toBe(
-            "https://app.example.com/#!/stack/12345/visual-builder?branch=main&environment=production&target-url=https%3A%2F%2Fexample.com%2F&locale=en-US"
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com&branch=main&environment=production&locale=en-US"
         );
     });
 
@@ -47,7 +47,7 @@ describe("getVisualBuilderRedirectionUrl", () => {
 
         const result = getVisualBuilderRedirectionUrl();
         expect(result.toString()).toBe(
-            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com%2F&locale=en-US"
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com&locale=en-US"
         );
     });
 
@@ -69,7 +69,7 @@ describe("getVisualBuilderRedirectionUrl", () => {
 
         const result = getVisualBuilderRedirectionUrl();
         expect(result.toString()).toBe(
-            "https://app.example.com/#!/stack/12345/visual-builder?branch=main&environment=production&target-url=https%3A%2F%2Fexample.com%2F&locale=fr-FR"
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com&branch=main&environment=production&locale=fr-FR"
         );
     });
 
@@ -89,7 +89,7 @@ describe("getVisualBuilderRedirectionUrl", () => {
 
         const result = getVisualBuilderRedirectionUrl();
         expect(result.toString()).toBe(
-            "https://app.example.com/#!/stack/12345/visual-builder?branch=main&environment=production&target-url=https%3A%2F%2Fexample.com%2F"
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com&branch=main&environment=production"
         );
     });
 
@@ -117,4 +117,94 @@ describe("getVisualBuilderRedirectionUrl", () => {
         );
         expect(result.toString()).not.toContain("?query=test");
     });
+    it("should return the correct URL with slash type hash routing", () => {
+        Object.defineProperty(window, "location", {
+            writable: true,
+            value: new URL("https://example.com/#/page"),
+        });
+        Config.get.mockReturnValue({
+            stackDetails: {
+                branch: "main",
+                apiKey: "12345",
+                environment: "production",
+                locale: "en-US",
+            },
+            clientUrlParams: {
+                url: "https://app.example.com",
+            },
+        });
+
+        const result = getVisualBuilderRedirectionUrl();
+        expect(result.toString()).toBe(
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com%2Fpage&branch=main&environment=production&locale=en-US"
+        );
+    });
+
+    it("should return the correct URL with no slash type hash routing", () => {
+        Object.defineProperty(window, "location", {
+            writable: true,
+            value: new URL("https://example.com/#page"),
+        });
+        Config.get.mockReturnValue({
+            stackDetails: {
+                branch: "main",
+                apiKey: "12345",
+                environment: "production",
+                locale: "en-US",
+            },
+            clientUrlParams: {
+                url: "https://app.example.com",
+            },
+        });
+
+        const result = getVisualBuilderRedirectionUrl();
+        expect(result.toString()).toBe(
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com%2Fpage&branch=main&environment=production&locale=en-US"
+        );
+    });
+    it("should return the correct URL with hash bang type hash routing", () => {
+        Object.defineProperty(window, "location", {
+            writable: true,
+            value: new URL("https://example.com/#!/page"),
+        });
+        Config.get.mockReturnValue({
+            stackDetails: {
+                branch: "main",
+                apiKey: "12345",
+                environment: "production",
+                locale: "en-US",
+            },
+            clientUrlParams: {
+                url: "https://app.example.com",
+            },
+        });
+
+        const result = getVisualBuilderRedirectionUrl();
+        expect(result.toString()).toBe(
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com%2Fpage&branch=main&environment=production&locale=en-US"
+        );
+    });
+
+    it("should return the correct URL with hash bang type hash routing", () => {
+        Object.defineProperty(window, "location", {
+            writable: true,
+            value: new URL("https://example.com/#!/page?query=test"),
+        });
+        Config.get.mockReturnValue({
+            stackDetails: {
+                branch: "main",
+                apiKey: "12345",
+                environment: "production",
+                locale: "en-US",
+            },
+            clientUrlParams: {
+                url: "https://app.example.com",
+            },
+        });
+
+        const result = getVisualBuilderRedirectionUrl();
+        expect(result.toString()).toBe(
+            "https://app.example.com/#!/stack/12345/visual-builder?target-url=https%3A%2F%2Fexample.com%2Fpage&branch=main&environment=production&locale=en-US"
+        );
+    });
 });

src/visualBuilder/utils/getVisualBuilderRedirectionUrl.ts

@@ -31,7 +31,9 @@ export default function getVisualBuilderRedirectionUrl(): URL {
         } else {
             pathFromHash = "/" + hash.substring(1);
         }
-        url.pathname = (url.pathname + pathFromHash).replace(/\/\//g, "/");
+        // remove query parameters from the path if we have both hash routing and query string
+        let onlyPathname = pathFromHash.split("?")[0];
+        url.pathname = (url.pathname + onlyPathname).replace(/\/\//g, "/");
         url.hash = "";
     } else {
         url.hash = "";