@7365admin1/layer-common 3.2.2-staging.180 → 3.2.2-staging.182

package/components/HidIntercomManagement.vue

@@ -76,7 +76,7 @@
           class="app-tab"
           :class="{ 'app-tab--active': activeTab === tab.value }"
           :aria-selected="activeTab === tab.value"
-          @click="activeTab = tab.value"
+          @click="selectTab(tab.value)"
         >
           {{ tab.label }}
         </button>
@@ -94,7 +94,12 @@
             @update:model-value="page = 1"
           />
           <AppField v-model="search" search placeholder="Search" />
-          <AppSelect v-model="statusFilter" :items="statusOptions" />
+          <AppSelect
+            v-model="statusFilter"
+            :items="statusOptions"
+            placeholder="Status"
+            clearable
+          />
         </div>
       </template>
 
@@ -126,6 +131,18 @@
         <StatusChip :status="item.status" />
       </template>
 
+      <template #[`item.contactStatus`]="{ item }">
+        <v-btn
+          size="small"
+          variant="outlined"
+          class="text-none"
+          :loading="testingContactReaderId === item.readerId"
+          @click="testContactSipStatus(item)"
+        >
+          {{ getContactReaderStatus(item) }}
+        </v-btn>
+      </template>
+
       <template #[`item.action-table`]="{ item }">
         <v-menu location="bottom end">
           <template #activator="{ props: menuProps }">
@@ -133,13 +150,19 @@
           </template>
           <v-list v-if="activeTab === 'intercom'" density="compact" class="row-menu">
             <v-list-item title="View" @click="openViewDialog(item)" />
-            <v-list-item title="SIP Settings" @click="openSipDialog(item)" />
+            <v-list-item
+              title="Test Connection with SIP"
+              :disabled="testingSipReaderId === item.reader._id"
+              @click="testSipConnection(item)"
+            />
             <v-list-item title="Call Settings" @click="openCallDialog(item)" />
             <v-list-item title="Dial Code" @click="openDialCodeDialog(item)" />
             <v-list-item title="Make a call" @click="openMakeCallDialog(item)" />
             <v-list-item title="Web call" @click="openWebPhoneDialog(item)" />
           </v-list>
           <v-list v-else density="compact" class="row-menu">
+            <v-list-item title="Call" prepend-icon="mdi-phone" @click="openContactCall(item)" />
+            <v-list-item title="Check reader SIP status" prepend-icon="mdi-lan-check" @click="testContactSipStatus(item)" />
             <v-list-item title="View" @click="openContactView(item)" />
             <v-list-item title="Edit" @click="openContactDialog(item)" />
             <v-list-item title="Delete" @click="openDeleteContact(item)" />
@@ -554,12 +577,16 @@
       <v-card class="form-dialog" rounded="lg">
         <v-card-title class="dialog-title">{{ contactForm.id ? 'Edit Contact' : 'Add Contact' }}</v-card-title>
         <v-card-text class="dialog-body">
+          <FieldLabel text="HID Reader" required />
+          <AppSelect
+            v-model="contactForm.readerId"
+            :items="readerOptions"
+            :disabled="Boolean(contactForm.id)"
+          />
           <FieldLabel text="Name" required />
           <AppField v-model="contactForm.name" placeholder="Enter name" />
-          <FieldLabel text="Location" />
-          <AppField v-model="contactForm.location" placeholder="Location" />
-          <FieldLabel text="Server Address" required />
-          <AppField v-model="contactForm.serverAddress" placeholder="192.168.1.1" />
+          <FieldLabel text="SIP Number / Address" required />
+          <AppField v-model="contactForm.serverAddress" placeholder="7100 or user@example.com" />
         </v-card-text>
         <v-card-actions class="dialog-actions pa-0">
           <v-btn class="text-none action-cancel" variant="flat" height="44" @click="contactDialog = false">Cancel</v-btn>
@@ -693,15 +720,19 @@ const {
 const activeTab = ref<IntercomTab>("intercom");
 const readers = ref<Record<string, any>[]>([]);
 const selectedReaderId = ref("");
+const testingSipReaderId = ref("");
+const testingContactReaderId = ref("");
 const intercomRows = ref<IntercomRow[]>([]);
 const contacts = ref<ContactRow[]>([]);
+const intercomLoaded = ref(false);
+const contactsLoaded = ref(false);
 const loading = ref(false);
 const saving = ref(false);
 const contactsSaving = ref(false);
 const calling = ref(false);
 const hangingUp = ref(false);
 const search = ref("");
-const statusFilter = ref("Status");
+const statusFilter = ref("");
 const page = ref(1);
 const limit = 20;
 const selectedRow = ref<IntercomRow | null>(null);
@@ -728,7 +759,7 @@ const deleteContactDialog = ref(false);
 
 const message = reactive<{ type: MessageType; text: string }>({ type: "info", text: "" });
 
-const statusOptions = ["Status", "Connected", "Not connected", "Connecting", "Disabled", "Failed"];
+const statusOptions = ["Connected", "Not connected", "Connecting", "Disabled", "Failed"];
 
 const pjsipKeys = [
   "enabled",
@@ -839,7 +870,7 @@ const filteredIntercomRows = computed(() => {
       row.dialCode,
       row.status,
     ].some((value) => String(value || "").toLowerCase().includes(query));
-    const matchesStatus = statusFilter.value === "Status" || row.status === statusFilter.value;
+    const matchesStatus = !statusFilter.value || row.status === statusFilter.value;
     return matchesReader && matchesSearch && matchesStatus;
   });
 });
@@ -848,13 +879,16 @@ const filteredContacts = computed(() => {
   const query = search.value.trim().toLowerCase();
   return contacts.value.filter((contact) => {
     const matchesReader = !selectedReaderId.value || contact.readerId === selectedReaderId.value;
+    const readerStatus = getContactReaderStatus(contact);
     const matchesSearch = !query || [
       contact.name,
       contact.location,
       contact.serverAddress,
       contact.dialCode,
+      readerStatus,
     ].some((value) => String(value || "").toLowerCase().includes(query));
-    return matchesReader && matchesSearch;
+    const matchesStatus = !statusFilter.value || readerStatus === statusFilter.value;
+    return matchesReader && matchesSearch && matchesStatus;
   });
 });
 
@@ -890,8 +924,8 @@ const tableHeaders = computed(() =>
     : [
         { title: "Name", value: "name", sortable: false },
         { title: "Location", value: "location", sortable: false },
-        { title: "SIP Server Address", value: "serverAddress", sortable: false },
-        { title: "Dial Code", value: "dialCode", sortable: false },
+        { title: "SIP Number / Address", value: "serverAddress", sortable: false },
+        { title: "Reader SIP Status", value: "contactStatus", sortable: false },
         { title: "", value: "action-table", sortable: false },
       ]
 );
@@ -1034,8 +1068,9 @@ async function reload() {
     if (!readers.value.some((reader) => reader._id === selectedReaderId.value)) {
       selectedReaderId.value = readers.value[0]?._id || "";
     }
-    await loadIntercomRows();
-    await loadContacts();
+    intercomLoaded.value = false;
+    contactsLoaded.value = false;
+    await loadActiveTab();
   } catch (error: any) {
     showMessage(getErrorMessage(error), "error");
   } finally {
@@ -1043,10 +1078,36 @@ async function reload() {
   }
 }
 
-async function loadIntercomRows() {
-  const rows: IntercomRow[] = [];
+async function loadActiveTab() {
+  if (activeTab.value === "intercom") {
+    await loadIntercomRows();
+    return;
+  }
+
+  await Promise.all([
+    intercomLoaded.value ? Promise.resolve() : loadIntercomRows(),
+    loadContacts(),
+  ]);
+}
 
-  for (const reader of readers.value) {
+async function selectTab(tab: IntercomTab) {
+  activeTab.value = tab;
+  page.value = 1;
+
+  if ((tab === "intercom" && intercomLoaded.value) || (tab === "contacts" && contactsLoaded.value)) return;
+
+  loading.value = true;
+  try {
+    await loadActiveTab();
+  } catch (error: unknown) {
+    showMessage(getErrorMessage(error), "error");
+  } finally {
+    loading.value = false;
+  }
+}
+
+async function loadIntercomRows() {
+  const rows = await Promise.all(readers.value.map(async (reader): Promise<IntercomRow> => {
     const [configurationResult, statusResult] = await Promise.allSettled([
       getReaderConfiguration(reader._id, { pjsip: pjsipKeys }),
       getIntercomStatus(reader._id),
@@ -1058,16 +1119,15 @@ async function loadIntercomRows() {
     const statusPayload = statusResponse?.data ?? statusResponse;
     const pjsip = normalizePjsip(configurationResponse, statusPayload);
     const status = normalizeStatus(statusPayload, pjsip);
-    rows.push(toIntercomRow(reader, pjsip, status));
-  }
+    return toIntercomRow(reader, pjsip, status);
+  }));
 
   intercomRows.value = rows;
+  intercomLoaded.value = true;
 }
 
 async function loadContacts() {
-  const rows: ContactRow[] = [];
-
-  for (const reader of readers.value) {
+  const readerContacts = await Promise.all(readers.value.map(async (reader): Promise<ContactRow[]> => {
     try {
       const response = await runObjectOperation(reader._id, {
         operation: "load",
@@ -1075,13 +1135,15 @@ async function loadContacts() {
         fields: ["id", "name", "number"],
         limit: 100,
       });
-      rows.push(...normalizeContacts(reader, response?.data ?? response));
+      return normalizeContacts(reader, response?.data ?? response);
     } catch {
       // Some firmware builds may not expose contacts until intercom is configured.
+      return [];
     }
-  }
+  }));
 
-  contacts.value = rows;
+  contacts.value = readerContacts.flat();
+  contactsLoaded.value = true;
 }
 
 function paginate<T>(items: T[]) {
@@ -1398,6 +1460,39 @@ function openContactView(contact: ContactRow) {
   contactViewDialog.value = true;
 }
 
+function getContactReaderStatus(contact: ContactRow) {
+  return intercomRows.value.find((row) => row.reader._id === contact.readerId)?.status || "Check status";
+}
+
+async function testContactSipStatus(contact: ContactRow) {
+  const reader = intercomRows.value.find((row) => row.reader._id === contact.readerId);
+  if (!reader) {
+    showMessage("The HID reader for this contact is not available.", "error");
+    return;
+  }
+
+  testingContactReaderId.value = contact.readerId;
+  try {
+    await testSipConnection(reader);
+  } finally {
+    testingContactReaderId.value = "";
+  }
+}
+
+function openContactCall(contact: ContactRow) {
+  const reader = intercomRows.value.find((row) => row.reader._id === contact.readerId);
+  if (!reader) {
+    showMessage("The HID reader for this contact is not available.", "error");
+    return;
+  }
+
+  selectedRow.value = reader;
+  makeCallForm.target = contact.serverAddress === "N/A" ? "" : contact.serverAddress;
+  makeCallForm.status = "";
+  makeCallForm.statusType = "info";
+  makeCallDialog.value = true;
+}
+
 function openDeleteContact(contact: ContactRow) {
   selectedContact.value = contact;
   deleteContactDialog.value = true;
@@ -1517,6 +1612,52 @@ async function runHangupCall() {
   }
 }
 
+async function testSipConnection(row: IntercomRow) {
+  const readerId = toText(row.reader._id);
+  if (!readerId || testingSipReaderId.value) return;
+
+  testingSipReaderId.value = readerId;
+  try {
+    const response = await getIntercomStatus(readerId);
+    const responseRecord = toRecord(response);
+    const statusPayload = toRecord(responseRecord.data || responseRecord);
+    const status = Number(statusPayload.status);
+
+    await reload();
+
+    if (status === 200) {
+      showMessage(`${row.name}: SIP is connected.`, "success");
+      return;
+    }
+    if (status === -1) {
+      showMessage(`${row.name}: SIP is disabled on the HID reader.`, "warning");
+      return;
+    }
+    if (status === 0 || status === 100) {
+      showMessage(`${row.name}: SIP is still connecting. Check the SIP settings on the HID reader.`, "warning");
+      return;
+    }
+    if (status === 401 || status === 403) {
+      showMessage(`${row.name}: SIP authentication failed. Check the account configured on the HID reader.`, "error");
+      return;
+    }
+    if (status === 408) {
+      showMessage(`${row.name}: The HID reader cannot reach the SIP server.`, "error");
+      return;
+    }
+    if (status === 503) {
+      showMessage(`${row.name}: The HID reader reported a SIP network failure.`, "error");
+      return;
+    }
+
+    showMessage(`${row.name}: SIP is not connected. Configure SIP on the HID reader and test again.`, "warning");
+  } catch (error: unknown) {
+    showMessage(getErrorMessage(error), "error");
+  } finally {
+    testingSipReaderId.value = "";
+  }
+}
+
 async function savePjsip(readerId: string, payload: Record<string, string>, options: { showSuccessMessage?: boolean } = {}) {
   saving.value = true;
   try {
@@ -1540,6 +1681,11 @@ async function saveContact() {
     return;
   }
 
+  if (!isSipCallTarget(contactForm.serverAddress)) {
+    showMessage("Enter a valid extension, SIP address, or IPv4 address.", "warning");
+    return;
+  }
+
   contactsSaving.value = true;
   try {
     if (contactForm.id) {

package/components/HidQrCodeConfiguration.vue

@@ -705,7 +705,11 @@ async function loadReaderConfiguration() {
   try {
     const response = await getReaderConfiguration(form.readerId, {
       general: ["online"],
-      identifier: ["pin_identification_enabled", "multi_factor_authentication"],
+      identifier: [
+        "card_identification_enabled",
+        "pin_identification_enabled",
+        "multi_factor_authentication",
+      ],
     });
     const configuration = getConfigurationData(response);
     const general = isUnknownRecord(configuration.general) ? configuration.general : {};
@@ -719,6 +723,11 @@ async function loadReaderConfiguration() {
       form.identificationMethods.pin = pinEnabled;
       form.identificationMethods.idPassword = !pinEnabled;
     }
+    if (identifier.card_identification_enabled !== undefined) {
+      form.identificationMethods.card = isEnabledConfiguration(
+        identifier.card_identification_enabled,
+      );
+    }
   } catch (error: unknown) {
     console.warn("Unable to load HID reader configuration:", errorConverter(error));
   }
@@ -790,7 +799,13 @@ async function saveIdentificationMethod(method: HidIdentificationMethod) {
 
   savingSection.value = `method-${method}`;
   try {
-    if (method === "pin" || method === "idPassword") {
+    if (method === "card") {
+      await setReaderConfiguration(form.readerId, {
+        identifier: {
+          card_identification_enabled: form.identificationMethods.card ? "1" : "0",
+        },
+      });
+    } else if (method === "pin" || method === "idPassword") {
       if (method === "pin" && form.identificationMethods.pin) {
         form.identificationMethods.idPassword = false;
       } else if (method === "idPassword" && form.identificationMethods.idPassword) {

package/components/HidReaderManagement.vue

@@ -38,7 +38,12 @@
       <template #extension>
         <div class="app-filter-row hid-reader-filters">
           <AppField v-model="search" search placeholder="Search" />
-          <AppSelect v-model="status" :items="statusOptions" />
+          <AppSelect
+            v-model="status"
+            :items="statusOptions"
+            placeholder="Status"
+            clearable
+          />
         </div>
       </template>
 
@@ -256,7 +261,7 @@ const {
 
 const readers = ref<Record<string, any>[]>([]);
 const search = ref("");
-const status = ref("Status");
+const status = ref("");
 const loading = ref(false);
 const saving = ref(false);
 const actionLoading = ref(false);
@@ -280,7 +285,11 @@ const syncPreviewStats = ref({
 });
 const resultStats = ref<typeof syncPreviewStats.value | null>(null);
 
-const statusOptions = ["Status", "active", "inactive", "deleted", "offline"];
+const statusOptions = [
+  { title: "Active", value: "active" },
+  { title: "Inactive", value: "inactive" },
+  { title: "Offline", value: "offline" },
+];
 
 /**
  * The columns. NO `weight`, on purpose.
@@ -324,7 +333,7 @@ const filteredReaders = computed(() => {
       resolveReaderStatus(reader),
     ].some((value) => String(value ?? "").toLowerCase().includes(query));
 
-    const matchesStatus = status.value === "Status" || resolveReaderStatus(reader) === status.value;
+    const matchesStatus = !status.value || resolveReaderStatus(reader) === status.value;
 
     return matchesSearch && matchesStatus;
   });