@sap/ux-specification 1.84.45 → 1.84.47

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

@@ -3,12 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const v4_1 = require("../../../v4");
 const i18next_1 = __importDefault(require("i18next"));
 const extensionLogger_1 = require("../../../extensionLogger");
-const common_1 = require("../../../specification/common");
-const v4_2 = require("../../../v4");
-const common_2 = require("../../common");
+const ux_specification_types_1 = require("@sap/ux-specification-types");
+const common_1 = require("../../common");
 const utils_1 = require("../utils/utils");
 /**
  * Callback for adding a single action to headerActions of V4
@@ -22,19 +20,19 @@ function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, head
     return (item, index) => {
         if ((!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) ||
             item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
-            const action = common_2.replaceAlias(item.Action, oDataServiceAVT);
-            const { actionName, actionId } = common_2.getActionNameAndId(action, entityType);
+            const action = common_1.replaceAlias(item.Action, oDataServiceAVT);
+            const { actionName, actionId } = common_1.getActionNameAndId(action, entityType);
             const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
-            const actionDefinitionKey = `HeaderAction<${common_2.prepareRef(actionId)}>`;
+            const actionDefinitionKey = `HeaderAction<${common_1.prepareRef(actionId)}>`;
             const headerAction = (appSchema.definitions[actionDefinitionKey] = {
                 type: 'object',
                 properties: {},
                 description: item.Label || actionName
             });
-            headerAction[v4_2.SchemaTag.isViewNode] = true;
-            headerAction[v4_2.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
+            headerAction[common_1.SchemaTag.isViewNode] = true;
+            headerAction[common_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
             headerActions.properties[actionId] = {
-                $ref: `${common_2.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
             };
         }
     };
@@ -50,7 +48,7 @@ function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, head
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  */
 function handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, generateParameters, v4Page) {
-    const collectionFacet = (sections.properties[facetKey] = common_2.createDefaultSection(appSchema, facet, facetKey));
+    const collectionFacet = (sections.properties[facetKey] = common_1.createDefaultSection(appSchema, facet, facetKey));
     collectionFacet.properties = {
         subsections: {
             additionalProperties: false,
@@ -60,8 +58,8 @@ function handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, g
         }
     };
     const subSections = collectionFacet.properties.subsections;
-    subSections[v4_2.SchemaTag.annotationPath] = facet.annotationPath;
-    subSections[v4_2.SchemaTag.isViewNode] = true;
+    subSections[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+    subSections[common_1.SchemaTag.isViewNode] = true;
     for (const key in facet.facets) {
         addSection(generateParameters, facet.facets, key, subSections, appSchema, sectionPrefix, v4Page);
     }
@@ -77,24 +75,24 @@ function handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, g
  * @param {ExtensionLogger} logger - logger for exceptions
  */
 function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceAVT) {
-    const lineItemId = common_2.getFacetKeyInSchema(facetKey);
+    const lineItemId = common_1.getFacetKeyInSchema(facetKey);
     const index = facetKey.lastIndexOf('::');
     const annotation = index > -1 ? facetKey.substring(index + 2) : facetKey;
-    const tableDefinition = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageTable, facetKey, appSchema);
+    const tableDefinition = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageTable, facetKey, appSchema);
     if (facet.entityType && annotation) {
-        tableDefinition[v4_2.SchemaTag.annotationPath] = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
+        tableDefinition[common_1.SchemaTag.annotationPath] = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
     }
     tableDefinition.properties.columns = {
-        $ref: `${common_2.DEFINITION_LINK_PREFIX}${lineItemId}`
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${lineItemId}`
     };
-    tableDefinition.properties.toolBar.$ref = common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageToolBar, facetKey);
+    tableDefinition.properties.toolBar.$ref = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBar, facetKey);
     //adjust quickVariantSelection
-    tableDefinition.properties.quickVariantSelection.$ref = common_2.getFacetDefinitionLink(v4_2.DefinitionName.QuickVariantSelectionV4OP, facetKey);
-    const tableQVS = common_2.parseSchemaDefinition(v4_2.DefinitionName.QuickVariantSelectionV4OP, facetKey, appSchema);
-    tableQVS.properties.paths['items'].$ref = common_2.getFacetDefinitionLink(v4_2.DefinitionName.AnnotationPathAsObject, facetKey);
-    common_2.parseSchemaDefinition(v4_2.DefinitionName.AnnotationPathAsObject, facetKey, appSchema);
-    common_2.addEnumForSingleTabVariant(facet.entityType, appSchema, `${v4_2.DefinitionName.AnnotationPathAsObject}<${lineItemId}>`);
-    utils_1.addLineItemsType(appSchema, lineItemFacet['target'], lineItemFacet['entityType'], oDataServiceAVT, lineItemId, v4_2.DefinitionName.ObjectPageTableColumn);
+    tableDefinition.properties.quickVariantSelection.$ref = common_1.getFacetDefinitionLink(common_1.DefinitionName.QuickVariantSelectionV4OP, facetKey);
+    const tableQVS = common_1.parseSchemaDefinition(common_1.DefinitionName.QuickVariantSelectionV4OP, facetKey, appSchema);
+    tableQVS.properties.paths['items'].$ref = common_1.getFacetDefinitionLink(common_1.DefinitionName.AnnotationPathAsObject, facetKey);
+    common_1.parseSchemaDefinition(common_1.DefinitionName.AnnotationPathAsObject, facetKey, appSchema);
+    common_1.addEnumForSingleTabVariant(facet.entityType, appSchema, `${common_1.DefinitionName.AnnotationPathAsObject}<${lineItemId}>`);
+    utils_1.addLineItemsType(appSchema, lineItemFacet['target'], lineItemFacet['entityType'], oDataServiceAVT, lineItemId, common_1.DefinitionName.ObjectPageTableColumn);
     return tableDefinition;
 }
 /**
@@ -111,13 +109,13 @@ function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceA
 function handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateParameters, sections) {
     if (sections) {
         sections.properties[facetKey] = {
-            $ref: common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageSectionTableV4, facetKey)
+            $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionTableV4, facetKey)
         };
     }
-    const sectionTable = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageSectionTableV4, facetKey, appSchema);
-    common_2.addSectionTitleAndDescription(facet, sectionTable, common_2.getFacetKeyInSchema(facetKey));
-    sectionTable[v4_2.SchemaTag.annotationPath] = facet.annotationPath;
-    sectionTable.properties.table['$ref'] = common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageTable, facetKey);
+    const sectionTable = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageSectionTableV4, facetKey, appSchema);
+    common_1.addSectionTitleAndDescription(facet, sectionTable, common_1.getFacetKeyInSchema(facetKey));
+    sectionTable[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+    sectionTable.properties.table['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageTable, facetKey);
     const table = handleLineItem(facet, facetKey, appSchema, lineItemFacet, generateParameters.serviceAVT);
     return { sectionTable, table };
 }
@@ -131,24 +129,24 @@ function handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateP
  */
 function handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix) {
     let definitionType;
-    if (sectionPrefix === v4_2.SectionType.Section) {
-        definitionType = v4_2.DefinitionName.ObjectPageSectionForm;
+    if (sectionPrefix === ux_specification_types_1.SectionType.Section) {
+        definitionType = common_1.DefinitionName.ObjectPageSectionForm;
     }
-    else if (sectionPrefix === v4_2.SectionType.HeaderSection) {
-        definitionType = v4_2.DefinitionName.ObjectPageHeaderSectionForm;
+    else if (sectionPrefix === ux_specification_types_1.SectionType.HeaderSection) {
+        definitionType = common_1.DefinitionName.ObjectPageHeaderSectionForm;
     }
     sections['properties'][facetKey] = {
-        $ref: common_2.getFacetDefinitionLink(definitionType, facetKey)
+        $ref: common_1.getFacetDefinitionLink(definitionType, facetKey)
     };
-    const formSection = common_2.parseSchemaDefinition(definitionType, facetKey, appSchema);
+    const formSection = common_1.parseSchemaDefinition(definitionType, facetKey, appSchema);
     if (!facet.ID) {
         formSection.properties = {};
     }
-    common_2.addSectionTitleAndDescription(facet, formSection, facetKey);
-    formSection[v4_2.SchemaTag.annotationPath] = facet.annotationPath;
-    formSection[v4_2.SchemaTag.isViewNode] = true;
-    const withActions = facet.base === common_2.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
-    common_2.handleForm(sectionPrefix, facet, formSection, appSchema, common_1.FioriElementsVersion.v4, withActions);
+    common_1.addSectionTitleAndDescription(facet, formSection, facetKey);
+    formSection[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+    formSection[common_1.SchemaTag.isViewNode] = true;
+    const withActions = facet.base === common_1.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
+    common_1.handleForm(sectionPrefix, facet, formSection, appSchema, ux_specification_types_1.FioriElementsVersion.v4, withActions);
 }
 /**
  * Adds definitions for header sections (DataPoint, Chart) in object page sections to the app schema
@@ -160,13 +158,13 @@ function handleFormIdentification(facet, facetKey, sections, appSchema, sectionP
  */
 function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey) {
     sections['properties'][facetKey] = {
-        $ref: `${common_2.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
     };
-    const sectionFacet = common_2.parseSchemaDefinition(v4_2.DefinitionName.CommonHeaderFacetSettings, facetDefinitionKey, appSchema, false);
-    common_2.addTargetTitleAndSectionDescription(facet, sectionFacet, facetKey);
-    sectionFacet[v4_2.SchemaTag.annotationPath] = facet.annotationPath;
-    sectionFacet[v4_2.SchemaTag.dataType] = common_2.determineDataTypeOfTarget(facet === null || facet === void 0 ? void 0 : facet.target);
-    sectionFacet[v4_2.SchemaTag.isViewNode] = true;
+    const sectionFacet = common_1.parseSchemaDefinition(common_1.DefinitionName.CommonHeaderFacetSettings, facetDefinitionKey, appSchema, false);
+    common_1.addTargetTitleAndSectionDescription(facet, sectionFacet, facetKey);
+    sectionFacet[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+    sectionFacet[common_1.SchemaTag.dataType] = common_1.determineDataTypeOfTarget(facet === null || facet === void 0 ? void 0 : facet.target);
+    sectionFacet[common_1.SchemaTag.isViewNode] = true;
 }
 /**
  * Adds definitions for Chart items in object page sections to the app schema
@@ -176,24 +174,24 @@ function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinition
  * @param {EntityType} entityType - current entity type
  */
 function handleChartActions(facet, facetKey, appSchema, entityType) {
-    const actions = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageToolBarActions, facetKey, appSchema);
+    const actions = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageToolBarActions, facetKey, appSchema);
     actions.additionalProperties = false;
     actions.properties = {};
     if (facet.Actions) {
         let i = 0;
         facet.Actions.forEach((actionRecord) => {
-            const description = common_2.getDataFieldDescription(actionRecord, entityType);
-            const prefix = actionRecord.$Type.split(v4_2.UIVOCABULARYDOT)[1];
+            const description = common_1.getDataFieldDescription(actionRecord, entityType);
+            const prefix = actionRecord.$Type.split(common_1.UIVOCABULARYDOT)[1];
             const actionId = actionRecord.Action.replace('/', '??');
             const toolBarActionsProperty = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
-                $ref: common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageToolBarAction, actionId),
+                $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBarAction, actionId),
                 description
             });
-            toolBarActionsProperty[v4_2.SchemaTag.propertyIndex] = i;
-            toolBarActionsProperty[v4_2.SchemaTag.annotationType] = actionRecord.$Type;
-            const toolBarAction = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageToolBarAction, common_2.prepareRef(actionId), appSchema);
-            toolBarAction[v4_2.SchemaTag.annotationPath] = common_2.getFacetAnnotationPath(actionRecord);
-            toolBarAction[v4_2.SchemaTag.dataType] = common_2.determineDataType(actionRecord);
+            toolBarActionsProperty[common_1.SchemaTag.propertyIndex] = i;
+            toolBarActionsProperty[common_1.SchemaTag.annotationType] = actionRecord.$Type;
+            const toolBarAction = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageToolBarAction, common_1.prepareRef(actionId), appSchema);
+            toolBarAction[common_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(actionRecord);
+            toolBarAction[common_1.SchemaTag.dataType] = common_1.determineDataType(actionRecord);
             toolBarAction.properties = {};
             i++;
         });
@@ -208,16 +206,16 @@ function handleChartActions(facet, facetKey, appSchema, entityType) {
  * @param {EntityType} entityType - current entity type
  */
 function handleChart(facet, facetKey, appSchema, entityType) {
-    const chart = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageChart, facetKey, appSchema);
+    const chart = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageChart, facetKey, appSchema);
     if (facet['Title']) {
         chart.description = facet['Title'];
     }
-    chart[v4_2.SchemaTag.annotationPath] = common_2.getFacetAnnotationPath(facet);
-    chart[v4_2.SchemaTag.dataType] = common_2.determineDataTypeOfTarget(facet.target || facet);
-    chart[v4_2.SchemaTag.isViewNode] = true;
-    chart.properties.toolBar['$ref'] = common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageToolBar, facetKey);
-    const chartToolBar = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageToolBar, facetKey, appSchema);
-    chartToolBar.properties.actions['$ref'] = common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageToolBarActions, facetKey);
+    chart[common_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(facet);
+    chart[common_1.SchemaTag.dataType] = common_1.determineDataTypeOfTarget(facet.target || facet);
+    chart[common_1.SchemaTag.isViewNode] = true;
+    chart.properties.toolBar['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBar, facetKey);
+    const chartToolBar = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageToolBar, facetKey, appSchema);
+    chartToolBar.properties.actions['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBarActions, facetKey);
     const chartActions = handleChartActions(facet, facetKey, appSchema, entityType);
     return { chart, chartActions };
 }
@@ -232,13 +230,13 @@ function handleChart(facet, facetKey, appSchema, entityType) {
 function handleSectionChart(facet, facetKey, appSchema, sections, entityType = facet.entityType) {
     if (sections) {
         sections.properties[facetKey] = {
-            $ref: common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageSectionChart, facetKey)
+            $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionChart, facetKey)
         };
     }
-    const sectionChart = common_2.parseSchemaDefinition(v4_2.DefinitionName.ObjectPageSectionChart, facetKey, appSchema);
-    common_2.addTargetTitleAndSectionDescription(facet, sectionChart, facetKey);
-    sectionChart[v4_2.SchemaTag.annotationPath] = common_2.getFacetAnnotationPath(facet);
-    sectionChart.properties.chart['$ref'] = common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageChart, facetKey);
+    const sectionChart = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageSectionChart, facetKey, appSchema);
+    common_1.addTargetTitleAndSectionDescription(facet, sectionChart, facetKey);
+    sectionChart[common_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(facet);
+    sectionChart.properties.chart['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageChart, facetKey);
     const { chart, chartActions } = handleChart(facet.target || facet, facetKey, appSchema, entityType);
     return { sectionChart, chart, chartActions };
 }
@@ -252,37 +250,49 @@ function handleSectionChart(facet, facetKey, appSchema, sections, entityType = f
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  */
 function handleSectionPresentationVariant(facet, facetKey, appSchema, sections, generateParameters) {
-    var _a;
-    const facetTarget = facet.target.Visualizations
-        ? (_a = facet.target.Visualizations[0]) === null || _a === void 0 ? void 0 : _a.$target : undefined;
-    if (facetTarget) {
-        const [namespace, target] = facet.target[v4_2.SchemaTag.fullyQualifiedName].split('@');
-        const pathPosition = facetKey.lastIndexOf('::');
-        let navPath;
-        if (pathPosition > 0) {
-            navPath = facetKey.slice(0, facetKey.lastIndexOf('::'));
+    let facetTarget, visualizationKey, target;
+    const visualizations = facet.target.Visualizations;
+    const navPath = facetKey.lastIndexOf('::') > 0 ? facetKey.slice(0, facetKey.lastIndexOf('::')) : undefined;
+    if (visualizations === null || visualizations === void 0 ? void 0 : visualizations[0]) {
+        if (visualizations[0].$target) {
+            facetTarget = visualizations[0].$target;
+            visualizationKey = `@${facetTarget.fullyQualifiedName.split('@')[1].split('/')[0]}`;
+            target = facetTarget;
+        }
+        else {
+            facetTarget = visualizations[0];
+            visualizationKey =
+                '@' +
+                    common_1.replaceAlias(`${facetTarget.targetString.split('@')[1].split('/')[0]}`, generateParameters.serviceAVT);
+            const navigationProp = generateParameters.entitySet.entityType.navigationProperties.find((prop) => {
+                return prop.name === navPath;
+            });
+            const targetType = navigationProp.targetType;
+            target = targetType.annotations.UI[visualizationKey.split(common_1.UIVOCABULARYDOT)[1]];
         }
-        const visualizationKey = `@${facetTarget.fullyQualifiedName.split('@')[1]}`;
+    }
+    if (facetTarget) {
+        const visualizationType = visualizationKey.split(common_1.UIVOCABULARYDOT)[1];
+        const namespace = facet.target[common_1.SchemaTag.fullyQualifiedName].split('@')[0];
         const fullVisualizationKey = navPath ? `${navPath}::${visualizationKey}` : visualizationKey;
-        const visualizationType = visualizationKey.split(v4_2.UIVOCABULARYDOT)[1];
-        if (visualizationType.startsWith(v4_1.Visualization.Chart)) {
+        if (visualizationType.startsWith(ux_specification_types_1.Visualization.Chart)) {
             sections.properties[`${facetKey}<${visualizationKey}>`] = {
-                $ref: common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageSectionChart, fullVisualizationKey)
+                $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionChart, fullVisualizationKey)
             };
             const { sectionChart, chart } = handleSectionChart(facetTarget, fullVisualizationKey, appSchema, undefined, facet.entityType);
-            sectionChart[v4_2.SchemaTag.annotationPath] = facet.annotationPath;
-            common_2.addTargetTitleAndSectionDescription(facet, sectionChart, facetKey);
-            chart[v4_2.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+            sectionChart[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+            common_1.addTargetTitleAndSectionDescription(facet, sectionChart, facetKey);
+            chart[common_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
         }
-        else if (visualizationType.startsWith(v4_1.Visualization.LineItem)) {
+        else if (visualizationType.startsWith(ux_specification_types_1.Visualization.LineItem)) {
             sections.properties[`${facetKey}<${visualizationKey}>`] = {
-                $ref: common_2.getFacetDefinitionLink(v4_2.DefinitionName.ObjectPageSectionTableV4, fullVisualizationKey)
+                $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionTableV4, fullVisualizationKey)
             };
-            const { sectionTable, table } = handleSectionTable(facet, fullVisualizationKey, appSchema, { target: facetTarget, entityType: facet.entityType }, generateParameters);
-            sectionTable[v4_2.SchemaTag.annotationPath] = facet.annotationPath;
-            common_2.addTargetTitleAndSectionDescription(facet, sectionTable, facetKey);
-            delete sectionTable[v4_2.SchemaTag.isViewNode];
-            table[v4_2.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+            const { sectionTable, table } = handleSectionTable(facet, fullVisualizationKey, appSchema, { target, entityType: facet.entityType }, generateParameters);
+            sectionTable[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+            common_1.addTargetTitleAndSectionDescription(facet, sectionTable, facetKey);
+            delete sectionTable[common_1.SchemaTag.isViewNode];
+            table[common_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
         }
     }
 }
@@ -298,48 +308,48 @@ function handleSectionPresentationVariant(facet, facetKey, appSchema, sections,
  */
 function addSection(generateParameters, facets, facetKey, sections, appSchema, sectionPrefix, v4Page) {
     const facet = facets[facetKey];
-    const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${common_2.getFacetKeyInSchema(facetKey)}>`;
+    const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${common_1.getFacetKeyInSchema(facetKey)}>`;
     switch (facet.base) {
-        case common_2.FacetBase.PresentationVariant: {
+        case common_1.FacetBase.PresentationVariant: {
             handleSectionPresentationVariant(facet, facetKey, appSchema, sections, generateParameters);
             break;
         }
-        case common_2.FacetBase.CollectionFacet: {
+        case common_1.FacetBase.CollectionFacet: {
             handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, generateParameters, v4Page);
             break;
         }
-        case common_2.FacetBase.LineItem: {
-            if (sectionPrefix === v4_2.SectionType.Section) {
+        case common_1.FacetBase.LineItem: {
+            if (sectionPrefix === ux_specification_types_1.SectionType.Section) {
                 const lineItemFacet = facets[facetKey];
                 handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateParameters, sections);
             }
             break;
         }
-        case common_2.FacetBase.Form:
-        case common_2.FacetBase.Identification: {
+        case common_1.FacetBase.Form:
+        case common_1.FacetBase.Identification: {
             handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix);
             break;
         }
-        case common_2.FacetBase.DataPoint: {
+        case common_1.FacetBase.DataPoint: {
             handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey);
             break;
         }
-        case common_2.FacetBase.Chart: {
-            if (sectionPrefix === v4_2.SectionType.HeaderSection) {
+        case common_1.FacetBase.Chart: {
+            if (sectionPrefix === ux_specification_types_1.SectionType.HeaderSection) {
                 handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey);
             }
-            else if (sectionPrefix === v4_2.SectionType.Section) {
+            else if (sectionPrefix === ux_specification_types_1.SectionType.Section) {
                 handleSectionChart(facet, facetKey, appSchema, sections);
             }
             break;
         }
-        case common_2.FacetBase.Address:
-        case common_2.FacetBase.Contact: {
-            common_2.handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix);
+        case common_1.FacetBase.Address:
+        case common_1.FacetBase.Contact: {
+            common_1.handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix);
             break;
         }
         default: {
-            sections['properties'][facetKey] = common_2.createDefaultSection(appSchema, facet, facetKey);
+            sections['properties'][facetKey] = common_1.createDefaultSection(appSchema, facet, facetKey);
         }
     }
 }
@@ -347,23 +357,22 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, s
  * Derives the sections from the UI.Facets annotation and adds them to the schema
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - application specific JSON schema
- * @param {EntityType} entityType - current entity type
  * @param {SapUiAppPageV4} v4Page - current page
  */
-function addSections(generateParameters, appSchema, entityType, v4Page) {
+function addSections(generateParameters, appSchema, 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);
+    const facets = common_1.getObjectPageFacets(generateParameters.entitySet.entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, ux_specification_types_1.FioriElementsVersion.v4, generateParameters.logger);
     if (!facets) {
-        delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSubSections];
+        delete appSchema.definitions[common_1.DefinitionName.ObjectPageSubSections];
         return;
     }
-    const sections = appSchema.definitions[v4_2.DefinitionName.Sections];
+    const sections = appSchema.definitions[common_1.DefinitionName.Sections];
     for (const facetKey in facets) {
-        addSection(generateParameters, facets, facetKey, sections, appSchema, v4_2.SectionType.Section, v4Page);
+        addSection(generateParameters, facets, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, v4Page);
     }
     // Custom sections as part of sections
-    if (appSchema.definitions[v4_2.DefinitionName.CustomSections]) {
-        sections.properties = Object.assign(Object.assign({}, sections.properties), appSchema.definitions[v4_2.DefinitionName.CustomSections].properties);
+    if (appSchema.definitions[common_1.DefinitionName.CustomSections]) {
+        sections.properties = Object.assign(Object.assign({}, sections.properties), appSchema.definitions[common_1.DefinitionName.CustomSections].properties);
     }
 }
 /**
@@ -375,39 +384,38 @@ function addSections(generateParameters, appSchema, entityType, v4Page) {
  */
 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[v4_2.DefinitionName.HeaderSections];
+    const facets = common_1.getObjectPageHeaderFacets(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, ux_specification_types_1.FioriElementsVersion.v4, generateParameters.logger);
+    const sections = appSchema.definitions[common_1.DefinitionName.HeaderSections];
     sections.properties = {};
     sections.additionalProperties = false;
     if (!facets) {
         return;
     }
     for (const facetKey in facets) {
-        addSection(generateParameters, facets, facetKey, sections, appSchema, v4_2.SectionType.HeaderSection, v4Page);
+        addSection(generateParameters, facets, facetKey, sections, appSchema, ux_specification_types_1.SectionType.HeaderSection, v4Page);
     }
     //delete generic definitions
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageHeaderSectionForm];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageHeaderSectionChart];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageHeaderSectionDataPoint];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageHeaderSectionContact];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageHeaderSectionAddress];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionForm];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionChart];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionDataPoint];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionContact];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionAddress];
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {object} schema - app specific schema that potentially gets enhanced
- * @param {EntityType} entityType - current entity type
  * @param {string} entitySetName - entity set of the actual (object) page
  * @param {SapUiAppPageV4[]} pages - list of all pages
  */
-function addRelatedFacetKeysType(generateParameters, schema, entityType, entitySetName, pages) {
+function addRelatedFacetKeysType(generateParameters, schema, entitySetName, pages) {
     Object.keys(pages).forEach((element) => {
         if (pages[element].options &&
             pages[element].options.settings &&
             pages[element].options.settings.entitySet === entitySetName &&
-            pages[element].name === v4_2.FE_TEMPLATE_V4_OBJECT_PAGE) {
+            pages[element].name === ux_specification_types_1.v4.FE_TEMPLATE_V4_OBJECT_PAGE) {
             // Find sections from annotation
-            const facetSections = common_2.getObjectPageFacetSection(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, generateParameters.logger);
+            const facetSections = common_1.getObjectPageFacetSection(generateParameters.entitySet.entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, generateParameters.logger);
             // Find custom sections ids from manifest
             const page = pages[element];
             if (page.options &&
@@ -426,7 +434,7 @@ function addRelatedFacetKeysType(generateParameters, schema, entityType, entityS
                 });
             }
             // Update schema definition
-            common_2.addDefinitionForRelatedFacetKeys(schema, [v4_2.DefinitionName.ObjectPageCustomSectionFragment], facetSections, [
+            common_1.addDefinitionForRelatedFacetKeys(schema, [common_1.DefinitionName.ObjectPageCustomSectionFragment], facetSections, [
                 'ID',
                 'label',
                 'key'
@@ -437,16 +445,16 @@ 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 {Definition} appSchema Schema of the app
  * @param {SapUiAppPageV4} v4Page - current page in manifest
  */
-function addHeader(generateParameters, appSchema, entityType, v4Page) {
-    common_2.addCommonHeaderSchema(appSchema, entityType);
+function addHeader(generateParameters, appSchema, v4Page) {
+    const entityType = generateParameters.entitySet.entityType;
+    common_1.addCommonHeaderSchema(appSchema, entityType);
     // Add header actions
-    common_2.addHeaderActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, addHeaderActionCallBackV4);
+    common_1.addHeaderActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, addHeaderActionCallBackV4);
     // Add header sections
-    appSchema.definitions[v4_2.DefinitionName.HeaderSections][v4_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
+    appSchema.definitions[common_1.DefinitionName.HeaderSections][common_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
     addHeaderSections(generateParameters, appSchema, entityType, v4Page);
 }
 /**
@@ -463,7 +471,7 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
     // Change reference to generated sections
     appSchema.properties.sections = {
-        $ref: `${common_2.DEFINITION_LINK_PREFIX}${v4_2.DefinitionName.Sections}`
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.Sections}`
     };
     const entitySet = (_b = (_a = generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT) === null || _a === void 0 ? void 0 : _a.entitySets) === null || _b === void 0 ? void 0 : _b.find((es) => es.entityType.name === entityTypeName);
     if (!entitySet) {
@@ -471,76 +479,77 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYSET4NAME', { entityType: entityTypeName }),
             location: {
-                path: common_2.METADATAPATH
+                path: common_1.METADATAPATH
             }
         });
     }
-    const entityType = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType;
-    if (!generateParameters.manifest[common_1.ManifestSection.ui5].routing ||
-        !generateParameters.manifest[common_1.ManifestSection.ui5].routing.targets) {
+    generateParameters.entitySet = entitySet;
+    if (!generateParameters.manifest[ux_specification_types_1.ManifestSection.ui5].routing ||
+        !generateParameters.manifest[ux_specification_types_1.ManifestSection.ui5].routing.targets) {
         extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOROUTING'),
             location: {
-                path: v4_2.MANIFESTPATH
+                path: common_1.MANIFESTPATH
             }
         });
         return appSchema;
     }
     //initialize sections
-    const sections = (appSchema.definitions[v4_2.DefinitionName.Sections] = {
+    const sections = (appSchema.definitions[common_1.DefinitionName.Sections] = {
         type: 'object',
         properties: {},
         additionalProperties: false,
-        description: v4_2.DefinitionName.Sections
+        description: common_1.DefinitionName.Sections
     });
-    sections[v4_2.SchemaTag.isViewNode] = true;
+    sections[common_1.SchemaTag.isViewNode] = true;
     if (entitySet) {
-        const pages = generateParameters.manifest[common_1.ManifestSection.ui5].routing.targets;
+        const pages = generateParameters.manifest[ux_specification_types_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_2.MANIFESTPATH,
-                    range: [common_1.ManifestSection.generic]
+                    path: common_1.MANIFESTPATH,
+                    range: [ux_specification_types_1.ManifestSection.generic]
                 }
             });
             return appSchema;
         }
-        const v4Page = utils_1.findPageV4(pages, v4_2.FE_TEMPLATE_V4_OBJECT_PAGE, entitySet, generateParameters.logger);
+        const v4Page = utils_1.findPageV4(pages, ux_specification_types_1.v4.FE_TEMPLATE_V4_OBJECT_PAGE, entitySet, generateParameters.logger);
         if (!v4Page) {
             return appSchema;
         }
         // Add Header
-        addHeader(generateParameters, appSchema, entityType, v4Page);
+        addHeader(generateParameters, appSchema, v4Page);
         // Add sections
-        sections[v4_2.SchemaTag.isViewNode] = true;
-        sections[v4_2.SchemaTag.annotationPath] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
-        addSections(generateParameters, appSchema, entityType, v4Page);
+        sections[common_1.SchemaTag.isViewNode] = true;
+        sections[common_1.SchemaTag.annotationPath] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
+        addSections(generateParameters, appSchema, v4Page);
         // Custom Section facets
-        addRelatedFacetKeysType(generateParameters, appSchema, entityType, entitySet.name, pages);
+        addRelatedFacetKeysType(generateParameters, appSchema, entitySet.name, pages);
         // Add Footer (actions only)
-        common_2.addFooterActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT);
+        common_1.addFooterActions(appSchema, generateParameters);
     }
     // Delete generic definitions from schema
-    delete appSchema.definitions[v4_2.DefinitionName.CommonHeaderFacetSettings];
-    delete appSchema.definitions[v4_2.DefinitionName.GenericColumnsOP];
-    delete appSchema.definitions[v4_2.DefinitionName.GenericSections];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageChart];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionAddress];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionChart];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionContact];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionDataPoint];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionForm];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionTableV4];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSectionPresentationVariant];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageSubSections];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageTable];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageToolBar];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageToolBarAction];
-    delete appSchema.definitions[v4_2.DefinitionName.ObjectPageToolBarActions];
-    delete appSchema.definitions[v4_2.DefinitionName.QuickVariantSelectionV4OP];
+    delete appSchema.definitions[common_1.DefinitionName.CommonHeaderFacetSettings];
+    delete appSchema.definitions[common_1.DefinitionName.GenericColumnsOP];
+    delete appSchema.definitions[common_1.DefinitionName.GenericSections];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageChart];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionAddress];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionChart];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionContact];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionDataPoint];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionForm];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionTableV4];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionPresentationVariant];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSubSections];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageTable];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageToolBar];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageToolBarAction];
+    delete appSchema.definitions[common_1.DefinitionName.ObjectPageToolBarActions];
+    delete appSchema.definitions[common_1.DefinitionName.QuickVariantSelectionV4OP];
     return appSchema;
 }
 exports.generateObjectPageSchemaV4 = generateObjectPageSchemaV4;