@object-ui/app-shell 11.3.0 → 11.5.0

package/dist/views/RecordDetailView.js

@@ -7,11 +7,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * the object field definitions.
  */
 import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
-import { useParams, useNavigate, useLocation, Link } from 'react-router-dom';
-import { DetailView, RecordChatterPanel, buildDefaultPageSchema, extractMentions } from '@object-ui/plugin-detail';
+import { useParams, useNavigate, useLocation, useSearchParams, Link } from 'react-router-dom';
+import { DetailView, RecordChatterPanel, buildDefaultPageSchema, deriveFieldGroupDetailSections, extractMentions } from '@object-ui/plugin-detail';
 import { Empty, EmptyTitle, EmptyDescription } from '@object-ui/components';
 import { useAuth, createAuthenticatedFetch } from '@object-ui/auth';
-import { ActionProvider, useObjectTranslation, useObjectLabel, usePageAssignment, RecordContextProvider, SchemaRenderer, DiscussionContextProvider, HighlightFieldsProvider, useGlobalUndo } from '@object-ui/react';
+import { ActionProvider, useObjectTranslation, useObjectLabel, usePageAssignment, RecordContextProvider, SchemaRenderer, DiscussionContextProvider, HighlightFieldsProvider, useGlobalUndo, useDataInvalidation, notifyDataChanged } from '@object-ui/react';
 import { buildExpandFields } from '@object-ui/core';
 import { toast } from 'sonner';
 import { useRecordPresence, PresenceAvatars } from '@object-ui/collaboration';
@@ -26,6 +26,9 @@ import { ActionConfirmDialog } from './ActionConfirmDialog';
 import { ActionParamDialog } from './ActionParamDialog';
 import { ActionResultDialog } from './ActionResultDialog';
 import { FlowRunner } from './FlowRunner';
+import { RelatedRecordActionsBridge } from './RelatedRecordActionsBridge';
+import { withPageTabsUrlSync } from '../utils/pageTabsUrlSync';
+import { RECORD_DETAIL_TAB_PARAM } from '../urlParams';
 import { resolveActionParams } from '../utils/resolveActionParams';
 import { useRecordBreadcrumbTitle } from '../context/NavigationContext';
 import { useRecordApprovals } from '../hooks/useRecordApprovals';
@@ -47,9 +50,8 @@ const AUDIT_FIELD_NAMES = new Set(['created_at', 'created_by', 'updated_at', 'up
 /**
  * System/tenant fields that the framework auto-injects on every record but
  * which carry no business value on a detail page. Hidden from the
- * auto-generated section (when the object has no explicit form sections).
- * Authors who really want to show these can still list them in
- * `objectDef.views.form.sections`.
+ * auto-generated sections. Authors who really want to surface one can
+ * assign it to a `fieldGroups` group explicitly (explicit listing wins).
  */
 const HIDDEN_SYSTEM_FIELD_NAMES = new Set([
     'organization_id', 'tenant_id', 'is_deleted', 'deleted_at',
@@ -80,6 +82,20 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
     const { showDebug } = useMetadataInspector();
     const { user } = useAuth();
     const navigate = useNavigate();
+    // objectui#2257 — the active detail tab is URL-addressable (`?tab=`), so it
+    // survives the page subtree remounting (refreshKey-style save refreshes;
+    // dev-StrictMode URL churn). Written with `replace` — switching tabs must
+    // not stack history entries (Back would page through tabs and fight the
+    // overlay contract where Back closes `?form=…`).
+    const [tabSearchParams, setTabSearchParams] = useSearchParams();
+    const activeTabParam = tabSearchParams.get(RECORD_DETAIL_TAB_PARAM) ?? undefined;
+    const handleTabChange = useCallback((value) => {
+        const sp = new URLSearchParams(window.location.search);
+        if (sp.get(RECORD_DETAIL_TAB_PARAM) === value)
+            return;
+        sp.set(RECORD_DETAIL_TAB_PARAM, value);
+        setTabSearchParams(sp, { replace: true });
+    }, [setTabSearchParams]);
     const location = useLocation();
     const originFrom = location.state?.from;
     const { t } = useObjectTranslation();
@@ -89,7 +105,6 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
     const [isLoading, setIsLoading] = useState(true);
     const [feedItems, setFeedItems] = useState([]);
     const [mentionSuggestions, setMentionSuggestions] = useState([]);
-    const [actionRefreshKey, setActionRefreshKey] = useState(0);
     // Screen-flow runtime: a paused `screen`-node flow launched from a record action.
     const [screenFlow, setScreenFlow] = useState(null);
     const [childRelatedData, setChildRelatedData] = useState({});
@@ -105,6 +120,17 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
     // Navigation code passes `record.id || record._id` directly into the URL
     // without adding any prefix, so no stripping is needed.
     const pureRecordId = recordId;
+    // #2269 — "refresh data, don't rebuild UI": after an action/save succeeds
+    // we INVALIDATE this record on the bus instead of bumping a key that
+    // remounted the whole DetailView (destroying tab/scroll/inline-edit state).
+    // `recordInvalidationNonce` is the read side: it bumps when THIS record (or
+    // its object) is invalidated by anyone — the form overlay, an action, an
+    // undo, or any dataSource write via the MutationEvent bridge.
+    const recordInvalidationNonce = useDataInvalidation(objectName || undefined, pureRecordId || undefined);
+    const notifyRecordChanged = useCallback(() => {
+        if (objectName)
+            notifyDataChanged({ objectName, recordId: pureRecordId || undefined });
+    }, [objectName, pureRecordId]);
     // Record-scoped presence ("who else is viewing this record"). The default
     // PresenceProvider source is a no-op, so this resolves to `[]` until a
     // realtime transport (WebSocket-backed source) is wired in by the host
@@ -231,7 +257,9 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             cancelled = true;
             window.removeEventListener('objectui:record-changed', onChanged);
         };
-    }, [effectivePage, objectName, pureRecordId, dataSource, objectDef]);
+        // #2269: recordInvalidationNonce re-runs this fetch in place whenever the
+        // record (or its object) is invalidated on the bus.
+    }, [effectivePage, objectName, pureRecordId, dataSource, objectDef, recordInvalidationNonce]);
     // Schema-driven path: derive a human-readable record title from the
     // loaded `pageRecord` so favourites (record:*) and the breadcrumb show
     // e.g. "Acme Corporation" instead of the raw record id. The legacy
@@ -308,7 +336,13 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
     // "Undo" button (for `undoable` actions) restores the record's prior values.
     const undoCtl = useGlobalUndo({
         dataSource,
-        onUndo: () => { setActionRefreshKey(k => k + 1); toast.success('Change undone'); },
+        onUndo: (op) => {
+            if (op?.objectName)
+                notifyDataChanged({ objectName: op.objectName, recordId: op.recordId });
+            else
+                notifyRecordChanged();
+            toast.success('Change undone');
+        },
     });
     const toastHandler = useCallback((message, options) => {
         if (options?.type === 'error') {
@@ -359,38 +393,46 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                 case 'opportunity_mark_lost':
                     await dataSource.update(objectName, pureRecordId, { stage: 'closed_lost', loss_reason: params.loss_reason });
                     break;
-                default:
-                    // Generic: update record with collected params
-                    if (Object.keys(params).length > 0) {
+                default: {
+                    // Generic: update record with collected params. Related-list row
+                    // actions retarget a CHILD record via explicit `objectName`/`recordId`;
+                    // otherwise the update falls back to this page's record.
+                    const targetObject = action.objectName ?? objectName;
+                    const targetId = action.recordId ?? pureRecordId;
+                    const isThisRecord = targetObject === objectName && String(targetId) === String(pureRecordId);
+                    if (Object.keys(params).length > 0 && targetObject && targetId != null) {
                         // Undoable single-record update: capture the changed fields' prior
                         // values from the loaded record so the success toast can offer Undo.
-                        if (action.undoable && pageRecord && objectName && pureRecordId) {
+                        // Only this page's record has its prior values loaded, so child-row
+                        // updates skip undo capture.
+                        if (action.undoable && isThisRecord && pageRecord) {
                             const undoData = {};
                             for (const k of Object.keys(params))
                                 undoData[k] = pageRecord[k] ?? null;
                             undo = {
-                                id: `undo-${objectName}-${pureRecordId}-${Date.now()}`,
+                                id: `undo-${targetObject}-${targetId}-${Date.now()}`,
                                 type: 'update',
-                                objectName,
-                                recordId: String(pureRecordId),
+                                objectName: targetObject,
+                                recordId: String(targetId),
                                 timestamp: Date.now(),
-                                description: action.label || `Undo ${objectName}`,
+                                description: action.label || `Undo ${targetObject}`,
                                 undoData,
                                 redoData: { ...params },
                             };
                         }
-                        await dataSource.update(objectName, pureRecordId, params);
+                        await dataSource.update(targetObject, String(targetId), params);
                     }
                     break;
+                }
             }
             const shouldRefresh = action.refreshAfter === true;
             if (shouldRefresh) {
-                setActionRefreshKey(k => k + 1);
+                notifyRecordChanged();
             }
             else if (undo) {
                 // Even when refreshAfter isn't set, reflect the change so the user sees
                 // it (and the subsequent Undo) on the open record.
-                setActionRefreshKey(k => k + 1);
+                notifyRecordChanged();
             }
             return { success: true, reload: shouldRefresh, undo };
         }
@@ -419,8 +461,11 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
-                    recordId: pureRecordId,
-                    objectName,
+                    // Related-list row actions retarget the flow at a CHILD record via
+                    // an explicit `recordId` / `objectName`; fall back to this page's
+                    // record when the action carries none (header/more actions).
+                    recordId: action.recordId ?? pureRecordId,
+                    objectName: action.objectName ?? objectName,
                     params: action.params ?? {},
                 }),
             });
@@ -440,7 +485,7 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             }
             const shouldRefresh = action.refreshAfter !== false;
             if (shouldRefresh) {
-                setActionRefreshKey(k => k + 1);
+                notifyRecordChanged();
             }
             return { success: true, data: json?.data, reload: shouldRefresh };
         }
@@ -554,14 +599,16 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                     }
                 }
                 if (action.refreshAfter === true)
-                    setActionRefreshKey(k => k + 1);
+                    notifyRecordChanged();
                 return { success: true };
             }
             const obj = action.objectName || objectName || 'global';
             const res = await authFetch(`${baseUrl}/api/v1/actions/${encodeURIComponent(obj)}/${encodeURIComponent(targetName)}`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ recordId: pureRecordId, params }),
+                // Related-list row actions retarget a CHILD record via explicit
+                // `recordId`; header/more actions carry none and use this page's id.
+                body: JSON.stringify({ recordId: action.recordId ?? pureRecordId, params }),
             });
             const json = await res.json().catch(() => null);
             // The action route wraps the handler's return value in a {success, data}
@@ -580,14 +627,16 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                     }
                     catch { /* ignore */ }
                 }
-                // Surface the failure — this custom new-tab path bypasses
-                // ActionRunner's toast-on-error, so otherwise the user gets no feedback.
-                toast.error(errMsg);
+                // Don't toast here. This handler always runs through the ActionRunner
+                // (registered as the `script` handler on the ActionProvider below, which
+                // wires `onToast`), whose post-execution hook surfaces the returned
+                // `error` as one toast. Toasting again double-fired the message
+                // (e.g. RECORD_LOCKED appeared twice). Mirrors useConsoleActionRuntime.
                 return { success: false, error: errMsg };
             }
             const shouldRefresh = action.refreshAfter !== false;
             if (shouldRefresh)
-                setActionRefreshKey(k => k + 1);
+                notifyRecordChanged();
             const result = json?.data;
             // ── redirectUrl convention ────────────────────────────────────────
             // A script-action handler can return `{ redirectUrl: 'https://…' }`
@@ -653,7 +702,8 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                 catch { /* ignore */ }
             }
             const msg = error.message;
-            toast.error(msg);
+            // Don't toast here — the ActionRunner post-execution hook toasts the
+            // returned `error` once (see the failure branch above).
             return { success: false, error: msg };
         }
         finally {
@@ -686,7 +736,7 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             else {
                 return { success: false, error: `Unknown approval target: ${target}` };
             }
-            setActionRefreshKey((k) => k + 1);
+            notifyRecordChanged();
             return { success: true, reload: true };
         }
         catch (err) {
@@ -1215,76 +1265,49 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
         if (!objectDef) {
             return { type: 'detail-view' };
         }
-        // Auto-detect primary field: prefer objectDef metadata, then 'name' or 'title' heuristic
+        // Auto-detect primary field: prefer objectDef metadata — `primaryField`
+        // (objectui-local override), then the spec-canonical `nameField` and its
+        // deprecated `displayNameField` alias (ADR-0079) — then the 'name'/'title'
+        // heuristic.
         const primaryField = objectDef.primaryField
+            || objectDef.nameField
+            || objectDef.displayNameField
             || Object.keys(objectDef.fields || {}).find((key) => key === 'name' || key === 'title');
-        // Build sections: prefer form sections from objectDef, fallback to flat field list
-        const formSections = objectDef.views?.form?.sections;
-        const sections = formSections && formSections.length > 0
-            ? formSections.map((sec) => ({
-                title: sec.name ? sectionLabel(objectDef.name, sec.name, sec.title || sec.name) : sec.title,
-                collapsible: sec.collapsible,
-                defaultCollapsed: sec.defaultCollapsed,
-                fields: (sec.fields || [])
-                    .filter((f) => {
-                    // Honor `hidden: true` on a field def even when the form
-                    // section explicitly lists it. Hidden fields are typically
-                    // internal artifacts (e.g. database URL, environment id)
-                    // that platform actions read but end-users shouldn't see.
-                    const fieldName = typeof f === 'string' ? f : f.name;
-                    const fieldDef = objectDef.fields?.[fieldName];
-                    return !fieldDef?.hidden;
-                })
-                    .map((f) => {
-                    const fieldName = typeof f === 'string' ? f : f.name;
-                    const fieldDef = objectDef.fields[fieldName];
-                    if (!fieldDef) {
-                        console.warn(`[RecordDetailView] Field "${fieldName}" not found in ${objectDef.name} definition`);
-                        return { name: fieldName, label: fieldName };
-                    }
-                    const refTarget = fieldDef.reference_to || fieldDef.reference;
-                    return {
-                        name: fieldName,
-                        label: fieldDef.label || fieldName,
-                        type: fieldDef.type || 'text',
-                        ...(fieldDef.options && { options: fieldDef.options }),
-                        ...(refTarget && { reference_to: refTarget }),
-                        ...(fieldDef.reference_field && { reference_field: fieldDef.reference_field }),
-                        ...(fieldDef.currency && { currency: fieldDef.currency }),
-                    };
-                }),
-            }))
-            : (() => {
-                // Auto-grouping (platform B): when no form sections are authored,
-                // split fields into a primary section and a collapsible
-                // "More details" section so long-form/secondary fields don't
-                // dilute the main grid. The primary section stays untitled so
-                // DetailSection still flattens its chrome when alone.
-                const allFields = Object.keys(objectDef.fields || {})
-                    .filter((key) => !AUDIT_FIELD_NAMES.has(key) && !HIDDEN_SYSTEM_FIELD_NAMES.has(key) && !objectDef.fields[key]?.hidden);
-                const toField = (key) => {
-                    const fieldDef = objectDef.fields[key];
-                    const refTarget = fieldDef.reference_to || fieldDef.reference;
-                    return {
-                        name: key,
-                        label: fieldDef.label || key,
-                        type: fieldDef.type || 'text',
-                        ...(fieldDef.options && { options: fieldDef.options }),
-                        ...(refTarget && { reference_to: refTarget }),
-                        ...(fieldDef.reference_field && { reference_field: fieldDef.reference_field }),
-                        ...(fieldDef.currency && { currency: fieldDef.currency }),
-                    };
+        // Build sections (ADR-0085: grouping is the `fieldGroups` semantic
+        // role — there is no per-surface sections override; per-page
+        // customization goes through an assigned Page schema):
+        //   1) sections derived from the object's `fieldGroups`;
+        //   2) auto-grouping (primary + collapsible "More details").
+        const sections = (() => {
+            const toField = (key) => {
+                const fieldDef = objectDef.fields[key];
+                const refTarget = fieldDef.reference_to || fieldDef.reference;
+                return {
+                    name: key,
+                    label: fieldDef.label || key,
+                    type: fieldDef.type || 'text',
+                    ...(fieldDef.options && { options: fieldDef.options }),
+                    ...(refTarget && { reference_to: refTarget }),
+                    ...(fieldDef.reference_field && { reference_field: fieldDef.reference_field }),
+                    ...(fieldDef.currency && { currency: fieldDef.currency }),
                 };
-                const primaryKeys = allFields.filter((k) => !isSecondaryField(k, objectDef.fields[k]));
-                const secondaryKeys = allFields.filter((k) => isSecondaryField(k, objectDef.fields[k]));
-                // Below ~6 primary fields the second section often looks awkward
-                // — keep the legacy single-untitled-section behaviour. Also
-                // honour the "no secondary fields" case the same way.
+            };
+            // Auto-grouping (platform B): split fields into a primary section
+            // and a collapsible "More details" section so long-form/secondary
+            // fields don't dilute the main grid. The primary section stays
+            // untitled so DetailSection still flattens its chrome when alone.
+            // Shared by the pure-fallback path and the ungrouped remainder of
+            // the fieldGroups path below.
+            const splitPrimarySecondary = (keys) => {
+                const primaryKeys = keys.filter((k) => !isSecondaryField(k, objectDef.fields[k]));
+                const secondaryKeys = keys.filter((k) => isSecondaryField(k, objectDef.fields[k]));
+                // Keep the legacy single-untitled-section behaviour when the
+                // split would leave one side empty.
                 if (secondaryKeys.length === 0 || primaryKeys.length === 0) {
                     return [
                         {
                             showBorder: false,
-                            fields: allFields.map(toField),
+                            fields: keys.map(toField),
                         },
                     ];
                 }
@@ -1302,7 +1325,31 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                         fields: secondaryKeys.map(toField),
                     },
                 ];
-            })();
+            };
+            // 1) fieldGroups-derived sections (the ADR-0085 semantic role,
+            //    same shared derivation the runtime form honours). Declared
+            //    groups render as titled cards in declared order; the
+            //    trailing untitled bucket (ungrouped fields) still goes
+            //    through the primary/"More details" split so long-form
+            //    fields stay tucked away.
+            const grouped = deriveFieldGroupDetailSections(objectDef);
+            if (grouped) {
+                return grouped.flatMap((sec) => {
+                    if (!sec.name) {
+                        return splitPrimarySecondary(sec.fields.map((f) => f.name));
+                    }
+                    return [{
+                            ...sec,
+                            title: sectionLabel(objectDef.name, sec.name, sec.title),
+                            showBorder: true,
+                        }];
+                });
+            }
+            // 3) Pure auto-grouping fallback.
+            const allFields = Object.keys(objectDef.fields || {})
+                .filter((key) => !AUDIT_FIELD_NAMES.has(key) && !HIDDEN_SYSTEM_FIELD_NAMES.has(key) && !objectDef.fields[key]?.hidden);
+            return splitPrimarySecondary(allFields);
+        })();
         // Audit fields (created_at/created_by/updated_at/updated_by) are NOT
         // appended as a section here — they are surfaced by `<RecordMetaFooter>`
         // (rendered by DetailView) as a single subtle line below the content,
@@ -1372,10 +1419,22 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             }
             return base;
         })();
-        // Build highlightFields: exclusively from objectDef metadata (no hardcoded fallback)
-        const highlightFields = objectDef.views?.detail?.highlightFields ?? [];
-        // Build sectionGroups from objectDef detail/form config if available
-        const sectionGroups = objectDef.views?.detail?.sectionGroups ?? objectDef.views?.form?.sectionGroups;
+        // Build highlightFields from the object's semantic role (ADR-0085).
+        // Bare field names resolve label/type from the field def.
+        const rawHighlightFields = objectDef.highlightFields ?? [];
+        const highlightFields = (Array.isArray(rawHighlightFields) ? rawHighlightFields : [])
+            .map((f) => {
+            const name = typeof f === 'string' ? f : f?.name;
+            if (!name)
+                return null;
+            const fieldDef = objectDef.fields?.[name];
+            return {
+                name,
+                label: fieldDef?.label || name,
+                ...(fieldDef?.type ? { type: fieldDef.type } : {}),
+            };
+        })
+            .filter((f) => !!f);
         // Build related entries from reverse-reference child objects.
         // `referenceField` is the FK field on the child pointing back to this
         // record — passed so the related-list renderer can hide the redundant
@@ -1468,9 +1527,10 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                 // Surface the child object's canonical display field so the
                 // right-rail can show meaningful labels (`user_agent`, `email`,
                 // …) instead of opaque IDs like `kCc8mhJr0bRs0r9Ykd09…`.
-                displayField: childObjectDef?.displayNameField ||
-                    (Array.isArray(childObjectDef?.compactLayout)
-                        ? childObjectDef.compactLayout[0]
+                displayField: childObjectDef?.nameField ||
+                    childObjectDef?.displayNameField ||
+                    (Array.isArray(childObjectDef?.highlightFields)
+                        ? childObjectDef.highlightFields[0]
                         : undefined),
                 onNew,
                 onViewAll,
@@ -1496,6 +1556,10 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             primaryField,
             sections,
             autoTabs: true,
+            // objectui#2257 — URL-driven active tab (same `?tab=` contract as the
+            // schema path's page:tabs node).
+            defaultTab: activeTabParam,
+            onTabChange: handleTabChange,
             autoDiscoverRelated: true,
             ...(historyEnabled && {
                 history: {
@@ -1505,7 +1569,6 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             }),
             ...(related.length > 0 && { related }),
             ...(highlightFields.length > 0 && { highlightFields }),
-            ...(sectionGroups && sectionGroups.length > 0 && { sectionGroups }),
             ...(recordHeaderActions.length > 0 && {
                 actions: [{
                         type: 'action:bar',
@@ -1515,7 +1578,7 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
             }),
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [objectDef?.name, pureRecordId, childRelatedData, actionRefreshKey, appName, navigate, dataSource, t, objectLabel, objects, historyEnabled, historyEntries, historyLoading, approvals.available, approvals.canDecide, approvals.pendingRequest, approvals.latestRequest, embedded]);
+    }, [objectDef?.name, pureRecordId, childRelatedData, appName, navigate, dataSource, t, objectLabel, objects, historyEnabled, historyEntries, historyLoading, approvals.available, approvals.canDecide, approvals.pendingRequest, approvals.latestRequest, embedded, activeTabParam, handleTabChange]);
     if (isLoading) {
         return _jsx(SkeletonDetail, {});
     }
@@ -1666,14 +1729,21 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
         const synthRelated = Array.isArray(detailSchema.related)
             ? detailSchema.related
                 .filter((r) => r?.api && r?.referenceField)
-                .map((r) => ({
-                title: r.title,
-                objectName: r.api,
-                relationshipField: r.referenceField,
-                ...(Array.isArray(r.columns) ? { columns: r.columns } : {}),
-                ...(typeof r.pageSize === 'number' ? { limit: r.pageSize } : {}),
-                ...(r.icon ? { icon: r.icon } : {}),
-            }))
+                .map((r) => {
+                // Carry the `relatedList: 'primary'` prominence flag from the derived
+                // relationship graph. Matched by (childObject, referenceField) — the
+                // unique key of a related list — so it is robust to ordering/filtering.
+                const derived = childRelations.find((c) => c.childObject === r.api && c.referenceField === r.referenceField);
+                return {
+                    title: r.title,
+                    objectName: r.api,
+                    relationshipField: r.referenceField,
+                    ...(Array.isArray(r.columns) ? { columns: r.columns } : {}),
+                    ...(typeof r.pageSize === 'number' ? { limit: r.pageSize } : {}),
+                    ...(r.icon ? { icon: r.icon } : {}),
+                    ...(derived?.isPrimary ? { isPrimary: true } : {}),
+                };
+            })
             : undefined;
         const synthHistory = detailSchema.history
             ? {
@@ -1694,16 +1764,14 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                 headerActions: synthHeaderActions,
                 related: synthRelated,
                 history: synthHistory,
-                // Per-object opt-outs read from `objectDef.detail.*`. Lets
-                // catalog/atomic objects (product, task, ...) keep a focused
-                // single-column layout instead of inheriting the rail.
-                showReferenceRail: objectDef?.detail?.showReferenceRail === true || undefined,
-                hideReferenceRail: objectDef?.detail?.hideReferenceRail === true || undefined,
-                hideRelatedTab: objectDef?.detail?.hideRelatedTab === true || undefined,
-                relatedLayout: objectDef?.detail?.relatedLayout === 'tabs' ? 'tabs' : undefined,
+                // ADR-0085 removed the per-object `detail.*` presentation
+                // toggles (show/hideReferenceRail, hideRelatedTab, relatedLayout)
+                // — the synth defaults apply; per-page layout goes through an
+                // assigned Page schema (`record:reference_rail` stays available
+                // there as a renderer capability).
                 ...(assignedSlots ? { slots: assignedSlots } : {}),
             });
-        return (_jsxs("div", { className: "h-full bg-background overflow-hidden flex flex-col relative", children: [_jsxs("div", { className: "absolute top-2 sm:top-4 right-2 sm:right-4 z-50 flex items-center gap-2", children: [recordPresence.length > 0 && (_jsx(PresenceAvatars, { users: recordPresence, size: "sm", maxVisible: 3, showStatus: true })), _jsx(ManagedByBadge, { managedBy: objectDef?.managedBy })] }), _jsx(RecordContextProvider, { objectName: objectName, recordId: pureRecordId, data: pageRecord, objectSchema: objectDef, dataSource: dataSource, embedded: embedded, headerSystemActions: synthSystemActions, isFavorite: isRecordFavorite, onToggleFavorite: favoriteRecord ? handleToggleRecordFavorite : undefined, children: _jsx(HighlightFieldsProvider, { children: _jsx(DiscussionContextProvider, { items: feedItems, onAddComment: handleAddComment, onAddReply: handleAddReply, onToggleReaction: handleToggleReaction, mentionSuggestions: mentionSuggestions, children: _jsxs(ActionProvider, { context: { record: pageRecord || {}, objectName, user: currentUser }, onConfirm: confirmHandler, onToast: toastHandler, onNavigate: navigateHandler, onParamCollection: paramCollectionHandler, onResultDialog: resultDialogHandler, onModal: modalHandler, handlers: { api: apiHandler, flow: flowHandler, script: serverActionHandler, approval: approvalHandler }, children: [_jsxs("div", { className: "flex-1 overflow-hidden flex flex-row", children: [_jsxs("div", { className: "flex-1 overflow-auto p-3 sm:p-4 lg:p-6 scroll-pb-48", children: [originFrom?.pathname && originFrom?.label && (_jsxs(Link, { to: originFrom.pathname, className: "inline-flex items-center gap-1 mb-3 text-sm text-muted-foreground hover:text-foreground transition-colors", children: [_jsx(ChevronLeft, { className: "h-4 w-4" }), _jsx("span", { children: originFrom.label })] })), _jsx(SchemaRenderer, { schema: renderedPage }), showAutoDiscussion && (_jsx("div", { className: "mt-6", children: _jsx(RecordChatterPanel, { config: {
+        return (_jsxs("div", { className: "h-full bg-background overflow-hidden flex flex-col relative", children: [_jsxs("div", { className: "absolute top-2 sm:top-4 right-2 sm:right-4 z-50 flex items-center gap-2", children: [recordPresence.length > 0 && (_jsx(PresenceAvatars, { users: recordPresence, size: "sm", maxVisible: 3, showStatus: true })), _jsx(ManagedByBadge, { managedBy: objectDef?.managedBy })] }), _jsx(RecordContextProvider, { objectName: objectName, recordId: pureRecordId, data: pageRecord, objectSchema: objectDef, dataSource: dataSource, embedded: embedded, headerSystemActions: synthSystemActions, isFavorite: isRecordFavorite, onToggleFavorite: favoriteRecord ? handleToggleRecordFavorite : undefined, children: _jsx(HighlightFieldsProvider, { children: _jsx(DiscussionContextProvider, { items: feedItems, onAddComment: handleAddComment, onAddReply: handleAddReply, onToggleReaction: handleToggleReaction, mentionSuggestions: mentionSuggestions, children: _jsxs(ActionProvider, { context: { record: pageRecord || {}, objectName, user: currentUser }, onConfirm: confirmHandler, onToast: toastHandler, onNavigate: navigateHandler, onParamCollection: paramCollectionHandler, onResultDialog: resultDialogHandler, onModal: modalHandler, handlers: { api: apiHandler, flow: flowHandler, script: serverActionHandler, approval: approvalHandler }, children: [_jsxs("div", { className: "flex-1 overflow-hidden flex flex-row", children: [_jsxs("div", { className: "flex-1 overflow-auto p-3 sm:p-4 lg:p-6 scroll-pb-48", children: [originFrom?.pathname && originFrom?.label && (_jsxs(Link, { to: originFrom.pathname, className: "inline-flex items-center gap-1 mb-3 text-sm text-muted-foreground hover:text-foreground transition-colors", children: [_jsx(ChevronLeft, { className: "h-4 w-4" }), _jsx("span", { children: originFrom.label })] })), _jsx(RelatedRecordActionsBridge, { appName: appName, objects: objects, dataSource: dataSource, actionLabel: actionLabel, children: _jsx(SchemaRenderer, { schema: withPageTabsUrlSync(renderedPage, { defaultTab: activeTabParam, onTabChange: handleTabChange }) }) }), showAutoDiscussion && (_jsx("div", { className: "mt-6", children: _jsx(RecordChatterPanel, { config: {
                                                                 position: 'bottom',
                                                                 collapsible: false,
                                                                 feed: {
@@ -1720,7 +1788,7 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                     } }), _jsx(ActionResultDialog, { state: resultDialogState, onAcknowledge: () => {
                         resultDialogState.resolve?.();
                         setResultDialogState({ open: false });
-                    } }), _jsx(FlowRunner, { state: screenFlow, authFetch: authFetch, baseUrl: import.meta.env.VITE_SERVER_URL || '', dataSource: dataSource, objects: objects, onClose: () => setScreenFlow(null), onComplete: () => { setScreenFlow(null); setActionRefreshKey(k => k + 1); } })] }));
+                    } }), _jsx(FlowRunner, { state: screenFlow, authFetch: authFetch, baseUrl: import.meta.env.VITE_SERVER_URL || '', dataSource: dataSource, objects: objects, onClose: () => setScreenFlow(null), onComplete: () => { setScreenFlow(null); notifyRecordChanged(); } })] }));
     }
     return (_jsxs("div", { className: "h-full bg-background overflow-hidden flex flex-col relative", children: [_jsxs("div", { className: "absolute top-2 sm:top-4 right-2 sm:right-4 z-50 flex items-center gap-2", children: [recordPresence.length > 0 && (_jsx(PresenceAvatars, { users: recordPresence, size: "sm", maxVisible: 3, showStatus: true })), _jsx(ManagedByBadge, { managedBy: objectDef?.managedBy })] }), _jsxs("div", { className: "flex-1 overflow-hidden flex flex-row", children: [_jsx("div", { className: "flex-1 overflow-auto p-3 sm:p-4 lg:p-6 scroll-pb-48", children: _jsx("div", { className: "mx-auto w-full max-w-[1400px]", children: _jsxs(ActionProvider, { context: { record: {}, objectName, user: currentUser }, onConfirm: confirmHandler, onToast: toastHandler, onNavigate: navigateHandler, onParamCollection: paramCollectionHandler, onResultDialog: resultDialogHandler, onModal: modalHandler, handlers: { api: apiHandler, flow: flowHandler, script: serverActionHandler, approval: approvalHandler }, children: [_jsx(DetailView, { schema: detailSchema, dataSource: dataSource, objectLabel: objectLabel({ name: objectDef.name, label: objectDef.label }), isFavorite: isRecordFavorite, onToggleFavorite: favoriteRecord ? handleToggleRecordFavorite : undefined, onDataLoaded: (record) => {
                                             if (!record || typeof record !== 'object')
@@ -1742,7 +1810,7 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                                                     enableThreading: true,
                                                     showCommentInput: true,
                                                 },
-                                            }, items: feedItems, onAddComment: handleAddComment, onAddReply: handleAddReply, onToggleReaction: handleToggleReaction }) }, actionRefreshKey), modalElement] }) }) }), _jsx(MetadataPanel, { open: showDebug, sections: [{ title: 'View Schema', data: detailSchema }] })] }), _jsx(ActionConfirmDialog, { state: confirmState, onOpenChange: (open) => {
+                                            }, items: feedItems, onAddComment: handleAddComment, onAddReply: handleAddReply, onToggleReaction: handleToggleReaction }) }), modalElement] }) }) }), _jsx(MetadataPanel, { open: showDebug, sections: [{ title: 'View Schema', data: detailSchema }] })] }), _jsx(ActionConfirmDialog, { state: confirmState, onOpenChange: (open) => {
                     if (!open)
                         setConfirmState(s => ({ ...s, open: false }));
                 } }), _jsx(ActionParamDialog, { state: paramState, onOpenChange: (open) => {
@@ -1751,5 +1819,5 @@ export function RecordDetailView({ dataSource, objects, onEdit, objectNameOverri
                 } }), _jsx(ActionResultDialog, { state: resultDialogState, onAcknowledge: () => {
                     resultDialogState.resolve?.();
                     setResultDialogState({ open: false });
-                } }), _jsx(FlowRunner, { state: screenFlow, authFetch: authFetch, baseUrl: import.meta.env.VITE_SERVER_URL || '', dataSource: dataSource, objects: objects, onClose: () => setScreenFlow(null), onComplete: () => { setScreenFlow(null); setActionRefreshKey(k => k + 1); } })] }));
+                } }), _jsx(FlowRunner, { state: screenFlow, authFetch: authFetch, baseUrl: import.meta.env.VITE_SERVER_URL || '', dataSource: dataSource, objects: objects, onClose: () => setScreenFlow(null), onComplete: () => { setScreenFlow(null); notifyRecordChanged(); } })] }));
 }

package/dist/views/RecordFormPage.js

@@ -181,7 +181,13 @@ export function RecordFormPage({ mode }) {
     // `simple` here (see the form-layout-vs-presentation modelling note in #1890).
     const formDef = objectDef.form ?? objectDef.formViews?.default ?? {};
     const pageFormType = ['tabbed', 'wizard', 'split'].includes(formDef.type) ? formDef.type : 'simple';
-    const formLayoutProps = pageFormType !== 'simple' && Array.isArray(formDef.sections)
+    // Curated `sections` are wired through for EVERY layout family — a `simple`
+    // form view's sections still carry the authored field selection, order,
+    // grouping and per-field `visibleOn` predicates (#2212). Dropping them for
+    // `simple` made the page-mode form fall back to the raw schema (every field,
+    // no conditional visibility) while the New/Edit modal honored the same view
+    // via resolveFormViewLayout.
+    const formLayoutProps = Array.isArray(formDef.sections) && formDef.sections.length > 0
         ? {
             sections: formDef.sections,
             defaultTab: formDef.defaultTab,

package/dist/views/RelatedRecordActionsBridge.d.ts

@@ -0,0 +1,33 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/**
+ * Notify open related lists for `objectName` to refetch.
+ *
+ * Since #2269 this is a thin alias over the data-invalidation bus — the bus
+ * dispatches the legacy `objectui:related-changed` window event RelatedList
+ * listens for, plus every `useDataInvalidation` reader. Kept for callers
+ * whose writes BYPASS the dataSource (row actions over the ActionRunner);
+ * dataSource writes need no manual call (the MutationEvent bridge covers
+ * them).
+ */
+export declare function notifyRelatedChanged(objectName: string): void;
+/** i18n label resolver signature (matches `useObjectLabel().actionLabel`). */
+type ActionLabelFn = (objectName: string | undefined, actionName: string, fallback: string) => string;
+export interface RelatedRecordActionsBridgeProps {
+    /** Current app segment used to build `/apps/:appName/...` routes. */
+    appName?: string;
+    /** All object definitions (to resolve the child object + its actions). */
+    objects: any[];
+    /** Data source for delete + action dispatch. */
+    dataSource: any;
+    /** Localizes a child action's label (falls back to the raw label). */
+    actionLabel: ActionLabelFn;
+    children: React.ReactNode;
+}
+export declare function RelatedRecordActionsBridge({ appName, objects, dataSource, actionLabel, children, }: RelatedRecordActionsBridgeProps): import("react").JSX.Element;
+export {};