@7365admin1/layer-common 1.11.48 → 1.11.50

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.50
+
+### Patch Changes
+
+- 92473a5: update useRole and useOrg
+
+## 1.11.49
+
+### Patch Changes
+
+- ef80e57: add get member with user and org
+
 ## 1.11.48
 
 ### Patch Changes

package/components/CameraForm.vue

@@ -177,16 +177,16 @@ const hostRule = computed(() => {
   return (v: string | any) => {
     if (!v) return true;
 
-    const isAnpr = prop.type === 'anpr';
-    
+    const isAnpr = prop.type === "anpr";
+
     const anprRegex = /^http:\/\/[a-z0-9.-]+\.[a-z]{2,}(:\d+)?$/i;
     const defaultRegex = /^https:\/\/[a-z0-9.-]+\.[a-z]{2,}\/[a-z0-9._-]+$/i;
 
     if (isAnpr) {
-      return anprRegex.test(v) || 'Format: http://domain:port';
+      return anprRegex.test(v) || "Format: http://domain:port";
     }
-    
-    return defaultRegex.test(v) || 'Format: https://domain/path';
+
+    return defaultRegex.test(v) || "Format: https://domain/path";
   };
 });
 
@@ -211,8 +211,18 @@ if (prop.mode === "edit") {
 console.log("prop.camera", prop?.camera);
 camera.value.site = prop.site;
 camera.value.type = prop.type;
-camera.value.category = prop.camera?.category && prop.title == "Edit Camera" ? prop.camera?.category : prop.type == "anpr" ? "resident" : "standard";
-camera.value.direction = prop.camera?.direction && prop.title == "Edit Camera" ? prop.camera?.direction : prop.type == "anpr" ? "both" : "none";
+camera.value.category =
+  prop.camera?.category && prop.title == "Edit Camera"
+    ? prop.camera?.category
+    : prop.type == "anpr"
+    ? "resident"
+    : "standard";
+camera.value.direction =
+  prop.camera?.direction && prop.title == "Edit Camera"
+    ? prop.camera?.direction
+    : prop.type == "anpr"
+    ? "both"
+    : "none";
 
 const validForm = ref(false);
 const formRef = ref<HTMLFormElement | null>(null);
@@ -289,6 +299,10 @@ async function submit() {
 
     emit("success", `${prop.title} added successfully!`);
   } catch (error: any) {
+    console.log(
+      "error",
+      error.response?._data?.message || "Failed to add camera"
+    );
     emit("error", error.response?._data?.message || "Failed to add camera");
   } finally {
     disable.value = false;

package/components/CameraMain.vue

@@ -11,7 +11,7 @@
 
           <template #append>
             <v-btn
-             v-if="!prop.readOnly"
+              v-if="!prop.readOnly"
               variant="flat"
               color="primary"
               class="text-none"
@@ -61,6 +61,7 @@
         :type="prop.type"
         @cancel="dialogAdd = false"
         @success="handleSuccess"
+        @error="handleError"
       />
     </v-dialog>
 
@@ -72,6 +73,7 @@
         :type="prop.type"
         @cancel="dialogEdit = false"
         @success="handleSuccess"
+        @error="handleError"
         mode="edit"
         :camera="camera"
       />
@@ -200,6 +202,13 @@
       </v-card>
     </v-dialog>
 
+    <Snackbar
+      v-model="messageSnackbar"
+      :text="message"
+      :color="messageColor"
+      style="z-index: 3000"
+    />
+
     <v-dialog v-model="dialogDelete" persistent width="540">
       <v-card width="100%">
         <v-card-text
@@ -319,6 +328,16 @@ const dialogEdit = ref(false);
 const dialogPreview = ref(false);
 const dialogDelete = ref(false);
 
+const messageSnackbar = ref(false);
+const message = ref("");
+const messageColor = ref<"success" | "error" | "info">();
+
+function showMessage(text: string, type: "success" | "error" | "info") {
+  messageSnackbar.value = true;
+  message.value = text;
+  messageColor.value = type;
+}
+
 function openDialogEdit() {
   dialogEdit.value = true;
 
@@ -331,6 +350,11 @@ function openDialogDelete() {
   if (dialogPreview.value) dialogPreview.value = false;
 }
 
+function handleError(msg: string) {
+  const text = prop.type === "ip" ? "CCTV camera already exist" : msg;
+  showMessage(text, "error");
+}
+
 function handleSuccess() {
   if (dialogAdd.value) dialogAdd.value = false;
 
@@ -366,8 +390,11 @@ async function submitDelete() {
     await deleteSiteCameraById(camera.value._id ?? "");
     await getCameraRefresh();
     dialogDelete.value = false;
-  } catch (error) {
-    console.error("Error deleting camera:", error);
+  } catch (error: any) {
+    showMessage(
+      error?.response?._data?.message || "Failed to delete camera.",
+      "error"
+    );
   }
 }
 </script>

package/components/EntryPassMain.vue

@@ -217,6 +217,46 @@
 
         <v-divider thickness="1"></v-divider>
 
+        <div class="d-flex w-100 mt-7 pb-10">
+          <p class="font-weight-medium flex-grow-1">
+            QR Code Validity
+            <span class="d-block text-caption text-grey-darken-1 mt-1">
+              Set how long a generated QR code remains valid before it expires.
+            </span>
+            <v-col cols="12" class="pr-0 mt-3">
+              <v-row no-gutters>
+                <v-col cols="12" md="4" class="mb-5">
+                  <v-text-field
+                    label="Validity (minutes)"
+                    placeholder="e.g. 30"
+                    hide-details
+                    density="comfortable"
+                    clearable
+                    type="number"
+                    min="1"
+                    v-model.number="currentEntryPassSettings.qrCodeValidityMinutes"
+                  ></v-text-field>
+                </v-col>
+              </v-row>
+              <v-row>
+                <v-col cols="12" md="3">
+                  <v-btn
+                    color="primary"
+                    variant="flat"
+                    prepend-icon="mdi-timer-outline"
+                    block
+                    @click="saveQrCodeValidity()"
+                  >
+                    Save
+                  </v-btn>
+                </v-col>
+              </v-row>
+            </v-col>
+          </p>
+        </div>
+
+        <v-divider thickness="1"></v-divider>
+
         <div class="d-flex w-100 mt-7 pb-10">
           <p class="font-weight-medium flex-grow-1">
             Resident-app Disclaimer Message
@@ -326,6 +366,7 @@ const currentEntryPassSettings = ref<Record<string, any>>({
   qrCodeTemplateHeader: "",
   qrCodeTemplateHeaderSubText: "",
   qrCodeTemplateDate: "",
+  qrCodeValidityMinutes: null,
   disclaimerMessage: "",
   url: "",
   template: { id: "", name: "" },
@@ -489,6 +530,7 @@ watchEffect(() => {
       qrCodeTemplateHeader: data.settings?.qrTemplate?.header ?? "",
       qrCodeTemplateHeaderSubText: data.settings?.qrTemplate?.subText ?? "",
       qrCodeTemplateDate: data.settings?.qrTemplate?.date ?? "",
+      qrCodeValidityMinutes: data.settings?.validityMinutes ?? null,
       url: data.settings?.url ?? "",
       template: data.settings?.template ?? { id: "", name: "" },
       createdAt: data.createdAt ?? "",
@@ -518,6 +560,7 @@ function buildPayload() {
         subText: currentEntryPassSettings.value.qrCodeTemplateHeaderSubText,
         date: currentEntryPassSettings.value.qrCodeTemplateDate || null,
       },
+      validityMinutes: currentEntryPassSettings.value.qrCodeValidityMinutes || null,
       url: currentEntryPassSettings.value.url,
       template: currentEntryPassSettings.value.template?.id
         ? currentEntryPassSettings.value.template
@@ -550,6 +593,12 @@ async function saveQrCodeTemplate() {
   getSiteEntryPassSettings();
 }
 
+async function saveQrCodeValidity() {
+  await _save(buildPayload());
+  showMessage("Entry Pass Settings updated successfully!", "success");
+  getSiteEntryPassSettings();
+}
+
 async function saveResidentAppDisclaimerMsg() {
   await _save(buildPayload());
   showMessage("Entry Pass Settings updated successfully!", "success");

package/components/Input/DatePicker.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="d-flex flex-column">
         <v-text-field v-bind="$attrs" ref="datePickerRef" :model-value="dateFormattedReadOnly" autocomplete="off"
-            :placeholder="placeholder" :rules="rules" style="z-index: 10" @click="openDatePicker">
+            :placeholder="placeholder" :rules="rules" style="z-index: 10" @click="openDatePicker" @click:clear.stop="clearDate">
             <template #append-inner>
                 <v-icon icon="mdi-calendar" @click.stop="openDatePicker" />
             </template>
         </v-text-field>
         <div class="w-100 d-flex align-end ga-3 hidden-input">
-            <input ref="dateInput" type="date" v-model="date" />
+            <input ref="dateInput" type="date" v-model="date" :min="min" />
         </div>
     </div>
 </template>
@@ -22,6 +22,10 @@ const prop = defineProps({
     placeholder: {
         type: String,
         default: 'DD/MM/YYYY'
+    },
+    min: {
+        type: String,
+        default: undefined
     }
 })
 
@@ -34,6 +38,11 @@ const datePickerRef = ref<HTMLInputElement | null>(null)
 
 const isInitialLoad = ref(true)
 
+function clearDate() {
+    date.value = null
+    dateFormattedReadOnly.value = null
+}
+
 function openDatePicker() {
     setTimeout(() => {
         dateInput.value?.showPicker?.()

package/components/SiteSettings.vue

@@ -14,36 +14,73 @@
               <v-row>
                 <!-- Cover Photo + Preview -->
                 <v-col cols="12" lg="5" class="pt-0">
-                  <InputLabel title="Cover Photo (displayed in resident app)" class="d-block mb-2" />
-                  <InputFileV2 v-model="coverPhoto" accept="image/*" title="Upload cover photo" :height="120" />
+                  <InputLabel
+                    title="Cover Photo (displayed in resident app)"
+                    class="d-block mb-2"
+                  />
+                  <InputFileV2
+                    v-model="coverPhoto"
+                    accept="image/*"
+                    title="Upload cover photo"
+                    :height="120"
+                  />
                 </v-col>
                 <v-col cols="12" lg="7" class="pl-lg-4 pt-4 pt-lg-0">
                   <InputLabel title="Preview" class="d-block mb-2" />
-                  <v-img v-if="coverPhotoUrl" :src="coverPhotoUrl" aspect-ratio="16/9" cover rounded="lg"
-                    class="w-100 border" />
-                  <div v-else
+                  <v-img
+                    v-if="coverPhotoUrl"
+                    :src="coverPhotoUrl"
+                    aspect-ratio="16/9"
+                    cover
+                    rounded="lg"
+                    class="w-100 border"
+                  />
+                  <div
+                    v-else
                     class="w-100 d-flex align-center justify-center rounded-lg bg-grey-lighten-4 border border-dashed"
-                    style="aspect-ratio: 16/9">
-                    <span class="text-caption text-medium-emphasis">No cover photo uploaded</span>
+                    style="aspect-ratio: 16/9"
+                  >
+                    <span class="text-caption text-medium-emphasis"
+                      >No cover photo uploaded</span
+                    >
                   </div>
                 </v-col>
 
                 <!-- Description + Site Documents -->
                 <v-col cols="12" lg="6" class="mt-2">
                   <InputLabel title="Description" class="d-block mb-1" />
-                  <v-textarea v-model="description" variant="outlined" density="compact" rows="4" hide-details no-resize
-                    style="height: 119px" />
+                  <v-textarea
+                    v-model="description"
+                    variant="outlined"
+                    density="compact"
+                    rows="4"
+                    hide-details
+                    no-resize
+                    style="height: 119px"
+                  />
                 </v-col>
                 <v-col cols="12" lg="6" class="mt-2 pl-lg-2">
                   <InputLabel title="Site Documents" class="d-block mb-1" />
-                  <InputFileV2 v-model="siteDocuments" :multiple="true" accept="*/*" title="Upload documents"
-                    :height="104" />
+                  <InputFileV2
+                    v-model="siteDocuments"
+                    :multiple="true"
+                    accept="*/*"
+                    title="Upload documents"
+                    :height="104"
+                  />
                 </v-col>
 
                 <!-- Submit -->
                 <v-col cols="12" class="pt-0 d-flex justify-end">
-                  <v-btn color="primary-button" class="text-none" size="large" variant="flat" text="Save"
-                    :loading="savingSiteInfo" @click="saveSiteInfo" />
+                  <v-btn
+                    color="primary-button"
+                    class="text-none"
+                    size="large"
+                    variant="flat"
+                    text="Save"
+                    :loading="savingSiteInfo"
+                    @click="saveSiteInfo"
+                  />
                 </v-col>
 
                 <!-- Divider -->
@@ -54,8 +91,14 @@
                 <v-col cols="12">
                   <v-row no-gutters>
                     <v-col cols="12" lg="4" class="mt-2">
-                      <NumberSettingField v-model="blocks" title="No. of blocks" type="blocks" :site-id="siteId"
-                        :disabled="existingBlockNumber === blocks" @success="refreshSiteData" />
+                      <NumberSettingField
+                        v-model="blocks"
+                        title="No. of blocks"
+                        type="blocks"
+                        :site-id="siteId"
+                        :disabled="existingBlockNumber === blocks"
+                        @success="refreshSiteData"
+                      />
                     </v-col>
                   </v-row>
                 </v-col>
@@ -63,9 +106,14 @@
                 <v-col cols="12">
                   <v-row no-gutters>
                     <v-col cols="12" lg="4" class="mt-2">
-                      <NumberSettingField v-model="guardPosts" title="No. of guard posts" type="guard_posts"
-                        :site-id="siteId" :disabled="existingGuardPostNumber === guardPosts"
-                        @success="refreshSiteData" />
+                      <NumberSettingField
+                        v-model="guardPosts"
+                        title="No. of guard posts"
+                        type="guard_posts"
+                        :site-id="siteId"
+                        :disabled="existingGuardPostNumber === guardPosts"
+                        @success="refreshSiteData"
+                      />
                     </v-col>
                   </v-row>
                 </v-col>
@@ -94,7 +142,7 @@
                   hide-details
                 ></v-switch>
               </v-col>
-              
+
               <v-col cols="6">
                 <v-switch
                   v-model="ANPRSwitches.openBarrierPickUpDropOff"
@@ -133,8 +181,11 @@
 
           <v-divider class="my-4"></v-divider>
 
-          <CameraMain :site="siteId" :read-only="!canManageSiteSettings"
-            :guard-posts="siteData?.metadata?.guardPosts" />
+          <CameraMain
+            :site="siteId"
+            :read-only="!canManageSiteSettings"
+            :guard-posts="siteData?.metadata?.guardPosts"
+          />
         </v-expansion-panel-text>
       </v-expansion-panel>
 
@@ -146,7 +197,11 @@
         </v-expansion-panel-title>
 
         <v-expansion-panel-text>
-          <CameraMain :site="siteId" type="ip" :read-only="!canManageSiteSettings" />
+          <CameraMain
+            :site="siteId"
+            type="ip"
+            :read-only="!canManageSiteSettings"
+          />
         </v-expansion-panel-text>
       </v-expansion-panel>
 
@@ -157,15 +212,39 @@
         </v-expansion-panel-title>
 
         <v-expansion-panel-text>
-          <v-text-field v-model="prefix" label="Prefix" :disabled="isLoading || !canManageSiteSettings"
-            @input="handleInput" />
-
-          <v-select v-model="noOfDigits" :items="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]" label="No. of Digits"
-            :disabled="isLoading || !canManageSiteSettings" />
+          <v-autocomplete
+            v-if="!props.service"
+            v-model="selectedServiceProvider"
+            :items="serviceProviders"
+            :loading="isFetchingServiceProviders"
+            :disabled="!canManageSiteSettings"
+            label="Select Service Provider"
+            @click="fetchServiceProvidersBySiteService"
+            class="mt-4"
+          />
+
+          <v-text-field
+            v-model="prefix"
+            label="Prefix"
+            :disabled="isLoading || !canManageSiteSettings"
+            @input="handleInput"
+          />
+
+          <v-select
+            v-model="noOfDigits"
+            :items="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"
+            label="No. of Digits"
+            :disabled="isLoading || !canManageSiteSettings"
+          />
 
           <v-text-field v-model="orderNumberPreview" label="Preview" readonly />
 
-          <v-btn v-if="canManageSiteSettings" class="mt-2" :loading="isLoading" @click="save">
+          <v-btn
+            v-if="canManageSiteSettings"
+            class="mt-2"
+            :loading="isLoading"
+            @click="save"
+          >
             Save
           </v-btn>
         </v-expansion-panel-text>
@@ -177,8 +256,13 @@
           Delivery Companies
         </v-expansion-panel-title>
         <v-expansion-panel-text class="">
-          <DeliveryCompany :site="siteId" v-model:initial="deliveryCompanies" @refresh-site="refreshSiteData"
-            @update:companiesValue="handleUpdateCompanies" :read-only="!canManageSiteSettings" />
+          <DeliveryCompany
+            :site="siteId"
+            v-model:initial="deliveryCompanies"
+            @refresh-site="refreshSiteData"
+            @update:companiesValue="handleUpdateCompanies"
+            :read-only="!canManageSiteSettings"
+          />
         </v-expansion-panel-text>
       </v-expansion-panel>
 
@@ -192,7 +276,11 @@
         </v-expansion-panel-text>
       </v-expansion-panel>
 
-      <slot name="panels" :can-manage="canManageSiteSettings" :site-id="siteId" />
+      <slot
+        name="panels"
+        :can-manage="canManageSiteSettings"
+        :site-id="siteId"
+      />
     </v-expansion-panels>
 
     <Snackbar v-model="toast.show" :text="toast.message" :color="toast.color" />
@@ -200,11 +288,11 @@
 </template>
 
 <script setup lang="ts">
-import useFile from '../composables/useFile';
-import useSiteSettings from '../composables/useSiteSettings';
-import useUtils from '../composables/useUtils';
-import useWorkOrder from '../composables/useWorkOrder';
-import useANPRSettings from '../composables/useANPRSettings';
+import useFile from "../composables/useFile";
+import useSiteSettings from "../composables/useSiteSettings";
+import useUtils from "../composables/useUtils";
+import useWorkOrder from "../composables/useWorkOrder";
+import useANPRSettings from "../composables/useANPRSettings";
 
 const props = defineProps({
   siteId: { type: String, required: true },
@@ -215,17 +303,17 @@ const props = defineProps({
   showWorkOrderSettings: { type: Boolean, default: false },
   showDeliveryCompanies: { type: Boolean, default: false },
   showResidentVisitors: { type: Boolean, default: false },
+  service: { type: String, default: false },
 });
 
-
 const openPanels = ref([]); // default open first
 
-const { getSiteById, updateSitebyId, updateSiteInformation } = useSiteSettings();
+const { getSiteById, updateSitebyId, updateSiteInformation } =
+  useSiteSettings();
 const { requiredRule } = useUtils();
 const { getFileUrl } = useFile();
 const { getWorkOrderSettings, createWorkOrderSettings } = useWorkOrder();
 
-
 const blocks = ref(0);
 const guardPosts = ref(0);
 const gracePeriod = ref(0);
@@ -251,9 +339,8 @@ const siteDocuments = ref<string[]>([]);
 const siteDocumentsNames = ref<Record<string, string>>({});
 const savingSiteInfo = ref<boolean>(false);
 
-
 const coverPhotoUrl = computed(() =>
-  coverPhoto.value.length > 0 ? getFileUrl(coverPhoto.value[0]) : "",
+  coverPhoto.value.length > 0 ? getFileUrl(coverPhoto.value[0]) : ""
 );
 
 const toast = reactive({
@@ -268,7 +355,6 @@ function showSnackbar(text: string, color = "success") {
   toast.show = true;
 }
 
-
 const { data: siteData, refresh: refreshSiteData } = await useLazyAsyncData(
   `site-${props.siteId}`,
   () => getSiteById(props.siteId)
@@ -285,7 +371,7 @@ watch(
       guardPosts.value = siteDataValue.metadata?.guardPosts || 0;
       existingGuardPostNumber.value = guardPosts.value;
       deliveryCompanies.value = Array.isArray(
-        siteDataValue?.deliveryCompanyList,
+        siteDataValue?.deliveryCompanyList
       )
         ? [...siteDataValue.deliveryCompanyList]
         : [];
@@ -305,7 +391,6 @@ watch(
   { immediate: true }
 );
 
-
 async function handleSaveGracePeriod() {
   gracePeriodLoading.value = true;
   try {
@@ -372,6 +457,7 @@ const { data: workOrderSetting } = await useLazyAsyncData(
 
 watchEffect(() => {
   if (workOrderSetting.value) {
+    selectedServiceProvider.value = workOrderSetting.value?.service;
     prefix.value = workOrderSetting.value?.prefix;
     noOfDigits.value = workOrderSetting.value?.noOfDigits;
   }
@@ -389,12 +475,52 @@ const orderNumberPreview = computed(() => {
   return `${prefix.value}${"0".repeat(noOfDigits.value - 1)}1`;
 });
 
+const route = useRoute();
+
+const message = ref("");
+const messageColor = ref("");
+const messageSnackbar = ref(false);
+
+function showMessage(msg: string, color: string) {
+  message.value = msg;
+  messageColor.value = color;
+  messageSnackbar.value = true;
+}
+
+const { getAll: getAllServiceProvider } = useServiceProvider();
+
+const serviceProviders = ref<TServiceProvider[]>([]);
+const isFetchingServiceProviders = ref(false);
+let selectedServiceProvider = ref<string>("");
+let providersArray = ref<string[]>([]);
+
+async function fetchServiceProvidersBySiteService() {
+  isFetchingServiceProviders.value = true;
+
+  try {
+    const response = await getAllServiceProvider({
+      siteId: route.params.site as string,
+      limit: 1000,
+    });
+
+    providersArray.value = [];
+    serviceProviders.value = response.items.map((i: any) => {
+      providersArray.value.push(i);
+      return i.name;
+    });
+  } catch (error: any) {
+    return showMessage(errorConverter(error), "error");
+  } finally {
+    isFetchingServiceProviders.value = false;
+  }
+}
+
 async function save() {
   try {
     isLoading.value = true;
     await createWorkOrderSettings({
       site: props.siteId,
-      service: "Security",
+      service: props.service || selectedServiceProvider.value,
       prefix: prefix.value,
       noOfDigits: noOfDigits.value,
     });
@@ -412,36 +538,32 @@ function show(message: string, color: string) {
   toast.color = color;
 }
 
-
 // ANPR Settings
-const {getANPRSettingBySite, createUpdateANPRSettings} = useANPRSettings();
-const isSaving = ref(false)
+const { getANPRSettingBySite, createUpdateANPRSettings } = useANPRSettings();
+const isSaving = ref(false);
 
 // Reactive object to hold the state of the 3 switches
 const ANPRSwitches = ref({
   enableUnregistered: false,
   openBarrierPickUpDropOff: false,
-  vehicleSnapshot: false
-})
+  vehicleSnapshot: false,
+});
 
-await useLazyAsyncData(
-  `anpr-settings-${props.siteId}`,
-  async () => {
-    const data = await getANPRSettingBySite({
-      site: props.siteId,
-      userType: "site",
-    });
-    console.log('data', data)
-    if(typeof data?.ANPRSwitches == "object"){
-      ANPRSwitches.value = data?.ANPRSwitches
-    }
+await useLazyAsyncData(`anpr-settings-${props.siteId}`, async () => {
+  const data = await getANPRSettingBySite({
+    site: props.siteId,
+    userType: "site",
+  });
+  console.log("data", data);
+  if (typeof data?.ANPRSwitches == "object") {
+    ANPRSwitches.value = data?.ANPRSwitches;
   }
-);
+});
 
 const saveANPRSettings = async () => {
   try {
-    isSaving.value = true
-    
+    isSaving.value = true;
+
     // Replace this with your actual API endpoint / store action
     // await $fetch(`/api/sites/${siteId.value}/camera-settings`, {
     //   method: 'POST',
@@ -453,14 +575,13 @@ const saveANPRSettings = async () => {
       updatedBy: props.createdBy,
       userType: "site",
     };
-     console.log('saveANPRSettings data:', data)
+    console.log("saveANPRSettings data:", data);
     await createUpdateANPRSettings(data);
     show("Saved successfully", "success");
   } catch (error) {
-    console.error('Failed to save settings:', error)
+    console.error("Failed to save settings:", error);
   } finally {
-    isSaving.value = false
+    isSaving.value = false;
   }
-}
-
+};
 </script>

package/components/VehicleForm.vue

@@ -34,19 +34,19 @@
 
           <v-col v-if="shouldShowField('block')" cols="12">
             <InputLabel class="text-capitalize" title="Block" required />
-            <v-select v-model="vehicle.block" :items="blocksArray" item-value="value" item-title="title"
+            <v-autocomplete v-model="vehicle.block" :items="blocksArray" 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-select v-model="vehicle.level" :items="levelsArray" density="comfortable" :disabled="!vehicle.block"
+            <v-autocomplete v-model="vehicle.level" :items="levelsArray" 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-select v-model="vehicle.unit" :items="unitsArray" density="comfortable" :disabled="!vehicle.level"
+            <v-autocomplete v-model="vehicle.unit" :items="unitsArray" density="comfortable" :disabled="!vehicle.level"
               :rules="[requiredRule]" />
           </v-col>
 

package/components/VisitorForm.vue

@@ -152,21 +152,21 @@
 
           <v-col v-if="shouldShowField('block')" cols="12">
             <InputLabel class="text-capitalize" title="Block" required />
-            <v-select v-model="visitor.block" :items="blocksArray" item-value="value" item-title="title"
+            <v-autocomplete v-model="visitor.block" :items="blocksArray" item-value="value" item-title="title"
               :loading="blockStatus === 'pending'" @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-select v-model="visitor.level" :items="levelsArray" density="comfortable" :disabled="!visitor.block"
+            <v-autocomplete v-model="visitor.level" :items="levelsArray" density="comfortable" :disabled="!visitor.block"
               :loading="levelsStatus === 'pending'" @update:model-value="handleChangeLevel" :rules="[requiredRule]" />
           </v-col>
 
 
           <v-col v-if="shouldShowField('unit')" cols="12">
             <InputLabel class="text-capitalize" title="Unit" required />
-            <v-select v-model="visitor.unit" :items="unitsArray" density="comfortable" item-title="title"
+            <v-autocomplete v-model="visitor.unit" :items="unitsArray" density="comfortable" item-title="title"
               item-value="value" :disabled="!visitor.level" :loading="unitsStatus === 'pending'" :rules="[requiredRule]"
               @update:model-value="handleUpdateUnit" />
           </v-col>
@@ -546,9 +546,9 @@ watch(fetchPersonByContactReq, (obj: Partial<TPerson>) => {
     if (!visitor.company) {
       visitor.company = companyNames.value?.[0]
     }
-    visitor.block = visitor.block ?? obj.block ?? ""
-    visitor.level = visitor.level ?? obj.level ?? ""
-    visitor.unit = visitor.unit ?? obj.unit ?? ""
+    // visitor.block = visitor.block ?? obj.block ?? ""
+    // visitor.level = visitor.level ?? obj.level ?? ""
+    // visitor.unit = visitor.unit ?? obj.unit ?? ""
     visitor.nric = visitor.nric ?? obj.nric ?? ""
 
     setTimeout(() => {

package/composables/useMember.ts

@@ -114,6 +114,7 @@ export default function useMember() {
       body: payload,
     })
   }
+  
   function updateMemberSite(
     id: string,
     siteId: string,
@@ -132,6 +133,20 @@ export default function useMember() {
     )
   }
 
+  function getByUserTypeOrg(
+    user: string,
+    type: string,
+    org: string
+  ) {
+    return useNuxtApp().$api<TMember>(
+      `/api/members/user/${user}/app/${type}/org`,
+      {
+        method: "GET",
+        query: { org },
+      }
+    );
+  }
+
   return {
     members,
     member,
@@ -149,6 +164,7 @@ export default function useMember() {
     updateMemberRole,
     createMemberDirect,
     updateMemberSite,
-    getAllByUserId
+    getAllByUserId,
+    getByUserTypeOrg
   };
 }

package/composables/useOrg.ts

@@ -80,6 +80,12 @@ export default function useOrg() {
     });
   }
 
+  function getOrgById(id = "") {
+    return useNuxtApp().$api<TOrg>(`/api/organizations/org/id/${id}`, {
+      method: "GET",
+    });
+  }
+
   const { currentUser } = useLocalAuth();
 
   const currentOrg = useState("currentOrg", () => "");
@@ -121,7 +127,7 @@ export default function useOrg() {
     value: Partial<Pick<TOrg, "name" | "type" | "email" | "nature" | "contact">>
   ) {
     return useNuxtApp()
-      .$api<Record<string, any>>("/api/organizations", {
+      .$api<Record<string, any>>("/api/organizations/onboarding", {
         method: "POST",
         body: value,
       })
@@ -131,6 +137,20 @@ export default function useOrg() {
         ) as TOrg;
       });
   }
+
+  function completeOnboarding(id: string) {
+    return useNuxtApp()
+      .$api<Record<string, any>>(
+        `/api/organizations/onboarding/complete/${id}`,
+        {
+          method: "POST",
+        }
+      )
+      .then((response: Record<string, any>) => {
+        return (response?.data ?? response?.organization ?? response) as TOrg;
+      });
+  }
+
   function updateOrg(
     id: string,
     value: Partial<Pick<TOrg, "name" | "type" | "email" | "nature" | "contact">>
@@ -224,12 +244,14 @@ export default function useOrg() {
     getByName,
     currentOrg,
     getById,
+    getOrgById,
     getAll,
     getAllV2,
     add,
     addOnboardingOrg,
     updateOrg,
     getOrgsByEmail,
-    getOrganizationsWithSubscription
+    getOrganizationsWithSubscription,
+    completeOnboarding
   };
 }

package/package.json

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

package/types/vehicle.d.ts

@@ -9,7 +9,7 @@ declare type TVehicle = {
   block: number | "";
   level: string;
   unit: string;
-  uniName?: string; // For display purposes, the API will return the unit name if available
+  unitName?: string; // For display purposes, the API will return the unit name if available
   nric?: string | null;
   remarks?: string;
   seasonPassType?: string;