@7365admin1/layer-common 1.11.54 → 3.0.0

package/components/VehicleForm.vue

@@ -34,20 +34,25 @@
 
           <v-col v-if="shouldShowField('block')" cols="12">
             <InputLabel class="text-capitalize" title="Block" required />
-            <v-autocomplete v-model="vehicle.block" :items="blocksArray" item-value="value" item-title="title"
-              @update:model-value="handleChangeBlock" density="comfortable" :rules="[requiredRule]" />
+            <v-autocomplete v-model="vehicle.block" :items="blocksArray" autocomplete="off"
+              :key="blockListDataPending ? 'block-list-pending' : 'block-list-ready'" :loading="blockListDataPending"
+              item-value="value" item-title="title" @update:model-value="handleChangeBlock" density="comfortable"
+              :rules="[requiredRule]" />
           </v-col>
 
           <v-col v-if="shouldShowField('level')" cols="12">
             <InputLabel class="text-capitalize" title="Level" required />
-            <v-autocomplete v-model="vehicle.level" :items="levelsArray" density="comfortable" :disabled="!vehicle.block"
-              @update:model-value="handleChangeLevel" :rules="[requiredRule]" />
+            <v-autocomplete v-model="vehicle.level" :items="levelsArray" autocomplete="off"
+              :key="levelListDataPending ? 'level-list-pending' : 'level-list-ready'" :loading="levelListDataPending"
+              density="comfortable" :disabled="!vehicle.block" @update:model-value="handleChangeLevel"
+              :rules="[requiredRule]" />
           </v-col>
 
           <v-col v-if="shouldShowField('unit')" cols="12">
             <InputLabel class="text-capitalize" title="Unit" required />
-            <v-autocomplete v-model="vehicle.unit" :items="unitsArray" density="comfortable" :disabled="!vehicle.level"
-              :rules="[requiredRule]" />
+            <v-autocomplete v-model="vehicle.unit" :items="unitsArray" autocomplete="off"
+              :key="unitListDataPending ? 'unit-list-pending' : 'unit-list-ready'" :loading="unitListDataPending"
+              density="comfortable" :disabled="!vehicle.level" :rules="[requiredRule]" />
           </v-col>
 
           <v-col v-if="shouldShowField('nric')" cols="12">
@@ -278,6 +283,7 @@ const { requiredRule, formatDateISO8601, debounce } = useUtils();
 const { addVehicle, getCustomSeasonPassTypes, updateVehicle, formatVehicleStatus } = useVehicle();
 const { getSiteById, getSiteLevels, getSiteUnits } = useSiteSettings();
 const { findPersonByNRICMultipleResult, getPeopleByUnit } = usePeople();
+const { getBlocksSelection, getLevelsSelection, getUnitSelection } = useBuilding();
 
 const emit = defineEmits(['back', 'select', 'done', 'error', 'close', 'close:all']);
 
@@ -313,6 +319,7 @@ const seasonPassTypeArray = ref<{ title: string, value: string }[]>([]);
 
 const matchingPeople = ref<Partial<TPeople>[]>([]);
 const showMatchingPeopleDialog = ref(false);
+const prefillingRecords = ref(false);
 const checkingNRIC = ref(false);
 const checkingUnit = ref(false);
 
@@ -367,62 +374,80 @@ if (prop.vehicleData) {
 }
 
 
-const { data: siteData, refresh: refreshSiteData } = useLazyAsyncData(
-  `fetch-site-data-${prop.site}`,
-  async () => await getSiteById(prop.site));
 
-const { data: levelsData, refresh: refreshLevelsData } = useLazyAsyncData(
-  `fetch-levels-data-${prop.site}-${vehicle.block}`,
+const {
+  data: blocksListData,
+  refresh: refreshBlockListData,
+  status: blocksListStatus,
+  pending: blockListDataPending,
+} = useAsyncData(`vehicle-fetch-block-list-data-${prop.site}`, () =>
+  getBlocksSelection({ siteId: prop.site }), { watch: [() => prop.site], deep: true }
+);
+
+
+const {
+  data: levelsData,
+  refresh: refreshLevelsData,
+  status: levelsStatus,
+  pending: levelListDataPending,
+} = useAsyncData(
+  `vehicle-fetch-levels-data-${prop.site}-${vehicle.block}`,
   async () => {
-    if (!vehicle.block) return Promise.resolve(null);;
-    return await getSiteLevels(prop.site, { block: Number(vehicle.block) })
-  });
+    if (!vehicle.block) return Promise.resolve(null);
+    // return await getSiteWithLevels(prop.site, { block: Number(vehicle.block) });
+    return await getLevelsSelection({ siteId: prop.site, blockId: vehicle.block._id ? vehicle.block._id : vehicle.block });
+  }, { watch: [() => vehicle.block], deep: true }
+);
 
-const { data: unitsData, refresh: refreshUnitsData } = useLazyAsyncData(
-  `fetch-units-data-${prop.site}-${vehicle.level}`,
+const {
+  data: unitsData,
+  refresh: refreshUnitsData,
+  status: unitsStatus,
+  pending: unitListDataPending,
+} = useAsyncData(
+  `vehicle-fetch-units-data-${prop.site}-${vehicle.level}`,
   async () => {
-    if (!vehicle.level) return Promise.resolve(null);;
-    return await getSiteUnits(prop.site, Number(vehicle.block), vehicle.level)
-  });
+    if (!vehicle.level) return Promise.resolve(null);
+    return await getUnitSelection({ siteId: prop.site, block: vehicle.block._id ? vehicle.block._id : vehicle.block, level: vehicle.level._id ? vehicle.level._id : vehicle.level });
+  }, { watch: [() => vehicle.level], deep: true }
+);
 
 
 const { data: seasonPassTypeData, refresh: refreshSeasonPassTypeData } = useLazyAsyncData(
-  `fetch-season-pass-type-data-${prop.site}`,
+  `vehicle-fetch-season-pass-type-data-${prop.site}`,
   async () => await getCustomSeasonPassTypes(prop.site));
 
 
 watch(
-  siteData,
-  (newVal) => {
-    const siteDataValue = newVal as any;
-    if (siteDataValue) {
-      const numberOfBlocks = siteDataValue.metadata?.block || 0;
-      for (let i = 1; i <= numberOfBlocks; i++) {
-        blocksArray.value.push({
-          title: `Block ${i}`,
-          value: i
-        });
-      }
-
-    } else {
+  [blocksListData],
+  () => {
+    if (blocksListStatus.value === 'pending') {
       blocksArray.value = [];
+      return;
     }
-  }, { immediate: true });
 
+    const arr = Array.isArray(blocksListData.value?.data) ? blocksListData.value?.data : [];
+    blocksArray.value = arr.map((block: any) => ({
+      title: block.name,
+      value: block._id,
+    }));
+  },
+  { immediate: true, deep: true }
+)
 
-watch(
-  levelsData,
-  (newVal: any) => {
-    if (newVal) {
-      const arr = newVal.levels || [];
-      levelsArray.value = arr?.map((level: any) => ({
-        title: level,
-        value: level
-      }));
-    } else {
-      levelsArray.value = [];
-    }
-  }, { immediate: true });
+watch([levelsData], () => {
+  if (levelsStatus.value === 'pending') {
+    levelsArray.value = [];
+    return;
+  }
+
+  const arr = Array.isArray(levelsData.value?.data) ? levelsData.value?.data : [];
+  const mappedLevels = arr.map((level: any) => ({
+    title: level.name,
+    value: level._id,
+  }));
+  levelsArray.value = mappedLevels;
+}, { immediate: true, deep: true })
 
 watch(
   unitsData,
@@ -710,7 +735,7 @@ function selectPeopleRecord(record: TPeople) {
 
 
 async function checkPeopleById() {
-  if (!vehicle.unit || prop.mode === 'edit') return;
+  if (!vehicle.unit || prop.mode === 'edit' || prefillingRecords.value) return;
 
   checkingUnit.value = true;
   showMatchingPeopleDialog.value = true;
@@ -743,6 +768,8 @@ const debounceedCheckUnit = debounce(checkPeopleById, 500);
 watch(
   () => vehicle.unit,
   async (newUnit) => {
+    if (prefillingRecords.value) return;
+
     resetVehicleDetails();
     matchingPeople.value = [];
     if (!newUnit) return;
@@ -778,13 +805,25 @@ onMounted(() => {
       vehicle.start = prop.vehicleData.start || '';
       vehicle.plateNumber = prop.vehicleData.plateNumber
       vehicle.peopleId = prop.vehicleData.peopleId || '';
-      vehicle.block = prop.vehicleData.block === 0 ? null  : prop.vehicleData.block || null;
+      vehicle.block = prop.vehicleData.block || null;
 
-      if(prop.type === "seasonpass"){
+      if (prop.type === "seasonpass") {
         showSubscriptionDateOptions.value = true;
       }
     }
   }, 300);
+
+  if (prop.mode === 'add' && prop.type !== 'blocklist') {
+    // For add mode, we want to check for matching people records if the type is not blocklist, as blocklist records are typically not linked to people records.
+    prefillingRecords.value = true;
+    vehicle.block = prop.vehicleData?.block?._id ? prop.vehicleData?.block?._id : '';
+    vehicle.level = prop.vehicleData?.level?._id ? prop.vehicleData?.level?._id : '';
+    vehicle.unit = prop.vehicleData?.unit?._id ? prop.vehicleData?.unit?._id : '';
+  }
+
+  nextTick(() => {
+    prefillingRecords.value = false;
+  })
 })
 
 

package/components/VehicleManagement.vue

@@ -170,9 +170,9 @@ const headers = [
   { title: "Name", value: "name" },
   { title: "Vehicle Numbers", value: "plates" },
   { title: "NRIC", value: "nric" },
-  { title: "Block", value: "block" },
-  { title: "Floor", value: "level" },
-  { title: "Unit", value: "unitName" },
+  { title: "Block", value: "block.name" },
+  { title: "Floor", value: "level.name" },
+  { title: "Unit", value: "unit.name" },
   { title: "Category", value: "category" },
   // { title: "Type", value: "type" },
   // { title: "Status", value: "status" },
@@ -247,7 +247,7 @@ const formattedFields: Partial<Record<keyof TVehicle, string>> = {
   nric: "NRIC",
   block: "Block",
   level: "Level",
-  unitName: "Unit",
+  unit: "Unit",
   start: "Start",
   end: "End",
   category: "Category",
@@ -259,6 +259,12 @@ const formattedFields: Partial<Record<keyof TVehicle, string>> = {
 function formatValues(key: string, value: any) {
   if (!value) return ""
   switch (key) {
+    case "unit":
+      return value.name || "";
+    case "level":
+      return value.name || "";
+    case "block":
+      return value.name || "";
     case "start":
       return formatDate(value)
     case "end":

package/components/VisitorForm.vue

@@ -152,27 +152,27 @@
 
           <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" item-title="title"
-              :loading="blockStatus === 'pending'" @update:model-value="handleChangeBlock" density="comfortable"
+            <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"
               :rules="[requiredRule]" />
           </v-col>
 
           <v-col v-if="shouldShowField('level')" cols="12">
             <InputLabel class="text-capitalize" title="Level" required />
-            <v-autocomplete v-model="visitor.level" :items="levelsArray" density="comfortable" :disabled="!visitor.block"
-              :loading="levelsStatus === 'pending'" @update:model-value="handleChangeLevel" :rules="[requiredRule]" />
+            <v-autocomplete v-model="visitor.level" :items="levelsArray"  density="comfortable" autocomplete="off"
+              :disabled="!visitor.block" :key="levelListDataPending ? '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 />
-            <v-autocomplete v-model="visitor.unit" :items="unitsArray" density="comfortable" item-title="title"
-              item-value="value" :disabled="!visitor.level" :loading="unitsStatus === 'pending'" :rules="[requiredRule]"
+            <v-autocomplete v-model="visitor.unit" :items="unitsArray" density="comfortable" autocomplete="off" item-title="title"
+              item-value="value" :disabled="!visitor.level" :key="unitListDataPending ? 'unit-list-pending' : 'unit-list-ready'" :loading="unitsDataPending" :rules="[requiredRule]"
               @update:model-value="handleUpdateUnit" />
           </v-col>
 
           <v-col v-if="shouldShowField('unit')" cols="12">
-            <InputLabel class="text-capitalize" title="Registered Unit Company Name" required :key="'unit-key' + visitor.level" />
+            <InputLabel class="text-capitalize" title="Registered Unit Company Name" required
+              :key="'unit-key' + visitor.level" />
             <v-text-field v-model.trim="registeredUnitCompanyName" density="comfortable"
               :loading="buildingUnitDataPending" readonly class="no-pointer" />
           </v-col>
@@ -315,7 +315,8 @@ const currentAutofillSource = ref<AutofillSource>(null);
 
 
 const { requiredRule, debounce, UTCToLocalTIme } = useUtils();
-const { getSiteById, getSiteLevels, getSiteUnits } = useSiteSettings();
+const { getSiteById } = useSiteSettings();
+const { getBlocksSelection, getLevelsSelection, getUnitSelection } = useBuilding();
 const { createVisitor, typeFieldMap, contractorTypes, getVisitors, updateVisitor } = useVisitor();
 const { getBySiteId: getEntryPassSettingsBySiteId } = useSiteEntryPassSettings();
 const { createVisitorPass, signQr } = useAccessManagement();
@@ -683,78 +684,101 @@ const {
 const {
   data: siteData,
   refresh: refreshSiteData,
-  status: blockStatus,
+  status: siteStatus,
   pending: siteDataPending,
-} = useLazyAsyncData(`fetch-site-data-${prop.site}`, () =>
+} = useLazyAsyncData(`visitor-fetch-site-data-${prop.site}`, () =>
   getSiteById(prop.site)
 );
 
+
+const {
+  data: blocksListData,
+  refresh: refreshBlockListData,
+  status: blocksListStatus,
+  pending: blockListDataPending,
+} = useLazyAsyncData(`visitor-fetch-block-list-data-${prop.site}`, () =>
+  getBlocksSelection({ siteId: prop.site }), {watch: [() => prop.site], deep: true }
+);
+
+
+
 const {
   data: levelsData,
   refresh: refreshLevelsData,
   status: levelsStatus,
+  pending: levelsDataPending,
 } = useLazyAsyncData(
-  `fetch-levels-data-${prop.site}-${visitor.block}`,
+  `visitor-fetch-levels-data-${prop.site}-${visitor.block}`,
   async () => {
     if (!visitor.block) return Promise.resolve(null);
-    return await getSiteLevels(prop.site, { block: Number(visitor.block) });
-  }, { watch: [() => visitor.block] }
+    // return await getSiteWithLevels(prop.site, { block: Number(visitor.block) });
+    return await getLevelsSelection({ siteId: prop.site, blockId: visitor.block });
+  }, { watch: [() => visitor.block], deep: true }
 );
 
 const {
   data: unitsData,
   refresh: refreshUnitsData,
   status: unitsStatus,
+  pending: unitsDataPending,
 } = useLazyAsyncData(
-  `fetch-units-data-${prop.site}-${visitor.level}`,
+  `visitor-fetch-units-data-${prop.site}-${visitor.level}`,
   async () => {
     if (!visitor.level) return Promise.resolve(null);
-    return await getSiteUnits(prop.site, Number(visitor.block), visitor.level);
-  }, { watch: [() => visitor.level] }
+    return await getUnitSelection({ siteId: prop.site, block: visitor.block, level: visitor.level });
+  },{ watch: [() => visitor.level], deep: true }
 );
 
+
 watch(
   siteData,
   (newVal) => {
     const siteDataValue = newVal as TSite;
     if (siteDataValue) {
-      const numberOfBlocks = siteDataValue.metadata?.block || 0;
-      for (let i = 1; i <= numberOfBlocks; i++) {
-        blocksArray.value.push({
-          title: `Block ${i}`,
-          value: i,
-        });
-      }
 
       deliveryCompanyList.value = Array.isArray(siteDataValue?.deliveryCompanyList) ? siteDataValue.deliveryCompanyList : [];
 
-    } else {
-      blocksArray.value = [];
-    }
+    } 
   },
   { immediate: true }
 );
 
 watch(
-  levelsData,
-  (newVal: any) => {
-    if (newVal) {
-      const arr = newVal.levels || [];
-      levelsArray.value = arr?.map((level: any) => ({
-        title: level,
-        value: level,
-      }));
-    } else {
-      levelsArray.value = [];
+  [blocksListData],
+  () => {
+    if (blocksListStatus.value === 'pending') {
+      blocksArray.value = [];
+      return;
     }
+
+    const arr = Array.isArray(blocksListData.value?.data) ? blocksListData.value?.data : [];
+    blocksArray.value = arr.map((block: any) => ({
+      title: block.name,
+      value: block._id,
+    }));
   },
-  { immediate: true }
-);
+  { immediate: true, deep: true }
+)
+
+
+watch([levelsData], () => {
+  if (levelsStatus.value === 'pending') {
+    levelsArray.value = [];
+    return;
+  }
+
+  const arr = Array.isArray(levelsData.value?.data) ? levelsData.value?.data : [];
+  const mappedLevels = arr.map((level: any) => ({
+    title: level.name,
+    value: level._id,
+  }));
+  levelsArray.value = mappedLevels;
+}, { immediate: true,  deep: true})
 
 watch(
   unitsData,
   (newVal: any) => {
-    if (!newVal) {
+    if (!newVal || !Array.isArray(newVal)) {
       unitsArray.value = []
       return
     }
@@ -777,7 +801,7 @@ watch(
 
     unitsArray.value = mapped
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 
 
@@ -925,7 +949,7 @@ async function submit() {
   }
 
   // add register status when registering unregistered visitor
-  if (prop.mode === 'register'){
+  if (prop.mode === 'register') {
     payload.status = "registered"
   }
 

package/components/VisitorManagement.vue

@@ -96,7 +96,7 @@
             formatLocation({
               block: item.block,
               level: item.level,
-              unit: item.unitName,
+              unit: item.unit,
             })
           }}</span>
         </span>
@@ -852,7 +852,7 @@ const formattedFields = {
   company: "Company",
   block: "Block",
   level: "Level",
-  unitName: "Unit",
+  unit: "Unit",
   checkIn: "Check In",
   snapshotEntryImage: "Entry Image",
   checkOut: "Check Out",
@@ -973,10 +973,10 @@ const selectedVisitorObject = computed<Record<string, any>>(() => {
 
   let locationString = "N/A";
 
-  if (obj?.block || obj?.level || obj?.unitName) {
-    locationString = `${obj.block} / ${obj.level} / ${obj.unitName}`;
-  } else if (obj?.block) {
-    locationString = obj.block;
+  if (obj?.block?.name || obj?.level?.name || obj?.unitName) {
+    locationString = `${obj.block?.name} / ${obj.level?.name} / ${obj.unitName}`;
+  } else if (obj?.block?.name) {
+    locationString = obj.block?.name;
   } else {
     locationString = "N/A";
   }
@@ -994,6 +994,10 @@ function formatValues(key: string, value: any) {
   switch (key) {
     case "unit":
       return value?.name;
+    case "block":
+      return value?.name;
+    case "level":
+      return value?.name;
     case "checkIn":
       return formatDate(value);
     case "checkOut":

package/composables/useBuilding.ts

@@ -206,7 +206,7 @@ export default function useBuilding() {
     });
   }
 
-  function createBuilding(data: TBuilding) {
+  function createBuilding(data: TBuildingPayload) {
     return useNuxtApp().$api("/api/buildings", {
       method: "POST",
       body: data,
@@ -222,7 +222,7 @@ export default function useBuilding() {
 
   function updateById(
     id: string,
-    data: Pick<TBuilding, "name" | "block" | "levels" | "buildingFloorPlan">
+    data: TBuildingUpdatePayload
   ) {
     return useNuxtApp().$api(`/api/buildings/id/${id}`, {
       method: "PATCH",
@@ -236,6 +236,32 @@ export default function useBuilding() {
     });
   }
 
+
+  function getBlocksSelection({siteId} : { siteId: string; }) {
+    return useNuxtApp().$api(`/api/buildings/list/site/${siteId}`, {
+      method: "GET",
+    });
+  }
+
+  function getLevelsSelection({siteId, blockId} : { siteId: string; blockId: string }) {
+    return useNuxtApp().$api(`/api/building-levels/list/site/${siteId}`, {
+      method: "GET",
+      query: {
+        block: blockId
+      }
+    });
+  }
+
+  async function getUnitSelection({siteId, block, level} : { siteId: string; block: string; level: string }) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/building-units/site/${siteId}/block/${block}/level/${level}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+
+
   return {
     categories,
     types,
@@ -246,5 +272,8 @@ export default function useBuilding() {
     updateBuildingField,
     deleteById,
     updateById,
-  };
+    getBlocksSelection,
+    getLevelsSelection,
+    getUnitSelection
+  }
 }

package/composables/useBuildingLevel.ts

@@ -0,0 +1,31 @@
+export default function useBuildingLevel() {
+
+
+  function batchUpdateLevels(levels: { _id: string; name: string }[]) {
+
+    const formattedPayloadLevels = levels.map(level => ({
+      _id: level._id,
+      value: {
+        name: level.name
+      }
+    }));
+
+    return useNuxtApp().$api(`/api/building-levels/batch`, {
+      method: "PATCH",
+      body: 
+        [...formattedPayloadLevels]
+    });
+  }
+
+  function deleteById(id: string) {
+    return useNuxtApp().$api(`/api/building-levels/${id}`, {
+      method: "PUT",
+    });
+  }
+
+
+  return {
+    deleteById,
+    batchUpdateLevels
+  };
+}

package/composables/useSecurityUtils.ts

@@ -3,9 +3,9 @@ export default function(){
     const formatLocation = ({block, level, unit}: {block: number, level: string, unit: string | TBuildingUnit}) => {
     const parts = [];
 
-    if (block) parts.push(`Block ${block}`);
-    if (level) parts.push(level);
-    if (unit) parts.push(unit);
+    if (block?.name) parts.push(`${block.name}`);
+    if (level?.name) parts.push(`${level.name}`);
+    if (unit?.name) parts.push(unit?.name);
 
     return parts.join(" / ");
     };

package/package.json

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

package/types/building.d.ts

@@ -3,7 +3,7 @@ declare type TBuilding = {
   site: string;
   name: string;
   block: number | null;
-  levels: string[];
+  levels: { _id: string; name: string }[];
   buildingFiles: { id: string, name: string }[] | string[];
 };
 
@@ -16,7 +16,7 @@ declare type TBuildingUnit = {
   building: string;
   buildingName?: string;
   block: number | null;
-  level: string | null;
+  level: { _id: string; name: string } | null;
   category: string;
   status: string;
   buildingUnitFiles: string[];
@@ -25,3 +25,15 @@ declare type TBuildingUnit = {
   leaseStart: string;
   leaseEnd: string;
 };
+
+
+declare type TBuildingPayload = Pick<TBuilding, "site" | "name" | "block" | "buildingFiles"> & {
+  levels: string[];
+};
+
+
+declare type TBuildingUpdatePayload = Pick<TBuilding, "name" | "buildingFiles"> & {
+  levels: string[];
+};
+
+declare type TBuildingUnitPayload = Pick<TBuildingUnit, "site" | "name" | "building" | "buildingName" | "block" | "category" | "status" | "buildingUnitFiles" | "companyName" | "companyRegistrationNumber" | "leaseStart" | "leaseEnd"> & { level?: string}

package/types/vehicle.d.ts

@@ -6,8 +6,14 @@ declare type TVehicle = {
   direction: "entry" | "exit" | "both" | "none";
   name: string;
   phoneNumber?: string;
-  block: number | "";
-  level: string;
+  block: { 
+    _id: string;
+    name: string;
+  }
+  level: {
+    _id: string;
+    name: string;
+  }
   unit: string;
   unitName?: string; // For display purposes, the API will return the unit name if available
   nric?: string | null;
@@ -33,8 +39,6 @@ declare type TVehiclePayload = Pick<
   | "direction"
   | "name"
   | "phoneNumber"
-  | "block"
-  | "level"
   | "unit"
   | "nric"
   | "remarks"
@@ -44,4 +48,4 @@ declare type TVehiclePayload = Pick<
   | "site"
   | "org"
   | "peopleId"
-> & { plateNumber?: string | string[] };
+> & { plateNumber?: string | string[], block?: string, level?: string };