@sap/ux-specification 1.96.52 → 1.96.54

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

@@ -11,84 +11,262 @@ const common_1 = require("../../common");
 const utils_1 = require("../utils/utils");
 const utils_2 = require("../utils/utils");
 const StableIdHelper_1 = require("../../v4/utils/StableIdHelper");
-const pageExtenstions_1 = require("./fpm-custom-page/pageExtenstions");
+const pageExtensions_1 = require("./fpm-custom-page/pageExtensions");
+const utils_3 = require("../../v2/generate/utils");
 const ROOT_PROPERTIES_ORDER = ['header', 'layout', 'sections', 'footer'];
+const CRITICAL_ACTION_TYPES = [
+    'UI.CriticalityType/Positive',
+    'UI.CriticalityType/VeryPositive',
+    'UI.CriticalityType/Negative',
+    'UI.CriticalityType/VeryNegative'
+];
 const CUSTOM_ACTION_DEFINITION_DESCRIPTION = 'Custom Action';
 /**
- * Callback for adding a single action to headerActions of V4
- * @param {EntityType} entityType - current entity type
+ * V4 callback - adds a single header action to schema
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {ActionListType} action - item of the Ui.Identification collection and its original index
+ * @param {ActionType} actionType - action classification for grouping
  * @param {Definition} appSchema Schema of the app
- * @param actionAnnotation - annotation as present in AVT ConvertedMetadata
+ * @param {EntityType} entityType - current entity type
  * @param {Definition} headerActions - list of header actions, to be enhanced
- * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, headerActions, oDataServiceAVT) {
-    return (item, index) => {
+function addSingleHeaderActionV4(oDataServiceAVT, action, actionType, appSchema, entityType, headerActions, index) {
+    const { actionName, namespace } = (0, common_1.getActionNameAndId)(action.item, oDataServiceAVT);
+    const stableId = (0, StableIdHelper_1.getStableIdPartFromDataField)(action.item);
+    //stableId is used as key in V4, as the DataFieldForAction:: prefix shall be present in manifest settings
+    const convertedIdentification = action.item['fullyQualifiedName'].replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
+    const actionDefinitionKey = `ObjectPageHeaderAction<${(0, common_1.prepareRef)(stableId)}>`;
+    const headerAction = (appSchema.definitions[actionDefinitionKey] = {
+        type: 'object',
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageHeaderAction}`,
+        description: (0, common_1.getDataFieldDescription)(action.item, entityType)
+    });
+    headerAction[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    headerAction[ux_specification_types_1.SchemaTag.dataType] = (0, common_1.determineDataType)(action.item);
+    headerAction[ux_specification_types_1.SchemaTag.propertyIndex] = index;
+    //keys
+    headerAction[ux_specification_types_1.SchemaTag.keys] = [];
+    if (action.item[ux_specification_types_1.SchemaKeyName.semanticObject]) {
+        headerAction[ux_specification_types_1.SchemaTag.keys].push({
+            name: ux_specification_types_1.SchemaKeyName.semanticObject,
+            value: action.item[ux_specification_types_1.SchemaKeyName.semanticObject]
+        });
+    }
+    headerAction[ux_specification_types_1.SchemaTag.keys].push({ name: ux_specification_types_1.SchemaKeyName.action, value: actionName });
+    if (namespace) {
+        appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.target] = namespace;
+    }
+    headerAction[ux_specification_types_1.SchemaTag.actionType] = actionType;
+    headerAction[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}`;
+    headerActions.properties[stableId] = {
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+    };
+    // add propertyIndexes
+    headerActions.properties[stableId][ux_specification_types_1.SchemaTag.propertyIndex] = index;
+}
+/**
+ * Adds a given standard action to the app schema of the object page
+ * @param {string} actionName  - name of the action
+ * @param {Definition} appSchema - schema of the object page
+ * @param {Definition} headerActions - list of header actions, to be enhanced
+ * @param {number} index - index for propertyIndex
+ *
+ * @returns the new header action definition
+ */
+function addStandardHeaderAction(actionName, appSchema, headerActions, index) {
+    const referenceKey = `${actionName}Action`;
+    const actionDefinitionKey = `ObjectPageHeaderAction<${referenceKey}>`;
+    const headerAction = (appSchema.definitions[actionDefinitionKey] = {
+        type: 'object',
+        description: `${actionName}`,
+        additionalProperties: true
+    });
+    headerAction[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    headerAction[ux_specification_types_1.SchemaTag.propertyIndex] = index;
+    //keys
+    headerAction[ux_specification_types_1.SchemaTag.keys] = [];
+    headerAction[ux_specification_types_1.SchemaTag.keys].push({ name: ux_specification_types_1.SchemaKeyName.action, value: actionName });
+    headerAction[ux_specification_types_1.SchemaTag.actionType] = ux_specification_types_1.ActionType.Standard;
+    headerActions.properties[referenceKey] = {
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+    };
+    // add propertyIndexes
+    headerActions.properties[referenceKey][ux_specification_types_1.SchemaTag.propertyIndex] = index;
+    return headerAction;
+}
+/**
+ * V4 callback - adds a single footer action to schema
+ * @param {ActionListType} action - item of the Ui.Identification collection and its original index
+ * @param {ActionType} actionType - action classification for grouping
+ * @param {EntityType} entityType - current entity type
+ * @param {Definition} appSchema - schema of the object page
+ * @param {Definition} footerActions - list of footer actions, to be enhanced
+ */
+function addSingleFooterAction(action, actionType, entityType, appSchema, footerActions, index) {
+    const actionId = (0, StableIdHelper_1.getStableIdPartFromDataField)(action.item);
+    const description = (0, common_1.getDataFieldDescription)(action.item, entityType);
+    const actionDefinitionKey = (0, common_1.prepareRef)(`${ux_specification_types_1.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
+    const convertedIdentification = action.item['fullyQualifiedName'].replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
+    const footerAction = (appSchema.definitions[actionDefinitionKey] = {
+        type: 'object',
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.FooterActionV4}`,
+        description: description
+    });
+    footerAction[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    footerAction[ux_specification_types_1.SchemaTag.actionType] = actionType;
+    footerAction[ux_specification_types_1.SchemaTag.propertyIndex] = index;
+    footerAction[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}`;
+    footerActions.properties[actionId] = {
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+    };
+}
+/**
+ * Distiguishes critical actions and others and returns two separate groups
+ * @param {any} identification - UI.Identification annotation as present in AVT ConvertedMetadata
+ * @returns two separate groups of items
+ */
+function groupByCriticality(identification) {
+    const criticalActions = [];
+    const unCriticalActions = [];
+    identification.forEach((item, index) => {
         if ((!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) ||
             item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* UIAnnotationTypes.DataFieldForIntentBasedNavigation */) {
-            const { actionName, actionId, namespace } = (0, common_1.getActionNameAndId)(item, oDataServiceAVT);
-            if (!actionId) {
-                return;
-            }
-            const stableId = (0, StableIdHelper_1.getStableIdPartFromDataField)(item);
-            //stableId is used as key in V4, as the DataFieldForAction:: prefix shall be present in manifest settings
-            const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
-            const actionDefinitionKey = `ObjectPageHeaderAction<${(0, common_1.prepareRef)(stableId)}>`;
-            const headerAction = (appSchema.definitions[actionDefinitionKey] = {
-                type: 'object',
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageHeaderAction}`,
-                description: (0, common_1.getDataFieldDescription)(item, entityType)
-            });
-            headerAction[ux_specification_types_1.SchemaTag.isViewNode] = true;
-            headerAction[ux_specification_types_1.SchemaTag.dataType] = (0, common_1.determineDataType)(item);
-            //keys
-            headerAction[ux_specification_types_1.SchemaTag.keys] = [];
-            if (item[ux_specification_types_1.SchemaKeyName.semanticObject]) {
-                headerAction[ux_specification_types_1.SchemaTag.keys].push({
-                    name: ux_specification_types_1.SchemaKeyName.semanticObject,
-                    value: item[ux_specification_types_1.SchemaKeyName.semanticObject]
-                });
+            if (CRITICAL_ACTION_TYPES.includes(item['Criticality'])) {
+                criticalActions.push({ index, item });
             }
-            headerAction[ux_specification_types_1.SchemaTag.keys].push({ name: ux_specification_types_1.SchemaKeyName.action, value: actionName });
-            if (namespace) {
-                appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.target] = namespace;
+            else {
+                unCriticalActions.push({ index, item });
             }
-            headerAction[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
-            headerActions.properties[stableId] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
-            };
         }
-    };
+    });
+    return { criticalActions, unCriticalActions };
+}
+/**
+ * Adds the critical header actions to schema
+ * @param {ActionListType[]} criticalActions - list of critical actions
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {Definition} appSchema - schema of the object page
+ * @param {EntityType} entityType - current entity type
+ * @param {Definition} headerActions - list of all header actions
+ */
+function addCriticalActions(criticalActions, oDataServiceAVT, appSchema, entityType, headerActions) {
+    for (let index = 0; index < criticalActions.length; index++) {
+        addSingleHeaderActionV4(oDataServiceAVT, criticalActions[index], ux_specification_types_1.ActionType.Criticality, appSchema, entityType, headerActions, index);
+    }
+}
+/**
+ * Checks if one of the uncritical actions is marked by isCopyAction.
+ * If so, adds this first to the schema and deletes it from the list.
+ * @param {ActionListType[]} unCriticalActions - list of uncritical actions
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {Definition} appSchema - schema of the object page
+ * @param {EntityType} entityType - current entity type
+ * @param {Definition} headerActions - list of all header actions
+ * @param {number} nextIndex - index for propertyIndex
+ */
+function addCopyAction(unCriticalActions, oDataServiceAVT, appSchema, entityType, headerActions, nextIndex) {
+    const copyActionIndex = unCriticalActions.findIndex((action) => {
+        return action.item['annotations']?.UI?.IsCopyAction !== undefined;
+    });
+    if (copyActionIndex > -1) {
+        addSingleHeaderActionV4(oDataServiceAVT, unCriticalActions[copyActionIndex], ux_specification_types_1.ActionType.Copy, appSchema, entityType, headerActions, nextIndex);
+        nextIndex++;
+        unCriticalActions.splice(copyActionIndex, 1);
+    }
+}
+/**
+ * Adds the critical header actions to schema
+ * @param {ActionListType[]} unCriticalActions - list of uncritical actions
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {Definition} appSchema - schema of the object page
+ * @param {EntityType} entityType - current entity type
+ * @param {Definition} headerActions - list of all header actions
+ * @param {number} nextIndex - index for propertyIndex
+ */
+function addUncriticalActions(unCriticalActions, oDataServiceAVT, appSchema, entityType, headerActions, nextIndex) {
+    for (const action of unCriticalActions) {
+        addSingleHeaderActionV4(oDataServiceAVT, action, ux_specification_types_1.ActionType.Annotation, appSchema, entityType, headerActions, nextIndex);
+        nextIndex++;
+    }
+}
+/**
+ * Fills the annotationPath of the given schema definition, by checking first the EntitySet annotation, then the EntityType annotation.
+ * @param {Definition} schemaDefinition - current definition in the schema
+ * @param {EntitySet} entitySet - current entity set
+ * @param {EntityType} entityType - current entity type
+ * @param {string} annotationName - name of the annotation term to be checked
+ */
+function setAnnotationPathFromEntitySetOrEntityType(schemaDefinition, entitySet, entityType, annotationName) {
+    if (entitySet?.annotations?.UI?.[annotationName] || !entityType?.annotations?.UI?.[annotationName]) {
+        schemaDefinition[ux_specification_types_1.SchemaTag.annotationPath] = `/${entitySet.fullyQualifiedName}/${ux_specification_types_1.UIVOCABULARYALPHADOT}${annotationName}`;
+    }
+    else {
+        schemaDefinition[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/${ux_specification_types_1.UIVOCABULARYALPHADOT}${annotationName}`;
+    }
+}
+/**
+ * Callback for adding a single action to headerActions of V4
+ * @param {EntityType} entityType - current entity type
+ * @param {Definition} appSchema - schema of the object page
+ * @param {any} identification - UI.Identification annotation as present in AVT ConvertedMetadata
+ * @param {Definition} headerActions - list of header actions, to be enhanced
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {EntitySet} entitySet - current entity set
+ */
+function addHeaderActionCallBackV4(entityType, appSchema, identification, headerActions, oDataServiceAVT, entitySet) {
+    //Build groups of action types
+    const { criticalActions = [], unCriticalActions = [] } = identification ? groupByCriticality(identification) : {};
+    addCriticalActions(criticalActions, oDataServiceAVT, appSchema, entityType, headerActions);
+    const isDeletable = (0, utils_3.isEntityDeletable)(entitySet);
+    const isUpdatable = (0, utils_3.isEntityUpdatable)(entitySet);
+    // Add standard header actions
+    // If ReadOnly, and all capabilities restrictions are set to true or When nothing exists i.e. no capabilities annotation and no draft root, show only Delete button
+    // If DraftRoot + DraftNode and dynamic value for restriction - show Edit and Delete, if bool == false then hide the button
+    if ((0, utils_3.isDraftEnabled)(entitySet) && isUpdatable) {
+        const editAction = addStandardHeaderAction('Edit', appSchema, headerActions, criticalActions.length);
+        setAnnotationPathFromEntitySetOrEntityType(editAction, entitySet, entityType, 'UpdateHidden');
+    }
+    if (isDeletable) {
+        const deleteAction = addStandardHeaderAction('Delete', appSchema, headerActions, criticalActions.length + 1);
+        setAnnotationPathFromEntitySetOrEntityType(deleteAction, entitySet, entityType, 'DeleteHidden');
+    }
+    const nextIndex = criticalActions.length + 2;
+    //Check if isCopyAction is defined, this gets rendered first after delete
+    addCopyAction(unCriticalActions, oDataServiceAVT, appSchema, entityType, headerActions, nextIndex);
+    addUncriticalActions(unCriticalActions, oDataServiceAVT, appSchema, entityType, headerActions, nextIndex);
 }
 /**
  * Callback for adding a single action to footerActions of V4
  * @param {EntityType} entityType - current entity type
- * @param {Definition} appSchema Schema of the app
+ * @param {Definition} appSchema - schema of the object page
  * @param {Definition} footerActions - list of footer actions, to be enhanced
- * @param {String} convertedIdentification - converted UI.Identification term
+ * @param {any} identification - UI.Identification annotation as present in AVT ConvertedMetadata
  */
-function addFooterActionCallBackV4(entityType, appSchema, footerActions, convertedIdentification) {
-    return (item, index) => {
+function addFooterActionCallBackV4(entityType, appSchema, footerActions, identification) {
+    const criticalActions = [];
+    const unCriticalActions = [];
+    identification.forEach((item, index) => {
         if (item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) {
-            const actionId = (0, StableIdHelper_1.getStableIdPartFromDataField)(item);
-            const description = (0, common_1.getDataFieldDescription)(item, entityType);
-            const actionDefinitionKey = (0, common_1.prepareRef)(`${ux_specification_types_1.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
-            appSchema.definitions[actionDefinitionKey] = {
-                type: 'object',
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.FooterActionV4}`,
-                description: description
-            };
-            appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.isViewNode] = true;
-            appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
-            footerActions.properties[actionId] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
-            };
+            if (item['Criticality']) {
+                criticalActions.push({ index, item });
+            }
+            else {
+                unCriticalActions.push({ index, item });
+            }
         }
-    };
+    });
+    for (let index = 0; index < criticalActions.length; index++) {
+        const action = criticalActions[index];
+        addSingleFooterAction(action, ux_specification_types_1.ActionType.Criticality, entityType, appSchema, footerActions, index);
+    }
+    for (let index = 0; index < unCriticalActions.length; index++) {
+        const action = unCriticalActions[index];
+        addSingleFooterAction(action, ux_specification_types_1.ActionType.Annotation, entityType, appSchema, footerActions, criticalActions.length + index);
+    }
 }
 /**
  * Object Page specific enhancements to addCustomColumnDefinition
- * @param {object} appSchema App schema in general
+ * @param {object} appSchema - app schema of the object page
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  * @param {string} lineItemId - identifier of the current table in schema
  * @param {string} facetIdInManifest - identifier of the current object page section in manifest
@@ -116,7 +294,7 @@ function addCustomColumnsOP(appSchema, v4Page, lineItemId, facetIdInManifest, lo
 }
 /**
  * Object Page specific enhancements to addCustomColumnDefinition
- * @param {object} appSchema App schema in general
+ * @param {object} appSchema - app schema of the object page
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  * @param {string} lineItemId - identifier of the current table in schema
  * @param {string} facetIdInManifest - identifier of the current object page section in manifest
@@ -148,9 +326,9 @@ function addTableCustomActionsOP(appSchema, v4Page, lineItemId, facetIdInManifes
 }
 /**
  * Object Page specific custom action enhancements to header and footer
- * @param {object} appSchema App schema in general
- * @param {SapUiAppPageV4} v4Page Current page in manifest
- * @param {DefinitionName} customActionDefinitionKey custom action key used in definitions
+ * @param {object} appSchema - app schema of the object page
+ * @param {SapUiAppPageV4} v4Page  - current page in manifest
+ * @param {DefinitionName} customActionDefinitionKey - custom action key used in definitions
  * @param {ExtensionLogger} logger - logger for exceptions
  */
 function addHeaderFooterCustomActionsOP(appSchema, v4Page, customActionDefinitionKey, logger) {
@@ -176,8 +354,8 @@ function addHeaderFooterCustomActionsOP(appSchema, v4Page, customActionDefinitio
 }
 /**
  * Object Page specific enhancements to handleFormIdentification
- * @param {object} appSchema App schema in general
- * @param {SapUiAppPageV4} v4Page Current page in manifest
+ * @param {object} appSchema - app schema of the object page
+ * @param {SapUiAppPageV4} v4Page - current page in manifest
  * @param {string} formItemId - identifier of the current form in schema
  * @param {string} facetIdInManifest - identifier of the current object page section in manifest
  * @param {ExtensionLogger} logger - logger for exceptions
@@ -205,7 +383,7 @@ function addFormCustomActionsOP(appSchema, v4Page, formItemId, facetIdInManifest
  * Adds definitions for line items in object page sections to the app schema
  * @param {FacetConfig} facet - the given facet from the UI annotations
  * @param {string} facetKey - key of the facet, as used in annotation
- * @param {Definition} appSchema - app schema in general
+ * @param {Definition} appSchema - app schema of the object page
  * @param {object} lineItemFacet - current lineItem facet
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @param {SapUiAppPageV4} v4Page Current page in manifest
@@ -243,9 +421,9 @@ function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceA
 }
 /**
  * Adds definitions for table section in object page sections to the app schema
- * @param {FacetConfig} facet - current facet.
- * @param {string} facetKey - facet key.
- * @param {Definition} appSchema - app specific schema that potentially gets enhanced.
+ * @param {FacetConfig} facet - current facet
+ * @param {string} facetKey - facet key
+ * @param {Definition} appSchema - app specific schema of the object page that gets enhanced
  * @param {object} lineItemFacet - current lineItem facet
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {SapUiAppPageV4} v4Page Current page in manifest
@@ -272,7 +450,7 @@ function handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateP
  * @param {v4.SapUiAppPageV4} v4Page Current page in manifest
  * @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} appSchema - app specific schema of the object page that gets enhanced
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
  * @param {ExtensionLogger} logger - logger for exceptions
  */
@@ -304,10 +482,10 @@ function handleFormIdentification(facet, v4Page, facetKey, sections, appSchema,
 }
 /**
  * Adds definitions for header sections (DataPoint, Chart) in object page sections to the app schema
- * @param {FacetConfig} facet - current facet.
- * @param {string} facetKey - facet key.
- * @param {object} sections - schema of current sections definition.
- * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {FacetConfig} facet - current facet
+ * @param {string} facetKey - facet key
+ * @param {object} sections - schema of current sections definition
+ * @param {object} appSchema - app specific schema of the object page that gets enhanced
  * @param {SectionType} facetDefinitionKey - key to identify new definition
  */
 function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey) {
@@ -325,7 +503,7 @@ function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinition
  * Adds definitions for Chart items in object page sections to the app schema
  * @param {FacetConfig | Chart | object} facet - current facet.
  * @param {string} facetKey - facet key.
- * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {object} appSchema - app specific schema of the object page that gets enhanced.
  * @param {EntityType} entityType - current entity type
  */
 function handleChartActions(facet, facetKey, appSchema, entityType) {
@@ -357,7 +535,7 @@ function handleChartActions(facet, facetKey, appSchema, entityType) {
  * Adds definitions for Chart items in object page sections to the app schema
  * @param {FacetConfig | Chart | object} facet - current facet.
  * @param {string} facetKey - facet key.
- * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {object} appSchema - app specific schema of the object page that gets enhanced.
  * @param {EntityType} entityType - current entity type
  */
 function handleChart(facet, facetKey, appSchema, entityType) {
@@ -378,7 +556,7 @@ function handleChart(facet, facetKey, appSchema, entityType) {
  * Adds definitions for Chart section in object page sections to the app schema
  * @param {FacetConfig} facet - current facet.
  * @param {string} facetKey - facet key.
- * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {object} appSchema - app specific schema of the object page that gets enhanced.
  * @param {object} sections - schema of current sections definition.
  * @param {EntityType} entityType - current entity type
  */
@@ -399,7 +577,7 @@ function handleSectionChart(facet, facetKey, appSchema, sections, entityType = f
  * Adds definitions for presentation variants in object page sections to the app schema
  * @param {FacetConfig} facet - the given facet from the UI annotations
  * @param {string} facetKey - key of the facet, as used in annotation
- * @param {Definition} appSchema - app schema in general
+ * @param {Definition} appSchema - app schema of the object page
  * @param {object} sections - schema of current sections definition.
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {SapUiAppPageV4} v4Page Current page in manifest
@@ -409,10 +587,7 @@ function handleSectionPresentationVariant(facet, facetKey, appSchema, sections,
     if (!facet?.target) {
         (0, extensionLogger_1.log)(generateParameters.logger, {
             severity: "error" /* LogSeverity.Error */,
-            message: i18next_1.default.t('NOPRESENTATIONVARIANT', { key: facetKey }),
-            location: {
-                path: ux_specification_types_1.METADATAPATH
-            }
+            message: i18next_1.default.t('NOPRESENTATIONVARIANT', { key: facetKey })
         });
         return;
     }
@@ -466,8 +641,8 @@ function handleSectionPresentationVariant(facet, facetKey, appSchema, sections,
 }
 /**
  * Method checks if passed facet contains any collection facet.
- * @param {FacetConfig} facet - facet to check.
- * @returns {boolean} Passed facet contains at least one collection facet.
+ * @param {FacetConfig} facet - facet to check
+ * @returns {boolean} Passed facet contains at least one collection facet
  */
 function containsCollectionFacet(facet) {
     const childFacets = facet.facets || {};
@@ -481,10 +656,10 @@ function containsCollectionFacet(facet) {
 }
 /**
  * Object Page specific enhancements to addCustomColumnDefinition
- * @param {object} appSchema - app schema in general
+ * @param {object} appSchema - app schema of the object page
  * @param {string} id - identifier of the current section facet
  * @param {string[]} featureToggles - supported features
- * @returns {string} Custom sub section reference id.
+ * @returns {string} Custom sub section reference id
  */
 function createCustomSubSectionReference(appSchema, id, featureToggles) {
     const referenceId = `${ux_specification_types_1.DefinitionName.ObjectPageCustomSubSectionFragment}<${id}>`;
@@ -516,7 +691,7 @@ function createCustomSubSectionReference(appSchema, id, featureToggles) {
 /**
  * Common method updates schema for custom header sections or custom subsections.
  * @param {Definition} sections - sections definition
- * @param {Definition} appSchema - app schema in general
+ * @param {Definition} appSchema - app schema of the object page
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  * @param {FacetConfig} facet - the given facet from the UI annotations
@@ -568,7 +743,7 @@ function applyCustomSections(sections, appSchema, generateParameters, v4Page, fa
  * Adds definitions for collections in object page sections to the app schema
  * @param {FacetConfig} facet - the given facet from the UI annotations
  * @param {string} facetKey - key of the facet, as used in annotation
- * @param {Definition} appSchema - app schema in general
+ * @param {Definition} appSchema - app schema of the object page
  * @param {Definition} sections - schema of current sections definition.
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
@@ -608,10 +783,10 @@ function handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, g
 /**
  * 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 {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 of the object page that gets enhanced.
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  * @param {number} [level=0] Section level in tree
@@ -666,7 +841,7 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, s
 /**
  * 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 {object} appSchema - application specific JSON schema of the object page
  * @param {SapUiAppPageV4} v4Page - current page
  */
 function addSections(generateParameters, appSchema, v4Page) {
@@ -691,7 +866,7 @@ function addSections(generateParameters, appSchema, v4Page) {
 /**
  * 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 {object} appSchema - application specific JSON schema of the object page
  * @param {EntityType} entityType - current entity type
  * @param {SapUiAppPageV4} v4Page - current page in manifest
  */
@@ -720,7 +895,7 @@ function addHeaderSections(generateParameters, appSchema, entityType, v4Page) {
 /**
  * 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 {object} schema - app specific schema of the object page that gets enhanced
  * @param {SapUiAppPageV4[]} pages - list of all pages
  * @param {string} contextPath - contextPath of the actual (object) page
  */
@@ -761,14 +936,14 @@ function addRelatedFacetKeysType(generateParameters, schema, pages, contextPath)
 /**
  * Add Object Page Header to app-specific schema
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
- * @param {Definition} appSchema Schema of the app
+ * @param {Definition} appSchema Schema of the object page
  * @param {SapUiAppPageV4} v4Page - current page in manifest
  */
 function addHeader(generateParameters, appSchema, v4Page) {
     const entityType = generateParameters.entityType;
     (0, common_1.addCommonHeaderSchema)(appSchema, entityType);
     // Add header actions
-    (0, common_1.addHeaderActions)(appSchema, entityType, generateParameters.serviceAVT, addHeaderActionCallBackV4);
+    (0, common_1.addHeaderActions)(appSchema, entityType, generateParameters.entitySet, generateParameters.serviceAVT, addHeaderActionCallBackV4);
     // Add custom header actions
     addHeaderFooterCustomActionsOP(appSchema, v4Page, ux_specification_types_1.DefinitionName.CustomHeaderActionOP, generateParameters.logger);
     // Add header sections
@@ -781,8 +956,8 @@ function addHeader(generateParameters, appSchema, v4Page) {
  * 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 contextPath - contextPath of the given page
+ * @param {object} genericSchema  - generic JSON schema of an object page
+ * @param {string} contextPath - contextPath of the given page
  * @param {object} genericMacrosSchema - generic JSON schema of custom page
  *
  * @returns the app specific JSON schema
@@ -845,7 +1020,15 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, contextPa
             appSchema['definitions'][ux_specification_types_1.DefinitionName.ObjectPageCustomSectionFragment]['properties']['controls'] = {
                 type: 'object'
             };
-            (0, pageExtenstions_1.resolveFragments)(appSchema, genericMacrosSchema, generateParameters, v4Page.id);
+            try {
+                (0, pageExtensions_1.resolveFragments)(appSchema, genericMacrosSchema, generateParameters, v4Page.id);
+            }
+            catch (error) {
+                (0, extensionLogger_1.log)(generateParameters.logger, {
+                    severity: "error" /* LogSeverity.Error */,
+                    message: error
+                });
+            }
         }
         // Add Footer (actions only)
         (0, common_1.addFooterActions)(appSchema, generateParameters, ux_specification_types_1.FioriElementsVersion.v4, addFooterActionCallBackV4);