@7365admin1/layer-common 4.39.1 → 4.40.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @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
@@ -1453,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/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.1",
+  "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.",