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

package/components/MemberMain.vue

@@ -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()"
         >
@@ -100,6 +101,8 @@
 
       <div class="app-table-scroll">
         <v-data-table
+          class="member-table"
+          :class="{ 'member-table--pin-action': actionLast }"
           :headers="props.headers"
           :items="items"
           item-value="_id"
@@ -118,15 +121,21 @@
                (memberRoleChip in utils/role.ts, server roleState). -->
           <template #item.roleName="{ item }">
             <StatusChip
-              v-if="memberRoleChip(item)"
+              v-if="memberRoleChip(item, orgLevel)"
               :dot="false"
               pill
-              :tone="memberRoleChip(item)?.tone"
+              :tone="memberRoleChip(item, orgLevel)?.tone"
+              class="member-role-chip"
               data-test="member-role-chip"
             >
-              {{ memberRoleChip(item)?.text }}
+              {{ memberRoleChip(item, orgLevel)?.text }}
             </StatusChip>
           </template>
+          <!-- Organization app: every person, and where they may go
+               (owner report 2026-09-29: a site-limited person stays listed). -->
+          <template v-if="orgLevel" #item.siteName="{ item }">
+            <span data-test="member-site-scope">{{ siteAccessLabel(item) }}</span>
+          </template>
           <template #item.dateInvited="{ item }">
             {{ formatDateInvited(item.dateInvited) }}
           </template>
@@ -134,6 +143,18 @@
             <span data-test="member-last-active">{{ formatLastActive(item.lastLoginAt) }}</span>
           </template>
           <template #item.action-table="{ item }">
+           <div class="d-flex align-center justify-end ga-1">
+            <!-- The main task on the organisation's Members list, so it is a
+                 button on every row rather than only inside the menu. -->
+            <AppButton
+              v-if="siteAccessAllowed && item.user"
+              variant="ghost"
+              icon="mdi-map-marker-multiple-outline"
+              data-test="member-site-access-button"
+              @click="openSiteAccess(item)"
+            >
+              Site access
+            </AppButton>
             <!--
               `props.assignRole` belongs in this test. The menu's only item that
               is not status-dependent is Assign Role, but the menu itself opened
@@ -142,12 +163,12 @@
               and the permission was unreachable.
             -->
             <v-menu
-              v-if="
+              v-if="!isLimited(item) && (
                 props.assignRole ||
                 (currentStatus === 'active' &&
                   (canSuspendMembers || canDeleteMembers)) ||
                 (currentStatus === 'suspended' &&
-                  (canActivateMembers || canDeleteMembers))
+                  (canActivateMembers || canDeleteMembers)))
               "
               v-model="item.menuOpen"
               :close-on-content-click="false"
@@ -216,6 +237,7 @@
                 </v-list-item>
               </v-list>
             </v-menu>
+           </div>
           </template>
         </v-data-table>
       </div>
@@ -349,6 +371,8 @@ import {
   otherSiteBannerText,
   roleUsableHere,
   safeReturnTo,
+  siteAccessLabel,
+  limitedSites,
   withCurrentRole,
 } from "../utils/role";
 import { formatLastActive } from "../utils/last-active";
@@ -457,6 +481,11 @@ const props = defineProps({
   },
 });
 
+/* The Organization app's Members list: no site, organisation memberships. It
+   lists every person (site-limited ones as one row with `limitedTo`), labels
+   where each may go, and has no "role from another site" banner - there is no
+   "this site" here. */
+const orgLevel = computed(() => !props.siteId && props.type === "organization");
 const items = ref<Array<Record<string, any>>>([]);
 const onlyOtherSite = ref(false);
 const page = ref(1);
@@ -533,6 +562,8 @@ const {
       type: props.type,
       siteId: props.siteId,
       roleState: onlyOtherSite.value ? "other-site" : "",
+      // Organization app: site-limited people too, one row each (`limitedTo`).
+      people: orgLevel.value,
     }),
   {
     watch: [() => props.status, () => props.orgId, () => props.siteId, headerSearch, onlyOtherSite],
@@ -561,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
@@ -632,6 +665,12 @@ function setMember({
    screen, whoever may assign roles can choose a member's sites. The server
    decides again (owner / org-wide admin only). */
 const siteAccessAllowed = computed(() => props.assignRole && !props.siteId);
+/* A site-limited person's row stands for several per-site memberships, so the
+   one-membership actions (Assign Role, Suspend, Delete) are not offered on it;
+   Site access manages them. */
+const isLimited = (item: Record<string, any>) => orgLevel.value && limitedSites(item).length > 0;
+/* Keep the actions column on screen however wide the table gets. */
+const actionLast = computed(() => props.headers[props.headers.length - 1]?.value === "action-table");
 const siteAccessDialog = ref(false);
 const siteAccessUser = ref("");
 const siteAccessName = ref("");
@@ -777,20 +816,16 @@ function formatDateInvited(value?: string | null) {
   if (Number.isNaN(date.getTime())) return "";
 
   const parts = new Intl.DateTimeFormat("en-US", {
-    month: "long",
+    month: "short",
     day: "numeric",
     year: "numeric",
-    hour: "2-digit",
-    minute: "2-digit",
-    hour12: true,
   }).formatToParts(date);
 
   const getPart = (type: Intl.DateTimeFormatPartTypes) =>
     parts.find((part) => part.type === type)?.value ?? "";
 
-  return `${getPart("month")} ${getPart("day")}, ${getPart("year")} ${getPart(
-    "hour"
-  )}:${getPart("minute")}${getPart("dayPeriod").toUpperCase()}`;
+  // Short ("Sep 29, 2026") so the table fits and the actions stay in view.
+  return `${getPart("month")} ${getPart("day")}, ${getPart("year")}`;
 }
 
 async function handleUpdateMemberStatus() {
@@ -826,3 +861,23 @@ const updateActionText = computed(() => {
   return map[updateAction.value] || updateAction.value;
 });
 </script>
+
+<style scoped>
+/* The actions column stays pinned to the right edge (owner report 2026-09-29:
+   at 1151px the menu sat off-screen behind a sideways scroll). */
+.member-table--pin-action :deep(th:last-child),
+.member-table--pin-action :deep(td:last-child) {
+  position: sticky;
+  right: 0;
+  z-index: 1;
+  background: rgb(var(--v-theme-surface));
+  box-shadow: -1px 0 0 rgba(var(--v-border-color), var(--v-border-opacity));
+}
+.member-table--pin-action :deep(thead th:last-child) {
+  z-index: 3;
+}
+.member-table :deep(.member-role-chip) {
+  white-space: normal;
+  height: auto;
+}
+</style>

package/composables/useMember.ts

@@ -72,9 +72,13 @@ export default function useMember() {
     roleState = "",
     /** A building unit id, or "none": members on no unit yet. */
     unit = "",
+    people = false,
   } = {}) {
     const query: Record<string, any> = { page, limit, type, status };
 
+    // Organization app Members: every person, site-limited ones as one row
+    // with `limitedTo` (core 2026-09-29). Only sent when asked for.
+    if (people) query.people = 1;
     if (search) query.search = search;
     // "other-site": only members holding a role pinned to another site.
     if (roleState) query.roleState = roleState;

package/package.json

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

@@ -36,12 +36,28 @@ export function withCurrentRole<T extends { _id?: unknown; name?: unknown }>(
  * a member showed "Security" and Assign Role could not fix it). Rows from an
  * older server carry no `roleState` and render exactly as before.
  */
-export function memberRoleChip(item: {
-  roleName?: unknown;
-  roleState?: unknown;
-  roleSiteName?: unknown;
-}): { text: string; tone: "info" | "warn" } | null {
+export function memberRoleChip(
+  item: {
+    roleName?: unknown;
+    roleState?: unknown;
+    roleSiteName?: unknown;
+    limitedTo?: unknown;
+  },
+  /** The Organization app's Members list: there is no "this site" there. */
+  orgLevel = false,
+): { text: string; tone: "info" | "warn" } | null {
   const name = typeof item?.roleName === "string" ? item.roleName : "";
+  const limited = limitedSites(item);
+  if (orgLevel && limited.length) {
+    return {
+      text: limited.map((l) => `${l.roleName || "No role"} (${l.siteName || "a site"})`).join(", "),
+      tone: "info",
+    };
+  }
+  if (orgLevel && item?.roleState === "other-site") {
+    const site = typeof item?.roleSiteName === "string" && item.roleSiteName ? item.roleSiteName : "";
+    return { text: site ? `${name || "Role"} (${site})` : name || "Role", tone: "info" };
+  }
   switch (item?.roleState) {
     case "missing":
       return { text: "No role assigned - assign one", tone: "warn" };
@@ -66,9 +82,14 @@ export function memberRoleChip(item: {
  * 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.`;
@@ -95,3 +116,19 @@ export function safeReturnTo(value: unknown): string {
   const path = Array.isArray(value) ? value[0] : value;
   return typeof path === "string" && /^\/(?!\/)[^\s\\]*$/.test(path) ? path : "";
 }
+
+type TLimitedSite = { siteId?: string; siteName?: string; roleName?: string };
+
+/** The sites a site-limited person may open (server `limitedTo`; org Members). */
+export function limitedSites(item: { limitedTo?: unknown } | null | undefined): TLimitedSite[] {
+  return Array.isArray(item?.limitedTo) ? (item!.limitedTo as TLimitedSite[]) : [];
+}
+
+/**
+ * The Organization app's Members "Sites" cell (owner report 2026-09-29, Aigle
+ * / Kanesan): a person limited to sites stays on the list and says where.
+ */
+export function siteAccessLabel(item: { limitedTo?: unknown } | null | undefined): string {
+  const names = limitedSites(item).map((l) => l.siteName || "a site");
+  return names.length ? `Limited to: ${names.join(", ")}` : "All sites";
+}