@sap/ux-specification 1.71.41 → 1.71.45

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

@@ -4,18 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const v2_1 = require("../../../../v2");
-const common_1 = require("../../../common");
 const table_1 = require("../controls/table");
 const extensionLogger_1 = require("../../../../extensionLogger");
 const utils_1 = require("../utils");
-const common_2 = require("../../../common");
+const common_1 = require("../../../common");
 const manifest_1 = require("../../export/manifest");
 const sapUiPageV2_1 = require("../.../../../../../specification/v2/webapp/manifest/sapUiPageV2");
 const i18next_1 = __importDefault(require("i18next"));
 const i18n_1 = require("../../../../i18n/i18n");
-const common_3 = require("../../../../specification/common");
+const common_2 = require("../../../../specification/common");
 const listReport_1 = require("../pages/listReport");
 const factory_1 = require("../../export/factory");
+const types_1 = require("../../types");
 /**
  * Prepares the list of flex changes
  * @param change - the flex change (UI Adaptation)
@@ -28,21 +28,21 @@ function prepareFlexChanges(changes, entitySet, logger) {
     changes.forEach((changeString) => {
         var _a, _b;
         try {
-            const change = common_2.parseChangeString(changeString);
-            if (((_a = change.controlId) === null || _a === void 0 ? void 0 : _a.includes(sapUiPageV2_1.FE_TEMPLATE_V2_OBJECT_PAGE)) && ((_b = change.controlId) === null || _b === void 0 ? void 0 : _b.includes(entitySet))) {
+            const change = common_1.parseChangeString(changeString);
+            if (change && ((_a = change.controlId) === null || _a === void 0 ? void 0 : _a.includes(sapUiPageV2_1.FE_TEMPLATE_V2_OBJECT_PAGE)) && ((_b = change.controlId) === null || _b === void 0 ? void 0 : _b.includes(entitySet))) {
                 let selectorId = change.controlId.split('--')[1].replace(/:3a:3a/g, '::');
                 const complexIdMatch = new RegExp('.+DataField.+:::sSmartTableId::.+');
                 if (complexIdMatch.exec(selectorId) !== null) {
                     selectorId = selectorId.split('template:::TableColumn:::')[1];
                 }
-                const idParts = selectorId.split(':::');
+                const selectorIdParts = selectorId.split(':::');
                 let id, facetID;
-                if (idParts.length === 1) {
-                    const lastIdParts = idParts[0].split('-');
+                if (selectorIdParts.length === 1) {
+                    const lastIdParts = selectorIdParts[0].split('-');
                     id = lastIdParts[lastIdParts.length - 1];
-                    if (idParts[0].indexOf('com.sap.vocabularies.UI.v1.LineItem') >= 0 ||
-                        idParts[0].indexOf('UI.LineItem') >= 0 ||
-                        idParts[0].indexOf('::Table') >= 0) {
+                    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]
@@ -52,7 +52,6 @@ function prepareFlexChanges(changes, entitySet, logger) {
                         const idParts = id.split('::');
                         if (idParts.length > 1) {
                             facetID = idParts[0];
-                            id = idParts[1];
                         }
                         else if (lastIdParts[0].indexOf('::') > -1) {
                             facetID = lastIdParts[0].split('::')[0];
@@ -60,22 +59,19 @@ function prepareFlexChanges(changes, entitySet, logger) {
                     }
                 }
                 else if (selectorId.indexOf('sSmartTableId') >= 0) {
-                    id = selectorId;
-                    for (let index = 0; index < idParts.length; index++) {
-                        const element = idParts[index];
+                    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', '/@com.sap.vocabularies.UI.v1.LineItem');
+                                .replace(`::${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`, `/@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`);
                             break;
                         }
                     }
                 }
                 else {
-                    facetID = idParts[0];
-                    id = idParts[1];
+                    facetID = selectorIdParts[0];
                 }
                 selectorId = selectorId
                     .replace(/:2f/g, '/')
@@ -105,51 +101,90 @@ function prepareFlexChanges(changes, entitySet, logger) {
     });
     return result;
 }
+const addFlexToConfig = (config, propertyKey, flexChange) => {
+    config[propertyKey] = flexChange;
+};
+const getSectionType = (schemaSection) => {
+    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']) {
+        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']) {
+        return types_1.SectionTypeV2.SubSection;
+    }
+};
 /**
  * Transfers settings from manifest and flexChanges to object page config
+ * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
  * @param configPart - part of the configuration to be filled
- * @param manifest - manifest.json of the app
  * @param schemaDefinition - current section of the app specific schema
  * @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 (Facet ID)
+ * @param sectionTitle - title of the section (optional)
  * @param actionId - ID of the given action (optional)
  */
-function transferSettingsAndFlexChanges(configPart, manifest, schemaDefinition, pageKeys, flexChanges, jsonSchema, logger, sectionId, sectionTitle, actionId) {
+function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefinition, pageKeys, flexChanges, sectionId, sectionTitle, actionId) {
+    var _a;
     if (!schemaDefinition) {
         return;
     }
     let deprecatedProperties = [];
     let manifestSection = {};
-    if (configPart.getDeprecated) {
+    if (configPart === null || configPart === void 0 ? void 0 : configPart.getDeprecated) {
         deprecatedProperties = configPart.getDeprecated();
     }
-    const unescapedId = sectionId && sectionId.replace(/::@com.sap.vocabularies/g, '/@com.sap.vocabularies');
+    const unescapedId = sectionId && sectionId.replace(/::@com.sap.vocabularies/g, v2_1.VOCWITHSLASH);
     for (const propertyKey in schemaDefinition['properties'] || schemaDefinition) {
-        const syncRule = common_2.getReflectMetadata(configPart, propertyKey);
+        const syncRule = common_1.getReflectMetadata(configPart, propertyKey);
         if (syncRule || propertyKey === 'columns') {
             if (propertyKey === 'columns' || (syncRule && syncRule.flex)) {
                 if (sectionId) {
                     for (const selector in flexChanges) {
-                        if ((flexChanges[selector].propertyId === propertyKey ||
-                            (propertyKey === 'columns' &&
-                                flexChanges[selector].controlType === common_1.ControlType.TableColumn)) &&
-                            flexChanges[selector].facetId &&
-                            (flexChanges[selector].facetId === sectionId ||
-                                flexChanges[selector].facetId === unescapedId ||
-                                flexChanges[selector].facetId === sectionTitle)) {
-                            table_1.addFlexForTable(configPart, flexChanges[selector], jsonSchema);
+                        const flexChange = flexChanges[selector];
+                        const propertyIdMatch = flexChange.propertyId === propertyKey;
+                        const isTableColumn = propertyKey === 'columns' && flexChange.controlType === common_1.ControlType.TableColumn;
+                        const facetIds = [sectionId, unescapedId, sectionTitle];
+                        if ((propertyIdMatch || isTableColumn) && facetIds.indexOf(flexChange === null || flexChange === void 0 ? void 0 : flexChange.facetId) > -1) {
+                            table_1.addFlexForTable(configPart, flexChanges[selector], importParameters.jsonSchema);
                         }
                     }
                 }
                 else {
                     for (const selector in flexChanges) {
-                        if ((!actionId || selector.endsWith(actionId)) &&
-                            ((flexChanges[selector].propertyId === propertyKey && !flexChanges[selector].facetId) ||
-                                (flexChanges[selector].propertyId === propertyKey &&
-                                    flexChanges[selector].facetId === 'action'))) {
-                            configPart[propertyKey] = flexChanges[selector].newValue;
+                        const flexChange = flexChanges[selector];
+                        const actionIdMatch = !actionId || new RegExp(`.*${actionId}\\d?$`).test(selector);
+                        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) {
+                            // Sections
+                            addFlexToConfig(configPart, propertyKey, flexChange.newValue);
                             break;
                         }
                     }
@@ -160,7 +195,7 @@ function transferSettingsAndFlexChanges(configPart, manifest, schemaDefinition,
                     ? sectionId.replace(/\/@/g, '::').replace(/@com.sap/g, 'com.sap')
                     : undefined;
                 const path = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
-                manifestSection = manifest_1.getManifestSectionByPathV2(manifest, path);
+                manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
                 const importHandler = syncRule.manifest.import;
                 if (importHandler && typeof importHandler === 'function') {
                     const value = importHandler(manifestSection, sectionId);
@@ -179,9 +214,9 @@ function transferSettingsAndFlexChanges(configPart, manifest, schemaDefinition,
                     for (const key in manifestSection) {
                         const deprecated = deprecatedProperties[key];
                         if (deprecated) {
-                            extensionLogger_1.log(logger, {
+                            extensionLogger_1.log(importParameters.logger, {
                                 severity: "warning" /* Warning */,
-                                message: common_2.getTextForDeprecated(key, deprecated),
+                                message: common_1.getTextForDeprecated(key, deprecated),
                                 location: {
                                     path: 'webapp/manifest.json/',
                                     range: path.split('/')
@@ -196,217 +231,321 @@ function transferSettingsAndFlexChanges(configPart, manifest, schemaDefinition,
     }
 }
 /**
- *  Fills the sections and subsections of the configuration (recursive function)
- * @param sectionProperties - current properties' list (of sections or subsections)
- * @param manifestSettings - object page settings section of the manifest
+ *  Fills the fields of an object page form
+ * @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)
+ */
+function fillFields(importParameters, escapedId, fieldProperties, configPart, factory, pageKeys, flexChanges) {
+    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);
+        if (Object.keys(configPart[escapedId]['form']['fields'][fieldProperty]).length === 0) {
+            delete configPart[escapedId]['form']['fields'][fieldProperty];
+        }
+    }
+    if (Object.keys(configPart[escapedId]['form']['fields']).length === 0) {
+        delete configPart[escapedId]['form']['fields'];
+    }
+}
+/**
+ * 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)
+ */
+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');
+    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';
+        //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;
+        let localJsonSchema;
+        const schemaDefinitions = importParameters.jsonSchema['definitions'];
+        if (tableType) {
+            localJsonSchema = schemaDefinitions['ObjectPage' + tableType + '<' + escapedSectionId + '>'];
+        }
+        else {
+            localJsonSchema = schemaDefinitions['ObjectPageResponsiveTable<' + escapedSectionId + '>'];
+        }
+        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 {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;
+    const customColumnTarget = customColumnSchemaProp
+        ? utils_1.getTargetFromCustomColumnRef(customColumnSchemaProp.$ref)
+        : undefined;
+    if (customColumnTarget) {
+        const objectPageSectionData = {
+            key: sectionTitle || escapedSectionId.replace('@', ''),
+            target: customColumnTarget
+        };
+        listReport_1.addFragments(configPart[escapedSectionId], importParameters.manifest, v2Page, common_2.PageType.ObjectPage, importParameters.fragments, objectPageSectionData);
+    }
+}
+/**
+ *  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.
- * @param {FileData[]} fragments - Array with XML fragments.
  */
-function fillSections(sectionProperties, manifestSettings, configPart, manifest, jsonSchema, factory, pageKeys, flexChanges, v2Page, objectPageConfig, fragments, logger) {
-    let escapedId, sectionTitle;
+function fillSectionsInConfig(importParameters, sectionProperties, manifestSettings, configPart, factory, pageKeys, flexChanges, v2Page, objectPageConfig) {
+    var _a, _b;
+    let sectionTitle;
     for (const sectionId in sectionProperties) {
-        escapedId = sectionId.replace(/\/@/g, '::');
+        const escapedSectionId = sectionId.replace(/\/@/g, '::');
         let schemaSection = sectionProperties[sectionId];
         if (schemaSection['$ref'] &&
-            schemaSection['$ref'].startsWith(common_2.DEFINITION_LINK_PREFIX + 'ObjectPageSectionTableV2')) {
+            (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
-            schemaSection = jsonSchema['definitions']['ObjectPageSectionTableV2<' + escapedId + '>'];
-            sectionTitle = (schemaSection === null || schemaSection === void 0 ? void 0 : schemaSection.title) ? schemaSection.title.split(v2_1.FacetTitlePrefix)[1] : undefined;
-            const manifestKey = escapedId.replace('@com.sap', 'com.sap');
+            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) {
-                const tableType = manifestSection
-                    ? manifestSection.tableSettings
-                        ? manifestSection.tableSettings.type
-                            ? manifestSection.tableSettings.type
-                            : 'ResponsiveTable'
-                        : 'ResponsiveTable'
-                    : 'ResponsiveTable';
-                //Instantiate metadata
-                const OPtable = factory.createInstance(common_3.PageType.ObjectPage, 'ObjectPage' + tableType);
-                configPart[escapedId] = { table: OPtable };
-                let localJsonSchema;
-                if (tableType) {
-                    localJsonSchema = jsonSchema['definitions']['ObjectPage' + tableType + '<' + escapedId + '>'];
-                }
-                else {
-                    localJsonSchema = jsonSchema['definitions']['ObjectPageResponsiveTable<' + escapedId + '>'];
-                }
-                transferSettingsAndFlexChanges(configPart[escapedId]['table'], manifest, localJsonSchema, pageKeys, flexChanges, jsonSchema, logger, sectionId, sectionTitle);
-                // Custom column ref
-                const customColumnSchemaProp = jsonSchema['definitions'][escapedId].properties.custom;
-                const customColumnTarget = customColumnSchemaProp
-                    ? utils_1.getTargetFromCustomColumnRef(customColumnSchemaProp.$ref)
-                    : undefined;
-                if (customColumnTarget) {
-                    const objectPageSectionData = {
-                        key: sectionTitle || escapedId.replace('@', ''),
-                        target: customColumnTarget
-                    };
-                    listReport_1.addFragments(configPart[escapedId], manifest, v2Page, common_3.PageType.ObjectPage, fragments, objectPageSectionData);
-                }
+                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['properties'] && schemaSection['properties']['subsections']) {
+        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];
+            }
+        }
+        else if ((schemaSection['properties'] && schemaSection['properties']['subsections']) ||
+            (schemaSection['$ref'] &&
+                (getSectionType(schemaSection) === types_1.SectionTypeV2.Section ||
+                    getSectionType(schemaSection) === types_1.SectionTypeV2.SubSection))) {
             // Section with subsections
-            configPart[escapedId] = {
+            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: {}
-            };
-            schemaSection = jsonSchema['definitions']['ObjectPageSectionV2<' + escapedId + '>'];
-            sectionTitle = (schemaSection === null || schemaSection === void 0 ? void 0 : schemaSection.title) ? schemaSection.title.split(v2_1.FacetTitlePrefix)[1] : undefined;
-            fillSections(schemaSection['properties'], manifestSettings, configPart[escapedId]['subsections'], manifest, jsonSchema, factory, pageKeys, flexChanges, v2Page, objectPageConfig, fragments, logger);
-        }
-        else if (schemaSection['$ref'] &&
-            schemaSection['$ref'] === common_2.DEFINITION_LINK_PREFIX + 'ObjectPageSectionChartV2') {
-            // Section without subsections
-            schemaSection = jsonSchema['definitions']['ObjectPageSectionChartV2'];
-            sectionTitle = schemaSection.title ? schemaSection.title.split(v2_1.FacetTitlePrefix)[1] : undefined;
-            const manifestKey = escapedId.replace('@com.sap', 'com.sap');
-            const manifestSection = manifestSettings && manifestSettings.sections && manifestSettings.sections[manifestKey];
-            const chartConfig = factory.createInstance(common_3.PageType.ObjectPage, 'ObjectPageChart');
-            configPart[escapedId] = { chart: chartConfig };
-            if (manifestSection || flexChanges) {
-                transferSettingsAndFlexChanges(configPart[escapedId]['chart'], manifest, jsonSchema['definitions']['ObjectPageChart'], pageKeys, flexChanges, jsonSchema, logger, sectionId, sectionTitle);
+            });
+            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);
         }
     }
 }
 /**
  *  Fills the action of the configuration
+ * @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 manifest - manifest.json of the app
- * @param jsonSchema - app specific schema
+ * @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)
  */
-function fillActions(actionProperties, configPart, manifest, jsonSchema, factory, pageKeys, flexChanges, logger) {
-    let actionId;
+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) {
-            actionId = actionProperty.replace(/\/@/g, '::');
-            configPart['actions'][actionId] = factory.createInstance(common_3.PageType.ObjectPage, 'HeaderAction');
-            transferSettingsAndFlexChanges(configPart['actions'][actionId], manifest, jsonSchema['definitions']['HeaderAction'], pageKeys, flexChanges, jsonSchema, logger, undefined, undefined, actionId);
+            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];
+            }
         }
     }
+    if (sectionId && Object.keys(configPart['actions']).length === 0) {
+        delete configPart['actions'];
+    }
 }
 /**
  * Fill properties of object page confg based on manifest settings
- * @param objectPageConfig - Object page config (file content)
- * @param manifest - manifest.json of the given app
- * @param jsonSchema - app specific JSON schema
+ * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
  * @param pageKeys - list of page keys (comprises the one entry describing the given page)
- * @param entitySet - entity set for identifying the given object page
  * @param flexChangesForTransfer - list of flex changes (pre-processed by prepareFlexChanges)
  * @param v2Page - page definition in manifest.json
  * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
- * @param fragments - list of all extension fragment files and their content
- * @param logger - Logger class for logging messages
+ * @returns {ObjectPageConfig} - the object page configuration (JSON)
  */
-function fillConfig(objectPageConfig, manifest, jsonSchema, pageKeys, entitySet, flexChangesForTransfer, v2Page, factory, fragments, logger) {
+function fillConfig(importParameters, pageKeys, flexChangesForTransfer, v2Page, factory) {
+    const objectPageConfig = factory.createPageInstance(common_2.PageType.ObjectPage);
     const manifestSettings = v2Page.component.settings;
     // Transfer page information
-    transferSettingsAndFlexChanges(objectPageConfig, manifest, jsonSchema['properties'], pageKeys, flexChangesForTransfer, jsonSchema, logger);
+    transferSettingsAndFlexChanges(importParameters, objectPageConfig, importParameters.jsonSchema['properties'], pageKeys, flexChangesForTransfer);
     // Transfer header information
-    objectPageConfig.header = factory.createInstance(common_3.PageType.ObjectPage, 'ObjectPageHeader');
-    transferSettingsAndFlexChanges(objectPageConfig.header, manifest, jsonSchema['definitions']['ObjectPageHeader']
-        ? jsonSchema['definitions']['ObjectPageHeader']
-        : jsonSchema['definitions']['ObjectPageHeader<GenericActions>'], pageKeys, flexChangesForTransfer, jsonSchema, logger);
-    const headerAction = jsonSchema['definitions']['HeaderActions'];
+    objectPageConfig.header = 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);
+    const headerAction = importParameters.jsonSchema['definitions']['HeaderActions'];
     if (headerAction) {
-        fillActions(headerAction.properties, objectPageConfig.header, manifest, jsonSchema, factory, pageKeys, flexChangesForTransfer, logger);
+        fillActions(importParameters, headerAction.properties, objectPageConfig.header, factory, pageKeys, flexChangesForTransfer);
     }
     // Transfer Layout information
-    objectPageConfig.layout = factory.createInstance(common_3.PageType.ObjectPage, 'ObjectPageLayout');
-    transferSettingsAndFlexChanges(objectPageConfig.layout, manifest, jsonSchema['definitions']['ObjectPageLayout'], pageKeys, flexChangesForTransfer, jsonSchema, logger);
+    objectPageConfig.layout = factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageLayout');
+    transferSettingsAndFlexChanges(importParameters, objectPageConfig.layout, importParameters.jsonSchema['definitions']['ObjectPageLayout'], pageKeys, flexChangesForTransfer);
     if (Object.keys(objectPageConfig.layout).length === 0) {
         delete objectPageConfig.layout;
     }
     // Fill sections and subsections
     objectPageConfig.sections = {};
-    const sections = jsonSchema['definitions']['Sections'];
+    const sections = importParameters.jsonSchema['definitions']['Sections'];
     if (sections) {
-        fillSections(sections.properties, manifestSettings, objectPageConfig.sections, manifest, jsonSchema, factory, pageKeys, flexChangesForTransfer, v2Page, objectPageConfig, fragments, logger);
+        fillSectionsInConfig(importParameters, sections.properties, manifestSettings, objectPageConfig.sections, factory, pageKeys, flexChangesForTransfer, v2Page, objectPageConfig);
     }
     // Find custom sections
-    const customSections = utils_1.findCustomSectionExtensions(manifest, entitySet);
+    const customSections = utils_1.findCustomSectionExtensions(importParameters.manifest, importParameters.entitySet);
     if (Object.keys(customSections).length > 0) {
         objectPageConfig.sections.custom = [];
         for (const sectionId in customSections) {
             const customSection = 'fragmentName' in customSections[sectionId]
-                ? factory.createInstance(common_3.PageType.ObjectPage, 'ObjectPageCustomSectionFragment')
-                : factory.createInstance(common_3.PageType.ObjectPage, 'ObjectPageCustomSectionView');
-            transferSettingsAndFlexChanges(customSection, manifest, jsonSchema['definitions']['fragmentName' in customSections[sectionId]
+                ? factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageCustomSectionFragment')
+                : factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageCustomSectionView');
+            transferSettingsAndFlexChanges(importParameters, customSection, importParameters.jsonSchema['definitions']['fragmentName' in customSections[sectionId]
                 ? 'ObjectPageCustomSectionFragment'
-                : 'ObjectPageCustomSectionView'], pageKeys, flexChangesForTransfer, jsonSchema, logger, sectionId);
+                : 'ObjectPageCustomSectionView'], pageKeys, flexChangesForTransfer, sectionId);
             objectPageConfig.sections.custom.push(customSection);
         }
     }
+    return objectPageConfig;
 }
 /**
- * External API: Create configuration (file content) for a V2 object page
- * @param {object} manifest  - manifest of the app
- * @param {string[]} flex - list of flex changes (from UI adaptatin)
- * @param {object} jsonSchema - app specific JSON schema
- * @param {string} entitySet - current entity set, identifying the given page
- * @param {FileData[]} fragments - list of all extension fragment files and their content
- * @param {ExtensionLogger} logger - Logger class for logging messages
- * @returns config - the object page configuration
+ * Creates the configuration (file content) for a V2 object page
+ * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
+ *
+ * @returns {ObjectPageConfig} - the object page configuration (JSON)
  */
-function createObjectPageConfig(manifest, flex, jsonSchema, entitySet, fragments, logger) {
+function createObjectPageConfigV2(importParameters) {
     // Initialize i18next
     i18n_1.initI18n();
-    if (!manifest[common_3.ManifestSection.generic]) {
-        extensionLogger_1.log(logger, {
+    if (!importParameters.manifest[common_2.ManifestSection.generic]) {
+        extensionLogger_1.log(importParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOFE'),
             location: {
                 path: v2_1.MANIFESTPATH,
-                range: [common_3.ManifestSection.generic]
+                range: [common_2.ManifestSection.generic]
             }
         });
         return;
     }
     const pageKeys = [];
-    const v2Pages = manifest[common_3.ManifestSection.generic].pages;
+    const v2Pages = importParameters.manifest[common_2.ManifestSection.generic].pages;
     if (!v2Pages) {
-        extensionLogger_1.log(logger, {
+        extensionLogger_1.log(importParameters.logger, {
             severity: "error" /* Error */,
-            message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
+            message: i18next_1.default.t('NOPAGES', { appId: importParameters.manifest['sap.app']['id'] }),
             location: {
                 path: v2_1.MANIFESTPATH,
-                range: [common_3.ManifestSection.generic]
+                range: [common_2.ManifestSection.generic]
             }
         });
         return;
     }
-    const v2Page = utils_1.findObjectPage(v2Pages, entitySet, pageKeys);
+    const entitySet = importParameters.entitySet;
+    const v2Page = utils_1.findObjectPageV2(v2Pages, importParameters.entitySet, pageKeys);
     if (!v2Page) {
-        extensionLogger_1.log(logger, {
+        extensionLogger_1.log(importParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYSET', { entitySet }),
             location: {
                 path: v2_1.MANIFESTPATH,
-                range: [common_3.ManifestSection.generic]
+                range: [common_2.ManifestSection.generic]
             }
         });
         return;
     }
-    const flexChangesForTransfer = prepareFlexChanges(flex, entitySet);
+    const flexChangesForTransfer = prepareFlexChanges(importParameters.flex, entitySet);
     const factory = new factory_1.MetadataInstanceFactoryV2();
-    //Instantiate Page
-    const config = factory.createPageInstance(common_3.PageType.ObjectPage);
     //Fill config.json with manifest settings and flex changes
-    fillConfig(config, manifest, jsonSchema, pageKeys, entitySet, flexChangesForTransfer, v2Page, factory, fragments, logger);
-    return config;
+    return fillConfig(importParameters, pageKeys, flexChangesForTransfer, v2Page, factory);
 }
-exports.createObjectPageConfig = createObjectPageConfig;
+exports.createObjectPageConfigV2 = createObjectPageConfigV2;
 //# sourceMappingURL=objectPage.js.map