@7365admin1/layer-common 4.50.0 → 4.51.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.51.0
+
+### Minor Changes
+
+- ac247e2: Members: a banner "N members here have a role from another site. Assign each one a role for this site." with a one-click filter to list them (server `roleState=other-site`); disappears at 0. `useMember().getAll` accepts `roleState`.
+
 ## 4.50.0
 
 ### Minor Changes
@@ -1539,11 +1545,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/MemberMain.vue

@@ -27,6 +27,28 @@
       </template>
     </PageHeader>
 
+    <!-- Owner decision 2026-09-25: members holding ANOTHER site's role keep
+         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"
+      type="warning"
+      variant="tonal"
+      density="compact"
+      class="mb-3"
+      data-test="member-other-site-banner"
+    >
+      <div class="d-flex align-center flex-wrap ga-2">
+        <span class="flex-grow-1">{{ otherSiteBanner }}</span>
+        <AppButton
+          data-test="member-other-site-filter"
+          @click="toggleOtherSite()"
+        >
+          {{ onlyOtherSite ? "Show all members" : "Show them" }}
+        </AppButton>
+      </div>
+    </v-alert>
+
     <AppCard class="table-card">
       <CardToolbar :count="pageRange">
         <template #tabs>
@@ -278,7 +300,7 @@
 </template>
 
 <script setup lang="ts">
-import { memberRoleChip, withCurrentRole } from "../utils/role";
+import { memberRoleChip, otherSiteBannerText, withCurrentRole } from "../utils/role";
 
 const props = defineProps({
   /** The design's page title. Every app that mounts this screen calls it
@@ -372,6 +394,7 @@ const props = defineProps({
 });
 
 const items = ref<Array<Record<string, any>>>([]);
+const onlyOtherSite = ref(false);
 const page = ref(1);
 const pages = ref(10);
 const pageRange = ref("-- - -- of --");
@@ -444,12 +467,47 @@ const {
       page: page.value,
       type: props.type,
       siteId: props.siteId,
+      roleState: onlyOtherSite.value ? "other-site" : "",
     }),
   {
-    watch: [() => props.status, () => props.orgId, () => props.siteId, headerSearch],
+    watch: [() => props.status, () => props.orgId, () => props.siteId, headerSearch, onlyOtherSite],
   }
 );
 
+/*
+ * "N members here have a role from another site" — the count is the server's
+ * (`roleState=other-site`, `total`), for this org / site / app, so it is right
+ * however many pages the list has. Refreshed with the list (after an Assign
+ * Role the list refreshes, and so does this).
+ */
+const { data: otherSiteReq, refresh: refreshOtherSite } = useAsyncData(
+  `members-other-site-${props.type}-${props.orgId}-${props.siteId}-${props.status}`,
+  () =>
+    props.assignRole && props.orgId
+      ? _getAll({
+          status: props.status,
+          org: props.orgId,
+          page: 1,
+          limit: 1,
+          type: props.type,
+          siteId: props.siteId,
+          roleState: "other-site",
+        }).catch(() => null)
+      : Promise.resolve(null),
+  { watch: [() => props.status, () => props.orgId, () => props.siteId] }
+);
+const otherSiteBanner = computed(() =>
+  otherSiteBannerText(otherSiteReq.value?.total)
+);
+watch(otherSiteBanner, (text) => {
+  // the last one fixed: back to the full list
+  if (!text && onlyOtherSite.value) onlyOtherSite.value = false;
+});
+function toggleOtherSite() {
+  page.value = 1;
+  onlyOtherSite.value = !onlyOtherSite.value;
+}
+
 const loading = computed(() => getAllReqStatus.value === "pending");
 
 watch(headerSearch, () => {
@@ -567,7 +625,7 @@ async function updateMemberRole() {
       props.orgId
     );
     await setMember({ mode: "assign-role" });
-    await getAll();
+    await Promise.all([getAll(), refreshOtherSite()]);
   } catch (error: any) {
     // `message.value` alone sets the snackbar's TEXT and never opens it, so a
     // refused role change said nothing at all - the dialog just closed and the

package/composables/useMember.ts

@@ -69,10 +69,13 @@ export default function useMember() {
     type = "",
     status = "active",
     siteId = "",
+    roleState = "",
   } = {}) {
     const query: Record<string, any> = { page, limit, type, status };
 
     if (search) query.search = search;
+    // "other-site": only members holding a role pinned to another site.
+    if (roleState) query.roleState = roleState;
     if (user) query.user = user;
     if (org) query.org = org;
     if (siteId) query.siteId = siteId;

package/package.json

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

@@ -60,3 +60,16 @@ export function memberRoleChip(item: {
       return name ? { text: name, tone: "info" } : null;
   }
 }
+
+/**
+ * The Members banner (owner decision 2026-09-25: keep the warning, companies
+ * 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 {
+  const n = typeof count === "number" && Number.isFinite(count) ? Math.floor(count) : 0;
+  if (n <= 0) return null;
+  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.`;
+}