@7365admin1/layer-common 4.39.0 → 4.39.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.39.1
+
+### Patch Changes
+
+- b1c2177: Visitor Mgmt: the Unregistered tab now appears on first load and after switching site, without a hard refresh. `useANPRSettings` takes a ref or getter for the site and keeps one entry per site; the Visitor Mgmt page reads its own site's ANPR switches instead of relying on the layout's plate toast, which kept the first site's switches after a site switch. A plate-toast link to the Unregistered tab is no longer bounced to Registered while the switches are still loading.
+
 ## 4.39.0
 
 ### Minor Changes
@@ -1447,11 +1453,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                              GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                              GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                              owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                              staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/VisitorManagement.vue

@@ -1502,8 +1502,17 @@ const { org: orgId, site: siteId } = route.params as {
   site: string;
 };
 
-const { enableUnregistered } = useANPRSettings(siteId);
+// The page reads its own site's switches rather than relying on the layout's
+// toast to have fetched them - that copy could belong to the previous site.
+const {
+  enableUnregistered,
+  loaded: anprSettingsLoaded,
+  ensureANPRSettings,
+} = useANPRSettings(siteId);
 const enableUnregisteredTab = computed(() => enableUnregistered.value);
+ensureANPRSettings(true).catch(() => {
+  // No settings = no Unregistered tab, same as before.
+});
 
 const {
   getVisitors,
@@ -2933,7 +2942,11 @@ watch([searchInput, dateFrom, dateTo, filterTypes, activeTab], () => {
 const syncVisitorFiltersFromRoute = () => {
   const requestedTab = (route.query.tab as string) || "registered";
   const nextTab =
-    (!enableUnregisteredTab.value && requestedTab === "unregistered") ||
+    // Until the switches are read, keep a requested Unregistered tab (the plate
+    // toast links here) instead of bouncing it to Registered.
+    (anprSettingsLoaded.value &&
+      !enableUnregisteredTab.value &&
+      requestedTab === "unregistered") ||
     (!showResidentTransactionsTab.value && requestedTab === "resident-transactions")
       ? "registered"
       : requestedTab;
@@ -2992,9 +3005,9 @@ const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();
 
 watch(
-  enableUnregisteredTab,
-  (enabled) => {
-    if (!enabled && activeTab.value === "unregistered") {
+  [enableUnregisteredTab, anprSettingsLoaded],
+  ([enabled]) => {
+    if (!enabled && anprSettingsLoaded.value && activeTab.value === "unregistered") {
       activeTab.value = "registered";
     }
   },

package/components/VisitorSocketPopUp.vue

@@ -137,8 +137,9 @@ const config = useRuntimeConfig();
 const publicConfig = config.public as Record<string, string | undefined>;
 const route  = useRoute();
 const { tab } = useVisitor();
+// A getter, not the string: this component outlives site switches.
 const { enableUnregistered, ensureANPRSettings } = useANPRSettings(
-  props.siteId
+  () => props.siteId
 );
 const enableUnregisteredSnackbar = computed(() => enableUnregistered.value);
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =

package/composables/useANPRSettings.ts

@@ -1,19 +1,50 @@
-export default function (siteId?: string) {
-  const stateKey = computed(() =>
-    siteId ? `anpr-settings-${siteId}` : "anpr-settings"
-  );
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
+
+/*
+ * A site's ANPR switches (e.g. "Enable Unregistered Vehicles"), shared by every
+ * caller on the page: the Visitor Mgmt tabs, the plate toast in the layout, and
+ * Site Settings.
+ *
+ * `siteId` may be a ref or a getter. The layout's toast lives across site
+ * switches, so a plain string captured once kept answering for the FIRST site
+ * it saw - and the Visitor Mgmt page never fetched at all, so its
+ * "Unregistered" tab showed only when that stale copy happened to be for the
+ * right site (i.e. after a hard refresh on the page itself).
+ *
+ * One map keyed by site id: a key that is present means "fetched", even when
+ * the site has no settings yet (stored as `{}`).
+ */
+export default function (siteId?: MaybeRefOrGetter<string | undefined>) {
+  const site = computed(() => toValue(siteId) || "");
 
-  const anprSettings = useState<Record<string, any> | null>(
-    stateKey.value,
-    () => null
+  const bySite = useState<Record<string, Record<string, any>>>(
+    "anpr-settings-by-site",
+    () => ({})
   );
 
+  const anprSettings = computed<Record<string, any> | null>({
+    get: () => bySite.value[site.value] ?? null,
+    set: (value) => {
+      bySite.value = { ...bySite.value, [site.value]: value ?? {} };
+    },
+  });
+
+  /** True once this site's settings have been read (or saved) at least once. */
+  const loaded = computed(() => site.value in bySite.value);
+
   const enableUnregistered = computed(
     () => anprSettings.value?.ANPRSwitches?.enableUnregistered === true
   );
 
+  function store(forSite: unknown, response: Record<string, any> | null) {
+    const key = String(forSite ?? "");
+    if (!key) return;
+    bySite.value = { ...bySite.value, [key]: response ?? {} };
+  }
+
   async function fetchANPRSettings(data?: any) {
-    const payload = data ?? (siteId ? { site: siteId, userType: "site" } : undefined);
+    const payload =
+      data ?? (site.value ? { site: site.value, userType: "site" } : undefined);
 
     if (!payload) {
       return anprSettings.value;
@@ -27,23 +58,21 @@ export default function (siteId?: string) {
       }
     );
 
-    if (response) {
-      anprSettings.value = response;
-    }
+    store(payload.site, response);
 
     return response;
   }
 
   async function ensureANPRSettings(force = false) {
-    if (!siteId) {
+    if (!site.value) {
       return anprSettings.value;
     }
 
-    if (!force && anprSettings.value) {
+    if (!force && loaded.value) {
       return anprSettings.value;
     }
 
-    return await fetchANPRSettings({ site: siteId, userType: "site" });
+    return await fetchANPRSettings({ site: site.value, userType: "site" });
   }
 
   async function getANPRSettingBySite(data: any) {
@@ -60,7 +89,7 @@ export default function (siteId?: string) {
     );
 
     if (response) {
-      anprSettings.value = response;
+      store(data?.site, response);
     }
 
     return response;
@@ -68,6 +97,7 @@ export default function (siteId?: string) {
 
   return {
     anprSettings,
+    loaded,
     enableUnregistered,
     ensureANPRSettings,
     getANPRSettingBySite,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.39.0",
+  "version": "4.39.1",
   "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.",
@@ -36,7 +36,7 @@
     "build": "nuxt build .playground",
     "generate": "nuxt generate .playground",
     "preview": "nuxt preview .playground",
-    "test": "esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && esbuild composables/usePlateToastWindow.ts --format=esm --outfile=test/.build/usePlateToastWindow.mjs --log-level=error && esbuild utils/client-invite-modules.ts --bundle --platform=node --format=esm --outfile=test/.build/client-invite-modules.mjs --log-level=error && esbuild utils/robot-display.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-display.mjs --log-level=error && esbuild utils/building-map.ts --bundle --platform=node --format=esm --outfile=test/.build/building-map.mjs --log-level=error && esbuild utils/robot-building.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-building.mjs --log-level=error && esbuild utils/robot-fleet-core.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-fleet-core.mjs --log-level=error && node --experimental-strip-types --test \"test/*.test.mjs\" && yarn test:units",
+    "test": "esbuild composables/useANPRSettings.ts --format=esm --outfile=test/.build/useANPRSettings.mjs --log-level=error && esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && esbuild composables/usePlateToastWindow.ts --format=esm --outfile=test/.build/usePlateToastWindow.mjs --log-level=error && esbuild utils/client-invite-modules.ts --bundle --platform=node --format=esm --outfile=test/.build/client-invite-modules.mjs --log-level=error && esbuild utils/robot-display.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-display.mjs --log-level=error && esbuild utils/building-map.ts --bundle --platform=node --format=esm --outfile=test/.build/building-map.mjs --log-level=error && esbuild utils/robot-building.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-building.mjs --log-level=error && esbuild utils/robot-fleet-core.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-fleet-core.mjs --log-level=error && node --experimental-strip-types --test \"test/*.test.mjs\" && yarn test:units",
     "test:units": "node --experimental-strip-types --test \"utils/*.test.ts\"",
     "release": "yarn run build && changeset publish"
   },