Merge branch 'release/v5.3.1' into version/5.3.0

heseya · Nov 3, 2023 · ee371a3 · ee371a3
2 parents c2c6630 + 83b493b
commit ee371a3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "store-admin",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "private": true,
   "description": "Admin panel for Heseya Store API",
   "author": "Heseya",

diff --git a/src/components/root/DesktopNavigation.vue b/src/components/root/DesktopNavigation.vue
@@ -6,6 +6,7 @@
         <router-link
           v-if="item.type === MenuItemType.Link"
           :key="i"
+          v-can="item.can"
           class="nav__link"
           :to="item.to"
           :exact="item.exact"

diff --git a/src/consts/menuItems.ts b/src/consts/menuItems.ts
@@ -63,7 +63,7 @@ export const MENU_ITEMS: MenuItem[] = [
     svgIconPath: 'icons/orders-icon.svg',
     label: 'models.orders',
     disabled: true,
-    can: PERMISSIONS_TREE.Orders.ShowSummary,
+    can: PERMISSIONS_TREE.Orders.Show,
   },
   { id: nextId(), type: MenuItemType.Spacer, disabled: true },
   {

diff --git a/src/store/menuItems.ts b/src/store/menuItems.ts
@@ -2,6 +2,9 @@ import { actionTree, getterTree, mutationTree } from 'typed-vuex'
 import { App } from '@heseya/store-core'
 
 import { DEFAULT_MENU_ITEMS, MenuItemType, MenuItem, MenuLink } from '@/consts/menuItems'
+import { hasAccess } from '@/utils/hasAccess'
+import { accessor } from '.'
+import { PERMISSIONS_TREE } from '@/consts/permissions'
 
 const state = () => ({
   activeItems: DEFAULT_MENU_ITEMS,
@@ -13,6 +16,12 @@ const getters = getterTree(state, {
       (item: MenuItem) => item.type === MenuItemType.Link,
     ) as MenuLink[]
   },
+
+  items(state): MenuItem[] {
+    return state.activeItems.filter((item) =>
+      `can` in item ? hasAccess(item.can || [])(accessor.auth.user?.permissions || []) : true,
+    )
+  },
 })
 
 const mutations = mutationTree(state, {
@@ -45,7 +54,8 @@ const actions = actionTree(
 
     async initMicrofrontendMenuItems({ dispatch, rootGetters }) {
       if (rootGetters['auth/isLogged']) {
-        await dispatch('apps/fetch', { limit: 500 }, { root: true })
+        if (hasAccess(PERMISSIONS_TREE.Apps.Show)(accessor.auth.user?.permissions || []))
+          await dispatch('apps/fetch', { limit: 500 }, { root: true })
         dispatch('removeNotExistingApps')
       }
     },

diff --git a/src/views/settings/Index.vue b/src/views/settings/Index.vue
@@ -12,7 +12,7 @@
             v-for="item in group"
             v-show="!isLinkHidden(item)"
             :key="item.id"
-            :v-can="item.can"
+            v-can="item.can"
             :name="$t(item.label).toString()"
             :url="item.to"
             :icon-class="item.iconClass"