@7365admin1/layer-common 4.73.1-staging.455 → 4.73.1-staging.456

package/components/MemberMain.vue

@@ -31,7 +31,7 @@
          their access; the company assigns each one a role for this site.
          Shown while any remain (server count), gone at 0. -->
     <v-alert
-      v-if="props.assignRole && otherSiteBanner && !orgLevel"
+      v-if="props.assignRole && otherSiteBanner"
       type="warning"
       variant="tonal"
       density="compact"
@@ -41,6 +41,7 @@
       <div class="d-flex align-center flex-wrap ga-2">
         <span class="flex-grow-1">{{ otherSiteBanner }}</span>
         <AppButton
+          v-if="!orgLevel"
           data-test="member-other-site-filter"
           @click="toggleOtherSite()"
         >
@@ -578,7 +579,7 @@ const {
 const { data: otherSiteReq, refresh: refreshOtherSite } = useAsyncData(
   `members-other-site-${props.type}-${props.orgId}-${props.siteId}-${props.status}`,
   () =>
-    props.assignRole && props.orgId && !orgLevel.value
+    props.assignRole && props.orgId
       ? _getAll({
           status: props.status,
           org: props.orgId,
@@ -591,8 +592,10 @@ const { data: otherSiteReq, refresh: refreshOtherSite } = useAsyncData(
       : Promise.resolve(null),
   { watch: [() => props.status, () => props.orgId, () => props.siteId] }
 );
+// At organisation level there is no "this site": the count says what is wrong
+// and points to "Fix roles from other sites" (no per-site filter there).
 const otherSiteBanner = computed(() =>
-  otherSiteBannerText(otherSiteReq.value?.total)
+  otherSiteBannerText(otherSiteReq.value?.total, orgLevel.value)
 );
 watch(otherSiteBanner, (text) => {
   // the last one fixed: back to the full list

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.73.1-staging.455",
+  "version": "4.73.1-staging.456",
   "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/role.ts

@@ -82,9 +82,14 @@ export function memberRoleChip(
  * re-assign a role for the right site, nobody's access is cut). `null` at 0 so
  * the banner disappears once every member here has this site's role.
  */
-export function otherSiteBannerText(count: unknown): string | null {
+export function otherSiteBannerText(count: unknown, orgLevel = false): string | null {
   const n = typeof count === "number" && Number.isFinite(count) ? Math.floor(count) : 0;
   if (n <= 0) return null;
+  if (orgLevel) {
+    return n === 1
+      ? "1 member holds a role created for one particular site. Fix roles from other sites gives them the right role."
+      : `${n} members hold a role created for one particular site. Fix roles from other sites gives each one the right role.`;
+  }
   return n === 1
     ? "1 member here has a role from another site. Assign them a role for this site."
     : `${n} members here have a role from another site. Assign each one a role for this site.`;