@7365admin1/layer-common 4.97.1-staging.512 → 4.97.1-staging.514

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/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.97.1-staging.512",
+  "version": "4.97.1-staging.514",
   "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.",