@7365admin1/layer-common 4.97.1-staging.574 → 4.97.1-staging.575

package/components/HidUserEnrollment.vue

@@ -1214,6 +1214,7 @@ import {
   subjectLinkOf,
   type HidEnrolmentSubject,
 } from "../utils/hid-enrolment-subject";
+import { nextRegistration } from "../utils/hid-registration";
 /* Mirrors core's audience rules — core is what enforces them; this only decides
    what is worth offering and where an enrolment lands. */
 import {
@@ -2954,8 +2955,8 @@ async function openEnroll() {
    * reader chosen on the screen behind it.
    */
   const [hidUserId, registration] = await Promise.all([
-    getNextUid(),
-    getNextRegistration(),
+    getNextUid(selectedReaderId.value),
+    getNextRegistration(selectedReaderId.value),
     loadReaders({ resolveSelection: false }),
   ]);
   resetForm();
@@ -4377,26 +4378,26 @@ async function getNextUid(readerId: string) {
   return `UID${String(nextNumber).padStart(6, "0")}`;
 }
 
-async function getNextRegistration() {
-  const existingUsers = await getExistingHidReaderUsers();
-  const registrations = existingUsers
-    .map((user) => String(user.registration || "").trim())
-    .filter(Boolean);
-  const numericRegistrations = registrations
-    .map((registration) => {
-      const match = registration.match(/^(\d+)$/);
-      return match
-        ? { value: Number(match[1]), width: match[1].length }
-        : undefined;
-    })
-    .filter((item): item is { value: number; width: number } => Boolean(item));
-  const maxRegistration = numericRegistrations.reduce(
-    (max, item) => Math.max(max, item.value),
-    0
-  );
-  const width = Math.max(6, ...numericRegistrations.map((item) => item.width));
-
-  return String(maxRegistration + 1).padStart(width, "0");
+/**
+ * The next registration number ON THIS READER.
+ *
+ * Every reader numbers its own users (see `enrolOnReader`), so the list has to
+ * come from the reader being allocated for. This used to read it with no
+ * reader at all, which `getExistingHidReaderUsers` answers with an empty list,
+ * so every enrolment proposed 000001 and the second person on a reader was
+ * refused with "HID Amico identity already exists for this reader"
+ * (2026-10-20, Landscape Management on HID 1 after Pest Management took
+ * 000001). The roster on screen is the second opinion for the selected reader,
+ * exactly as `getNextUid` consults it: it catches a number the device holds
+ * but has not reported.
+ */
+async function getNextRegistration(readerId: string) {
+  const existingUsers = await getExistingHidReaderUsers(readerId, ["id", "registration"]);
+  const onScreen = readerId === selectedReaderId.value ? users.value : [];
+  return nextRegistration([
+    ...existingUsers.map((user) => user.registration),
+    ...onScreen.map((user) => user.registration),
+  ]);
 }
 
 async function getExistingHidReaderIds(readerId: string) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.574",
+  "version": "4.97.1-staging.575",
   "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/utils/hid-registration.ts

@@ -0,0 +1,24 @@
+/**
+ * THE NEXT REGISTRATION NUMBER ON ONE READER.
+ *
+ * Each reader numbers its own users, so the input is that reader's existing
+ * registration numbers (from the device, plus the roster on screen when it is
+ * the selected reader). Numeric ones count; the next is the highest plus one,
+ * zero padded to six digits or to the widest number already in use, whichever
+ * is wider. Anything that is not a plain number (`USR-...`, blank, undefined)
+ * is ignored rather than breaking the allocation.
+ *
+ * Pure. `HidUserEnrollment.vue` reads the lists and calls this.
+ */
+export function nextRegistration(registrations: readonly unknown[]): string {
+  let max = 0;
+  let width = 6;
+  for (const value of registrations) {
+    const text = String(value ?? "").trim();
+    const match = text.match(/^(\d+)$/);
+    if (!match) continue;
+    max = Math.max(max, Number(match[1]));
+    width = Math.max(width, match[1].length);
+  }
+  return String(max + 1).padStart(width, "0");
+}