@7365admin1/layer-common 4.104.0 → 4.106.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @iservice365/layer-common
 
+## 4.106.0
+
+### Minor Changes
+
+- 4740604: Online forms review: remarks are optional when approving and still required to reject or request a resubmission (same rule as iMA365).
+
+## 4.105.0
+
+### Minor Changes
+
+- c43bf75: Site role pickers (Assign Role, Invite member, Reassign on delete) label organisation-wide roles "Name (organisation)"; site roles keep their plain name. Display only - the same role id is sent.
+
+## 4.104.1
+
+### Patch Changes
+
+- 0112ec7: Service Providers: an unknown staff count (older row with no linked company) shows "-" instead of 0; View Members lists the company's active people on this site (same as Members > Service Providers) instead of one person's memberships.
+
 ## 4.104.0
 
 ### Minor Changes

package/components/MemberMain.vue

@@ -374,7 +374,7 @@
                       v-model="selectedRole"
                       :items="pickerRoles"
                       item-value="_id"
-                      :item-title="roleLabel"
+                      :item-title="props.siteId ? sitePickerRoleLabel : roleLabel"
                       density="comfortable"
                       :rules="[requiredRule]"
                       :error-messages="
@@ -428,6 +428,7 @@ import {
   limitedSites,
   withCurrentRole,
   roleLabel,
+  sitePickerRoleLabel,
 } from "../utils/role";
 import { formatLastActive } from "../utils/last-active";
 import { formatMemberDate, memberAccess, memberPerson } from "../utils/member-row";

package/components/OnlineFormFill.vue

@@ -593,11 +593,12 @@ watch(() => props.initialManagementValues, (saved) => {
   managementValues.value = { ...loaded, ...managementValues.value };
 }, { immediate: true });
 
-const remarksRequired = computed(() => !!selectedAction.value);
+// Owner 2026-10-06: remarks are optional for Approve, required to reject or send back.
+const remarksRequired = computed(() => !!selectedAction.value && selectedAction.value !== "approved");
 
 // Same wording as the iMA365 review screen, so office and phone read alike.
 const REVIEW_TEXT: Record<string, { remarks: string; confirm: string }> = {
-  approved: { remarks: "Remarks (the resident sees this)", confirm: "Confirm approval" },
+  approved: { remarks: "Remarks - optional (the resident sees this)", confirm: "Confirm approval" },
   rejected: { remarks: "Reason for rejection (the resident sees this)", confirm: "Confirm rejection" },
   resubmission: { remarks: "Reason for resubmission (the resident sees this)", confirm: "Send back to resident" },
 };
@@ -605,8 +606,8 @@ const remarksLabel = computed(() => REVIEW_TEXT[selectedAction.value]?.remarks ?
 const confirmLabel = computed(() => REVIEW_TEXT[selectedAction.value]?.confirm ?? "Confirm");
 const reviewHint = computed(() =>
   selectedAction.value === "approved" && managementUseItems.value.length
-    ? "Fill in the For Management Use Only box and your remarks, then confirm."
-    : "Choose Approve, Request resubmission or Reject, add your remarks, then confirm.",
+    ? "Fill in the For Management Use Only box, add remarks if you wish, then confirm."
+    : "Choose Approve, Request resubmission or Reject. Remarks are needed to reject or send back. Then confirm.",
 );
 
 const managementComplete = computed(() => {
@@ -616,7 +617,7 @@ const managementComplete = computed(() => {
 
 const canConfirm = computed(() =>
   !!selectedAction.value &&
-  adminRemarks.value.trim().length > 0 &&
+  (!remarksRequired.value || adminRemarks.value.trim().length > 0) &&
   managementComplete.value
 );
 

package/components/RolePermissionMain.vue

@@ -166,7 +166,7 @@
                 <v-select
                   v-model="memberReassignments[member._id]"
                   :items="deletionPreview.replacementRoles"
-                  :item-title="roleLabel"
+                  :item-title="props.siteId ? sitePickerRoleLabel : roleLabel"
                   item-value="_id"
                   label="Reassign role"
                   density="comfortable"
@@ -206,7 +206,7 @@
 
 <script setup lang="ts">
 // Relative import: this layer's `utils/` is not auto-imported into consumers.
-import { roleLabel, safeReturnTo, showSiteField } from "../utils/role";
+import { roleLabel, safeReturnTo, showSiteField, sitePickerRoleLabel } from "../utils/role";
 import { holdsPermission } from "../utils/permission-spellings";
 import {
   catalogueForOrg,

package/components/ServiceProviderMain.vue

@@ -320,7 +320,7 @@
 
   <v-dialog v-model="viewDialog" max-width="514">
     <v-card class="screen-modal">
-      <v-card-title>Members ({{ memberDialogCount }})</v-card-title>
+      <v-card-title>Members ({{ viewRow?.serviceProviderOrgId ? memberDialogCount : "-" }})</v-card-title>
 
       <div class="screen-modal__body sp-members-scroll">
         <v-table class="sp-members-table">
@@ -336,6 +336,11 @@
                 Loading...
               </td>
             </tr>
+            <tr v-else-if="!viewRow?.serviceProviderOrgId">
+              <td colspan="2" class="text-center sp-members-note">
+                This provider was added without a linked company account, so its staff cannot be listed.
+              </td>
+            </tr>
             <tr v-else-if="!serviceProviderMembers.length">
               <td colspan="2" class="text-center sp-members-note">
                 No members found.
@@ -1006,6 +1011,7 @@ const {
   createServiceProviderInvite,
   updateStatus: updateServiceProviderStatus,
   invite,
+  getSiteMembers,
 } = useServiceProvider();
 const { getAll: getAllMembers, getAllByUserId } = useMember();
 
@@ -1377,7 +1383,8 @@ function setInviteSiteName(siteId: string) {
 }
 
 function formatMembersCell(value: unknown): string {
-  if (value == null || value === "") return "0";
+  // null = an older row with no company recorded: unknown, not 0.
+  if (value == null || value === "") return "-";
   const n = Number(value);
   if (!Number.isFinite(n)) return "0";
   return String(n);
@@ -1522,13 +1529,17 @@ async function openView(row: TableRow) {
 
   loadingMembers.value = true;
   try {
-    const data = await getAllByUserId(row.userId);
-
-    serviceProviderMembers.value = (data.items ?? []).map((member: any) => ({
-      _id: member._id,
-      name: member.name || "-",
-      role: member.role || "-",
-    }));
+    // The company's people on THIS site - the same list as Members > Service
+    // Providers. It used to read one person's memberships (`row.userId`),
+    // which a stored provider row does not even carry (owner report 2026-10-06).
+    const data = await getSiteMembers(props.siteId);
+    serviceProviderMembers.value = (data.items ?? [])
+      .filter((member) => member.companyId === row.serviceProviderOrgId && member.status === "active")
+      .map((member) => ({
+        _id: String(member._id),
+        name: member.name || member.email || "-",
+        role: member.role || "-",
+      }));
   } catch (error: any) {
     showMessage(errorConverter(error), "error");
   } finally {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.104.0",
+  "version": "4.106.0",
   "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/invite-role-options.ts

@@ -16,7 +16,8 @@ export function inviteRoleOptions(
     .filter((role) => role && role._id)
     .map((role) => ({
       _id: String(role._id),
-      title: String(role.name ?? ""),
+      // Organisation-wide roles read "Administrator (organisation)" (owner, 2026-10-06).
+      title: role.site ? String(role.name ?? "") : `${String(role.name ?? "")} (organisation)`,
       subtitle: role.site ? SITE_ROLE_LABEL : ORG_ROLE_LABEL,
     }));
 }

package/utils/role.ts

@@ -22,6 +22,19 @@ export function roleLabel(role: { name?: unknown; siteName?: unknown; site?: unk
   return role?.site && site ? `${name} · ${site}` : name;
 }
 
+/**
+ * A site-level role picker's label (owner, 2026-10-06): organisation-wide roles
+ * stay offered at a site but read "Administrator (organisation)", so nobody
+ * mistakes them for a role of this site. Site roles keep `roleLabel`. Display
+ * only - the picker still sends the same `_id`. A row the server did not send
+ * (`withCurrentRole`'s placeholder has no `type`) is left plain: we do not know
+ * whether it is organisation-wide.
+ */
+export function sitePickerRoleLabel(role: { name?: unknown; siteName?: unknown; site?: unknown; type?: unknown } | null | undefined): string {
+  if (!role || role.site || role.type === undefined) return roleLabel(role);
+  return `${roleLabel(role)} (organisation)`;
+}
+
 /**
  * The Assign Role picker's list, with the member's CURRENT role always in it.
  *