@7365admin1/layer-common 4.35.1-staging.384 → 4.36.0

package/components/HidAccessLogDashboard.vue

@@ -376,7 +376,6 @@ const visitorRecords = ref<Record<string, HidAccessRecord>>({});
 const logs = ref<HidAccessRecord[]>([]);
 const liveAccessLogs = ref<HidAccessRecord[]>([]);
 const administratorUserIds = ref<Set<number>>(new Set());
-const { selectHidReader, resolveForSite } = useHidReaderSelection();
 const selectedReaderId = ref("");
 const activeTab = ref<AccessTab>("all");
 const search = ref("");
@@ -402,10 +401,7 @@ const exportForm = reactive({
 });
 
 const statusOptions = ["Authorized", "Not Authorized", "Unknown"];
-const accessMethodFilterOptions = ["Facial", "QR Code", "ID and Password", "PIN", "Card", "Intercom"];
-
-/** The persisted event the resident app records when it opens a door on a call. */
-const INTERCOM_DOOR_OPEN_EVENT = "intercom_door_open";
+const accessMethodFilterOptions = ["Facial", "QR Code", "ID and Password", "PIN", "Card"];
 const accessMethodOptions = ["All", ...accessMethodFilterOptions];
 
 const readerOptions = computed(() =>
@@ -593,11 +589,9 @@ async function loadReaders() {
   if (!props.site) return;
   const response = await getReaders({ site: props.site, page: 1, limit: 100 });
   readers.value = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
-  /* Shared with every other HID screen — see `useHidReaderSelection`. The
-     resolver refuses a remembered reader that is not this site's, so a site
-     switch or a deleted reader falls back to the first rather than querying
-     an id the site does not own. */
-  selectedReaderId.value = resolveForSite(props.site, readers.value);
+  if (!selectedReaderId.value && readers.value.length) {
+    selectedReaderId.value = readers.value[0]._id;
+  }
 }
 
 async function loadDashboard() {
@@ -612,7 +606,7 @@ async function loadDashboard() {
   resetDashboardData();
   try {
     const isVisitorTab = activeTab.value === "visitor";
-    const [logResponse, intercomLogResponse, hidAccessLogResponse, visitorResponse, readerUserResponse] = await Promise.all([
+    const [logResponse, hidAccessLogResponse, visitorResponse, readerUserResponse] = await Promise.all([
       loadDashboardSource(
         getLogs(selectedReaderId.value, {
           page: page.value,
@@ -621,20 +615,6 @@ async function loadDashboard() {
         null,
         "persisted access logs",
       ),
-      // Door opens from the resident app during an intercom call. The reader
-      // never logs a DTMF door open, so these exist only as persisted events
-      // and are fetched by type: the general page above is shared with every
-      // other event the reader emits and is dropped whenever the reader has
-      // live logs, which it always has.
-      loadDashboardSource(
-        getLogs(selectedReaderId.value, {
-          page: page.value,
-          limit,
-          type: INTERCOM_DOOR_OPEN_EVENT,
-        }),
-        null,
-        "intercom door-open logs",
-      ),
       loadDashboardSource(
         getReaderAccessLogs(selectedReaderId.value, {
           page: page.value,
@@ -701,14 +681,9 @@ async function loadDashboard() {
     // identity metadata here: it can contain a stale photo from another user.
     allIdentities.value = readerUsers;
     identities.value = readerUsers;
-    const intercomItems = intercomLogResponse?.items ?? intercomLogResponse?.data?.items ?? intercomLogResponse?.data?.logs ?? [];
-    logs.value = [
-      ...(liveItems.length
-        ? []
-        : logResponse?.items ?? logResponse?.data?.items ?? logResponse?.data?.logs ?? []),
-      // Always kept: the reader has no live counterpart for these.
-      ...intercomItems,
-    ];
+    logs.value = liveItems.length
+      ? []
+      : logResponse?.items ?? logResponse?.data?.items ?? logResponse?.data?.logs ?? [];
     liveAccessLogs.value = liveItems;
     serverPages.value = Number(hidAccessLogResponse?.pages ?? hidAccessLogResponse?.data?.pages ?? 1);
     serverPageRange.value = String(
@@ -844,8 +819,6 @@ function getAccessMethod(identity: HidAccessRecord, log?: HidAccessRecord) {
     id_password: "ID and Password",
     pin: "PIN",
     card: "Card",
-    // Set by the API on intercom_door_open events; no reader field implies it.
-    intercom: "Intercom",
   };
   const normalizedMethod = String(payload.normalizedMethod || "");
   if (normalizedMethodLabels[normalizedMethod]) return normalizedMethodLabels[normalizedMethod];
@@ -860,36 +833,11 @@ function getAccessMethod(identity: HidAccessRecord, log?: HidAccessRecord) {
   return identity.metadata?.facialData || identity.metadata?.imageTimestamp ? "Facial" : "N/A";
 }
 
-/**
- * One shape for the whole Access Date and Time column: `15:18:43 23/9/2026`.
- *
- * Reader rows arrive as a number and went through `formatHidEpochDate`; an
- * intercom door open never touches the reader, so the API writes it as an ISO
- * string and this branch took `toLocaleString` instead - which put
- * "9/23/2026, 2:15:29 PM" in the same column, one row below "15:18:43
- * 23/9/2026". Both branches now build the same string.
- *
- * Local parts here, UTC parts there, on purpose: the reader encodes its own
- * wall clock as if it were UTC, while an ISO string is a real instant. Reading
- * each the way it was written is what makes both columns show the time that was
- * on the clock at the door.
- */
 function formatDate(value?: string | number) {
   if (!value) return "N/A";
   if (typeof value === "number") return formatHidEpochDate(value);
-  const date = new Date(value);
-  if (Number.isNaN(date.getTime())) return "N/A";
-  return formatClock(
-    [date.getHours(), date.getMinutes(), date.getSeconds()],
-    date.getDate(),
-    date.getMonth() + 1,
-    date.getFullYear(),
-  );
-}
-
-function formatClock(time: number[], day: number, month: number, year: number) {
-  const clock = time.map((part) => String(part).padStart(2, "0")).join(":");
-  return `${clock} ${day}/${month}/${year}`;
+  const date = typeof value === "number" ? new Date(value * 1000) : new Date(value);
+  return Number.isNaN(date.getTime()) ? "N/A" : date.toLocaleString();
 }
 
 function parseDate(value?: string | number) {
@@ -919,12 +867,13 @@ function formatHidEpochDate(value: number) {
   const date = new Date(value * 1000);
   if (Number.isNaN(date.getTime())) return "N/A";
 
-  return formatClock(
-    [date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds()],
-    date.getUTCDate(),
-    date.getUTCMonth() + 1,
-    date.getUTCFullYear(),
-  );
+  const time = [
+    date.getUTCHours(),
+    date.getUTCMinutes(),
+    date.getUTCSeconds(),
+  ].map((part) => String(part).padStart(2, "0")).join(":");
+
+  return `${time} ${date.getUTCDate()}/${date.getUTCMonth() + 1}/${date.getUTCFullYear()}`;
 }
 
 function openHistoryDialog(row: AccessRow) {
@@ -1599,12 +1548,6 @@ function escapeHtml(value: unknown) {
     .replace(/"/g, "&quot;")
     .replace(/'/g, "&#039;");
 }
-
-/* Publish every change, including the seed above: a screen that had to fall
-   back to the first reader should leave the others agreeing with it. */
-watch(selectedReaderId, (value) => {
-  if (value) selectHidReader(props.site, value);
-});
 </script>
 
 <style scoped>

package/components/HidIntercomManagement.vue

@@ -162,8 +162,11 @@
             />
             <v-list-item class="screen-menu__item" title="Call Settings" prepend-icon="mdi-cog" @click="openCallDialog(item)" />
             <v-list-item class="screen-menu__item" title="Dial Code" prepend-icon="mdi-dialpad" @click="openDialCodeDialog(item)" />
+            <v-list-item class="screen-menu__item" title="Make a call" prepend-icon="mdi-phone" @click="openMakeCallDialog(item)" />
+            <v-list-item class="screen-menu__item" title="Web call" prepend-icon="mdi-headset" @click="openWebPhoneDialog(item)" />
           </v-list>
           <v-list v-else density="compact" class="screen-menu">
+            <v-list-item class="screen-menu__item" title="Call" prepend-icon="mdi-phone" @click="openContactCall(item)" />
             <v-list-item class="screen-menu__item" title="Check reader SIP status" prepend-icon="mdi-lan-check" @click="testContactSipStatus(item)" />
             <v-list-item class="screen-menu__item" title="View" prepend-icon="mdi-eye" @click="openContactView(item)" />
             <v-list-item class="screen-menu__item" title="Edit" prepend-icon="mdi-pencil" @click="openContactDialog(item)" />
@@ -586,36 +589,9 @@
             :disabled="Boolean(contactForm.id)"
           />
           <FieldLabel text="Name" required />
-          <!-- The name is picked from the site's SIP accounts (`hid-sip-accounts`)
-               rather than typed, so a contact always names a person who holds an
-               extension. The model stays the plain name string the reader stores,
-               so `saveContact` is unchanged; an existing contact whose name is not
-               in the list still displays it (AppSelect falls back to the raw value). -->
-          <!-- Searchable: this is the one list on the screen that grows with
-               the estate, and the unit is part of every option's text, so the
-               box finds a person by name or by where they live. -->
-          <AppSelect
-            v-model="contactForm.name"
-            :items="sipAccountOptions"
-            :disabled="sipAccountsLoading"
-            :placeholder="sipAccountsLoading ? 'Loading SIP accounts…' : 'Name shown on calls'"
-            searchable
-            search-placeholder="Search name or unit"
-            class="my-3"
-            @update:model-value="applySipAccountToContact"
-          />
-          <p v-if="sipAccountsError" class="field-hint field-hint--error">{{ sipAccountsError }}</p>
-          <p v-else-if="!sipAccountsLoading && !sipAccounts.length" class="field-hint">
-            No SIP accounts on this site yet. An account is created the first time a user opens Web Call.
-          </p>
+          <AppField v-model="contactForm.name" placeholder="Name shown on calls" class="my-3" />
           <FieldLabel text="Address" required />
-          <!-- Always read-only: it shows the extension of the chosen SIP account
-               and is never typed into. -->
-          <AppField
-            v-model="contactForm.serverAddress"
-            :placeholder="contactAddressPlaceholder"
-            disabled
-          />
+          <AppField v-model="contactForm.serverAddress" :placeholder="contactAddressPlaceholder" />
           <p class="field-hint">{{ contactAddressHint }}</p>
         </v-card-text>
         <v-card-actions class="dialog-actions pa-0">
@@ -660,8 +636,6 @@
 </template>
 
 <script setup lang="ts">
-import type { HidSipAccountListItem } from "../composables/useHidAmico";
-
 const props = defineProps({
   org: {
     type: String,
@@ -758,8 +732,6 @@ const {
   makeIntercomCall,
   finalizeIntercomCall,
   ensureSipAccount,
-  getSipAccounts,
-  notifyIntercomCall,
 } = useHidAmico();
 
 const activeTab = ref<IntercomTab>("intercom");
@@ -788,11 +760,6 @@ const webPhoneActionLoading = ref(false);
 const sipAccount = ref<SipAccount | null>(null);
 const sipAccountLoading = ref(false);
 const sipAccountError = ref("");
-// The site's SIP account list for the contact dialog's name picker. Distinct
-// from `sipAccount` above, which is the CALLER's own account for the web phone.
-const sipAccounts = ref<HidSipAccountListItem[]>([]);
-const sipAccountsLoading = ref(false);
-const sipAccountsError = ref("");
 const remoteVideoEl = ref<HTMLVideoElement | null>(null);
 const remoteAudioEl = ref<HTMLAudioElement | null>(null);
 const webPhone = useSipWebPhone();
@@ -897,58 +864,6 @@ const readerOptions = computed(() => readers.value.map((reader) => ({
   value: reader._id,
 })));
 
-/**
- * "Harris - Blk 1/Level 1/Unit 1" - the name a contact is stored under.
- *
- * The unit belongs in the name itself, not only in the picker's label: the
- * reader's contact list is what a visitor reads off the door panel, and
- * "Harris" alone does not say which home it rings. An account whose owner has
- * no address, and every account until the API ships the `unitLabel` field,
- * falls back to the bare name rather than trailing a separator.
- */
-function buildContactName(account: HidSipAccountListItem) {
-  const unit = String(account.unitLabel ?? "").trim();
-  return unit ? `${account.name} - ${unit}` : account.name;
-}
-
-/**
- * The contact name picker. `value` is the composed name because that is what
- * the reader stores and what `saveContact` sends; the extension goes into the
- * Address field, not the label. A name that already sits on the contact being
- * edited but is no longer in the SIP list is kept as an option so the picker
- * does not silently drop it.
- */
-const sipAccountOptions = computed(() => {
-  const options: Array<{ title: string; value: string }> = sipAccounts.value
-    .filter((account: HidSipAccountListItem) => account.name)
-    .map((account: HidSipAccountListItem) => {
-      const name = buildContactName(account);
-      return { title: name, value: name };
-    });
-  const current = contactForm.name.trim();
-  if (current && !options.some((option) => option.value === current)) {
-    options.unshift({ title: current, value: current });
-  }
-  return options;
-});
-
-/**
- * The SIP account behind a stored contact name, or null when the name is not
- * one. The bare name is matched as well as the composed one, so a contact
- * created before the unit was part of the name still resolves to its account
- * on edit instead of looking unrecognised.
- */
-function findSipAccount(name: string) {
-  const value = name.trim();
-  if (!value) return null;
-  const match = sipAccounts.value.find((account: HidSipAccountListItem) => buildContactName(account) === value)
-    ?? sipAccounts.value.find((account: HidSipAccountListItem) => account.name === value);
-  return (match ?? null) as HidSipAccountListItem | null;
-}
-
-/** The SIP account behind the picked name, or null for a legacy / unpicked name. */
-const selectedSipAccount = computed(() => findSipAccount(contactForm.name));
-
 const visibleRows = computed(() => activeTab.value === "intercom" ? filteredIntercomRows.value : filteredContacts.value);
 const pages = computed(() => Math.max(1, Math.ceil(visibleRows.value.length / limit)));
 const pageRange = computed(() => {
@@ -1061,11 +976,14 @@ const contactReaderRow = computed(() =>
 );
 const isContactReaderPeerToPeer = computed(() => contactReaderRow.value?.operatingMode === "Peer-to-Peer");
 const contactAddressPlaceholder = computed(() => (isContactReaderPeerToPeer.value ? "192.168.0.129" : "7100"));
-const contactAddressHint = computed(() => (
-  selectedSipAccount.value
-    ? "Extension of the selected SIP account."
-    : "Filled from the SIP account of the name selected above."
-));
+const contactAddressHint = computed(() => {
+  if (!contactReaderRow.value) {
+    return "Extension number (SIP Client) or local IP address (Peer-to-Peer), depending on the reader's operating mode.";
+  }
+  return isContactReaderPeerToPeer.value
+    ? "Peer-to-Peer mode: enter the contact's local IP address."
+    : "SIP Client mode: enter the contact's extension number.";
+});
 const areSipCredentialFieldsDisabled = computed(() => !sipForm.enabled || isPeerToPeerMode.value);
 const intercomDetailSections = computed(() => {
   const row = selectedRow.value;
@@ -1481,37 +1399,6 @@ async function loadSipAccount() {
   }
 }
 
-async function loadSipAccounts() {
-  if (!props.org || !props.site) return;
-
-  sipAccountsLoading.value = true;
-  sipAccountsError.value = "";
-  try {
-    const response = await getSipAccounts(props.site, props.org);
-    const rows = toRecord(response).data;
-    sipAccounts.value = Array.isArray(rows) ? rows as HidSipAccountListItem[] : [];
-    // An existing contact opened before the list arrived: once its name is
-    // matched to an account, show that account's extension in the locked field.
-    applySipAccountToContact(contactForm.name.trim());
-  } catch (error: unknown) {
-    sipAccounts.value = [];
-    sipAccountsError.value = getErrorMessage(error);
-  } finally {
-    sipAccountsLoading.value = false;
-  }
-}
-
-/**
- * Picking a SIP account sets the address to its extension. The Address field
- * is always disabled, so this is the only way it gets a value; a name that is
- * not an account (a legacy contact) leaves whatever address it already had.
- */
-function applySipAccountToContact(name: string) {
-  const account = findSipAccount(name);
-  if (!account) return;
-  contactForm.serverAddress = account.extension;
-}
-
 async function connectWebPhone() {
   const account = sipAccount.value;
   if (!account) {
@@ -1555,10 +1442,8 @@ async function disconnectWebPhone() {
 
 async function startWebCall() {
   webPhoneActionLoading.value = true;
-  const destination = webPhoneForm.destination;
   try {
-    await webPhone.call(destination);
-    void ringResidentPhone(destination);
+    await webPhone.call(webPhoneForm.destination);
   } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
@@ -1566,50 +1451,6 @@ async function startWebCall() {
   }
 }
 
-/**
- * Wake the called resident's mobile so they are there to answer.
- *
- * Deliberately fired AFTER the INVITE and never awaited. The SIP leg is the
- * call: it is already ringing by the time this runs, and a resident whose
- * phone is asleep is the only thing this fixes. So a failure here is logged
- * and dropped rather than shown — telling the operator "call failed" for a
- * call that is ringing would be worse than a silent miss.
- *
- * A destination with no resident behind it (a staff extension, an external SIP
- * address) comes back `notified: false` with a reason and is not an error.
- */
-async function ringResidentPhone(destination: string) {
-  if (!props.org || !props.site) return;
-
-  try {
-    // No `readerId`: this call came from the web phone, not a door station.
-    // The reader selected in the table above is whatever the operator happens
-    // to be looking at, and sending it would tell the resident's app the call
-    // arrived at a door it never touched.
-    await notifyIntercomCall(props.site, {
-      orgId: props.org,
-      destination,
-      callId: createCallId(),
-    });
-  } catch (error: unknown) {
-    console.warn("[intercom] could not send the incoming-call push", error);
-  }
-}
-
-/**
- * A per-call id, so a second push for the same call replaces the first on the
- * resident's lock screen rather than stacking a second ringing card.
- * `randomUUID` needs a secure context, which the web phone already requires —
- * getUserMedia does not run without one — but the fallback keeps a call from
- * failing on that account alone.
- */
-function createCallId() {
-  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-    return crypto.randomUUID();
-  }
-  return `call-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-}
-
 async function answerWebCall() {
   webPhoneActionLoading.value = true;
   try {
@@ -1667,9 +1508,6 @@ function openContactDialog(contact?: ContactRow) {
   contactForm.location = contact?.location === "N/A" ? "" : contact?.location || selectedReader?.location || "";
   contactForm.serverAddress = contact?.serverAddress === "N/A" ? "" : contact?.serverAddress || "";
   contactDialog.value = true;
-  // Fetched on every open, not cached: an account is provisioned the first
-  // time a user opens Web Call, so the list can grow between two dialogs.
-  void loadSipAccounts();
 }
 
 function openContactView(contact: ContactRow) {
@@ -2258,10 +2096,6 @@ export default {
   line-height: 1.4;
 }
 
-.field-hint--error {
-  color: var(--err);
-}
-
 .sip-settings-dialog .field-label {
   margin-top: 14px;
 }