@7365admin1/layer-common 1.11.12 → 1.11.13

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.13
+
+### Patch Changes
+
+- 9c88e03: Update Vehicle Management Changes
+
 ## 1.11.12
 
 ### Patch Changes

package/components/VehicleForm.vue

@@ -54,7 +54,7 @@
 
           <v-col v-if="shouldShowField('nric')" cols="12">
             <InputLabel class="text-capitalize" title="NRIC" required />
-            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]" :disabled="disablePrefilledInputs" />
+            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]" :disabled="disablePrefilledInputs && type !== 'blocklist'" />
           </v-col>
 
           <v-col v-if="shouldShowField('name')" cols="12">
@@ -184,7 +184,7 @@
     </v-toolbar>
 
     <v-dialog v-model="showMatchingPeopleDialog" max-width="700" persistent>
-      <v-card :loading="checkingNRIC">
+      <v-card :loading="checkingUnit">
         <v-toolbar>
           <v-toolbar-title>
             <v-row no-gutters class="d-flex align-center justify-space-between">
@@ -192,14 +192,14 @@
                 Matching Records for "{{ searchUnitName ?? "-" }}"
               </span>
               <span>
-                <v-btn v-if="matchingPeople.length === 0" icon="mdi-close" variant="text"
-                  @click="showMatchingPeopleDialog = false" />
+                <v-btn icon="mdi-close" variant="text"
+                  @click="handleCloseMatchDialog" />
               </span>
             </v-row>
           </v-toolbar-title>
         </v-toolbar>
 
-        <v-card-text>
+        <v-card-text max-height="400" style="overflow-y: auto">
 
           <v-list lines="three">
             <v-list-item v-if="matchingPeople.length > 0 || checkingUnit" v-for="v in matchingPeople" :key="v._id"
@@ -743,6 +743,13 @@ const resetVehicleDetails = () => {
 }
 
 
+function handleCloseMatchDialog() {
+  showMatchingPeopleDialog.value = false;
+  if(matchingPeople.value.length > 0) {
+    vehicle.unit = null
+  }
+}
+
 
 
 

package/components/VehicleManagement.vue

@@ -89,17 +89,18 @@
       </DialogUpdateMoreAction>
     </v-dialog>
     <v-dialog v-model="dialog.deleteVehicle" persistent width="540">
-      <DialogDeleteConfirmation :message="message" :loading="deletingVehicle"   :prompt-title="`Are you sure want to delete this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
+      <DialogDeleteConfirmation :loading="deletingVehicle"   :prompt-title="`Are you sure want to delete this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
         @delete="submitDelete" @close="closeDeleteDialog" />
     </v-dialog>
     <v-dialog v-model="dialog.approveVehicle" persistent width="540">
-      <DialogReusablePrompt :message="message" :loading="approvingVehicle" :prompt-title="`Are you sure want to approve this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
+      <DialogReusablePrompt :loading="approvingVehicle" :prompt-title="`Are you sure want to approve this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
         @approve="submitApprove" @close="dialog.approveVehicle = false"  />
     </v-dialog>
     <v-dialog v-model="dialog.restoreVehicle" persistent width="540">
-      <DialogReusablePrompt :message="message" :loading="restoringVehicle" :prompt-title="`Are you sure want to restore this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
-        @approve="submitRestore" @close="dialog.restoreVehicle = false"  />
+      <DialogReusablePrompt :loading="restoringVehicle" :prompt-title="`Are you sure want to restore this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
+        @proceed="submitRestore" @close="dialog.restoreVehicle = false"  />
     </v-dialog>
+    <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-row>
 </template>
 
@@ -199,7 +200,7 @@ const formattedFields: Partial<Record<keyof TVehicle, string>> = {
   nric: "NRIC",
   block: "Block",
   level: "Level",
-  unit: "Unit",
+  unitName: "Unit",
   start: "Start",
   end: "End",
   category: "Category",
@@ -365,7 +366,10 @@ async function submitDelete() {
 
 async function submitRestore() {
 
+  console.log("Submitting restore for plate number ID:", selectedPlateNumberObject.value);
   const plateNumberId = selectedPlateNumberObject.value?._id;
+
+
   if (!plateNumberId) {
     showMessage("Invalid plate number selected for restoration.", "error");
     return;
@@ -382,7 +386,9 @@ async function submitRestore() {
     getVehiclesRefresh();
   } catch (error: any) {
     console.error("Error restoring vehicle:", error);
-    message.value = error.response._data.message;
+    const errMessage = error?.response?._data?.message || "Failed to restore vehicle";
+    showMessage(errMessage, "error");
+    // message.value = error.response._data.message;
   } finally {
     restoringVehicle.value = false;
   }
@@ -408,7 +414,8 @@ async function submitApprove() {
     getVehiclesRefresh();
   } catch (error: any) {
     console.error("Error approving vehicle:", error);
-    message.value = error.response._data.message;
+    const errMessage = error?.response?._data?.message || "Failed to approve vehicle";
+    showMessage(errMessage, "error");
   } finally {
     approvingVehicle.value = false;
   }

package/composables/useVehicle.ts

@@ -75,7 +75,7 @@ export default function useVehicle() {
 
   async function approveVehicle({ site, org, id }: { site: string, org: string, id: string}){
     return await useNuxtApp().$api<Record<string, any>>(
-      `/api/vehicles/approve/ ${id}`,
+      `/api/vehicles/approve/${id}`,
       {
         method: "PUT",
         body: {

package/package.json

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