@sap/ux-specification 1.71.93 → 1.71.95

package/dist/src/sync/common/distTagEvaluator.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DistTagEvaluator = void 0;
+const ux_specification_types_1 = require("@sap/ux-specification-types");
 const extensionLogger_1 = require("../../extensionLogger");
 const i18next_1 = __importDefault(require("i18next"));
 const distTagsJSON = __importStar(require("./dist_tag.json"));
@@ -89,7 +90,10 @@ class DistTagEvaluator {
             const message = i18next_1.default.t('UNKNOWNMINUI5VERSION', { minUI5Version });
             (0, extensionLogger_1.log)(logger, {
                 severity: "info" /* LogSeverity.Info */,
-                message
+                message,
+                location: {
+                    path: ux_specification_types_1.MANIFESTPATH
+                }
             });
             return;
         }
@@ -98,7 +102,10 @@ class DistTagEvaluator {
             const message = i18next_1.default.t('WRONGMINUI5VERSION', { minUI5Version });
             (0, extensionLogger_1.log)(logger, {
                 severity: "warning" /* LogSeverity.Warning */,
-                message
+                message,
+                location: {
+                    path: ux_specification_types_1.MANIFESTPATH
+                }
             });
         }
     }

package/dist/src/sync/common/distTagEvaluator.js.map

@@ -1 +1 @@
-{"version":3,"file":"distTagEvaluator.js","sourceRoot":"","sources":["../../../../src/sync/common/distTagEvaluator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2DAA4C;AAC5C,sDAA8B;AAC9B,8DAAgD;AAChD,wDAAsE;AAEtE,MAAa,gBAAgB;IAGzB;QACI,IAAI,gBAAgB,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9C,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;SACjE;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,mBAAmB;QACtB,gBAAgB,CAAC,cAAc,GAAG,EAAE,CAAC;IACzC,CAAC;IAED;;;OAGG;IACI,cAAc;QACjB,OAAO,sBAAkB,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACI,oBAAoB;QACvB,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;QAEvC,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACxC,IAAI,WAAW,EAAE;YACb,IAAI,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACjC,oCAAoC;gBACpC,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;aAChC;iBAAM;gBACH,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;gBACrE,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;gBACxE,IAAI,GAAG,EAAE;oBACL,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;iBACxB;aACJ;SACJ;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAClF,CAAC;IAED;;;;OAIG;IACI,yBAAyB,CAAC,aAAqB,EAAE,MAAuB;QAC3E,mHAAmH;QACnH,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,MAAM,EAAE;YAC9C,OAAO;SACV;QACD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACjD,MAAM,OAAO,GAAG,iBAAO,CAAC,CAAC,CAAC,sBAAsB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YACrE,IAAA,qBAAG,EAAC,MAAM,EAAE;gBACR,QAAQ,+BAAkB;gBAC1B,OAAO;aACV,CAAC,CAAC;YACH,OAAO;SACV;QACD,MAAM,aAAa,GACf,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC1D,MAAM,OAAO,GAAG,iBAAO,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YACnE,IAAA,qBAAG,EAAC,MAAM,EAAE;gBACR,QAAQ,qCAAqB;gBAC7B,OAAO;aACV,CAAC,CAAC;SACN;IACL,CAAC;;AA7EL,4CA8EC;AA7EU,+BAAc,GAAa,EAAE,CAAC"}
+{"version":3,"file":"distTagEvaluator.js","sourceRoot":"","sources":["../../../../src/sync/common/distTagEvaluator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAAwE;AACxE,2DAA4C;AAC5C,sDAA8B;AAC9B,8DAAgD;AAChD,wDAAsE;AAEtE,MAAa,gBAAgB;IAGzB;QACI,IAAI,gBAAgB,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9C,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;SACjE;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,mBAAmB;QACtB,gBAAgB,CAAC,cAAc,GAAG,EAAE,CAAC;IACzC,CAAC;IAED;;;OAGG;IACI,cAAc;QACjB,OAAO,sBAAkB,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACI,oBAAoB;QACvB,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;QAEvC,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACxC,IAAI,WAAW,EAAE;YACb,IAAI,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACjC,oCAAoC;gBACpC,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;aAChC;iBAAM;gBACH,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;gBACrE,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;gBACxE,IAAI,GAAG,EAAE;oBACL,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;iBACxB;aACJ;SACJ;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAClF,CAAC;IAED;;;;OAIG;IACI,yBAAyB,CAAC,aAAqB,EAAE,MAAuB;QAC3E,mHAAmH;QACnH,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,MAAM,EAAE;YAC9C,OAAO;SACV;QACD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACjD,MAAM,OAAO,GAAG,iBAAO,CAAC,CAAC,CAAC,sBAAsB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YACrE,IAAA,qBAAG,EAAC,MAAM,EAAE;gBACR,QAAQ,+BAAkB;gBAC1B,OAAO;gBACP,QAAQ,EAAE;oBACN,IAAI,EAAE,qCAAY;iBACrB;aACJ,CAAC,CAAC;YACH,OAAO;SACV;QACD,MAAM,aAAa,GACf,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC1D,MAAM,OAAO,GAAG,iBAAO,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YACnE,IAAA,qBAAG,EAAC,MAAM,EAAE;gBACR,QAAQ,qCAAqB;gBAC7B,OAAO;gBACP,QAAQ,EAAE;oBACN,IAAI,EAAE,qCAAY;iBACrB;aACJ,CAAC,CAAC;SACN;IACL,CAAC;;AAnFL,4CAoFC;AAnFU,+BAAc,GAAa,EAAE,CAAC"}

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

@@ -1,6 +1,6 @@
 import type { ConvertedMetadata, EntitySet, EntityType } from '@sap-ux/vocabularies-types';
 import type { FacetConfig, GenerateAppSchemaParameters } from '@sap/ux-specification-types';
-import { FioriElementsVersion, SectionType } from '@sap/ux-specification-types';
+import { FioriElementsVersion, SectionType, v2 } from '@sap/ux-specification-types';
 import type { Definition } from 'typescript-json-schema';
 /**
  * Adds definitions for forms in object page sections to the app schema
@@ -34,17 +34,18 @@ export declare function getActionNameAndId(item: any, oDataServiceAVT: Converted
  * Add Object Page Footer Action Buttons to app-specific schema
  *
  * @param {object} appSchema Schema of the app
- * @param {EntityType} entityType - current entity type
- * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {GenerateAppSchemaParameters} generateParameters - Schema parameters
+ * @param {FioriElementsVersion} version - Fiori elements versions
+ * @param {SapUiAppPagesV2} pages - pages found in manifest
  */
-export declare function addFooterActions(appSchema: Definition, generateParameters: GenerateAppSchemaParameters): void;
+export declare function addFooterActions(appSchema: Definition, generateParameters: GenerateAppSchemaParameters, version?: FioriElementsVersion, pages?: v2.SapUiAppPagesV2): void;
 /**
  * Add Object Page Header Action Buttons to app-specific schema
  * @param {object} appSchema Schema of the app
  * @param {EntityType} entityType - current entity type
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-export declare function addHeaderActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConvertedMetadata, addHeaderActionCallBack: any): void;
+export declare function addHeaderActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConvertedMetadata, addHeaderActionCallBack: any, isV2?: boolean): void;
 /**
  * Adds common Object Page Header definitions to the app schema
  * @param appSchema - app-specific JSOn schema

package/dist/src/sync/common/generate/objectPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../src/sync/common/generate/objectPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI3F,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAE5F,OAAO,EAGH,oBAAoB,EAGpB,WAAW,EAEd,MAAM,6BAA6B,CAAC;AAUrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4WzD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAwDpB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,GAAG,MAAM,CAarG;AAED;;;;GAIG;AAEH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,GAAG,EACT,eAAe,EAAE,iBAAiB,GACnC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CA0B7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,kBAAkB,EAAE,2BAA2B,GAAG,IAAI,CA+D7G;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,iBAAiB,EAClC,uBAAuB,KAAA,GACxB,IAAI,CAoCN;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAUzF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,GAAG,SAAS,GAAG,SAAS,CAMlH"}
+{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../src/sync/common/generate/objectPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI3F,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAGH,oBAAoB,EAIpB,WAAW,EAEX,EAAE,EACL,MAAM,6BAA6B,CAAC;AAUrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA6WzD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAwDpB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,GAAG,MAAM,CAarG;AAED;;;;GAIG;AAEH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,GAAG,EACT,eAAe,EAAE,iBAAiB,GACnC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CA0B7D;AAsBD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,kBAAkB,EAAE,2BAA2B,EAC/C,OAAO,CAAC,EAAE,oBAAoB,EAC9B,KAAK,CAAC,EAAE,EAAE,CAAC,eAAe,GAC3B,IAAI,CAsEN;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,iBAAiB,EAClC,uBAAuB,KAAA,EACvB,IAAI,UAAQ,GACb,IAAI,CAsCN;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAYzF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,GAAG,SAAS,GAAG,SAAS,CAMlH"}

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineEntitySetOfFacet = exports.addCommonHeaderSchema = exports.addHeaderActions = exports.addFooterActions = exports.getActionNameAndId = exports.replaceAlias = exports.handleForm = void 0;
 const StableIdHelper_1 = require("../../v4/utils/StableIdHelper");
 const ux_specification_types_1 = require("@sap/ux-specification-types");
-const ux_specification_types_2 = require("@sap/ux-specification-types");
 const __1 = require("..");
+const utils_1 = require("../../v2/generate/utils");
 /**
  * Copies the field properties from the generic definition to the specific field definition
  * @param {FioriElementsVersion} version - Fiori Elements version
@@ -13,7 +13,7 @@ const __1 = require("..");
  * @param {string} fieldDefinition - the unique ID for the given field definition
  */
 function copyFieldProperties(version, appSchema, field, fieldDefinition) {
-    if (version === ux_specification_types_2.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
+    if (version === ux_specification_types_1.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
         switch (field.$Type) {
             case "com.sap.vocabularies.UI.v1.DataField" /* UIAnnotationTypes.DataField */:
             case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* UIAnnotationTypes.DataFieldForAnnotation */:
@@ -25,7 +25,7 @@ function copyFieldProperties(version, appSchema, field, fieldDefinition) {
             }
         }
     }
-    else if (version === ux_specification_types_2.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
+    else if (version === ux_specification_types_1.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
         switch (field.$Type) {
             case "com.sap.vocabularies.UI.v1.DataField" /* UIAnnotationTypes.DataField */:
             case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* UIAnnotationTypes.DataFieldForAnnotation */:
@@ -46,10 +46,10 @@ function copyFieldProperties(version, appSchema, field, fieldDefinition) {
  * @returns the field definition name in schema
  */
 function determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference) {
-    const fieldReferenceType = version === ux_specification_types_2.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+    const fieldReferenceType = version === ux_specification_types_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId.split('::')[0].replace('DataField', 'Field')
         : undefined;
-    if (version === ux_specification_types_2.FioriElementsVersion.v2) {
+    if (version === ux_specification_types_1.FioriElementsVersion.v2) {
         return `${fieldReferenceType}<${targetID}::${fieldReference}>`;
     }
     else {
@@ -64,24 +64,24 @@ function determineFieldDefinitionName(version, fieldReferenceId, targetID, field
  */
 function addKeysTagForDataField(field, appSchema, schemaKeyOfField) {
     if (typeof field.Value !== 'string' && field.Value.type === 'Path') {
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys] = [
             {
                 name: 'Value',
                 value: field.Value.path
             }
         ];
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.Value.$target
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.target] = field.Value.$target
             ? field.Value.$target.fullyQualifiedName.split('/')[0]
             : field.Value.path;
     }
     else if (typeof field.Value === 'string' && field.Value) {
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys] = [
             {
                 name: 'Value',
                 value: field.Value
             }
         ];
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
     }
 }
 /**
@@ -97,19 +97,19 @@ function addKeysTagToField(field, appSchema, schemaKeyOfField) {
         addKeysTagForDataField(field, appSchema, schemaKeyOfField);
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* UIAnnotationTypes.DataFieldForAnnotation */) {
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys] = [
             {
                 name: 'Target',
                 value: (0, __1.replaceNamespaces)(field.Target.value)
             }
         ];
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] =
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.target] =
             field.Target.$target.fullyQualifiedName.split('@')[0];
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) {
         const separator = field.Action.lastIndexOf('.');
         if (separator === -1) {
-            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys] = [
                 {
                     name: 'Action',
                     value: field.Action
@@ -117,29 +117,29 @@ function addKeysTagToField(field, appSchema, schemaKeyOfField) {
             ];
         }
         else {
-            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys] = [
                 {
                     name: 'Action',
                     value: field.Action.substring(separator + 1, field.Action.length)
                 }
             ];
-            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.Action.substring(0, separator);
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.target] = field.Action.substring(0, separator);
         }
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* UIAnnotationTypes.DataFieldForIntentBasedNavigation */) {
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys] = [
             {
                 name: ux_specification_types_1.SchemaKeyName.semanticObject,
                 value: field.SemanticObject
             }
         ];
         if (field.Action) {
-            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys].push({
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.keys].push({
                 name: 'Action',
                 value: field.Action
             });
         }
-        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
     }
 }
 /**
@@ -155,7 +155,7 @@ function addKeysTagToField(field, appSchema, schemaKeyOfField) {
 function addField(sectionType, appSchema, field, targetID, key, section, version, withActions = true) {
     // Calculate field reference
     const fieldReferenceId = (0, StableIdHelper_1.getStableIdPartFromDataField)(field);
-    const fieldReference = version === ux_specification_types_2.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+    const fieldReference = version === ux_specification_types_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId.split('::').splice(1).join('::')
         : fieldReferenceId;
     // Determine field definition name
@@ -166,17 +166,17 @@ function addField(sectionType, appSchema, field, targetID, key, section, version
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */ ||
         field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* UIAnnotationTypes.DataFieldForIntentBasedNavigation */) {
-        if (withActions && sectionType === ux_specification_types_2.SectionType.Section) {
-            const actionsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
+        if (withActions && sectionType === ux_specification_types_1.SectionType.Section) {
+            const actionsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
             const fieldInSchema = (appSchema.definitions[actionsDefinition].properties[fieldReference] =
                 {
                     $ref: `${__1.DEFINITION_LINK_PREFIX}${schemaKeyOfField}`
                 });
-            fieldInSchema[ux_specification_types_2.SchemaTag.propertyIndex] = parseInt(key);
+            fieldInSchema[ux_specification_types_1.SchemaTag.propertyIndex] = parseInt(key);
         }
     }
     else {
-        const fieldsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
+        const fieldsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
         appSchema.definitions[fieldsDefinition]['properties'][fieldReference] = {
             $ref: `${__1.DEFINITION_LINK_PREFIX}${schemaKeyOfField}`,
             propertyIndex: parseInt(key)
@@ -191,14 +191,14 @@ function addField(sectionType, appSchema, field, targetID, key, section, version
     };
     //Add tags
     addKeysTagToField(field, appSchema, schemaKeyOfField);
-    appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.annotationPath] = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
-    appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.annotationType] = field.$Type;
-    appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.annotationPath] = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
+    appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.annotationType] = field.$Type;
+    appSchema.definitions[schemaKeyOfField][ux_specification_types_1.SchemaTag.isViewNode] = true;
     (0, __1.addDataTypeToDefinition)(appSchema.definitions[schemaKeyOfField], field);
     // Copy the generic definition of field properties to the specific one
     copyFieldProperties(version, appSchema, field, schemaKeyOfField);
     if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */ && appSchema.definitions?.['FormAction']) {
-        appSchema.definitions[schemaKeyOfField].properties = appSchema.definitions[ux_specification_types_2.DefinitionName.FormAction].properties;
+        appSchema.definitions[schemaKeyOfField].properties = appSchema.definitions[ux_specification_types_1.DefinitionName.FormAction].properties;
     }
 }
 /**
@@ -231,12 +231,12 @@ function addFieldsToFormDefinition(section, sectionType, appSchema, targetID, ve
     if (!section.target) {
         return;
     }
-    const formDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Form}<${targetID}>`);
-    const fieldsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
-    const actionsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
+    const formDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Form}<${targetID}>`);
+    const fieldsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
+    const actionsDefinition = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
     // Form definition
     appSchema.properties['form'] = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinition}` };
-    if (sectionType === ux_specification_types_2.SectionType.Section && withActions) {
+    if (sectionType === ux_specification_types_1.SectionType.Section && withActions) {
         appSchema['definitions'][formDefinition] = {
             type: 'object',
             properties: {
@@ -254,7 +254,7 @@ function addFieldsToFormDefinition(section, sectionType, appSchema, targetID, ve
             description: 'Actions',
             additionalProperties: false
         };
-        appSchema['definitions'][actionsDefinition][ux_specification_types_2.SchemaTag.isViewNode] = true;
+        appSchema['definitions'][actionsDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
     }
     else {
         appSchema['definitions'][formDefinition] = {
@@ -266,9 +266,9 @@ function addFieldsToFormDefinition(section, sectionType, appSchema, targetID, ve
             additionalProperties: false
         };
     }
-    appSchema.definitions[formDefinition][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    appSchema.definitions[formDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
     if (section.entityType?.name) {
-        appSchema.definitions[formDefinition][ux_specification_types_2.SchemaTag.annotationPath] = (0, __1.createAnnotationPath)(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
+        appSchema.definitions[formDefinition][ux_specification_types_1.SchemaTag.annotationPath] = (0, __1.createAnnotationPath)(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
     }
     // Fields definition
     appSchema.definitions[fieldsDefinition] = {
@@ -277,9 +277,9 @@ function addFieldsToFormDefinition(section, sectionType, appSchema, targetID, ve
         description: 'Fields',
         additionalProperties: false
     };
-    appSchema.definitions[fieldsDefinition][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    appSchema.definitions[fieldsDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
     // Add fields
-    if (section.base === ux_specification_types_2.FacetBase.Identification) {
+    if (section.base === ux_specification_types_1.FacetBase.Identification) {
         for (const key in section.target) {
             const field = section.target[key];
             if (field) {
@@ -305,18 +305,18 @@ function addTagsToFormDefinition(section, appSchema, formDefinitionKey) {
         const targetValue = section.target['qualifier']
             ? `${section.target['term']}#${section.target['qualifier']}`
             : `${section.target['term']}`;
-        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.keys] = [
+        appSchema.definitions[formDefinitionKey][ux_specification_types_1.SchemaTag.keys] = [
             {
                 name: ux_specification_types_1.SchemaKeyName.target,
                 value: targetValue.replace(/com.sap.vocabularies.UI.v1./g, '')
             }
         ];
-        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.target] =
+        appSchema.definitions[formDefinitionKey][ux_specification_types_1.SchemaTag.target] =
             section.target['fullyQualifiedName']?.split('@')[0];
     }
-    appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    appSchema.definitions[formDefinitionKey][ux_specification_types_1.SchemaTag.isViewNode] = true;
     if (section.entityType?.name) {
-        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.annotationPath] = (0, __1.createAnnotationPath)(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
+        appSchema.definitions[formDefinitionKey][ux_specification_types_1.SchemaTag.annotationPath] = (0, __1.createAnnotationPath)(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
     }
 }
 /**
@@ -334,13 +334,13 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
         return;
     }
     const targetID = determineTargetIdOfForm(section);
-    const formDefinitionKey = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Form}<${targetID}>`);
-    const fieldsDefinitionKey = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
-    const actionsDefinitionKey = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
-    const withActions = section.base === ux_specification_types_2.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
+    const formDefinitionKey = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Form}<${targetID}>`);
+    const fieldsDefinitionKey = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
+    const actionsDefinitionKey = (0, __1.prepareRef)(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
+    const withActions = section.base === ux_specification_types_1.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
     // Form definition
     appSchemaSection.properties.form = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinitionKey}` };
-    if (sectionType === ux_specification_types_2.SectionType.Section && withActions) {
+    if (sectionType === ux_specification_types_1.SectionType.Section && withActions) {
         appSchema.definitions[formDefinitionKey] = {
             type: 'object',
             properties: {
@@ -358,7 +358,7 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
             description: 'Actions',
             additionalProperties: false
         };
-        appSchema.definitions[actionsDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+        appSchema.definitions[actionsDefinitionKey][ux_specification_types_1.SchemaTag.isViewNode] = true;
     }
     else {
         appSchema.definitions[formDefinitionKey] = {
@@ -379,7 +379,7 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
         description: 'Fields',
         additionalProperties: false
     };
-    appSchema.definitions[fieldsDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    appSchema.definitions[fieldsDefinitionKey][ux_specification_types_1.SchemaTag.isViewNode] = true;
     // Add fields
     addFieldsToFormDefinition(section, sectionType, appSchema, targetID, version, withActions);
     return targetID;
@@ -438,44 +438,65 @@ function getActionNameAndId(item, oDataServiceAVT) {
     return { actionName, actionId, namespace };
 }
 exports.getActionNameAndId = getActionNameAndId;
+/**
+ * Checks if requested Entity Set is same as first Object Page
+ * @param {SapUiAppPagesV2} pages - pages found in manifest
+ * @param {GenerateAppSchemaParameters} generateParameters - Schema parameters
+ * @returns {boolean} If found Object Page is first Object Page
+ */
+function isFirstObjectPage(pages, generateParameters) {
+    for (const key in pages) {
+        const element = pages[key];
+        if (element.component?.name === ux_specification_types_1.v2.FE_TEMPLATE_V2_OBJECT_PAGE) {
+            if (generateParameters.entitySet?.name === element.entitySet) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        return isFirstObjectPage(element.pages, generateParameters);
+    }
+}
 /**
  * Add Object Page Footer Action Buttons to app-specific schema
  *
  * @param {object} appSchema Schema of the app
- * @param {EntityType} entityType - current entity type
- * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {GenerateAppSchemaParameters} generateParameters - Schema parameters
+ * @param {FioriElementsVersion} version - Fiori elements versions
+ * @param {SapUiAppPagesV2} pages - pages found in manifest
  */
-function addFooterActions(appSchema, generateParameters) {
-    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooter] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageFooter}<ObjectPageFooterActions>`]));
+function addFooterActions(appSchema, generateParameters, version, pages) {
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooter] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageFooter}<ObjectPageFooterActions>`]));
     // Change reference of footer
     appSchema.properties['footer'] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.ObjectPageFooter}`
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageFooter}`
     };
     // Add action to configuration
-    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooter].properties[ux_specification_types_2.PropertyName.actions] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.FooterActions}`
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooter].properties[ux_specification_types_1.PropertyName.actions] = {
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.FooterActions}`
     };
-    const footerActions = (appSchema.definitions[ux_specification_types_2.DefinitionName.FooterActions] = {
+    const footerActions = (appSchema.definitions[ux_specification_types_1.DefinitionName.FooterActions] = {
         type: 'object',
         properties: {},
         description: 'Actions',
         additionalProperties: false
     });
-    footerActions[ux_specification_types_2.SchemaTag.isViewNode] = true;
-    const alias = (0, __1.findAlias)(ux_specification_types_2.UIVOCABULARY, generateParameters.serviceAVT);
-    const entityType = generateParameters.entitySet.entityType;
-    const actionAnnotation = alias && entityType.annotations?.[alias]?.Identification;
+    footerActions[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    const alias = (0, __1.findAlias)(ux_specification_types_1.UIVOCABULARY, generateParameters.serviceAVT);
+    const entityType = generateParameters.entitySet?.entityType;
+    const actionAnnotation = alias && entityType?.annotations?.[alias]?.Identification;
     if (actionAnnotation) {
         const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
-        footerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${convertedIdentification}`;
+        footerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}`;
         actionAnnotation.forEach((item, index) => {
             if (item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) {
                 const { actionName, actionId } = getActionNameAndId(item, generateParameters.serviceAVT);
                 const description = item.Label || actionName;
-                const actionDefinitionKey = (0, __1.prepareRef)(`${ux_specification_types_2.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
-                if (appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterAction]) {
+                const actionDefinitionKey = (0, __1.prepareRef)(`${ux_specification_types_1.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
+                if (appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterAction]) {
                     appSchema.definitions[actionDefinitionKey] = {
-                        ...JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterAction])),
+                        ...JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterAction])),
                         description,
                         annotationPath: `/${convertedIdentification}/${index}`
                     };
@@ -486,8 +507,8 @@ function addFooterActions(appSchema, generateParameters) {
                         properties: {},
                         description: description
                     };
-                    appSchema.definitions[actionDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
-                    appSchema.definitions[actionDefinitionKey][ux_specification_types_2.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
+                    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: `${__1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
@@ -495,11 +516,16 @@ function addFooterActions(appSchema, generateParameters) {
             }
         });
     }
-    else {
-        footerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`;
+    else if (entityType) {
+        footerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`;
+    }
+    if (version === ux_specification_types_1.FioriElementsVersion.v2 &&
+        isFirstObjectPage(pages, generateParameters) &&
+        !(0, utils_1.isDraftEnabled)(entityType)) {
+        (0, utils_1.addStandardFooterActionsOP)(appSchema, footerActions);
     }
-    delete appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterActions];
-    delete appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageFooter}<${ux_specification_types_2.DefinitionName.ObjectPageFooterActions}>`];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterActions];
+    delete appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageFooter}<${ux_specification_types_1.DefinitionName.ObjectPageFooterActions}>`];
 }
 exports.addFooterActions = addFooterActions;
 /**
@@ -508,33 +534,36 @@ exports.addFooterActions = addFooterActions;
  * @param {EntityType} entityType - current entity type
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-function addHeaderActions(appSchema, entityType, oDataServiceAVT, addHeaderActionCallBack) {
-    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader].properties[ux_specification_types_2.PropertyName.actions] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.HeaderActions}`
+function addHeaderActions(appSchema, entityType, oDataServiceAVT, addHeaderActionCallBack, isV2 = false) {
+    const actionsDefinition = ux_specification_types_1.DefinitionName.HeaderActions;
+    const actions = appSchema.definitions[actionsDefinition];
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader].properties[ux_specification_types_1.PropertyName.actions] = {
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${actionsDefinition}`
     };
-    const headerActions = (appSchema.definitions[ux_specification_types_2.DefinitionName.HeaderActions] = {
+    const headerActions = (appSchema.definitions[actionsDefinition] = {
         type: 'object',
         properties: {},
         description: 'Actions',
         additionalProperties: false
     });
-    headerActions[ux_specification_types_2.SchemaTag.isViewNode] = true;
-    const alias = (0, __1.findAlias)(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
-    const identification = alias &&
-        entityType.annotations &&
-        entityType.annotations[alias] &&
-        entityType.annotations[alias].Identification;
+    headerActions[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    const alias = (0, __1.findAlias)(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
+    const identification = alias && entityType?.annotations?.[alias]?.Identification;
     if (identification) {
-        headerActions[ux_specification_types_2.SchemaTag.annotationPath] =
+        headerActions[ux_specification_types_1.SchemaTag.annotationPath] =
             '/' +
                 identification.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
         identification.forEach(addHeaderActionCallBack(entityType, appSchema, identification, headerActions, oDataServiceAVT));
     }
-    else {
-        headerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`;
+    else if (entityType) {
+        headerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`;
+    }
+    if (isV2) {
+        // handle header actions
+        (0, utils_1.addStandardHeaderActions)(appSchema, true, actions);
     }
-    delete appSchema.definitions[ux_specification_types_2.DefinitionName.GenericActions];
-    delete appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageHeader}<${ux_specification_types_2.DefinitionName.GenericActions}>`];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.GenericActions];
+    delete appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageHeader}<${ux_specification_types_1.DefinitionName.GenericActions}>`];
 }
 exports.addHeaderActions = addHeaderActions;
 /**
@@ -544,10 +573,12 @@ exports.addHeaderActions = addHeaderActions;
  */
 function addCommonHeaderSchema(appSchema, entityType) {
     appSchema.properties['header'] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.ObjectPageHeader}`
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageHeader}`
     };
-    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageHeader}<${ux_specification_types_2.DefinitionName.GenericActions}>`]));
-    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader][ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* UIAnnotationTerms.HeaderInfo */}`;
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageHeader}<${ux_specification_types_1.DefinitionName.GenericActions}>`]));
+    if (entityType) {
+        appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader][ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* UIAnnotationTerms.HeaderInfo */}`;
+    }
 }
 exports.addCommonHeaderSchema = addCommonHeaderSchema;
 /**