@asd20/ui-next 2.36.0 → 2.38.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+# [2.38.0](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.37.0...ui-next-v2.38.0) (2026-11-11)
+
+
+### Features
+
+* add organization email and omit missing public data ([8b1b8a7](https://github.com/academydistrict20/asd20-ui-next/commit/8b1b8a79a6b6ea04b8925cce517d022c839a1955))
+
+# [2.37.0](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.36.0...ui-next-v2.37.0) (2026-11-10)
+
+
+### Bug Fixes
+
+* use generic organization labels for message data ([c4c7c5a](https://github.com/academydistrict20/asd20-ui-next/commit/c4c7c5ac0d5857966cfaccabb9d5f8c0fb7ed99a))
+
+
+### Features
+
+* resolve shared message data in the current school context ([808af89](https://github.com/academydistrict20/asd20-ui-next/commit/808af89ac9e8d01395aafc770c02c9e9fbeda5e0))
+* support configurable live Team rosters ([bc32c32](https://github.com/academydistrict20/asd20-ui-next/commit/bc32c325f4dcfd5ea13856ce90da081e093de95e))
+
 # [2.36.0](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.35.4...ui-next-v2.36.0) (2026-11-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asd20/ui-next",
-  "version": "2.36.0",
+  "version": "2.38.0",
   "private": false,
   "description": "ASD20 UI component library for Vue 3.",
   "license": "MIT",

package/src/components/atoms/Asd20RichBodyContent/index.vue

@@ -6,7 +6,7 @@
     @click="onContentClick"
   >
     <p
-      v-if="liveDataError && !liveDataProvider"
+      v-if="showLiveDataDiagnostics && liveDataError && !liveDataProvider"
       role="status"
     >
       {{ liveDataError }} <button
@@ -76,6 +76,7 @@ export default {
   props: {
     bodyContent: { type: String, default: '' },
     bodyJson: { type: [String, Object], default: '' },
+    organizationId: { type: String, default: '' },
     headingLevelOffset: { type: Number, default: 0 },
     headingIdPrefix: { type: String, default: '' },
   },

package/src/components/atoms/Asd20RichBodyContent/messageDocumentRenderer.js

@@ -4,7 +4,7 @@ import {
   contextualAccordionItemKey,
   normalizeHeadingContext,
 } from './headingContext.js'
-import { validateLiveDataReference, liveDataLabel } from '../../../helpers/liveMessageData.js'
+import { validateLiveDataReference } from '../../../helpers/liveMessageData.js'
 
 const MESSAGE_DOCUMENT_SCHEMA_VERSION = 1
 
@@ -96,8 +96,8 @@ const MARK_RENDER_ORDER = Object.freeze({
   superscript: 6,
 })
 const NODE_ATTRIBUTE_NAMES = Object.freeze({
-  liveDataField: ['source', 'sourceId', 'field'],
-  liveDataBlock: ['source', 'sourceId', 'field'],
+  liveDataField: ['source', 'sourceId', 'field', 'binding', 'teamRole'],
+  liveDataBlock: ['source', 'sourceId', 'field', 'binding', 'teamRole', 'memberFields', 'memberOrder', 'memberSort'],
   doc: ['schemaVersion'],
   text: [],
   hardBreak: [],
@@ -807,8 +807,7 @@ function renderImage(attrs, className = '') {
 
 function renderStandardNode(node, context, path, accordionItemId) {
   if (node.type === 'liveDataField' || node.type === 'liveDataBlock') {
-    const tag = node.type === 'liveDataField' ? 'span' : 'div'
-    return `<${tag} class="asd20-live-data-unavailable">${escapeHtml(liveDataLabel(node.attrs))} is currently unavailable.</${tag}>`
+    return ''
   }
   if (node.type === 'text') return renderMarkedText(node, context, path)
   if (node.type === 'hardBreak') return '<br>'

package/src/components/templates/Asd20HandbookTemplate/index.vue

@@ -147,7 +147,7 @@
       >
         <slot name="sidebar-status" />
         <p
-          v-if="liveDataError && !liveDataManaged"
+          v-if="showLiveDataDiagnostics && liveDataError && !liveDataManaged"
           role="status"
         >
           {{ liveDataError }} <button
@@ -298,7 +298,7 @@ import { installDocumentPrintLifecycle } from '../../../helpers/documentPrint'
 import { shouldHandleClientRoutingEvent } from '../../../helpers/linkPolicy'
 import pageTemplateMixin from '../../../mixins/pageTemplateMixin'
 import { publicationHeadingPlanKey } from '../../atoms/Asd20RichBodyContent/headingContext'
-import { liveMessageDataMixin, liveMessageDataProviderKey } from '../../../helpers/liveMessageDataRuntime'
+import { liveMessageDataMixin, liveMessageDataProviderKey, liveMessageDataOrganizationKey } from '../../../helpers/liveMessageDataRuntime'
 
 export default {
   name: 'Asd20HandbookTemplate',
@@ -320,6 +320,7 @@ export default {
     return {
       [publicationHeadingPlanKey]: () => this.publicationHeadings.idPlan,
       [liveMessageDataProviderKey]: () => ({ snapshot: this.liveDataSnapshot }),
+      [liveMessageDataOrganizationKey]: () => this.liveDataContextOrganizationId,
     }
   },
   props: {

package/src/helpers/liveMessageData.js

@@ -3,19 +3,22 @@
 
 // Canonical public live-data contract. The shared UI's copy is generated by
 // scripts/sync-live-message-data.mjs; never add arbitrary paths or queries here.
-const LIVE_DATA_VERSION = 1;
+const LIVE_DATA_VERSION = 4;
+const ADMINISTRATION_TEAM_TAG = "asd20:handbook:administration";
+const LIVE_DATA_MEMBER_FIELDS = Object.freeze({ name: "Name", title: "Title", phone: "Phone" });
 const LIVE_DATA_FIELDS = Object.freeze({
   organization: Object.freeze({
-    title: "School name",
-    address: "School address",
-    phone: "School main phone",
-    hours: "School office hours",
-    administrators: "School administrators",
+    title: "Organization Name",
+    address: "Organization Address",
+    phone: "Organization Main Phone",
+    email: "Organization Email",
+    hours: "Organization Office Hours",
+    administrators: "Organization Administrators",
   }),
   team: Object.freeze({
-    contactPhone: "Team contact phone",
-    officeHours: "Team office hours",
-    staff: "Team staff list",
+    contactPhone: "Team Contact Phone",
+    officeHours: "Team Office Hours",
+    staff: "Team Staff List",
   }),
 });
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -24,23 +27,41 @@ const LIVE_DATA_NODE_TYPES = new Set(["liveDataField", "liveDataBlock"]);
 function validateLiveDataReference(node) {
   const attrs = node?.attrs;
   if (!LIVE_DATA_NODE_TYPES.has(node?.type) || !attrs ||
-      Object.keys(attrs).some(key => !["source", "sourceId", "field"].includes(key)) ||
+      Object.keys(attrs).some(key => !["source", "sourceId", "field", "binding", "teamRole", "memberFields", "memberOrder", "memberSort"].includes(key)) ||
       typeof attrs.source !== "string" || typeof attrs.field !== "string" ||
       !Object.hasOwn(LIVE_DATA_FIELDS, attrs.source) ||
       !Object.hasOwn(LIVE_DATA_FIELDS[attrs.source], attrs.field) ||
-      typeof attrs.sourceId !== "string" || !UUID.test(attrs.sourceId) || node.content?.length || node.marks?.length) {
+      node.content?.length || node.marks?.length) {
     return false;
   }
+  const binding = attrs.binding ?? "fixed";
+  if (!["fixed", "currentSchool"].includes(binding)) return false;
+  if (binding === "fixed") {
+    if (typeof attrs.sourceId !== "string" || !UUID.test(attrs.sourceId) || attrs.teamRole != null) return false;
+  } else if ((attrs.sourceId != null && attrs.sourceId !== "") ||
+      (attrs.source === "team" ? attrs.teamRole !== "administration" : attrs.teamRole != null)) return false;
+  if (attrs.memberFields != null && (!Array.isArray(attrs.memberFields) || !attrs.memberFields.length ||
+      attrs.memberFields.length > 3 || new Set(attrs.memberFields).size !== attrs.memberFields.length ||
+      attrs.memberFields.some(field => !Object.hasOwn(LIVE_DATA_MEMBER_FIELDS, field)))) return false;
+  if (attrs.memberOrder != null && (!Array.isArray(attrs.memberOrder) || attrs.memberOrder.length > 100 ||
+      attrs.memberOrder.some(id => typeof id !== "string" || !UUID.test(id)) ||
+      new Set(attrs.memberOrder.map(id => id.toLowerCase())).size !== attrs.memberOrder.length)) return false;
+  if (attrs.memberSort != null && !["alphabetical", "custom", "administration"].includes(attrs.memberSort)) return false;
+  if (attrs.memberOrder?.length && (binding === "currentSchool" || (attrs.memberSort != null && attrs.memberSort !== "custom"))) return false;
+  if (binding === "currentSchool" && attrs.memberSort === "custom") return false;
+  if ((attrs.memberFields != null || attrs.memberOrder != null || attrs.memberSort != null) && !(attrs.source === "team" && attrs.field === "staff")) return false;
   const block = ["staff", "administrators"].includes(attrs.field);
   return node.type === (block ? "liveDataBlock" : "liveDataField");
 }
 
 function liveDataLabel(attrs) {
-  return LIVE_DATA_FIELDS[attrs?.source]?.[attrs?.field] || "Live information";
+  const label = LIVE_DATA_FIELDS[attrs?.source]?.[attrs?.field] || "Live information";
+  return attrs?.binding === "currentSchool" ? `Current Organization · ${label}` : label;
 }
 
 function liveDataKey(attrs) {
-  return `${attrs.source}:${attrs.sourceId.toLowerCase()}:${attrs.field}`;
+  const base = `${attrs.source}:${attrs.binding === "currentSchool" ? `currentSchool:${attrs.teamRole || ""}` : attrs.sourceId.toLowerCase()}:${attrs.field}`;
+  return attrs.field === "staff" ? `${base}:${JSON.stringify([attrs.memberFields ?? Object.keys(LIVE_DATA_MEMBER_FIELDS), (attrs.memberOrder || []).map(id => id.toLowerCase()), attrs.memberSort || (attrs.memberOrder?.length ? "custom" : "alphabetical")])}` : base;
 }
 
 function collectLiveDataReferences(bodyJson) {
@@ -70,11 +91,67 @@ const dataText = value => typeof value === "string" ? value.trim().slice(0, 1200
 const textNode = text => ({ type: "text", text });
 const paragraph = text => ({ type: "paragraph", content: [textNode(text)] });
 
-function liveDataContent(attrs, snapshot) {
+function liveDataSource(attrs, snapshot, organizationId = snapshot?.contextOrganizationId) {
   const collection = attrs.source === "organization" ? snapshot?.organizations : snapshot?.teams;
-  const source = collection?.find(item => item.id?.toLowerCase() === attrs.sourceId.toLowerCase());
+  let source;
+  if (attrs.binding === "currentSchool") {
+    if (typeof organizationId !== "string" || !UUID.test(organizationId)) return null;
+    const id = organizationId.toLowerCase();
+    if (attrs.source === "organization") source = collection?.find(item => item.id?.toLowerCase() === id);
+    else {
+      const candidates = collection?.filter(item => item.ownerOrganizationId?.toLowerCase() === id && item.isPublic === true &&
+        item.ownerOrganization?.status === "Published" && Array.isArray(item.tags) && item.tags.includes(ADMINISTRATION_TEAM_TAG));
+      if (candidates?.length !== 1) return null;
+      source = candidates[0];
+    }
+  } else source = collection?.find(item => item.id?.toLowerCase() === attrs.sourceId.toLowerCase());
   if (!source || (attrs.source === "organization" && source.status !== "Published") ||
       (attrs.source === "team" && (source.isPublic !== true || source.ownerOrganization?.status !== "Published"))) return null;
+  return source;
+}
+
+// Public roster values are presentation data, never authored attributes. Order
+// uses stable person IDs; departed members disappear and new members sort last.
+function administrationRoleRank(title) {
+  const parts = dataText(title).normalize("NFKC").toLowerCase().split(/[,;|/()–—]|\s+-\s+/)
+    .map(part => part.replace(/[^\p{L}\p{N}]+/gu, " ").trim());
+  // Match whole role segments: an assistant/secretary to the Principal is not
+  // the Principal, and Assistant Principal must never match Principal first.
+  const ranks = parts.map(part => {
+    part = part.replace(/^(?:(?:alternative|online|home|elementary|middle|high|junior|secondary|primary|school|k 8)\s+)+/, "");
+    if (/^(?:(?:elementary|middle|high|junior high) school )?(?:assistant|asst|associate|vice) principals?(?: (?:elementary|middle|high|junior high) school)?$/.test(part)) return 1;
+    if (/^(?:(?:elementary|middle|high|junior high) school )?principals?(?: (?:elementary|middle|high|junior high) school)?$/.test(part) || part === "head of school") return 0;
+    if (/^(?:school |student )?dean(?: of students| of student affairs)?$/.test(part)) return 2;
+    return 3;
+  });
+  return Math.min(...ranks, 3);
+}
+
+function liveDataMembers(attrs, snapshot, { organizationId } = {}) {
+  const source = liveDataSource(attrs, snapshot, organizationId);
+  if (!source) return [];
+  const entries = attrs.field === "staff" ? source.people : source.administrators;
+  if (!Array.isArray(entries) || entries.length > 100) return [];
+  const unique = new Map();
+  entries.forEach(entry => {
+    const person = attrs.field === "staff" ? entry?.person : entry;
+    if (!person || (attrs.field === "staff" && person.isPublic !== true)) return;
+    const name = dataText(person.displayName) || [dataText(person.firstName), dataText(person.lastName)].filter(Boolean).join(" ");
+    if (!name) return;
+    const member = { id: dataText(person.id).toLowerCase(), name, title: dataText(person.title), phone: dataText(person.phone) };
+    const key = member.id || JSON.stringify(member);
+    if (!unique.has(key)) unique.set(key, member);
+  });
+  const order = new Map((attrs.memberOrder || []).map((id, index) => [id.toLowerCase(), index]));
+  const compare = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+  const rank = member => attrs.memberSort === "administration" ? administrationRoleRank(member.title) :
+    attrs.memberSort === "alphabetical" ? 0 : order.get(member.id) ?? Infinity;
+  return [...unique.values()].sort((a, b) => rank(a) - rank(b) || compare(a.name, b.name) || compare(a.id, b.id));
+}
+
+function liveDataContent(attrs, snapshot, organizationId) {
+  const source = liveDataSource(attrs, snapshot, organizationId);
+  if (!source) return null;
   if (attrs.field === "address") {
     const address = source.address || {};
     const value = [dataText(address.street1),
@@ -83,18 +160,9 @@ function liveDataContent(attrs, snapshot) {
     return value ? [textNode(value)] : null;
   }
   if (["staff", "administrators"].includes(attrs.field)) {
-    const people = attrs.field === "staff"
-      ? (source.people || []).map(item => item.person).filter(person => person?.isPublic === true)
-      : source.administrators;
-    if (!Array.isArray(people) || people.length > 100) return null;
-    const unique = new Map();
-    people.forEach(person => {
-      const name = dataText(person?.displayName) || [dataText(person?.firstName), dataText(person?.lastName)].filter(Boolean).join(" ");
-      if (!name) return;
-      const line = [name, dataText(person.title), dataText(person.phone)].filter(Boolean).join(" — ");
-      unique.set(person.id || line, line);
-    });
-    const lines = [...unique.values()].sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+    const fields = attrs.memberFields ?? Object.keys(LIVE_DATA_MEMBER_FIELDS);
+    const lines = liveDataMembers(attrs, snapshot, { organizationId }).map(member => Object.keys(LIVE_DATA_MEMBER_FIELDS)
+      .filter(field => fields.includes(field)).map(field => member[field]).filter(Boolean).join(" — ")).filter(Boolean);
     return lines.length ? [{ type: "bulletList", content: lines.map(line => ({ type: "listItem", content: [paragraph(line)] })) }] : null;
   }
   const value = dataText(source[attrs.field]);
@@ -103,34 +171,47 @@ function liveDataContent(attrs, snapshot) {
 
 // Materialization returns a copy containing only ordinary document nodes.
 // Persist the authored references, never this presentation projection.
-function resolveLiveDataDocument(bodyJson, snapshot, { strict = true } = {}) {
+function resolveLiveDataDocument(bodyJson, snapshot, { strict = true, organizationId, unavailable = "message" } = {}) {
   collectLiveDataReferences(bodyJson);
   const value = typeof bodyJson === "string" ? JSON.parse(bodyJson || "null") : bodyJson;
   const diagnostics = [];
   function resolve(node) {
     if (LIVE_DATA_NODE_TYPES.has(node?.type)) {
-      const content = liveDataContent(node.attrs, snapshot);
+      const content = liveDataContent(node.attrs, snapshot, organizationId);
       if (content) return content;
       diagnostics.push({ code: "live-data-unavailable", reference: liveDataKey(node.attrs) });
+      if (unavailable === "omit") return [];
       const message = `${liveDataLabel(node.attrs)} is currently unavailable.`;
       return node.type === "liveDataBlock" ? [paragraph(message)] : [textNode(message)];
     }
     if (!node || typeof node !== "object") return [node];
+    const content = Array.isArray(node.content) ? node.content.flatMap(resolve) : undefined;
+    if (unavailable === "omit" && node.type === "heading" && content?.length === 0 &&
+        node.content.some(child => LIVE_DATA_NODE_TYPES.has(child.type))) return [];
     return [{ ...node, ...(node.attrs ? { attrs: { ...node.attrs } } : {}),
-      ...(Array.isArray(node.content) ? { content: node.content.flatMap(resolve) } : {}) }];
+      ...(content ? { content } : {}) }];
   }
   const document = resolve(value)[0];
+  // Keep an all-missing projection renderable without falling back to authored
+  // HTML. This placeholder is presentation-only and never saved to the message.
+  if (unavailable === "omit" && diagnostics.length && document?.type === "doc" && document.content?.length === 0)
+    document.content = [{ type: "paragraph" }];
   if (strict && diagnostics.length) throw new Error("Required live information is unavailable. Review the message data sources.");
   return { document, diagnostics };
 }
 
 // One anonymous query captures every dependency for a document batch. No admin
 // secret, user session, arbitrary field names, or private employee data is used.
-async function fetchLiveDataSnapshot(documents, { endpoint, fetchImpl = globalThis.fetch, signal } = {}) {
+async function fetchLiveDataSnapshot(documents, { endpoint, fetchImpl = globalThis.fetch, signal, organizationId } = {}) {
   const references = new Map();
   documents.forEach(document => collectLiveDataReferences(document).forEach(attrs => references.set(liveDataKey(attrs), attrs)));
-  const organizationIds = [...new Set([...references.values()].filter(ref => ref.source === "organization").map(ref => ref.sourceId.toLowerCase()))].sort();
-  const teamIds = [...new Set([...references.values()].filter(ref => ref.source === "team").map(ref => ref.sourceId.toLowerCase()))].sort();
+  const current = [...references.values()].filter(ref => ref.binding === "currentSchool");
+  if (current.length && (typeof organizationId !== "string" || !UUID.test(organizationId))) throw new Error("Choose an organization to preview current-organization information.");
+  const organizationIds = [...new Set([...references.values()].filter(ref => ref.source === "organization" && ref.binding !== "currentSchool").map(ref => ref.sourceId.toLowerCase()))];
+  if (current.length) organizationIds.push(organizationId.toLowerCase());
+  const uniqueOrganizationIds = [...new Set(organizationIds)].sort();
+  const teamIds = [...new Set([...references.values()].filter(ref => ref.source === "team" && ref.binding !== "currentSchool").map(ref => ref.sourceId.toLowerCase()))].sort();
+  const currentTeam = current.some(ref => ref.source === "team");
   if (organizationIds.length + teamIds.length > 50 || references.size > 100) throw new Error("Too many live data sources.");
   if (!references.size) return { version: LIVE_DATA_VERSION, organizations: [], teams: [] };
   if (!endpoint) throw new Error("Public message data is not configured.");
@@ -138,27 +219,27 @@ async function fetchLiveDataSnapshot(documents, { endpoint, fetchImpl = globalTh
     method: "POST", credentials: "omit", redirect: "error", cache: "no-store", signal,
     headers: { "Content-Type": "application/json", "Cache-Control": "no-cache" },
     body: JSON.stringify({
-      query: `query liveMessageData($organizationIds: [uuid!]!, $teamIds: [uuid!]!) {
+      query: `query liveMessageData($organizationIds: [uuid!]!, $teamIds: [uuid!]!${currentTeam ? ", $contextOrganizationIds: [uuid!]!" : ""}) {
         organizations(where: {id: {_in: $organizationIds}, status: {_eq: "Published"}}) {
-          id status title address phone hours administrators
+          id status title address phone email hours administrators
         }
-        teams: groups(where: {id: {_in: $teamIds}, isPublic: {_eq: true}, ownerOrganization: {status: {_eq: "Published"}}}) {
-          id title isPublic contactPhone officeHours ownerOrganization { status }
+        teams: groups(where: {${currentTeam ? `_or: [{id: {_in: $teamIds}}, {ownerOrganizationId: {_in: $contextOrganizationIds}, tags: {_contains: ["${ADMINISTRATION_TEAM_TAG}"]}}]` : "id: {_in: $teamIds}"}, isPublic: {_eq: true}, ownerOrganization: {status: {_eq: "Published"}}}, limit: 101) {
+          id title isPublic contactPhone officeHours ownerOrganizationId tags ownerOrganization { status }
           people(where: {person: {isPublic: {_eq: true}}}, order_by: {person: {id: asc}}, limit: 101) {
             person { id displayName firstName lastName title phone isPublic }
           }
         }
-      }`, variables: { organizationIds, teamIds },
+      }`, variables: { organizationIds: uniqueOrganizationIds, teamIds, ...(currentTeam ? { contextOrganizationIds: [organizationId.toLowerCase()] } : {}) },
     }),
   });
   if (!response.ok) throw new Error("Public message data is unavailable.");
   const result = await response.json();
-  if (result.errors || !Array.isArray(result.data?.organizations) || !Array.isArray(result.data?.teams)) throw new Error("Public message data is unavailable.");
-  return { version: LIVE_DATA_VERSION, organizations: result.data.organizations, teams: result.data.teams };
+  if (result.errors || !Array.isArray(result.data?.organizations) || !Array.isArray(result.data?.teams) || result.data.teams.length > 100) throw new Error("Public message data is unavailable.");
+  return { version: LIVE_DATA_VERSION, ...(current.length ? { contextOrganizationId: organizationId.toLowerCase() } : {}), organizations: result.data.organizations, teams: result.data.teams };
 }
 
 export {
-  LIVE_DATA_VERSION, LIVE_DATA_FIELDS, LIVE_DATA_NODE_TYPES,
+  LIVE_DATA_VERSION, LIVE_DATA_FIELDS, LIVE_DATA_NODE_TYPES, LIVE_DATA_MEMBER_FIELDS, ADMINISTRATION_TEAM_TAG,
   validateLiveDataReference, liveDataLabel, liveDataKey,
-  collectLiveDataReferences, resolveLiveDataDocument, fetchLiveDataSnapshot,
+  collectLiveDataReferences, resolveLiveDataDocument, fetchLiveDataSnapshot, liveDataMembers, administrationRoleRank,
 };

package/src/helpers/liveMessageDataRuntime.js

@@ -3,18 +3,25 @@ import { resolveRuntimeConfigValue } from './runtimeConfig'
 
 export const liveMessageDataEndpointKey = 'liveMessageDataEndpoint'
 export const liveMessageDataProviderKey = 'liveMessageDataProvider'
+export const liveMessageDataOrganizationKey = 'liveMessageDataOrganization'
 
 // The host supplies liveDataDocuments and may provide a batch snapshot to its
 // descendants. Only references trigger a request; ordinary messages are inert.
 export const liveMessageDataMixin = {
   inject: {
+    showLiveDataDiagnostics: { from: 'liveMessageDataDiagnostics', default: false },
     liveDataEndpoint: { from: liveMessageDataEndpointKey, default: '' },
     liveDataProvider: { from: liveMessageDataProviderKey, default: null },
+    liveDataOrganizationProvider: { from: liveMessageDataOrganizationKey, default: null },
   },
   data: () => ({ liveDataSnapshot: null, liveDataLoading: false, liveDataError: '', liveDataEpoch: 0, liveDataMounted: false, liveDataController: null }),
   computed: {
+    liveDataContextOrganizationId() { return this.organizationId || (this.liveDataOrganizationProvider ? this.liveDataOrganizationProvider() : this.organization?.id) || '' },
     liveDataReferencesKey() {
-      try { return JSON.stringify(this.liveDataDocuments.flatMap(doc => collectLiveDataReferences(doc))) }
+      try {
+        const references = this.liveDataDocuments.flatMap(doc => collectLiveDataReferences(doc))
+        return references.length ? JSON.stringify([references, references.some(ref => ref.binding === 'currentSchool') ? this.liveDataContextOrganizationId : '']) : '[]'
+      }
       catch { return '' }
     },
     effectiveLiveDataSnapshot() { return this.liveDataProvider ? this.liveDataProvider().snapshot : this.liveDataSnapshot },
@@ -38,10 +45,11 @@ export const liveMessageDataMixin = {
         const snapshot = await fetchLiveDataSnapshot(this.liveDataDocuments, {
           endpoint: this.liveDataEndpoint || resolveRuntimeConfigValue({ runtimeConfig: this.$config, runtimeConfigKeys: ['graphqlEndpoint'] }),
           signal: controller.signal,
+          organizationId: this.liveDataContextOrganizationId,
         })
-        // Validate availability before accepting a partial capture.
+        // Validate references while retaining available fields in a partial capture.
         this.liveDataDocuments.forEach(doc => {
-          if (collectLiveDataReferences(doc).length) resolveLiveDataDocument(doc, snapshot)
+          if (collectLiveDataReferences(doc).length) resolveLiveDataDocument(doc, snapshot, { strict: false, organizationId: this.liveDataContextOrganizationId })
         })
         if (epoch === this.liveDataEpoch) this.liveDataSnapshot = snapshot
       } catch { if (epoch === this.liveDataEpoch) this.liveDataError = 'Live information is currently unavailable.' }
@@ -50,7 +58,7 @@ export const liveMessageDataMixin = {
     projectLiveMessageData(bodyJson) {
       try {
         if (!collectLiveDataReferences(bodyJson).length) return bodyJson
-        return resolveLiveDataDocument(bodyJson, this.effectiveLiveDataSnapshot, { strict: false }).document
+        return resolveLiveDataDocument(bodyJson, this.effectiveLiveDataSnapshot, { strict: false, organizationId: this.liveDataContextOrganizationId, unavailable: this.showLiveDataDiagnostics ? 'message' : 'omit' }).document
       } catch { return bodyJson }
     },
   },

package/src/mixins/pageTemplateMixin.js

@@ -2,6 +2,8 @@ import responsiveBreakpointMixin from './responsiveBreakpointMixin'
 import { buildBreadcrumbLinks } from '../helpers/breadcrumbLinks'
 
 export default {
+  inject: { pageLiveDataOrganizationProvider: { from: 'liveMessageDataOrganization', default: null } },
+  provide() { return { liveMessageDataOrganization: () => this.pageLiveDataOrganizationProvider ? this.pageLiveDataOrganizationProvider() : this.organization?.id || '' } },
   mixins: [responsiveBreakpointMixin],
 
   data: () => ({