@7365admin1/layer-common 3.0.24 → 3.0.26

package/components/HidIntercomManagement.vue

@@ -104,6 +104,7 @@
                       <v-list-item title="SIP Settings" @click="openSipDialog(row)" />
                       <v-list-item title="Call Settings" @click="openCallDialog(row)" />
                       <v-list-item title="Dial Code" @click="openDialCodeDialog(row)" />
+                      <v-list-item title="Make a call" @click="openMakeCallDialog(row)" />
                     </v-list>
                   </v-menu>
                 </td>
@@ -344,6 +345,55 @@
       </v-card>
     </v-dialog>
 
+    <v-dialog v-model="makeCallDialog" max-width="520" persistent>
+      <v-card class="form-dialog make-call-dialog" rounded="lg">
+        <v-card-title class="dialog-title">Make a Call</v-card-title>
+        <v-card-text class="dialog-body make-call-body">
+          <div class="make-call-field">
+            <div class="call-label">Address to dial</div>
+            <v-text-field
+              v-model="makeCallForm.target"
+              placeholder="Enter extension, address, or contact"
+              variant="outlined"
+              density="compact"
+              hide-details="auto"
+              class="call-input"
+              @keyup.enter="runMakeCall"
+            />
+          </div>
+          <div class="make-call-actions">
+            <v-btn
+              class="text-none make-call-primary"
+              variant="flat"
+              :loading="calling"
+              :disabled="!makeCallForm.target.trim()"
+              @click="runMakeCall"
+            >
+              Make a call
+            </v-btn>
+            <v-btn
+              class="text-none make-call-danger"
+              variant="flat"
+              :loading="hangingUp"
+              @click="runHangupCall"
+            >
+              Hang up call
+            </v-btn>
+          </div>
+          <div v-if="makeCallForm.status" class="make-call-status" :class="`is-${makeCallForm.statusType}`">
+            {{ makeCallForm.status }}
+          </div>
+          <div class="make-call-note">
+            The call will only be made if the equipment is on the idle or identification screen.
+          </div>
+        </v-card-text>
+        <v-card-actions class="dialog-actions pa-0">
+          <v-btn class="text-none action-cancel" variant="flat" height="44" @click="makeCallDialog = false">Cancel</v-btn>
+          <v-btn class="text-none action-submit" variant="flat" height="44" @click="makeCallDialog = false">Close</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
     <v-dialog v-model="contactDialog" max-width="360" persistent>
       <v-card class="form-dialog" rounded="lg">
         <v-card-title class="dialog-title">{{ contactForm.id ? 'Edit Contact' : 'Add Contact' }}</v-card-title>
@@ -461,6 +511,8 @@ const {
   setReaderConfiguration,
   runObjectOperation,
   getIntercomStatus,
+  makeIntercomCall,
+  finalizeIntercomCall,
 } = useHidAmico();
 
 const activeTab = ref<IntercomTab>("intercom");
@@ -470,6 +522,8 @@ const contacts = ref<ContactRow[]>([]);
 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 page = ref(1);
@@ -484,6 +538,7 @@ const rebootConfirmDialog = ref(false);
 const rebootingDialog = ref(false);
 const callDialog = ref(false);
 const dialCodeDialog = ref(false);
+const makeCallDialog = ref(false);
 const contactDialog = ref(false);
 const contactViewDialog = ref(false);
 const deleteContactDialog = ref(false);
@@ -556,6 +611,12 @@ const dialForm = reactive({
   code: "",
 });
 
+const makeCallForm = reactive({
+  target: "",
+  status: "",
+  statusType: "info" as MessageType,
+});
+
 const contactForm = reactive({
   id: undefined as number | undefined,
   readerId: "",
@@ -882,6 +943,14 @@ function openDialCodeDialog(row: IntercomRow) {
   dialCodeDialog.value = true;
 }
 
+function openMakeCallDialog(row: IntercomRow) {
+  selectedRow.value = row;
+  makeCallForm.target = row.extension !== "N/A" ? row.extension : "";
+  makeCallForm.status = "";
+  makeCallForm.statusType = "info";
+  makeCallDialog.value = true;
+}
+
 function openContactDialog(contact?: ContactRow) {
   selectedContact.value = contact || null;
   contactForm.id = contact?.id;
@@ -947,6 +1016,51 @@ async function saveDialCode() {
   dialCodeDialog.value = false;
 }
 
+async function runMakeCall() {
+  if (!selectedRow.value) return;
+  const target = makeCallForm.target.trim();
+  if (!target) {
+    makeCallForm.status = "Please enter an address to dial.";
+    makeCallForm.statusType = "warning";
+    return;
+  }
+
+  calling.value = true;
+  makeCallForm.status = "";
+  try {
+    await makeIntercomCall(selectedRow.value.reader._id, target);
+    makeCallForm.status = `Calling ${target}.`;
+    makeCallForm.statusType = "success";
+    showMessage(`Calling ${target}.`, "success");
+  } catch (error: any) {
+    const message = getErrorMessage(error);
+    makeCallForm.status = message;
+    makeCallForm.statusType = "error";
+    showMessage(message, "error");
+  } finally {
+    calling.value = false;
+  }
+}
+
+async function runHangupCall() {
+  if (!selectedRow.value) return;
+  hangingUp.value = true;
+  makeCallForm.status = "";
+  try {
+    await finalizeIntercomCall(selectedRow.value.reader._id);
+    makeCallForm.status = "Call ended.";
+    makeCallForm.statusType = "success";
+    showMessage("Intercom call ended.", "success");
+  } catch (error: any) {
+    const message = getErrorMessage(error);
+    makeCallForm.status = message;
+    makeCallForm.statusType = "error";
+    showMessage(message, "error");
+  } finally {
+    hangingUp.value = false;
+  }
+}
+
 async function savePjsip(readerId: string, payload: Record<string, string>, options: { showSuccessMessage?: boolean } = {}) {
   saving.value = true;
   try {
@@ -1745,6 +1859,78 @@ export default {
   margin-bottom: 0;
 }
 
+.make-call-dialog {
+  width: 520px;
+  max-width: 94vw;
+}
+
+.make-call-body {
+  display: grid;
+  gap: 18px;
+  padding: 20px 24px 26px;
+}
+
+.make-call-field {
+  max-width: 320px;
+}
+
+.make-call-actions {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+  gap: 18px;
+  align-items: center;
+}
+
+.make-call-primary,
+.make-call-danger {
+  min-height: 46px;
+  border-radius: 0;
+  color: #fff;
+  font-size: 14px;
+  letter-spacing: 0;
+}
+
+.make-call-primary {
+  background: #06324f;
+}
+
+.make-call-danger {
+  background: #d91345;
+}
+
+.make-call-status {
+  padding: 10px 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 1.4;
+}
+
+.make-call-status.is-success {
+  background: #e7f7ec;
+  color: #17833b;
+}
+
+.make-call-status.is-warning {
+  background: #fff7db;
+  color: #8a5b00;
+}
+
+.make-call-status.is-error {
+  background: #fde8e8;
+  color: #b42318;
+}
+
+.make-call-status.is-info {
+  background: #edf4ff;
+  color: #075fb7;
+}
+
+.make-call-note {
+  color: #5d6673;
+  font-size: 13px;
+  line-height: 1.45;
+}
+
 .call-two-col {
   gap: 12px;
 }

package/components/HidReaderManagement.vue

@@ -859,12 +859,32 @@ function getFriendlyHidError(error: any) {
     return "Unable to verify the HID reader session. Please check the reader username and password, then try again.";
   }
 
+  if (
+    message.includes("status 401") ||
+    message.includes("401 Authorization Required") ||
+    lowerMessage.includes("authorization required")
+  ) {
+    return "Unable to authorize the HID gateway connection. Please check the relay credentials on the server, then try again.";
+  }
+
+  if (message.includes("status 403") || lowerMessage.includes("forbidden")) {
+    return "The HID gateway rejected this request. Please check the relay access permissions and try again.";
+  }
+
+  if (message.includes("status 404") || lowerMessage.includes("not found")) {
+    return "The HID gateway endpoint could not be found. Please check the reader Base URL and try again.";
+  }
+
+  if (lowerMessage.includes("<html") || lowerMessage.includes("<!doctype")) {
+    return "The HID gateway returned an unexpected response. Please check the relay configuration and try again.";
+  }
+
   if (message.includes("reader is not active")) {
     return "This HID reader is not active. Please enable the reader before syncing.";
   }
 
   if (message.includes("HID Amico request failed:")) {
-    return message;
+    return "The HID device rejected the request. Please check the reader connection and try again.";
   }
 
   return message || "The HID device rejected the request. Please check the reader connection and try again.";

package/components/Nfc/NFCPatrolReportMain.vue

@@ -24,6 +24,7 @@
         <v-window-item value="patrol">
           <PatrolReportTab
             :active="activeTab === 'patrol'"
+            :site="site"
             :filters="filters"
             :options="options"
             @update:filters="updateFilters"

package/components/Nfc/PatrolReport/PatrolReportTab.vue

@@ -43,6 +43,7 @@ import ReportLocationHeader from "./ReportLocationHeader.vue";
 
 const props = defineProps<{
   active: boolean;
+  site: string;
   filters: NFCPatrolReportFilters;
   options: NFCPatrolReportFilterOptions;
 }>();
@@ -59,7 +60,7 @@ const {
   dialogRemarks,
   fetchReport,
   openRemarksDialog,
-} = useNFCPatrolReport(props.filters);
+} = useNFCPatrolReport(props.filters, props.site);
 
 watch(
   () => [props.filters.route, props.filters.timeRange, props.filters.date, props.active],

package/components/Nfc/PatrolReport/ReportFilters.vue

@@ -4,6 +4,8 @@
       <v-select
         :model-value="modelValue.route"
         :items="options.routes"
+        item-title="title"
+        item-value="value"
         label="Select Route"
         variant="outlined"
         density="comfortable"
@@ -18,7 +20,7 @@
       <v-select
         :model-value="modelValue.timeRange"
         :items="options.timeRanges"
-        label="Time Range"
+        label="Start Time"
         variant="outlined"
         density="comfortable"
         rounded="lg"

package/components/RolePermissionMain.vue

@@ -58,7 +58,7 @@
             <span class="text-caption font-weight-bold text-capitalize">
               permissions
             </span>
-            <v-chip>{{ value.length }}</v-chip>
+            <v-chip>{{ getPermissionCount(value) }}</v-chip>
           </template>
 
           <template #item.action-table="{ item }" v-if="canDeleteRole">
@@ -265,10 +265,22 @@ const selectedPermissions = ref<Array<string>>([]);
 const originalPermissions = ref<Array<string>>([]);
 const edit = ref(false);
 
-const { convertPermissionsToArray } = useUtils();
-
 const roleId = ref("");
 
+function getPermissionCount(permissions: unknown): number {
+  return Array.isArray(permissions) ? permissions.length : 0;
+}
+
+function updateRolePermissionsInList(
+  roles: Array<Record<string, any>>,
+  roleId: string,
+  permissions: string[]
+) {
+  return roles.map((role) =>
+    role._id === roleId ? { ...role, permissions } : role
+  );
+}
+
 const { getRoleById: _getRoleById, deleteRole } = useRole();
 
 const { data: role, refresh: getRoleById } = useLazyAsyncData(
@@ -324,9 +336,26 @@ const Permissions = computed(() => {
 });
 
 function successfulUpdate() {
+  const savedPermissions = [...selectedPermissions.value];
+
   previewDialog.value = false;
-  getRoles();
-  useLocalSetup(props.type);
+  edit.value = false;
+  originalPermissions.value = savedPermissions;
+  items.value = updateRolePermissionsInList(
+    items.value,
+    roleId.value,
+    savedPermissions
+  );
+  void refreshRolesAfterUpdate(savedPermissions);
+}
+
+async function refreshRolesAfterUpdate(savedPermissions: string[]) {
+  await getRoles();
+  items.value = updateRolePermissionsInList(
+    items.value,
+    roleId.value,
+    savedPermissions
+  );
 }
 
 const confirmDialog = ref(false);

package/components/SiteSettings.vue

@@ -371,7 +371,9 @@ function show(message: string, color: string) {
 }
 
 // ANPR Settings
-const { getANPRSettingBySite, createUpdateANPRSettings } = useANPRSettings();
+const { getANPRSettingBySite, createUpdateANPRSettings } = useANPRSettings(
+  props.siteId
+);
 const isSaving = ref(false);
 
 // Reactive object to hold the state of the 3 switches