@7365admin1/layer-common 4.39.0 → 4.40.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @iservice365/layer-common
 
+## 4.40.1
+
+### Patch Changes
+
+- 783ffe2: Edit Camera: the device password is write-only. On edit the Password field is optional, starts blank with the placeholder "Saved · leave blank to keep", and is sent only when a new one is typed, so an admin can switch a camera's Status without re-typing its login. A status-only change now enables Submit. Password stays required when adding a camera.
+
+## 4.40.0
+
+### Minor Changes
+
+- 3a96438: Client invitations: an accepted invitation whose site never reached the company's Sites list now says so in plain words and offers "Add <site> to your Sites" (`linkInvitationSite`, `PUT /service-provider-invitations/:id/link-site`). Needs core 3.100.0.
+
+## 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 +1465,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/CameraForm.vue

@@ -161,14 +161,21 @@
           </v-col>
 
           <v-col v-if="isANPR" cols="12">
-            <InputLabel class="text-capitalize" title="Password" required />
+            <!-- Write-only: the saved password is never sent to the browser, so
+                 on edit a blank field keeps it. Required only for a new camera. -->
+            <InputLabel
+              class="text-capitalize"
+              title="Password"
+              :required="!isEdit"
+            />
             <v-text-field
               v-model.trim="camera.password"
               type="password"
+              autocomplete="new-password"
               class="filter-field"
               density="comfortable"
-              :rules="[requiredRule]"
-              placeholder="Enter password"
+              :rules="isEdit ? [] : [requiredRule]"
+              :placeholder="isEdit ? 'Saved · leave blank to keep' : 'Enter password'"
             />
           </v-col>
 
@@ -419,8 +426,12 @@ const camera = ref<TSiteCamera>({
 
 camera.value.site = prop.site;
 
-if (prop.mode === "edit") {
+const isEdit = prop.mode === "edit";
+
+if (isEdit) {
   camera.value = JSON.parse(JSON.stringify(prop.camera));
+  // Never pre-filled: blank means "keep the saved password".
+  camera.value.password = "";
 }
 camera.value.site = prop.site;
 camera.value.type = prop.type;
@@ -576,7 +587,9 @@ const hasChanges = computed(() => {
     return (
       camera.value.host !== prop.camera.host ||
       camera.value.username !== prop.camera.username ||
-      camera.value.password !== prop.camera.password ||
+      // A typed password is a change; blank keeps the saved one.
+      !!camera.value.password ||
+      camera.value.status !== prop.camera.status ||
       camera.value.category !== prop.camera.category ||
       camera.value.guardPost !== prop.camera.guardPost ||
       camera.value.direction !== prop.camera.direction ||
@@ -895,7 +908,8 @@ async function save(
       const res = await updateSiteCamera(camera.value._id ?? "", {
         ...addressPayload(),
         username: camera.value.username,
-        password: camera.value.password,
+        // Sent only when typed; left out, the server keeps the saved one.
+        ...(camera.value.password ? { password: camera.value.password } : {}),
         category: camera.value.category,
         guardPost: camera.value.guardPost,
         direction: camera.value.direction,

package/components/ClientInvitations.vue

@@ -78,7 +78,17 @@
           </div>
 
           <div v-else-if="item.status === 'complete'" class="px-4 pb-4">
-            <NuxtLink v-if="item.onThisOrg" :to="`/org/${org}/sites`">Open Sites</NuxtLink>
+            <v-btn
+              v-if="item.needsSiteLink"
+              variant="flat"
+              class="screen-btn-primary"
+              :loading="working[item._id] === 'link'"
+              :disabled="Boolean(working[item._id])"
+              @click="addToSites(item)"
+            >
+              Add {{ item.siteName }} to your Sites
+            </v-btn>
+            <NuxtLink v-else-if="item.onThisOrg" :to="`/org/${org}/sites`">Open Sites</NuxtLink>
             <NuxtLink
               v-else-if="item.providerOrgId && item.providerOrgId !== org"
               :to="`/org/${item.providerOrgId}/sites`"
@@ -124,8 +134,13 @@ const tabs: Array<{ value: Tab; label: string }> = [
 ];
 
 const route = useRoute();
-const { getReceivedInvitations, getInvitation, acceptInvitation, declineInvitation } =
-  useServiceProviderInvitation();
+const {
+  getReceivedInvitations,
+  getInvitation,
+  acceptInvitation,
+  declineInvitation,
+  linkInvitationSite,
+} = useServiceProviderInvitation();
 
 const tab = ref<Tab>("pending");
 const items = ref<TReceivedServiceProviderInvitation[]>([]);
@@ -180,6 +195,9 @@ function stateLine(item: TReceivedServiceProviderInvitation) {
       if (item.onThisOrg) {
         return `Accepted${on(item.answeredAt)} — ${item.siteName} is on your Sites list as a site you serve for ${item.orgName}.`;
       }
+      if (item.needsSiteLink) {
+        return "This invitation was accepted, but the site wasn't added to your Sites. Add it now.";
+      }
       if (!item.providerOrgId || item.providerOrgId === props.org) {
         return `Accepted${on(item.answeredAt)}, but ${item.siteName} is not on this company's Sites list. Please contact Seven365 support so we can add it.`;
       }
@@ -228,6 +246,20 @@ async function answer(item: TReceivedServiceProviderInvitation, action: "accept"
   }
 }
 
+/** Accepted but never added to the Sites list: add it now, then show it. */
+async function addToSites(item: TReceivedServiceProviderInvitation) {
+  errors[item._id] = "";
+  working[item._id] = "link";
+  try {
+    await linkInvitationSite(item._id, props.org);
+    await load();
+  } catch (err: any) {
+    errors[item._id] = err?.data?.message || "Could not add this site to your Sites.";
+  } finally {
+    working[item._id] = "";
+  }
+}
+
 // Opened from the bell: start on the tab the linked invitation is in.
 if (linked.value) {
   try {

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/composables/useServiceProviderInvitation.ts

@@ -48,6 +48,8 @@ export type TReceivedServiceProviderInvitation = {
   providerOrgName?: string;
   /** Accepted AND on the Sites list of the company on screen. */
   onThisOrg?: boolean;
+  /** Accepted, but the site is on no company's Sites list: offer to add it. */
+  needsSiteLink?: boolean;
 };
 
 /** The words on screen. Kept beside the server's own list on purpose — a
@@ -171,6 +173,17 @@ export default function useServiceProviderInvitation() {
     });
   }
 
+  /**
+   * An accepted invitation whose site never reached this company's Sites
+   * list: add it now. Safe to repeat - the server adds it once.
+   */
+  function linkInvitationSite(id: string, org: string) {
+    return useNuxtApp().$api<{ message: string }>(`${base}/${id}/link-site`, {
+      method: "PUT",
+      body: { org },
+    });
+  }
+
   /**
    * "Client invitations": one tab of the invitations sent to the signed-in
    * account, plus the count in every tab. `org` is the company on screen.
@@ -200,6 +213,7 @@ export default function useServiceProviderInvitation() {
     getInvitation,
     declineInvitation,
     acceptInvitation,
+    linkInvitationSite,
     getReceivedInvitations,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.39.0",
+  "version": "4.40.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"
   },