@7365admin1/layer-common 3.0.19 → 3.0.21

package/components/HygieneUpdateMoreAction.vue

@@ -19,7 +19,7 @@
 
     <v-toolbar class="pa-0" density="compact">
       <v-row no-gutters>
-        <v-col cols="6" class="pa-0">
+        <v-col :cols="showMoreActions ? 6 : 12" class="pa-0">
           <v-btn
             block
             variant="text"
@@ -32,7 +32,7 @@
           </v-btn>
         </v-col>
 
-        <v-col cols="6" class="pa-0">
+        <v-col v-if="showMoreActions" cols="6" class="pa-0">
           <v-menu>
             <template #activator="{ props }">
               <v-btn
@@ -204,6 +204,11 @@ const prop = defineProps({
     type: String,
     default: "Actions",
   },
+
+  showMoreActions: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const emit = defineEmits([

package/components/Input/DateTimePicker.vue

@@ -1,186 +1,201 @@
 <template>
-    <div class="d-flex flex-column">
-        <v-text-field v-bind="$attrs" ref="dateTimePickerRef" :model-value="dateTimeFormattedReadOnly" autocomplete="off"
-            :placeholder="inputPlaceholder" :rules="rules" style="z-index: 10" @click="openDatePicker">
-            <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="inputType" v-model="dateTime" :min="minValue" />
-        </div>
+  <div class="d-flex flex-column">
+    <v-text-field
+      v-bind="$attrs"
+      ref="dateTimePickerRef"
+      :model-value="dateTimeFormattedReadOnly"
+      autocomplete="off"
+      :placeholder="inputPlaceholder"
+      :rules="rules"
+      style="z-index: 10"
+      @click="openDatePicker"
+    >
+      <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="inputType"
+        v-model="dateTime"
+        :min="minValue"
+      />
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch } from "vue";
 
 const prop = defineProps({
-    rules: {
-        type: Array as PropType<Array<any>>,
-        default: () => []
-    },
-    placeholder: {
-        type: String,
-        default: 'DD/MM/YYYY, HH:MM AM/PM'
-    },
-    dateOnly: {
-        type: Boolean,
-        default: false
-    },
-    min: {
-        type: String,
-        default: undefined
-    }
-})
-
-const { formatDateISO8601 } = useUtils()
-const dateTime = defineModel<string | null>({ default: null }) //2025-10-10T13:09 format 
-const dateTimeUTC = defineModel<string | null>('utc', { default: null }) // UTC format
-
-const dateTimeFormattedReadOnly = ref<string | null>(null)
-const inputType = computed(() => (prop.dateOnly ? 'date' : 'datetime-local'))
-
+  rules: {
+    type: Array as PropType<Array<any>>,
+    default: () => [],
+  },
+  placeholder: {
+    type: String,
+    default: "DD/MM/YYYY, HH:MM AM/PM",
+  },
+  dateOnly: {
+    type: Boolean,
+    default: false,
+  },
+  min: {
+    type: String,
+    default: undefined,
+  },
+});
+
+const { formatDateISO8601 } = useUtils();
+const dateTime = defineModel<string | null>({ default: null }); //2025-10-10T13:09 format
+const dateTimeUTC = defineModel<string | null>("utc", { default: null }); // UTC format
+
+const dateTimeFormattedReadOnly = ref<string | null>(null);
+const inputType = computed(() => (prop.dateOnly ? "date" : "datetime-local"));
 
 const minValue = computed(() => {
-    if (!prop.min) return undefined
-    if (/^\d{4}-\d{2}-\d{2}$/.test(prop.min)) {
-        return prop.dateOnly ? prop.min : `${prop.min}T00:00`
-    }
-    return prop.min
-})
-const inputPlaceholder = computed(() => (
-    prop.placeholder || (prop.dateOnly ? 'MM/DD/YYYY' : 'DD/MM/YYYY, HH:MM AM/PM')
-))
-
-
-
-
-const dateInput = ref<HTMLInputElement | null>(null)
-const dateTimePickerRef = ref<HTMLInputElement | null>(null)
-
-const isInitialLoad = ref(true)
+  if (!prop.min) return undefined;
+  if (/^\d{4}-\d{2}-\d{2}$/.test(prop.min)) {
+    return prop.dateOnly ? prop.min : `${prop.min}T00:00`;
+  }
+  return prop.min;
+});
+const inputPlaceholder = computed(
+  () =>
+    prop.placeholder ||
+    (prop.dateOnly ? "MM/DD/YYYY" : "DD/MM/YYYY, HH:MM AM/PM")
+);
+
+const dateInput = ref<HTMLInputElement | null>(null);
+const dateTimePickerRef = ref<HTMLInputElement | null>(null);
+
+const isInitialLoad = ref(true);
 
 function openDatePicker() {
-    setTimeout(() => {
-        dateInput.value?.showPicker?.()
-    }, 0)
+  setTimeout(() => {
+    dateInput.value?.showPicker?.();
+  }, 0);
 }
 
 function validate() {
-    (dateTimePickerRef.value as any)?.validate()
+  (dateTimePickerRef.value as any)?.validate();
 }
 
 function convertToReadableFormat(dateStr: string): string {
+  if (!dateStr) return "";
 
-    if (!dateStr) return "";
+  const date = new Date(dateStr);
+  if (Number.isNaN(date.getTime())) return "";
 
-    const date = new Date(dateStr)
-    if (Number.isNaN(date.getTime())) return "";
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const year = date.getFullYear();
 
-    const month = String(date.getMonth() + 1).padStart(2, '0')
-    const day = String(date.getDate()).padStart(2, '0')
-    const year = date.getFullYear()
+  if (prop.dateOnly) {
+    return `${day}/${month}/${year}`;
+  }
 
-    if (prop.dateOnly) {
-        return `${month}/${day}/${year}`
-    }
+  let hours = date.getHours();
+  const minutes = String(date.getMinutes()).padStart(2, "0");
 
-    let hours = date.getHours()
-    const minutes = String(date.getMinutes()).padStart(2, '0')
+  const ampm = hours >= 12 ? "PM" : "AM";
+  hours = hours % 12;
+  hours = hours ? hours : 12;
 
-    const ampm = hours >= 12 ? 'PM' : 'AM'
-    hours = hours % 12
-    hours = hours ? hours : 12
+  const formattedTime = `${String(hours).padStart(2, "0")}:${minutes} ${ampm}`;
 
-    const formattedTime = `${String(hours).padStart(2, '0')}:${minutes} ${ampm}`
-
-    return `${day}/${month}/${year}, ${formattedTime}`
+  return `${day}/${month}/${year}, ${formattedTime}`;
 }
 
 function toDateOnlyInputValue(dateStr: string): string {
-    if (!dateStr) return ''
-    if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr
-    const date = new Date(dateStr)
-    if (Number.isNaN(date.getTime())) return ''
-    const year = date.getFullYear()
-    const month = String(date.getMonth() + 1).padStart(2, '0')
-    const day = String(date.getDate()).padStart(2, '0')
-    return `${year}-${month}-${day}`
+  if (!dateStr) return "";
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr;
+  const date = new Date(dateStr);
+  if (Number.isNaN(date.getTime())) return "";
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
 }
 
-function handleInitialDate(){
-    const dateDefault = dateTime.value
-    const dateUTC = dateTimeUTC.value
-    if(dateDefault){
-        dateTimeFormattedReadOnly.value = convertToReadableFormat(dateDefault)
-        if (prop.dateOnly) {
-            dateTimeUTC.value = toDateOnlyInputValue(dateDefault)
-        } else {
-            const localDate = new Date(dateDefault)
-            dateTimeUTC.value = localDate.toISOString()
-        }
-    } else if (dateUTC){
-        dateTimeFormattedReadOnly.value = convertToReadableFormat(dateUTC)
-        if (prop.dateOnly) {
-            dateTime.value = toDateOnlyInputValue(dateUTC)
-        } else {
-            const localDate = new Date(dateUTC)
-            dateTime.value = formatDateISO8601(localDate)
-        }
+function handleInitialDate() {
+  const dateDefault = dateTime.value;
+  const dateUTC = dateTimeUTC.value;
+  if (dateDefault) {
+    dateTimeFormattedReadOnly.value = convertToReadableFormat(dateDefault);
+    if (prop.dateOnly) {
+      dateTimeUTC.value = toDateOnlyInputValue(dateDefault);
+    } else {
+      const localDate = new Date(dateDefault);
+      dateTimeUTC.value = localDate.toISOString();
+    }
+  } else if (dateUTC) {
+    dateTimeFormattedReadOnly.value = convertToReadableFormat(dateUTC);
+    if (prop.dateOnly) {
+      dateTime.value = toDateOnlyInputValue(dateUTC);
     } else {
-        dateTimeFormattedReadOnly.value = null
+      const localDate = new Date(dateUTC);
+      dateTime.value = formatDateISO8601(localDate);
     }
+  } else {
+    dateTimeFormattedReadOnly.value = null;
+  }
 }
 
-
-watch(dateTime, (dateVal) => {
-    if (isInitialLoad.value) return // ignore the first run
+watch(
+  dateTime,
+  (dateVal) => {
+    if (isInitialLoad.value) return; // ignore the first run
     if (!dateVal) {
-        dateTimeFormattedReadOnly.value = null;
-        dateTimeUTC.value = null
-        return
+      dateTimeFormattedReadOnly.value = null;
+      dateTimeUTC.value = null;
+      return;
     }
 
-    dateTimeFormattedReadOnly.value = convertToReadableFormat(dateVal)
+    dateTimeFormattedReadOnly.value = convertToReadableFormat(dateVal);
     if (prop.dateOnly) {
-        dateTimeUTC.value = toDateOnlyInputValue(dateVal)
+      dateTimeUTC.value = toDateOnlyInputValue(dateVal);
     } else {
-        const localDate = new Date(dateVal)
-        dateTimeUTC.value = localDate.toISOString()
+      const localDate = new Date(dateVal);
+      dateTimeUTC.value = localDate.toISOString();
     }
-
-}, { immediate: false })
-
-  watch(dateTimeUTC, () => {
-        handleInitialDate()
-  }, { immediate: true})
-
+  },
+  { immediate: false }
+);
+
+watch(
+  dateTimeUTC,
+  () => {
+    handleInitialDate();
+  },
+  { immediate: true }
+);
 
 onMounted(async () => {
-    await nextTick()
-    isInitialLoad.value = false
-    // Wait until Vuetify renders its internal input
-    const nativeInput = (dateTimePickerRef.value as any)?.$el?.querySelector('input')
-    if (nativeInput) {
-        nativeInput.addEventListener('click', (e: MouseEvent) => {
-            e.stopPropagation()
-            openDatePicker()
-        })
-    }
-    
-})
-
+  await nextTick();
+  isInitialLoad.value = false;
+  // Wait until Vuetify renders its internal input
+  const nativeInput = (dateTimePickerRef.value as any)?.$el?.querySelector(
+    "input"
+  );
+  if (nativeInput) {
+    nativeInput.addEventListener("click", (e: MouseEvent) => {
+      e.stopPropagation();
+      openDatePicker();
+    });
+  }
+});
 
 defineExpose({
-    validate
-})
+  validate,
+});
 </script>
 
 <style scoped>
 .hidden-input {
-    opacity: 0;
-    height: 0;
-    width: 1px;
+  opacity: 0;
+  height: 0;
+  width: 1px;
 }
 </style>

package/components/MemberMain.vue

@@ -73,6 +73,9 @@
           <template #item.nature="{ item }">
             {{ replaceMatch(item.nature, "_", " ") }}
           </template>
+          <template #item.dateInvited="{ item }">
+            {{ formatDateInvited(item.dateInvited) }}
+          </template>
           <template #item.action-table="{ item }">
             <v-menu
               v-if="
@@ -289,19 +292,24 @@ const props = defineProps({
         value: "name",
       },
       {
-        title: "Role",
+        title: "Email",
+
+        value: "email",
+      },
+      {
+        title: "Roles and Permission",
 
         value: "roleName",
       },
       {
-        title: "Organization",
+        title: "Site Invited To",
 
-        value: "orgName",
+        value: "siteName",
       },
       {
-        title: "Status",
+        title: "Date",
 
-        value: "status",
+        value: "dateInvited",
       },
       {
         title: "Action",
@@ -347,7 +355,7 @@ const normalizedRouteParams = computed(() => {
 
 const tabOptions = [
   { name: "Active", status: "active" },
-  { name: "Suspended", status: "suspended" },
+  { name: "Inactive", status: "suspended" },
 ];
 
 function toRoute(status: any) {
@@ -477,6 +485,29 @@ function showMessage(msg: string, color: string) {
   messageSnackbar.value = true;
 }
 
+function formatDateInvited(value?: string | null) {
+  if (!value) return "";
+
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return "";
+
+  const parts = new Intl.DateTimeFormat("en-US", {
+    month: "long",
+    day: "numeric",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: true,
+  }).formatToParts(date);
+
+  const getPart = (type: Intl.DateTimeFormatPartTypes) =>
+    parts.find((part) => part.type === type)?.value ?? "";
+
+  return `${getPart("month")} ${getPart("day")}, ${getPart("year")} ${getPart(
+    "hour"
+  )}:${getPart("minute")}${getPart("dayPeriod").toUpperCase()}`;
+}
+
 async function handleUpdateMemberStatus() {
   if (!selectedMemberId.value) return;
   updateLoading.value = true;

package/components/ServiceProviderMain.vue

@@ -732,6 +732,7 @@ const {
   add: addServiceProvider,
   createServiceProviderInvite,
   updateStatus: updateServiceProviderStatus,
+  invite
 } = useServiceProvider();
 const { getAll: getAllMembers } = useMember();
 
@@ -759,9 +760,10 @@ const createInviteDialog = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
 const { getByUserType } = useMember();
+const { getOrgs } = useOrg();
 
 async function checkExistingAccount(email: string) {
-  // existingAccount.value = null;
+  existingAccount.value = null;
 
   if (!email.trim() || emailRule(email) !== true) return;
 
@@ -772,19 +774,23 @@ async function checkExistingAccount(email: string) {
 
     if (!user?._id) return;
 
-const member = await getByUserType(user._id, "organization");
-    console.log("member raw:", member);
-    console.log("onboardingCompleted:", member?.onboardingCompleted);
+const orgs = await getOrgs({
+  user: user._id,
+});
+
+const matchedOrg = orgs.items?.find(
+  (org: any) => org.type === serviceProviderInvite.value.app
+);
+
+if (matchedOrg) {
+  existingAccount.value = {
+    _id: matchedOrg.value,
+    text: matchedOrg.text,
+    ...matchedOrg,
+  };
+}
 
-    if (member?.onboardingCompleted) {
-      existingAccount.value = {
-        _id: member.org,
-        text: member.orgName,
-        ...member,
-      };
-    }
   } catch (error) {
-    console.error(error);
     existingAccount.value = null;
   } finally {
     checkingExistingAccount.value = false;
@@ -799,6 +805,14 @@ watch(
     await checkExistingAccount(value);
   }
 );
+watch(
+  () => serviceProviderInvite.value.app,
+  () => {
+    if (serviceProviderInvite.value.email) {
+      checkExistingAccount(serviceProviderInvite.value.email);
+    }
+  }
+);
 
 const serviceProviderInviteApps = computed(() =>
   natureOfBusinessV3.map((item) => ({
@@ -1183,33 +1197,42 @@ async function submitServiceProviderAdd() {
     disableServiceProvider.value = false;
   }
 }
-
 async function submitServiceProviderInvite() {
   disableServiceProvider.value = true;
   messageServiceProvider.value = "";
+
   try {
-    const payload = {
+    await invite({
       email: serviceProviderInvite.value.email.trim(),
-      name: "",
-      app: serviceProviderInvite.value.app,
       orgId: props.orgId,
       siteId: serviceProviderInvite.value.siteId,
       siteName:
-        serviceProviderInvite.value.siteName || site.value?.name || props.siteName,
-    };
+        serviceProviderInvite.value.siteName ||
+        site.value?.name ||
+        props.siteName,
+
+      inviteType: existingAccount.value
+        ? "create-org"
+        : "organization-invite",
+    });
 
-    await createServiceProviderInvite(payload);
     showMessage("Invitation sent.", "success");
+
     if (createMoreServiceProvider.value) {
       serviceProviderInvite.value.email = "";
     } else {
-      await setServiceProvider({ mode: "invite", dialog: false });
+      await setServiceProvider({
+        mode: "invite",
+        dialog: false,
+      });
     }
+
     await loadList();
   } catch (error: any) {
     messageServiceProvider.value =
       error?.response?._data?.message ??
       "An error occurred while inviting the service provider.";
+
     showMessage(errorConverter(error), "error");
   } finally {
     disableServiceProvider.value = false;

package/composables/useHidAmico.ts

@@ -132,6 +132,25 @@ export default function useHidAmico() {
     });
   }
 
+  function getIntercomStatus(readerId: string) {
+    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/intercom/status`, {
+      method: "GET",
+    });
+  }
+
+  function makeIntercomCall(readerId: string, target: string) {
+    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/intercom/call`, {
+      method: "POST",
+      body: { target },
+    });
+  }
+
+  function finalizeIntercomCall(readerId: string) {
+    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/intercom/hangup`, {
+      method: "POST",
+    });
+  }
+
   return {
     getReaders,
     createReader,
@@ -148,5 +167,8 @@ export default function useHidAmico() {
     createIdentity,
     updateIdentity,
     deleteIdentity,
+    getIntercomStatus,
+    makeIntercomCall,
+    finalizeIntercomCall,
   };
 }

package/composables/useHidNavigation.ts

@@ -34,6 +34,13 @@ export default function useHidNavigation() {
             params: { org, site },
           },
         },
+        {
+          title: "Intercom",
+          route: {
+            name: "org-site-access-mgmt-intercom",
+            params: { org, site },
+          },
+        },
         {
           title: "Identity Mapping",
           route: {

package/composables/useServiceProvider.ts

@@ -174,12 +174,13 @@ export default function useServiceProvider() {
     orgId = "",
     siteId = "",
     siteName = "",
+    inviteType=""
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       "/api/service-providers/invite",
       {
         method: "POST",
-        body: { email, orgId, siteId, siteName },
+        body: { email, orgId, siteId, siteName, inviteType },
       }
     );
   }

package/package.json

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

package/pages/[org]/[site]/access-mgmt/intercom/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before configuring HID intercom."
+    >
+      <HidIntercomManagement :site="siteId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
+});
+
+const route = useRoute();
+
+const orgId = computed(() => String(route.params.org || ""));
+const siteId = computed(() => String(route.params.site || ""));
+</script>