fix: resolve conflict

app/components/app/division/entry-form-prev.vue

@@ -7,6 +7,7 @@ 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 { Form } from '~/components/pub/ui/form'
 
 interface DivisionFormData {
   name: string

app/components/app/installation/entry-form.vue

@@ -5,6 +5,7 @@ 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 { Form } from '~/components/pub/ui/form'
 
 interface InstallationFormData {
   name: string

app/components/app/person-address/entry-form.vue

@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
 import Label from '~/components/pub/custom-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
+import { Form } from '~/components/pub/ui/form'
 
 interface DivisionFormData {
   name: string

app/components/app/person-contact/entry-form.vue

@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
 import Label from '~/components/pub/custom-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
+import { Form } from '~/components/pub/ui/form'
 
 interface DivisionFormData {
   name: string

app/components/app/person-relative/entry-form.vue

@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
 import Label from '~/components/pub/custom-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'
 
 interface DivisionFormData {
   name: string

app/components/app/person/entry-form.vue

@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
 import Label from '~/components/pub/custom-ui/form/label.vue'
 import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
+import { Form } from '~/components/pub/ui/form'
 
 interface DivisionFormData {
   name: string

app/components/app/specialist-intern/entry-form.vue

@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
 import Label from '~/components/pub/custom-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'
 
 interface DivisionFormData {
   name: string

app/components/content/encounter/list.vue

@@ -96,15 +96,14 @@ provide('table_data_loader', isLoading)
 
 <template>
   <Header :prep="{ ...hreaderPrep }" :ref-search-nav="refSearchNav" />
-  <div class="my-4 rounded-md border p-4">
-    <Filter :ref-search-nav="refSearchNav" />
-    <div class="my-4 flex flex-1 flex-col gap-4 md:gap-8">
-      <AppEncounterList :data="data" />
-    </div>
-
-    <Dialog v-model:open="isFormEntryDialogOpen" title="Filter" size="lg" prevent-outside>
-      <AppEncounterFilter />
-    </Dialog>
-    <!-- <Pagination :pagination-meta="paginationMeta" @page-change="handlePageChange" /> -->
+  <Separator class="my-4 xl:my-5" />
+  <Filter :ref-search-nav="refSearchNav" />
+  <div class="my-4 flex flex-1 flex-col gap-4 md:gap-8">
+    <AppEncounterList :data="data" />
   </div>
+
+  <Dialog v-model:open="isFormEntryDialogOpen" title="Filter" size="lg" prevent-outside>
+    <AppEncounterFilter />
+  </Dialog>
+  <!-- <Pagination :pagination-meta="paginationMeta" @page-change="handlePageChange" /> -->
 </template>

app/components/content/satusehat/list.vue

@@ -4,6 +4,7 @@ import { useUrlSearchParams } from '@vueuse/core'
 import Header from '~/components/pub/custom-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'
 
 // State management
 const data = ref([])

app/pages/(features)/rehab/registration/add.vue

@@ -34,8 +34,8 @@ const canCreate = hasCreateAccess(roleAccess)
 </script>
 
 <template>
-  <div v-if="canCreate">
+  <template v-if="canCreate">
     <ContentEncounterEntry form-type="Tambah" />
-  </div>
+  </template>
   <Error v-else :status-code="403" />
 </template>