@rippling/rippling-sdk 0.2.0-alpha.49 → 0.2.0-alpha.51

package/lib/manifest/custom-object-page-layout.mjs

@@ -14,32 +14,34 @@ function isFieldRef(value) {
     const candidate = value;
     return candidate != null && typeof candidate === 'object' && isField(candidate.field);
 }
-const FIELD_SECTION_ID = Symbol('CustomObjectPageLayout.fieldSectionId');
+const LAYOUT_SECTION_KEY = Symbol('CustomObjectPageLayout.layoutSectionKey');
 function isCustomObjectFieldSection(value) {
     return value instanceof CustomObjectFieldSection;
 }
-function attachFieldSectionId(section, sectionId) {
-    if (section.key != null && section.key !== sectionId) {
-        throw new Error(`CustomObjectPageLayout fields_section key "${section.key}" does not match field section "${sectionId}".`);
-    }
-    section.key = sectionId;
-    Object.defineProperty(section, FIELD_SECTION_ID, {
-        value: sectionId,
+function explicitLayoutSectionKey(section) {
+    const record = section;
+    const key = section.key ?? record['layout_section_key'] ?? record['layoutSectionKey'];
+    return typeof key === 'string' ? key : undefined;
+}
+function attachLayoutSectionKey(section, sectionKey) {
+    if (explicitLayoutSectionKey(section) == null)
+        section.key = sectionKey;
+    Object.defineProperty(section, LAYOUT_SECTION_KEY, {
+        value: sectionKey,
         enumerable: false,
         configurable: true,
     });
     return section;
 }
 function layoutSectionKey(section) {
-    return (section.key ??
-        section[FIELD_SECTION_ID]);
+    return (explicitLayoutSectionKey(section) ??
+        section[LAYOUT_SECTION_KEY]);
 }
 function layoutSectionMatches(section, sectionKey) {
     return layoutSectionKey(section) === sectionKey;
 }
-function inputFieldsSectionHasKey(input) {
-    const record = input;
-    return Object.prototype.hasOwnProperty.call(record, 'key') && record['key'] != null;
+function isSerializedFieldsSection(section) {
+    return section.type === 'fields_section';
 }
 function assertSameObject(customObject, field, sectionKey) {
     if (field.getCustomObjectApiName() !== customObject.getApiName()) {
@@ -74,10 +76,29 @@ function toSerializedSectionField(fieldRqlName, options = {}) {
         normalized.hidden = options.hidden;
     if (options.editable != null)
         normalized.editable = options.editable;
+    if (options.readOnly != null)
+        normalized.readOnly = options.readOnly;
+    if (options.defaultValue != null)
+        normalized.defaultValue = options.defaultValue;
+    if (options.height != null)
+        normalized.height = options.height;
+    if (options.canBeDeleted != null)
+        normalized.canBeDeleted = options.canBeDeleted;
     if (options.movementOption != null)
         normalized.movementOption = options.movementOption;
     return normalized;
 }
+function copySectionOptions(target, input) {
+    if (input.canBeDeleted != null)
+        target.canBeDeleted = input.canBeDeleted;
+    if (input.canBeRenamed != null)
+        target.canBeRenamed = input.canBeRenamed;
+    if (input.movementOption != null)
+        target.movementOption = input.movementOption;
+    if (input.hideName != null)
+        target.hideName = input.hideName;
+    return target;
+}
 function normalizeSectionField(customObject, section, sectionKey, entry) {
     if (isField(entry)) {
         assertSameObject(customObject, entry, sectionKey);
@@ -94,26 +115,28 @@ function normalizeSectionField(customObject, section, sectionKey, entry) {
 }
 function normalizeFieldsSection(customObject, input) {
     assertSectionBelongsTo(customObject, input.section);
-    const sectionId = input.section.getSectionId();
-    if (inputFieldsSectionHasKey(input)) {
-        throw new Error('CustomObjectPageLayout fields_section key is not supported. Omit key.');
-    }
+    const sectionKey = input.key ?? input.section.getSectionId();
     const name = input.name ?? input.section.getName();
-    const normalized = {
+    const normalized = copySectionOptions({
         name,
         type: 'fields_section',
-        fields: input.fields.map((field) => normalizeSectionField(customObject, input.section, sectionId, field)),
-    };
+        fields: input.fields.map((field) => normalizeSectionField(customObject, input.section, sectionKey, field)),
+    }, input);
     if (input.layout != null)
         normalized.layout = input.layout;
-    return attachFieldSectionId(normalized, sectionId);
+    return attachLayoutSectionKey(normalized, sectionKey);
+}
+function normalizeSection(customObject, section) {
+    if (section.type === 'fields_section')
+        return normalizeFieldsSection(customObject, section);
+    return { ...section };
 }
 function normalizeTab(customObject, tab) {
     if (tab.type === 'custom_tab')
         return tab;
     return {
         ...tab,
-        sections: tab.sections.map((section) => normalizeFieldsSection(customObject, section)),
+        sections: tab.sections.map((section) => normalizeSection(customObject, section)),
     };
 }
 function normalizeSystemSectionEdit(customObject, tabKey, sectionKey, edit) {
@@ -128,7 +151,7 @@ function normalizeSystemTabEdit(customObject, tabKey, edit) {
     const { newSections: _newSections, systemSectionEdits: _systemSectionEdits, ...rest } = edit;
     const normalized = { ...rest };
     if (edit.newSections != null) {
-        normalized.newSections = edit.newSections.map((section) => normalizeFieldsSection(customObject, section));
+        normalized.newSections = edit.newSections.map((section) => normalizeSection(customObject, section));
     }
     if (edit.systemSectionEdits != null) {
         const systemSectionEdits = {};
@@ -186,6 +209,18 @@ function normalizeHeaderEdits(headerEdits) {
     for (const [index, field] of (headerEdits.newFields ?? []).entries()) {
         assertKnownKeys(field, NEW_HEADER_FIELD_KEYS, `CustomObjectPageLayout headerEdits.newFields[${index}]`, 'Use { rqlName, key } entries, or call addHeaderField(field).');
     }
+    if (headerEdits.newTitleField === '') {
+        throw new Error('CustomObjectPageLayout headerEdits.newTitleField cannot be empty. Use titleFieldDeleted.');
+    }
+    if (headerEdits.newDescriptionField === '') {
+        throw new Error('CustomObjectPageLayout headerEdits.newDescriptionField cannot be empty. Use descriptionFieldDeleted.');
+    }
+    if (headerEdits.newTitleField != null && headerEdits.titleFieldDeleted === true) {
+        throw new Error('CustomObjectPageLayout headerEdits cannot both set newTitleField and titleFieldDeleted.');
+    }
+    if (headerEdits.newDescriptionField != null && headerEdits.descriptionFieldDeleted === true) {
+        throw new Error('CustomObjectPageLayout headerEdits cannot both set newDescriptionField and descriptionFieldDeleted.');
+    }
     if (headerEdits.headerFieldsOrder == null)
         return headerEdits;
     return {
@@ -248,52 +283,90 @@ function fieldRqlNameOf(entry) {
     if (entry == null || typeof entry !== 'object')
         return undefined;
     const record = entry;
-    const fieldRqlName = record['fieldRqlName'] ?? record['field_rql_name'];
+    const fieldRqlName = record['fieldRqlName'] ?? record['field_rql_name'] ?? record['apiName'] ?? record['api_name'];
     return typeof fieldRqlName === 'string' ? fieldRqlName : undefined;
 }
-function explicitFieldSectionId(entry) {
-    if (entry == null || typeof entry !== 'object')
-        return undefined;
-    const record = entry;
-    const fieldSectionId = record['fieldSection'] ?? record['field_section'];
-    return typeof fieldSectionId === 'string' ? fieldSectionId : undefined;
+function addFieldSectionLayoutSection(index, fieldSectionId, entry) {
+    const entries = index.get(fieldSectionId) ?? [];
+    if (!entries.some((existing) => existing.tabKey === entry.tabKey && existing.sectionKey === entry.sectionKey)) {
+        entries.push(entry);
+    }
+    index.set(fieldSectionId, entries);
 }
-function inferredSectionIdFromFields(section, resolveFieldSectionId) {
-    const sectionIds = new Set();
+function indexFieldsSectionInput(index, tabKey, section) {
+    addFieldSectionLayoutSection(index, section.section.getSectionId(), {
+        tabKey,
+        sectionKey: section.key ?? section.section.getSectionId(),
+    });
+}
+function indexPageLayoutSectionInput(index, tabKey, section) {
+    if (section.type === 'fields_section')
+        indexFieldsSectionInput(index, tabKey, section);
+}
+function buildFieldSectionLayoutIndexFromProps(tabEdits) {
+    const index = new Map();
+    if (tabEdits == null)
+        return index;
+    for (const tab of tabEdits.newTabs ?? []) {
+        if (tab.type !== 'tab_with_sections')
+            continue;
+        for (const section of tab.sections)
+            indexPageLayoutSectionInput(index, tab.key, section);
+    }
+    for (const [tabKey, tabEdit] of Object.entries(tabEdits.systemTabEdits ?? {})) {
+        for (const section of tabEdit.newSections ?? []) {
+            indexPageLayoutSectionInput(index, tabKey, section);
+        }
+    }
+    return index;
+}
+function indexLoadedFieldsSection(index, tabKey, section, resolveFieldSectionId) {
+    const sectionKey = layoutSectionKey(section);
+    if (sectionKey == null || resolveFieldSectionId == null)
+        return;
     for (const field of section.fields ?? []) {
-        const explicitSectionId = explicitFieldSectionId(field);
-        if (explicitSectionId != null) {
-            sectionIds.add(explicitSectionId);
+        const fieldRqlName = fieldRqlNameOf(field);
+        if (fieldRqlName == null)
             continue;
+        const fieldSectionId = resolveFieldSectionId(fieldRqlName);
+        if (fieldSectionId != null) {
+            addFieldSectionLayoutSection(index, fieldSectionId, { tabKey, sectionKey });
         }
-        const fieldApiName = fieldRqlNameOf(field);
-        if (fieldApiName == null || resolveFieldSectionId == null)
+    }
+}
+function buildFieldSectionLayoutIndexFromLoadedTabEdits(tabEdits, resolveFieldSectionId) {
+    const index = new Map();
+    for (const tab of tabEdits.newTabs ?? []) {
+        if (!isTabWithSections(tab))
             continue;
-        const resolvedSectionId = resolveFieldSectionId(fieldApiName);
-        if (resolvedSectionId != null)
-            sectionIds.add(resolvedSectionId);
+        for (const section of tab.sections) {
+            if (isSerializedFieldsSection(section)) {
+                indexLoadedFieldsSection(index, tab.key, section, resolveFieldSectionId);
+            }
+        }
     }
-    return sectionIds.size === 1 ? [...sectionIds][0] : undefined;
+    for (const [tabKey, tabEdit] of Object.entries(tabEdits.systemTabEdits ?? {})) {
+        for (const section of tabEdit.newSections ?? []) {
+            if (isSerializedFieldsSection(section)) {
+                indexLoadedFieldsSection(index, tabKey, section, resolveFieldSectionId);
+            }
+        }
+    }
+    return index;
 }
-function annotateLoadedFieldsSection(section, resolveFieldSectionId) {
-    const explicitSectionId = layoutSectionKey(section);
-    const inferredSectionId = inferredSectionIdFromFields(section, resolveFieldSectionId);
-    if (explicitSectionId != null && inferredSectionId != null && explicitSectionId !== inferredSectionId) {
-        throw new Error(`CustomObjectPageLayout fields_section key "${explicitSectionId}" does not match ` +
-            `field section "${inferredSectionId}".`);
-    }
-    const sectionId = explicitSectionId ?? inferredSectionId;
-    return sectionId == null ? section : attachFieldSectionId(section, sectionId);
+function annotateLoadedFieldsSection(section) {
+    const sectionKey = layoutSectionKey(section);
+    return sectionKey == null ? section : attachLayoutSectionKey(section, sectionKey);
 }
-function annotateLoadedTabEdits(tabEdits, resolveFieldSectionId) {
+function annotateLoadedTabEdits(tabEdits) {
     for (const tab of tabEdits.newTabs ?? []) {
         if (!isTabWithSections(tab))
             continue;
-        tab.sections = tab.sections.map((section) => annotateLoadedFieldsSection(section, resolveFieldSectionId));
+        tab.sections = tab.sections.map((section) => isSerializedFieldsSection(section) ? annotateLoadedFieldsSection(section) : section);
     }
     for (const tabEdit of Object.values(tabEdits.systemTabEdits ?? {})) {
         if (tabEdit.newSections != null) {
-            tabEdit.newSections = tabEdit.newSections.map((section) => annotateLoadedFieldsSection(section, resolveFieldSectionId));
+            tabEdit.newSections = tabEdit.newSections.map((section) => isSerializedFieldsSection(section) ? annotateLoadedFieldsSection(section) : section);
         }
     }
     return tabEdits;
@@ -409,6 +482,7 @@ export class CustomObjectPageLayout {
         this._customObjectApiName = customObject.getApiName();
         this._name = props.name;
         this._tabEdits = normalizeTabEdits(customObject, props.tabEdits ?? {});
+        this._fieldSectionLayoutSections = buildFieldSectionLayoutIndexFromProps(props.tabEdits);
         this._headerEdits = normalizeHeaderEdits(props.headerEdits ?? {});
         this._visibilityConditions = props.visibilityConditions ?? {};
         this._blueprintKey = props.blueprintKey;
@@ -427,15 +501,17 @@ export class CustomObjectPageLayout {
     /** @internal Hydrates a page layout from existing manifest wire JSON. */
     static _fromExistingComponent(customObject, component, resolveFieldSectionId) {
         const layout = Object.create(CustomObjectPageLayout.prototype);
+        const tabEdits = annotateLoadedTabEdits(cloneJson(component['tab_edits'] ?? {}));
         Object.assign(layout, {
             _layoutId: requireStringComponentField(component, 'layout_id', CustomObjectPageLayout.componentType),
             _apiName: requireStringComponentField(component, 'api_name', CustomObjectPageLayout.componentType),
             _customObjectApiName: requireStringComponentField(component, 'object_rql_name', CustomObjectPageLayout.componentType),
             _name: requireStringComponentField(component, 'name', CustomObjectPageLayout.componentType),
-            _tabEdits: annotateLoadedTabEdits(cloneJson(component['tab_edits'] ?? {}), resolveFieldSectionId),
+            _tabEdits: tabEdits,
             _headerEdits: cloneJson(component['header_edits'] ?? {}),
             _visibilityConditions: cloneJson(component['visibility_conditions'] ?? {}),
             _blueprintKey: component['blueprint_key'],
+            _fieldSectionLayoutSections: buildFieldSectionLayoutIndexFromLoadedTabEdits(tabEdits, resolveFieldSectionId),
         });
         customObject._register(layout);
         return layout;
@@ -471,8 +547,8 @@ export class CustomObjectPageLayout {
      * Adds multiple fields to an existing layout section.
      *
      * Fields are inserted in the order provided. For custom layout sections,
-     * pass `options.section` so TypeScript and runtime validation agree on the
-     * target `CUSTOM_OBJECT_FIELD_SECTION`.
+     * pass `section` to choose the typed field section. Use `sectionKey` only
+     * when a field section maps to multiple layout sections.
      */
     addFields(fields, options) {
         if (fields.length === 0)
@@ -486,14 +562,19 @@ export class CustomObjectPageLayout {
                 return this.ensureSystemSectionFieldContainer(options.tabKey, options.sectionKey);
             })()
             : (() => {
-                assertOptionAbsent(options, 'sectionKey', 'CustomObjectPageLayout addField sectionKey is only supported with systemSection: true. ' +
-                    'Pass section: CustomObjectFieldSection for custom layout sections.');
                 assertOptionAbsent(options, 'fieldSection', 'CustomObjectPageLayout addField fieldSection is no longer supported. ' +
                     'Pass section: CustomObjectFieldSection instead.');
-                const section = requireFieldSectionOption(options.section, 'CustomObjectPageLayout addField section');
-                this.assertFieldSectionBelongsToLayout(section);
-                fieldSectionForMutation = section;
-                return this.requireOneFieldContainer(options.tabKey, section.getSectionId(), section);
+                const section = options.section == null ?
+                    undefined
+                    : requireFieldSectionOption(options.section, 'CustomObjectPageLayout addField section');
+                if (section != null) {
+                    this.assertFieldSectionBelongsToLayout(section);
+                    fieldSectionForMutation = section;
+                }
+                const sectionKey = options.sectionKey ??
+                    (section == null ? undefined : this.layoutSectionKeyForFieldSection(options.tabKey, section)) ??
+                    section?.getSectionId();
+                return this.requireOneFieldContainer(options.tabKey, sectionKey, section);
             })();
         const entries = fields.map((field) => this.serializeFieldForMutation(field, container.sectionKey ?? container.label, options, fieldSectionForMutation));
         if (options.allowDuplicate !== true) {
@@ -527,12 +608,12 @@ export class CustomObjectPageLayout {
             sectionKey = options.sectionKey;
         }
         else {
-            assertOptionAbsent(options, 'sectionKey', 'CustomObjectPageLayout removeField sectionKey is only supported with systemSection: true. ' +
-                'Pass section: CustomObjectFieldSection for custom layout sections.');
+            sectionKey = options.sectionKey;
             if (options.section != null) {
                 const section = requireFieldSectionOption(options.section, 'CustomObjectPageLayout removeField section');
                 this.assertFieldSectionBelongsToLayout(section);
-                sectionKey = section.getSectionId();
+                sectionKey ?? (sectionKey = this.layoutSectionKeyForFieldSection(options.tabKey, section));
+                sectionKey ?? (sectionKey = section.getSectionId());
             }
         }
         const containers = this.findFieldContainers({
@@ -590,6 +671,9 @@ export class CustomObjectPageLayout {
             const sectionsOrder = this.ensureSystemSectionsOrder(tabEdit);
             insertAt(sections, normalized, options.position);
             insertUniqueAt(sectionsOrder, layoutSectionKey(normalized), options.position);
+            if (section.type === 'fields_section') {
+                this.rememberFieldSectionLayoutSection(section.section, options.tabKey, layoutSectionKey(normalized));
+            }
             return this;
         }
         const tab = this.findNewTabWithSections(options.tabKey);
@@ -599,6 +683,9 @@ export class CustomObjectPageLayout {
         }
         this.assertSectionKeyAvailable(tab.sections, layoutSectionKey(normalized), options.tabKey, options.allowDuplicate);
         insertAt(tab.sections, normalized, options.position);
+        if (section.type === 'fields_section') {
+            this.rememberFieldSectionLayoutSection(section.section, tab.key, layoutSectionKey(normalized));
+        }
         return this;
     }
     removeSection(sectionOrKey, options = {}) {
@@ -615,9 +702,15 @@ export class CustomObjectPageLayout {
             this.removeSectionVisibility(sectionOrKey);
             return this;
         }
-        const section = requireFieldSectionOption(sectionOrKey, 'CustomObjectPageLayout removeSection section');
-        this.assertFieldSectionBelongsToLayout(section);
-        const sectionKey = section.getSectionId();
+        let sectionKey;
+        if (typeof sectionOrKey === 'string') {
+            sectionKey = sectionOrKey;
+        }
+        else {
+            const section = requireFieldSectionOption(sectionOrKey, 'CustomObjectPageLayout removeSection section');
+            this.assertFieldSectionBelongsToLayout(section);
+            sectionKey = this.layoutSectionKeyForFieldSection(options.tabKey, section) ?? section.getSectionId();
+        }
         const matches = [];
         for (const tab of this._tabEdits.newTabs ?? []) {
             if (!isTabWithSections(tab))
@@ -625,7 +718,7 @@ export class CustomObjectPageLayout {
             if (options.tabKey != null && tab.key !== options.tabKey)
                 continue;
             tab.sections.forEach((section, index) => {
-                if (layoutSectionMatches(section, sectionKey))
+                if (isSerializedFieldsSection(section) && layoutSectionMatches(section, sectionKey))
                     matches.push({ sections: tab.sections, section, index, tabKey: tab.key });
             });
         }
@@ -633,7 +726,7 @@ export class CustomObjectPageLayout {
             if (options.tabKey != null && tabKey !== options.tabKey)
                 continue;
             (tabEdit.newSections ?? []).forEach((section, index) => {
-                if (layoutSectionMatches(section, sectionKey))
+                if (isSerializedFieldsSection(section) && layoutSectionMatches(section, sectionKey))
                     matches.push({ sections: tabEdit.newSections, section, index, tabEdit, tabKey });
             });
         }
@@ -671,6 +764,10 @@ export class CustomObjectPageLayout {
         const tabsOrder = this.ensureTabsOrder();
         insertAt(newTabs, normalized, options.position);
         insertUniqueAt(tabsOrder, normalized.key, options.position);
+        if (tab.type === 'tab_with_sections') {
+            for (const section of tab.sections)
+                indexPageLayoutSectionInput(this._fieldSectionLayoutSections, tab.key, section);
+        }
         return this;
     }
     /**
@@ -729,13 +826,11 @@ export class CustomObjectPageLayout {
             this.removeHeaderOrderFieldIfUnused(removedField);
         return this;
     }
-    /** Sets the record title field in `header_edits`. */
     setTitleField(field) {
         const previousTitleField = this._headerEdits.newTitleField;
         const nextTitleField = this.headerFieldApiName(field);
         this._headerEdits.newTitleField = nextTitleField;
-        if (field != null)
-            this._headerEdits.titleFieldDeleted = false;
+        this._headerEdits.titleFieldDeleted = false;
         insertUniqueAt(this.ensureHeaderFieldsOrder(), nextTitleField, 'end');
         this.removeHeaderOrderFieldIfUnused(previousTitleField);
         return this;
@@ -748,13 +843,11 @@ export class CustomObjectPageLayout {
         this.removeHeaderOrderFieldIfUnused(previousTitleField);
         return this;
     }
-    /** Sets the record description field in `header_edits`. */
     setDescriptionField(field) {
         const previousDescriptionField = this._headerEdits.newDescriptionField;
         const nextDescriptionField = this.headerFieldApiName(field);
         this._headerEdits.newDescriptionField = nextDescriptionField;
-        if (field != null)
-            this._headerEdits.descriptionFieldDeleted = false;
+        this._headerEdits.descriptionFieldDeleted = false;
         insertUniqueAt(this.ensureHeaderFieldsOrder(), nextDescriptionField, 'end');
         this.removeHeaderOrderFieldIfUnused(previousDescriptionField);
         return this;
@@ -830,20 +923,19 @@ export class CustomObjectPageLayout {
             'pass a Field instance or { field }.');
     }
     normalizeSectionForMutation(input) {
+        if (input.type !== 'fields_section')
+            return { ...input };
         this.assertFieldSectionBelongsToLayout(input.section);
-        const sectionId = input.section.getSectionId();
-        if (inputFieldsSectionHasKey(input)) {
-            throw new Error('CustomObjectPageLayout fields_section key is not supported. Omit key.');
-        }
+        const sectionKey = input.key ?? input.section.getSectionId();
         const name = input.name ?? input.section.getName();
-        const normalized = {
+        const normalized = copySectionOptions({
             name,
             type: 'fields_section',
-            fields: input.fields.map((field) => this.normalizeSectionFieldForMutation(input.section, sectionId, field)),
-        };
+            fields: input.fields.map((field) => this.normalizeSectionFieldForMutation(input.section, sectionKey, field)),
+        }, input);
         if (input.layout != null)
             normalized.layout = input.layout;
-        return attachFieldSectionId(normalized, sectionId);
+        return attachLayoutSectionKey(normalized, sectionKey);
     }
     normalizeTabForMutation(tab) {
         if (tab.type === 'custom_tab')
@@ -885,6 +977,26 @@ export class CustomObjectPageLayout {
                 `"${section.getModelApiName()}", but the layout belongs to "${this._customObjectApiName}".`);
         }
     }
+    rememberFieldSectionLayoutSection(section, tabKey, sectionKey) {
+        if (sectionKey == null)
+            return;
+        addFieldSectionLayoutSection(this._fieldSectionLayoutSections, section.getSectionId(), {
+            tabKey,
+            sectionKey,
+        });
+    }
+    layoutSectionKeyForFieldSection(tabKey, section) {
+        const entries = this._fieldSectionLayoutSections.get(section.getSectionId()) ?? [];
+        const matches = tabKey == null ? entries : entries.filter((entry) => entry.tabKey === tabKey);
+        const sectionKeys = [...new Set(matches.map((entry) => entry.sectionKey))];
+        if (sectionKeys.length === 0)
+            return undefined;
+        if (sectionKeys.length === 1)
+            return sectionKeys[0];
+        const scope = tabKey == null ? '' : ` in tab "${tabKey}"`;
+        throw new Error(`CustomObjectPageLayout field section "${section.getSectionId()}" maps to multiple layout sections${scope}: ` +
+            `${sectionKeys.join(', ')}. Pass sectionKey to choose one.`);
+    }
     requireOneFieldContainer(tabKey, sectionKey, fallbackFieldSection) {
         const containers = this.findFieldContainers({
             tabKey,
@@ -904,8 +1016,8 @@ export class CustomObjectPageLayout {
                             `"${fallbackFieldSection.getModelApiName()}", but the layout belongs to "${this._customObjectApiName}".`);
                     }
                     const container = unkeyedContainers[0];
-                    attachFieldSectionId(container.section, fallbackFieldSection.getSectionId());
-                    container.sectionKey = fallbackFieldSection.getSectionId();
+                    attachLayoutSectionKey(container.section, sectionKey);
+                    container.sectionKey = sectionKey;
                     container.label = `${container.tabKey}.${container.sectionKey}`;
                     return container;
                 }
@@ -932,6 +1044,8 @@ export class CustomObjectPageLayout {
                 if (filter.tabKey != null && tab.key !== filter.tabKey)
                     continue;
                 for (const [index, section] of tab.sections.entries()) {
+                    if (!isSerializedFieldsSection(section))
+                        continue;
                     const sectionKey = layoutSectionKey(section);
                     if (filter.sectionKey != null && !layoutSectionMatches(section, filter.sectionKey))
                         continue;
@@ -949,6 +1063,8 @@ export class CustomObjectPageLayout {
                 if (filter.tabKey != null && tabKey !== filter.tabKey)
                     continue;
                 for (const [index, section] of (tabEdit.newSections ?? []).entries()) {
+                    if (!isSerializedFieldsSection(section))
+                        continue;
                     const sectionKey = layoutSectionKey(section);
                     if (filter.sectionKey != null && !layoutSectionMatches(section, filter.sectionKey))
                         continue;
@@ -1057,8 +1173,6 @@ export class CustomObjectPageLayout {
         return normalized;
     }
     headerFieldApiName(field) {
-        if (field == null)
-            return null;
         if (typeof field === 'string')
             return field;
         this.assertFieldBelongsToLayout(field);