@sap/ux-specification 1.90.18 → 1.90.21

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

@@ -9,10 +9,11 @@ import { ExtensionLogger } from '../../../apiTypes';
  * @param annotations - list of all annotation files (file content plus URI as identifier)
  * @param manifest - manifest.json of the app
  * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @param {FileData[]} fragments - list of fragment files and their content
  *
  * @returns the app specific JSON schema
  */
-export declare function generateObjectPageInterfaceV4(genericSchema: object, entitySet: string, annotations: FileData[], manifest: object, logger?: ExtensionLogger): object;
+export declare function generateObjectPageInterfaceV4(genericSchema: object, entitySet: string, annotations: FileData[], manifest: object, logger?: ExtensionLogger, fragments?: FileData[]): object;
 /**
  * Generates the app specific schema of a list report out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.
@@ -21,7 +22,8 @@ export declare function generateObjectPageInterfaceV4(genericSchema: object, ent
  * @param entitySetName - the base entity set of the given page
  * @param annotations - list of all annotation files (file content plus URI as identifier)
  * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @param manifest - manifest.json of the app
  *
  * @returns the app specific JSON schema
  */
-export declare function generateListReportInterfaceV4(genericSchema: object, entitySetName: string, annotations: FileData[], logger?: ExtensionLogger): object;
+export declare function generateListReportInterfaceV4(genericSchema: object, entitySetName: string, annotations: FileData[], logger?: ExtensionLogger, manifest?: object): object;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../common/utils");
 const _1 = require(".");
 const __1 = require("../../..");
+const v4_1 = require("../../../v4");
 /**
  * Generates the app specific schema of an object page out of the generic schema for the same page.
  * Generic types are replaced by information from the app specific annotations.
@@ -12,15 +13,16 @@ const __1 = require("../../..");
  * @param annotations - list of all annotation files (file content plus URI as identifier)
  * @param manifest - manifest.json of the app
  * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @param {FileData[]} fragments - list of fragment files and their content
  *
  * @returns the app specific JSON schema
  */
-function generateObjectPageInterfaceV4(genericSchema, entitySet, annotations, manifest, logger) {
+function generateObjectPageInterfaceV4(genericSchema, entitySet, annotations, manifest, logger, fragments) {
     const serviceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
     const generateParameters = {
         fioriElementsVersion: __1.FioriElementsVersion.v4,
         manifest,
-        fragments: [],
+        fragments,
         serviceAVT,
         logger
     };
@@ -35,13 +37,20 @@ exports.generateObjectPageInterfaceV4 = generateObjectPageInterfaceV4;
  * @param entitySetName - the base entity set of the given page
  * @param annotations - list of all annotation files (file content plus URI as identifier)
  * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @param manifest - manifest.json of the app
  *
  * @returns the app specific JSON schema
  */
-function generateListReportInterfaceV4(genericSchema, entitySetName, annotations, logger) {
-    const oDataServiceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
-    const entitySet = oDataServiceAVT.entitySets.find((es) => es.name === entitySetName);
-    return _1.generateListReportSchemaV4(genericSchema, entitySet.entityType.name, oDataServiceAVT, logger);
+function generateListReportInterfaceV4(genericSchema, entitySetName, annotations, logger, manifest) {
+    const serviceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const entitySet = serviceAVT.entitySets.find((es) => es.name === entitySetName);
+    const generateParameters = {
+        fioriElementsVersion: __1.FioriElementsVersion.v4,
+        manifest,
+        serviceAVT,
+        logger
+    };
+    return _1.generateListReportSchemaV4(generateParameters, genericSchema, entitySet, v4_1.FE_TEMPLATE_V4_LIST_REPORT);
 }
 exports.generateListReportInterfaceV4 = generateListReportInterfaceV4;
 //# sourceMappingURL=generate.js.map

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

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

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

@@ -1,14 +1,15 @@
+import { GenerateAppSchemaParameters } from '../../../apiTypes';
+import { EntitySet } from '@sap-ux/annotation-converter';
 import { ConverterOutput, EntityType } from '@sap-ux/vocabularies-types';
-import { ExtensionLogger } from '../../../apiTypes';
 export declare function addEnumForVariantPaths(entityType: EntityType, appSchema: object, oDataServiceAVT: ConverterOutput): void;
 /**
  * Generates an app specific schema for the FE V4 Listreport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ * @param genericSchema  - generic JSON schema of an object page
+ * @param {EntitySet} entitySet - entity set (AVT object) that is relevant for the given page
+ * @param {string} templateName - allows to distinguish list report from ALP
  *
- * @param {object} genericSchema - generic JSON schema of a list report
- * @param {string} entityTypeName - the base entity type of the given page
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by Annotation Vocabularies Tool
- * @param {ExtensionLogger} logger - Logger class for logging messages
  * @returns {object} application-specific schema of the list report
  */
-export declare function generateListReportSchemaV4(genericSchema: object, entityTypeName: string, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger): object;
+export declare function generateListReportSchemaV4(generateParameters: GenerateAppSchemaParameters, genericSchema: object, entitySet: EntitySet, templateName: string): object;

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

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../utils/utils");
+const __1 = require("../../..");
+const v4_1 = require("../../../v4");
 const i18next_1 = __importDefault(require("i18next"));
 const extensionLogger_1 = require("../../../extensionLogger");
-const utils_1 = require("../utils/utils");
 const common_1 = require("../../common");
 /**
  * Adds the selection fields to the app schema, as properties of the Filterbar
@@ -23,7 +25,6 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
     }
     let i = 0;
     selectionFieldsAnnotation.forEach((selectionField) => {
-        var _a;
         let description = selectionField.value;
         const fieldDefinition = 'SelectionField::' + common_1.prepareRef(selectionField.value);
         if (selectionField.type === 'PropertyPath') {
@@ -33,16 +34,8 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
             $ref: common_1.DEFINITION_LINK_PREFIX + fieldDefinition,
             propertyIndex: i
         };
-        appSchema['definitions'][fieldDefinition] = {
-            type: 'object',
-            properties: {},
-            description,
-            annotationPath: `${selectionFieldsDefinition.annotationPath}/${i}`,
-            isViewNode: true,
-            additionalProperties: false,
-            annotationType: selectionField === null || selectionField === void 0 ? void 0 : selectionField.type,
-            dataType: (_a = selectionField === null || selectionField === void 0 ? void 0 : selectionField.$target) === null || _a === void 0 ? void 0 : _a.type.replace('Edm.', '')
-        };
+        const dataType = common_1.determineDataType(selectionField);
+        appSchema['definitions'][fieldDefinition] = Object.assign({ type: 'object', properties: {}, description, annotationPath: `${selectionFieldsDefinition.annotationPath}/${i}`, isViewNode: true, additionalProperties: false, annotationType: selectionField === null || selectionField === void 0 ? void 0 : selectionField.type }, (dataType && { dataType }));
         i++;
     });
 }
@@ -55,40 +48,63 @@ exports.addEnumForVariantPaths = addEnumForVariantPaths;
 /**
  * Generates an app specific schema for the FE V4 Listreport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ * @param genericSchema  - generic JSON schema of an object page
+ * @param {EntitySet} entitySet - entity set (AVT object) that is relevant for the given page
+ * @param {string} templateName - allows to distinguish list report from ALP
  *
- * @param {object} genericSchema - generic JSON schema of a list report
- * @param {string} entityTypeName - the base entity type of the given page
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by Annotation Vocabularies Tool
- * @param {ExtensionLogger} logger - Logger class for logging messages
  * @returns {object} application-specific schema of the list report
  */
-function generateListReportSchemaV4(genericSchema, entityTypeName, oDataServiceAVT, logger) {
+function generateListReportSchemaV4(generateParameters, genericSchema, entitySet, templateName) {
     var _a, _b, _c, _d;
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
-    const entityType = oDataServiceAVT === null || oDataServiceAVT === void 0 ? void 0 : oDataServiceAVT.entityTypes.find((et) => et.name === entityTypeName);
+    const entityType = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType;
     if (!entityType) {
-        extensionLogger_1.log(logger, {
+        extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
-            message: i18next_1.default.t('NOENTITYTYPE', { entityType: entityTypeName }),
+            message: i18next_1.default.t('NOENTITYTYPE'),
             location: {
                 path: common_1.METADATAPATH
             }
         });
+        return appSchema;
     }
-    else {
-        const alias = common_1.findAlias(common_1.UIVOCABULARY, oDataServiceAVT);
-        const lineItemAnnotation = (_b = (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _a === void 0 ? void 0 : _a[alias]) === null || _b === void 0 ? void 0 : _b.LineItem;
-        appSchema['definitions']['Table'].properties.toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}ToolBar<LineItems>`;
-        utils_1.addLineItemsType(appSchema, lineItemAnnotation, entityType, oDataServiceAVT, 'TableColumn');
-        addEnumForVariantPaths(entityType, appSchema, oDataServiceAVT);
-        const selectionFieldAnnotation = (_d = (_c = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _c === void 0 ? void 0 : _c[alias]) === null || _d === void 0 ? void 0 : _d.SelectionFields;
-        addSelectionFields(entityType, appSchema, selectionFieldAnnotation);
-        //Switch from generic column to specific definition
-        appSchema['definitions']['Table'].properties['columns'].$ref = common_1.DEFINITION_LINK_PREFIX + 'LineItems';
-        delete appSchema['definitions']['GenericColumns'];
-        delete appSchema['definitions']['ToolBar'];
-        delete appSchema['definitions']['Actions'];
-        delete appSchema['definitions']['Action'];
+    if (!(generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT)) {
+        return appSchema;
+    }
+    const alias = common_1.findAlias(common_1.UIVOCABULARY, generateParameters.serviceAVT);
+    const lineItemAnnotation = (_b = (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _a === void 0 ? void 0 : _a[alias]) === null || _b === void 0 ? void 0 : _b.LineItem;
+    appSchema['definitions']['Table'].properties.toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}ToolBar<LineItems>`;
+    utils_1.addLineItemsType(appSchema, lineItemAnnotation, entityType, generateParameters.serviceAVT);
+    addEnumForVariantPaths(entityType, appSchema, generateParameters.serviceAVT);
+    const selectionFieldAnnotation = (_d = (_c = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _c === void 0 ? void 0 : _c[alias]) === null || _d === void 0 ? void 0 : _d.SelectionFields;
+    addSelectionFields(entityType, appSchema, selectionFieldAnnotation);
+    // Switch from generic column to specific definition
+    appSchema['definitions']['Table'].properties['columns'] = {
+        $ref: common_1.DEFINITION_LINK_PREFIX + 'LineItems'
+    };
+    delete appSchema['definitions']['GenericColumns'];
+    delete appSchema['definitions']['ToolBar'];
+    delete appSchema['definitions']['Actions'];
+    delete appSchema['definitions']['Action'];
+    if (generateParameters.manifest) {
+        //Find page in targets
+        const pages = generateParameters.manifest[__1.ManifestSection.ui5].routing.targets;
+        if (!pages) {
+            extensionLogger_1.log(generateParameters.logger, {
+                severity: "error" /* Error */,
+                message: i18next_1.default.t('NOPAGES', { appId: generateParameters.manifest['sap.app']['id'] }),
+                location: {
+                    path: v4_1.MANIFESTPATH,
+                    range: [__1.ManifestSection.generic]
+                }
+            });
+            return appSchema;
+        }
+        const v4Page = utils_1.findPageV4(pages, templateName, entitySet, generateParameters.logger);
+        if (!v4Page) {
+            return appSchema;
+        }
     }
     return appSchema;
 }

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

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

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

@@ -39,69 +39,46 @@ function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, head
         }
     };
 }
-/**
- * Adds definitions for collection facet items in object page sections to the app schema
- * @param {FacetConfigs} 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 {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
- */
-function handleCollection(facet, facetKey, sections, appSchema, oDataServiceAVT, sectionPrefix) {
-    sections['properties'][facetKey].properties = {
-        subsections: {
-            additionalProperties: false,
-            type: 'object',
-            properties: {},
-            annotationPath: facet.annotationPath,
-            isViewNode: true,
-            description: 'Subsections'
-        }
-    };
-    const subSections = sections['properties'][facetKey].properties.subsections;
-    for (const key in facet['facets']) {
-        addSection(facet['facets'], key, subSections, appSchema, oDataServiceAVT, sectionPrefix);
-    }
-}
 /**
  * Adds definitions for line items in object page sections to the app schema
  * @param facet - the given facet from the UI annotations
- * @param facetId - key of the facet, as listed in FacetConfigs
+ * @param facetIdInSchema - key of the facet, as used in schema
+ * @param facetIdInManifest - key of the facet, as used in annotation
  * @param facets - list of all facets
  * @param appSchema - app schema in general
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {SapUiAppPageV4} v4Page Current page in manifest
+ * @param {ExtensionLogger} logger - logger for exceptions
  */
-function handleLineItem(facet, facetId, facets, appSchema, oDataServiceAVT) {
+function handleLineItem(facet, facetIdInManifest, facetIdInSchema, facets, appSchema, oDataServiceAVT, v4Page, logger) {
     let navigationProperty = '', annotation = '';
-    [navigationProperty, annotation] = facetId.split('::');
-    const schemaIdForOpSection = 'ObjectPageSectionTableV4<' + facetId + '>';
+    [navigationProperty, annotation] = facetIdInSchema.split('::');
+    const schemaIdForOpSection = `ObjectPageSectionTableV4<${facetIdInSchema}>`;
     appSchema['definitions'][schemaIdForOpSection] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageSectionTableV4']));
-    const schemaIdForTable = `ObjectPageTable<${facetId}>`;
+    const schemaIdForTable = `ObjectPageTable<${facetIdInSchema}>`;
     appSchema['definitions'][schemaIdForOpSection].properties.table.$ref = `${common_2.DEFINITION_LINK_PREFIX}${schemaIdForTable}`;
-    appSchema['definitions'][schemaIdForTable] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageTable']));
+    appSchema['definitions'][schemaIdForTable] = JSON.parse(JSON.stringify(appSchema['definitions'][v4_1.DefinitionName.ObjectPageTable]));
     appSchema['definitions'][schemaIdForOpSection].annotationPath = facet.annotationPath;
-    common_2.addSectionTitleAndDescription(facet, appSchema['definitions'][schemaIdForOpSection], facetId);
-    appSchema['definitions'][schemaIdForOpSection].properties.table.$ref =
-        common_2.DEFINITION_LINK_PREFIX + 'ObjectPageTable<' + facetId + '>';
-    const idForTable = 'ObjectPageTable<' + facetId + '>';
-    appSchema['definitions'][idForTable] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageTable']));
+    common_2.addSectionTitleAndDescription(facet, appSchema['definitions'][schemaIdForOpSection], facetIdInSchema);
+    appSchema['definitions'][schemaIdForOpSection].properties.table.$ref = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageTable<${facetIdInSchema}>`;
+    const idForTable = `ObjectPageTable<${facetIdInSchema}>`;
+    appSchema['definitions'][idForTable] = JSON.parse(JSON.stringify(appSchema['definitions'][v4_1.DefinitionName.ObjectPageTable]));
     if (facet.entityType && annotation) {
         appSchema['definitions'][idForTable].annotationPath = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
     }
     appSchema['definitions'][idForTable].properties['columns'] = {
-        $ref: common_2.DEFINITION_LINK_PREFIX + facetId
+        $ref: common_2.DEFINITION_LINK_PREFIX + facetIdInSchema
     };
-    appSchema['definitions'][idForTable].properties['toolBar'].$ref = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetId}>`;
+    appSchema['definitions'][idForTable].properties['toolBar'].$ref = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetIdInSchema}>`;
     //adjust quickVariantSelection
-    appSchema['definitions'][idForTable].properties['quickVariantSelection'].$ref = `${common_2.DEFINITION_LINK_PREFIX}QuickVariantSelectionV4OP<${facetId}>`;
-    appSchema['definitions'][`QuickVariantSelectionV4OP<${facetId}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['QuickVariantSelectionV4OP']));
-    appSchema['definitions'][`AnnotationPathAsObject<${facetId}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['AnnotationPathAsObject']));
-    appSchema['definitions'][`QuickVariantSelectionV4OP<${facetId}>`].properties.paths.items.$ref = `${common_2.DEFINITION_LINK_PREFIX}AnnotationPathAsObject<${facetId}>`;
-    common_2.addEnumForSingleTabVariant(facet.entityType, appSchema, `AnnotationPathAsObject<${facetId}>`);
+    appSchema['definitions'][idForTable].properties['quickVariantSelection'].$ref = `${common_2.DEFINITION_LINK_PREFIX}QuickVariantSelectionV4OP<${facetIdInSchema}>`;
+    appSchema['definitions'][`QuickVariantSelectionV4OP<${facetIdInSchema}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['QuickVariantSelectionV4OP']));
+    appSchema['definitions'][`AnnotationPathAsObject<${facetIdInSchema}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['AnnotationPathAsObject']));
+    appSchema['definitions'][`QuickVariantSelectionV4OP<${facetIdInSchema}>`].properties.paths.items.$ref = `${common_2.DEFINITION_LINK_PREFIX}AnnotationPathAsObject<${facetIdInSchema}>`;
+    common_2.addEnumForSingleTabVariant(facet.entityType, appSchema, `AnnotationPathAsObject<${facetIdInSchema}>`);
     for (const facetKey in facets) {
-        if (facets[facetKey].base === 'LineItem' && facetKey.includes(navigationProperty)) {
-            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, oDataServiceAVT, 'ObjectPageTableColumn', facetId);
+        if (facets[facetKey].base === common_2.FacetBase.LineItem && facetKey.includes(navigationProperty)) {
+            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, oDataServiceAVT, v4_1.DefinitionName.ObjectPageTableColumn, facetIdInSchema);
         }
     }
 }
@@ -129,7 +106,26 @@ function handleFormIdentification(facet, facetKey, sections, appSchema, sectionP
     common_2.handleForm(sectionPrefix, facet, appSchema['definitions'][formDefinitionKey], appSchema, common_1.FioriElementsVersion.v4, withActions);
 }
 /**
- * Adds definitions for DataPoint, Address and Contact items in object page sections to the app schema
+ * Adds definitions for DataPoint items in object page sections to the app schema
+ * @param {FacetConfigs} 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 {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
+ * @param {SectionType} facetDefinitionKey - key to identify new definition
+ */
+function handleChartAndDataPoint(facet, facetKey, sections, appSchema, facetDefinitionKey) {
+    sections['properties'][facetKey] = {
+        $ref: `${common_2.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
+    };
+    appSchema['definitions'][facetDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions'][`CommonHeaderFacetSettings`]));
+    common_2.addTargetTitleAndSectionDescription(facet, appSchema['definitions'][facetDefinitionKey], facetKey);
+    appSchema['definitions'][facetDefinitionKey]['annotationPath'] = facet.annotationPath;
+    appSchema['definitions'][facetDefinitionKey]['dataType'] = common_2.determineDataTypeOfTarget(facet === null || facet === void 0 ? void 0 : facet.target);
+    appSchema['definitions'][facetDefinitionKey]['isViewNode'] = true;
+}
+/**
+ * Adds definitions for Address and Contact items in object page sections to the app schema
  * @param {FacetConfigs} facet - current facet.
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
@@ -137,7 +133,7 @@ function handleFormIdentification(facet, facetKey, sections, appSchema, sectionP
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
  * @param {SectionType} facetDefinitionKey - key to identify new definition
  */
-function handleDataPointAddressContact(facet, facetKey, sections, appSchema, sectionPrefix, facetDefinitionKey) {
+function handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix, facetDefinitionKey) {
     sections['properties'][facetKey] = {
         $ref: `${common_2.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
     };
@@ -148,38 +144,56 @@ function handleDataPointAddressContact(facet, facetKey, sections, appSchema, sec
 }
 /**
  * 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 {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
+ * @param {SapUiAppPageV4} v4Page Current page in manifest
  */
-function addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, sectionPrefix) {
+function addSection(generateParameters, facets, facetKey, sections, appSchema, sectionPrefix, v4Page) {
     const facet = facets[facetKey];
-    const definitionKey = facetKey.replace('#', '::');
+    const facetKeyInSchema = facetKey.replace('#', '::');
     if (facet.base === 'CollectionFacet') {
         //handle collection facets
         sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey);
-        handleCollection(facet, facetKey, sections, appSchema, oDataServiceAVT, sectionPrefix);
+        sections['properties'][facetKey].properties = {
+            subsections: {
+                additionalProperties: false,
+                type: 'object',
+                properties: {},
+                annotationPath: facet.annotationPath,
+                isViewNode: true,
+                description: 'Subsections'
+            }
+        };
+        const subSections = sections['properties'][facetKey].properties.subsections;
+        for (const key in facet['facets']) {
+            addSection(generateParameters, facet['facets'], key, subSections, appSchema, sectionPrefix, v4Page);
+        }
     }
     else if (facet.base === 'LineItem' && sectionPrefix === v4_1.SectionType.Section) {
-        const tableDefinitionKey = `ObjectPage${sectionPrefix}TableV4<${definitionKey}>`;
+        const tableDefinitionKey = `ObjectPage${sectionPrefix}TableV4<${facetKeyInSchema}>`;
         //handle reference facet (if comprising line item)
         sections['properties'][facetKey] = {
             $ref: `${common_2.DEFINITION_LINK_PREFIX}${tableDefinitionKey}`
         };
-        handleLineItem(facet, definitionKey, facets, appSchema, oDataServiceAVT);
+        handleLineItem(facet, facetKey, facetKeyInSchema, facets, appSchema, generateParameters.serviceAVT, v4Page, generateParameters.logger);
     }
     else if (facet.base === common_2.FacetBase.Form || facet.base === common_2.FacetBase.Identification) {
-        const formDefinitionKey = `ObjectPage${sectionPrefix}Form<${definitionKey}>`;
+        const formDefinitionKey = `ObjectPage${sectionPrefix}Form<${facetKeyInSchema}>`;
         handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix, formDefinitionKey);
     }
     else if (facet.base === common_2.FacetBase.DataPoint ||
-        facet.base === common_2.FacetBase.Address ||
-        facet.base === common_2.FacetBase.Contact) {
-        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${definitionKey}>`;
-        handleDataPointAddressContact(facet, facetKey, sections, appSchema, sectionPrefix, facetDefinitionKey);
+        (facet.base === common_2.FacetBase.Chart && sectionPrefix === v4_1.SectionType.HeaderSection)) {
+        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${facetKeyInSchema}>`;
+        handleChartAndDataPoint(facet, facetKey, sections, appSchema, facetDefinitionKey);
+    }
+    else if (facet.base === common_2.FacetBase.Address || facet.base === common_2.FacetBase.Contact) {
+        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${facetKeyInSchema}>`;
+        handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix, facetDefinitionKey);
     }
     else {
         sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey);
@@ -190,10 +204,9 @@ function addSection(facets, facetKey, sections, appSchema, oDataServiceAVT, sect
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - application specific JSON schema
  * @param {EntityType} entityType - current entity type
- * @param {string} entitySetName - name of the current entity set
- * @param pages {SapUiAppPageV4[]} - list of (manifest) pages
+ * @param {SapUiAppPageV4} v4Page - current page
  */
-function addSections(generateParameters, appSchema, entityType, entitySetName, pages) {
+function addSections(generateParameters, appSchema, entityType, v4Page) {
     // Get facet annotations
     const facets = common_2.getObjectPageFacets(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, common_1.FioriElementsVersion.v4, generateParameters.logger);
     if (!facets) {
@@ -201,15 +214,9 @@ function addSections(generateParameters, appSchema, entityType, entitySetName, p
         return;
     }
     const sections = appSchema['definitions']['Sections'];
-    Object.keys(pages).forEach((element) => {
-        var _a, _b;
-        if (((_b = (_a = pages[element].options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.entitySet) === entitySetName &&
-            pages[element].name === v4_1.FE_TEMPLATE_V4_OBJECT_PAGE) {
-            for (const facetKey in facets) {
-                addSection(facets, facetKey, sections, appSchema, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, v4_1.SectionType.Section);
-            }
-        }
-    });
+    for (const facetKey in facets) {
+        addSection(generateParameters, facets, facetKey, sections, appSchema, v4_1.SectionType.Section, v4Page);
+    }
     // Custom sections as part of sections
     if (appSchema['definitions']['CustomSections']) {
         sections.properties = Object.assign(Object.assign({}, sections.properties), appSchema['definitions']['CustomSections'].properties);
@@ -220,10 +227,9 @@ function addSections(generateParameters, appSchema, entityType, entitySetName, p
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - application specific JSON schema
  * @param {EntityType} entityType - current entity type
- * @param {string} entitySetName - name of the current entity set
- * @param pages {SapUiAppPageV4[]} - list of (manifest) pages
+ * @param {SapUiAppPageV4} v4Page - current page in manifest
  */
-function addHeaderSections(generateParameters, appSchema, entityType, entitySetName, pages) {
+function addHeaderSections(generateParameters, appSchema, entityType, v4Page) {
     // Get facet annotations
     const facets = common_2.getObjectPageHeaderFacets(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, common_1.FioriElementsVersion.v4, generateParameters.logger);
     const sections = appSchema['definitions']['HeaderSections'];
@@ -232,15 +238,9 @@ function addHeaderSections(generateParameters, appSchema, entityType, entitySetN
     if (!facets) {
         return;
     }
-    Object.keys(pages).forEach((element) => {
-        var _a, _b;
-        if (((_b = (_a = pages[element].options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.entitySet) === entitySetName &&
-            pages[element].name === v4_1.FE_TEMPLATE_V4_OBJECT_PAGE) {
-            for (const facetKey in facets) {
-                addSection(facets, facetKey, sections, appSchema, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, v4_1.SectionType.HeaderSection);
-            }
-        }
-    });
+    for (const facetKey in facets) {
+        addSection(generateParameters, facets, facetKey, sections, appSchema, v4_1.SectionType.HeaderSection, v4Page);
+    }
     //delete generic definitions
     delete appSchema['definitions']['ObjectPageHeaderSectionForm'];
     delete appSchema['definitions']['ObjectPageHeaderSectionChart'];
@@ -292,20 +292,18 @@ function addRelatedFacetKeysType(generateParameters, schema, entityType, entityS
 }
 /**
  * Add Object Page Header to app-specific schema
- *
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema Schema of the app
  * @param {EntityType} entityType - current entity type
- * @param entitySet - current entity set
- * @param pages {SapUiAppPageV4[]} - list of (manifest) pages
+ * @param {SapUiAppPageV4} v4Page - current page in manifest
  */
-function addHeader(generateParameters, appSchema, entityType, entitySet, pages) {
+function addHeader(generateParameters, appSchema, entityType, v4Page) {
     common_2.addCommonHeaderSchema(appSchema, entityType);
     // Add header actions
     common_2.addHeaderActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, addHeaderActionCallBackV4);
     // Add header sections
-    appSchema['definitions']['HeaderSections']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
-    addHeaderSections(generateParameters, appSchema, entityType, entitySet.name, pages);
+    appSchema['definitions']['HeaderSections']['annotationPath'] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
+    addHeaderSections(generateParameters, appSchema, entityType, v4Page);
 }
 /**
  * Generates an app specific schema out of the generic schema.
@@ -343,6 +341,7 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
                 path: v4_1.MANIFESTPATH
             }
         });
+        return appSchema;
     }
     //initialize sections
     appSchema['definitions']['Sections'] = {
@@ -365,11 +364,15 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
             });
             return appSchema;
         }
+        const v4Page = utils_1.findPageV4(pages, v4_1.FE_TEMPLATE_V4_OBJECT_PAGE, entitySet, generateParameters.logger);
+        if (!v4Page) {
+            return appSchema;
+        }
         // Add Header
-        addHeader(generateParameters, appSchema, entityType, entitySet, pages);
+        addHeader(generateParameters, appSchema, entityType, v4Page);
         // Add sections
         appSchema['definitions']['Sections']['annotationPath'] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
-        addSections(generateParameters, appSchema, entityType, entitySet.name, pages);
+        addSections(generateParameters, appSchema, entityType, v4Page);
         // Custom Section facets
         addRelatedFacetKeysType(generateParameters, appSchema, entityType, entitySet.name, pages);
         // Add Footer (actions only)
@@ -379,7 +382,8 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
     delete appSchema['definitions']['GenericSections'];
     delete appSchema['definitions']['ObjectPageSubSections'];
     delete appSchema['definitions']['ObjectPageTable'];
-    delete appSchema['definitions']['GenericColumns'];
+    delete appSchema['definitions']['GenericColumnsOP'];
+    delete appSchema['definitions']['CommonHeaderFacetSettings'];
     delete appSchema['definitions']['ObjectPageSectionTableV4'];
     delete appSchema['definitions']['ObjectPageSectionForm'];
     delete appSchema['definitions']['ObjectPageSectionDataPoint'];