From 64efb0dee7a99ad1a931f94e7717dba5d9dffae0 Mon Sep 17 00:00:00 2001
From: riefive <rie.five@gmail.com>
Date: Tue, 2 Dec 2025 13:41:27 +0700
Subject: [PATCH] feat: update role permissions and clean up access checks in
 encounter edit and add pages

---
 .../emergency/encounter/[id]/edit.vue         | 31 +++++++++----------
 .../(features)/emergency/encounter/add.vue    |  6 +---
 .../inpatient/encounter/[id]/edit.vue         | 31 +++++++++----------
 .../(features)/inpatient/encounter/add.vue    |  6 +---
 .../outpatient/encounter/[id]/edit.vue        | 31 +++++++++----------
 .../(features)/outpatient/encounter/add.vue   |  5 +--
 6 files changed, 45 insertions(+), 65 deletions(-)

diff --git a/app/pages/(features)/emergency/encounter/[id]/edit.vue b/app/pages/(features)/emergency/encounter/[id]/edit.vue
index 42c18012..514d7125 100644
--- a/app/pages/(features)/emergency/encounter/[id]/edit.vue
+++ b/app/pages/(features)/emergency/encounter/[id]/edit.vue
@@ -1,43 +1,40 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/emergency'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Edit Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/emergency/encounter']
-
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter'] || {}
 const { checkRole, hasUpdateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
+  navigateTo('/403')
 }
 
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
 
 // Get encounter ID from route params
 const encounterId = computed(() => {
   const id = route.params.id
   return typeof id === 'string' ? parseInt(id) : 0
 })
+
+// Define permission-based computed properties
+const canUpdate = hasUpdateAccess(roleAccess)
 </script>
 
 <template>
diff --git a/app/pages/(features)/emergency/encounter/add.vue b/app/pages/(features)/emergency/encounter/add.vue
index 86f8adc6..cc1dec72 100644
--- a/app/pages/(features)/emergency/encounter/add.vue
+++ b/app/pages/(features)/emergency/encounter/add.vue
@@ -2,7 +2,6 @@
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-
 import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
@@ -14,7 +13,7 @@ definePageMeta({
 
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
+const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
@@ -22,9 +21,6 @@ if (!hasAccess) {
   navigateTo('/403')
 }
 
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
 // Page needs
 const route = useRoute()
 useHead({
diff --git a/app/pages/(features)/inpatient/encounter/[id]/edit.vue b/app/pages/(features)/inpatient/encounter/[id]/edit.vue
index 39eed03d..c2ec6fe9 100644
--- a/app/pages/(features)/inpatient/encounter/[id]/edit.vue
+++ b/app/pages/(features)/inpatient/encounter/[id]/edit.vue
@@ -1,43 +1,40 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/inpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Edit Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/inpatient/encounter']
-
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter'] || {}
 const { checkRole, hasUpdateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
+  navigateTo('/403')
 }
 
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
 
 // Get encounter ID from route params
 const encounterId = computed(() => {
   const id = route.params.id
   return typeof id === 'string' ? parseInt(id) : 0
 })
+
+// Define permission-based computed properties
+const canUpdate = hasUpdateAccess(roleAccess)
 </script>
 
 <template>
diff --git a/app/pages/(features)/inpatient/encounter/add.vue b/app/pages/(features)/inpatient/encounter/add.vue
index 1852906c..20bdebaa 100644
--- a/app/pages/(features)/inpatient/encounter/add.vue
+++ b/app/pages/(features)/inpatient/encounter/add.vue
@@ -2,7 +2,6 @@
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-
 import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
@@ -14,7 +13,7 @@ definePageMeta({
 
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
+const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
@@ -22,9 +21,6 @@ if (!hasAccess) {
   navigateTo('/403')
 }
 
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
 // Page needs
 const route = useRoute()
 useHead({
diff --git a/app/pages/(features)/outpatient/encounter/[id]/edit.vue b/app/pages/(features)/outpatient/encounter/[id]/edit.vue
index 8da7886e..6b344085 100644
--- a/app/pages/(features)/outpatient/encounter/[id]/edit.vue
+++ b/app/pages/(features)/outpatient/encounter/[id]/edit.vue
@@ -1,43 +1,40 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Edit Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/encounter']
-
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
 const { checkRole, hasUpdateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
+  navigateTo('/403')
 }
 
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
 
 // Get encounter ID from route params
 const encounterId = computed(() => {
   const id = route.params.id
   return typeof id === 'string' ? parseInt(id) : 0
 })
+
+// Define permission-based computed properties
+const canUpdate = hasUpdateAccess(roleAccess)
 </script>
 
 <template>
diff --git a/app/pages/(features)/outpatient/encounter/add.vue b/app/pages/(features)/outpatient/encounter/add.vue
index e60221e5..20bdebaa 100644
--- a/app/pages/(features)/outpatient/encounter/add.vue
+++ b/app/pages/(features)/outpatient/encounter/add.vue
@@ -13,7 +13,7 @@ definePageMeta({
 
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
+const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
@@ -21,9 +21,6 @@ if (!hasAccess) {
   navigateTo('/403')
 }
 
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
 // Page needs
 const route = useRoute()
 useHead({