Merge branch 'dev' into fe-prescription-56

app/composables/useRBAC.ts

@@ -9,13 +9,12 @@ export function useRBAC() {
 
   const checkRole = (roleAccess: RoleAccess, _userRoles?: string[]): boolean => {
     const roles = authStore.userRole
-    return roles.some((role: string) => role in roleAccess)
+    return roles.some((role: string) => (role in roleAccess) || role === 'system') // system by-passes this check
   }
 
   const checkPermission = (roleAccess: RoleAccess, permission: Permission, _userRoles?: string[]): boolean => {
     const roles = authStore.userRole
-    // const roles = ['admisi']
+    return roles.some((role: string) => roleAccess[role]?.includes(permission) || role === 'system') // system by-passes this check
-    return roles.some((role: string) => roleAccess[role]?.includes(permission))
   }
 
   const getUserPermissions = (roleAccess: RoleAccess, _userRoles?: string[]): Permission[] => {
@@ -23,7 +22,7 @@ export function useRBAC() {
     // const roles = ['admisi']
     const permissions = new Set<Permission>()
 
-    roles.forEach((role) => {
+    roles.forEach((role: string) => {
       if (roleAccess[role]) {
         roleAccess[role].forEach((permission) => permissions.add(permission))
       }

app/pages/(features)/rehab/encounter/index.vue

@@ -5,7 +5,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })

app/stores/user.ts

@@ -7,7 +7,10 @@ export const useUserStore = defineStore(
     const isAuthenticated = computed(() => !!user.value)
     const userRole = computed(() => {
       const roles = user.value?.roles || []
-      return roles.map((v) => v.split('-')[1])
+      return roles.map((input: string) => {
+        const parts = input.split('-')
+        return parts.length > 1 ? parts[1]: parts[0]
+      })
     })
 
     const login = async (userData: any) => {