@7365admin1/layer-common 3.2.8-staging.204 → 3.2.8-staging.206

package/components/HidIntercomManagement.vue

@@ -238,7 +238,7 @@
           <AppField
             v-model="sipForm.password"
             :disabled="areSipCredentialFieldsDisabled"
-            placeholder="Enter password"
+            placeholder="Leave blank to keep current password"
             :type="showSipPassword ? 'text' : 'password'"
             autocomplete="new-password"
             class="sip-input"
@@ -653,6 +653,17 @@ type ContactRow = {
   dialCode: string;
 };
 
+type HidReader = Record<string, unknown> & {
+  _id: string;
+  name?: string;
+  deviceId?: string;
+  location?: string;
+  monitorPath?: string;
+  portalName?: string;
+  readerModel?: string;
+  capabilities?: unknown;
+};
+
 type SipAccount = {
   orgId: string;
   site: string;
@@ -718,7 +729,7 @@ const {
 } = useHidAmico();
 
 const activeTab = ref<IntercomTab>("intercom");
-const readers = ref<Record<string, any>[]>([]);
+const readers = ref<HidReader[]>([]);
 const selectedReaderId = ref("");
 const testingSipReaderId = ref("");
 const testingContactReaderId = ref("");
@@ -770,7 +781,6 @@ const pjsipKeys = [
   "numeric_branch_enabled",
   "branch",
   "login",
-  "password",
   "peer_to_peer_enabled",
   "reg_status_query_period",
   "server_retry_interval",
@@ -1064,14 +1074,21 @@ async function reload() {
   loading.value = true;
   try {
     const response = await getReaders({ site: props.site, page: 1, limit: 100 });
-    readers.value = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
+    const responseRecord = toRecord(response);
+    const responseData = toRecord(responseRecord.data);
+    const availableReaders = responseRecord.items ?? responseData.items ?? responseData.readers ?? [];
+    readers.value = (Array.isArray(availableReaders) ? availableReaders : [])
+      .map(toHidReader)
+      .filter((reader): reader is HidReader => (
+        reader !== null && reader.readerModel === "VL70LF" && toRecord(reader.capabilities).intercom === true
+      ));
     if (!readers.value.some((reader) => reader._id === selectedReaderId.value)) {
       selectedReaderId.value = readers.value[0]?._id || "";
     }
     intercomLoaded.value = false;
     contactsLoaded.value = false;
     await loadActiveTab();
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     loading.value = false;
@@ -1178,7 +1195,7 @@ function toIntercomRow(reader: Record<string, unknown>, pjsip: Record<string, un
     numericExtension: toFlag(getPjsipValue(pjsip, ["numeric_branch_enabled", "numericExtension", "numericExtensionEnabled"])) === "1",
     extension: toText(getPjsipValue(pjsip, ["branch", "extension"]), "N/A"),
     login: toText(getPjsipValue(pjsip, ["login", "username"]), "N/A"),
-    password: toText(getPjsipValue(pjsip, ["password"]), ""),
+    password: "",
     operatingMode: peerToPeer ? "Peer-to-Peer" : "SIP Client",
     protocol: toText(getPjsipValue(pjsip, ["protocol"]), "UDP"),
     videoEnabled: toFlag(getPjsipValue(pjsip, ["video_enabled", "videoEnabled"])) === "1",
@@ -1251,9 +1268,13 @@ function normalizeStatus(response: Record<string, unknown>, pjsip: Record<string
   return "Not connected";
 }
 
-function normalizeContacts(reader: Record<string, any>, response: Record<string, any>): ContactRow[] {
-  const items = response?.contacts ?? response?.values ?? response?.data?.contacts ?? response?.data ?? [];
-  return (Array.isArray(items) ? items : []).map((contact, index) => ({
+function normalizeContacts(reader: HidReader, response: unknown): ContactRow[] {
+  const responseRecord = toRecord(response);
+  const responseData = toRecord(responseRecord.data);
+  const items = responseRecord.contacts ?? responseRecord.values ?? responseData.contacts ?? responseRecord.data ?? [];
+  return (Array.isArray(items) ? items : []).map((value, index) => {
+    const contact = toRecord(value);
+    return {
     _rowKey: `${reader._id}-${contact.id ?? index}`,
     id: toNumber(contact.id, undefined),
     readerId: reader._id,
@@ -1261,7 +1282,8 @@ function normalizeContacts(reader: Record<string, any>, response: Record<string,
     location: reader.location || "N/A",
     serverAddress: toText(contact.number || contact.serverAddress, "N/A"),
     dialCode: toText(contact.number || contact.serverAddress, "N/A"),
-  }));
+    };
+  });
 }
 
 function openViewDialog(row: IntercomRow) {
@@ -1515,7 +1537,7 @@ async function saveSipSettings() {
     return;
   }
 
-  const saved = await savePjsip(selectedRow.value.reader._id, {
+  const payload: Record<string, string> = {
     enabled: sipForm.enabled ? "1" : "0",
     server_ip: sipForm.serverIp,
     server_port: sipForm.serverPort,
@@ -1524,10 +1546,15 @@ async function saveSipSettings() {
     numeric_branch_enabled: sipForm.numericExtension ? "1" : "0",
     branch: isPeerToPeer ? "" : sipForm.extension,
     login: isPeerToPeer ? "" : sipForm.login,
-    password: isPeerToPeer ? "" : sipForm.password,
     peer_to_peer_enabled: isPeerToPeer ? "1" : "0",
     video_enabled: sipForm.videoEnabled ? "1" : "0",
-  });
+  };
+  if (isPeerToPeer) {
+    payload.password = "";
+  } else if (sipForm.password) {
+    payload.password = sipForm.password;
+  }
+  const saved = await savePjsip(selectedRow.value.reader._id, payload);
   if (saved) {
     sipDialog.value = false;
   }
@@ -1579,7 +1606,7 @@ async function runMakeCall() {
     makeCallForm.status = `Calling ${target}.`;
     makeCallForm.statusType = "success";
     showMessage(`Calling ${target}.`, "success");
-  } catch (error: any) {
+  } catch (error: unknown) {
     const message = getErrorMessage(error);
     makeCallForm.status = message;
     makeCallForm.statusType = "error";
@@ -1602,7 +1629,7 @@ async function runHangupCall() {
     makeCallForm.status = "Call ended.";
     makeCallForm.statusType = "success";
     showMessage("Intercom call ended.", "success");
-  } catch (error: any) {
+  } catch (error: unknown) {
     const message = getErrorMessage(error);
     makeCallForm.status = message;
     makeCallForm.statusType = "error";
@@ -1667,7 +1694,7 @@ async function savePjsip(readerId: string, payload: Record<string, string>, opti
       showMessage("Intercom settings saved.", "success");
     }
     return true;
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
     return false;
   } finally {
@@ -1711,7 +1738,7 @@ async function saveContact() {
     contactDialog.value = false;
     await loadContacts();
     showMessage("Intercom contact saved.", "success");
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     contactsSaving.value = false;
@@ -1730,7 +1757,7 @@ async function deleteContact() {
     deleteContactDialog.value = false;
     await loadContacts();
     showMessage("Intercom contact deleted.", "success");
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     contactsSaving.value = false;
@@ -1791,6 +1818,12 @@ function toRecord(value: unknown): Record<string, unknown> {
   return typeof value === "object" && value !== null ? value as Record<string, unknown> : {};
 }
 
+function toHidReader(value: unknown): HidReader | null {
+  const reader = toRecord(value);
+  const id = toText(reader._id);
+  return id ? { ...reader, _id: id } : null;
+}
+
 function toText(value: unknown, fallback = "") {
   if (value === undefined || value === null || value === "") return fallback;
   return String(value);

package/components/HidQrCodeConfiguration.vue

@@ -368,6 +368,7 @@ const {
   getReaders,
   getReaderConfiguration,
   setReaderConfiguration,
+  setReaderOperatingMode,
   getSitePermissions,
   getPermissionCandidates,
   updateSitePermissions,
@@ -779,9 +780,7 @@ async function saveOnlineMode() {
 
   savingSection.value = "online-mode";
   try {
-    await setReaderConfiguration(form.readerId, {
-      general: { online: form.onlineMode ? "1" : "0" },
-    });
+    await setReaderOperatingMode(form.readerId, form.onlineMode ? "online" : "standalone");
     await updateSitebyId(props.site, buildPayload());
     showMessage("Online mode updated.", "success");
   } catch (error: unknown) {

package/components/HidReaderForm.vue

@@ -39,11 +39,15 @@
           class="mb-3"
         />
 
-        <InputLabel title="Monitor Path" required class="mb-1" />
-        <v-btn-toggle v-model="monitorEnabled" mandatory divided class="monitor-toggle mb-3">
+        <InputLabel title="Monitor Callback" required class="mb-1" />
+        <v-btn-toggle v-model="monitorEnabled" mandatory divided class="monitor-toggle">
           <v-btn :value="true" class="text-none">Enable</v-btn>
           <v-btn :value="false" class="text-none">Disable</v-btn>
         </v-btn-toggle>
+        <p class="reader-discovery-hint mt-1 mb-3">
+          Enable only when this reader can reach the IP address or domain configured on iService365.
+          Disabling keeps the reader in Standalone mode and uses manual log pulls instead.
+        </p>
 
         <InputLabel title="Username" required class="mb-1" />
         <v-text-field
@@ -98,6 +102,22 @@
           readonly
         />
 
+        <InputLabel title="Reader Model" required class="mb-1" />
+        <v-select
+          v-model="draft.readerModel"
+          :items="readerModelOptions"
+          aria-label="Reader Model"
+          placeholder="Select the model printed on the reader"
+          variant="outlined"
+          density="compact"
+          hide-details="auto"
+          class="mb-3"
+        />
+        <v-alert v-if="draft.readerModel === 'unknown'" type="warning" variant="tonal" density="compact" class="mb-3">
+          The Amico system-information API does not return the hardware model. Select VL35LF or VL70LF from the
+          label on the physical reader so model-specific features are enabled correctly.
+        </v-alert>
+
         <InputLabel title="HID Portal" required class="mb-1" />
         <v-select
           v-model="draft.portalId"
@@ -111,6 +131,64 @@
           hide-details="auto"
           :readonly="mode === 'edit'"
         />
+
+        <InputLabel title="Card Profile Configured on Reader" required class="mt-3 mb-1" />
+        <v-select
+          v-model="draft.cardReadingMode"
+          :items="cardModeOptions"
+          aria-label="Card Data Mode"
+          placeholder="Select the mode configured on the reader"
+          variant="outlined"
+          density="compact"
+          hide-details="auto"
+          class="mb-3"
+        />
+        <v-alert type="info" variant="tonal" density="compact" class="mb-3">
+          Match Menu &gt; Access &gt; Identification Methods &gt; Card Reading on the physical reader.
+          The Amico HTTP API does not expose the OMNIKEY card-profile setting for automatic verification.
+        </v-alert>
+
+        <template v-if="draft.cardReadingMode === 'csn' || draft.cardReadingMode === 'csn_for_mifare'">
+          <InputLabel title="CSN Byte Order" required class="mb-1" />
+          <v-select
+            v-model="draft.csnByteOrder"
+            :items="csnByteOrderOptions"
+            variant="outlined"
+            density="compact"
+            hide-details="auto"
+            class="mb-3"
+          />
+        </template>
+
+        <template v-if="draft.cardReadingMode === 'pacs'">
+          <InputLabel title="PACS Output Format" required class="mb-1" />
+          <v-select
+            v-model="draft.pacsFormat"
+            :items="pacsFormatOptions"
+            variant="outlined"
+            density="compact"
+            hide-details="auto"
+            class="mb-3"
+          />
+        </template>
+
+        <InputLabel title="Operating Mode" required class="mb-1" />
+        <v-select
+          v-model="draft.operatingMode"
+          :items="operatingModeOptions"
+          variant="outlined"
+          density="compact"
+          hide-details="auto"
+          :disabled="!monitorEnabled"
+        />
+        <p v-if="!monitorEnabled" class="reader-discovery-hint mt-1 mb-0">
+          Online mode requires an enabled and verified Monitor callback.
+        </p>
+
+        <p v-if="draft.readerModel || draft.firmwareVersion" class="reader-discovery-hint mt-3">
+          Detected: {{ draft.readerModel || "Unknown model" }}
+          <template v-if="draft.firmwareVersion"> · Firmware {{ draft.firmwareVersion }}</template>
+        </p>
       </v-card-text>
 
       <v-card-actions class="screen-modal__footer">
@@ -125,7 +203,7 @@
           class="text-none screen-btn-primary"
           variant="flat"
           :loading="loading"
-          :disabled="mode === 'add' && (!draft.deviceId || !draft.portalId)"
+          :disabled="mode === 'add' && (!draft.deviceId || !draft.portalId || draft.cardReadingMode === 'unconfigured')"
           @click="submit"
         >
           Submit
@@ -136,6 +214,42 @@
 </template>
 
 <script setup lang="ts">
+type HidReaderFormRecord = {
+  name?: string;
+  baseUrl?: string;
+  deviceId?: string;
+  portalId?: number;
+  portalName?: string;
+  location?: string;
+  username?: string;
+  password?: string;
+  readerModel?: "VL35LF" | "VL70LF" | "unknown" | "";
+  firmwareVersion?: string;
+  cardReadingMode?: "unconfigured" | "pacs" | "csn" | "csn_for_mifare";
+  csnByteOrder?: "msb" | "lsb";
+  pacsFormat?: "raw" | "wiegand";
+  operatingMode?: "standalone" | "online";
+  monitorStatus?: "unconfigured" | "configured" | "disabled" | "failed";
+};
+
+type HidReaderFormPayload = {
+  name: string;
+  baseUrl: string;
+  deviceId: string;
+  portalId: number | null;
+  portalName: string;
+  location: string;
+  username: string;
+  password: string;
+  readerModel: "VL35LF" | "VL70LF" | "unknown" | "";
+  firmwareVersion: string;
+  cardReadingMode: "unconfigured" | "pacs" | "csn" | "csn_for_mifare";
+  csnByteOrder: "msb" | "lsb";
+  pacsFormat: "raw" | "wiegand";
+  operatingMode: "standalone" | "online";
+  monitorEnabled: boolean;
+};
+
 const props = defineProps({
   modelValue: {
     type: Boolean,
@@ -146,9 +260,13 @@ const props = defineProps({
     default: "add",
   },
   reader: {
-    type: Object as () => Record<string, any> | null,
+    type: Object as () => HidReaderFormRecord | null,
     default: null,
   },
+  site: {
+    type: String,
+    required: true,
+  },
   loading: {
     type: Boolean,
     default: false,
@@ -164,7 +282,7 @@ const props = defineProps({
 
 const emit = defineEmits<{
   "update:modelValue": [value: boolean];
-  submit: [payload: Record<string, any>];
+  submit: [payload: HidReaderFormPayload];
 }>();
 
 const dialogModel = computed({
@@ -188,8 +306,36 @@ const draft = reactive({
   location: "",
   username: "",
   password: "",
+  readerModel: "" as "VL35LF" | "VL70LF" | "unknown" | "",
+  firmwareVersion: "",
+  cardReadingMode: "unconfigured" as "unconfigured" | "pacs" | "csn" | "csn_for_mifare",
+  csnByteOrder: "msb" as "msb" | "lsb",
+  pacsFormat: "raw" as "raw" | "wiegand",
+  operatingMode: "standalone" as "standalone" | "online",
 });
 
+const cardModeOptions = [
+  { title: "PACS (facility code + card number)", value: "pacs" },
+  { title: "CSN", value: "csn" },
+  { title: "CSN for MIFARE", value: "csn_for_mifare" },
+];
+const csnByteOrderOptions = [
+  { title: "MSB first", value: "msb" },
+  { title: "LSB first", value: "lsb" },
+];
+const pacsFormatOptions = [
+  { title: "RAW", value: "raw" },
+  { title: "Wiegand", value: "wiegand" },
+];
+const operatingModeOptions = [
+  { title: "Standalone", value: "standalone" },
+  { title: "Online", value: "online" },
+];
+const readerModelOptions = [
+  { title: "VL35LF", value: "VL35LF" },
+  { title: "VL70LF", value: "VL70LF" },
+];
+
 watch(
   () => [props.modelValue, props.reader],
   () => {
@@ -208,7 +354,13 @@ watch(
     draft.location = props.reader?.location ?? "";
     draft.username = props.reader?.username ?? "";
     draft.password = props.reader?.password ?? "";
-    monitorEnabled.value = props.reader?.enabled ?? true;
+    monitorEnabled.value = props.reader?.monitorStatus !== "disabled";
+    draft.readerModel = props.reader?.readerModel ?? "";
+    draft.firmwareVersion = props.reader?.firmwareVersion ?? "";
+    draft.cardReadingMode = props.reader?.cardReadingMode ?? "unconfigured";
+    draft.csnByteOrder = props.reader?.csnByteOrder ?? "msb";
+    draft.pacsFormat = props.reader?.pacsFormat ?? "raw";
+    draft.operatingMode = props.reader?.operatingMode ?? "standalone";
   },
   { immediate: true },
 );
@@ -235,11 +387,16 @@ watch(
   },
 );
 
+watch(monitorEnabled, (enabled) => {
+  if (!enabled) draft.operatingMode = "standalone";
+});
+
 async function connectReader() {
   discovering.value = true;
   discoveryError.value = "";
   try {
     const response = await discoverReader({
+      site: props.site,
       baseUrl: draft.baseUrl.trim(),
       username: draft.username.trim(),
       password: draft.password,
@@ -250,6 +407,13 @@ async function connectReader() {
       ? nestedData as Record<string, unknown>
       : response;
     draft.deviceId = String(data?.deviceId || "");
+    const discoveredModel = String(data?.readerModel || "unknown");
+    draft.readerModel = (
+      discoveredModel === "VL35LF" || discoveredModel === "VL70LF"
+        ? discoveredModel
+        : draft.readerModel || "unknown"
+    ) as typeof draft.readerModel;
+    draft.firmwareVersion = String(data?.firmwareVersion || data?.version || "");
     portals.value = Array.isArray(data?.portals)
       ? data.portals.flatMap((portal: unknown) => {
           if (typeof portal !== "object" || portal === null) return [];
@@ -278,13 +442,15 @@ async function connectReader() {
 }
 
 function submit() {
+  if (draft.readerModel !== "VL35LF" && draft.readerModel !== "VL70LF") {
+    discoveryError.value = "Select the model printed on the physical HID reader.";
+    return;
+  }
   const portal = portals.value.find((item) => item.id === Number(draft.portalId));
-  const payload: Record<string, any> = {
+  const payload: HidReaderFormPayload = {
     ...draft,
     portalName: portal?.name || draft.portalName,
-    monitorPath: monitorEnabled.value ? "api/notifications" : "",
-    enabled: monitorEnabled.value,
-    status: monitorEnabled.value ? "active" : "inactive",
+    monitorEnabled: monitorEnabled.value,
   };
 
   emit("submit", payload);