@7365admin1/layer-common 4.148.0 → 4.148.2

package/composables/useVisitorCameraChoices.ts

@@ -0,0 +1,61 @@
+import { defaultGateForSite, visitorCameras, visitorGateChoices } from "../utils/visitor-camera";
+import useSiteSettings from "./useSiteSettings";
+import useLocalAuth from "./useLocalAuth";
+
+/**
+ * The site's ANPR cameras a visit can be checked at (active Entry, Both Entry
+ * and Exit, Visitors - see `utils/visitor-camera.ts`) and the signed-in user's
+ * default gate there (`defaultCameraGate: [{ site, cameraGateNumber }]` on
+ * their user, picked on the visitor list). The cameras are read in the
+ * background; a failed read shows no camera icon and the server uses the
+ * site's first camera.
+ */
+export default function useVisitorCameraChoices(site: () => string) {
+  const { getAllSiteCameras } = useSiteSettings();
+  const { currentUser } = useLocalAuth();
+  const cameras = ref<unknown[]>([]);
+
+  async function load() {
+    const id = site();
+    if (!id) {
+      cameras.value = [];
+      return;
+    }
+    try {
+      const res = await getAllSiteCameras({ site: id, type: "anpr", limit: 100 });
+      cameras.value = Array.isArray((res as any)?.items) ? (res as any).items : [];
+    } catch {
+      cameras.value = [];
+    }
+  }
+
+  watch(site, load, { immediate: true });
+
+  /** The user's default gate at this site (sent as `anprGate`), or undefined. */
+  const defaultGate = computed(() =>
+    defaultGateForSite((currentUser.value as any)?.defaultCameraGate, site())
+  );
+
+  /** Save (or clear, `null`) the default gate at this site, on the user. */
+  async function saveDefaultGate(gate: number | null) {
+    const res = await useNuxtApp().$api<Record<string, any>>("/api/users/default-camera-gate", {
+      method: "PATCH",
+      body: { site: site(), gate },
+    });
+    if (currentUser.value) {
+      (currentUser.value as any).defaultCameraGate = Array.isArray(res?.defaultCameraGate)
+        ? res.defaultCameraGate
+        : [];
+    }
+    return res;
+  }
+
+  return {
+    /** How many active Entry / Both / Visitors cameras (the icon shows with more than one). */
+    count: computed(() => visitorCameras(cameras.value).length),
+    choices: computed(() => visitorGateChoices(cameras.value)),
+    defaultGate,
+    saveDefaultGate,
+    reload: load,
+  };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.148.0",
+  "version": "4.148.2",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/types/camera.d.ts

@@ -28,5 +28,7 @@ declare type TSiteCamera = {
   direction: "entry" | "exit" | "both" | "none";
   name?: string;
   guardPost: number | null;
+  /** ANPR cameras: the gate (1-20) it watches; one camera per gate at a site. */
+  gate?: number | null;
   status: string;
 };

package/utils/anpr-direction.ts

@@ -12,8 +12,11 @@ export const isAllowCameraDirection = (direction: unknown): boolean =>
     String(direction ?? "").trim().toLowerCase(),
   );
 
-/** ANPR camera types that carry blocked plates: every type except Exit. */
-export const BLOCK_CAMERA_DIRECTIONS = ["entry", "both", "residents", "visitors"];
+/**
+ * ANPR camera types that carry blocked plates: every type, Exit included
+ * (owner, 2026-10-23). Mirrors `BLOCK_CAMERA_DIRECTIONS` in iservice365-core.
+ */
+export const BLOCK_CAMERA_DIRECTIONS = ["entry", "both", "residents", "visitors", "exit"];
 
 export const isBlockCameraDirection = (direction: unknown): boolean =>
   BLOCK_CAMERA_DIRECTIONS.includes(
@@ -48,8 +51,8 @@ export const listsFilledByDirectionChange = (
  * Mirrors `listsClearedByDirectionChange` in iservice365-core, which refuses
  * the change unless it is confirmed, so the form asks first.
  *
- * - To Exit: the allowed list and the blocklist.
- * - Entry / Both / Residents to Visitors: the allowed list.
+ * - Entry / Both / Residents to Visitors or Exit: the allowed list. Both
+ *   keep their blocklist (every camera holds the blocked plates).
  * - Anything else: nothing.
  */
 export const listsClearedByDirectionChange = (
@@ -61,8 +64,6 @@ export const listsClearedByDirectionChange = (
 
   if (!after || after === before) return { allow: false, block: false };
 
-  if (after === "exit") return { allow: true, block: true };
-
   return {
     allow: isAllowCameraDirection(before) && !isAllowCameraDirection(after),
     block: false,

package/utils/vehicle-actions.ts

@@ -27,7 +27,11 @@ export type VehicleActionPermissions = {
   canUpdateVehicle?: boolean;
   canDeleteVehicle?: boolean;
   canApproveVehicle?: boolean;
-  /** Block / Unblock. Omitted = allowed (today's behaviour). */
+  /**
+   * Block / Unblock, and every write on a Block Listed plate (type blocklist):
+   * Edit, Delete and Restore on it alone, Approve together with
+   * `canApproveVehicle`. Omitted = today's rule (Update / Delete / Approve).
+   */
   canManageBlocklist?: boolean;
 };
 
@@ -89,13 +93,27 @@ export function vehiclePlateActions(
     permissions.canManageBlocklist === undefined
       ? canUpdate
       : !!permissions.canManageBlocklist;
+  // A Block Listed plate's Edit and Delete follow Manage Blocklist when the
+  // host passes it (owner, 2026-10-23); other plates keep their own boxes.
+  const blocklistGoverned =
+    type === "blocklist" && permissions.canManageBlocklist !== undefined;
+  const canEdit = blocklistGoverned ? canBlock : canUpdate;
+  const canDelete = blocklistGoverned
+    ? canBlock
+    : !!permissions.canDeleteVehicle;
+  // Approve a pending Block Listed plate: Manage Blocklist AND Approve Vehicle.
+  const canApprove = blocklistGoverned
+    ? canBlock && !!permissions.canApproveVehicle
+    : !!permissions.canApproveVehicle;
+  // Restore (a write, through the approve endpoint): Manage Blocklist alone.
+  const canRestore = blocklistGoverned ? canBlock : !!permissions.canApproveVehicle;
   const actions: VehicleAction[] = [];
 
-  if (canUpdate && (isAllowed || isBlocked)) {
+  if (canEdit && (isAllowed || isBlocked)) {
     actions.push({ key: "edit", title: "Edit Vehicle", icon: "mdi-pencil" });
   }
 
-  if (permissions.canApproveVehicle && isPending) {
+  if (canApprove && isPending) {
     actions.push({
       key: "approve",
       title: "Approve",
@@ -109,7 +127,7 @@ export function vehiclePlateActions(
   // with "You do not have permission to approve vehicles." without it. It
   // used to be offered to everyone, so a role without the right saw Restore,
   // pressed it and was refused - and it could not be hidden on that refusal.
-  if (permissions.canApproveVehicle && isRestorable) {
+  if (canRestore && isRestorable) {
     actions.push({
       key: "restore",
       title: "Restore",
@@ -144,7 +162,7 @@ export function vehiclePlateActions(
     });
   }
 
-  if (permissions.canDeleteVehicle && (isAllowed || isBlocked)) {
+  if (canDelete && (isAllowed || isBlocked)) {
     actions.push({
       key: "delete",
       title: "Delete",

package/utils/visitor-barrier.ts

@@ -0,0 +1,42 @@
+/**
+ * What the screen says after a visitor is added, registered or checked in
+ * (owner, 2026-10-23): the action, then whether the ANPR barrier opened -
+ * "Opening Barrier Failed." in red. Mirrors isecure365's `visitor-barrier.ts`.
+ * The server reports `barrier: "opened" | "failed"`, absent when no barrier
+ * was asked to open, and `barrierCamera`: the camera's type and gate, "Entry
+ * Gate 1" - absent from older servers and for a camera with no gate saved.
+ */
+export type TBarrierOutcome = "opened" | "failed";
+
+export const VISITOR_ACTION_SUCCESS = {
+  add: "Add Visitor Success.",
+  register: "Register Visitor Success.",
+  checkIn: "Check In Visitor Success.",
+} as const;
+
+export const BARRIER_MESSAGES: Record<TBarrierOutcome, string> = {
+  opened: "Opening Barrier Success.",
+  failed: "Opening Barrier Failed.",
+};
+
+/**
+ * The barrier line: "Opening Barrier Success at Entry Gate 1." - or the plain
+ * "Opening Barrier Success." when the camera is not named.
+ */
+export function barrierMessage(outcome: TBarrierOutcome, camera?: string): string {
+  const plain = BARRIER_MESSAGES[outcome];
+  const name = String(camera ?? "").trim();
+  return name ? `${plain.replace(/\.$/, "")} at ${name}.` : plain;
+}
+
+/** The camera named in a server reply ("Entry Gate 1"), if it has one. */
+export function barrierCameraOf(data: unknown): string | undefined {
+  const value = (data as { barrierCamera?: unknown } | null | undefined)?.barrierCamera;
+  return typeof value === "string" && value.trim() ? value.trim() : undefined;
+}
+
+/** The barrier outcome in a server reply, if it has one. */
+export function barrierOf(data: unknown): TBarrierOutcome | undefined {
+  const value = (data as { barrier?: unknown } | null | undefined)?.barrier;
+  return value === "opened" || value === "failed" ? value : undefined;
+}

package/utils/visitor-camera.ts

@@ -0,0 +1,80 @@
+/**
+ * The ANPR camera a visit is checked at for a blocked plate and whose barrier
+ * opens for it (owner, 2026-10-23). Mirrors isecure365's
+ * `visitor-camera.helpers.ts`.
+ *
+ * Only an ACTIVE camera of type Entry, Both Entry and Exit or Visitors can do
+ * that. When a site has more than one, the user may pick a default from the
+ * visitor list (a camera icon beside the pagination); it is saved per site on
+ * their user as `defaultCameraGate: [{ site, cameraGateNumber }]` and sent as
+ * `anprGate` with add, register and guest check-in. None picked, or a gate no
+ * longer there: the server uses the site's first camera.
+ */
+export const VISITOR_CAMERA_DIRECTIONS = ["entry", "both", "visitors"];
+
+const DIRECTION_LABELS: Record<string, string> = {
+  entry: "Entry",
+  both: "Both Entry and Exit",
+  visitors: "Visitors",
+};
+
+export type TVisitorCameraChoice = { value: number; title: string };
+
+type TCameraLike = { _id?: unknown; direction?: unknown; host?: unknown; gate?: unknown; status?: unknown };
+
+/** The port in a camera's address; the protocol's default when none is written. */
+export function cameraPort(host: unknown): string {
+  const text = String(host ?? "").trim();
+  if (!text) return "";
+  const withoutScheme = text.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "");
+  const hostPart = withoutScheme.split(/[/?#]/)[0] ?? "";
+  const port = hostPart.match(/:(\d+)$/)?.[1];
+  if (port) return port;
+  return /^https:\/\//i.test(text) ? "443" : "80";
+}
+
+function gateOf(camera: { gate?: unknown } | null | undefined): number | null {
+  const gate = Number(camera?.gate);
+  return Number.isInteger(gate) && gate >= 1 ? gate : null;
+}
+
+/** "Entry Gate 1"; a camera with no gate saved yet: "Entry:8001". */
+export function visitorCameraLabel(camera: TCameraLike): string {
+  const direction = String(camera?.direction ?? "").toLowerCase();
+  const type = DIRECTION_LABELS[direction] ?? direction;
+  const gate = gateOf(camera);
+  if (gate) return `${type} Gate ${gate}`;
+  const port = cameraPort(camera?.host);
+  return port ? `${type}:${port}` : type;
+}
+
+/** The site's active Entry, Both and Visitors ANPR cameras. */
+export function visitorCameras(cameras: unknown): TCameraLike[] {
+  const list = Array.isArray(cameras) ? (cameras as TCameraLike[]) : [];
+  return list.filter(
+    (camera) =>
+      Boolean(camera?._id) &&
+      String(camera?.status ?? "active") === "active" &&
+      VISITOR_CAMERA_DIRECTIONS.includes(String(camera?.direction ?? "").toLowerCase()),
+  );
+}
+
+/** The gates that can be picked as the default ("Entry Gate 1"); a camera with no gate cannot. */
+export function visitorGateChoices(cameras: unknown): TVisitorCameraChoice[] {
+  return visitorCameras(cameras)
+    .filter((camera) => gateOf(camera) !== null)
+    .map((camera) => ({ value: gateOf(camera) as number, title: visitorCameraLabel(camera) }))
+    .sort((a, b) => a.value - b.value);
+}
+
+/** The user's default gate at this site, or undefined. */
+export function defaultGateForSite(saved: unknown, siteId: unknown): number | undefined {
+  if (!siteId || !Array.isArray(saved)) return undefined;
+  const entry = (saved as Array<{ site?: unknown; cameraGateNumber?: unknown }>).find(
+    (item) => String(item?.site ?? "") === String(siteId),
+  );
+  const gate = Number(entry?.cameraGateNumber);
+  return Number.isInteger(gate) && gate >= 1 ? gate : undefined;
+}
+
+export const VISITOR_CAMERA_LABEL = "Default ANPR Camera";