@sap/ux-specification 1.96.26 → 1.96.28

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

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

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

@@ -5,13 +5,14 @@ import type { Definition } from 'typescript-json-schema';
 /**
  * Adds definitions for forms in object page sections to the app schema
  * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
- * @param {FacetConfig} section - facet or section in the FE core model
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
  * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
  * @param {object} appSchema - app specific schema that gets enhanced
  * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {string} facetKey - facet key
  * @returns {string | undefined} target id of form
  */
-export declare function handleForm(sectionType: SectionType, section: FacetConfig, appSchemaSection: Definition, appSchema: Definition, version: FioriElementsVersion, withActions?: boolean): string | undefined;
+export declare function handleForm(sectionType: SectionType, section: FacetConfig, appSchemaSection: Definition, appSchema: Definition, version: FioriElementsVersion, facetKey: string): string | undefined;
 /**
  * Replaces an alias in an annotation ID or reference, based on the AVT references' list
  * @param annotationIdentifier - annotation ID or reference
@@ -25,23 +26,26 @@ export declare function replaceAlias(annotationIdentifier: string, oDataServiceA
  * @param entityType - entity type by AVT
  * @returns an object comprising action name and action id
  */
-export declare function getActionNameAndId(action: string, entityType: EntityType): {
+export declare function getActionNameAndId(item: any, entityType: EntityType, oDataServiceAVT: ConvertedMetadata): {
     actionName: string;
     actionId: string;
+    namespace: string;
 };
 /**
  * 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 {function} addFooterActionCallBack - Callback function, either V2 or V4
  */
-export declare function addFooterActions(appSchema: Definition, generateParameters: GenerateAppSchemaParameters): void;
+export declare function addFooterActions(appSchema: Definition, generateParameters: GenerateAppSchemaParameters, version: FioriElementsVersion, addFooterActionCallBack: any): 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
+ * @param {function} addHeaderActionCallBack - Callback function, either V2 or V4
  */
 export declare function addHeaderActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConvertedMetadata, addHeaderActionCallBack: any): void;
 /**

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;AAC5F,OAAO,EAGH,oBAAoB,EAGpB,WAAW,EAEd,MAAM,6BAA6B,CAAC;AASrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA8JzD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,oBAAoB,EAC7B,WAAW,UAAO,GACnB,MAAM,GAAG,SAAS,CA0EpB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,GAAG,MAAM,CAarG;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAenH;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;AAE5F,OAAO,EAGH,oBAAoB,EAGpB,WAAW,EAEd,MAAM,6BAA6B,CAAC;AASrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAmTzD;;;;;;;;;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;;;;;GAKG;AAEH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,iBAAiB,GACnC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CA0B7D;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,kBAAkB,EAAE,2BAA2B,EAC/C,OAAO,EAAE,oBAAoB,EAC7B,uBAAuB,KAAA,GACxB,IAAI,CAuCN;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,iBAAiB,EAClC,uBAAuB,KAAA,GACxB,IAAI,CAkCN;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"}

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

@@ -3,6 +3,7 @@ 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("..");
 /**
  * Copies the field properties from the generic definition to the specific field definition
@@ -12,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_1.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
+    if (version === ux_specification_types_2.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
         switch (field.$Type) {
             case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
             case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
@@ -24,7 +25,7 @@ function copyFieldProperties(version, appSchema, field, fieldDefinition) {
             }
         }
     }
-    else if (version === ux_specification_types_1.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
+    else if (version === ux_specification_types_2.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
         switch (field.$Type) {
             case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
             case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
@@ -45,16 +46,102 @@ 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_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+    const fieldReferenceType = version === ux_specification_types_2.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId.split('::')[0].replace('DataField', 'Field')
         : undefined;
-    if (version === ux_specification_types_1.FioriElementsVersion.v2) {
+    if (version === ux_specification_types_2.FioriElementsVersion.v2) {
         return `${fieldReferenceType}<${targetID}::${fieldReference}>`;
     }
     else {
         return `${targetID}::${fieldReference}`;
     }
 }
+/**
+ * Add th keys and targt tag for Datafield*
+ * @param field - the given field definition
+ * @param appSchema - the app schema to be updated
+ * @param schemaKeyOfField - key for the given field in the app schema
+ */
+function addKeysTagForDataField(field, appSchema, schemaKeyOfField) {
+    if (typeof field.Value !== 'string' && field.Value.type === 'Path') {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'Value',
+                value: field.Value.path
+            }
+        ];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.Value.$target
+            ? field.Value.$target.fullyQualifiedName.split('/')[0]
+            : field.Value.targetString.split('/')[0];
+    }
+    else if (typeof field.Value === 'string' && field.Value) {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'Value',
+                value: field.Value
+            }
+        ];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
+    }
+}
+/**
+ * Adds the "keys" tag to a field definition in schema
+ * @param field - the given field definition
+ * @param appSchema - the app schema to be updated
+ * @param schemaKeyOfField - key for the given field in the app schema
+ */
+function addKeysTagToField(field, appSchema, schemaKeyOfField) {
+    if (field.$Type === "com.sap.vocabularies.UI.v1.DataField" /* DataField */ ||
+        field.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */ ||
+        field.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */) {
+        addKeysTagForDataField(field, appSchema, schemaKeyOfField);
+    }
+    else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */) {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'Target',
+                value: field.Target.value
+            }
+        ];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] =
+            field.Target.$target.fullyQualifiedName.split('@')[0];
+    }
+    else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) {
+        const separator = field.Action.lastIndexOf('.');
+        if (separator === -1) {
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+                {
+                    name: 'Action',
+                    value: field.Action
+                }
+            ];
+        }
+        else {
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.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);
+        }
+    }
+    else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'SemanticObject',
+                value: field.SemanticObject
+            }
+        ];
+        if (field.Action) {
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys].push({
+                name: 'Action',
+                value: field.Action
+            });
+        }
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
+    }
+}
 /**
  * Adds a field definition to the app specific schema
  * @param {string} sectionType - prefix to distinguish Section and HeaderSection
@@ -68,49 +155,51 @@ function determineFieldDefinitionName(version, fieldReferenceId, targetID, field
 function addField(sectionType, appSchema, field, targetID, key, section, version, withActions = true) {
     // Calculate field reference
     const fieldReferenceId = StableIdHelper_1.getStableIdPartFromDataField(field);
-    const fieldReference = version === ux_specification_types_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+    const fieldReference = version === ux_specification_types_2.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId.split('::').splice(1).join('::')
         : fieldReferenceId;
     // Determine field definition name
-    const fieldDefinition = determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference);
+    const schemaKeyOfField = determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference);
     // Evaluate field type, set field reference of properties of fields' or actions' definition
     if (!field || !field.$Type) {
         return;
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ ||
         field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
-        if (withActions && sectionType === ux_specification_types_1.SectionType.Section) {
-            const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
+        if (withActions && sectionType === ux_specification_types_2.SectionType.Section) {
+            const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
             const fieldInSchema = (appSchema.definitions[actionsDefinition].properties[fieldReference] =
                 {
-                    $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldDefinition}`
+                    $ref: `${__1.DEFINITION_LINK_PREFIX}${schemaKeyOfField}`
                 });
-            fieldInSchema[ux_specification_types_1.SchemaTag.propertyIndex] = parseInt(key);
+            fieldInSchema[ux_specification_types_2.SchemaTag.propertyIndex] = parseInt(key);
         }
     }
     else {
-        const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
+        const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
         appSchema.definitions[fieldsDefinition]['properties'][fieldReference] = {
-            $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldDefinition}`,
+            $ref: `${__1.DEFINITION_LINK_PREFIX}${schemaKeyOfField}`,
             propertyIndex: parseInt(key)
         };
     }
     // Now set up the field definition
-    appSchema.definitions[fieldDefinition] = {
+    appSchema.definitions[schemaKeyOfField] = {
         type: 'object',
         properties: {},
         description: __1.getDataFieldDescription(field, section.entityType),
         additionalProperties: false
     };
     //Add tags
-    appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.annotationPath] = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
-    appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.annotationType] = field.$Type;
-    appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
-    __1.addDataTypeToDefinition(appSchema.definitions[fieldDefinition], field);
+    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;
+    __1.addDataTypeToDefinition(appSchema.definitions[schemaKeyOfField], field);
     // Copy the generic definition of field properties to the specific one
-    copyFieldProperties(version, appSchema, field, fieldDefinition);
+    copyFieldProperties(version, appSchema, field, schemaKeyOfField);
     if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ && appSchema.definitions?.['FormAction']) {
-        appSchema.definitions[fieldDefinition].properties = appSchema.definitions[ux_specification_types_1.DefinitionName.FormAction].properties;
+        appSchema.definitions[schemaKeyOfField].$ref = `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.FormAction}`;
+        delete appSchema.definitions[schemaKeyOfField].properties;
     }
 }
 /**
@@ -131,82 +220,118 @@ function determineTargetIdOfForm(section) {
     }
     return targetID;
 }
+/**
+ * Adds the specific definitions of the form fields to a schema
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
+ * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
+ * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {string } targetID - target id of form
+ * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {boolean} withActions - indicates that actions shall be considered
+ */
+function addFieldsToFormDefinition(section, sectionType, appSchema, targetID, version, withActions) {
+    if (section.base === ux_specification_types_2.FacetBase.Identification) {
+        for (const key in section.target) {
+            const field = section.target[key];
+            if (field) {
+                addField(sectionType, appSchema, field, targetID, key, section, version, withActions);
+            }
+        }
+    }
+    else {
+        for (const key in section.target['Data']) {
+            const field = section.target['Data'][key];
+            addField(sectionType, appSchema, field, targetID, key, section, version);
+        }
+    }
+}
+/**
+ * Adds the schema tags for a form definition
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
+ * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {string} formDefinitionKey - key of the form definition in schema
+ */
+function addTagsToFormDefinition(section, appSchema, formDefinitionKey) {
+    if (section.target) {
+        const targetValue = section.target['qualifier']
+            ? `${section.target['term']}#${section.target['qualifier']}`
+            : `${section.target['term']}`;
+        appSchema.definitions[formDefinitionKey][ux_specification_types_2.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] = section.target['fullyQualifiedName'].split('@')[0];
+    }
+    appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    if (section.entityType?.name) {
+        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.annotationPath] = __1.createAnnotationPath(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
+    }
+}
 /**
  * Adds definitions for forms in object page sections to the app schema
  * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
- * @param {FacetConfig} section - facet or section in the FE core model
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
  * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
  * @param {object} appSchema - app specific schema that gets enhanced
  * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {string} facetKey - facet key
  * @returns {string | undefined} target id of form
  */
-function handleForm(sectionType, section, appSchemaSection, appSchema, version, withActions = true) {
+function handleForm(sectionType, section, appSchemaSection, appSchema, version, facetKey) {
     if (!section.target) {
         return;
     }
     const targetID = determineTargetIdOfForm(section);
-    const formDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Form}<${targetID}>`);
-    const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
-    const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
+    const formDefinitionKey = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Form}<${targetID}>`);
+    const fieldsDefinitionKey = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
+    const actionsDefinitionKey = __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;
     // Form definition
-    appSchemaSection.properties['form'] = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinition}` };
-    if (sectionType === ux_specification_types_1.SectionType.Section && withActions) {
-        appSchema['definitions'][formDefinition] = {
+    appSchemaSection.properties.form = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinitionKey}` };
+    if (sectionType === ux_specification_types_2.SectionType.Section && withActions) {
+        appSchema.definitions[formDefinitionKey] = {
             type: 'object',
             properties: {
                 actions: {
-                    $ref: `${__1.DEFINITION_LINK_PREFIX}${actionsDefinition}`
+                    $ref: `${__1.DEFINITION_LINK_PREFIX}${actionsDefinitionKey}`
                 },
-                fields: { $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldsDefinition}` }
+                fields: { $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldsDefinitionKey}` }
             },
             description: 'Form',
             additionalProperties: false
         };
-        appSchema['definitions'][actionsDefinition] = {
+        appSchema.definitions[actionsDefinitionKey] = {
             type: 'object',
             properties: {},
             description: 'Actions',
             additionalProperties: false
         };
-        appSchema['definitions'][actionsDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
+        appSchema.definitions[actionsDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
     }
     else {
-        appSchema['definitions'][formDefinition] = {
+        appSchema.definitions[formDefinitionKey] = {
             type: 'object',
             properties: {
-                fields: { $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldsDefinition}` }
+                fields: { $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldsDefinitionKey}` }
             },
             description: 'Form',
             additionalProperties: false
         };
     }
-    appSchema.definitions[formDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
-    if (section.entityType?.name) {
-        appSchema.definitions[formDefinition][ux_specification_types_1.SchemaTag.annotationPath] = __1.createAnnotationPath(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
-    }
+    //Add schema tags
+    addTagsToFormDefinition(section, appSchema, formDefinitionKey);
     // Fields definition
-    appSchema.definitions[fieldsDefinition] = {
+    appSchema.definitions[fieldsDefinitionKey] = {
         type: 'object',
         properties: {},
         description: 'Fields',
         additionalProperties: false
     };
-    appSchema.definitions[fieldsDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
+    appSchema.definitions[fieldsDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
     // Add fields
-    if (section.base === ux_specification_types_1.FacetBase.Identification) {
-        for (const key in section.target) {
-            const field = section.target[key];
-            if (field) {
-                addField(sectionType, appSchema, field, targetID, key, section, version, withActions);
-            }
-        }
-    }
-    else {
-        for (const key in section.target['Data']) {
-            const field = section.target['Data'][key];
-            addField(sectionType, appSchema, field, targetID, key, section, version);
-        }
-    }
+    addFieldsToFormDefinition(section, sectionType, appSchema, targetID, version, withActions);
     return targetID;
 }
 exports.handleForm = handleForm;
@@ -237,86 +362,71 @@ exports.replaceAlias = replaceAlias;
  * @param entityType - entity type by AVT
  * @returns an object comprising action name and action id
  */
-function getActionNameAndId(action, entityType) {
-    let separatorIndex = action.lastIndexOf('/');
+function getActionNameAndId(item, entityType, oDataServiceAVT) {
+    const action = replaceAlias(item.Action, oDataServiceAVT);
+    let relevantAction = action;
+    let separatorIndex = action.indexOf('(');
+    if (separatorIndex > 0) {
+        relevantAction = action.substring(0, separatorIndex);
+    }
+    separatorIndex = relevantAction.lastIndexOf('/');
     if (separatorIndex === -1) {
-        separatorIndex = action.lastIndexOf('.');
+        separatorIndex = relevantAction.lastIndexOf('.');
     }
-    let actionName, actionId;
+    let actionName, actionId, namespace;
     if (separatorIndex > -1) {
-        actionName = action.substring(separatorIndex + 1);
-        actionId = `${action.substring(0, separatorIndex)}::${actionName}`;
+        actionName = relevantAction.substring(separatorIndex + 1);
+        namespace = relevantAction.substring(0, separatorIndex);
+        actionId = `${relevantAction.substring(0, separatorIndex)}::${actionName}`;
     }
     else {
-        actionName = action;
-        const namespace = entityType.fullyQualifiedName.split(entityType.name)[0];
-        actionId = `${namespace.substring(0, namespace.length - 1)}::${actionName}`;
+        actionName = relevantAction;
+        namespace = item.fullyQualifiedName.split('@')[0];
+        if (actionName && actionName !== '') {
+            actionId = `${namespace.substring(0, namespace.length - 1)}::${actionName}`;
+        }
     }
-    return { actionName, actionId };
+    return { actionName, actionId, namespace };
 }
 exports.getActionNameAndId = getActionNameAndId;
 /**
  * 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 {function} addFooterActionCallBack - Callback function, either V2 or V4
  */
-function addFooterActions(appSchema, generateParameters) {
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooter] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageFooter}<ObjectPageFooterActions>`]));
+function addFooterActions(appSchema, generateParameters, version, addFooterActionCallBack) {
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooter] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageFooter}<ObjectPageFooterActions>`]));
     // Change reference of footer
     appSchema.properties['footer'] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageFooter}`
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.ObjectPageFooter}`
     };
     // Add action to configuration
-    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}`
+    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}`
     };
-    const footerActions = (appSchema.definitions[ux_specification_types_1.DefinitionName.FooterActions] = {
+    const footerActions = (appSchema.definitions[ux_specification_types_2.DefinitionName.FooterActions] = {
         type: 'object',
         properties: {},
         description: 'Actions',
         additionalProperties: false
     });
-    footerActions[ux_specification_types_1.SchemaTag.isViewNode] = true;
-    const alias = __1.findAlias(ux_specification_types_1.UIVOCABULARY, generateParameters.serviceAVT);
+    footerActions[ux_specification_types_2.SchemaTag.isViewNode] = true;
+    const alias = __1.findAlias(ux_specification_types_2.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" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
-        footerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}`;
-        actionAnnotation.forEach((item, index) => {
-            if (item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) {
-                const { actionName, actionId } = getActionNameAndId(item.Action, entityType);
-                const description = item.Label || actionName;
-                const actionDefinitionKey = __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_1.DefinitionName.ObjectPageFooterAction])),
-                        description,
-                        annotationPath: `/${convertedIdentification}/${index}`
-                    };
-                }
-                else {
-                    appSchema.definitions[actionDefinitionKey] = {
-                        type: 'object',
-                        properties: {},
-                        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: `${__1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
-                };
-            }
-        });
+        footerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${convertedIdentification}`;
+        actionAnnotation.forEach(addFooterActionCallBack(entityType, appSchema, footerActions, convertedIdentification));
     }
     else {
-        footerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
+        footerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
     }
-    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterActions];
-    delete appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageFooter}<${ux_specification_types_1.DefinitionName.ObjectPageFooterActions}>`];
+    delete appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterActions];
+    delete appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageFooter}<${ux_specification_types_2.DefinitionName.ObjectPageFooterActions}>`];
 }
 exports.addFooterActions = addFooterActions;
 /**
@@ -324,34 +434,33 @@ exports.addFooterActions = addFooterActions;
  * @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 {function} addHeaderActionCallBack - Callback function, either V2 or V4
  */
 function addHeaderActions(appSchema, entityType, oDataServiceAVT, addHeaderActionCallBack) {
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader].properties[ux_specification_types_1.PropertyName.actions] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.HeaderActions}`
+    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}`
     };
-    const headerActions = (appSchema.definitions[ux_specification_types_1.DefinitionName.HeaderActions] = {
+    const headerActions = (appSchema.definitions[ux_specification_types_2.DefinitionName.HeaderActions] = {
         type: 'object',
         properties: {},
         description: 'Actions',
         additionalProperties: false
     });
-    headerActions[ux_specification_types_1.SchemaTag.isViewNode] = true;
-    const alias = __1.findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
+    headerActions[ux_specification_types_2.SchemaTag.isViewNode] = true;
+    const alias = __1.findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
     const identification = alias &&
         entityType.annotations &&
         entityType.annotations[alias] &&
         entityType.annotations[alias].Identification;
     if (identification) {
-        headerActions[ux_specification_types_1.SchemaTag.annotationPath] =
+        headerActions[ux_specification_types_2.SchemaTag.annotationPath] =
             '/' +
                 identification.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
         identification.forEach(addHeaderActionCallBack(entityType, appSchema, identification, headerActions, oDataServiceAVT));
     }
     else {
-        headerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
+        headerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
     }
-    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;
 /**
@@ -361,10 +470,10 @@ exports.addHeaderActions = addHeaderActions;
  */
 function addCommonHeaderSchema(appSchema, entityType) {
     appSchema.properties['header'] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageHeader}`
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.ObjectPageHeader}`
     };
-    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}>`]));
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader][ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* HeaderInfo */}`;
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageHeader}`]));
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader][ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* HeaderInfo */}`;
 }
 exports.addCommonHeaderSchema = addCommonHeaderSchema;
 /**