diff --git a/app/assets/css/main.css b/app/assets/css/main.css
index b04b1eac..8f547641 100644
--- a/app/assets/css/main.css
+++ b/app/assets/css/main.css
@@ -174,7 +174,7 @@ body {
 }
 
 body, table, label {
-  @apply md:!text-xs xl:!text-sm 2xl:!text-base;
+  @apply md:!text-xs xl:!text-sm 2xl:!text-sm;
 }
 
 /* Container */
diff --git a/app/components/app/division/entry-form-prev.vue b/app/components/app/division/entry-form-prev.vue
index 864e0cea..0684fc55 100644
--- a/app/components/app/division/entry-form-prev.vue
+++ b/app/components/app/division/entry-form-prev.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import type { TreeItem } from '~/components/pub/base/select-tree/type'
+import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import TreeSelect from '~/components/pub/base/select-tree/tree-select.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { Form } from '~/components/pub/ui/form'
 
 interface DivisionFormData {
diff --git a/app/components/app/division/entry-form.vue b/app/components/app/division/entry-form.vue
index 5f4b3299..a928c1bd 100644
--- a/app/components/app/division/entry-form.vue
+++ b/app/components/app/division/entry-form.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 
 // Types
 import type { DivisionFormData } from '~/schemas/division.schema.ts'
diff --git a/app/components/app/division/list-cfg.ts b/app/components/app/division/list-cfg.ts
index 3674b5c2..079faf52 100644
--- a/app/components/app/division/list-cfg.ts
+++ b/app/components/app/division/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-ud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-ud.vue'))
 
 export const cols: Col[] = [{ width: 100 }, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/division/list.vue b/app/components/app/division/list.vue
index dd450462..9169bcac 100644
--- a/app/components/app/division/list.vue
+++ b/app/components/app/division/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/division/tree.vue b/app/components/app/division/tree.vue
index 9dedcec3..a6f66eff 100644
--- a/app/components/app/division/tree.vue
+++ b/app/components/app/division/tree.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import TreeSelect from '~/components/pub/base/select-tree/tree-select.vue'
+import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
 
 /**
  * DEMO COMPONENT - Tree Select dengan Lazy Loading
diff --git a/app/components/app/doctor/entry-form.vue b/app/components/app/doctor/entry-form.vue
index bfa9802e..24584074 100644
--- a/app/components/app/doctor/entry-form.vue
+++ b/app/components/app/doctor/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/doctor/list-cfg.ts b/app/components/app/doctor/list-cfg.ts
index 0cff0cce..14c9cf0d 100644
--- a/app/components/app/doctor/list-cfg.ts
+++ b/app/components/app/doctor/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 const _doctorStatus = {
diff --git a/app/components/app/doctor/list.vue b/app/components/app/doctor/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/doctor/list.vue
+++ b/app/components/app/doctor/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/employee/entry-form.vue b/app/components/app/employee/entry-form.vue
index 7bb9dfd7..8ccf0916 100644
--- a/app/components/app/employee/entry-form.vue
+++ b/app/components/app/employee/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any; items: any[] }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/employee/list-cfg.ts b/app/components/app/employee/list-cfg.ts
index f697dc88..69ee9962 100644
--- a/app/components/app/employee/list-cfg.ts
+++ b/app/components/app/employee/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 const doctorStatus = {
   0: 'Tidak Aktif',
diff --git a/app/components/app/employee/list.vue b/app/components/app/employee/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/employee/list.vue
+++ b/app/components/app/employee/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/encounter/assesment-function/list-cfg.ts b/app/components/app/encounter/assesment-function/list-cfg.ts
index 24cc80d1..754d2dfb 100644
--- a/app/components/app/encounter/assesment-function/list-cfg.ts
+++ b/app/components/app/encounter/assesment-function/list-cfg.ts
@@ -1,9 +1,9 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/custom-ui/data/types'
+import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [
   {},
diff --git a/app/components/app/encounter/assesment-function/list.vue b/app/components/app/encounter/assesment-function/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/encounter/assesment-function/list.vue
+++ b/app/components/app/encounter/assesment-function/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 50189589..a3ec0902 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/custom-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/encounter/filter.vue b/app/components/app/encounter/filter.vue
index 91812991..31ec4476 100644
--- a/app/components/app/encounter/filter.vue
+++ b/app/components/app/encounter/filter.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
-import Select from '~/components/pub/custom-ui/form/select.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
 import { Form } from '~/components/pub/ui/form'
 
 interface InstallationFormData {
diff --git a/app/components/app/encounter/list-cfg.ts b/app/components/app/encounter/list-cfg.ts
index 9e1b5d33..0ca6a92c 100644
--- a/app/components/app/encounter/list-cfg.ts
+++ b/app/components/app/encounter/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-pdud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-pdud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 export const cols: Col[] = [
diff --git a/app/components/app/encounter/list.vue b/app/components/app/encounter/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/encounter/list.vue
+++ b/app/components/app/encounter/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/encounter/process.vue b/app/components/app/encounter/process.vue
new file mode 100644
index 00000000..237c04c2
--- /dev/null
+++ b/app/components/app/encounter/process.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import AssesmentFunctionList from './assesment-function/list.vue'
+
+const props = defineProps<{
+  initialActiveTab: string
+}>()
+
+const activeTab = ref(props.initialActiveTab)
+const emit = defineEmits<{
+  changeTab: [value: string]
+}>()
+
+interface TabItem {
+  value: string
+  label: string
+  component?: any
+  props?: Record<string, any>
+}
+
+const tabs: TabItem[] = [
+  { value: 'status', label: 'Status Masuk/Keluar' },
+  { value: 'early-medical-assessment', label: 'Pengkajian Awal Medis' },
+  { value: 'rehab-medical-assessment', label: 'Pengkajian Awal Medis Rehabilitasi Medis' },
+  { value: 'function-assessment', label: 'Asesmen Fungsi', component: AssesmentFunctionList },
+  { value: 'therapy-protocol', label: 'Protokol Terapi' },
+  { value: 'education-assessment', label: 'Asesmen Kebutuhan Edukasi' },
+  { value: 'consent', label: 'General Consent' },
+  { value: 'patient-note', label: 'CPRJ' },
+  { value: 'prescription', label: 'Order Obat' },
+  { value: 'device', label: 'Order Alkes' },
+  { value: 'mcu-radiology', label: 'Order Radiologi' },
+  { value: 'mcu-lab-pc', label: 'Order Lab PK' },
+  { value: 'mcu-lab-micro', label: 'Order Lab Mikro' },
+  { value: 'mcu-lab-pa', label: 'Order Lab PA' },
+  { value: 'medical-action', label: 'Order Ruang Tindakan' },
+  { value: 'mcu-result', label: 'Hasil Penunjang' },
+  { value: 'consultation', label: 'Konsultasi' },
+  { value: 'resume', label: 'Resume' },
+  { value: 'control', label: 'Surat Kontrol' },
+  { value: 'screening', label: 'Skrinning MPP' },
+  { value: 'supporting-document', label: 'Upload Dokumen Pendukung' },
+]
+
+function changeTab(value: string) {
+  activeTab.value = value;
+  emit('changeTab', value);
+}
+</script>
+
+<template>
+  <!-- Tabs -->
+  <div class="mt-4 flex flex-wrap gap-2 rounded-md border bg-white p-4 shadow-sm">
+    <Button
+      v-for="tab in tabs"
+      :key="tab.value"
+      :data-active="activeTab === tab.value"
+      class="rounded-full transition data-[active=false]:bg-gray-100 data-[active=true]:bg-primary data-[active=false]:text-gray-700 data-[active=true]:text-white"
+      @click="changeTab(tab.value)"
+    >
+      {{ tab.label }}
+    </Button>
+  </div>
+
+  <!-- Active Tab Content -->
+  <div class="mt-4 rounded-md border p-4">
+    <component
+      v-if="tabs.find((t) => t.value === activeTab)?.component"
+      :is="tabs.find((t) => t.value === activeTab)?.component"
+      :label="tabs.find((t) => t.value === activeTab)?.label"
+      v-bind="tabs.find((t) => t.value === activeTab)?.props || {}"
+    />
+  </div>
+</template>
diff --git a/app/components/app/encounter/quick-info.vue b/app/components/app/encounter/quick-info.vue
new file mode 100644
index 00000000..56f40e79
--- /dev/null
+++ b/app/components/app/encounter/quick-info.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import * as DE from '~/components/pub/my-ui/doc-entry';
+
+defineProps<{
+  data: any
+}>()
+</script>
+
+<template>
+  <div class="w-full rounded-md border bg-white p-4 shadow-sm">
+    <!-- Data Pasien -->
+    <h2 class="mb-2 md:text-base 2xl:text-lg font-semibold">{{ 'data.patient.person.name' }} - {{ 'data.patient.number' }}</h2>
+
+    <div class="grid grid-cols-3" >
+      <div>
+        <DE.Block mode="preview" labelSize="large">
+          <DE.Cell>
+            <DE.Label>Tgl. Lahir</DE.Label>
+            <DE.Field>
+              {{ 'data.patient.person.birthDate' }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label>Jenis Kelamin</DE.Label>
+            <DE.Field>
+              {{ 'data.patient.person.gender_code' }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label>Alamat</DE.Label>
+            <DE.Field>
+              <div v-html="'data.patient.person .addresses[0].address'"></div>
+            </DE.Field>
+          </DE.Cell>
+        </DE.Block>
+      </div>
+      <div>
+        <DE.Block mode="preview" labelSize="large">
+          <DE.Cell>
+            <DE.Label>Tgl. Kunjungan</DE.Label>
+            <DE.Field>
+              {{ 'data.date' }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label>Klinik</DE.Label>
+            <DE.Field>
+              {{ 'data.unit.name' }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label>DPJP</DE.Label>
+            <DE.Field>
+              {{ 'data.doctor.name' }}
+            </DE.Field>
+          </DE.Cell>
+        </DE.Block>
+      </div>
+      <div>
+        <DE.Block mode="preview" labelSize="large">
+          <DE.Cell>
+            <DE.Label>Tgl. Kunjungan</DE.Label>
+            <DE.Field>
+              {{ 'data.date' }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label>Klinik</DE.Label>
+            <DE.Field>
+              {{ 'data.unit.name' }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label>DPJP</DE.Label>
+            <DE.Field>
+              {{ 'data.doctor.name' }}
+            </DE.Field>
+          </DE.Cell>
+        </DE.Block>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/equipment/entry-form.vue b/app/components/app/equipment/entry-form.vue
index 07f5af19..5ff92ad2 100644
--- a/app/components/app/equipment/entry-form.vue
+++ b/app/components/app/equipment/entry-form.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 
 // Types
 import type { MaterialFormData } from '~/schemas/material.schema.ts'
diff --git a/app/components/app/equipment/list-cfg.ts b/app/components/app/equipment/list-cfg.ts
index add2eba3..8f3ff7e5 100644
--- a/app/components/app/equipment/list-cfg.ts
+++ b/app/components/app/equipment/list-cfg.ts
@@ -1,9 +1,9 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, Th } from '~/components/pub/custom-ui/data/types'
+import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, Th } from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{ width: 100 }, { width: 250 }, { width: 100 }, { width: 100 }, { width: 50 }]
 
diff --git a/app/components/app/equipment/list.vue b/app/components/app/equipment/list.vue
index d44aa4d8..9d655fdf 100644
--- a/app/components/app/equipment/list.vue
+++ b/app/components/app/equipment/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/installation/entry-form.vue b/app/components/app/installation/entry-form.vue
index 8272fc27..4257b712 100644
--- a/app/components/app/installation/entry-form.vue
+++ b/app/components/app/installation/entry-form.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
-import Select from '~/components/pub/custom-ui/form/select.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
 import { Form } from '~/components/pub/ui/form'
 
 interface InstallationFormData {
diff --git a/app/components/app/installation/list-cfg.ts b/app/components/app/installation/list-cfg.ts
index 6b8dc5ea..81de0024 100644
--- a/app/components/app/installation/list-cfg.ts
+++ b/app/components/app/installation/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-ud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-ud.vue'))
 
 export const cols: Col[] = [{ width: 100 }, {}, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/installation/list.vue b/app/components/app/installation/list.vue
index e9489ef1..72973ca3 100644
--- a/app/components/app/installation/list.vue
+++ b/app/components/app/installation/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data" :cols="cols" :header="header" :keys="keys" :func-parsed="funcParsed"
       :func-html="funcHtml" :func-component="funcComponent" :skeleton-size="paginationMeta?.pageSize"
     />
diff --git a/app/components/app/item-price/entry-form.vue b/app/components/app/item-price/entry-form.vue
index e0c97dc8..f2f55d76 100644
--- a/app/components/app/item-price/entry-form.vue
+++ b/app/components/app/item-price/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/item-price/list-cfg.ts b/app/components/app/item-price/list-cfg.ts
index e2c72f9c..c26856bf 100644
--- a/app/components/app/item-price/list-cfg.ts
+++ b/app/components/app/item-price/list-cfg.ts
@@ -5,10 +5,10 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 const _doctorStatus = {
   0: 'Tidak Aktif',
diff --git a/app/components/app/item-price/list.vue b/app/components/app/item-price/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/item-price/list.vue
+++ b/app/components/app/item-price/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/item/entry-form.vue b/app/components/app/item/entry-form.vue
index 8f6d3abf..7ddc930b 100644
--- a/app/components/app/item/entry-form.vue
+++ b/app/components/app/item/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/item/list-cfg.ts b/app/components/app/item/list-cfg.ts
index e2c72f9c..c26856bf 100644
--- a/app/components/app/item/list-cfg.ts
+++ b/app/components/app/item/list-cfg.ts
@@ -5,10 +5,10 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 const _doctorStatus = {
   0: 'Tidak Aktif',
diff --git a/app/components/app/item/list.vue b/app/components/app/item/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/item/list.vue
+++ b/app/components/app/item/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/laborant/entry-form.vue b/app/components/app/laborant/entry-form.vue
index 4bf7bc68..c9d54963 100644
--- a/app/components/app/laborant/entry-form.vue
+++ b/app/components/app/laborant/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/laborant/list-cfg.ts b/app/components/app/laborant/list-cfg.ts
index 0cff0cce..14c9cf0d 100644
--- a/app/components/app/laborant/list-cfg.ts
+++ b/app/components/app/laborant/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 const _doctorStatus = {
diff --git a/app/components/app/laborant/list.vue b/app/components/app/laborant/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/laborant/list.vue
+++ b/app/components/app/laborant/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/medicine-group/entry-form.vue b/app/components/app/medicine-group/entry-form.vue
index 2f955980..38aaeb8f 100644
--- a/app/components/app/medicine-group/entry-form.vue
+++ b/app/components/app/medicine-group/entry-form.vue
@@ -1,10 +1,10 @@
 
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Types
@@ -93,4 +93,4 @@ function onCancelForm() {
       </Button>
     </div>
   </form>
-</template>
\ No newline at end of file
+</template>
diff --git a/app/components/app/medicine-group/list-cfg.ts b/app/components/app/medicine-group/list-cfg.ts
index 4d053e5e..b9f068e9 100644
--- a/app/components/app/medicine-group/list-cfg.ts
+++ b/app/components/app/medicine-group/list-cfg.ts
@@ -5,10 +5,10 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, { width: 50 }]
 
diff --git a/app/components/app/medicine-group/list.vue b/app/components/app/medicine-group/list.vue
index d44aa4d8..9d655fdf 100644
--- a/app/components/app/medicine-group/list.vue
+++ b/app/components/app/medicine-group/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/medicine-method/entry-form.vue b/app/components/app/medicine-method/entry-form.vue
index 1be0a4a2..cccfe1c4 100644
--- a/app/components/app/medicine-method/entry-form.vue
+++ b/app/components/app/medicine-method/entry-form.vue
@@ -1,10 +1,10 @@
 
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Types
diff --git a/app/components/app/medicine-method/list-cfg.ts b/app/components/app/medicine-method/list-cfg.ts
index 4d053e5e..b9f068e9 100644
--- a/app/components/app/medicine-method/list-cfg.ts
+++ b/app/components/app/medicine-method/list-cfg.ts
@@ -5,10 +5,10 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, { width: 50 }]
 
diff --git a/app/components/app/medicine-method/list.vue b/app/components/app/medicine-method/list.vue
index d44aa4d8..9d655fdf 100644
--- a/app/components/app/medicine-method/list.vue
+++ b/app/components/app/medicine-method/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/medicine/entry-form.vue b/app/components/app/medicine/entry-form.vue
index 332b8399..0ef6fe5f 100644
--- a/app/components/app/medicine/entry-form.vue
+++ b/app/components/app/medicine/entry-form.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Helpers
diff --git a/app/components/app/medicine/list-cfg.ts b/app/components/app/medicine/list-cfg.ts
index 3440e5f9..bde85bc9 100644
--- a/app/components/app/medicine/list-cfg.ts
+++ b/app/components/app/medicine/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, {}, {}, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/medicine/list.vue b/app/components/app/medicine/list.vue
index d44aa4d8..9d655fdf 100644
--- a/app/components/app/medicine/list.vue
+++ b/app/components/app/medicine/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/nurse/entry-form.vue b/app/components/app/nurse/entry-form.vue
index 4bf7bc68..c9d54963 100644
--- a/app/components/app/nurse/entry-form.vue
+++ b/app/components/app/nurse/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/nurse/list-cfg.ts b/app/components/app/nurse/list-cfg.ts
index 0cff0cce..14c9cf0d 100644
--- a/app/components/app/nurse/list-cfg.ts
+++ b/app/components/app/nurse/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 const _doctorStatus = {
diff --git a/app/components/app/nurse/list.vue b/app/components/app/nurse/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/nurse/list.vue
+++ b/app/components/app/nurse/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/nutritionist/entry-form.vue b/app/components/app/nutritionist/entry-form.vue
index 4bf7bc68..c9d54963 100644
--- a/app/components/app/nutritionist/entry-form.vue
+++ b/app/components/app/nutritionist/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/nutritionist/list-cfg.ts b/app/components/app/nutritionist/list-cfg.ts
index 0cff0cce..14c9cf0d 100644
--- a/app/components/app/nutritionist/list-cfg.ts
+++ b/app/components/app/nutritionist/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 const _doctorStatus = {
diff --git a/app/components/app/nutritionist/list.vue b/app/components/app/nutritionist/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/nutritionist/list.vue
+++ b/app/components/app/nutritionist/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/patient/entry-form.vue b/app/components/app/patient/entry-form.vue
index bf0284ec..7c850a16 100644
--- a/app/components/app/patient/entry-form.vue
+++ b/app/components/app/patient/entry-form.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
-import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 </script>
 
 <template>
diff --git a/app/components/app/patient/list-cfg.ts b/app/components/app/patient/list-cfg.ts
index fd4d0317..c74ef59b 100644
--- a/app/components/app/patient/list-cfg.ts
+++ b/app/components/app/patient/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 export const cols: Col[] = [
diff --git a/app/components/app/patient/list.vue b/app/components/app/patient/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/patient/list.vue
+++ b/app/components/app/patient/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/patient/picker.vue b/app/components/app/patient/picker.vue
index a1dda029..5789ef6b 100644
--- a/app/components/app/patient/picker.vue
+++ b/app/components/app/patient/picker.vue
@@ -6,7 +6,7 @@ const modelValue = defineModel<any | null>()
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     v-model="modelValue"
     select-mode="single"
     :rows="data"
diff --git a/app/components/app/patient/quick-info.vue b/app/components/app/patient/quick-info.vue
deleted file mode 100644
index 1f8943c2..00000000
--- a/app/components/app/patient/quick-info.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<script setup lang="ts">
-interface PatientData {
-  noRm: string
-  nama: string
-  alamat: string
-  tanggalKunjungan: string
-  klinik: string
-  tanggalLahir: string
-  jenisKelamin: string
-  jenisPembayaran: string
-  noBilling: string
-  dpjp: string
-}
-
-defineProps<{
-  data: PatientData
-}>()
-</script>
-
-<template>
-  <div class="w-full rounded-md border bg-white p-4 shadow-sm">
-    <!-- Data Pasien -->
-    <h2 class="mb-2 text-base font-semibold">Data Pasien:</h2>
-
-    <div class="grid grid-cols-1 gap-y-2 text-sm md:grid-cols-2 lg:grid-cols-3">
-      <!-- col 1 -->
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">No. RM</span>
-        <span>: {{ data.noRm }}</span>
-      </div>
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">Tanggal Kunjungan</span>
-        <span>: {{ data.tanggalKunjungan }}</span>
-      </div>
-      <div class="grid grid-cols-[100px_auto]">
-        <span class="font-medium">Klinik</span>
-        <span>: {{ data.klinik }}</span>
-      </div>
-
-      <!-- col 2 -->
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">Nama Pasien</span>
-        <span>: {{ data.nama }}</span>
-      </div>
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">Tanggal Lahir</span>
-        <span>: {{ data.tanggalLahir }}</span>
-      </div>
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">Jenis Pembayaran</span>
-        <span>: {{ data.jenisPembayaran }}</span>
-      </div>
-
-      <!-- col 3 -->
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">Alamat</span>
-        <span>: {{ data.alamat }}</span>
-      </div>
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">Jenis Kelamin</span>
-        <span>: {{ data.jenisKelamin }}</span>
-      </div>
-      <div class="grid grid-cols-[140px_auto]">
-        <span class="font-medium">No. Billing</span>
-        <span>: {{ data.noBilling }}</span>
-      </div>
-
-      <!-- full row -->
-      <div class="grid grid-cols-[140px_auto] lg:col-span-3">
-        <span class="font-medium">DPJP</span>
-        <span>: {{ data.dpjp }}</span>
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/app/components/app/person-address/entry-form.vue b/app/components/app/person-address/entry-form.vue
index 88cbed61..bb10d3d4 100644
--- a/app/components/app/person-address/entry-form.vue
+++ b/app/components/app/person-address/entry-form.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
 import { Form } from '~/components/pub/ui/form'
diff --git a/app/components/app/person-contact/entry-form.vue b/app/components/app/person-contact/entry-form.vue
index 9b15c534..d7da4e91 100644
--- a/app/components/app/person-contact/entry-form.vue
+++ b/app/components/app/person-contact/entry-form.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
 import { Form } from '~/components/pub/ui/form'
diff --git a/app/components/app/person-relative/entry-form.vue b/app/components/app/person-relative/entry-form.vue
index 37e6bcdc..15aea135 100644
--- a/app/components/app/person-relative/entry-form.vue
+++ b/app/components/app/person-relative/entry-form.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
 import { Form } from '~/components/pub/ui/form'
diff --git a/app/components/app/person/entry-form.vue b/app/components/app/person/entry-form.vue
index e5d527a9..24705de4 100644
--- a/app/components/app/person/entry-form.vue
+++ b/app/components/app/person/entry-form.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
 import { Form } from '~/components/pub/ui/form'
diff --git a/app/components/app/pharmacist/entry-form.vue b/app/components/app/pharmacist/entry-form.vue
index 5dbe9bb0..4d7fde87 100644
--- a/app/components/app/pharmacist/entry-form.vue
+++ b/app/components/app/pharmacist/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/pharmacist/list-cfg.ts b/app/components/app/pharmacist/list-cfg.ts
index 0cff0cce..14c9cf0d 100644
--- a/app/components/app/pharmacist/list-cfg.ts
+++ b/app/components/app/pharmacist/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 const _doctorStatus = {
diff --git a/app/components/app/pharmacist/list.vue b/app/components/app/pharmacist/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/pharmacist/list.vue
+++ b/app/components/app/pharmacist/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/prescription-item/list-entry.ts b/app/components/app/prescription-item/list-entry.ts
index 709af3c8..c257b46a 100644
--- a/app/components/app/prescription-item/list-entry.ts
+++ b/app/components/app/prescription-item/list-entry.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, {}, {}, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/prescription-item/list-entry.vue b/app/components/app/prescription-item/list-entry.vue
index c27f4511..e5feecba 100644
--- a/app/components/app/prescription-item/list-entry.vue
+++ b/app/components/app/prescription-item/list-entry.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/prescription/entry.vue b/app/components/app/prescription/entry.vue
index 6e276206..3b4acf28 100644
--- a/app/components/app/prescription/entry.vue
+++ b/app/components/app/prescription/entry.vue
@@ -1,32 +1,32 @@
 <template>
   <div>
-    <PubCustomUiDocEntryBlock mode="preview" :colCount=3>
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>DPJP</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+    <PubMyUiDocEntryBlock mode="preview" :colCount=3>
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>DPJP</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-      <PubCustomUiDocEntryCell />
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>Tgl Order</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+      <PubMyUiDocEntryCell />
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>Tgl Order</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>DPJP</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>DPJP</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-      <PubCustomUiDocEntryCell />
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>Status</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+      <PubMyUiDocEntryCell />
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>Status</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-    </PubCustomUiDocEntryBlock>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+    </PubMyUiDocEntryBlock>
   </div>
 </template>
diff --git a/app/components/app/prescription/list.vue b/app/components/app/prescription/list.vue
index 901a6e6c..6fe27d39 100644
--- a/app/components/app/prescription/list.vue
+++ b/app/components/app/prescription/list.vue
@@ -10,33 +10,33 @@
   </div>
   <Separator class="my-5" />
   <div>
-    <PubCustomUiDocEntryBlock mode="preview" :colCount=3>
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>DPJP</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+    <PubMyUiDocEntryBlock mode="preview" :colCount=3>
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>DPJP</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-      <PubCustomUiDocEntryCell />
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>Tgl Order</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+      <PubMyUiDocEntryCell />
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>Tgl Order</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>DPJP</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>DPJP</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-      <PubCustomUiDocEntryCell />
-      <PubCustomUiDocEntryCell>
-        <PubCustomUiDocEntryLabel>Status</PubCustomUiDocEntryLabel>
-        <PubCustomUiDocEntryField>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+      <PubMyUiDocEntryCell />
+      <PubMyUiDocEntryCell>
+        <PubMyUiDocEntryLabel>Status</PubMyUiDocEntryLabel>
+        <PubMyUiDocEntryField>
             <Input />
-        </PubCustomUiDocEntryField>
-      </PubCustomUiDocEntryCell>
-    </PubCustomUiDocEntryBlock>
+        </PubMyUiDocEntryField>
+      </PubMyUiDocEntryCell>
+    </PubMyUiDocEntryBlock>
   </div>
 </template>
diff --git a/app/components/app/rehab/registration/sep-prosedur/list-cfg.ts b/app/components/app/rehab/registration/sep-prosedur/list-cfg.ts
index 24cc80d1..754d2dfb 100644
--- a/app/components/app/rehab/registration/sep-prosedur/list-cfg.ts
+++ b/app/components/app/rehab/registration/sep-prosedur/list-cfg.ts
@@ -1,9 +1,9 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/custom-ui/data/types'
+import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [
   {},
diff --git a/app/components/app/rehab/registration/sep-prosedur/list.vue b/app/components/app/rehab/registration/sep-prosedur/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/rehab/registration/sep-prosedur/list.vue
+++ b/app/components/app/rehab/registration/sep-prosedur/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/app/satusehat/card-summary.vue b/app/components/app/satusehat/card-summary.vue
index 6d139044..531e24d2 100644
--- a/app/components/app/satusehat/card-summary.vue
+++ b/app/components/app/satusehat/card-summary.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Summary } from '~/components/pub/base/summary-card/type'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
 
 const props = defineProps<{
   isLoading: boolean
@@ -10,10 +10,10 @@ const props = defineProps<{
 <template>
   <div class="grid gap-4 md:grid-cols-2 md:gap-8 lg:grid-cols-4">
     <template v-if="props.isLoading">
-      <PubBaseSummaryCard v-for="n in 4" :key="n" is-skeleton :stat="summaryData[n]" />
+      <PubMyUiSummaryCard v-for="n in 4" :key="n" is-skeleton :stat="summaryData[n]" />
     </template>
     <template v-else>
-      <PubBaseSummaryCard v-for="card in summaryData" :key="card.title" :stat="card" />
+      <PubMyUiSummaryCard v-for="card in summaryData" :key="card.title" :stat="card" />
     </template>
   </div>
 </template>
diff --git a/app/components/app/satusehat/list.vue b/app/components/app/satusehat/list.vue
index b4730480..3e3fe4cb 100644
--- a/app/components/app/satusehat/list.vue
+++ b/app/components/app/satusehat/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
 :rows="data" :cols="cols" :header="header" :keys="keys" :func-parsed="funcParsed"
     :func-html="funcHtml" :func-component="funcComponent"
 />
diff --git a/app/components/app/sep/entry-form.vue b/app/components/app/sep/entry-form.vue
index 0e6c16da..9ff4c8cd 100644
--- a/app/components/app/sep/entry-form.vue
+++ b/app/components/app/sep/entry-form.vue
@@ -10,7 +10,7 @@ import { Label } from '~/components/pub/ui/label'
 import { Select } from '~/components/pub/ui/select'
 import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
 import { Textarea } from '~/components/pub/ui/textarea'
-import DatepickerSingle from '~/components/pub/custom-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
 
 const emit = defineEmits<{
   (e: 'event', value: any): void
diff --git a/app/components/app/sep/list-cfg.ts b/app/components/app/sep/list-cfg.ts
index 013c7d6b..55fa91e1 100644
--- a/app/components/app/sep/list-cfg.ts
+++ b/app/components/app/sep/list-cfg.ts
@@ -1,9 +1,9 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, Th } from '~/components/pub/custom-ui/data/types'
+import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, Th } from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SepDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [
   { width: 120 }, // TGL. SEP
@@ -61,7 +61,7 @@ export const delKeyNames: KeyLabel[] = [
 ]
 
 export const funcParsed: Record<string, (row: any, ...args: any[]) => any> = {
-  
+
 }
 
 export const funcComponent: RecStrFuncComponent = {
diff --git a/app/components/app/sep/list.vue b/app/components/app/sep/list.vue
index 25707062..abf68e25 100644
--- a/app/components/app/sep/list.vue
+++ b/app/components/app/sep/list.vue
@@ -22,7 +22,7 @@ const props = defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :cols="cols"
     :header="header"
     :keys="keys"
diff --git a/app/components/app/sep/small-entry.vue b/app/components/app/sep/small-entry.vue
index 4b099b67..b4957aa9 100644
--- a/app/components/app/sep/small-entry.vue
+++ b/app/components/app/sep/small-entry.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/custom-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/specialist-intern/entry-form.vue b/app/components/app/specialist-intern/entry-form.vue
index e91346f8..c9719e09 100644
--- a/app/components/app/specialist-intern/entry-form.vue
+++ b/app/components/app/specialist-intern/entry-form.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
 import { Form } from '~/components/pub/ui/form'
diff --git a/app/components/app/specialist/entry-form-prev.vue b/app/components/app/specialist/entry-form-prev.vue
index 2dbfffc1..874a2c7d 100644
--- a/app/components/app/specialist/entry-form-prev.vue
+++ b/app/components/app/specialist/entry-form-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 interface SpecialistFormData {
   name: string
diff --git a/app/components/app/specialist/entry-form.vue b/app/components/app/specialist/entry-form.vue
index 7254ec98..749765d9 100644
--- a/app/components/app/specialist/entry-form.vue
+++ b/app/components/app/specialist/entry-form.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
-// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
+// import Combobox from '~/components/pub/my-ui/form/combobox.vue'
 
 // Types
 import type { SpecialistFormData } from '~/schemas/specialist.schema.ts'
diff --git a/app/components/app/specialist/list-cfg.ts b/app/components/app/specialist/list-cfg.ts
index 2ddc5007..f1ccbd25 100644
--- a/app/components/app/specialist/list-cfg.ts
+++ b/app/components/app/specialist/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/specialist/list.vue b/app/components/app/specialist/list.vue
index cde2a4ce..53558b2b 100644
--- a/app/components/app/specialist/list.vue
+++ b/app/components/app/specialist/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/subspecialist/entry-form-prev.vue b/app/components/app/subspecialist/entry-form-prev.vue
index 9d31fd3f..a5a056a5 100644
--- a/app/components/app/subspecialist/entry-form-prev.vue
+++ b/app/components/app/subspecialist/entry-form-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 interface SubSpecialistFormData {
   name: string
diff --git a/app/components/app/subspecialist/entry-form.vue b/app/components/app/subspecialist/entry-form.vue
index 6aea232d..21f1fa6e 100644
--- a/app/components/app/subspecialist/entry-form.vue
+++ b/app/components/app/subspecialist/entry-form.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
-// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
+// import Combobox from '~/components/pub/my-ui/form/combobox.vue'
 
 // Types
 import type { SubspecialistFormData } from '~/schemas/subspecialist.schema.ts'
diff --git a/app/components/app/subspecialist/list-cfg.ts b/app/components/app/subspecialist/list-cfg.ts
index c7ded48e..f9af020e 100644
--- a/app/components/app/subspecialist/list-cfg.ts
+++ b/app/components/app/subspecialist/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/subspecialist/list.vue b/app/components/app/subspecialist/list.vue
index cde2a4ce..53558b2b 100644
--- a/app/components/app/subspecialist/list.vue
+++ b/app/components/app/subspecialist/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/tools/entry-form.vue b/app/components/app/tools/entry-form.vue
index ac19794b..d6d037ca 100644
--- a/app/components/app/tools/entry-form.vue
+++ b/app/components/app/tools/entry-form.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 
 // Types
 import type { DeviceFormData } from '~/schemas/device.schema.ts'
diff --git a/app/components/app/tools/list-cfg.ts b/app/components/app/tools/list-cfg.ts
index 97bedbbd..53dac06d 100644
--- a/app/components/app/tools/list-cfg.ts
+++ b/app/components/app/tools/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{ width: 100 }, { width: 250 }, { width: 100 }, { width: 50 }]
 
diff --git a/app/components/app/tools/list.vue b/app/components/app/tools/list.vue
index d44aa4d8..9d655fdf 100644
--- a/app/components/app/tools/list.vue
+++ b/app/components/app/tools/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/unit/entry-form-prev.vue b/app/components/app/unit/entry-form-prev.vue
index 463a6683..06baecbb 100644
--- a/app/components/app/unit/entry-form-prev.vue
+++ b/app/components/app/unit/entry-form-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 interface UnitFormData {
   name: string
diff --git a/app/components/app/unit/entry-form.vue b/app/components/app/unit/entry-form.vue
index 7bad3552..0a9d04f0 100644
--- a/app/components/app/unit/entry-form.vue
+++ b/app/components/app/unit/entry-form.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 
 // Types
 import type { UnitFormData } from '~/schemas/unit.schema.ts'
diff --git a/app/components/app/unit/list-cfg.ts b/app/components/app/unit/list-cfg.ts
index a6f5ffc7..13bbc16f 100644
--- a/app/components/app/unit/list-cfg.ts
+++ b/app/components/app/unit/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [{}, {}, {}, { width: 50 }]
 
diff --git a/app/components/app/unit/list.vue b/app/components/app/unit/list.vue
index cde2a4ce..53558b2b 100644
--- a/app/components/app/unit/list.vue
+++ b/app/components/app/unit/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/uom/entry-form.vue b/app/components/app/uom/entry-form.vue
index 23c8ae0d..dbca1cef 100644
--- a/app/components/app/uom/entry-form.vue
+++ b/app/components/app/uom/entry-form.vue
@@ -1,10 +1,10 @@
 
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
-import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Types
diff --git a/app/components/app/uom/list-cfg.ts b/app/components/app/uom/list-cfg.ts
index e2c72f9c..c26856bf 100644
--- a/app/components/app/uom/list-cfg.ts
+++ b/app/components/app/uom/list-cfg.ts
@@ -5,10 +5,10 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 const _doctorStatus = {
   0: 'Tidak Aktif',
diff --git a/app/components/app/uom/list.vue b/app/components/app/uom/list.vue
index d44aa4d8..9d655fdf 100644
--- a/app/components/app/uom/list.vue
+++ b/app/components/app/uom/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
 interface Props {
@@ -21,7 +21,7 @@ function handlePageChange(page: number) {
 
 <template>
   <div class="space-y-4">
-    <PubBaseDataTable
+    <PubMyUiDataTable
       :rows="data"
       :cols="cols"
       :header="header"
diff --git a/app/components/app/user/entry-form.vue b/app/components/app/user/entry-form.vue
index 8e2f9a6b..5e210a09 100644
--- a/app/components/app/user/entry-form.vue
+++ b/app/components/app/user/entry-form.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+import Block from '~/components/pub/my-ui/form/block.vue'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
diff --git a/app/components/app/user/list-cfg.ts b/app/components/app/user/list-cfg.ts
index f697dc88..69ee9962 100644
--- a/app/components/app/user/list-cfg.ts
+++ b/app/components/app/user/list-cfg.ts
@@ -5,12 +5,12 @@ import type {
   RecStrFuncComponent,
   RecStrFuncUnknown,
   Th,
-} from '~/components/pub/custom-ui/data/types'
+} from '~/components/pub/my-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
 
 const doctorStatus = {
   0: 'Tidak Aktif',
diff --git a/app/components/app/user/list.vue b/app/components/app/user/list.vue
index 5b8778d9..b9a74929 100644
--- a/app/components/app/user/list.vue
+++ b/app/components/app/user/list.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <PubBaseDataTable
+  <PubMyUiDataTable
     :rows="data"
     :cols="cols"
     :header="header"
diff --git a/app/components/content/dashboard/index.vue b/app/components/content/dashboard/index.vue
index 2c76cad6..4aac014c 100644
--- a/app/components/content/dashboard/index.vue
+++ b/app/components/content/dashboard/index.vue
@@ -122,7 +122,7 @@ onMounted(() => {
     </div>
     <main class="my-6 flex flex-1 flex-col gap-4 md:gap-8">
       <div class="dashboard-grid">
-        <PubBaseSummaryCard v-for="card in summaryData" :key="card.title" :stat="card" />
+        <PubMyUiSummaryCard v-for="card in summaryData" :key="card.title" :stat="card" />
       </div>
       <div class="dashboard-grid">
         <Card v-for="n in 3" :key="n">
diff --git a/app/components/content/division/entry.ts b/app/components/content/division/entry.ts
index aef024e7..9f3cb9f4 100644
--- a/app/components/content/division/entry.ts
+++ b/app/components/content/division/entry.ts
@@ -1,4 +1,4 @@
-import type { TreeItem } from '~/components/pub/base/select-tree/type'
+import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
 import * as z from 'zod'
 
 export const divisionConf = {
diff --git a/app/components/content/division/list-prev.vue b/app/components/content/division/list-prev.vue
index f7bd1c8d..d072ac9a 100644
--- a/app/components/content/division/list-prev.vue
+++ b/app/components/content/division/list-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
 import AppDivisionEntryForm from '~/components/app/division/entry-form.vue'
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/header.vue'
 import { usePaginatedList } from '~/composables/usePaginatedList'
 import { divisionConf, divisionTreeConfig, schema } from './entry'
 // #region State & Computed
diff --git a/app/components/content/division/list.vue b/app/components/content/division/list.vue
index 0acae66d..8bb4e390 100644
--- a/app/components/content/division/list.vue
+++ b/app/components/content/division/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppDivisionList from '~/components/app/division/list.vue'
 import AppDivisionEntryForm from '~/components/app/division/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { DivisionSchema, type DivisionFormData } from '~/schemas/division.schema'
 
 // Handlers
diff --git a/app/components/content/employee/entry.vue b/app/components/content/employee/entry.vue
index 2c65d604..8dd6c48a 100644
--- a/app/components/content/employee/entry.vue
+++ b/app/components/content/employee/entry.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 import { MaterialSchema, type MaterialFormData } from '~/schemas/material.schema'
 
 const data = ref({
diff --git a/app/components/content/employee/list.vue b/app/components/content/employee/list.vue
index e03c976b..9ad5abf9 100644
--- a/app/components/content/employee/list.vue
+++ b/app/components/content/employee/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const data = ref([])
 
diff --git a/app/components/content/encounter/assesment-function/list.vue b/app/components/content/encounter/assesment-function/list.vue
index c53a6881..48d50bc9 100644
--- a/app/components/content/encounter/assesment-function/list.vue
+++ b/app/components/content/encounter/assesment-function/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 import AssesmentFunctionList from '~/components/app/encounter/assesment-function/list.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const props = defineProps<{
   label: string
diff --git a/app/components/content/encounter/entry.vue b/app/components/content/encounter/entry.vue
index 275a9529..9e6b19f7 100644
--- a/app/components/content/encounter/entry.vue
+++ b/app/components/content/encounter/entry.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
 
 const props = defineProps<{
   id: number
diff --git a/app/components/content/encounter/home.vue b/app/components/content/encounter/home.vue
deleted file mode 100644
index 2a4be548..00000000
--- a/app/components/content/encounter/home.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import AssesmentFunctionList from './assesment-function/list.vue'
-
-interface TabItem {
-  value: string
-  label: string
-  component?: any
-  props?: Record<string, any>
-}
-
-const tabs: TabItem[] = [
-  { value: 'status', label: 'Status Masuk/Keluar' },
-  { value: 'medis', label: 'Pengkajian Awal Medis' },
-  { value: 'rehab', label: 'Pengkajian Awal Medis Rehabilitasi Medis' },
-  { value: 'fungsi', label: 'Asesmen Fungsi', component: AssesmentFunctionList },
-  { value: 'protokol', label: 'Protokol Terapi' },
-  { value: 'edukasi', label: 'Asesmen Kebutuhan Edukasi' },
-  { value: 'consent', label: 'General Consent' },
-  { value: 'cprj', label: 'CPRJ' },
-  { value: 'obat', label: 'Order Obat' },
-  { value: 'alkes', label: 'Order Alkes' },
-  { value: 'radiologi', label: 'Order Radiologi' },
-  { value: 'labpk', label: 'Order Lab PK' },
-  { value: 'labmikro', label: 'Order Lab Mikro' },
-  { value: 'labpa', label: 'Order Lab PA' },
-  { value: 'ruangtindakan', label: 'Order Ruang Tindakan' },
-  { value: 'hasil', label: 'Hasil Penunjang' },
-  { value: 'konsultasi', label: 'Konsultasi' },
-  { value: 'resume', label: 'Resume' },
-  { value: 'kontrol', label: 'Surat Kontrol' },
-  { value: 'skrining', label: 'Skrinning MPP' },
-  { value: 'upload', label: 'Upload Dokumen Pendukung' },
-]
-
-const route = useRoute()
-const router = useRouter()
-
-// activeTab selalu sinkron dengan hash (#fungsi, #status, dll)
-const activeTab = computed({
-  get: () => (route.hash ? route.hash.substring(1) : 'fungsi'),
-  set: (val: string) => {
-    router.replace({ hash: `#${val}` }) // <-- tambahin '#' disini
-  },
-})
-
-const data = {
-  noRm: 'RM21123',
-  nama: 'Ahmad Sutanto',
-  alamat: 'Jl Jaksa Agung Suprapto No. 12, Jakarta',
-  tanggalKunjungan: '23 April 2024',
-  klinik: 'Bedah',
-  tanggalLahir: '23 April 1990 (25 Tahun)',
-  jenisKelamin: 'Laki-laki',
-  jenisPembayaran: 'JKN',
-  noBilling: '223332',
-  dpjp: 'dr. Syaifullah, Sp.OT(K)',
-}
-</script>
-
-<template>
-  <div class="w-full">
-    <div class="mb-4">
-      <button
-        class="flex items-center gap-2 rounded-full border border-orange-400 bg-orange-50 px-3 py-1 text-sm font-medium text-orange-600 hover:bg-orange-100"
-      >
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
-        </svg>
-        Kembali ke Daftar Kunjungan
-      </button>
-    </div>
-
-    <AppPatientQuickInfo :data="data" />
-
-    <!-- Tabs -->
-    <div class="mt-4 flex flex-wrap gap-2 rounded-md border bg-white p-4 shadow-sm">
-      <button
-        v-for="tab in tabs"
-        :key="tab.value"
-        :data-active="activeTab === tab.value"
-        class="flex-shrink-0 rounded-full px-4 py-2 text-sm font-medium transition data-[active=false]:bg-gray-100 data-[active=true]:bg-green-600 data-[active=false]:text-gray-700 data-[active=true]:text-white"
-        @click="activeTab = tab.value"
-      >
-        {{ tab.label }}
-      </button>
-    </div>
-
-    <!-- Active Tab Content -->
-    <div class="mt-4 rounded-md border p-4">
-      <component
-        :is="tabs.find((t) => t.value === activeTab)?.component"
-        v-if="tabs.find((t) => t.value === activeTab)?.component"
-        v-bind="tabs.find((t) => t.value === activeTab)?.props || {}"
-        :label="tabs.find((t) => t.value === activeTab)?.label"
-      />
-    </div>
-  </div>
-</template>
diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index 23e8c00f..088bf482 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { Summary } from '~/components/pub/base/summary-card/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
-import SummaryCard from '~/components/pub/base/summary-card/summary-card.vue'
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import Filter from '~/components/pub/custom-ui/nav-header/filter.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import Filter from '~/components/pub/my-ui/nav-header/filter.vue'
 
 const props = defineProps<{
   type: string
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
new file mode 100644
index 00000000..e1f1d490
--- /dev/null
+++ b/app/components/content/encounter/process.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
+
+// activeTab selalu sinkron dengan query param
+const activeTab = computed({
+  get: () => (route.query?.tab && typeof route.query.tab === 'string' ? route.query.tab : 'status'),
+  set: (val: string) => {
+    router.replace({ path: route.path, query: { tab: val } });
+  },
+})
+
+const data = {
+  noRm: 'RM21123',
+  nama: 'Ahmad Sutanto',
+  alamat: 'Jl Jaksa Agung Suprapto No. 12, Jakarta',
+  tanggalKunjungan: '23 April 2024',
+  klinik: 'Bedah',
+  tanggalLahir: '23 April 1990 (25 Tahun)',
+  jenisKelamin: 'Laki-laki',
+  jenisPembayaran: 'JKN',
+  noBilling: '223332',
+  dpjp: 'dr. Syaifullah, Sp.OT(K)',
+}
+</script>
+
+<template>
+  <div class="w-full">
+    <div class="mb-4">
+      <PubMyUiNavContentBa label="Kembali ke Daftar Kunjungan" />
+    </div>
+    <AppEncounterQuickInfo :data="data" />
+    <AppEncounterProcess :initial-active-tab="activeTab" @change-tab="activeTab = $event" />
+  </div>
+</template>
diff --git a/app/components/content/equipment/list.vue b/app/components/content/equipment/list.vue
index b1b348d1..48c5141f 100644
--- a/app/components/content/equipment/list.vue
+++ b/app/components/content/equipment/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppEquipmentList from '~/components/app/equipment/list.vue'
 import AppEquipmentEntryForm from '~/components/app/equipment/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { MaterialSchema, type MaterialFormData } from '~/schemas/material.schema'
 import type { Uom } from '~/models/uom'
 
diff --git a/app/components/content/installation/list.vue b/app/components/content/installation/list.vue
index baeab8c9..e4ee0d19 100644
--- a/app/components/content/installation/list.vue
+++ b/app/components/content/installation/list.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
 import AppInstallationEntryForm from '~/components/app/installation/entry-form.vue'
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/header.vue'
 import { transform, usePaginatedList } from '~/composables/usePaginatedList'
 import { installationConf, schemaConf } from './entry'
 
diff --git a/app/components/content/item-price/list.vue b/app/components/content/item-price/list.vue
index 9a5f567b..9dcba7be 100644
--- a/app/components/content/item-price/list.vue
+++ b/app/components/content/item-price/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Modal from '~/components/pub/base/modal/modal.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import Modal from '~/components/pub/my-ui/modal/modal.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const data = ref([])
 const entry = ref<any>({})
diff --git a/app/components/content/item/list.vue b/app/components/content/item/list.vue
index 41c7311f..6660f71e 100644
--- a/app/components/content/item/list.vue
+++ b/app/components/content/item/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Modal from '~/components/pub/base/modal/modal.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import Modal from '~/components/pub/my-ui/modal/modal.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const data = ref([])
 const entry = ref<any>({})
diff --git a/app/components/content/medicine-group/list.vue b/app/components/content/medicine-group/list.vue
index d56c4c49..3ff9e241 100644
--- a/app/components/content/medicine-group/list.vue
+++ b/app/components/content/medicine-group/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppMedicineGroupList from '~/components/app/medicine-group/list.vue'
 import AppMedicineGroupEntryForm from '~/components/app/medicine-group/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { BaseSchema, type BaseFormData } from '~/schemas/base.schema'
 
 // Handlers
diff --git a/app/components/content/medicine-method/list.vue b/app/components/content/medicine-method/list.vue
index 1de41ddc..36f93087 100644
--- a/app/components/content/medicine-method/list.vue
+++ b/app/components/content/medicine-method/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppMedicineMethodList from '~/components/app/medicine-method/list.vue'
 import AppMedicineMethodEntryForm from '~/components/app/medicine-method/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { BaseSchema, type BaseFormData } from '~/schemas/base.schema'
 
 // Handlers
diff --git a/app/components/content/medicine/list.vue b/app/components/content/medicine/list.vue
index 820931e8..1aa3a492 100644
--- a/app/components/content/medicine/list.vue
+++ b/app/components/content/medicine/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppMedicineList from '~/components/app/medicine/list.vue'
 import AppMedicineEntryForm from '~/components/app/medicine/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { MedicineSchema, type MedicineFormData } from '~/schemas/medicine.schema'
 import type { MedicineGroup } from '~/models/medicine-group'
 import type { MedicineMethod } from '~/models/medicine-method'
diff --git a/app/components/content/patient/list.vue b/app/components/content/patient/list.vue
index 7c849395..7d3c3c79 100644
--- a/app/components/content/patient/list.vue
+++ b/app/components/content/patient/list.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { Summary } from '~/components/pub/base/summary-card/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
-import SummaryCard from '~/components/pub/base/summary-card/summary-card.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const data = ref([])
 
diff --git a/app/components/content/prescription/list.vue b/app/components/content/prescription/list.vue
index a98202f2..b3cd7d25 100644
--- a/app/components/content/prescription/list.vue
+++ b/app/components/content/prescription/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 import PrescriptionItemListEntry from '~/components/app/prescription-item/list-entry.vue'
 
 const data = ref([])
diff --git a/app/components/content/rehab/registration/sep-prosedur/list.vue b/app/components/content/rehab/registration/sep-prosedur/list.vue
index 7f8cf7e1..1cf9a409 100644
--- a/app/components/content/rehab/registration/sep-prosedur/list.vue
+++ b/app/components/content/rehab/registration/sep-prosedur/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 import RehabSepProsedurList from '~/components/app/rehab/registration/sep-prosedur/list.vue'
 
 const props = defineProps<{
diff --git a/app/components/content/satusehat/const.ts b/app/components/content/satusehat/const.ts
index 8dee79cc..1d546648 100644
--- a/app/components/content/satusehat/const.ts
+++ b/app/components/content/satusehat/const.ts
@@ -1,6 +1,6 @@
-import type { ServiceStatus } from '~/components/pub/base/service-status/type'
-import type { Summary } from '~/components/pub/base/summary-card/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { ServiceStatus } from '~/components/pub/my-ui/service-status/type'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 import { CircleCheckBig, CircleDashed, CircleX, Send } from 'lucide-vue-next'
 
 export const tabs = [
diff --git a/app/components/content/satusehat/list.vue b/app/components/content/satusehat/list.vue
index 742fb8bc..6dcbd459 100644
--- a/app/components/content/satusehat/list.vue
+++ b/app/components/content/satusehat/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
 import { useUrlSearchParams } from '@vueuse/core'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import Header from '~/components/pub/my-ui/nav-header/header.vue'
 import { actions, headerPrep, refSearchNav, service, summaryData, tabs } from './const'
 import { defaultQuery, querySchema, tabSwitcher } from './schema.query'
 import { Form } from '~/components/pub/ui/form'
@@ -109,7 +109,7 @@ const activeTabFilter = computed({
   <div class="rounded-md border p-4">
     <Header :prep="headerPrep" :ref-search-nav="refSearchNav" />
     <div class="my-4 flex flex-1 flex-col gap-3 md:gap-4">
-      <PubBaseServiceStatus v-bind="service" />
+      <PubMyUiServiceStatus v-bind="service" />
       <AppSatusehatCardSummary :is-loading="isLoading.satusehatConn!" :summary-data="summaryData" />
     </div>
     <div class="rounded-md border p-4">
diff --git a/app/components/content/sep/list.vue b/app/components/content/sep/list.vue
index 2bfccd49..9a6cd8db 100644
--- a/app/components/content/sep/list.vue
+++ b/app/components/content/sep/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 import {
   DropdownMenu,
   DropdownMenuTrigger,
@@ -213,7 +213,7 @@ provide('table_data_loader', isLoading)
     <!-- Pagination -->
     <template v-if="paginationMeta">
       <div v-if="paginationMeta.totalPage > 1">
-        <PubCustomUiPagination :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+        <PubMyUiPagination :pagination-meta="paginationMeta" @page-change="handlePageChange" />
       </div>
     </template>
 
diff --git a/app/components/content/specialist-intern/entry.vue b/app/components/content/specialist-intern/entry.vue
index 3d0ec6c1..cbfb6670 100644
--- a/app/components/content/specialist-intern/entry.vue
+++ b/app/components/content/specialist-intern/entry.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 import { MaterialSchema, type MaterialFormData } from '~/schemas/material.schema'
 
 const data = ref({
diff --git a/app/components/content/specialist-intern/list.vue b/app/components/content/specialist-intern/list.vue
index f7a6f951..b004cc92 100644
--- a/app/components/content/specialist-intern/list.vue
+++ b/app/components/content/specialist-intern/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const data = ref([])
 
diff --git a/app/components/content/specialist/list-prev.vue b/app/components/content/specialist/list-prev.vue
index ee6d7f8b..9ed71016 100644
--- a/app/components/content/specialist/list-prev.vue
+++ b/app/components/content/specialist/list-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
 import AppSpecialistEntryForm from '~/components/app/specialist/entry-form.vue'
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/header.vue'
 import { usePaginatedList } from '~/composables/usePaginatedList'
 import { createFilteredUnitConf, installationConf, schemaConf, unitConf } from './entry'
 
diff --git a/app/components/content/specialist/list.vue b/app/components/content/specialist/list.vue
index d1c3bb21..ab3d13bb 100644
--- a/app/components/content/specialist/list.vue
+++ b/app/components/content/specialist/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppSpecialistList from '~/components/app/specialist/list.vue'
 import AppSpecialistEntryForm from '~/components/app/specialist/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { SpecialistSchema, type SpecialistFormData } from '~/schemas/specialist.schema'
 import type { Unit } from '~/models/unit'
 
diff --git a/app/components/content/subspecialist/list-prev.vue b/app/components/content/subspecialist/list-prev.vue
index a5496df6..81f59399 100644
--- a/app/components/content/subspecialist/list-prev.vue
+++ b/app/components/content/subspecialist/list-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
 import AppSubspecialistEntryForm from '~/components/app/subspecialist/entry-form.vue'
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/header.vue'
 import { usePaginatedList } from '~/composables/usePaginatedList'
 import { createFilteredUnitConf, installationConf, schemaConf, specialistConf, unitConf } from './entry'
 
diff --git a/app/components/content/subspecialist/list.vue b/app/components/content/subspecialist/list.vue
index ad38241f..8da9e24c 100644
--- a/app/components/content/subspecialist/list.vue
+++ b/app/components/content/subspecialist/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppSubSpecialistList from '~/components/app/subspecialist/list.vue'
 import AppSubSpecialistEntryForm from '~/components/app/subspecialist/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { SubspecialistSchema, type SubspecialistFormData } from '~/schemas/subspecialist.schema'
 import type { Specialist } from '~/models/specialist'
 
diff --git a/app/components/content/tools/list.vue b/app/components/content/tools/list.vue
index 27e90f56..c57b65b2 100644
--- a/app/components/content/tools/list.vue
+++ b/app/components/content/tools/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppToolsList from '~/components/app/tools/list.vue'
 import AppToolsEntryForm from '~/components/app/tools/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { DeviceSchema, type DeviceFormData } from '~/schemas/device.schema'
 import type { Uom } from '~/models/uom'
 
diff --git a/app/components/content/unit/list-prev.vue b/app/components/content/unit/list-prev.vue
index 9cee37a1..e5498f25 100644
--- a/app/components/content/unit/list-prev.vue
+++ b/app/components/content/unit/list-prev.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
 import AppUnitEntryForm from '~/components/app/unit/entry-form.vue'
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/header.vue'
 import { usePaginatedList } from '~/composables/usePaginatedList'
 import { schemaConf, unitConf } from './entry'
 
diff --git a/app/components/content/unit/list.vue b/app/components/content/unit/list.vue
index 3dcd184d..8105eb79 100644
--- a/app/components/content/unit/list.vue
+++ b/app/components/content/unit/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppUnitList from '~/components/app/unit/list.vue'
 import AppUnitEntryForm from '~/components/app/unit/entry-form.vue'
 
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { UnitSchema, type UnitFormData } from '~/schemas/unit.schema'
 
 // Handlers
diff --git a/app/components/content/uom/list.vue b/app/components/content/uom/list.vue
index 6e6bda1b..e7d6c077 100644
--- a/app/components/content/uom/list.vue
+++ b/app/components/content/uom/list.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppUomEntryForm from '~/components/app/uom/entry-form.vue'
 
 // Helpers
@@ -10,7 +10,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { UomSchema, type UomFormData } from '~/schemas/uom.schema'
 
 // Handlers
diff --git a/app/components/content/user/entry.vue b/app/components/content/user/entry.vue
index 7fb4d66d..30c2e1d7 100644
--- a/app/components/content/user/entry.vue
+++ b/app/components/content/user/entry.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 
 const data = ref({
   name: '',
diff --git a/app/components/content/user/list.vue b/app/components/content/user/list.vue
index e03c976b..9ad5abf9 100644
--- a/app/components/content/user/list.vue
+++ b/app/components/content/user/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 
 const data = ref([])
 
diff --git a/app/components/layout/Header.vue b/app/components/layout/Header.vue
index 612524ef..64f71058 100644
--- a/app/components/layout/Header.vue
+++ b/app/components/layout/Header.vue
@@ -50,7 +50,7 @@ watch(
     <div class="flex w-full items-center gap-4">
       <SidebarTrigger />
       <Separator orientation="vertical" class="h-4" />
-      <PubBaseBreadcrumb :links="links" />
+      <PubMyUiBreadcrumb :links="links" />
     </div>
      <div class="ml-auto flex items-center gap-2">
        <slot />
diff --git a/app/components/pub/base/breadcrumb/index.vue b/app/components/pub/my-ui/breadcrumb/index.vue
similarity index 100%
rename from app/components/pub/base/breadcrumb/index.vue
rename to app/components/pub/my-ui/breadcrumb/index.vue
diff --git a/app/components/pub/custom-ui/confirmation/README.md b/app/components/pub/my-ui/confirmation/README.md
similarity index 98%
rename from app/components/pub/custom-ui/confirmation/README.md
rename to app/components/pub/my-ui/confirmation/README.md
index 5ee90e58..27268cad 100644
--- a/app/components/pub/custom-ui/confirmation/README.md
+++ b/app/components/pub/my-ui/confirmation/README.md
@@ -133,5 +133,5 @@ async function handleConfirmAction(record, action) {
 ## Styling
 
 Komponen menggunakan Tailwind CSS dan shadcn/ui components. Pastikan dependencies berikut tersedia:
-- `~/components/pub/custom-ui/modal/dialog.vue`
+- `~/components/pub/my-ui/modal/dialog.vue`
 - `~/components/pub/ui/button`
diff --git a/app/components/pub/custom-ui/confirmation/confirmation.vue b/app/components/pub/my-ui/confirmation/confirmation.vue
similarity index 97%
rename from app/components/pub/custom-ui/confirmation/confirmation.vue
rename to app/components/pub/my-ui/confirmation/confirmation.vue
index e408b31a..590f328d 100644
--- a/app/components/pub/custom-ui/confirmation/confirmation.vue
+++ b/app/components/pub/my-ui/confirmation/confirmation.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
 import { Button } from '~/components/pub/ui/button'
 
 interface ConfirmationProps {
diff --git a/app/components/pub/custom-ui/confirmation/record-confirmation.vue b/app/components/pub/my-ui/confirmation/record-confirmation.vue
similarity index 97%
rename from app/components/pub/custom-ui/confirmation/record-confirmation.vue
rename to app/components/pub/my-ui/confirmation/record-confirmation.vue
index a544e5b0..a0455066 100644
--- a/app/components/pub/custom-ui/confirmation/record-confirmation.vue
+++ b/app/components/pub/my-ui/confirmation/record-confirmation.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Confirmation from '~/components/pub/custom-ui/confirmation/confirmation.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
 
 interface RecordData {
   id: number | string
diff --git a/app/components/pub/base/data-table/data-table.vue b/app/components/pub/my-ui/data-table/data-table.vue
similarity index 91%
rename from app/components/pub/base/data-table/data-table.vue
rename to app/components/pub/my-ui/data-table/data-table.vue
index 1127b4e4..883273b7 100644
--- a/app/components/pub/base/data-table/data-table.vue
+++ b/app/components/pub/my-ui/data-table/data-table.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { DataTableLoader } from './type'
-import type { Col, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/custom-ui/data/types'
+import type { Col, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/my-ui/data/types'
 import { Info } from 'lucide-vue-next'
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '~/components/pub/ui/table'
 
@@ -10,9 +10,9 @@ const props = defineProps<{
   cols: Col[]
   header: Th[][]
   keys: string[]
-  funcParsed: RecStrFuncUnknown
-  funcHtml: RecStrFuncUnknown
-  funcComponent: RecStrFuncComponent
+  funcParsed?: RecStrFuncUnknown
+  funcHtml?: RecStrFuncUnknown
+  funcComponent?: RecStrFuncComponent
   selectMode?: 'single' | 'multiple'
   modelValue?: any[] | any
 }>()
@@ -118,16 +118,16 @@ function handleActionCellClick(event: Event, _cellRef: string) {
         <TableCell v-for="(key, cellIndex) in keys" :key="`cell-${rowIndex}-${cellIndex}`" class="border">
           <!-- existing cell renderer -->
           <component
-            :is="funcComponent[key]?.(row, rowIndex).component"
-            v-if="funcComponent[key]"
+            :is="funcComponent?.[key]?.(row, rowIndex).component"
+            v-if="funcComponent?.[key]"
             :rec="row"
             :idx="rowIndex"
             v-bind="funcComponent[key]?.(row, rowIndex).props"
           />
           <template v-else>
-            <div v-if="funcHtml[key]" v-html="funcHtml[key]?.(row, rowIndex)"></div>
+            <div v-if="funcHtml?.[key]" v-html="funcHtml?.[key]?.(row, rowIndex)"></div>
             <template v-else>
-              {{ funcParsed[key]?.(row, rowIndex) ?? (row as any)[key] }}
+              {{ funcParsed?.[key]?.(row, rowIndex) ?? (row as any)[key] }}
             </template>
           </template>
         </TableCell>
diff --git a/app/components/pub/base/data-table/type.ts b/app/components/pub/my-ui/data-table/type.ts
similarity index 100%
rename from app/components/pub/base/data-table/type.ts
rename to app/components/pub/my-ui/data-table/type.ts
diff --git a/app/components/pub/custom-ui/data/dropdown-action-du.vue b/app/components/pub/my-ui/data/dropdown-action-du.vue
similarity index 100%
rename from app/components/pub/custom-ui/data/dropdown-action-du.vue
rename to app/components/pub/my-ui/data/dropdown-action-du.vue
diff --git a/app/components/pub/custom-ui/data/dropdown-action-ducd.vue b/app/components/pub/my-ui/data/dropdown-action-ducd.vue
similarity index 100%
rename from app/components/pub/custom-ui/data/dropdown-action-ducd.vue
rename to app/components/pub/my-ui/data/dropdown-action-ducd.vue
diff --git a/app/components/pub/custom-ui/data/dropdown-action-dud.vue b/app/components/pub/my-ui/data/dropdown-action-dud.vue
similarity index 100%
rename from app/components/pub/custom-ui/data/dropdown-action-dud.vue
rename to app/components/pub/my-ui/data/dropdown-action-dud.vue
diff --git a/app/components/pub/custom-ui/data/dropdown-action-pdud.vue b/app/components/pub/my-ui/data/dropdown-action-pdud.vue
similarity index 100%
rename from app/components/pub/custom-ui/data/dropdown-action-pdud.vue
rename to app/components/pub/my-ui/data/dropdown-action-pdud.vue
diff --git a/app/components/pub/custom-ui/data/dropdown-action-ud.vue b/app/components/pub/my-ui/data/dropdown-action-ud.vue
similarity index 100%
rename from app/components/pub/custom-ui/data/dropdown-action-ud.vue
rename to app/components/pub/my-ui/data/dropdown-action-ud.vue
diff --git a/app/components/pub/custom-ui/data/types.ts b/app/components/pub/my-ui/data/types.ts
similarity index 100%
rename from app/components/pub/custom-ui/data/types.ts
rename to app/components/pub/my-ui/data/types.ts
diff --git a/app/components/pub/custom-ui/doc-entry/block.vue b/app/components/pub/my-ui/doc-entry/block.vue
similarity index 100%
rename from app/components/pub/custom-ui/doc-entry/block.vue
rename to app/components/pub/my-ui/doc-entry/block.vue
diff --git a/app/components/pub/custom-ui/doc-entry/cell.vue b/app/components/pub/my-ui/doc-entry/cell.vue
similarity index 100%
rename from app/components/pub/custom-ui/doc-entry/cell.vue
rename to app/components/pub/my-ui/doc-entry/cell.vue
diff --git a/app/components/pub/custom-ui/doc-entry/colon.vue b/app/components/pub/my-ui/doc-entry/colon.vue
similarity index 100%
rename from app/components/pub/custom-ui/doc-entry/colon.vue
rename to app/components/pub/my-ui/doc-entry/colon.vue
diff --git a/app/components/pub/custom-ui/doc-entry/field.vue b/app/components/pub/my-ui/doc-entry/field.vue
similarity index 100%
rename from app/components/pub/custom-ui/doc-entry/field.vue
rename to app/components/pub/my-ui/doc-entry/field.vue
diff --git a/app/components/pub/custom-ui/doc-entry/index.ts b/app/components/pub/my-ui/doc-entry/index.ts
similarity index 100%
rename from app/components/pub/custom-ui/doc-entry/index.ts
rename to app/components/pub/my-ui/doc-entry/index.ts
diff --git a/app/components/pub/custom-ui/doc-entry/label.vue b/app/components/pub/my-ui/doc-entry/label.vue
similarity index 100%
rename from app/components/pub/custom-ui/doc-entry/label.vue
rename to app/components/pub/my-ui/doc-entry/label.vue
diff --git a/app/components/pub/base/error/error.vue b/app/components/pub/my-ui/error/error.vue
similarity index 100%
rename from app/components/pub/base/error/error.vue
rename to app/components/pub/my-ui/error/error.vue
diff --git a/app/components/pub/custom-ui/form/block.vue b/app/components/pub/my-ui/form/block.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/block.vue
rename to app/components/pub/my-ui/form/block.vue
diff --git a/app/components/pub/custom-ui/form/combobox.vue b/app/components/pub/my-ui/form/combobox.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/combobox.vue
rename to app/components/pub/my-ui/form/combobox.vue
diff --git a/app/components/pub/custom-ui/form/datepicker-single.vue b/app/components/pub/my-ui/form/datepicker-single.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/datepicker-single.vue
rename to app/components/pub/my-ui/form/datepicker-single.vue
diff --git a/app/components/pub/custom-ui/form/field-group.vue b/app/components/pub/my-ui/form/field-group.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/field-group.vue
rename to app/components/pub/my-ui/form/field-group.vue
diff --git a/app/components/pub/custom-ui/form/field.vue b/app/components/pub/my-ui/form/field.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/field.vue
rename to app/components/pub/my-ui/form/field.vue
diff --git a/app/components/pub/custom-ui/form/label.vue b/app/components/pub/my-ui/form/label.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/label.vue
rename to app/components/pub/my-ui/form/label.vue
diff --git a/app/components/pub/custom-ui/form/select.vue b/app/components/pub/my-ui/form/select.vue
similarity index 100%
rename from app/components/pub/custom-ui/form/select.vue
rename to app/components/pub/my-ui/form/select.vue
diff --git a/app/components/pub/base/modal/dialog.vue b/app/components/pub/my-ui/modal/dialog.vue
similarity index 100%
rename from app/components/pub/base/modal/dialog.vue
rename to app/components/pub/my-ui/modal/dialog.vue
diff --git a/app/components/pub/base/modal/modal.vue b/app/components/pub/my-ui/modal/modal.vue
similarity index 100%
rename from app/components/pub/base/modal/modal.vue
rename to app/components/pub/my-ui/modal/modal.vue
diff --git a/app/components/pub/my-ui/nav-content/ba.vue b/app/components/pub/my-ui/nav-content/ba.vue
new file mode 100644
index 00000000..c31fe72c
--- /dev/null
+++ b/app/components/pub/my-ui/nav-content/ba.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+type ClickType = 'cancel' | 'draft' | 'submit'
+
+const props = defineProps<{
+  label: string
+}>()
+
+const emit = defineEmits<{
+  (e: 'click', type: ClickType): void
+}>()
+
+function onClick(type: ClickType) {
+  emit('click', type)
+}
+
+</script>
+
+<template>
+  <Button
+    @click="onClick('draft')"
+    class="flex items-center gap-2 rounded-full border border-orange-400 bg-orange-50 px-3 py-1 text-sm font-medium text-orange-600 hover:bg-orange-100"
+  >
+    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
+    </svg>
+    {{ props.label }}
+  </Button>
+</template>
diff --git a/app/components/pub/custom-ui/nav-footer/ba-dr-su-pr.vue b/app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue
similarity index 94%
rename from app/components/pub/custom-ui/nav-footer/ba-dr-su-pr.vue
rename to app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue
index 5e6f69ab..78034463 100644
--- a/app/components/pub/custom-ui/nav-footer/ba-dr-su-pr.vue
+++ b/app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-type ClickType = 'cancel' | 'draft' | 'submit'
+type ClickType = 'cancel' | 'draft' | 'submit' | 'print'
 
 const emit = defineEmits<{
   (e: 'click', type: ClickType): void
diff --git a/app/components/pub/custom-ui/nav-footer/ba-dr-su.vue b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
similarity index 100%
rename from app/components/pub/custom-ui/nav-footer/ba-dr-su.vue
rename to app/components/pub/my-ui/nav-footer/ba-dr-su.vue
diff --git a/app/components/pub/custom-ui/nav-footer/ba-ed-de-pri.vue b/app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue
similarity index 86%
rename from app/components/pub/custom-ui/nav-footer/ba-ed-de-pri.vue
rename to app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue
index 18e67b86..4a9d5268 100644
--- a/app/components/pub/custom-ui/nav-footer/ba-ed-de-pri.vue
+++ b/app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-type ClickType = 'cancel' | 'draft' | 'submit'
+type ClickType = 'cancel' | 'draft' | 'delete' | 'print'
 
 const emit = defineEmits<{
   (e: 'click', type: ClickType): void
@@ -20,7 +20,7 @@ function onClick(type: ClickType) {
       <Icon name="i-lucide-file" class="me-2" />
       Edit
     </Button>
-    <Button class="bg-red-500" type="button" @click="onClick('submit')">
+    <Button class="bg-red-500" type="button" @click="onClick('delete')">
       <Icon name="i-lucide-trash" class="me-2 align-middle" />
       Delete
     </Button>
diff --git a/app/components/pub/custom-ui/nav-footer/ba-ed-de.vue b/app/components/pub/my-ui/nav-footer/ba-ed-de.vue
similarity index 84%
rename from app/components/pub/custom-ui/nav-footer/ba-ed-de.vue
rename to app/components/pub/my-ui/nav-footer/ba-ed-de.vue
index 9c79eba9..fabaa425 100644
--- a/app/components/pub/custom-ui/nav-footer/ba-ed-de.vue
+++ b/app/components/pub/my-ui/nav-footer/ba-ed-de.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-type ClickType = 'cancel' | 'draft' | 'submit'
+type ClickType = 'cancel' | 'draft' | 'delete'
 
 const emit = defineEmits<{
   (e: 'click', type: ClickType): void
@@ -20,7 +20,7 @@ function onClick(type: ClickType) {
       <Icon name="i-lucide-file" class="me-2" />
       Edit
     </Button>
-    <Button class="bg-red-500" type="button" @click="onClick('submit')">
+    <Button class="bg-red-500" type="button" @click="onClick('delete')">
       <Icon name="i-lucide-trash" class="me-2 align-middle" />
       Delete
     </Button>
diff --git a/app/components/pub/custom-ui/nav-footer/ba-ed-pri.vue b/app/components/pub/my-ui/nav-footer/ba-ed-pri.vue
similarity index 93%
rename from app/components/pub/custom-ui/nav-footer/ba-ed-pri.vue
rename to app/components/pub/my-ui/nav-footer/ba-ed-pri.vue
index 5190ec04..97bf62de 100644
--- a/app/components/pub/custom-ui/nav-footer/ba-ed-pri.vue
+++ b/app/components/pub/my-ui/nav-footer/ba-ed-pri.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-type ClickType = 'cancel' | 'draft' | 'submit'
+type ClickType = 'cancel' | 'draft' | 'print'
 
 const emit = defineEmits<{
   (e: 'click', type: ClickType): void
diff --git a/app/components/pub/custom-ui/nav-footer/ba-ed.vue b/app/components/pub/my-ui/nav-footer/ba-ed.vue
similarity index 100%
rename from app/components/pub/custom-ui/nav-footer/ba-ed.vue
rename to app/components/pub/my-ui/nav-footer/ba-ed.vue
diff --git a/app/components/pub/custom-ui/nav-footer/ba-su.vue b/app/components/pub/my-ui/nav-footer/ba-su.vue
similarity index 100%
rename from app/components/pub/custom-ui/nav-footer/ba-su.vue
rename to app/components/pub/my-ui/nav-footer/ba-su.vue
diff --git a/app/components/pub/custom-ui/nav-header/filter.vue b/app/components/pub/my-ui/nav-header/filter.vue
similarity index 99%
rename from app/components/pub/custom-ui/nav-header/filter.vue
rename to app/components/pub/my-ui/nav-header/filter.vue
index ca89728d..3e017f72 100644
--- a/app/components/pub/custom-ui/nav-header/filter.vue
+++ b/app/components/pub/my-ui/nav-header/filter.vue
@@ -5,7 +5,7 @@ import type { Ref } from 'vue'
 import type { DateRange } from 'radix-vue'
 import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
 import { cn } from '~/lib/utils'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 
 const props = defineProps<{
   prep: HeaderPrep
diff --git a/app/components/pub/custom-ui/nav-header/header.vue b/app/components/pub/my-ui/nav-header/header.vue
similarity index 98%
rename from app/components/pub/custom-ui/nav-header/header.vue
rename to app/components/pub/my-ui/nav-header/header.vue
index 621691d2..d11eb52b 100644
--- a/app/components/pub/custom-ui/nav-header/header.vue
+++ b/app/components/pub/my-ui/nav-header/header.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
 import { refDebounced } from '@vueuse/core'
 
 const props = defineProps<{
diff --git a/app/components/pub/custom-ui/nav-header/prep.vue b/app/components/pub/my-ui/nav-header/prep.vue
similarity index 98%
rename from app/components/pub/custom-ui/nav-header/prep.vue
rename to app/components/pub/my-ui/nav-header/prep.vue
index dd0cccd0..3864f4c5 100644
--- a/app/components/pub/custom-ui/nav-header/prep.vue
+++ b/app/components/pub/my-ui/nav-header/prep.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 
 const props = defineProps<{
   prep: HeaderPrep
diff --git a/app/components/pub/custom-ui/nav-header/search.vue b/app/components/pub/my-ui/nav-header/search.vue
similarity index 98%
rename from app/components/pub/custom-ui/nav-header/search.vue
rename to app/components/pub/my-ui/nav-header/search.vue
index 7aff7f8f..6e42c36f 100644
--- a/app/components/pub/custom-ui/nav-header/search.vue
+++ b/app/components/pub/my-ui/nav-header/search.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
 
 const props = defineProps<{
   prep: HeaderPrep
diff --git a/app/components/pub/custom-ui/pagination/pagination-view.vue b/app/components/pub/my-ui/pagination/pagination-view.vue
similarity index 83%
rename from app/components/pub/custom-ui/pagination/pagination-view.vue
rename to app/components/pub/my-ui/pagination/pagination-view.vue
index f3eaab4b..149d425e 100644
--- a/app/components/pub/custom-ui/pagination/pagination-view.vue
+++ b/app/components/pub/my-ui/pagination/pagination-view.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
 import Pagination from './pagination.vue'
 
 const props = defineProps<{
diff --git a/app/components/pub/custom-ui/pagination/pagination.type.ts b/app/components/pub/my-ui/pagination/pagination.type.ts
similarity index 100%
rename from app/components/pub/custom-ui/pagination/pagination.type.ts
rename to app/components/pub/my-ui/pagination/pagination.type.ts
diff --git a/app/components/pub/custom-ui/pagination/pagination.vue b/app/components/pub/my-ui/pagination/pagination.vue
similarity index 100%
rename from app/components/pub/custom-ui/pagination/pagination.vue
rename to app/components/pub/my-ui/pagination/pagination.vue
diff --git a/app/components/pub/base/select-tree/command-item.vue b/app/components/pub/my-ui/select-tree/command-item.vue
similarity index 100%
rename from app/components/pub/base/select-tree/command-item.vue
rename to app/components/pub/my-ui/select-tree/command-item.vue
diff --git a/app/components/pub/base/select-tree/leaf.vue b/app/components/pub/my-ui/select-tree/leaf.vue
similarity index 100%
rename from app/components/pub/base/select-tree/leaf.vue
rename to app/components/pub/my-ui/select-tree/leaf.vue
diff --git a/app/components/pub/base/select-tree/tree-node.vue b/app/components/pub/my-ui/select-tree/tree-node.vue
similarity index 100%
rename from app/components/pub/base/select-tree/tree-node.vue
rename to app/components/pub/my-ui/select-tree/tree-node.vue
diff --git a/app/components/pub/base/select-tree/tree-select.vue b/app/components/pub/my-ui/select-tree/tree-select.vue
similarity index 100%
rename from app/components/pub/base/select-tree/tree-select.vue
rename to app/components/pub/my-ui/select-tree/tree-select.vue
diff --git a/app/components/pub/base/select-tree/tree-view.vue b/app/components/pub/my-ui/select-tree/tree-view.vue
similarity index 100%
rename from app/components/pub/base/select-tree/tree-view.vue
rename to app/components/pub/my-ui/select-tree/tree-view.vue
diff --git a/app/components/pub/base/select-tree/type.ts b/app/components/pub/my-ui/select-tree/type.ts
similarity index 100%
rename from app/components/pub/base/select-tree/type.ts
rename to app/components/pub/my-ui/select-tree/type.ts
diff --git a/app/components/pub/base/service-status/service-status.vue b/app/components/pub/my-ui/service-status/service-status.vue
similarity index 100%
rename from app/components/pub/base/service-status/service-status.vue
rename to app/components/pub/my-ui/service-status/service-status.vue
diff --git a/app/components/pub/base/service-status/type.ts b/app/components/pub/my-ui/service-status/type.ts
similarity index 100%
rename from app/components/pub/base/service-status/type.ts
rename to app/components/pub/my-ui/service-status/type.ts
diff --git a/app/components/pub/base/summary-card/summary-card.vue b/app/components/pub/my-ui/summary-card/summary-card.vue
similarity index 100%
rename from app/components/pub/base/summary-card/summary-card.vue
rename to app/components/pub/my-ui/summary-card/summary-card.vue
diff --git a/app/components/pub/base/summary-card/type.ts b/app/components/pub/my-ui/summary-card/type.ts
similarity index 100%
rename from app/components/pub/base/summary-card/type.ts
rename to app/components/pub/my-ui/summary-card/type.ts
diff --git a/app/components/pub/ui/textarea/Textarea.vue b/app/components/pub/ui/textarea/Textarea.vue
index a6b182a3..a946b49a 100644
--- a/app/components/pub/ui/textarea/Textarea.vue
+++ b/app/components/pub/ui/textarea/Textarea.vue
@@ -20,5 +20,5 @@ const modelValue = useVModel(props, 'modelValue', emits, {
 </script>
 
 <template>
-  <textarea v-model="modelValue" :class="cn('flex min-h-20 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class)" />
+  <textarea v-model="modelValue" :class="cn('flex min-h-20 w-full rounded-md border border-slate-400 bg-white dark:bg-slate-950 px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class)" />
 </template>
diff --git a/app/composables/usePaginatedList.ts b/app/composables/usePaginatedList.ts
index d0edafb2..8d8051c8 100644
--- a/app/composables/usePaginatedList.ts
+++ b/app/composables/usePaginatedList.ts
@@ -1,5 +1,5 @@
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
 import { refDebounced, useUrlSearchParams } from '@vueuse/core'
 import * as z from 'zod'
 
diff --git a/app/error.vue b/app/error.vue
index e3e3d76b..c94b716f 100644
--- a/app/error.vue
+++ b/app/error.vue
@@ -7,8 +7,8 @@ const { isAuthenticated } = useUserStore()
 </script>
 
 <template>
-  <PubBaseError v-if="!isAuthenticated" :status-code="401" />
-  <PubBaseError v-else :status-code="404" />
+  <PubMyUiError v-if="!isAuthenticated" :status-code="401" />
+  <PubMyUiError v-else :status-code="404" />
 </template>
 
 <style scoped></style>
diff --git a/app/handlers/_handler.ts b/app/handlers/_handler.ts
index 4148c726..bcb1f808 100644
--- a/app/handlers/_handler.ts
+++ b/app/handlers/_handler.ts
@@ -104,6 +104,110 @@ export function createCrudHandler<T = any>(crud: {
   }
 }
 
+// Factory for CRUD handler state and actions
+export function genCrudHandler<T = any>(crud: {
+  create: (...args: any[]) => Promise<any>
+  update: (...args: any[]) => Promise<any>
+  remove: (...args: any[]) => Promise<any>
+}) {
+  const recId = ref<number>(0)
+  const recAction = ref<string>('')
+  const recItem = ref<T | null>(null)
+  const isReadonly = ref(false)
+  const isProcessing = ref(false)
+  const isFormEntryDialogOpen = ref(false)
+  const isRecordConfirmationOpen = ref(false)
+
+  function onResetState() {
+    recId.value = 0
+    recAction.value = ''
+    recItem.value = null
+  }
+
+  async function handleActionSave(values: any, refresh: () => void, reset: () => void, toast: ToastFn) {
+    isProcessing.value = true
+    await handleAsyncAction<[any], any>({
+      action: crud.create,
+      args: [values],
+      toast,
+      successMessage: 'Data berhasil disimpan',
+      errorMessage: 'Gagal menyimpan data',
+      onSuccess: () => {
+        isFormEntryDialogOpen.value = false
+        if (refresh) refresh()
+      },
+      onFinally: (isSuccess: boolean) => {
+        if (isSuccess) setTimeout(reset, 500)
+        isProcessing.value = false
+      },
+    })
+  }
+
+  async function handleActionEdit(
+    id: number | string,
+    values: any,
+    refresh: () => void,
+    reset: () => void,
+    toast: ToastFn,
+  ) {
+    isProcessing.value = true
+    await handleAsyncAction<[number | string, any], any>({
+      action: crud.update,
+      args: [id, values],
+      toast,
+      successMessage: 'Data berhasil diubah',
+      errorMessage: 'Gagal mengubah data',
+      onSuccess: () => {
+        isFormEntryDialogOpen.value = false
+        if (refresh) refresh()
+      },
+      onFinally: (isSuccess: boolean) => {
+        if (isSuccess) setTimeout(reset, 500)
+        isProcessing.value = false
+      },
+    })
+  }
+
+  async function handleActionRemove(id: number | string, refresh: () => void, toast: ToastFn) {
+    isProcessing.value = true
+    await handleAsyncAction<[number | string], any>({
+      action: crud.remove,
+      args: [id],
+      toast,
+      successMessage: 'Data berhasil dihapus',
+      errorMessage: 'Gagal menghapus data',
+      onSuccess: () => {
+        isRecordConfirmationOpen.value = false
+        if (refresh) refresh()
+      },
+      onFinally: () => {
+        isProcessing.value = false
+      },
+    })
+  }
+
+  function handleCancelForm(reset: () => void) {
+    isFormEntryDialogOpen.value = false
+    isReadonly.value = false
+    setTimeout(reset, 300)
+  }
+
+  return {
+    recId,
+    recAction,
+    recItem,
+    isReadonly,
+    isProcessing,
+    isFormEntryDialogOpen,
+    isRecordConfirmationOpen,
+    onResetState,
+    handleActionSave,
+    handleActionEdit,
+    handleActionRemove,
+    handleCancelForm,
+  }
+}
+
 // Reusable async handler for CRUD actions with toast and state management
 export type ToastFn = (params: { title: string; description: string; variant: 'default' | 'destructive' }) => void
 
diff --git a/app/pages/(features)/bpjs/sep/add.vue b/app/pages/(features)/bpjs/sep/add.vue
index 87413fc5..5db12aac 100644
--- a/app/pages/(features)/bpjs/sep/add.vue
+++ b/app/pages/(features)/bpjs/sep/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/bpjs/sep/index.vue b/app/pages/(features)/bpjs/sep/index.vue
index 7c527526..b8ec57c4 100644
--- a/app/pages/(features)/bpjs/sep/index.vue
+++ b/app/pages/(features)/bpjs/sep/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/common/uom/index.vue b/app/pages/(features)/common/uom/index.vue
index 2efdacb7..adb9d36f 100644
--- a/app/pages/(features)/common/uom/index.vue
+++ b/app/pages/(features)/common/uom/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/doctor/add.vue b/app/pages/(features)/doctor/add.vue
index c0a43c7f..a76811de 100644
--- a/app/pages/(features)/doctor/add.vue
+++ b/app/pages/(features)/doctor/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/doctor/index.vue b/app/pages/(features)/doctor/index.vue
index f0c8ddba..078df778 100644
--- a/app/pages/(features)/doctor/index.vue
+++ b/app/pages/(features)/doctor/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/human-src/employee/add.vue b/app/pages/(features)/human-src/employee/add.vue
index b615504e..0c21c3ee 100644
--- a/app/pages/(features)/human-src/employee/add.vue
+++ b/app/pages/(features)/human-src/employee/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/human-src/employee/index.vue b/app/pages/(features)/human-src/employee/index.vue
index e8e3647e..dd07cf40 100644
--- a/app/pages/(features)/human-src/employee/index.vue
+++ b/app/pages/(features)/human-src/employee/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/human-src/specialist-intern/add.vue b/app/pages/(features)/human-src/specialist-intern/add.vue
index 43a1b1da..0e5ed9da 100644
--- a/app/pages/(features)/human-src/specialist-intern/add.vue
+++ b/app/pages/(features)/human-src/specialist-intern/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/human-src/specialist-intern/index.vue b/app/pages/(features)/human-src/specialist-intern/index.vue
index 1d8132b3..997a9ee1 100644
--- a/app/pages/(features)/human-src/specialist-intern/index.vue
+++ b/app/pages/(features)/human-src/specialist-intern/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/integration/satusehat/add.vue b/app/pages/(features)/integration/satusehat/add.vue
index 1de89d94..c9d23199 100644
--- a/app/pages/(features)/integration/satusehat/add.vue
+++ b/app/pages/(features)/integration/satusehat/add.vue
@@ -36,5 +36,5 @@ const canCreate = hasCreateAccess(roleAccess)
   <div v-if="canCreate">
     <ContentPatientAdd />
   </div>
-  <PubBaseError v-else :status-code="403" />
+  <PubMyUiError v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/integration/satusehat/index.vue b/app/pages/(features)/integration/satusehat/index.vue
index 69126581..a0db9e78 100644
--- a/app/pages/(features)/integration/satusehat/index.vue
+++ b/app/pages/(features)/integration/satusehat/index.vue
@@ -34,6 +34,6 @@ const canRead = hasReadAccess(roleAccess)
     <div v-if="canRead">
       <ContentSatusehatList />
     </div>
-    <PubBaseError v-else :status-code="403" />
+    <PubMyUiError v-else :status-code="403" />
   </div>
 </template>
diff --git a/app/pages/(features)/org-src/division/index.vue b/app/pages/(features)/org-src/division/index.vue
index ed5f1c3b..af458d58 100644
--- a/app/pages/(features)/org-src/division/index.vue
+++ b/app/pages/(features)/org-src/division/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 // import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/org-src/installation/index.vue b/app/pages/(features)/org-src/installation/index.vue
index d8b934da..fc41142f 100644
--- a/app/pages/(features)/org-src/installation/index.vue
+++ b/app/pages/(features)/org-src/installation/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 // import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/org-src/specialist/index.vue b/app/pages/(features)/org-src/specialist/index.vue
index 2f01b48b..c2799818 100644
--- a/app/pages/(features)/org-src/specialist/index.vue
+++ b/app/pages/(features)/org-src/specialist/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 // import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/org-src/subspecialist/index.vue b/app/pages/(features)/org-src/subspecialist/index.vue
index 9b29d034..0d1f169c 100644
--- a/app/pages/(features)/org-src/subspecialist/index.vue
+++ b/app/pages/(features)/org-src/subspecialist/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 // import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/org-src/unit/index.vue b/app/pages/(features)/org-src/unit/index.vue
index baa77d6b..7032181f 100644
--- a/app/pages/(features)/org-src/unit/index.vue
+++ b/app/pages/(features)/org-src/unit/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 // import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/patient/add.vue b/app/pages/(features)/patient/add.vue
index 6532240a..412c2b3e 100644
--- a/app/pages/(features)/patient/add.vue
+++ b/app/pages/(features)/patient/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
diff --git a/app/pages/(features)/patient/index.vue b/app/pages/(features)/patient/index.vue
index 8f274db1..1877289e 100644
--- a/app/pages/(features)/patient/index.vue
+++ b/app/pages/(features)/patient/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/rehab/encounter/[id]/detail.vue b/app/pages/(features)/rehab/encounter/[id]/detail.vue
index e26b566c..e3d45895 100644
--- a/app/pages/(features)/rehab/encounter/[id]/detail.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/detail.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
diff --git a/app/pages/(features)/rehab/encounter/[id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/edit.vue
index 9391a12d..77b0dd3e 100644
--- a/app/pages/(features)/rehab/encounter/[id]/edit.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/edit.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
diff --git a/app/pages/(features)/rehab/encounter/[id]/process.vue b/app/pages/(features)/rehab/encounter/[id]/process.vue
index c1b8b716..3fa7525a 100644
--- a/app/pages/(features)/rehab/encounter/[id]/process.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/process.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`,
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
@@ -35,7 +35,7 @@ const canCreate = hasCreateAccess(roleAccess)
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterHome />
+    <ContentEncounterProcess />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/rehab/encounter/add.vue b/app/pages/(features)/rehab/encounter/add.vue
index 1558f645..f20b90c1 100644
--- a/app/pages/(features)/rehab/encounter/add.vue
+++ b/app/pages/(features)/rehab/encounter/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
diff --git a/app/pages/(features)/rehab/encounter/index.vue b/app/pages/(features)/rehab/encounter/index.vue
index 7cd6c5ed..9d06c9e0 100644
--- a/app/pages/(features)/rehab/encounter/index.vue
+++ b/app/pages/(features)/rehab/encounter/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue b/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue
index e4381443..6a45818c 100644
--- a/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue
+++ b/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue
@@ -36,5 +36,5 @@ const canCreate = hasCreateAccess(roleAccess)
   <div v-if="canCreate">
     <ContentDoctorAdd />
   </div>
-  <PubBaseError v-else :status-code="403" />
+  <PubMyUiError v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/rehab/registration/[id]/detail.vue b/app/pages/(features)/rehab/registration/[id]/detail.vue
index fe91932a..77c30c00 100644
--- a/app/pages/(features)/rehab/registration/[id]/detail.vue
+++ b/app/pages/(features)/rehab/registration/[id]/detail.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
diff --git a/app/pages/(features)/rehab/registration/[id]/edit.vue b/app/pages/(features)/rehab/registration/[id]/edit.vue
index a2cfab84..c6af01a9 100644
--- a/app/pages/(features)/rehab/registration/[id]/edit.vue
+++ b/app/pages/(features)/rehab/registration/[id]/edit.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
diff --git a/app/pages/(features)/rehab/registration/add.vue b/app/pages/(features)/rehab/registration/add.vue
index 1ef3e3fa..87053270 100644
--- a/app/pages/(features)/rehab/registration/add.vue
+++ b/app/pages/(features)/rehab/registration/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
@@ -13,7 +13,7 @@ definePageMeta({
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
 const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
diff --git a/app/pages/(features)/rehab/registration/index.vue b/app/pages/(features)/rehab/registration/index.vue
index 99d3a397..5b4fbfb8 100644
--- a/app/pages/(features)/rehab/registration/index.vue
+++ b/app/pages/(features)/rehab/registration/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/equipment/index.vue b/app/pages/(features)/tools-equipment-src/equipment/index.vue
index 1cbf7b3e..b1beab11 100644
--- a/app/pages/(features)/tools-equipment-src/equipment/index.vue
+++ b/app/pages/(features)/tools-equipment-src/equipment/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/medicine-method/index.vue b/app/pages/(features)/tools-equipment-src/medicine-method/index.vue
index 5be2a8d9..a400552a 100644
--- a/app/pages/(features)/tools-equipment-src/medicine-method/index.vue
+++ b/app/pages/(features)/tools-equipment-src/medicine-method/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/medicine-type/index.vue b/app/pages/(features)/tools-equipment-src/medicine-type/index.vue
index 9130ccf9..97ee385b 100644
--- a/app/pages/(features)/tools-equipment-src/medicine-type/index.vue
+++ b/app/pages/(features)/tools-equipment-src/medicine-type/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/medicine/[id]/edit.vue b/app/pages/(features)/tools-equipment-src/medicine/[id]/edit.vue
index adf77a76..74b5e576 100644
--- a/app/pages/(features)/tools-equipment-src/medicine/[id]/edit.vue
+++ b/app/pages/(features)/tools-equipment-src/medicine/[id]/edit.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/medicine/add.vue b/app/pages/(features)/tools-equipment-src/medicine/add.vue
index 0a93f9b3..706e052b 100644
--- a/app/pages/(features)/tools-equipment-src/medicine/add.vue
+++ b/app/pages/(features)/tools-equipment-src/medicine/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/medicine/index.vue b/app/pages/(features)/tools-equipment-src/medicine/index.vue
index 21622650..2be85f63 100644
--- a/app/pages/(features)/tools-equipment-src/medicine/index.vue
+++ b/app/pages/(features)/tools-equipment-src/medicine/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/(features)/tools-equipment-src/tools/index.vue b/app/pages/(features)/tools-equipment-src/tools/index.vue
index 00849cfd..d337e041 100644
--- a/app/pages/(features)/tools-equipment-src/tools/index.vue
+++ b/app/pages/(features)/tools-equipment-src/tools/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/_dev/prescription/list.vue b/app/pages/_dev/prescription/list.vue
index 733f011f..3ac06c40 100644
--- a/app/pages/_dev/prescription/list.vue
+++ b/app/pages/_dev/prescription/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/base/error/error.vue'
+import Error from '~/components/pub/my-ui/error/error.vue'
 // import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
diff --git a/app/pages/_dev/user/list.vue b/app/pages/_dev/user/list.vue
index ae207f41..cf61068d 100644
--- a/app/pages/_dev/user/list.vue
+++ b/app/pages/_dev/user/list.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import TreeSelect from '~/components/pub/base/select-tree/tree-select.vue'
+import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
 
 definePageMeta({
   layout: 'blank',
diff --git a/app/services/_crud-base.ts b/app/services/_crud-base.ts
new file mode 100644
index 00000000..f9d33744
--- /dev/null
+++ b/app/services/_crud-base.ts
@@ -0,0 +1,77 @@
+import { xfetch } from '~/composables/useXfetch'
+
+export async function create(path: string, data: any) {
+  try {
+    const resp = await xfetch(path, 'POST', data)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting division:', error)
+    throw new Error('Failed to post division')
+  }
+}
+
+export async function getList(path: string, params: any = null) {
+  try {
+    let url = path
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(path, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching divisions:', error)
+    throw new Error('Failed to fetch divisions')
+  }
+}
+
+export async function getDetail(path: string, id: number | string) {
+  try {
+    const resp = await xfetch(`${path}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching division detail:', error)
+    throw new Error('Failed to get division detail')
+  }
+}
+
+export async function update(path: string, id: number | string, data: any) {
+  try {
+    const resp = await xfetch(`${path}/${id}`, 'PATCH', data)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting division:', error)
+    throw new Error('Failed to put division')
+  }
+}
+
+export async function remove(path: string, id: number | string) {
+  try {
+    const resp = await xfetch(`${path}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting data:', error)
+    throw new Error('Failed to delete division')
+  }
+}