fixes

package.json

@@ -21,7 +21,7 @@
  "cy:open": "CYPRESS_CACHE_FOLDER='node_modules/.cache/Cypress' yarn cypress open -C cypress/config/cypress.config.ts"
  },
  "dependencies": {
- "@anzusystems/common-admin": "1.47.0-beta.4",
+ "@anzusystems/common-admin": "1.47.0-beta.8",
  "@mdi/font": "7.4.47",
  "@vuelidate/core": "^2.0.3",
  "@vuelidate/validators": "^2.0.4",
@@ -36,7 +36,7 @@
  "sortablejs": "^1.15.2",
  "universal-cookie": "^7.1.4",
  "uuid": "^10.0.0",
- "vue": "3.4.30",
+ "vue": "3.4.31",
  "vue-i18n": "^9.13.1",
  "vue-router": "^4.4.0",
  "vuetify": "^3.6.10"
@@ -45,9 +45,9 @@
  "@cypress/grep": "^4.0.2",
  "@intlify/unplugin-vue-i18n": "^4.0.0",
  "@rushstack/eslint-patch": "^1.10.3",
- "@stylistic/eslint-plugin": "^2.2.2",
+ "@stylistic/eslint-plugin": "^2.3.0",
  "@tsconfig/node18": "^18.2.4",
- "@types/node": "^20.14.8",
+ "@types/node": "^20.14.9",
  "@types/rusha": "^0.8.3",
  "@types/sortablejs": "^1.15.8",
  "@types/uuid": "^10.0.0",
@@ -73,7 +73,7 @@
  "stylelint-config-recommended-vue": "^1.5.0",
  "stylelint-config-standard-scss": "^13.1.0",
  "typescript": "5.4.5",
- "vite": "^5.3.1",
+ "vite": "^5.3.2",
  "vite-plugin-vuetify": "^2.0.3",
  "vue-tsc": "2.0.22"
  }

src/components/system/sidebar/SidebarMain.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { ROUTE } from '@/router/routes'
 import { useI18n } from 'vue-i18n'
-
 import { ACL } from '@/composables/auth/auth'
 
 const { t } = useI18n()

src/composables/system/appInitialize.ts

@@ -28,7 +28,7 @@ export async function createAppInitialize(
  try {
  const updateCurrentUserPromise = fetchCurrentUser(damClient)
  const loadDamConfigPromise = loadDamPrvConfig()
- await Promise.all([updateCurrentUserPromise, loadDamConfigPromise])
+ await Promise.allSettled([updateCurrentUserPromise, loadDamConfigPromise])
  } catch (error) {
  next({ name: ROUTE.SYSTEM.LOGIN })
  return
@@ -45,7 +45,7 @@ export async function createAppInitialize(
 
  const loadDamConfigExtSystemPromise = loadDamConfigExtSystem(currentExtSystemId.value)
  const loadDamConfigAssetCustomFormElementsPromise = loadDamConfigAssetCustomFormElements(currentExtSystemId.value)
- await Promise.all([loadDamConfigExtSystemPromise, loadDamConfigAssetCustomFormElementsPromise])
+ await Promise.allSettled([loadDamConfigExtSystemPromise, loadDamConfigAssetCustomFormElementsPromise])
  initAppNotificationListeners()
  } catch (error) {
  next({ name: ROUTE.SYSTEM.LOGIN })

src/main.ts

@@ -40,7 +40,7 @@ loadEnvConfig(() => {
  .use(vuetify)
  .use(router)
  .use<PluginOptions<AclValue>>(AnzuSystemsCommonAdmin, {
- currentUser: currentUser,
+ currentUser,
  languages: {
  available: AVAILABLE_LANGUAGES,
  default: DEFAULT_LANGUAGE,

src/router/checkAbility.ts

@@ -1,5 +1,5 @@
 import type { NavigationGuardNext, RouteLocationNormalized } from 'vue-router'
-import { isUndefined } from '@anzusystems/common-admin'
+import { type AclValue, isArray, isUndefined } from '@anzusystems/common-admin'
 import { useAuth } from '@/composables/auth/auth'
 
 export const checkAbility = async (
@@ -8,8 +8,10 @@ export const checkAbility = async (
  next: NavigationGuardNext
 ) => {
  const { canForAll } = useAuth()
-
- if (isUndefined(to.meta.requiredPermissions)) {
+ if (
+ isUndefined(to.meta.requiredPermissions) ||
+ (isArray<AclValue>(to.meta.requiredPermissions) && to.meta.requiredPermissions.length === 0)
+ ) {
  next()
  } else if (canForAll(to.meta.requiredPermissions)) {
  next()