@7365admin1/layer-common 4.103.0 → 4.104.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 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
+
+- d7b2152: A site's Roles & Permissions screen lists only the roles made for that site (needs core with `scope=site`); organisation-wide roles are managed in the Organization app. An empty site list says so.
+
 ## 4.103.0
 
 ### Minor Changes

package/components/RolePermissionMain.vue

@@ -436,7 +436,9 @@ const {
       type: props.listType ?? props.type,
       org: props.orgId,
       site: props.siteId,
-      scope: props.scope,
+      // A site's screen lists only the roles made for that site (owner,
+      // 2026-10-06); organisation-wide roles live in the Organization app.
+      scope: props.scope || (props.siteId ? "site" : ""),
     }),
   {
     watch: [page, headerSearch],
@@ -473,6 +475,9 @@ const emptyText = computed(() => {
   if (getRoleReqError.value) {
     return "Could not load roles. Please refresh to try again.";
   }
+  if (props.siteId) {
+    return "No roles have been made for this site yet. Organisation-wide roles are managed in the Organization app.";
+  }
   return "No roles have been created yet.";
 });
 

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.103.0",
+  "version": "4.104.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.",