@sap/ux-specification 1.90.11 → 1.90.15

package/dist/src/sync/v2/generate/listReport.js

@@ -13,18 +13,13 @@ const types_1 = require("../types");
 /**
  * Generates an app specific schema for the FE V2 Listreport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.
- *
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} genericSchema - generic JSON schema of a list report
  * @param {string} entityTypeName - the base entity type of the given page
  * @param {EntityType[]} entityTypes - list of all entity types
- * @param {object} manifest - manifest.json of the given application
- * @param {FileData[]} fragments - list of fragment files and their content
- * @param {ExtensionLogger} logger - Logger class for logging messages
- * @param {string} appId - application ID
- *
  * @returns appSchema - the application specific JSON schema
  */
-function generateListReportSchemaV2(genericSchema, entityTypeName, entityTypes, manifest, fragments, logger) {
+function generateListReportSchemaV2(generateParameters, genericSchema, entityTypeName) {
     // Initialize i18next
     i18n_1.initI18n();
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
@@ -57,9 +52,9 @@ function generateListReportSchemaV2(genericSchema, entityTypeName, entityTypes,
     appSchema['definitions'][types_1.ANALYTICALTABLE].properties.toolBar.$ref = lrToolBar;
     appSchema['definitions'][types_1.GRIDTABLE] = gridTableDefinition;
     appSchema['definitions'][types_1.GRIDTABLE].properties.toolBar.$ref = lrToolBar;
-    const entityType = entityTypes.find((et) => et.name === entityTypeName);
+    const entityType = generateParameters.serviceAVT.entityTypes.find((et) => et.name === entityTypeName);
     if (!entityType) {
-        v2_1.log(logger, {
+        v2_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYTYPE', { entityType: entityTypeName }),
             location: {
@@ -74,9 +69,9 @@ function generateListReportSchemaV2(genericSchema, entityTypeName, entityTypes,
         //add fields for createWithParameterDialog
         common_1.addFieldsType(appSchema, entityType);
         const pageKeys = [];
-        const v2Page = import_1.findListReportPageV2(manifest[v2_1.ManifestSection.generic].pages, pageKeys);
+        const v2Page = import_1.findListReportPageV2(generateParameters.manifest[v2_1.ManifestSection.generic].pages, pageKeys);
         if (!v2Page) {
-            v2_1.log(logger, {
+            v2_1.log(generateParameters.logger, {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOALP'),
                 location: {
@@ -86,7 +81,7 @@ function generateListReportSchemaV2(genericSchema, entityTypeName, entityTypes,
             });
             return;
         }
-        utils_1.addListReportColumnExtensions(appSchema, entityType, v2Page, manifest, fragments);
+        utils_1.addListReportColumnExtensions(appSchema, entityType, v2Page, generateParameters.manifest, generateParameters.fragments);
         //Delete generic definitions
         delete appSchema['definitions']['ResponsiveTableWithMultiSelect'];
         delete appSchema['definitions']['ResponsiveTableWithInlineDelete'];

package/dist/src/sync/v2/generate/listReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/v2/generate/objectPage.d.ts

@@ -1,6 +1,4 @@
-import { ConverterOutput } from '@sap-ux/vocabularies-types';
-import { FileData } from '../../common';
-import { ExtensionLogger } from '../../../v2';
+import { GenerateAppSchemaParameters } from '../../../v2';
 export interface ObjectPageSectionData {
     target: string;
     key?: string;
@@ -8,15 +6,10 @@ export interface ObjectPageSectionData {
 /**
  * Generates an app specific schema out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.
- *
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param genericSchema - generic JSON schema of an object page
  * @param entityTypeName - the base entity type of the given page
- * @param annotations - list of all annotation files (file content plus URI as identifier)
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param manifest - manifest.json of the app
- * @param {FileData[]} [fragments] - array with XML fragments.
- * @param {ExtensionLogger} logger - Logger class for logging messages
  *
  * @returns the app specific JSON schema
  */
-export declare function generateObjectPageSchemaV2(genericSchema: object, entityTypeName: string, oDataServiceAVT: ConverterOutput, manifest: object, fragments?: FileData[], logger?: ExtensionLogger): object;
+export declare function generateObjectPageSchemaV2(generateParameters: GenerateAppSchemaParameters, genericSchema: object, entityTypeName: string): object | undefined;

package/dist/src/sync/v2/generate/objectPage.js

@@ -10,49 +10,66 @@ const v2_1 = require("../../../v2");
 const common_2 = require("../../../specification/common");
 const i18next_1 = __importDefault(require("i18next"));
 const i18n_1 = require("../../../i18n/i18n");
+const types_1 = require("../types");
 /**
- * Add Object Page Header Action Buttons to app-specific schema
- *
- * @param {object} appSchema Schema of the app
- * @param {EntityType} entityType - current entity type
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * Adds flexChange properties for sub(sections)
+ * @param appSchema - app schema in general
+ * @param schemaSection - current section
+ * @param property - property that will be enhanced
+ * @param sectionType - type of section
  */
-function addHeaderActions(appSchema, entityType, oDataServiceAVT) {
-    const alias = common_1.findAlias(v2_1.UIVOCABULARY, oDataServiceAVT);
-    const actionAnnotation = alias &&
-        entityType.annotations &&
-        entityType.annotations[alias] &&
-        entityType.annotations[alias].Identification;
-    if (actionAnnotation) {
-        // Add action to configuration
-        appSchema['definitions']['ObjectPageHeader'].properties['actions'] = {
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}HeaderActions`
-        };
-        const headerActions = (appSchema['definitions']['HeaderActions'] = {
-            type: 'object',
-            properties: {},
-            description: 'Actions',
-            additionalProperties: false,
-            isViewNode: true,
-            annotationPath: actionAnnotation.fullyQualifiedName
-        });
-        actionAnnotation.forEach((item, index) => {
-            if (!item['Determining'] && item.$Type === 'com.sap.vocabularies.UI.v1.DataFieldForAction') {
-                const { actionName, actionId } = common_1.getActionNameAndId(item.Action, entityType);
-                const description = item.Label || actionName;
-                const actionDefinitionKey = `HeaderAction<${actionId}>`;
-                appSchema['definitions'][actionDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions']['HeaderAction']));
-                appSchema['definitions'][actionDefinitionKey].annotationPath = `${actionAnnotation.fullyQualifiedName}/${index}`;
-                appSchema['definitions'][actionDefinitionKey].description = description;
-                headerActions.properties[actionId] = {
-                    $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
-                };
-            }
-        });
-        delete appSchema['definitions']['GenericActions'];
-        delete appSchema['definitions']['HeaderAction'];
-        delete appSchema['definitions']['ObjectPageHeader<GenericActions>'];
+function addFlexChangeForSection(appSchema, schemaSection, property, sectionType) {
+    let controlType;
+    switch (sectionType) {
+        case types_1.SectionTypeV2.Section:
+        case types_1.SectionTypeV2.SectionForm:
+        case types_1.SectionTypeV2.SectionChart:
+        case types_1.SectionTypeV2.SectionTable:
+            controlType = v2_1.ControlType.Section;
+            break;
+        case types_1.SectionTypeV2.SubSection:
+            controlType = v2_1.ControlType.SubSection;
+            break;
+        case types_1.SectionTypeV2.SubSectionForm:
+            controlType = v2_1.ControlType.SmartGroup;
+            break;
+        case types_1.SectionTypeV2.SubSectionChart:
+            controlType = v2_1.ControlType.SmartChart;
+            break;
+        case types_1.SectionTypeV2.SubSectionTable:
+            controlType = v2_1.ControlType.SmartTable;
+            break;
     }
+    if (controlType === undefined) {
+        return;
+    }
+    common_1.addPatternForBindingChangeOfEnumOP(appSchema, schemaSection, property);
+    schemaSection['properties'][property].artifactType = 'FlexChange';
+    schemaSection['properties'][property].controlType = controlType;
+}
+/**
+ * Callback for adding a single action to headerActions of V2
+ * @param {EntityType} entityType - current entity type
+ * @param {object} appSchema Schema of the app
+ * @param actionAnnotation - annotation as present in AVT ConverterOutput
+ * @param headerActions - list of header actions, to be enhanced
+ */
+function addHeaderActionCallBackV2(entityType, appSchema, actionAnnotation, headerActions, oDataServiceAVT) {
+    return (item, index) => {
+        if (!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) {
+            const action = common_1.replaceAlias(item.Action, oDataServiceAVT);
+            const { actionName, actionId } = common_1.getActionNameAndId(action, entityType);
+            const description = item.Label || actionName;
+            const actionDefinitionKey = `HeaderAction<${common_1.prepareRef(actionId)}>`;
+            appSchema['definitions'][actionDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions']['HeaderAction']));
+            const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
+            appSchema['definitions'][actionDefinitionKey].annotationPath = `/${convertedIdentification}/${index}`;
+            appSchema['definitions'][actionDefinitionKey].description = description;
+            headerActions.properties[actionId] = {
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+            };
+        }
+    };
 }
 /**
  * Method ensures that definitions for custom columns are created for passed entitySet.
@@ -89,7 +106,7 @@ function ensureCustomColumnDefinitionExists(appSchema, manifest, entitySetName,
  * @param appSchema - app-specific schema, to be updated
  */
 function addTableDefinition(tableType, facetId, facet, appSchema) {
-    const schemaId = `${tableType}<${facetId}>`;
+    const schemaId = common_1.prepareRef(`${tableType}<${facetId}>`);
     appSchema['definitions'][schemaId] = JSON.parse(JSON.stringify(appSchema['definitions'][tableType]));
     appSchema['definitions'][schemaId]['properties']['columns']['$ref'] = common_1.DEFINITION_LINK_PREFIX + facetId;
     appSchema['definitions'][schemaId].properties.toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetId}>`;
@@ -101,51 +118,53 @@ function addTableDefinition(tableType, facetId, facet, appSchema) {
 }
 /**
  * Adds definitions for line items in object page sections to the app schema
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {string} facetId - key of the facet, as listed in FacetConfigs
  * @param {object} appSchema - app schema in general
  * @param {FacetConfig} facet - the given facet from the UI annotations
  * @param {FacetConfigs} facets - list of all facets
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param {object} manifest - manifest.json of the app
- * @param {FileData[]} [fragments] - array with XML fragments.
  */
-function handleLineItem(facetId, appSchema, facet, facets, oDataServiceAVT, manifest, fragments) {
+function handleLineItem(generateParameters, facetId, appSchema, facet, facets, sectionType) {
+    var _a;
     if (facet.base !== 'LineItem' || !facetId) {
         //no properties
         return;
     }
     const navigationProperty = facetId.split('::')[0];
-    const schemaIdForOpSection = 'ObjectPageSectionTableV2<' + facetId + '>';
-    appSchema['definitions'][schemaIdForOpSection] = {
-        type: 'object',
-        properties: {
-            table: {
-                anyOf: [
-                    {
-                        $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithMultiSelect<${facetId}>`
-                    },
-                    {
-                        $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithInlineDelete<${facetId}>`
-                    },
-                    {
-                        $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageAnalyticalTable<${facetId}>`
-                    },
-                    {
-                        $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageGridTable<${facetId}>`
-                    },
-                    {
-                        $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageTreeTable<${facetId}>`
-                    }
-                ]
-            }
+    const schemaIdForOpSection = `${sectionType}<${facetId}>`;
+    appSchema['definitions'][schemaIdForOpSection] = common_1.createSectionWithoutProperties(facet, facetId);
+    const appSchemaSection = appSchema['definitions'][schemaIdForOpSection];
+    if (facet.ID || ((_a = facet.target) === null || _a === void 0 ? void 0 : _a['qualifier'])) {
+        appSchemaSection.properties = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionTable]['properties']));
+        if (appSchemaSection.properties.visible) {
+            addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
+        }
+    }
+    else {
+        appSchemaSection.properties.table = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionTable]['properties']['table']));
+    }
+    appSchemaSection.properties.table.anyOf = [
+        {
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithMultiSelect<${facetId}>`
         },
-        additionalProperties: false,
-        annotationPath: facet.annotationPath
-    };
-    common_1.addSectionTitleAndDescription(facet, appSchema['definitions'][schemaIdForOpSection], facetId);
+        {
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithInlineDelete<${facetId}>`
+        },
+        {
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageAnalyticalTable<${facetId}>`
+        },
+        {
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageGridTable<${facetId}>`
+        },
+        {
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageTreeTable<${facetId}>`
+        }
+    ];
+    appSchemaSection.annotationPath = facet.annotationPath;
+    common_1.addSectionTitleAndDescription(facet, appSchemaSection, facetId);
     // Find target entity
     const targetEntity = facet.entityType
-        ? oDataServiceAVT.entitySets.find((es) => es.entityType.name === facet.entityType.name || es.name === facet.entityType.name)
+        ? generateParameters.serviceAVT.entitySets.find((es) => es.entityType.name === facet.entityType.name || es.name === facet.entityType.name)
         : undefined;
     addTableDefinition('ObjectPageResponsiveTableWithMultiSelect', facetId, facet, appSchema);
     addTableDefinition('ObjectPageResponsiveTableWithInlineDelete', facetId, facet, appSchema);
@@ -155,87 +174,129 @@ function handleLineItem(facetId, appSchema, facet, facets, oDataServiceAVT, mani
     let customColumnDefinitionKey;
     if (targetEntity) {
         // Make sure that custom columns definitions are created for passed entity
-        customColumnDefinitionKey = ensureCustomColumnDefinitionExists(appSchema, manifest, targetEntity.name, facet.entityType.name, oDataServiceAVT, fragments);
+        customColumnDefinitionKey = ensureCustomColumnDefinitionExists(appSchema, generateParameters.manifest, targetEntity.name, facet.entityType.name, generateParameters.serviceAVT, generateParameters.fragments);
     }
     for (const facetKey in facets) {
         if (facets[facetKey].base === 'LineItem' && facetKey.includes(navigationProperty)) {
-            utils_1.addLineItemsType(appSchema, facets[facetKey]['lineItem'], facets[facetKey]['entityType'], facetId, customColumnDefinitionKey);
+            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, facetId, customColumnDefinitionKey);
+        }
+    }
+}
+/**
+ * Adds definitions for subsections in object page sections to the app schema
+ * @param facetId - key of the facet, as listed in FacetConfigs
+ * @param appSchema - app schema in general
+ * @param facet - the given facet from the UI annotations
+ * @param facets - list of all facets
+ */
+function handleSubSection(facetId, appSchema, facet, sectionType) {
+    const schemaIdForSection = facetId.replace(`@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`, facet.base);
+    const definitionKey = `${sectionType}<${schemaIdForSection}>`;
+    appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetId);
+    const appSchemaSection = appSchema['definitions'][definitionKey];
+    if (facet.ID) {
+        appSchemaSection.properties = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SubSection]['properties']));
+        if (appSchemaSection.properties.visible) {
+            addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
         }
     }
+    appSchemaSection.properties.subsections = {
+        type: 'object',
+        description: 'Subsections',
+        properties: {},
+        additionalProperties: false,
+        isViewNode: true
+    };
 }
 /**
  * Creates a section definition in app schema.
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {FacetConfigs} facets - list of all facets.
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
  * @param {object} appSchema - app specific schema that potentially gets enhanced.
- * @param {object} manifest - manifest.json of the app.
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool.
- * @param {FileData[]} [fragments] - array with XML fragments.
  */
-function addSection(facets, facetKey, sections, appSchema, manifest, oDataServiceAVT, fragments) {
+function addSection(generateParameters, facets, facetKey, sections, appSchema, isSubSection = false) {
+    var _a;
     const facet = facets[facetKey];
     switch (facet.base) {
         case v2_1.FacetBase.CollectionFacet: {
             //handle collection facets
-            const schemaIdForSection = facetKey.replace('@com.sap.vocabularies.UI.v1.Facets', facet.base);
-            sections['properties'][schemaIdForSection] = common_1.createSectionWithoutProperties(facet, facetKey);
-            const collectionDefinition = `ObjectPageSectionV2<${schemaIdForSection}>`;
-            sections['properties'][schemaIdForSection].properties = {
-                subsections: {
-                    $ref: common_1.DEFINITION_LINK_PREFIX + collectionDefinition
-                }
-            };
-            appSchema['definitions'][collectionDefinition] = common_1.createSectionWithoutProperties(facet, facetKey);
-            appSchema['definitions'][collectionDefinition].description = 'Subsections';
+            const sectionType = (sections === null || sections === void 0 ? void 0 : sections['description']) === 'Subsections' ? types_1.SectionTypeV2.SubSection : types_1.SectionTypeV2.Section;
+            const schemaIdForSection = facetKey.replace(`@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`, facet.base);
+            isSubSection = true;
+            const definitionKey = `${sectionType}<${schemaIdForSection}>`;
+            sections['properties'][schemaIdForSection] = { $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}` };
+            handleSubSection(facetKey, appSchema, facet, sectionType);
+            const subSections = appSchema['definitions'][definitionKey].properties.subsections;
             for (const key in facet['facets']) {
-                addSection(facet['facets'], key, appSchema['definitions'][collectionDefinition], appSchema, manifest, oDataServiceAVT, fragments);
+                addSection(generateParameters, facet['facets'], key, subSections, appSchema, isSubSection);
             }
             break;
         }
         case v2_1.FacetBase.LineItem: {
             //handle reference facet (if comprising line item)
+            const sectionType = isSubSection ? types_1.SectionTypeV2.SubSectionTable : types_1.SectionTypeV2.SectionTable;
             sections['properties'][facetKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageSectionTableV2<${facetKey}>`
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${sectionType}<${facetKey}>`
             };
-            handleLineItem(facetKey, appSchema, facet, facets, oDataServiceAVT, manifest, fragments);
+            handleLineItem(generateParameters, facetKey, appSchema, facet, facets, sectionType);
             //add fields for createWithParameterDialog
-            common_1.addFieldsType(appSchema, facet.entityType);
+            const floorplanSuffix = 'OP';
+            common_1.addFieldsType(appSchema, facet.entityType, floorplanSuffix);
             break;
         }
         case v2_1.FacetBase.Chart: {
             //handle reference facet (if comprising chart)
-            const chartSettings = appSchema['definitions']['GenericSections']['additionalProperties']['anyOf'].find((element) => element['$ref'] === `${common_1.DEFINITION_LINK_PREFIX}ObjectPageSectionChartV2`);
-            sections['properties'][facetKey] = chartSettings;
-            common_1.addSectionTitleAndDescription(facet, appSchema['definitions']['ObjectPageSectionChartV2'], facetKey);
+            const sectionType = isSubSection ? types_1.SectionTypeV2.SubSectionChart : types_1.SectionTypeV2.SectionChart;
+            const definitionKey = `${sectionType}<${facetKey}>`;
+            sections['properties'][facetKey] = {
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}`
+            };
+            appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetKey);
+            const appSchemaSection = appSchema['definitions'][definitionKey];
+            if (facet.ID) {
+                appSchemaSection.properties = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionChart]['properties']));
+                if (appSchemaSection.properties.visible) {
+                    addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
+                }
+            }
             break;
         }
         case v2_1.FacetBase.Form:
         case v2_1.FacetBase.Identification: {
-            const formDefinitionKey = `ObjectPageForm<${facetKey}>`;
+            const sectionType = isSubSection ? types_1.SectionTypeV2.SubSectionForm : types_1.SectionTypeV2.SectionForm;
+            const definitionKey = `${sectionType}<${facetKey}>`;
             sections['properties'][facetKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${formDefinitionKey}`
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}`
             };
-            appSchema['definitions'][formDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions'][`ObjectPageSectionFormV2`]));
+            appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetKey);
+            const appSchemaSection = appSchema['definitions'][definitionKey];
+            if ((facet === null || facet === void 0 ? void 0 : facet.ID) || ((_a = facet.target) === null || _a === void 0 ? void 0 : _a['qualifier'])) {
+                appSchemaSection['properties'] = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionForm]['properties']));
+                if (appSchemaSection.properties.visible) {
+                    addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
+                }
+            }
             if (facet === null || facet === void 0 ? void 0 : facet.ID) {
-                appSchema['definitions'][formDefinitionKey]['title'] = common_1.FacetTitlePrefix + facet.ID;
+                appSchemaSection.title = common_1.FacetTitlePrefix + facet.ID;
             }
             if (facet === null || facet === void 0 ? void 0 : facet.Label) {
-                appSchema['definitions'][formDefinitionKey]['description'] = facet.Label;
+                appSchemaSection.description = facet.Label;
             }
             let withActions = true;
-            appSchema['definitions'][formDefinitionKey]['annotationPath'] = facet.annotationPath;
-            appSchema['definitions'][formDefinitionKey]['isViewNode'] = true;
-            if (!appSchema['definitions'][formDefinitionKey].description) {
+            appSchemaSection.annotationPath = facet.annotationPath;
+            appSchemaSection.isViewNode = true;
+            if (!appSchemaSection.description) {
                 if (facet.base === v2_1.FacetBase.Form) {
-                    appSchema['definitions'][formDefinitionKey].description = 'Form';
+                    appSchemaSection.description = 'Form';
                 }
                 else if (facet.base === 'Identification') {
-                    appSchema['definitions'][formDefinitionKey].description = 'Identification';
+                    appSchemaSection.description = 'Identification';
                     withActions = false;
                 }
             }
-            common_1.handleForm(v2_1.SectionType.Section, facet, appSchema['definitions'][formDefinitionKey], appSchema, true, withActions);
+            common_1.handleForm(v2_1.SectionType.Section, facet, appSchemaSection, appSchema, common_2.FioriElementsVersion.v2, withActions);
             break;
         }
         default: {
@@ -246,13 +307,12 @@ function addSection(facets, facetKey, sections, appSchema, manifest, oDataServic
 }
 /**
  * Adds the sections to the app schema
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - app specific schema that potentially gets enhanced
  * @param {EntityType} entityType - current entity type
  * @param {SapUiAppPagesV2} pages - list of (manifest) pages
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function addSections(appSchema, entityType, entitySetName, pages, oDataServiceAVT, manifest, fragments, logger) {
+function addSections(generateParameters, appSchema, entityType, entitySetName, pages) {
     //initialize sections
     const sections = (appSchema['definitions']['Sections'] = {
         type: 'object',
@@ -262,13 +322,13 @@ function addSections(appSchema, entityType, entitySetName, pages, oDataServiceAV
         isViewNode: true
     });
     if (entityType) {
-        sections['annotationPath'] = `/${entityType.fullyQualifiedName}/@com.sap.vocabularies.UI.v1.Facets`;
+        sections['annotationPath'] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
     }
     if (!pages) {
         return;
     }
     // Get facet annotations
-    const facets = common_1.getObjectPageFacets(entityType, oDataServiceAVT, common_2.FioriElementsVersion.v2, logger);
+    const facets = common_1.getObjectPageFacets(entityType, generateParameters.serviceAVT, common_2.FioriElementsVersion.v2, generateParameters.logger);
     if (!facets || Object.keys(facets).length === 0) {
         return;
     }
@@ -278,11 +338,11 @@ function addSections(appSchema, entityType, entitySetName, pages, oDataServiceAV
         if (entitySetName.includes(element.entitySet)) {
             // Loop on all facets (of the given entitySet)
             for (const facetKey in facets) {
-                addSection(facets, facetKey, sections, appSchema, manifest, oDataServiceAVT, fragments);
+                addSection(generateParameters, facets, facetKey, sections, appSchema);
             }
         }
         else {
-            addSections(appSchema, entityType, entitySetName, element.pages, oDataServiceAVT, manifest, fragments);
+            addSections(generateParameters, appSchema, entityType, entitySetName, element.pages);
         }
     }
     // Add custom sections
@@ -298,13 +358,9 @@ function addSections(appSchema, entityType, entitySetName, pages, oDataServiceAV
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
 function addHeader(appSchema, entityType, oDataServiceAVT) {
-    appSchema['properties']['header'] = {
-        $ref: common_1.DEFINITION_LINK_PREFIX + 'ObjectPageHeader'
-    };
-    appSchema['definitions']['ObjectPageHeader'] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageHeader<GenericActions>']));
-    appSchema['definitions']['ObjectPageHeader'].annotationPath = `/${entityType.fullyQualifiedName}/@com.sap.vocabularies.UI.v1.HeaderInfo`;
-    //Add Header Actions
-    addHeaderActions(appSchema, entityType, oDataServiceAVT);
+    common_1.addCommonHeaderSchema(appSchema, entityType);
+    //Add header actions
+    common_1.addHeaderActions(appSchema, entityType, oDataServiceAVT, addHeaderActionCallBackV2);
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
@@ -324,18 +380,13 @@ function addRelatedFacetKeysType(schema, entityType, oDataServiceAVT, logger) {
 /**
  * Generates an app specific schema out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.
- *
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param genericSchema - generic JSON schema of an object page
  * @param entityTypeName - the base entity type of the given page
- * @param annotations - list of all annotation files (file content plus URI as identifier)
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param manifest - manifest.json of the app
- * @param {FileData[]} [fragments] - array with XML fragments.
- * @param {ExtensionLogger} logger - Logger class for logging messages
  *
  * @returns the app specific JSON schema
  */
-function generateObjectPageSchemaV2(genericSchema, entityTypeName, oDataServiceAVT, manifest, fragments, logger) {
+function generateObjectPageSchemaV2(generateParameters, genericSchema, entityTypeName) {
     // Initialize i18next
     i18n_1.initI18n();
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
@@ -348,10 +399,10 @@ function generateObjectPageSchemaV2(genericSchema, entityTypeName, oDataServiceA
     appSchema['properties']['sections'] = {
         $ref: common_1.DEFINITION_LINK_PREFIX + 'Sections'
     };
-    const entitySet = oDataServiceAVT.entitySets &&
-        oDataServiceAVT.entitySets.find((es) => es.entityType.name === entityTypeName || es.name === entityTypeName);
+    const entitySet = generateParameters.serviceAVT.entitySets &&
+        generateParameters.serviceAVT.entitySets.find((es) => es.entityType.name === entityTypeName || es.name === entityTypeName);
     if (!entitySet) {
-        v2_1.log(logger, {
+        v2_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYSET4NAME', { entityType: entityTypeName }),
             location: {
@@ -361,12 +412,24 @@ function generateObjectPageSchemaV2(genericSchema, entityTypeName, oDataServiceA
         return;
     }
     const entityType = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType;
+    const pages = generateParameters.manifest[common_2.ManifestSection.generic].pages;
+    if (!pages) {
+        v2_1.log(generateParameters.logger, {
+            severity: "error" /* Error */,
+            message: i18next_1.default.t('NOPAGES', { appId: generateParameters.manifest['sap.app']['id'] }),
+            location: {
+                path: v2_1.MANIFESTPATH,
+                range: [common_2.ManifestSection.generic]
+            }
+        });
+        return appSchema;
+    }
     // Add header
-    addHeader(appSchema, entityType, oDataServiceAVT);
+    addHeader(appSchema, entityType, generateParameters.serviceAVT);
     // Add sections
-    addSections(appSchema, entityType, entitySet.name, manifest[common_2.ManifestSection.generic].pages, oDataServiceAVT, manifest, fragments, logger);
+    addSections(generateParameters, appSchema, entityType, entitySet.name, pages);
     // Custom section facets
-    addRelatedFacetKeysType(appSchema, entityType, oDataServiceAVT, logger);
+    addRelatedFacetKeysType(appSchema, entityType, generateParameters.serviceAVT, generateParameters.logger);
     // Remove Custom Column non existing extensions - TreeTableColumnsExtension does not exist in ALP
     utils_1.removeElementsFromEnum(appSchema['definitions']['TableColumnExtensionTypeV2']['enum'], [
         v2_1.TableColumnExtensionTypeV2.TreeTableColumnsExtension
@@ -386,28 +449,18 @@ function generateObjectPageSchemaV2(genericSchema, entityTypeName, oDataServiceA
             delete appSchema['properties']['sections'];
         }
     }
-    const v2Page = import_1.findObjectPageV2(manifest[common_2.ManifestSection.generic].pages, entitySet.name, []);
-    if (!v2Page) {
-        v2_1.log(logger, {
-            severity: "error" /* Error */,
-            message: i18next_1.default.t('NOALP'),
-            location: {
-                path: v2_1.MANIFESTPATH,
-                range: [common_2.ManifestSection.generic]
-            }
-        });
-        return appSchema;
-    }
+    common_1.addFooterActions(appSchema, entityType, generateParameters.serviceAVT);
     // Eliminate generic definitions
     delete appSchema['definitions']['GenericSections'];
     delete appSchema['definitions']['ObjectPageSectionTableV2'];
     delete appSchema['definitions']['GenericColumns'];
-    delete appSchema['definitions']['ObjectPageSubSections'];
+    delete appSchema['definitions']['ObjectPageSectionFormV2'];
+    delete appSchema['definitions']['ObjectPageSectionTableV2'];
+    delete appSchema['definitions']['ObjectPageSubSectionV2'];
     delete appSchema['definitions']['ObjectPageResponsiveTableWithMultiSelect'];
     delete appSchema['definitions']['ObjectPageResponsiveTableWithInlineDelete'];
     delete appSchema['definitions']['ObjectPageAnalyticalTable'];
     delete appSchema['definitions']['ObjectPageTreeTable'];
-    delete appSchema['definitions']['ObjectPageSectionFormV2'];
     delete appSchema['definitions']['ObjectPageGridTable'];
     delete appSchema['definitions']['ObjectPageToolBar'];
     delete appSchema['definitions']['ObjectPageToolBarActions'];