@7365admin1/layer-common 3.0.31-staging.26 → 3.0.31-staging.28

package/.github/workflows/publish-staging.yml

@@ -34,3 +34,14 @@ jobs:
 
       - name: Publish to npm with staging tag
         run: npm publish --tag staging --registry https://registry.npmjs.org
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+        run: |
+          MESSAGE="@everyone :rotating_light: **Publish Staging** failed in \`${{ github.repository }}\` (\`${{ github.workflow }}\`)
+          ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          curl -s -X POST -H "Content-Type: application/json" \
+            -d "$(jq -n --arg content "$MESSAGE" '{content: $content}')" \
+            "$DISCORD_WEBHOOK_URL"

package/components/VisitorForm.vue

@@ -121,6 +121,10 @@
             </v-row>
           </v-col>
 
+         
+
+        
+
           <v-col v-if="shouldShowField('deliveryType')" cols="12">
             <v-row>
               <v-col cols="12">
@@ -159,6 +163,7 @@
             </v-col>
           </template>
 
+         
           <template v-if="shouldShowField('delivery-company')">
             <v-col cols="12">
               <InputLabel class="text-capitalize" title="Delivery Company" />
@@ -167,7 +172,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="siteDataPending">
+                    <v-list-item-title v-if="fetchCompanyListPending">
                       <v-progress-circular indeterminate size="20" class="mr-3" />
                       Searching companies…
                     </v-list-item-title>
@@ -175,7 +180,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.
@@ -190,7 +195,6 @@
           </template>
 
 
-
           <v-col v-if="shouldShowField('block')" cols="12">
             <InputLabel class="text-capitalize" title="Block" required />
             <v-autocomplete v-model="visitor.block" :items="blocksArray" item-value="value" autocomplete="off"
@@ -307,7 +311,7 @@
             <span class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
           </div>
 
-          <template v-if="selectedNricContactOptions.length >= 1">
+          <template v-if="!visitor.contact && selectedNricContactOptions.length >= 1">
             <h3 class="nric-options-section-title font-weight-bold mb-2">Contact</h3>
             <v-radio-group v-model="selectedNricContact" hide-details color="success" class="nric-option-group">
               <v-radio v-for="contact in selectedNricContactOptions" :key="contact" :label="contact" :value="contact"
@@ -315,7 +319,7 @@
             </v-radio-group>
           </template>
 
-          <template v-if="selectedNricPlateOptions.length >= 1">
+          <template v-if="!visitor.plateNumber && selectedNricPlateOptions.length >= 1">
             <h3 class="nric-options-section-title font-weight-bold mb-2 mt-5">Vehicle</h3>
             <v-radio-group v-model="selectedNricPlate" hide-details color="success" class="nric-option-group">
               <v-radio v-for="plate in selectedNricPlateOptions" :key="plate" :label="plate" :value="plate"
@@ -683,10 +687,6 @@ const requireNRIC = computed(() => {
   return prop.type !== "walk-in" && prop.type !== "guest";
 });
 
-const isVehicleRequired = computed(() => {
-  return ["guest", "drop-off", "pick-up"].includes(prop.type);
-});
-
 const hidQrCodePassConfig = computed(() => {
   return (siteData.value as any)?.metadata?.hidQrCodePass || {};
 });
@@ -1084,9 +1084,21 @@ 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 ||
@@ -1198,6 +1210,18 @@ 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";
@@ -1206,7 +1230,9 @@ 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.26",
+  "version": "3.0.31-staging.28",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {