fix(helpers): prefix route path with slash (#382)

* fix(helpers): prefix route path with slash * fix(helpers): do not prefix technical urls
vuestorefront · Feb 13, 2020 · 43602eb · 43602eb · github-actions · Feb 13, 2020
1 parent 8d15ea4
commit 43602eb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/packages/helpers/__tests__/navigation/getNavigationRoutes.spec.ts b/packages/helpers/__tests__/navigation/getNavigationRoutes.spec.ts
@@ -1,6 +1,23 @@
 import { getNavigationRoutes } from "@shopware-pwa/helpers";
 describe("Shopware helpers - navigation", () => {
   describe("getNavigationRoutes", () => {
+    it("should return technical url without prefixing by slash if it exists already", () => {
+      const SWNavigationResponse = [
+        {
+          name: "Cloting",
+          route: {
+            path: "/navigation/7d4c679c61d5aa387c80a6a45d75c117"
+          },
+          children: null
+        }
+      ];
+
+      const result = getNavigationRoutes(SWNavigationResponse as any);
+
+      expect(result).toStrictEqual([
+        { routeLabel: "Cloting", routePath: "/navigation/7d4c679c61d5aa387c80a6a45d75c117", children: null }
+      ]);
+    });
     it("should return an array with one object with no children included", () => {
       const SWNavigationResponse = [
         {
@@ -15,7 +32,7 @@ describe("Shopware helpers - navigation", () => {
       const result = getNavigationRoutes(SWNavigationResponse as any);
 
       expect(result).toStrictEqual([
-        { routeLabel: "Cloting", routePath: "clothing/", children: null }
+        { routeLabel: "Cloting", routePath: "/clothing/", children: null }
       ]);
     });
 
@@ -42,12 +59,12 @@ describe("Shopware helpers - navigation", () => {
       expect(result).toStrictEqual([
         {
           routeLabel: "Cloting",
-          routePath: "clothing/",
+          routePath: "/clothing/",
           children: [
             {
               children: undefined,
               routeLabel: "Outdoor",
-              routePath: "clothing/outdoor/"
+              routePath: "/clothing/outdoor/"
             }
           ]
         }

diff --git a/packages/helpers/src/navigation/getNavigationRoutes.ts b/packages/helpers/src/navigation/getNavigationRoutes.ts
@@ -18,7 +18,7 @@ export function getNavigationRoutes(
       route: { path: string; resourceType: string };
     }) => ({
       routeLabel: element.name,
-      routePath: element.route.path,
+      routePath: element.route.path.charAt(0) !== '/' ? `/${element.route.path}` : element.route.path,
       children: element.children && getNavigationRoutes(element.children)
     })
   );