@7365admin1/layer-common 3.0.21 → 3.0.23

package/components/ServiceProviderMain.vue

@@ -181,7 +181,6 @@
         <v-card-text v-else class="text-body-2 text-medium-emphasis">
           You do not have permission to view service providers.
         </v-card-text>
-
       </v-card>
     </v-col>
   </v-row>
@@ -415,151 +414,151 @@
     </v-card>
   </v-dialog>
 
- <v-dialog v-model="createInviteDialog" width="580" persistent>
-  <v-card width="100%" rounded="lg" class="sp-invite-card">
-    <v-toolbar flat color="grey-lighten-4" height="76">
-      <v-row no-gutters class="fill-height px-6" align="center">
-        <span class="font-weight-bold text-h5">
-          Invite Service Provider
-        </span>
-      </v-row>
-    </v-toolbar>
-
-    <v-card-text class="sp-invite-body">
-      <v-form
-        v-model="validServiceProvider"
-        :disabled="disableServiceProvider"
-      >
-        <v-row no-gutters>
-          <!-- Email -->
-          <v-col cols="12">
-            <v-row no-gutters>
-              <InputLabel class="text-capitalize" title="Email" required />
-              <v-col cols="12">
-                <v-text-field
-                  v-model="serviceProviderInvite.email"
-                  variant="outlined"
-                  density="comfortable"
-                  :rules="[requiredRule, emailRule]"
-                ></v-text-field>
-              </v-col>
-            </v-row>
-          </v-col>
-
-          <!-- Existing account block -->
-          <v-col cols="12" v-if="existingAccount">
-            <v-divider class="mb-6" />
-
-            <div class="sp-existing-title">Existing Account Verified</div>
-
-            <div class="sp-existing-copy">
-              {{ serviceProviderInvite.email }} is already onboarded.
-              Sending this invite will add this site to the list of
-              locations this company manages.
-            </div>
-
-            <v-row no-gutters>
-              <InputLabel title="Organization" />
-              <v-col cols="12">
-                <v-text-field
-                  :model-value="existingAccount.text"
-                  readonly
-                  variant="outlined"
-                  density="comfortable"
-                />
-              </v-col>
-            </v-row>
-          </v-col>
-
-          <v-col cols="12">
-            <v-divider class="mb-6" />
-          </v-col>
+  <v-dialog v-model="createInviteDialog" width="580" persistent>
+    <v-card width="100%" rounded="lg" class="sp-invite-card">
+      <v-toolbar flat color="grey-lighten-4" height="76">
+        <v-row no-gutters class="fill-height px-6" align="center">
+          <span class="font-weight-bold text-h5">
+            Invite Service Provider
+          </span>
+        </v-row>
+      </v-toolbar>
 
-          <!-- App & Site: only shown when no existing account is verified -->
-          <template v-if="!existingAccount">
+      <v-card-text class="sp-invite-body">
+        <v-form
+          v-model="validServiceProvider"
+          :disabled="disableServiceProvider"
+        >
+          <v-row no-gutters>
+            <!-- Email -->
             <v-col cols="12">
               <v-row no-gutters>
-                <InputLabel class="text-capitalize" title="App" required />
+                <InputLabel class="text-capitalize" title="Email" required />
                 <v-col cols="12">
-                  <v-select
-                    v-model="serviceProviderInvite.app"
-                    :items="serviceProviderInviteApps"
-                    item-title="title"
-                    item-value="value"
+                  <v-text-field
+                    v-model="serviceProviderInvite.email"
                     variant="outlined"
                     density="comfortable"
-                    :rules="[requiredRule]"
-                  ></v-select>
+                    :rules="[requiredRule, emailRule]"
+                  ></v-text-field>
                 </v-col>
               </v-row>
             </v-col>
 
-            <v-col cols="12">
+            <!-- Existing account block -->
+            <v-col cols="12" v-if="existingAccount">
+              <v-divider class="mb-6" />
+
+              <div class="sp-existing-title">Existing Account Verified</div>
+
+              <div class="sp-existing-copy">
+                {{ serviceProviderInvite.email }} is already onboarded. Sending
+                this invite will add this site to the list of locations this
+                company manages.
+              </div>
+
               <v-row no-gutters>
-                <InputLabel class="text-capitalize" title="Site" required />
+                <InputLabel title="Organization" />
                 <v-col cols="12">
-                  <v-select
-                    v-model="serviceProviderInvite.siteId"
-                    :items="serviceProviderInviteSites"
-                    item-title="title"
-                    item-value="value"
+                  <v-text-field
+                    :model-value="existingAccount.text"
+                    readonly
                     variant="outlined"
                     density="comfortable"
-                    :rules="[requiredRule]"
-                    @update:model-value="setInviteSiteName"
-                  ></v-select>
+                  />
                 </v-col>
               </v-row>
             </v-col>
-          </template>
 
-          <!-- Error message -->
-          <v-col cols="12" class="my-2">
-            <v-row no-gutters>
-              <v-col cols="12" class="text-center">
-                <span
-                  class="text-none text-subtitle-2 font-weight-medium text-error"
-                >
-                  {{ messageServiceProvider }}
-                </span>
+            <v-col cols="12">
+              <v-divider class="mb-6" />
+            </v-col>
+
+            <!-- App & Site: only shown when no existing account is verified -->
+            <template v-if="!existingAccount">
+              <v-col cols="12">
+                <v-row no-gutters>
+                  <InputLabel class="text-capitalize" title="App" required />
+                  <v-col cols="12">
+                    <v-select
+                      v-model="serviceProviderInvite.app"
+                      :items="serviceProviderInviteApps"
+                      item-title="title"
+                      item-value="value"
+                      variant="outlined"
+                      density="comfortable"
+                      :rules="[requiredRule]"
+                    ></v-select>
+                  </v-col>
+                </v-row>
               </v-col>
-            </v-row>
-          </v-col>
-        </v-row>
-      </v-form>
-    </v-card-text>
 
-    <v-toolbar flat height="76" class="sp-invite-footer">
-      <v-row no-gutters class="fill-height">
-        <v-col cols="6" class="fill-height">
-          <v-btn
-            block
-            variant="flat"
-            class="text-none sp-invite-footer-btn"
-            height="76"
-            @click="setServiceProvider({ mode: 'invite', dialog: false })"
-          >
-            Back
-          </v-btn>
-        </v-col>
+              <v-col cols="12">
+                <v-row no-gutters>
+                  <InputLabel class="text-capitalize" title="Site" required />
+                  <v-col cols="12">
+                    <v-select
+                      v-model="serviceProviderInvite.siteId"
+                      :items="serviceProviderInviteSites"
+                      item-title="title"
+                      item-value="value"
+                      variant="outlined"
+                      density="comfortable"
+                      :rules="[requiredRule]"
+                      @update:model-value="setInviteSiteName"
+                    ></v-select>
+                  </v-col>
+                </v-row>
+              </v-col>
+            </template>
 
-        <v-col cols="6" class="fill-height">
-          <v-btn
-            block
-            variant="flat"
-            class="text-none sp-invite-submit-btn"
-            height="76"
-            :disabled="!validServiceProvider"
-            :loading="disableServiceProvider"
-            @click="submitServiceProviderInvite()"
-          >
-            Submit
-          </v-btn>
-        </v-col>
-      </v-row>
-    </v-toolbar>
-  </v-card>
-</v-dialog>
+            <!-- Error message -->
+            <v-col cols="12" class="my-2">
+              <v-row no-gutters>
+                <v-col cols="12" class="text-center">
+                  <span
+                    class="text-none text-subtitle-2 font-weight-medium text-error"
+                  >
+                    {{ messageServiceProvider }}
+                  </span>
+                </v-col>
+              </v-row>
+            </v-col>
+          </v-row>
+        </v-form>
+      </v-card-text>
+
+      <v-toolbar flat height="76" class="sp-invite-footer">
+        <v-row no-gutters class="fill-height">
+          <v-col cols="6" class="fill-height">
+            <v-btn
+              block
+              variant="flat"
+              class="text-none sp-invite-footer-btn"
+              height="76"
+              @click="setServiceProvider({ mode: 'invite', dialog: false })"
+            >
+              Back
+            </v-btn>
+          </v-col>
+
+          <v-col cols="6" class="fill-height">
+            <v-btn
+              block
+              variant="flat"
+              class="text-none sp-invite-submit-btn"
+              height="76"
+              :disabled="!validServiceProvider"
+              :loading="disableServiceProvider"
+              @click="submitServiceProviderInvite()"
+            >
+              Submit
+            </v-btn>
+          </v-col>
+        </v-row>
+      </v-toolbar>
+    </v-card>
+  </v-dialog>
 
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
 </template>
@@ -689,7 +688,7 @@ const headers = [
 
 const { natureOfBusinessV3 } = useLocal();
 const { requiredRule, emailRule, debounce } = useUtils();
-const {getUserByEmail} = useUser()
+const { getUserByEmail } = useUser();
 
 const listTab = ref<ListTab>("active");
 const page = ref(1);
@@ -732,14 +731,13 @@ const {
   add: addServiceProvider,
   createServiceProviderInvite,
   updateStatus: updateServiceProviderStatus,
-  invite
+  invite,
 } = useServiceProvider();
 const { getAll: getAllMembers } = useMember();
 
-const { getVerifications, cancelUserInvitation, getVerificationByEmail } = useVerification();
-const {
-  getOrgsByMembership,
-} = useMember();
+const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
+  useVerification();
+const { getOrgsByMembership } = useMember();
 
 const existingAccount = ref<any>(null);
 const checkingExistingAccount = ref(false);
@@ -774,22 +772,21 @@ async function checkExistingAccount(email: string) {
 
     if (!user?._id) return;
 
-const orgs = await getOrgs({
-  user: user._id,
-});
-
-const matchedOrg = orgs.items?.find(
-  (org: any) => org.type === serviceProviderInvite.value.app
-);
+    const orgs = await getOrgs({
+      user: user._id,
+    });
 
-if (matchedOrg) {
-  existingAccount.value = {
-    _id: matchedOrg.value,
-    text: matchedOrg.text,
-    ...matchedOrg,
-  };
-}
+    const matchedOrg = orgs.items?.find(
+      (org: any) => org.type === serviceProviderInvite.value.app
+    );
 
+    if (matchedOrg) {
+      existingAccount.value = {
+        _id: matchedOrg.value,
+        text: matchedOrg.text,
+        ...matchedOrg,
+      };
+    }
   } catch (error) {
     existingAccount.value = null;
   } finally {
@@ -797,7 +794,6 @@ if (matchedOrg) {
   }
 }
 
-
 watch(
   () => serviceProviderInvite.value.email,
   async (value) => {
@@ -876,7 +872,10 @@ function rowActionLabel(row: TableRow) {
 
 function typeDisplay(type: string, nature?: string) {
   if (nature && String(nature).trim()) return String(nature);
-  const list = natureOfBusinessV3.value as Array<{ title?: string; value?: string }>;
+  const list = natureOfBusinessV3.value as Array<{
+    title?: string;
+    value?: string;
+  }>;
   const hit = list?.find((x) => x.value === type);
   return hit?.title ?? type ?? "-";
 }
@@ -975,12 +974,12 @@ function mapInviteRows(raw: Record<string, any>[]): TableRow[] {
 }
 
 async function loadList() {
-  if (!props.siteId || !props.canViewServiceProviders) {
-    items.value = [];
-    pages.value = 0;
-    pageRange.value = "-- - -- of --";
-    return;
-  }
+  // if (!props.siteId || !props.canViewServiceProviders) {
+  //   items.value = [];
+  //   pages.value = 0;
+  //   pageRange.value = "-- - -- of --";
+  //   return;
+  // }
 
   loading.value = true;
   try {
@@ -1077,7 +1076,8 @@ async function confirmStatusChange() {
   if (!statusActionRow.value) return;
 
   statusUpdating.value = true;
-  const nextStatus = statusAction.value === "reactivate" ? "active" : "inactive";
+  const nextStatus =
+    statusAction.value === "reactivate" ? "active" : "inactive";
   try {
     await updateServiceProviderStatus(statusActionRow.value._id, nextStatus);
     showMessage(
@@ -1142,38 +1142,38 @@ function setServiceProvider({
     createDialog.value = dialog;
   }
 
- if (dialog) {
-  serviceProvider.value = {
-    name: "",
-    type: "",
-    email: "",
-    description: "",
-    orgId: props.orgId,
-    siteId: props.siteId,
-    siteName: site.value?.name ?? "",
-    orgName: "Org Name",
-    category: mode === "add" ? "internal" : "external",
-  };
-
-  if (mode === "invite") {
-    existingAccount.value = null;
-
-    serviceProviderInvite.value = {
+  if (dialog) {
+    serviceProvider.value = {
+      name: "",
+      type: "",
       email: "",
-      app: defaultInviteApp,
+      description: "",
+      orgId: props.orgId,
       siteId: props.siteId,
-      siteName: site.value?.name || props.siteName,
+      siteName: site.value?.name ?? "",
+      orgName: "Org Name",
+      category: mode === "add" ? "internal" : "external",
     };
-  }
 
-  createMoreServiceProvider.value = false;
-  return;
-}
+    if (mode === "invite") {
+      existingAccount.value = null;
+
+      serviceProviderInvite.value = {
+        email: "",
+        app: defaultInviteApp,
+        siteId: props.siteId,
+        siteName: site.value?.name || props.siteName,
+      };
+    }
+
+    createMoreServiceProvider.value = false;
+    return;
+  }
 
-serviceProvider.value.description = data.description ?? "";
-serviceProvider.value.email = data.email ?? "";
-serviceProvider.value.name = data.name ?? "";
-serviceProvider.value.type = data.type ?? "";
+  serviceProvider.value.description = data.description ?? "";
+  serviceProvider.value.email = data.email ?? "";
+  serviceProvider.value.name = data.name ?? "";
+  serviceProvider.value.type = data.type ?? "";
 }
 
 async function submitServiceProviderAdd() {
@@ -1211,9 +1211,7 @@ async function submitServiceProviderInvite() {
         site.value?.name ||
         props.siteName,
 
-      inviteType: existingAccount.value
-        ? "create-org"
-        : "organization-invite",
+      inviteType: existingAccount.value ? "create-org" : "organization-invite",
     });
 
     showMessage("Invitation sent.", "success");

package/components/UnitMain.vue

@@ -197,7 +197,11 @@
     </v-card>
   </v-dialog>
 
-  <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
+  <Snackbar
+    v-model="messageSnackbar"
+    :text="snackBarMessage"
+    :color="messageColor"
+  />
 
   <input
     ref="fileInput"
@@ -297,8 +301,11 @@ const dialogMode = ref<"add" | "edit">("add");
 const editingUnit = ref<Record<string, any>>({});
 const areaName = ref("");
 
+const snackBarMessage = ref("");
+
 function showMessage(msg: string, color: string = "error") {
   message.value = msg;
+  snackBarMessage.value = msg;
   messageColor.value = color;
   messageSnackbar.value = true;
 }

package/components/VisitorForm.vue

@@ -1269,6 +1269,8 @@ async function submit() {
       payload.visitorPass = visitor.visitorPass;
       payload.passKeys = visitor.passKeys;
     }
+
+    delete payload.createdBy;
   }
 
   if (prop.type === "contractor") {

package/components/VisitorManagement.vue

@@ -1604,6 +1604,10 @@ function handleRegistrationUnregisteredVisitor(item: Partial<TVisitor>) {
   selectedVisitorId.value = id;
   dialog.showSelection = true;
   mode.value = "register";
+
+  if(!selectedVisitorDataObject.value){
+    getVisitorRefresh();
+  }
 }
 
 function handleViewImage(imageId: string) {
@@ -2034,6 +2038,33 @@ onMounted(() => {
       (route.query.checkedOut as string) == "true" || false;
   }
 });
+
+const { socketUnregisteredVisitorTrigger, visitorSocketData } =
+  useVisitorSocket();
+
+  watchEffect(async () => {
+    if (visitorSocketData.value && visitorSocketData.value.reload && activeTab.value === "unregistered") {
+      await getVisitorRefresh();
+      visitorSocketData.value = null;
+      socketUnregisteredVisitorTrigger.value = false;
+    }
+
+    if(visitorSocketData.value && visitorSocketData.value.plateNumber && socketUnregisteredVisitorTrigger.value && activeTab.value === "unregistered" && dialog.showSelection === false) {
+      // await getVisitorRefresh();
+      // visitorSocketData.value = null;
+      // socketUnregisteredVisitorTrigger.value = false;
+      setTimeout(async() => {
+        const { _id } = visitorSocketData.value;
+        await handleRegistrationUnregisteredVisitor({ _id });
+        socketUnregisteredVisitorTrigger.value = false;
+
+        setTimeout(() => {
+          visitorSocketData.value = null;
+        }, 1000)
+      }, 1000)
+    }
+  })
+
 </script>
 
 <style scoped></style>