fix(getPages): fix applying on root wrongly

yeutech-lab · Feb 28, 2019 · ded8cf8 · ded8cf8
1 parent cd9de35
commit ded8cf8
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/src/getPages.js b/src/getPages.js
@@ -173,6 +173,6 @@ function getMergeSet(object, path, value) {
     const val = get(object, path) || {};
     set(object, path, merge(val, value));
   } else {
-    Object.assign(object, merge(object[path] || {}, { [path]: value }));
+    Object.assign(object, merge(object, { [path]: value }));
   }
 }
diff --git a/src/tests/getPages.test.js b/src/tests/getPages.test.js
@@ -276,4 +276,49 @@ describe('getPages', () => {
       },
     });
   });
+
+  it('should remove duplicate', () => {
+    const routesConfig = [
+      {
+        path: '/auth',
+        role: 1,
+      },
+      {
+        path: '/users',
+      },
+      {
+        path: '/user-management',
+      },
+      {
+        path: '/users',
+        exact: true,
+        routes: [
+          {
+            page: 'users.userEdit',
+            path: '/users/:id',
+          },
+        ],
+      },
+    ];
+    const p = getPages(routesConfig);
+    expect(p).toEqual({
+      auth: {
+        path: '/auth',
+        role: 1,
+      },
+      userManagement: {
+        path: '/user-management',
+      },
+      users: {
+        exact: true,
+        path: '/users',
+        $id: {
+          path: '/users/:id',
+        },
+        userEdit: {
+          path: '/users/:id',
+        },
+      },
+    });
+  });
 });