@sap/ux-specification 1.90.15 → 1.96.2

package/dist/src/sync/v2/import/pages/objectPage.js

@@ -16,6 +16,66 @@ const common_2 = require("../../../../specification/common");
 const listReport_1 = require("../pages/listReport");
 const factory_1 = require("../../export/factory");
 const types_1 = require("../../types");
+const common_3 = require("../common");
+/**
+ * Determines Facet ID from single string selector Id
+ * @param {string} selectorId Selector ID
+ * @returns {string} FacetID
+ */
+function getSingleSelectorIdPart(selectorIdParts, facetID) {
+    const lastIdParts = selectorIdParts[0].split('-');
+    const id = lastIdParts[lastIdParts.length - 1];
+    if (selectorIdParts[0].indexOf("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) >= 0 && selectorIdParts[0].indexOf('action') >= 0) {
+        // Object Page ToolBar Actions
+        facetID = lastIdParts[0].split(`${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}::`)[1].split('::')[0];
+    }
+    else if (selectorIdParts[0].indexOf("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) >= 0 ||
+        selectorIdParts[0].indexOf('UI.LineItem') >= 0 ||
+        selectorIdParts[0].indexOf('::Table') >= 0) {
+        facetID = lastIdParts[0]
+            .split('::Table')[0]
+            .split('::responsiveTable')[0]
+            .replace(/::/g, '/@');
+    }
+    else {
+        const idParts = id.split('::');
+        if (idParts.length > 1) {
+            facetID = idParts[0];
+        }
+        else if (lastIdParts[0].indexOf('::') > -1) {
+            facetID = lastIdParts[0].split('::')[0];
+        }
+    }
+    return facetID;
+}
+/**
+ * Determines Facet ID of flex change
+ * @param {string} selectorId Control ID of flex change
+ * @returns {string} FacetID
+ */
+function getFacetID(selectorId) {
+    let facetID;
+    const selectorIdParts = selectorId.split(':::');
+    if (selectorIdParts.length === 1) {
+        facetID = getSingleSelectorIdPart(selectorIdParts, facetID);
+    }
+    else if (selectorId.indexOf('sSmartTableId') >= 0) {
+        for (const element of selectorIdParts) {
+            if (element.startsWith('sSmartTableId')) {
+                facetID = element
+                    .split('sSmartTableId::')[1]
+                    .split('::Table')[0]
+                    .split('/responsiveTable')[0]
+                    .replace(`::${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`, `/@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`);
+                break;
+            }
+        }
+    }
+    else {
+        facetID = selectorIdParts[0];
+    }
+    return facetID;
+}
 /**
  * Prepares the list of flex changes
  * @param change - the flex change (UI Adaptation)
@@ -35,48 +95,8 @@ function prepareFlexChanges(changes, entitySet, logger) {
                 if (complexIdMatch.exec(selectorId) !== null) {
                     selectorId = selectorId.split('template:::TableColumn:::')[1];
                 }
-                const selectorIdParts = selectorId.split(':::');
-                let id, facetID;
-                if (selectorIdParts.length === 1) {
-                    const lastIdParts = selectorIdParts[0].split('-');
-                    id = lastIdParts[lastIdParts.length - 1];
-                    if (selectorIdParts[0].indexOf("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) >= 0 ||
-                        selectorIdParts[0].indexOf('UI.LineItem') >= 0 ||
-                        selectorIdParts[0].indexOf('::Table') >= 0) {
-                        facetID = lastIdParts[0]
-                            .split('::Table')[0]
-                            .split('::responsiveTable')[0]
-                            .replace(/::/g, '/@');
-                    }
-                    else {
-                        const idParts = id.split('::');
-                        if (idParts.length > 1) {
-                            facetID = idParts[0];
-                        }
-                        else if (lastIdParts[0].indexOf('::') > -1) {
-                            facetID = lastIdParts[0].split('::')[0];
-                        }
-                    }
-                }
-                else if (selectorId.indexOf('sSmartTableId') >= 0) {
-                    for (const element of selectorIdParts) {
-                        if (element.startsWith('sSmartTableId')) {
-                            facetID = element
-                                .split('sSmartTableId::')[1]
-                                .split('::Table')[0]
-                                .split('/responsiveTable')[0]
-                                .replace(`::${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`, `/@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`);
-                            break;
-                        }
-                    }
-                }
-                else {
-                    facetID = selectorIdParts[0];
-                }
-                selectorId = selectorId
-                    .replace(/:2f/g, '/')
-                    .replace(/:40/g, '@')
-                    .replace(/:23/g, '#')
+                const facetID = getFacetID(selectorId);
+                selectorId = common_3.convertSelector(selectorId)
                     .replace(/:3a:3a/g, '::')
                     .replace(/\/@com.sap.vocabularies/g, '::com.sap.vocabularies');
                 if (result[selectorId] && result[selectorId].propertyId !== change.content.property) {
@@ -105,17 +125,18 @@ const addFlexToConfig = (config, propertyKey, flexChange) => {
     config[propertyKey] = flexChange;
 };
 const getSectionType = (schemaSection) => {
+    var _a, _b, _c;
     let reference;
     if (schemaSection['$ref']) {
         reference = schemaSection['$ref'].includes('<') ? schemaSection['$ref'].split('<')[0] : schemaSection['$ref'];
         return reference.replace(common_1.DEFINITION_LINK_PREFIX, '');
     }
-    else if (schemaSection['properties']['subsections']['$ref']) {
+    else if ((_b = (_a = schemaSection['properties']) === null || _a === void 0 ? void 0 : _a['subsections']) === null || _b === void 0 ? void 0 : _b['$ref']) {
         reference = schemaSection['properties']['subsections']['$ref'];
         reference = reference.includes('<') ? reference.split('<')[0] : reference;
         return reference.replace(common_1.DEFINITION_LINK_PREFIX, '');
     }
-    else if (schemaSection['properties']['subsections']) {
+    else if ((_c = schemaSection['properties']) === null || _c === void 0 ? void 0 : _c['subsections']) {
         return types_1.SectionTypeV2.SubSection;
     }
 };
@@ -127,7 +148,6 @@ const getSectionType = (schemaSection) => {
  * @param pageKeys - list of page keys (comprises the one entry describing the given page)
  * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
  * @param sectionId - ID of the given section (optional)
- * @param sectionTitle - title of the section (optional)
  * @param actionId - ID of the given action (optional)
  */
 function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefinition, pageKeys, flexChanges, sectionId, sectionTitle, actionId) {
@@ -163,29 +183,13 @@ function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefi
                         const propertyIdMatch = flexChange.propertyId === propertyKey;
                         const schemaControlType = (_a = schemaDefinition['properties'][flexChange.propertyId]) === null || _a === void 0 ? void 0 : _a.controlType;
                         const controlTypeMatch = flexChange.controlType === schemaControlType;
-                        if (!flexChange.facetId && actionIdMatch && propertyIdMatch) {
-                            addFlexToConfig(configPart, propertyKey, flexChange.newValue);
-                            break;
-                        }
-                        else if (flexChange.facetId === 'action' &&
-                            !sectionTitle &&
-                            actionIdMatch &&
-                            propertyIdMatch) {
-                            // Actions
-                            addFlexToConfig(configPart, propertyKey, flexChange.newValue);
-                            break;
-                        }
-                        else if (!sectionTitle && actionIdMatch && propertyIdMatch && controlTypeMatch) {
-                            addFlexToConfig(configPart, propertyKey, flexChange.newValue);
-                            break;
-                        }
-                        else if (selector.includes(sectionTitle) &&
-                            actionIdMatch &&
-                            propertyIdMatch &&
-                            controlTypeMatch) {
+                        if (
+                        // Actions
+                        (flexChange.facetId === 'action' && !sectionTitle && actionIdMatch && propertyIdMatch) ||
+                            (!sectionTitle && actionIdMatch && propertyIdMatch && controlTypeMatch) ||
                             // Sections
+                            (selector.includes(sectionTitle) && actionIdMatch && propertyIdMatch && controlTypeMatch)) {
                             addFlexToConfig(configPart, propertyKey, flexChange.newValue);
-                            break;
                         }
                     }
                 }
@@ -194,8 +198,21 @@ function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefi
                 const sectionIdInManifest = sectionId
                     ? sectionId.replace(/\/@/g, '::').replace(/@com.sap/g, 'com.sap')
                     : undefined;
-                const path = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
-                manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
+                let path;
+                if (sectionTitle) {
+                    path = syncRule.manifest.path(pageKeys, {}, sectionTitle);
+                    if (Object.values(manifest_1.getManifestSectionByPathV2(importParameters.manifest, path)).length !== 0) {
+                        manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
+                    }
+                    else {
+                        path = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
+                        manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
+                    }
+                }
+                else {
+                    path = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
+                    manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
+                }
                 const importHandler = syncRule.manifest.import;
                 if (importHandler && typeof importHandler === 'function') {
                     const value = importHandler(manifestSection, sectionId);
@@ -230,26 +247,59 @@ function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefi
         }
     }
 }
+/**
+ *  Fills the action of the configuration
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
+ * @param {object} actionProperties - current properties' list (of action)
+ * @param {object} configPart - the given part of the object page config
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
+ * @param {ActionTypeV2|string} importTypeId - type of action that should be initiated
+ */
+function fillActions(importParameters, actionProperties, configPart, configParameters, importTypeId) {
+    let actionId, configActionId;
+    configPart['actions'] = {};
+    importTypeId = importTypeId.replace(/@/g, '::');
+    const actionType = importTypeId.split('::').pop();
+    if (configParameters.flexChanges.constructor === Object && Object.keys(configParameters.flexChanges).length !== 0) {
+        for (const actionProperty in actionProperties) {
+            configActionId = actionProperty.replace(/@/g, '::');
+            if (actionType === types_1.ActionTypeV2.Form) {
+                actionId = `${configActionId}${importTypeId}`;
+            }
+            else if (actionType === types_1.ActionTypeV2.Footer) {
+                actionId = `${configActionId}::Determining`;
+            }
+            else {
+                actionId = configActionId;
+            }
+            configPart['actions'][configActionId] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, actionType);
+            transferSettingsAndFlexChanges(importParameters, configPart['actions'][configActionId], importParameters.jsonSchema['definitions'][actionType], configParameters.pageKeys, configParameters.flexChanges, undefined, undefined, actionId);
+            if (Object.keys(configPart['actions'][configActionId]).length === 0) {
+                delete configPart['actions'][configActionId];
+            }
+        }
+    }
+    if (Object.keys(configPart['actions']).length === 0) {
+        delete configPart['actions'];
+    }
+}
 /**
  *  Fills the fields of an object page form
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
  * @param escapedId - current Id for config part
  * @param fieldProperties - current properties' list (of fields)
  * @param configPart - the given part of the object page config
- * @param manifest - manifest.json of the app
- * @param jsonSchema - app specific schema
- * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
- * @param pageKeys - list of page keys (comprises the one entry describing the given page)
- * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
  */
-function fillFields(importParameters, escapedId, fieldProperties, configPart, factory, pageKeys, flexChanges) {
+function fillFields(importParameters, escapedId, fieldProperties, configPart, configParameters) {
     let fieldId;
     configPart[escapedId]['form']['fields'] = {};
     for (const fieldProperty in fieldProperties) {
         fieldId = fieldProperty.includes('::')
             ? fieldProperty.split('::')[1] + '::GroupElement'
             : fieldProperty + '::GroupElement';
-        configPart[escapedId]['form']['fields'][fieldProperty] = factory.createInstance(common_2.PageType.ObjectPage, 'Field');
-        transferSettingsAndFlexChanges(importParameters, configPart[escapedId]['form']['fields'][fieldProperty], importParameters.jsonSchema['definitions']['Field'], pageKeys, flexChanges, undefined, undefined, fieldId);
+        configPart[escapedId]['form']['fields'][fieldProperty] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'Field');
+        transferSettingsAndFlexChanges(importParameters, configPart[escapedId]['form']['fields'][fieldProperty], importParameters.jsonSchema['definitions']['Field'], configParameters.pageKeys, configParameters.flexChanges, undefined, undefined, fieldId);
         if (Object.keys(configPart[escapedId]['form']['fields'][fieldProperty]).length === 0) {
             delete configPart[escapedId]['form']['fields'][fieldProperty];
         }
@@ -259,61 +309,57 @@ function fillFields(importParameters, escapedId, fieldProperties, configPart, fa
     }
 }
 /**
- * Fill table settings in config.json
- * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
- * @param manifestSettings - object page settings section of the manifest
- * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
- * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
- * @param configPart - the given part of the object page config
- * @param manifest - manifest.json of the app
- * @param pageKeys - list of page keys (comprises the one entry describing the given page)
- * @param logger - Logger class for logging messages
- * @param sectionId - ID of the current section
- * @param sectionType - Section type (Sub/Section Table)
+ *  Fills the table section of the object page config
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
+ * @param {SectionPartProperties} sectionPart - current properties' list
+ * @param {Settings} manifestSettings - object page settings section of the manifest
+ * @param {object} configPart - the given part of the object page config
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
  */
-function fillTableInConfig(importParameters, manifestSettings, flexChanges, factory, configPart, pageKeys, sectionId, sectionType) {
-    const escapedSectionId = sectionId.replace(/\/@/g, '::');
-    const schemaSection = importParameters.jsonSchema['definitions'][`${sectionType}<${sectionId}>`];
-    const sectionTitle = schemaSection.title ? schemaSection.title.split(v2_1.FacetTitlePrefix)[1] : undefined;
-    const manifestKey = escapedSectionId.replace('@com.sap', 'com.sap');
+function fillTableInConfig(importParameters, sectionPart, manifestSettings, configPart, configParameters) {
+    var _a, _b;
+    const sectionTitle = ((_a = sectionPart.schema['title']) === null || _a === void 0 ? void 0 : _a.startsWith(v2_1.FacetTitlePrefix)) ? sectionPart.schema['title'].split(v2_1.FacetTitlePrefix)[1]
+        : undefined;
+    const manifestKey = sectionTitle || sectionPart.id.replace('@com.sap', 'com.sap');
     const manifestSection = manifestSettings && manifestSettings.sections && manifestSettings.sections[manifestKey];
-    if (manifestSection || flexChanges) {
-        const tableType = manifestSection
-            ? manifestSection.tableSettings
-                ? manifestSection.tableSettings.type
-                    ? manifestSection.tableSettings.type
-                    : 'ResponsiveTable'
-                : 'ResponsiveTable'
-            : 'ResponsiveTable';
+    if (manifestSection || configParameters.flexChanges) {
+        const tableType = ((_b = manifestSection === null || manifestSection === void 0 ? void 0 : manifestSection.tableSettings) === null || _b === void 0 ? void 0 : _b.type) || 'ResponsiveTable';
         //Instantiate metadata
-        const OPtable = factory.createInstance(common_2.PageType.ObjectPage, `ObjectPage${tableType}`);
-        configPart[escapedSectionId] = factory.createInstance(common_2.PageType.ObjectPage, sectionType, { table: {} });
-        configPart[escapedSectionId]['table'] = OPtable;
+        const OPtable = configParameters.factory.createInstance(common_2.PageType.ObjectPage, `ObjectPage${tableType}`, {
+            toolBar: {}
+        });
+        configPart[sectionPart.id] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, sectionPart.type, {
+            table: {}
+        });
+        configPart[sectionPart.id]['table'] = OPtable;
         let localJsonSchema;
         const schemaDefinitions = importParameters.jsonSchema['definitions'];
         if (tableType === 'TreeTable' || tableType === 'AnalyticalTable' || tableType === 'GridTable') {
-            localJsonSchema = schemaDefinitions['ObjectPage' + tableType + '<' + escapedSectionId + '>'];
+            localJsonSchema = schemaDefinitions[`ObjectPage${tableType}<${sectionPart.id}>`];
         }
-        else {
-            if (schemaDefinitions[`ObjectPageResponsiveTableWithMultiSelect<${escapedSectionId}>`] &&
-                schemaDefinitions[`ObjectPageResponsiveTableWithInlineDelete<${escapedSectionId}>`]) {
-                localJsonSchema = JSON.parse(JSON.stringify(schemaDefinitions[`ObjectPageResponsiveTableWithMultiSelect<${escapedSectionId}>`]));
-                localJsonSchema['properties'] = Object.assign(Object.assign({}, localJsonSchema['properties']), schemaDefinitions[`ObjectPageResponsiveTableWithInlineDelete<${escapedSectionId}>`]['properties']);
-            }
+        else if (schemaDefinitions[`ObjectPageResponsiveTableWithMultiSelect<${sectionPart.id}>`] &&
+            schemaDefinitions[`ObjectPageResponsiveTableWithInlineDelete<${sectionPart.id}>`]) {
+            localJsonSchema = JSON.parse(JSON.stringify(schemaDefinitions[`ObjectPageResponsiveTableWithMultiSelect<${sectionPart.id}>`]));
+            localJsonSchema['properties'] = Object.assign(Object.assign({}, localJsonSchema['properties']), schemaDefinitions[`ObjectPageResponsiveTableWithInlineDelete<${sectionPart.id}>`]['properties']);
+        }
+        transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id], sectionPart.schema, configParameters.pageKeys, configParameters.flexChanges, undefined, sectionTitle);
+        transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id]['table'], localJsonSchema, configParameters.pageKeys, configParameters.flexChanges, sectionPart.id, sectionTitle);
+        const toolBarActions = JSON.parse(JSON.stringify(schemaDefinitions))[`Actions<${sectionPart.id}>`];
+        if (toolBarActions === null || toolBarActions === void 0 ? void 0 : toolBarActions['properties']) {
+            fillActions(importParameters, toolBarActions.properties, configPart[sectionPart.id]['table']['toolBar'], configParameters, types_1.ActionTypeV2.ToolBar);
+        }
+        if (Object.keys(configPart[sectionPart.id]['table']['toolBar']).length === 0) {
+            delete configPart[sectionPart.id]['table']['toolBar'];
         }
-        transferSettingsAndFlexChanges(importParameters, configPart[escapedSectionId], schemaSection, pageKeys, flexChanges, undefined, sectionTitle);
-        transferSettingsAndFlexChanges(importParameters, configPart[escapedSectionId]['table'], localJsonSchema, pageKeys, flexChanges, sectionId, sectionTitle);
     }
 }
 /**
  * Fills custom columns in a V2 object page config JSON
- * @param appSchema - app specific schema
- * @param escapedSectionId - escaped version of the section ID
- * @param sectionTitle - section title
- * @param configPart - the given part of the object page config
- * @param manifest - manifest.json of the app
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
+ * @param {string} escapedSectionId - escaped version of the section ID
+ * @param {string} sectionTitle - title of current section, if available
+ * @param {object} configPart - the given part of the object page config
  * @param {SapUiAppPageV2} v2Page - v2 page from manifest.
- * @param {FileData[]} fragments - Array with XML fragments.
  */
 function fillCustomColumnsInConfig(importParameters, escapedSectionId, sectionTitle, configPart, v2Page) {
     const customColumnSchemaProp = importParameters.jsonSchema['definitions'][escapedSectionId].properties.custom;
@@ -329,123 +375,137 @@ function fillCustomColumnsInConfig(importParameters, escapedSectionId, sectionTi
     }
 }
 /**
- *  Fills the action of the configuration
+ *  Fills the sections and subsections of the object page config (recursive function)
  * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
- * @param actionProperties - current properties' list (of action)
- * @param configPart - the given part of the object page config
- * @param actionInstance - type of action that should be initiated
- * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
- * @param pageKeys - list of page keys (comprises the one entry describing the given page)
- * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
+ * @param {sectionPartProperties} sectionPart - current properties' list of chart section
+ * @param {Settings} manifestSettings - object page settings section of the manifest
+ * @param {object} configPart - the given part of the object page config
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
  */
-function fillActions(importParameters, actionProperties, configPart, factory, pageKeys, flexChanges, sectionId) {
-    let actionId, configActionId;
-    configPart['actions'] = {};
-    const actionType = sectionId ? 'FormAction' : 'HeaderAction';
-    if (flexChanges.constructor === Object && Object.keys(flexChanges).length !== 0) {
-        for (const actionProperty in actionProperties) {
-            configActionId = actionProperty.replace(/@/g, '::');
-            actionId = (sectionId ? `${actionProperty}${sectionId}` : actionProperty).replace(/@/g, '::');
-            configPart['actions'][configActionId] = factory.createInstance(common_2.PageType.ObjectPage, actionType);
-            transferSettingsAndFlexChanges(importParameters, configPart['actions'][configActionId], importParameters.jsonSchema['definitions'][actionType], pageKeys, flexChanges, undefined, undefined, actionId);
-            if (sectionId && Object.keys(configPart['actions'][configActionId]).length === 0) {
-                delete configPart['actions'][configActionId];
-            }
-        }
+function fillChartSection(importParameters, sectionPart, manifestSettings, configPart, configParameters) {
+    const sectionTitle = common_1.getSectionTitle(sectionPart.schema, importParameters.jsonSchema);
+    const manifestKey = sectionPart.id.replace('@com.sap', 'com.sap');
+    const manifestSection = manifestSettings && manifestSettings.sections && manifestSettings.sections[manifestKey];
+    configPart[sectionPart.id] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, sectionPart.type, {
+        chart: {}
+    });
+    configPart[sectionPart.id]['chart'] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageChart');
+    if (manifestSection || configParameters.flexChanges) {
+        transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id], sectionPart.schema, configParameters.pageKeys, configParameters.flexChanges, undefined, sectionTitle);
+        transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id]['chart'], importParameters.jsonSchema['definitions']['ObjectPageChart'], configParameters.pageKeys, configParameters.flexChanges, sectionPart.id, sectionTitle);
     }
-    if (sectionId && Object.keys(configPart['actions']).length === 0) {
-        delete configPart['actions'];
+}
+/**
+ * Fills the form section of the object page config
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
+ * @param {sectionPartProperties} sectionPart - current properties' list of form section
+ * @param {object} configPart - the given part of the object page config
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
+ */
+function fillFormSection(importParameters, sectionPart, configPart, configParameters) {
+    const sectionTitle = common_1.getSectionTitle(sectionPart.schema, importParameters.jsonSchema);
+    const formId = sectionPart.schema['properties']['form']['$ref'].split('SectionForm')[1];
+    configPart[sectionPart.id] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, sectionPart.type, {
+        form: {}
+    });
+    if (configParameters.flexChanges) {
+        transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id], sectionPart.schema, configParameters.pageKeys, configParameters.flexChanges, undefined, sectionTitle);
+    }
+    const formActions = importParameters.jsonSchema['definitions'][`SectionActions${formId}`];
+    if (formActions && formActions['properties']) {
+        fillActions(importParameters, formActions.properties, configPart[sectionPart.id]['form'], configParameters, `${sectionPart.id}::${types_1.ActionTypeV2.Form}`);
+    }
+    const formFields = importParameters.jsonSchema['definitions'][`SectionFields${formId}`];
+    if (formFields['properties']) {
+        fillFields(importParameters, sectionPart.id, formFields.properties, configPart, configParameters);
+    }
+    if (Object.keys(configPart[sectionPart.id]['form']).length === 0) {
+        delete configPart[sectionPart.id]['form'];
+    }
+    if (Object.keys(configPart[sectionPart.id]).length === 0) {
+        delete configPart[sectionPart.id];
     }
 }
 /**
- *  Fills the sections and subsections of the object page config (recursive function)
- * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
- * @param sectionProperties - current properties' list (of sections or subsections)
- * @param manifestSettings - object page settings section of the manifest
- * @param configPart - the given part of the object page config
- * @param pageKeys - list of page keys (comprises the one entry describing the given page)
- * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
- * @param {SapUiAppPageV2} v2Page - v2 page from manifest.
- * @param {ObjectPageConfig} objectPageConfig - page config object.
+ *  Fills the subsection of the object page config
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
+ * @param {sectionPartProperties} sectionPart - current properties' list of subsection
+ * @param {Settings} manifestSettings - object page settings section of the manifest
+ * @param {object} configPart - the given part of the object page config
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
  */
-function fillSectionsInConfig(importParameters, sectionProperties, manifestSettings, configPart, factory, pageKeys, flexChanges, v2Page, objectPageConfig) {
+function fillSubSection(importParameters, sectionPart, manifestSettings, configPart, configParameters) {
     var _a, _b;
-    let sectionTitle;
+    const sectionTitle = common_1.getSectionTitle(sectionPart.schema, importParameters.jsonSchema);
+    configPart[sectionPart.id] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, sectionPart.type, {
+        subsections: {}
+    });
+    if (configParameters.flexChanges) {
+        transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id], sectionPart.schema, configParameters.pageKeys, configParameters.flexChanges, undefined, sectionTitle);
+    }
+    let currentSchemaSection;
+    if ((_b = (_a = sectionPart.schema['properties']) === null || _a === void 0 ? void 0 : _a['subsections']) === null || _b === void 0 ? void 0 : _b['properties']) {
+        currentSchemaSection = sectionPart.schema['properties']['subsections']['properties'];
+    }
+    else {
+        currentSchemaSection = sectionPart.schema['properties'];
+    }
+    fillSectionsInConfig(importParameters, currentSchemaSection, manifestSettings, configPart[sectionPart.id]['subsections'], configParameters);
+}
+/**
+ * Fills the sections and subsections of the object page config (recursive function)
+ * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
+ * @param {object} sectionProperties - current properties' list (of sections or subsections)
+ * @param {Settings} manifestSettings - object page settings section of the manifest
+ * @param {object} configPart - the given part of the object page config
+ * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig.
+ */
+function fillSectionsInConfig(importParameters, sectionProperties, manifestSettings, configPart, configParameters) {
     for (const sectionId in sectionProperties) {
-        const escapedSectionId = sectionId.replace(/\/@/g, '::');
-        let schemaSection = sectionProperties[sectionId];
-        if (schemaSection['$ref'] &&
-            (getSectionType(schemaSection) === types_1.SectionTypeV2.SectionTable ||
-                getSectionType(schemaSection) === types_1.SectionTypeV2.SubSectionTable)) {
-            const sectionType = getSectionType(schemaSection);
-            fillTableInConfig(importParameters, manifestSettings, flexChanges, factory, configPart, pageKeys, sectionId, sectionType);
-            // Custom column ref
-            fillCustomColumnsInConfig(importParameters, escapedSectionId, sectionTitle, configPart, v2Page);
-        }
-        else if (schemaSection['$ref'] &&
-            (getSectionType(schemaSection) === types_1.SectionTypeV2.SectionChart ||
-                getSectionType(schemaSection) === types_1.SectionTypeV2.SubSectionChart)) {
-            // Section without subsections
-            const sectionType = getSectionType(schemaSection);
-            schemaSection = importParameters.jsonSchema['definitions'][`${sectionType}<${sectionId}>`];
-            const sectionTitle = common_1.getSectionTitle(schemaSection, importParameters.jsonSchema);
-            const manifestKey = escapedSectionId.replace('@com.sap', 'com.sap');
-            const manifestSection = manifestSettings && manifestSettings.sections && manifestSettings.sections[manifestKey];
-            configPart[escapedSectionId] = factory.createInstance(common_2.PageType.ObjectPage, sectionType, { chart: {} });
-            configPart[escapedSectionId]['chart'] = factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageChart');
-            if (manifestSection || flexChanges) {
-                transferSettingsAndFlexChanges(importParameters, configPart[escapedSectionId], schemaSection, pageKeys, flexChanges, undefined, sectionTitle);
-                transferSettingsAndFlexChanges(importParameters, configPart[escapedSectionId]['chart'], importParameters.jsonSchema['definitions']['ObjectPageChart'], pageKeys, flexChanges, sectionId, sectionTitle);
-            }
-        }
-        else if (schemaSection['$ref'] &&
-            (getSectionType(schemaSection) === types_1.SectionTypeV2.SectionForm ||
-                getSectionType(schemaSection) === types_1.SectionTypeV2.SubSectionForm)) {
-            const sectionType = getSectionType(schemaSection);
-            schemaSection = importParameters.jsonSchema['definitions'][`${sectionType}<${sectionId}>`];
-            const sectionTitle = common_1.getSectionTitle(schemaSection, importParameters.jsonSchema);
-            const formId = schemaSection['properties']['form']['$ref'].split('SectionForm')[1];
-            configPart[escapedSectionId] = factory.createInstance(common_2.PageType.ObjectPage, sectionType, { form: {} });
-            if (flexChanges) {
-                transferSettingsAndFlexChanges(importParameters, configPart[escapedSectionId], schemaSection, pageKeys, flexChanges, undefined, sectionTitle);
-            }
-            const formActions = importParameters.jsonSchema['definitions'][`SectionActions${formId}`];
-            if (formActions['properties']) {
-                fillActions(importParameters, formActions.properties, configPart[escapedSectionId]['form'], factory, pageKeys, flexChanges, `${escapedSectionId}::FormAction`);
-            }
-            const formFields = importParameters.jsonSchema['definitions'][`SectionFields${formId}`];
-            if (formFields['properties']) {
-                fillFields(importParameters, escapedSectionId, formFields.properties, configPart, factory, pageKeys, flexChanges);
-            }
-            if (Object.keys(configPart[escapedSectionId]['form']).length === 0) {
-                delete configPart[escapedSectionId]['form'];
-            }
-            if (Object.keys(configPart[escapedSectionId]).length === 0) {
-                delete configPart[escapedSectionId];
+        const sectionPart = {
+            id: sectionId.replace(/\/@/g, '::'),
+            type: getSectionType(sectionProperties[sectionId]),
+            schema: sectionProperties[sectionId]
+        };
+        if (sectionPart.schema['$ref'] && sectionPart.type) {
+            switch (sectionPart.type) {
+                case types_1.SectionTypeV2.SectionTable:
+                case types_1.SectionTypeV2.SubSectionTable: {
+                    sectionPart.schema =
+                        importParameters.jsonSchema['definitions'][`${sectionPart.type}<${sectionId}>`];
+                    fillTableInConfig(importParameters, sectionPart, manifestSettings, configPart, configParameters);
+                    // Custom column ref
+                    fillCustomColumnsInConfig(importParameters, sectionPart.id, undefined, configPart, configParameters.v2Page);
+                    break;
+                }
+                case types_1.SectionTypeV2.SectionChart:
+                case types_1.SectionTypeV2.SubSectionChart: {
+                    // Section without subsections
+                    sectionPart.schema =
+                        importParameters.jsonSchema['definitions'][`${sectionPart.type}<${sectionId}>`];
+                    fillChartSection(importParameters, sectionPart, manifestSettings, configPart, configParameters);
+                    break;
+                }
+                case types_1.SectionTypeV2.SectionForm:
+                case types_1.SectionTypeV2.SubSectionForm: {
+                    sectionPart.schema =
+                        importParameters.jsonSchema['definitions'][`${sectionPart.type}<${sectionId}>`];
+                    fillFormSection(importParameters, sectionPart, configPart, configParameters);
+                    break;
+                }
+                case types_1.SectionTypeV2.Section:
+                case types_1.SectionTypeV2.SubSection: {
+                    // Section with subsections
+                    sectionPart.schema =
+                        importParameters.jsonSchema['definitions'][`${sectionPart.type}<${sectionId}>`];
+                    fillSubSection(importParameters, sectionPart, manifestSettings, configPart, configParameters);
+                    break;
+                }
             }
         }
-        else if ((schemaSection['properties'] && schemaSection['properties']['subsections']) ||
-            (schemaSection['$ref'] &&
-                (getSectionType(schemaSection) === types_1.SectionTypeV2.Section ||
-                    getSectionType(schemaSection) === types_1.SectionTypeV2.SubSection))) {
-            // Section with subsections
-            const sectionType = getSectionType(schemaSection);
-            schemaSection = importParameters.jsonSchema['definitions'][`${sectionType}<${sectionId}>`];
-            const sectionTitle = common_1.getSectionTitle(schemaSection, importParameters.jsonSchema);
-            configPart[escapedSectionId] = factory.createInstance(common_2.PageType.ObjectPage, sectionType, {
-                subsections: {}
-            });
-            if (flexChanges) {
-                transferSettingsAndFlexChanges(importParameters, configPart[escapedSectionId], schemaSection, pageKeys, flexChanges, undefined, sectionTitle);
-            }
-            let currentSchemaSection;
-            if ((_b = (_a = schemaSection['properties']) === null || _a === void 0 ? void 0 : _a['subsections']) === null || _b === void 0 ? void 0 : _b['properties']) {
-                currentSchemaSection = schemaSection['properties']['subsections']['properties'];
-            }
-            else {
-                currentSchemaSection = schemaSection['properties'];
-            }
-            fillSectionsInConfig(importParameters, currentSchemaSection, manifestSettings, configPart[escapedSectionId]['subsections'], factory, pageKeys, flexChanges, v2Page, objectPageConfig);
+        else if (sectionPart.schema['properties'] && sectionPart.schema['properties']['subsections']) {
+            sectionPart.schema = importParameters.jsonSchema['definitions'][`${sectionPart.type}<${sectionId}>`];
+            fillSubSection(importParameters, sectionPart, manifestSettings, configPart, configParameters);
         }
     }
 }
@@ -458,23 +518,28 @@ function fillSectionsInConfig(importParameters, sectionProperties, manifestSetti
  * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
  * @returns {ObjectPageConfig} - the object page configuration (JSON)
  */
-function fillConfig(importParameters, pageKeys, flexChangesForTransfer, v2Page, factory) {
-    const objectPageConfig = factory.createPageInstance(common_2.PageType.ObjectPage);
-    const manifestSettings = v2Page.component.settings;
+function fillConfig(importParameters, configParameters) {
+    const objectPageConfig = configParameters.factory.createPageInstance(common_2.PageType.ObjectPage);
+    const manifestSettings = configParameters.v2Page.component.settings;
     // Transfer page information
-    transferSettingsAndFlexChanges(importParameters, objectPageConfig, importParameters.jsonSchema['properties'], pageKeys, flexChangesForTransfer);
+    transferSettingsAndFlexChanges(importParameters, objectPageConfig, importParameters.jsonSchema['properties'], configParameters.pageKeys, configParameters.flexChanges);
     // Transfer header information
-    objectPageConfig.header = factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageHeader');
+    objectPageConfig.header = configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageHeader');
     transferSettingsAndFlexChanges(importParameters, objectPageConfig.header, importParameters.jsonSchema['definitions']['ObjectPageHeader']
         ? importParameters.jsonSchema['definitions']['ObjectPageHeader']
-        : importParameters.jsonSchema['definitions']['ObjectPageHeader<GenericActions>'], pageKeys, flexChangesForTransfer);
+        : importParameters.jsonSchema['definitions']['ObjectPageHeader<GenericActions>'], configParameters.pageKeys, configParameters.flexChanges);
     const headerAction = importParameters.jsonSchema['definitions']['HeaderActions'];
     if (headerAction) {
-        fillActions(importParameters, headerAction.properties, objectPageConfig.header, factory, pageKeys, flexChangesForTransfer);
+        fillActions(importParameters, headerAction.properties, objectPageConfig.header, configParameters, types_1.ActionTypeV2.Header);
+    }
+    objectPageConfig.footer = {};
+    const footerAction = importParameters.jsonSchema['definitions']['FooterActions'];
+    if (footerAction) {
+        fillActions(importParameters, footerAction.properties, objectPageConfig.footer, configParameters, types_1.ActionTypeV2.Footer);
     }
     // Transfer Layout information
-    objectPageConfig.layout = factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageLayout');
-    transferSettingsAndFlexChanges(importParameters, objectPageConfig.layout, importParameters.jsonSchema['definitions']['ObjectPageLayout'], pageKeys, flexChangesForTransfer);
+    objectPageConfig.layout = configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageLayout');
+    transferSettingsAndFlexChanges(importParameters, objectPageConfig.layout, importParameters.jsonSchema['definitions']['ObjectPageLayout'], configParameters.pageKeys, configParameters.flexChanges);
     if (Object.keys(objectPageConfig.layout).length === 0) {
         delete objectPageConfig.layout;
     }
@@ -482,7 +547,7 @@ function fillConfig(importParameters, pageKeys, flexChangesForTransfer, v2Page,
     objectPageConfig.sections = {};
     const sections = importParameters.jsonSchema['definitions']['Sections'];
     if (sections) {
-        fillSectionsInConfig(importParameters, sections.properties, manifestSettings, objectPageConfig.sections, factory, pageKeys, flexChangesForTransfer, v2Page, objectPageConfig);
+        fillSectionsInConfig(importParameters, sections.properties, manifestSettings, objectPageConfig.sections, configParameters);
     }
     // Find custom sections
     const customSections = utils_1.findCustomSectionExtensions(importParameters.manifest, importParameters.entitySet);
@@ -490,11 +555,11 @@ function fillConfig(importParameters, pageKeys, flexChangesForTransfer, v2Page,
         objectPageConfig.sections.custom = [];
         for (const sectionId in customSections) {
             const customSection = 'fragmentName' in customSections[sectionId]
-                ? factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageCustomSectionFragment')
-                : factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageCustomSectionView');
+                ? configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageCustomSectionFragment')
+                : configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageCustomSectionView');
             transferSettingsAndFlexChanges(importParameters, customSection, importParameters.jsonSchema['definitions']['fragmentName' in customSections[sectionId]
                 ? 'ObjectPageCustomSectionFragment'
-                : 'ObjectPageCustomSectionView'], pageKeys, flexChangesForTransfer, sectionId);
+                : 'ObjectPageCustomSectionView'], configParameters.pageKeys, configParameters.flexChanges, sectionId);
             objectPageConfig.sections.custom.push(customSection);
         }
     }
@@ -549,7 +614,7 @@ function createObjectPageConfigV2(importParameters) {
     const flexChangesForTransfer = prepareFlexChanges(importParameters.flex, entitySet);
     const factory = new factory_1.MetadataInstanceFactoryV2();
     //Fill config.json with manifest settings and flex changes
-    return fillConfig(importParameters, pageKeys, flexChangesForTransfer, v2Page, factory);
+    return fillConfig(importParameters, { pageKeys, flexChanges: flexChangesForTransfer, v2Page, factory });
 }
 exports.createObjectPageConfigV2 = createObjectPageConfigV2;
 //# sourceMappingURL=objectPage.js.map