@7365admin1/layer-common 4.44.0 → 4.45.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @iservice365/layer-common
 
+## 4.45.0
+
+### Minor Changes
+
+- c6a8606: Invite member: from inside a site the Site field is fixed to that site (read-only), and the Role list shows only the organisation's own active roles for the invited app and that site, each labelled "Site role" or "Organisation role". Org-less template roles are no longer offered on an invitation into an organisation.
+- 1c0aea4: Settings → Site Information is read-only on a site the organisation serves but does not own: a note says "This site belongs to <Client>. Only they can change its details.", cover photo, description and documents are inert and Save is hidden. Blocks and guard posts stay editable. Driven by `detailsEditable`/`ownerOrgName` on the site read (core); absent on an older API = unchanged.
+
 ## 4.44.0
 
 ### Minor Changes
@@ -1502,11 +1509,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/InvitationForm.vue

@@ -46,9 +46,10 @@
               <v-col cols="12">
                 <v-autocomplete
                   v-model="invite.role"
-                  :items="roles"
-                  item-title="name"
+                  :items="roleOptions"
+                  item-title="title"
                   item-value="_id"
+                  :item-props="(item: any) => ({ subtitle: item.subtitle })"
                   :rules="[requiredRule]"
                   class="filter-field"
                   density="comfortable"
@@ -61,7 +62,23 @@
             <v-row no-gutters>
               <InputLabel class="text-capitalize" title="Site" />
               <v-col cols="12">
+                <!--
+                  Inviting from inside a site invites INTO that site. The owner
+                  (2026-09-25): other sites in this list were confusing, so the
+                  site is shown, not chosen.
+                -->
+                <v-text-field
+                  v-if="fixedSite"
+                  :model-value="invite.siteName || 'This site'"
+                  class="filter-field"
+                  density="comfortable"
+                  readonly
+                  hint="Invitations from this site are for this site."
+                  persistent-hint
+                  data-test="invite-fixed-site"
+                ></v-text-field>
                 <v-autocomplete
+                  v-else
                   v-model="invite.site"
                   :items="sites"
                   class="filter-field"
@@ -133,6 +150,8 @@ import useCustomerSite from '../composables/useCustomerSite';
 import useLocal from '../composables/useLocal';
 import { useLocalSetup } from '../composables/useLocalSetup';
 import useRole from '../composables/useRole';
+import useSite from '../composables/useSite';
+import { inviteRoleOptions } from '../utils/invite-role-options';
 import useUser from '../composables/useUser';
 import useUtils from '../composables/useUtils';
 
@@ -169,6 +188,16 @@ const props = defineProps({
    * which is about the site created in step 4) had no way to say so. It is
    * wired to `invite` below.
    */
+  /*
+   * The site the invitation is being made FROM (every site-level Invitations
+   * page passes it through InvitationMain). When set, the Site field is fixed
+   * to it and the Role list is that site's roles plus the organisation-wide
+   * ones.
+   */
+  siteId: {
+    type: String,
+    default: "",
+  },
   site: {
     type: Object as PropType<TCustomerSite>,
     default: () => ({
@@ -262,6 +291,18 @@ watch(
   },
   { immediate: true, deep: true }
 )
+
+/* The site this form is fixed to, if any: the page's site, or onboarding's. */
+const fixedSite = computed(() => props.siteId || props.site?.site || "")
+
+watch(
+  () => props.siteId,
+  (siteId) => {
+    if (!siteId) return
+    invite.value.site = siteId
+  },
+  { immediate: true }
+)
 // invite.value.app = props.app;
 // invite.value.org = props.org ?? "";
 
@@ -357,6 +398,27 @@ watchEffect(() => {
   }
 });
 
+/* Name the fixed site: from the organisation's site list, else read it. */
+const { getSiteById } = useSite();
+watch(
+  [fixedSite, sites],
+  async ([siteId]) => {
+    if (!siteId || invite.value.siteName) return
+    const listed = sites.value.find((x) => x?.value === siteId)
+    if (listed?.title) {
+      invite.value.siteName = listed.title
+      return
+    }
+    try {
+      const site: any = await getSiteById(siteId)
+      invite.value.siteName = site?.name || site?.data?.name || ""
+    } catch {
+      // The field still reads "This site"; the invitation carries the id.
+    }
+  },
+  { immediate: true }
+)
+
 watchEffect(() => {
   if (hasSite.value) {
     refreshSiteData();
@@ -384,26 +446,47 @@ const roles = ref<Array<Record<string, any>>>([]);
  */
 const { getInvitableRoles } = useRole();
 
+/*
+ * 2026-09-25 (owner report, Wing Tai / Winsland House I): the list now asks for
+ * the app actually being invited into (`invite.app`, which the App field can
+ * change - it used to keep asking for `props.app`) and for the chosen site, so
+ * it holds only this organisation's roles for this app and site. The org-less
+ * templates are gone from any invitation that names an organisation - the
+ * server refuses them there (`core roleInvitable`).
+ */
 const { data: RolesData, refresh: refreshRoles } = await useLazyAsyncData(
-  "get-roles-by-type-" + props.org + "-" + props.app,
+  "get-roles-by-type-" + props.org + "-" + props.app + "-" + fixedSite.value,
   () =>
     getInvitableRoles({
       org: props.org,
-      type: props.app,
-      limit: 50,
+      type: invite.value.app || props.app,
+      site: invite.value.site,
+      limit: 100,
     }),
-  { watch: [() => props.app] }
+  { watch: [() => props.app, () => invite.value.app, () => invite.value.site] }
 );
 
 watchEffect(() => {
   if (RolesData.value) {
     roles.value = RolesData.value.items;
+    // A role picked for a different site is not valid for this one.
+    if (
+      invite.value.role &&
+      !roles.value.some((r: any) => String(r._id) === String(invite.value.role))
+    ) {
+      invite.value.role = "";
+    }
   }
 });
 
+const roleOptions = computed(() => inviteRoleOptions(roles.value));
+
 async function handleUpdateApp(value: string)  {
   invite.value.role = "";
-  invite.value.site = "";
+  if (!fixedSite.value) {
+    invite.value.site = "";
+    invite.value.siteName = "";
+  }
   await refreshRoles()
 }
 

package/components/InvitationMain.vue

@@ -124,6 +124,7 @@
       <InvitationForm
         title="Invite member"
         :org="org"
+        :site-id="props.siteId"
         :invite-member="true"
         @cancel="dialogMember = false"
         @success="handleSuccess"

package/components/SiteSettings.vue

@@ -28,7 +28,17 @@
         <v-expansion-panel-text>
           <v-row no-gutters class="d-flex justify-center py-10">
             <v-form class="w-100">
-              <v-row>
+              <!--
+                Owner decision 2026-09-25: a site's details are its owning
+                client's. A provider that serves the site sees them read-only;
+                the server refuses the save too. Blocks and guard posts below
+                stay editable - they are the provider's operational settings.
+              -->
+              <v-alert v-if="siteDetailsLocked" type="info" variant="tonal" density="compact" class="mb-4"
+                data-test="site-info-owner-only">
+                {{ siteOwnerNote }}
+              </v-alert>
+              <v-row :inert="siteDetailsLocked" :class="{ 'opacity-60': siteDetailsLocked }">
                 <!-- Cover Photo + Preview -->
                 <v-col cols="12" lg="5" class="pt-0">
                   <InputLabel title="Cover Photo (displayed in resident app)" class="d-block mb-2" />
@@ -58,10 +68,12 @@
                 </v-col>
 
                 <!-- Submit -->
-                <v-col cols="12" class="pt-0 d-flex justify-end">
+                <v-col v-if="!siteDetailsLocked" cols="12" class="pt-0 d-flex justify-end">
                   <v-btn color="primary-button" class="text-none" size="large" variant="flat" text="Save"
                     :loading="savingSiteInfo" @click="saveSiteInfo" />
                 </v-col>
+              </v-row>
+              <v-row>
 
                 <!-- Divider -->
                 <v-col cols="12" class="my-2">
@@ -290,6 +302,13 @@ const orgId = computed(
   () => props.orgId || String((siteData.value as TSite | null)?.orgId ?? "")
 );
 
+// The site read says whether this caller may change the site's details (core
+// 3.103). Absent on an older API = unknown, so nothing is locked here.
+const siteDetailsLocked = computed(
+  () => (siteData.value as any)?.detailsEditable === false
+);
+const siteOwnerNote = computed(() => siteOwnerOnlyNote((siteData.value as any)?.ownerOrgName));
+
 watch(
   siteData,
   (val: TSite) => {

package/composables/useRole.ts

@@ -73,17 +73,34 @@ export default function useRole() {
       limit?: number;
     }
   ) {
+    /*
+     * An invitation INTO an organisation offers that organisation's own roles
+     * only (owner, 2026-09-25: the org-less templates "Org Owner", "Org - Admin
+     * Doan623"... in a site's Invite member list were never this client's).
+     * The server refuses a template on such an invitation (`core
+     * roleInvitable`). Templates are still what an invitation naming NO
+     * organisation offers, e.g. the console's new-client flows.
+     *
+     * A role pinned to a site is offered only for THAT site: the server's site
+     * filter returns this site's roles plus the org-wide ones, and with no site
+     * chosen yet only the org-wide ones are valid.
+     */
     const [tenant, templates] = await Promise.all([
       org
         ? getRoles({ search, org, site, type, limit })
         : Promise.resolve({ items: [] } as Record<string, any>),
-      getRoles({ search, type: "organization", limit }),
+      org
+        ? Promise.resolve({ items: [] } as Record<string, any>)
+        : getRoles({ search, type: "organization", limit }),
     ]);
 
     const seen = new Set<string>();
     const items = [...(tenant?.items ?? []), ...(templates?.items ?? [])].filter(
       (role: Record<string, any>) => {
         if (role?.type === "admin") return false;
+        if (role?.status && role.status !== "active") return false;
+        const roleSite = String(role?.site ?? "");
+        if (roleSite && roleSite !== String(site ?? "")) return false;
         const id = String(role?._id ?? "");
         if (!id || seen.has(id)) return false;
         seen.add(id);

package/package.json

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

@@ -0,0 +1,22 @@
+/**
+ * The Invite member Role list, labelled so an inviter can tell a role made for
+ * this site from one that applies across the organisation (owner report
+ * 2026-09-25). The roles themselves are already scoped by
+ * `useRole.getInvitableRoles`.
+ */
+export type TInviteRoleOption = { _id: string; title: string; subtitle: string };
+
+export const SITE_ROLE_LABEL = "Site role";
+export const ORG_ROLE_LABEL = "Organisation role";
+
+export function inviteRoleOptions(
+  roles: Array<Record<string, any>> | null | undefined,
+): TInviteRoleOption[] {
+  return (roles ?? [])
+    .filter((role) => role && role._id)
+    .map((role) => ({
+      _id: String(role._id),
+      title: String(role.name ?? ""),
+      subtitle: role.site ? SITE_ROLE_LABEL : ORG_ROLE_LABEL,
+    }));
+}

package/utils/site-owner-note.ts

@@ -0,0 +1,9 @@
+/**
+ * What a service provider is told on a site it serves but does not own
+ * (owner decision 2026-09-25: only the owning client changes a site's
+ * details). Same words as the server's refusal.
+ */
+export function siteOwnerOnlyNote(ownerName?: string | null): string {
+  const name = String(ownerName ?? "").trim() || "another organisation";
+  return `This site belongs to ${name}. Only they can change its details.`;
+}