@7365admin1/layer-common 4.90.2 → 4.90.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.90.3
+
+### Patch Changes
+
+- d7c20a9: Visitor form: required and optional fields now match the security mobile app, and every field says "(Required)" or "(Optional)". Phone is optional for Drive-in and Walk-in; NRIC is optional for Delivery; Vehicle Number is required for Drive-in, Pick-Up and Drop-Off; Company Name is required for Contractor; Delivery Company is required. Walk-in no longer shows Company Name, and only the fields on the form are sent when a visitor is saved (no hidden company on Walk-in, no purpose on Drive-in). Pass, Keys and contractor member fields are labelled too.
+
 ## 4.90.2
 
 ### Patch Changes
@@ -2022,11 +2028,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                        GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                        GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                          GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                          GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                        owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                        staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                          owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                          staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/MemberInformation.vue

@@ -10,12 +10,12 @@
         <v-form ref="formRef" v-model="validForm" :disabled="processing" @click="errorScanPassMessage = ''">
           <v-row no-gutters class="pt-5 ga-2">
             <v-col cols="12">
-              <InputLabel class="text-capitalize" title="Full Name" required />
+              <InputLabel class="text-capitalize" title="Full Name (Required)" required />
               <v-text-field v-model.trim="memberForm.name" density="compact" hide-details :rules="[requiredRule]" />
             </v-col>
 
             <v-col cols="12">
-              <InputLabel class="text-capitalize" title="NRIC" required />
+              <InputLabel class="text-capitalize" title="NRIC (Required)" required />
               <v-menu v-model="memberNRICSearchMenu" location="bottom" offset-y :close-on-content-click="false">
                 <template #activator="{ props: menuProps }">
                   <InputNRICNumber v-bind="menuProps" v-model.trim="memberForm.nric" density="compact" hide-details
@@ -34,7 +34,7 @@
             </v-col>
 
             <v-col cols="12">
-              <InputLabel class="text-capitalize" title="Phone Number" required />
+              <InputLabel class="text-capitalize" title="Phone Number (Required)" required />
               <v-menu v-model="memberPhoneSearchMenu" location="bottom" offset-y :close-on-content-click="false">
                 <template #activator="{ props: menuProps }">
                   <InputPhoneNumberV2 v-bind="menuProps" v-model="memberForm.contact" density="compact"
@@ -54,7 +54,7 @@
 
             <v-col cols="12">
               <v-autocomplete v-model="selectedPass" v-model:search="passInput" :hide-no-data="false" class="mt-3"
-                :items="passItemsFilteredFinal" item-title="prefixAndName" item-value="_id" label="Pass (optional)"
+                :items="passItemsFilteredFinal" item-title="prefixAndName" item-value="_id" label="Pass (Optional)"
                 variant="outlined" density="compact" :error-messages="errorScanPassMessage" persistent-hint small-chips
                 :clearable="clearable" @click="fetchPasses">
                 <template v-slot:no-data>

package/components/PassInformation.vue

@@ -19,7 +19,7 @@
           :rules="props.passRules"
           item-title="prefixAndName"
           item-value="_id"
-          label="Pass"
+          label="Pass (Optional)"
           variant="outlined"
           hide-details
           persistent-hint
@@ -48,7 +48,7 @@
             :rules="props.passRules"
             item-title="prefixAndName"
             item-value="_id"
-            label="Keys"
+            label="Keys (Optional)"
             multiple
             variant="outlined"
             hide-details

package/components/VisitorForm.vue

@@ -16,14 +16,14 @@
       <v-form ref="formRef" v-model="validForm" :disabled="processing" @click="errorMessage = ''">
         <v-row no-gutters class="pt-4">
           <v-col v-if="shouldShowField('attachments')" class="w-100">
-            <InputLabel class="text-capitalize" title="Attach Image" />
+            <InputLabel class="text-capitalize" title="Attach Image (Optional)" />
             <InputFileV2 v-model="visitor.attachments" multiple :max-length="3" />
           </v-col>
 
           <v-col v-if="shouldShowField('nric')" cols="12">
             <v-row>
               <v-col cols="12">
-                <InputLabel class="text-capitalize" title="NRIC" :required="requireNRIC" />
+                <InputLabel class="text-capitalize" :title="requireNRIC ? 'NRIC (Required)' : 'NRIC (Optional)'" :required="requireNRIC" />
                 <v-menu v-model="nricSearchMenu" location="bottom" offset-y :close-on-content-click="false"
                   content-class="visitor-form__menu">
                   <template #activator="{ props }">
@@ -55,11 +55,11 @@
           <v-col v-if="shouldShowField('contact')" cols="12">
             <v-row>
               <v-col cols="12">
-                <InputLabel class="text-capitalize" title="Phone Number" required />
+                <InputLabel class="text-capitalize" :title="requireContact ? 'Phone Number (Required)' : 'Phone Number (Optional)'" :required="requireContact" />
                 <v-menu v-model="phoneSearchMenu" location="bottom" offset-y :close-on-content-click="false"
                   content-class="visitor-form__menu">
                   <template #activator="{ props }">
-                    <InputPhoneNumberV2 v-bind="props" v-model="visitor.contact" :rules="[requiredRule]"
+                    <InputPhoneNumberV2 v-bind="props" v-model="visitor.contact" :rules="[requireContact ? requiredRule : () => true]"
                       @focus="isPhoneFieldFocused = true" @blur="isPhoneFieldFocused = false" density="comfortable"
                       :key="currentAutofillSource + 'phone-key'" @update:model-value="handleUpdatePhoneNumber" />
                   </template>
@@ -87,12 +87,13 @@
           <v-col v-if="shouldShowField('plateNumber')" cols="12">
             <v-row>
               <v-col cols="12">
-                <InputLabel class="text-capitalize" title="Vehicle Number" :required="isVehicleRequired" />
+                <InputLabel class="text-capitalize" :title="isVehicleRequired ? 'Vehicle Number (Required)' : 'Vehicle Number (Optional)'" :required="isVehicleRequired" />
                 <!-- <v-text-field v-model.trim.uppercase="visitor.plateNumber" density="comfortable" /> -->
                 <v-menu v-model="vehicleSearchMenu" location="bottom" offset-y :close-on-content-click="false"
                   content-class="visitor-form__menu">
                   <template #activator="{ props }">
                     <InputVehicleNumber v-bind="props" v-model="visitor.plateNumber" density="comfortable"
+                      :rules="[isVehicleRequired ? requiredRule : () => true]"
                       @update:model-value="handleUpdateVehicleNumber" @focus="handleFocusPlateNumber"
                       @blur="isPlateNumberFieldFocused = false" />
                   </template>
@@ -117,7 +118,7 @@
           </v-col>
 
           <v-col v-if="shouldShowField('contractorType')" cols="12">
-            <InputLabel class="text-capitalize" title="Contractor Type" required />
+            <InputLabel class="text-capitalize" title="Contractor Type (Required)" required />
             <v-combobox v-model="contractorTypeObj" v-model:search="contractorTypeInput" ref="contractorTypeCombo"
               autocomplete="off" :hide-no-data="false" @update:focused="handleFocusedContractorType"
               :items="contractorTypes" :rules="[requiredRule]" item-value="value"
@@ -139,7 +140,7 @@
           <v-col v-if="shouldShowField('name')" cols="12">
             <v-row>
               <v-col cols="12">
-                <InputLabel class="text-capitalize" title="Full Name" required />
+                <InputLabel class="text-capitalize" title="Full Name (Required)" required />
                 <v-text-field v-model.trim="visitor.name" density="comfortable" :rules="[requiredRule]" />
               </v-col>
             </v-row>
@@ -159,7 +160,7 @@
                      place of `primary`, which is the darker link tone. Without
                      the label this was the only required field in the form with
                      nothing naming it: just a bare Food/Parcel pair. -->
-                <InputLabel class="text-capitalize" title="Delivery Type" required />
+                <InputLabel class="text-capitalize" title="Delivery Type (Required)" required />
                 <v-radio-group v-model="visitor.deliveryType" inline color="accent" :rules="[requiredRule]">
                   <v-radio label="Food" value="Food"></v-radio>
                   <v-radio label="Parcel" value="Parcel"></v-radio>
@@ -170,8 +171,9 @@
 
           <template v-if="shouldShowField('company')">
             <v-col cols="12">
-              <InputLabel class="text-capitalize" title="Company Name" />
+              <InputLabel class="text-capitalize" :title="requireCompany ? 'Company Name (Required)' : 'Company Name (Optional)'" :required="requireCompany" />
               <v-combobox v-model="visitor.company" v-model:search="companyNameInput" ref="companyCombo"
+                :rules="[requireCompany ? requiredRule : () => true]"
                 autocomplete="off" :hide-no-data="true" :items="companyNames" item-value="value"
                 @update:model-value="handleSelectCompanyName" variant="outlined" density="comfortable" persistent-hint
                 small-chips>
@@ -182,8 +184,9 @@
          
           <template v-if="shouldShowField('delivery-company')">
             <v-col cols="12">
-              <InputLabel class="text-capitalize" title="Delivery Company" />
+              <InputLabel class="text-capitalize" title="Delivery Company (Required)" required />
               <v-combobox v-model="deliveryCompany" v-model:search="deliveryCompanyInput" ref="companyCombo"
+                :rules="[requiredRule]"
                 autocomplete="off" :hide-no-data="false" :items="deliveryCompanyList" item-value="value"
                 :loading="siteDataPending" variant="outlined" density="comfortable" persistent-hint small-chips>
                 <template v-slot:no-data>
@@ -205,7 +208,7 @@
 
 
           <v-col v-if="shouldShowField('block')" cols="12">
-            <InputLabel class="text-capitalize" title="Block" required />
+            <InputLabel class="text-capitalize" title="Block (Required)" required />
             <v-autocomplete v-model="visitor.block" :items="blocksArray" item-value="value" autocomplete="off"
               item-title="title" :key="blockListDataPending ? 'block-list-pending' : 'block-list-ready'
                 " :loading="blockListDataPending" @update:model-value="handleChangeBlock" density="comfortable"
@@ -213,13 +216,13 @@
           </v-col>
 
           <v-col v-if="shouldShowField('level')" cols="12">
-            <InputLabel class="text-capitalize" title="Level" required />
+            <InputLabel class="text-capitalize" title="Level (Required)" required />
             <v-autocomplete v-model="visitor.level" :items="levelsArray" density="comfortable" autocomplete="off"
               :disabled="!visitor.block" :key="levelsDataPending ? 'level-list-pending' : 'level-list-ready'
                 " :loading="levelsDataPending" @update:model-value="handleChangeLevel" :rules="[requiredRule]" />
           </v-col>
           <v-col v-if="shouldShowField('unit')" cols="12">
-            <InputLabel class="text-capitalize" title="Unit" required />
+            <InputLabel class="text-capitalize" title="Unit (Required)" required />
             <v-autocomplete v-model="visitor.unit" :items="unitsArray" density="comfortable" autocomplete="off"
               item-title="title" item-value="value" :disabled="!visitor.level"
               :key="unitsDataPending ? 'unit-list-pending' : 'unit-list-ready'" :loading="unitsDataPending"
@@ -227,14 +230,14 @@
           </v-col>
 
           <v-col v-if="shouldShowField('unit')" cols="12">
-            <InputLabel class="text-capitalize" title="Registered Unit Company Name" required
+            <InputLabel class="text-capitalize" title="Registered Unit Company Name"
               :key="'unit-key' + visitor.level" />
             <v-text-field v-model.trim="registeredUnitCompanyName" density="comfortable"
               :loading="buildingUnitDataPending" readonly class="no-pointer" />
           </v-col>
 
           <v-col v-if="shouldShowField('remarks')" cols="12">
-            <InputLabel class="text-capitalize" title="Remarks" />
+            <InputLabel class="text-capitalize" title="Remarks (Optional)" />
             <v-textarea v-model="visitor.remarks" density="comfortable" :rows="3" no-resize />
           </v-col>
 
@@ -831,12 +834,29 @@ const formMode = computed<"add" | "edit" | "register">(() => {
   return selectedUnregisteredVisitor.value ? "register" : prop.mode;
 });
 
+// Fields this form actually has for the visitor type - drives both what is
+// shown and what is sent on submit, so nothing outside the form is saved.
+// typeFieldMap also feeds the details dialog, so it can list more than this:
+//   - walk-in "company": not on the security mobile app's walk-in, hidden here
+//     but still shown on older walk-in records in the details dialog;
+//   - guest "purpose": never drawn in this form.
+const formFieldsExcluded: Partial<Record<TVisitorType, string[]>> = {
+  "walk-in": ["company"],
+  guest: ["purpose"],
+};
+
+const isFormField = (
+  fieldKey: keyof TVisitorPayload | "delivery-company"
+) => {
+  if (formFieldsExcluded[prop.type]?.includes(fieldKey)) return false;
+  return !!typeFieldMap[prop.type]?.includes(fieldKey);
+};
+
 const shouldShowField = (
   fieldKey: keyof TVisitorPayload | "delivery-company"
 ) => {
   if ((!withStep2.value && !withStep3.value) || contractorStep.value === 1) {
-    const visibleFields = typeFieldMap[prop.type];
-    return visibleFields?.includes(fieldKey);
+    return isFormField(fieldKey);
   }
 };
 
@@ -866,8 +886,21 @@ const showShowKeysField = computed(() => {
   return ["guest", "contractor", "walk-in"].includes(prop.type);
 });
 
+// Required / optional per type - kept in line with the security mobile app.
 const requireNRIC = computed(() => {
-  return prop.type !== "walk-in" && prop.type !== "guest";
+  return prop.type === "contractor";
+});
+
+const requireContact = computed(() => {
+  return ["contractor", "delivery"].includes(prop.type);
+});
+
+const isVehicleRequired = computed(() => {
+  return ["guest", "pick-up", "drop-off"].includes(prop.type);
+});
+
+const requireCompany = computed(() => {
+  return prop.type === "contractor";
 });
 
 const hidQrCodePassConfig = computed(() => {
@@ -1942,7 +1975,8 @@ async function submit(options: { skipNonCheckedOutCheck?: boolean } = {}) {
   if (formMode.value === "add" || formMode.value === "register") {
     const allowedFields = typeFieldMap[prop.type];
     for (const key of allowedFields as (keyof TVisitorPayload)[]) {
-      if (visitor[key] !== undefined) {
+      // only what the form has (see isFormField)
+      if (isFormField(key) && visitor[key] !== undefined) {
         payload = {
           ...payload,
           [key]: visitor[key],

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.90.2",
+  "version": "4.90.3",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",