@sap/ux-specification 1.90.11 → 1.90.15

package/dist/src/sync/v4/export/manifest.js

@@ -47,12 +47,102 @@ function initializeRouting(manifestRouting) {
     }
     return routing;
 }
+function setTargetOptions(target, navigationKey, association) {
+    if (!target.options) {
+        target.options = createTargetOption();
+    }
+    if (!target.options.settings) {
+        target.options.settings = {};
+    }
+    if (!target.options.settings.navigation) {
+        target.options.settings.navigation = {};
+    }
+    target.options.settings.navigation[navigationKey] = {
+        detail: {
+            route: association
+        }
+    };
+}
+function calculateQueryPattern(parts, pageType) {
+    let pattern = '';
+    parts.forEach((part, index) => {
+        let key = '';
+        if (pageType !== v4_1.PageTypeV4.ListReport) {
+            // Keys should be like - 'key', 'key2', 'key3'
+            key = `({key${index ? index + 1 : ''}})`;
+        }
+        pattern += `${pattern ? '/' : ''}${part}${key}`;
+    });
+    return pattern;
+}
+function handlePageNavigation(page, pages, target, routing) {
+    if (page.navigation) {
+        for (const association in page.navigation) {
+            const parts = page.navigation[association].split('.');
+            const pageType = pages[association] && pages[association].pageType;
+            const pattern = calculateQueryPattern(parts, pageType);
+            // Handle list report page different as there can be duplicate last part
+            let navigationKey = parts[parts.length - 1];
+            if (pageType === v4_1.PageTypeV4.ListReport ||
+                (pageType === v4_1.PageTypeV4.CustomPage && !pages[association].entitySet && !navigationKey)) {
+                navigationKey = association;
+            }
+            if (navigationKey) {
+                setTargetOptions(target, navigationKey, association);
+            }
+            if (!routing.routes.some((routingRoute) => routingRoute.name === association)) {
+                // Make sure there no route duplication
+                routing.routes.push(createRoute(association, association, `${pattern}${Constants.OptionalQuery}`));
+            }
+        }
+    }
+}
+function removeDeletedPages(routing, pages) {
+    for (const id in routing.targets) {
+        if (!pages || !pages[id]) {
+            // Remove target
+            delete routing.targets[id];
+            // Remove routes
+            const index = routing.routes.findIndex((route) => route.name === id);
+            if (index !== -1) {
+                routing.routes.splice(index, 1);
+            }
+        }
+    }
+}
+function transferEntitySet(page, target) {
+    var _a, _b, _c, _d, _e, _f;
+    if (page.entitySet) {
+        if (!target.options) {
+            target.options = createTargetOption(page.entitySet, page.variantManagement);
+        }
+        target.options.settings.entitySet = page.entitySet;
+        // We handle custom sections from scratch in exportObjectPageV4- clear 'sections' before handling
+        if ((_d = (_c = (_b = (_a = target === null || target === void 0 ? void 0 : target.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.sections) {
+            target.options.settings.content.body.sections = {};
+        }
+    }
+    else {
+        (_f = (_e = target.options) === null || _e === void 0 ? void 0 : _e.settings) === null || _f === void 0 ? true : delete _f.entitySet;
+    }
+}
+function updateRoute(routing, id, page) {
+    const route = routing.routes.find((routingRoute) => routingRoute.name === id);
+    if (route) {
+        if (page.defaultLayoutType) {
+            route.layout = page.defaultLayoutType;
+        }
+        else {
+            delete route.layout;
+        }
+    }
+}
 /**
  * Transform Pages(from app.json) to UI5 routing configuration(manifest.json)
  * @param routing UI5 routing configuration
  */
 function transformRoutingV4(homePage, pages, manifest) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b;
     const routing = initializeRouting(manifest[v4_1.ManifestSection.ui5].routing);
     // add default route
     if (homePage && !routing.routes.some((route) => route.name === homePage)) {
@@ -95,93 +185,23 @@ function transformRoutingV4(homePage, pages, manifest) {
                 }
             });
         }
-        if (page.entitySet) {
-            if (!target.options) {
-                target.options = createTargetOption(page.entitySet, page.variantManagement);
-            }
-            target.options.settings.entitySet = page.entitySet;
-            // We handle custom sections from scratch in exportObjectPageV4- clear 'sections' before handling
-            if ((_d = (_c = (_b = (_a = target === null || target === void 0 ? void 0 : target.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.sections) {
-                target.options.settings.content.body.sections = {};
-            }
-        }
-        else {
-            (_f = (_e = target.options) === null || _e === void 0 ? void 0 : _e.settings) === null || _f === void 0 ? true : delete _f.entitySet;
-        }
+        transferEntitySet(page, target);
         if (target && !page.controlAggregation) {
             delete target.contextPattern;
             delete target.controlAggregation;
         }
-        if ((_h = (_g = target === null || target === void 0 ? void 0 : target.options) === null || _g === void 0 ? void 0 : _g.settings) === null || _h === void 0 ? void 0 : _h.navigation) {
+        if ((_b = (_a = target === null || target === void 0 ? void 0 : target.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.navigation) {
             // We handle page 'navigation' from scratch - clear 'navigation' before handling
             target.options.settings.navigation = {};
         }
         // Handle page 'navigation'
-        if (page.navigation) {
-            for (const association in page.navigation) {
-                let pattern = '';
-                const parts = page.navigation[association].split('.');
-                const pageType = pages[association] && pages[association].pageType;
-                parts.forEach((part, index) => {
-                    let key = '';
-                    if (pageType !== v4_1.PageTypeV4.ListReport) {
-                        // Keys should be like - 'key', 'key2', 'key3'
-                        key = `({key${index ? index + 1 : ''}})`;
-                    }
-                    pattern += `${pattern ? '/' : ''}${part}${key}`;
-                });
-                // Handle list report page different as there can be duplicate last part
-                let navigationKey = parts[parts.length - 1];
-                if (pageType === v4_1.PageTypeV4.ListReport ||
-                    (pageType === v4_1.PageTypeV4.CustomPage && !pages[association].entitySet && !navigationKey)) {
-                    navigationKey = association;
-                }
-                if (navigationKey) {
-                    if (!target.options) {
-                        target.options = createTargetOption();
-                    }
-                    if (!target.options.settings) {
-                        target.options.settings = {};
-                    }
-                    if (!target.options.settings.navigation) {
-                        target.options.settings.navigation = {};
-                    }
-                    target.options.settings.navigation[navigationKey] = {
-                        detail: {
-                            route: association
-                        }
-                    };
-                }
-                if (!routing.routes.some((route) => route.name === association)) {
-                    // Make sure there no route duplication
-                    routing.routes.push(createRoute(association, association, `${pattern}${Constants.OptionalQuery}`));
-                }
-            }
-        }
+        handlePageNavigation(page, pages, target, routing);
         // Update associated route with layout information
-        const route = routing.routes.find((route) => route.name === id);
-        if (route) {
-            if (page.defaultLayoutType) {
-                route.layout = page.defaultLayoutType;
-            }
-            else {
-                delete route.layout;
-            }
-        }
+        updateRoute(routing, id, page);
         routing.targets[id] = target;
     }
     // Remove deleted pages
-    for (const id in routing.targets) {
-        if (!pages || !pages[id]) {
-            // Remove target
-            delete routing.targets[id];
-            // Remove routes
-            const index = routing.routes.findIndex((route) => route.name === id);
-            if (index !== -1) {
-                routing.routes.splice(index, 1);
-            }
-        }
-    }
+    removeDeletedPages(routing, pages);
     return routing;
 }
 exports.transformRoutingV4 = transformRoutingV4;

package/dist/src/sync/v4/export/manifest.js.map

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

package/dist/src/sync/v4/generate/generate.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../common/utils");
 const _1 = require(".");
+const __1 = require("../../..");
 /**
  * Generates the app specific schema of an object page out of the generic schema for the same page.
  * Generic types are replaced by information from the app specific annotations.
@@ -15,8 +16,15 @@ const _1 = require(".");
  * @returns the app specific JSON schema
  */
 function generateObjectPageInterfaceV4(genericSchema, entitySet, annotations, manifest, logger) {
-    const oDataServiceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
-    return _1.generateObjectPageSchemaV4(genericSchema, entitySet, oDataServiceAVT, manifest, logger);
+    const serviceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const generateParameters = {
+        fioriElementsVersion: __1.FioriElementsVersion.v4,
+        manifest,
+        fragments: [],
+        serviceAVT,
+        logger
+    };
+    return _1.generateObjectPageSchemaV4(generateParameters, genericSchema, entitySet);
 }
 exports.generateObjectPageInterfaceV4 = generateObjectPageInterfaceV4;
 /**

package/dist/src/sync/v4/generate/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/sync/v4/generate/generate.ts"],"names":[],"mappings":";;AACA,8CAA6D;AAC7D,wBAA2E;AAG3E;;;;;;;;;;;GAWG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAgB,EAChB,MAAwB;IAExB,MAAM,eAAe,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrE,OAAO,6BAA0B,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACnG,CAAC;AATD,sEASC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,aAAqB,EACrB,WAAuB,EACvB,MAAwB;IAExB,MAAM,eAAe,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IAErF,OAAO,6BAA0B,CAAC,aAAa,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;AACzG,CAAC;AAVD,sEAUC"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/sync/v4/generate/generate.ts"],"names":[],"mappings":";;AACA,8CAA6D;AAC7D,wBAA2E;AAE3E,gCAAgD;AAEhD;;;;;;;;;;;GAWG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAgB,EAChB,MAAwB;IAExB,MAAM,UAAU,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAgC;QACpD,oBAAoB,EAAE,wBAAoB,CAAC,EAAE;QAC7C,QAAQ;QACR,SAAS,EAAE,EAAE;QACb,UAAU;QACV,MAAM;KACT,CAAC;IACF,OAAO,6BAA0B,CAAC,kBAAkB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AACpF,CAAC;AAhBD,sEAgBC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,aAAqB,EACrB,WAAuB,EACvB,MAAwB;IAExB,MAAM,eAAe,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IAErF,OAAO,6BAA0B,CAAC,aAAa,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;AACzG,CAAC;AAVD,sEAUC"}

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

@@ -1,14 +1,11 @@
-import { ConverterOutput } from '@sap-ux/vocabularies-types';
-import { ExtensionLogger } from '../../../v4';
+import { GenerateAppSchemaParameters } from '../../../v4';
 /**
  * Generates an app specific schema out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.
+ * @param {GenerateAppSchemaParameters} 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 {ConverterOutput} oDataServiceAVT  - complete service information, as returned by annotation vocabularies tool
- * @param manifest - manifest.json of the app
- * @param {ExtensionLogger} logger - Logger class for logging messages
  *
  * @returns the app specific JSON schema
  */
-export declare function generateObjectPageSchemaV4(genericSchema: object, entityTypeName: string, oDataServiceAVT: ConverterOutput, manifest: object, logger?: ExtensionLogger): object;
+export declare function generateObjectPageSchemaV4(generateParameters: GenerateAppSchemaParameters, genericSchema: object, entityTypeName: string): object;

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

@@ -10,57 +10,33 @@ const utils_1 = require("../utils/utils");
 const i18next_1 = __importDefault(require("i18next"));
 const extensionLogger_1 = require("../../../extensionLogger");
 /**
- * Add Object Page Header Action Buttons to app-specific schema
- *
- * @param {object} appSchema Schema of the app
+ * Callback for adding a single action to headerActions of V4
  * @param {EntityType} entityType - current entity type
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @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 addHeaderActions(appSchema, entityType, oDataServiceAVT) {
-    appSchema['definitions']['ObjectPageHeader'] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageHeader<GenericActions>']));
-    // Change reference of header
-    appSchema['properties']['header'] = {
-        $ref: common_2.DEFINITION_LINK_PREFIX + 'ObjectPageHeader'
+function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, headerActions, oDataServiceAVT) {
+    return (item, index) => {
+        if ((!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) ||
+            item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
+            const action = common_2.replaceAlias(item.Action, oDataServiceAVT);
+            const { actionName, actionId } = common_2.getActionNameAndId(action, entityType);
+            const description = item.Label || actionName;
+            const actionDefinitionKey = `HeaderAction<${common_2.prepareRef(actionId)}>`;
+            const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
+            appSchema['definitions'][actionDefinitionKey] = {
+                isViewNode: true,
+                type: 'object',
+                properties: {},
+                description: description,
+                annotationPath: `/${convertedIdentification}/${index}`
+            };
+            headerActions.properties[actionId] = {
+                $ref: `${common_2.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+            };
+        }
     };
-    delete appSchema['definitions']['GenericActions'];
-    delete appSchema['definitions']['ObjectPageHeader<GenericActions>'];
-    const alias = common_2.findAlias(v4_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_2.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') ||
-                item.$Type === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation') {
-                const { actionName, actionId } = common_2.getActionNameAndId(item.Action, entityType);
-                const description = item.Label || actionName;
-                const actionDefinitionKey = `HeaderAction<${actionId}>`;
-                appSchema['definitions'][actionDefinitionKey] = {
-                    isViewNode: true,
-                    type: 'object',
-                    properties: {},
-                    description: description,
-                    annotationPath: `${actionAnnotation.fullyQualifiedName}/${index}`
-                };
-                headerActions.properties[actionId] = {
-                    $ref: `${common_2.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
-                };
-            }
-        });
-    }
 }
 /**
  * Adds definitions for line items in object page sections to the app schema
@@ -92,7 +68,7 @@ function handleLineItem(facetId, appSchema, facet, facets, oDataServiceAVT) {
     appSchema['definitions'][idForTable].properties['toolBar'].$ref = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetId}>`;
     for (const facetKey in facets) {
         if (facets[facetKey].base === 'LineItem' && facetKey.includes(navigationProperty)) {
-            utils_1.addLineItemsType(appSchema, facets[facetKey]['lineItem'], facets[facetKey]['entityType'], oDataServiceAVT, 'ObjectPageTableColumn', facetId);
+            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, oDataServiceAVT, 'ObjectPageTableColumn', facetId);
         }
     }
 }
@@ -106,6 +82,7 @@ function handleLineItem(facetId, appSchema, facet, facets, oDataServiceAVT) {
  */
 function addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, sectionPrefix) {
     const facet = facets[facetKey];
+    const definitionKey = facetKey.replace('#', '::');
     if (facet.base === 'CollectionFacet') {
         //handle collection facets
         sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey);
@@ -127,12 +104,12 @@ function addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, sect
     else if (facet.base === 'LineItem' && sectionPrefix === v4_1.SectionType.Section) {
         //handle reference facet (if comprising line item)
         sections['properties'][facetKey] = {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPage${sectionPrefix}TableV4<${facetKey}>`
+            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPage${sectionPrefix}TableV4<${definitionKey}>`
         };
-        handleLineItem(facetKey, appSchema, facet, facets, oDataServiceAVT);
+        handleLineItem(definitionKey, appSchema, facet, facets, oDataServiceAVT);
     }
     else if (facet.base === common_2.FacetBase.Form || facet.base === common_2.FacetBase.Identification) {
-        const formDefinitionKey = `ObjectPage${sectionPrefix}Form<${facetKey}>`;
+        const formDefinitionKey = `ObjectPage${sectionPrefix}Form<${definitionKey}>`;
         sections['properties'][facetKey] = {
             $ref: `${common_2.DEFINITION_LINK_PREFIX}${formDefinitionKey}`
         };
@@ -140,13 +117,13 @@ function addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, sect
         common_2.addSectionTitleAndDescription(facet, appSchema['definitions'][formDefinitionKey], facetKey);
         appSchema['definitions'][formDefinitionKey]['annotationPath'] = facet.annotationPath;
         appSchema['definitions'][formDefinitionKey]['isViewNode'] = true;
-        const withActions = facet.base === common_2.FacetBase.Identification ? false : true;
-        common_2.handleForm(sectionPrefix, facet, appSchema['definitions'][formDefinitionKey], appSchema, false, withActions);
+        const withActions = facet.base === common_2.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
+        common_2.handleForm(sectionPrefix, facet, appSchema['definitions'][formDefinitionKey], appSchema, common_1.FioriElementsVersion.v4, withActions);
     }
     else if (facet.base === common_2.FacetBase.DataPoint ||
         facet.base === common_2.FacetBase.Address ||
         facet.base === common_2.FacetBase.Contact) {
-        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${facetKey}>`;
+        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${definitionKey}>`;
         sections['properties'][facetKey] = {
             $ref: `${common_2.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
         };
@@ -161,15 +138,15 @@ function addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, sect
 }
 /**
  * Derives the sections from the UI.Facets annotation and adds them to the schema
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - application specific JSON schema
- * @param {string} entityTypeName - current entity type
+ * @param {EntityType} entityType - current entity type
+ * @param {string} entitySetName - name of the current entity set
  * @param pages {SapUiAppPageV4[]} - 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, logger) {
+function addSections(generateParameters, appSchema, entityType, entitySetName, pages) {
     // Get facet annotations
-    const facets = common_2.getObjectPageFacets(entityType, oDataServiceAVT, common_1.FioriElementsVersion.v4, logger);
+    const facets = common_2.getObjectPageFacets(entityType, generateParameters.serviceAVT, common_1.FioriElementsVersion.v4, generateParameters.logger);
     if (!facets) {
         delete appSchema['definitions']['ObjectPageSubSections'];
         return;
@@ -180,7 +157,7 @@ function addSections(appSchema, entityType, entitySetName, pages, oDataServiceAV
         if (((_b = (_a = pages[element].options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.entitySet) === entitySetName &&
             pages[element].name === v4_1.FE_TEMPLATE_V4_OBJECT_PAGE) {
             for (const facetKey in facets) {
-                addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, v4_1.SectionType.Section);
+                addSection(facets, facetKey, sections, appSchema, generateParameters.serviceAVT, v4_1.SectionType.Section);
             }
         }
     });
@@ -191,15 +168,15 @@ function addSections(appSchema, entityType, entitySetName, pages, oDataServiceAV
 }
 /**
  * Derives the header sections from the UI.HeaderFacets annotation and adds them to the schema
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - application specific JSON schema
- * @param {string} entityTypeName - current entity type
+ * @param {EntityType} entityType - current entity type
+ * @param {string} entitySetName - name of the current entity set
  * @param pages {SapUiAppPageV4[]} - 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 addHeaderSections(appSchema, entityType, entitySetName, pages, oDataServiceAVT, logger) {
+function addHeaderSections(generateParameters, appSchema, entityType, entitySetName, pages) {
     // Get facet annotations
-    const facets = common_2.getObjectPageHeaderFacets(entityType, oDataServiceAVT, common_1.FioriElementsVersion.v4, logger);
+    const facets = common_2.getObjectPageHeaderFacets(entityType, generateParameters.serviceAVT, common_1.FioriElementsVersion.v4, generateParameters.logger);
     const sections = appSchema['definitions']['HeaderSections'];
     sections.properties = {};
     sections.additionalProperties = false;
@@ -211,14 +188,10 @@ function addHeaderSections(appSchema, entityType, entitySetName, pages, oDataSer
         if (((_b = (_a = pages[element].options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.entitySet) === entitySetName &&
             pages[element].name === v4_1.FE_TEMPLATE_V4_OBJECT_PAGE) {
             for (const facetKey in facets) {
-                addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, v4_1.SectionType.HeaderSection);
+                addSection(facets, facetKey, sections, appSchema, generateParameters.serviceAVT, v4_1.SectionType.HeaderSection);
             }
         }
     });
-    // Custom sections as part of sections - still open if can be added the same way
-    /*if (appSchema['definitions']['CustomSections']) {
-        sections.properties = { ...sections.properties, ...appSchema['definitions']['CustomSections'].properties };
-    }*/
     //delete generic definitions
     delete appSchema['definitions']['ObjectPageHeaderSectionForm'];
     delete appSchema['definitions']['ObjectPageHeaderSectionChart'];
@@ -228,20 +201,20 @@ function addHeaderSections(appSchema, entityType, entitySetName, pages, oDataSer
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} schema - app specific schema that potentially gets enhanced
  * @param {EntityType} entityType - current entity type
  * @param {string} entitySetName - entity set of the actual (object) page
  * @param {SapUiAppPageV4[]} pages - list of all pages
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-function addRelatedFacetKeysType(schema, entityType, entitySetName, pages, oDataServiceAVT, logger) {
+function addRelatedFacetKeysType(generateParameters, schema, entityType, entitySetName, pages) {
     Object.keys(pages).forEach((element) => {
         if (pages[element].options &&
             pages[element].options.settings &&
             pages[element].options.settings.entitySet === entitySetName &&
             pages[element].name === v4_1.FE_TEMPLATE_V4_OBJECT_PAGE) {
             // Find sections from annotation
-            const facetSections = common_2.getObjectPageFacetSection(entityType, oDataServiceAVT, logger);
+            const facetSections = common_2.getObjectPageFacetSection(entityType, generateParameters.serviceAVT, generateParameters.logger);
             // Find custom sections ids from manifest
             const page = pages[element];
             if (page.options &&
@@ -268,27 +241,43 @@ function addRelatedFacetKeysType(schema, entityType, entitySetName, pages, oData
         }
     });
 }
+/**
+ * Add Object Page Header 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
+ * @param entitySet - current entity set
+ * @param manifest - manifest.json of the app
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ */
+function addHeader(generateParameters, appSchema, entityType, entitySet, pages) {
+    common_2.addCommonHeaderSchema(appSchema, entityType);
+    // Add header actions
+    common_2.addHeaderActions(appSchema, entityType, generateParameters.serviceAVT, addHeaderActionCallBackV4);
+    // Add header sections
+    appSchema['definitions']['HeaderSections']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
+    addHeaderSections(generateParameters, appSchema, entityType, entitySet.name, pages);
+}
 /**
  * Generates an app specific schema out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.
+ * @param {GenerateAppSchemaParameters} 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 {ConverterOutput} oDataServiceAVT  - complete service information, as returned by annotation vocabularies tool
- * @param manifest - manifest.json of the app
- * @param {ExtensionLogger} logger - Logger class for logging messages
  *
  * @returns the app specific JSON schema
  */
-function generateObjectPageSchemaV4(genericSchema, entityTypeName, oDataServiceAVT, manifest, logger) {
-    var _a, _b, _c, _d;
+function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTypeName) {
+    var _a;
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
     // Change reference to generated sections
     appSchema['properties']['sections'] = {
         $ref: common_2.DEFINITION_LINK_PREFIX + 'Sections'
     };
-    const entitySet = oDataServiceAVT === null || oDataServiceAVT === void 0 ? void 0 : oDataServiceAVT.entitySets.find((es) => es.entityType.name === entityTypeName);
+    const entitySet = (_a = generateParameters.serviceAVT.entitySets) === null || _a === void 0 ? void 0 : _a.find((es) => es.entityType.name === entityTypeName);
     if (!entitySet) {
-        extensionLogger_1.log(logger, {
+        extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYSET4NAME', { entityType: entityTypeName }),
             location: {
@@ -297,8 +286,9 @@ function generateObjectPageSchemaV4(genericSchema, entityTypeName, oDataServiceA
         });
     }
     const entityType = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType;
-    if (!manifest[common_1.ManifestSection.ui5].routing || !manifest[common_1.ManifestSection.ui5].routing.targets) {
-        extensionLogger_1.log(logger, {
+    if (!generateParameters.manifest[common_1.ManifestSection.ui5].routing ||
+        !generateParameters.manifest[common_1.ManifestSection.ui5].routing.targets) {
+        extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOROUTING'),
             location: {
@@ -315,18 +305,27 @@ function generateObjectPageSchemaV4(genericSchema, entityTypeName, oDataServiceA
         description: 'Sections'
     };
     if (entitySet) {
-        // Add header actions
-        addHeaderActions(appSchema, entityType, oDataServiceAVT);
-        // Add annotation path to ObjectPageHeader
-        appSchema['definitions']['ObjectPageHeader']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@com.sap.vocabularies.UI.v1.HeaderInfo`;
-        // Add header sections
-        appSchema['definitions']['HeaderSections']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@com.sap.vocabularies.UI.v1.HeaderFacets`;
-        addHeaderSections(appSchema, entityType, entitySet.name, (_b = (_a = manifest[common_1.ManifestSection.ui5]) === null || _a === void 0 ? void 0 : _a.routing) === null || _b === void 0 ? void 0 : _b.targets, oDataServiceAVT, logger);
+        const pages = generateParameters.manifest[common_1.ManifestSection.ui5].routing.targets;
+        if (!pages) {
+            extensionLogger_1.log(generateParameters.logger, {
+                severity: "error" /* Error */,
+                message: i18next_1.default.t('NOPAGES', { appId: generateParameters.manifest['sap.app']['id'] }),
+                location: {
+                    path: v4_1.MANIFESTPATH,
+                    range: [common_1.ManifestSection.generic]
+                }
+            });
+            return appSchema;
+        }
+        // Add Header
+        addHeader(generateParameters, appSchema, entityType, entitySet, pages);
         // Add sections
-        appSchema['definitions']['Sections']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@com.sap.vocabularies.UI.v1.Facets`;
-        addSections(appSchema, entityType, entitySet.name, (_d = (_c = manifest[common_1.ManifestSection.ui5]) === null || _c === void 0 ? void 0 : _c.routing) === null || _d === void 0 ? void 0 : _d.targets, oDataServiceAVT, logger);
+        appSchema['definitions']['Sections']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
+        addSections(generateParameters, appSchema, entityType, entitySet.name, pages);
         // Custom Section facets
-        addRelatedFacetKeysType(appSchema, entityType, entitySet.name, manifest[common_1.ManifestSection.ui5].routing.targets, oDataServiceAVT, logger);
+        addRelatedFacetKeysType(generateParameters, appSchema, entityType, entitySet.name, pages);
+        // Add Footer (actions only)
+        common_2.addFooterActions(appSchema, entityType, generateParameters.serviceAVT);
     }
     // Delete generic definitions from schema
     delete appSchema['definitions']['GenericSections'];