From 3a4b2aa6fb940b9d29bc1d6743f09e7302764c7e Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Sat, 11 Oct 2025 00:25:44 +0700
Subject: [PATCH] dev: hotfix, moved combobox and datepicker

---
 app/components/app/bed/entry-form.vue         |  2 +-
 app/components/app/chamber/entry-form.vue     |  2 +-
 .../app/division-position/entry-form.vue      |  2 +-
 app/components/app/encounter/entry-form.vue   |  4 +--
 app/components/app/floor/entry-form.vue       |  2 +-
 .../app/installation/entry-form.vue           |  2 +-
 .../app/patient/_common/select-ethnicity.vue  |  2 +-
 .../app/patient/_common/select-job.vue        |  2 +-
 .../_common/select-district.vue               |  2 +-
 .../person-address/_common/select-postal.vue  |  2 +-
 .../_common/select-province.vue               |  2 +-
 .../person-address/_common/select-regency.vue |  2 +-
 .../person-address/_common/select-village.vue |  2 +-
 app/components/app/person/entry-form.vue      |  2 +-
 app/components/app/room/entry-form.vue        |  2 +-
 app/components/app/sep/entry-form.vue         |  2 +-
 app/components/app/sep/small-entry.vue        |  4 +--
 .../app/specialist-intern/entry-form.vue      |  2 +-
 app/components/app/specialist/entry-form.vue  |  2 +-
 .../app/subspecialist/entry-form.vue          |  2 +-
 app/components/app/unit/entry-form.vue        |  2 +-
 app/components/app/warehouse/entry-form.vue   |  2 +-
 .../pub/my-ui/{form => combobox}/combobox.vue | 13 +++-------
 app/components/pub/my-ui/combobox/index.ts    | 25 +++++++++++++++++++
 .../datepicker-single.vue                     |  0
 25 files changed, 53 insertions(+), 33 deletions(-)
 rename app/components/pub/my-ui/{form => combobox}/combobox.vue (96%)
 create mode 100644 app/components/pub/my-ui/combobox/index.ts
 rename app/components/pub/my-ui/{form => datepicker}/datepicker-single.vue (100%)

diff --git a/app/components/app/bed/entry-form.vue b/app/components/app/bed/entry-form.vue
index 0b103cd0..f2b0c961 100644
--- a/app/components/app/bed/entry-form.vue
+++ b/app/components/app/bed/entry-form.vue
@@ -5,7 +5,7 @@ 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'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/chamber/entry-form.vue b/app/components/app/chamber/entry-form.vue
index af8da097..f44a6745 100644
--- a/app/components/app/chamber/entry-form.vue
+++ b/app/components/app/chamber/entry-form.vue
@@ -5,7 +5,7 @@ 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'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/division-position/entry-form.vue b/app/components/app/division-position/entry-form.vue
index 9e144e64..2525b49b 100644
--- a/app/components/app/division-position/entry-form.vue
+++ b/app/components/app/division-position/entry-form.vue
@@ -4,7 +4,7 @@ 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'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { DivisionPositionFormData } from '~/schemas/division-position.schema'
diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 6f2ad074..fd6c8da9 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -5,9 +5,9 @@ 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'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 import { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/floor/entry-form.vue b/app/components/app/floor/entry-form.vue
index ec78dacc..a59bfd4c 100644
--- a/app/components/app/floor/entry-form.vue
+++ b/app/components/app/floor/entry-form.vue
@@ -5,7 +5,7 @@ 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'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/installation/entry-form.vue b/app/components/app/installation/entry-form.vue
index 393eb793..c83e5cb1 100644
--- a/app/components/app/installation/entry-form.vue
+++ b/app/components/app/installation/entry-form.vue
@@ -4,7 +4,7 @@ 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'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { InstallationFormData } from '~/schemas/installation.schema'
diff --git a/app/components/app/patient/_common/select-ethnicity.vue b/app/components/app/patient/_common/select-ethnicity.vue
index a4231571..e1ecd08a 100644
--- a/app/components/app/patient/_common/select-ethnicity.vue
+++ b/app/components/app/patient/_common/select-ethnicity.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/patient/_common/select-job.vue b/app/components/app/patient/_common/select-job.vue
index b9804bb5..b14cbb66 100644
--- a/app/components/app/patient/_common/select-job.vue
+++ b/app/components/app/patient/_common/select-job.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/person-address/_common/select-district.vue b/app/components/app/person-address/_common/select-district.vue
index 97b50e4e..91f853f8 100644
--- a/app/components/app/person-address/_common/select-district.vue
+++ b/app/components/app/person-address/_common/select-district.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/person-address/_common/select-postal.vue b/app/components/app/person-address/_common/select-postal.vue
index 84df7b33..83b33786 100644
--- a/app/components/app/person-address/_common/select-postal.vue
+++ b/app/components/app/person-address/_common/select-postal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/person-address/_common/select-province.vue b/app/components/app/person-address/_common/select-province.vue
index bf984154..f8cc5464 100644
--- a/app/components/app/person-address/_common/select-province.vue
+++ b/app/components/app/person-address/_common/select-province.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/person-address/_common/select-regency.vue b/app/components/app/person-address/_common/select-regency.vue
index bb2202d3..9b415b6e 100644
--- a/app/components/app/person-address/_common/select-regency.vue
+++ b/app/components/app/person-address/_common/select-regency.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/person-address/_common/select-village.vue b/app/components/app/person-address/_common/select-village.vue
index 561fa9b6..a3d7725c 100644
--- a/app/components/app/person-address/_common/select-village.vue
+++ b/app/components/app/person-address/_common/select-village.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/person/entry-form.vue b/app/components/app/person/entry-form.vue
index a9a9c6cf..0ea3757a 100644
--- a/app/components/app/person/entry-form.vue
+++ b/app/components/app/person/entry-form.vue
@@ -3,7 +3,7 @@ import type { FormErrors } from '~/types/error'
 import { Form } from '~/components/pub/ui/form'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/room/entry-form.vue b/app/components/app/room/entry-form.vue
index 6aca0d77..b460cc2d 100644
--- a/app/components/app/room/entry-form.vue
+++ b/app/components/app/room/entry-form.vue
@@ -5,7 +5,7 @@ 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'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/sep/entry-form.vue b/app/components/app/sep/entry-form.vue
index 9aea7c31..e48d23ec 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/Select.vue'
 import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
 import { Textarea } from '~/components/pub/ui/textarea'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 const emit = defineEmits<{
   (e: 'event', value: any): void
diff --git a/app/components/app/sep/small-entry.vue b/app/components/app/sep/small-entry.vue
index b4957aa9..a5372099 100644
--- a/app/components/app/sep/small-entry.vue
+++ b/app/components/app/sep/small-entry.vue
@@ -2,12 +2,12 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/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 c9719e09..aca8245b 100644
--- a/app/components/app/specialist-intern/entry-form.vue
+++ b/app/components/app/specialist-intern/entry-form.vue
@@ -2,7 +2,7 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/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'
diff --git a/app/components/app/specialist/entry-form.vue b/app/components/app/specialist/entry-form.vue
index ee649391..70c0f294 100644
--- a/app/components/app/specialist/entry-form.vue
+++ b/app/components/app/specialist/entry-form.vue
@@ -4,7 +4,7 @@ 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'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { SpecialistFormData } from '~/schemas/specialist.schema'
diff --git a/app/components/app/subspecialist/entry-form.vue b/app/components/app/subspecialist/entry-form.vue
index 53a74f68..8f176fb1 100644
--- a/app/components/app/subspecialist/entry-form.vue
+++ b/app/components/app/subspecialist/entry-form.vue
@@ -4,7 +4,7 @@ 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'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { SubspecialistFormData } from '~/schemas/subspecialist.schema'
diff --git a/app/components/app/unit/entry-form.vue b/app/components/app/unit/entry-form.vue
index f400967f..1b369695 100644
--- a/app/components/app/unit/entry-form.vue
+++ b/app/components/app/unit/entry-form.vue
@@ -4,7 +4,7 @@ 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'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { UnitFormData } from '~/schemas/unit.schema'
diff --git a/app/components/app/warehouse/entry-form.vue b/app/components/app/warehouse/entry-form.vue
index ad367706..cc3256e0 100644
--- a/app/components/app/warehouse/entry-form.vue
+++ b/app/components/app/warehouse/entry-form.vue
@@ -5,7 +5,7 @@ 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'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/pub/my-ui/form/combobox.vue b/app/components/pub/my-ui/combobox/combobox.vue
similarity index 96%
rename from app/components/pub/my-ui/form/combobox.vue
rename to app/components/pub/my-ui/combobox/combobox.vue
index 475fbb13..fbb241e0 100644
--- a/app/components/pub/my-ui/form/combobox.vue
+++ b/app/components/pub/my-ui/combobox/combobox.vue
@@ -1,16 +1,11 @@
 <script setup lang="ts">
 import { cn } from '~/lib/utils'
 
-interface Item {
-  value: string | number
-  label: string
-  code?: string
-  priority?: number
-}
+import { type Item } from './index'
 
 const props = defineProps<{
-  id: string
-  modelValue?: string | number
+  id?: string
+  modelValue?: string
   items: Item[]
   placeholder?: string
   searchPlaceholder?: string
@@ -20,7 +15,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-  'update:modelValue': [value: string | number]
+  'update:modelValue': [value: string]
 }>()
 
 const open = ref(false)
diff --git a/app/components/pub/my-ui/combobox/index.ts b/app/components/pub/my-ui/combobox/index.ts
new file mode 100644
index 00000000..ce8325f0
--- /dev/null
+++ b/app/components/pub/my-ui/combobox/index.ts
@@ -0,0 +1,25 @@
+export interface Item {
+  value: string
+  label: string
+  code?: string
+  priority?: number
+}
+
+export function recStrToItem(input: Record<string, string>): Item[] {
+  console.log(input)
+  const items: Item[] = []
+  let idx = 0;
+  for (const key in input) {
+    if (input.hasOwnProperty(key)) {
+      const value = input[key]
+      items.push({
+        value: key || ('unknown-' + idx),
+        label: input[key] || ('unknown-' + idx),
+      })
+    }
+    idx++
+  }
+  return items
+}
+
+export { default as Combobox } from './combobox.vue'
diff --git a/app/components/pub/my-ui/form/datepicker-single.vue b/app/components/pub/my-ui/datepicker/datepicker-single.vue
similarity index 100%
rename from app/components/pub/my-ui/form/datepicker-single.vue
rename to app/components/pub/my-ui/datepicker/datepicker-single.vue