@7365admin1/layer-common 3.0.31-staging.18 → 3.0.31-staging.20

package/components/VisitorForm.vue

@@ -12,7 +12,7 @@
       <div class="w-100 d-flex justify-space-between ga-2">
         <span class="text-subtitle-1 w-100 font-weight-bold mb-3">{{
           formTitle
-        }}</span>
+          }}</span>
         <span v-if="withStep2 || withStep3" class="text-subtitle-2 font-weight-bold" style="text-wrap: nowrap">Step
           <span class="text-primary-button">{{ contractorStep }}</span>/{{ withStep3 ? 3 : withStep2 ? 2 : 1 }}</span>
       </div>
@@ -92,7 +92,7 @@
             </v-row>
           </v-col>
 
-            <v-col v-if="shouldShowField('contractorType')" cols="12">
+          <v-col v-if="shouldShowField('contractorType')" cols="12">
             <InputLabel class="text-capitalize" title="Contractor Type" required />
             <v-combobox v-model="contractorTypeObj" v-model:search="contractorTypeInput" ref="contractorTypeCombo"
               autocomplete="off" :hide-no-data="false" @update:focused="handleFocusedContractorType"
@@ -104,7 +104,7 @@
                   <v-list-item-title @click.stop="handleAddNewContractorType" class="d-flex align-center ga-1">
                     <span><v-icon icon="mdi-plus" /></span> Add "<strong>{{
                       contractorTypeInput
-                    }}</strong>" as custom contractor type.
+                      }}</strong>" as custom contractor type.
                   </v-list-item-title>
                 </v-list-item>
               </template>
@@ -137,15 +137,11 @@
               <InputLabel class="text-capitalize" title="Company Name" />
               <v-combobox v-model="visitor.company" v-model:search="companyNameInput" ref="companyCombo"
                 autocomplete="off" :hide-no-data="false" :items="companyNames" item-value="value"
-                :loading="fetchCompanyListPending" @update:model-value="handleSelectCompanyName" variant="outlined"
-                density="comfortable" persistent-hint small-chips>
-                <template v-slot:no-data>
+                @update:model-value="handleSelectCompanyName" variant="outlined" density="comfortable" persistent-hint
+                small-chips>
+                <!-- <template v-slot:no-data>
                   <v-list-item>
-                    <v-list-item-title v-if="fetchCompanyListPending">
-                      <v-progress-circular indeterminate size="20" class="mr-3" />
-                      Searching companies…
-                    </v-list-item-title>
-                    <v-list-item-title v-else-if="companyNameInput" @click.stop="handleAddNewCompany"
+                    <v-list-item-title v-if="companyNameInput" @click.stop="handleAddNewCompany"
                       class="d-flex align-center ga-1">
                       <span><v-icon icon="mdi-plus" /></span>Add "<strong>{{
                         companyNameInput
@@ -158,7 +154,7 @@
                       No companies available. Start typing to add a new one.
                     </v-list-item-title>
                   </v-list-item>
-                </template>
+                </template> -->
               </v-combobox>
             </v-col>
           </template>
@@ -171,7 +167,7 @@
                 :loading="siteDataPending" variant="outlined" density="comfortable" persistent-hint small-chips>
                 <template v-slot:no-data>
                   <v-list-item>
-                    <v-list-item-title v-if="fetchCompanyListPending">
+                    <v-list-item-title v-if="siteDataPending">
                       <v-progress-circular indeterminate size="20" class="mr-3" />
                       Searching companies…
                     </v-list-item-title>
@@ -179,7 +175,7 @@
                       class="d-flex align-center ga-1">
                       <span><v-icon icon="mdi-plus" /></span>Add "<strong>{{
                         companyNameInput
-                      }}</strong>" as new company.
+                        }}</strong>" as new company.
                     </v-list-item-title>
                     <v-list-item-title v-else-if="!companyNameInput && companyNames.length === 0">
                       Start typing to search for companies.
@@ -933,23 +929,34 @@ function getPersonPlateOptions(item: Partial<TPeople>) {
 function findMatchingContactOption(options: string[], value?: string | null) {
   const normalizedValue = value?.trim();
   if (!normalizedValue) return "";
+  const compactValue = normalizedValue.replace(/\s/g, "");
 
   return (
     options.find((option) => option.trim() === normalizedValue) ||
-    options.find((option) => option.replace(/\s/g, "") === normalizedValue.replace(/\s/g, "")) ||
+    options.find((option) => option.replace(/\s/g, "") === compactValue) ||
+    options.find((option) => option.trim().includes(normalizedValue)) ||
+    options.find((option) => option.replace(/\s/g, "").includes(compactValue)) ||
     ""
   );
 }
 
+function normalizePlateNumber(value?: string | null) {
+  return (value ?? "").replace(/[^A-Z0-9]/gi, "").toUpperCase();
+}
+
 function normalizePlateOption(value?: string | null) {
   return (value || "").replace(/[^A-Z0-9]/gi, "").toUpperCase();
 }
 
 function findMatchingPlateOption(options: string[], value?: string | null) {
-  const normalizedValue = normalizePlateOption(value);
+  const normalizedValue = normalizePlateNumber(value);
   if (!normalizedValue) return "";
 
-  return options.find((option) => normalizePlateOption(option) === normalizedValue) || "";
+  return (
+    options.find((option) => normalizePlateNumber(option) === normalizedValue) ||
+    options.find((option) => normalizePlateNumber(option).includes(normalizedValue)) ||
+    ""
+  );
 }
 
 function applyNricSearchResult(
@@ -970,10 +977,18 @@ function applyNricSearchResult(
   visitor.name = item.name || visitor.name;
   visitor.contact = options.contacts || getPersonContactOptions(item)[0] || visitor.contact;
   visitor.plateNumber = options.plateNumber || getPersonPlateOptions(item)[0] || visitor.plateNumber;
-  companyNames.value = item.companyName ?? [];
-  if (!visitor.company) {
-    visitor.company = companyNames.value?.[0] || visitor.company;
+
+  companyNames.value = Array.isArray(item.companyName) ? item.companyName : [];
+
+  if (item.companyName && item.companyName.length === 1) {
+    visitor.company = item.companyName?.[0] || visitor.company;
+  }
+
+  if (item.companyName && item.companyName.length > 1) {
+    visitor.company = ""
   }
+
+
   // visitor.block = (item.block as any) ?? (visitor.block as any) ?? "";
   // visitor.level = (item.level as any) ?? (visitor.level as any) ?? "";
   // visitor.unit = item.unit ?? visitor.unit ?? "";
@@ -1040,21 +1055,9 @@ function confirmNricAutofillOptions() {
   closeNricAutofillOptions();
 }
 
-const {
-  data: fetchCompanyListReq,
-  refresh: fetchCompanyListRefresh,
-  pending: fetchCompanyListPending,
-} = useLazyAsyncData(`fetch-company-list`, () => {
-  if (!companyNameInput.value) return Promise.resolve(null);
-  return searchCompanyList(companyNameInput.value);
-});
 
-watch(fetchCompanyListReq, (arr) => {
-  if (Array.isArray(arr)) {
-    companyAutofillDataArray.value = arr;
-    companyNames.value = arr?.flatMap((x) => x?.companyName);
-  }
-});
+
+
 function getVisitorSearchItems(res: any): TVisitor[] {
   const items =
     res?.items ||
@@ -1165,18 +1168,6 @@ async function handleCheckout(visitorId: string) {
   }
 }
 
-const debounceFetchCompany = debounce(
-  async () => fetchCompanyListRefresh(),
-  200
-);
-
-watch(companyNameInput, async (val) => {
-  if (!val) {
-    companyNames.value = [];
-    return;
-  }
-  await debounceFetchCompany();
-});
 
 function handleAutofillDataViaVehicleNumber(item: TPeople) {
   currentAutofillSource.value = "vehicleNumber";
@@ -1185,9 +1176,7 @@ function handleAutofillDataViaVehicleNumber(item: TPeople) {
   visitor.nric = item.nric;
   visitor.contact = item.contact;
   companyNames.value = item.companyName ?? [];
-  if (!visitor.company) {
-    visitor.company = companyNames.value?.[0];
-  }
+
   visitor.block = item.block ?? "";
   visitor.level = item.level ?? "";
   visitor.unit = item.unit ?? "";

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.0.31-staging.18",
+  "version": "3.0.31-staging.20",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {