fix(admin): flattenMenuItemOfAdmin use pathPrefix of routes

d2-projects · Jan 14, 2020 · f66b400 · f66b400
1 parent c58d17e
commit f66b400
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/routes/admin.js b/src/routes/admin.js
@@ -2,11 +2,11 @@ import { map, kebabCase } from 'lodash'
 
 export const pathPrefix = '/admin'
 
-export const routes = (prefix = pathPrefix) => [
+export const routes = () => [
   {
-    path: prefix,
+    path: pathPrefix,
     name: 'admin',
-    redirect: `${prefix}/dashboard`,
+    redirect: `${pathPrefix}/dashboard`,
     component: () => import('../views/admin/$index'),
     children: map(
       [

diff --git a/src/store/modules/admin/index.js b/src/store/modules/admin/index.js
@@ -1,7 +1,7 @@
 import { includes } from 'lodash'
 import { FLAGS } from '@/constants/flags'
 import { getField, updateField } from 'vuex-map-fields'
-import { flattenMenuItemOfAdmin } from '@/views/admin/$index/utils'
+import { flattenMenuItemOfAdmin } from './utils'
 import { createMenu } from './menu'
 
 export const namespace = 'admin'

diff --git a/src/views/admin/$index/utils.js → src/store/modules/admin/utils.js b/src/views/admin/$index/utils.js → src/store/modules/admin/utils.js
@@ -1,4 +1,5 @@
 import { map, flattenDeep, uniqBy, filter } from 'lodash'
+import { pathPrefix } from '@/routes/admin'
 
 const flattenMenuItem = (() => {
   const it = collection =>
@@ -14,6 +15,8 @@ const flattenMenuItem = (() => {
 
 export const flattenMenuItemOfAdmin = menu =>
   uniqBy(
-    filter(flattenMenuItem(menu), ({ index }) => /^\/admin/.test(index)),
+    filter(flattenMenuItem(menu), ({ index }) =>
+      new RegExp(pathPrefix).test(index)
+    ),
     'index'
   )