@sap/ux-specification 1.136.14 → 1.136.15

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

@@ -9,7 +9,7 @@ exports.addVisualFilters = addVisualFilters;
 exports.applyCustomFilterFields = applyCustomFilterFields;
 exports.analyzeViewAnnotation = analyzeViewAnnotation;
 exports.addALPViews = addALPViews;
-exports.applyLRTableSchemaAdjustments = applyLRTableSchemaAdjustments;
+exports.applyLRSchemaAdjustments = applyLRSchemaAdjustments;
 exports.addTagsToView = addTagsToView;
 exports.addLRViewParts = addLRViewParts;
 exports.getDefaultAnnotationPath = getDefaultAnnotationPath;
@@ -22,6 +22,7 @@ const ux_specification_types_1 = require("@sap/ux-specification-types");
 const i18next_1 = __importDefault(require("i18next"));
 const extensionLogger_1 = require("../../../extensionLogger");
 const common_1 = require("../../common");
+const actions_1 = require("./actions");
 const AppSchema_1 = require("../sync-rules/AppSchema");
 const App_1 = require("../sync-rules/App");
 const Page_1 = require("../sync-rules/Page");
@@ -181,38 +182,6 @@ function applyCustomFilterFields(appSchema, selectionFieldsDefinition, v4Page) {
         });
     }
 }
-/**
- * Adds selection fields or compact/visual filters to filter bar.
- *
- * @param entityType - actual entity type (AVT information)
- * @param appSchema - app-specific JSON schema
- * @param v4Page - actual page in the manifest
- * @param alias - the given alias or namespace of the OData annotations
- */
-function addFilterBar(entityType, appSchema, v4Page, alias) {
-    const visualFilters = getVisualFilters(v4Page);
-    const selectionFields = alias && entityType?.annotations?.[alias]?.SelectionFields;
-    let selectionFieldsDefinition;
-    // Hide visualFilters/selectionFields depending on existing visual filters
-    if (visualFilters) {
-        appSchema.definitions[ux_specification_types_1.DefinitionName.SelectionFields][ux_specification_types_1.SchemaTag.hidden] = true;
-        appSchema.definitions[ux_specification_types_1.DefinitionName.SelectionFields]['properties'] = {};
-        selectionFieldsDefinition = appSchema.definitions[ux_specification_types_1.DefinitionName.CompactFilters];
-        selectionFieldsDefinition.additionalProperties = false;
-        selectionFieldsDefinition.properties = {};
-        addVisualFilters(entityType, appSchema, visualFilters, selectionFields);
-    }
-    else {
-        const filterBar = appSchema.definitions[ux_specification_types_1.DefinitionName.FilterBar];
-        filterBar.properties['initialLayout'][ux_specification_types_1.SchemaTag.hidden] = true;
-        filterBar.properties['layout'][ux_specification_types_1.SchemaTag.hidden] = true;
-        appSchema.definitions[ux_specification_types_1.DefinitionName.CompactFilters][ux_specification_types_1.SchemaTag.hidden] = true;
-        appSchema.definitions[ux_specification_types_1.DefinitionName.VisualFilters][ux_specification_types_1.SchemaTag.hidden] = true;
-    }
-    selectionFieldsDefinition = addSelectionFields(entityType, appSchema, selectionFields, selectionFieldsDefinition);
-    // Apply custom filter fields
-    applyCustomFilterFields(appSchema, selectionFieldsDefinition, v4Page);
-}
 /**
  *
  * @param appSchema - The app JSON schema to be updated
@@ -498,28 +467,27 @@ function addALPViews(appSchema, viewsPaths, generateParameters, templateAnnotati
             appSchema.definitions[ux_specification_types_1.DefinitionName.ALPTable][ux_specification_types_1.SchemaTag.annotationPath] = target;
         }
         const schemaAdjustmentParameters = {
+            logger: generateParameters.logger,
             appSchema,
             v4Page,
-            tableDefinitionId: ux_specification_types_1.DefinitionName.ALPTable,
-            facetDefinitionId: ux_specification_types_1.DefinitionName.LineItems,
-            dataForLineItem
+            tableDefinitionKey: ux_specification_types_1.DefinitionName.ALPTable,
+            facetDefinitionKey: ux_specification_types_1.DefinitionName.LineItems,
+            dataForLineItem,
+            customActionDefinitionName: ux_specification_types_1.DefinitionName.CustomTableAction,
+            sectionActionsDefinitionKey: `${ux_specification_types_1.DefinitionName.Actions}<${(0, common_1.prepareRef)(ux_specification_types_1.DefinitionName.LineItems)}>`
         };
-        applyLRTableSchemaAdjustments(schemaAdjustmentParameters);
+        applyLRSchemaAdjustments(schemaAdjustmentParameters);
         const pathParts = annotations[viewAnnotation].fullyQualifiedName.split('@');
         tableView[ux_specification_types_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
         tableView[ux_specification_types_1.SchemaTag.key] = 'secondary';
         tableView[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.key, value: 'secondary' }];
     }
     (0, utils_2.addCustomColumnDefinition)(appSchema, v4Page, generateParameters.logger);
-    // Table toolbar actions with custom actions
-    const schemaIdForToolbarActions = `${ux_specification_types_1.DefinitionName.Actions}<${(0, common_1.prepareRef)(ux_specification_types_1.DefinitionName.LineItems)}>`;
-    (0, utils_2.addCustomActionDefinition)(appSchema, v4Page, generateParameters.logger, undefined, schemaIdForToolbarActions);
-    (0, utils_2.addEnumForActionAnchor)(appSchema, schemaIdForToolbarActions, ux_specification_types_1.DefinitionName.CustomActionPosition);
     // Add "manifestPath" for table properties
     addManifestPathsToPropertiesLR(appSchema, ux_specification_types_1.DefinitionName.ALPTable, tableDefinition, {
         pageName: v4Page.id,
         manifest: generateParameters.manifest,
-        targetAnnotation
+        targetAnnotation: target
     });
 }
 /**
@@ -558,18 +526,30 @@ function addViewChartDefinitions(inputParameters, annotations) {
  * @param viewsDefinition - the views definition in app schema (MultiTableModeV4)
  * @param viewKey - view key
  * @param title - view title
+ * @param page - Represents the page in the application's structure where the view line items are to be added.
  */
-function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title) {
+function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title, page) {
     const idForChart = addViewChartDefinitions(inputParameters, UIAnnotations);
-    appSchema.definitions[idForChart].properties.annotationPath[ux_specification_types_1.SchemaTag.hidden] = true;
-    appSchema.definitions[idForChart].properties.index[ux_specification_types_1.SchemaTag.hidden] = true;
-    appSchema.definitions[idForChart].properties.entitySet[ux_specification_types_1.SchemaTag.hidden] = true;
+    const chartViewDefinition = appSchema.definitions[idForChart];
+    chartViewDefinition.properties.annotationPath[ux_specification_types_1.SchemaTag.hidden] = true;
+    chartViewDefinition.properties.index[ux_specification_types_1.SchemaTag.hidden] = true;
+    chartViewDefinition.properties.entitySet[ux_specification_types_1.SchemaTag.hidden] = true;
     const titleOnHover = `Chart View (key: ${viewKey})`;
     viewsDefinition.properties[viewKey] = {
         $ref: `${common_1.DEFINITION_LINK_PREFIX}${idForChart}`,
         description: title ? title : titleOnHover,
         title: titleOnHover
     };
+    // Add "manifestPath" for table properties
+    addManifestPathsToPropertiesLR(inputParameters.appSchema, ux_specification_types_1.DefinitionName.LRChartView, chartViewDefinition, {
+        pageName: page.getPage().id,
+        manifest: page.getApp().manifest,
+        targetAnnotation: inputParameters.targetAnnotation,
+        viewConfig: {
+            key: viewKey,
+            entitySet: inputParameters.entitySet
+        }
+    });
 }
 /**
  * Retrieves the line item reference for a specified view and entity type.
@@ -599,20 +579,19 @@ function getLineItemRef(v4Page, entityType, viewKey, lineItemTerm, lineItemQuali
  *
  * @param {SchemaAdjustmentParameters} schemaAdjustmentParameters - An object containing parameters required for schema adjustments.
  * It includes the application schema, table definition ID, facet definition ID, and the V4 page information.
- * @returns {void} This function does not return any value.
  */
 function adjustCreationFieldsDefinition(schemaAdjustmentParameters) {
-    const { entityType, appSchema, tableDefinitionId, facetDefinitionId, v4Page, viewKey } = schemaAdjustmentParameters;
+    const { entityType, appSchema, tableDefinitionKey, facetDefinitionKey, v4Page, viewKey } = schemaAdjustmentParameters;
     // when the table view is created, the entity type may differ from the one used for the table
     // schemaAdjustmentParameters contains the entity type used for the view
     const lineItemRef = getLineItemRef(v4Page, entityType, viewKey, entityType?.annotations?.UI?.LineItem?.term);
     // set specific implementation for creation fields in the LR table
-    const creationModeDefinitionKey = (0, common_1.getFacetDefinitionKey)(ux_specification_types_1.DefinitionName.TableCreationModeLR, facetDefinitionId);
-    const tableDefinition = appSchema.definitions[tableDefinitionId];
+    const creationModeDefinitionKey = (0, common_1.getFacetDefinitionKey)(ux_specification_types_1.DefinitionName.TableCreationModeLR, facetDefinitionKey);
+    const tableDefinition = appSchema.definitions[tableDefinitionKey];
     const creationModeProperty = tableDefinition.properties[ux_specification_types_1.PropertyName.creationMode];
-    creationModeProperty.$ref = (0, common_1.getFacetDefinitionLink)(ux_specification_types_1.DefinitionName.TableCreationModeLR, facetDefinitionId);
+    creationModeProperty.$ref = (0, common_1.getFacetDefinitionLink)(ux_specification_types_1.DefinitionName.TableCreationModeLR, facetDefinitionKey);
     const creationModeDefinition = appSchema.definitions[creationModeDefinitionKey] ??
-        (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.TableCreationModeLR, facetDefinitionId, appSchema);
+        (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.TableCreationModeLR, facetDefinitionKey, appSchema);
     const context = {
         page: v4Page,
         schema: creationModeDefinition,
@@ -634,20 +613,19 @@ function adjustCreationFieldsDefinition(schemaAdjustmentParameters) {
  *
  * @param {SchemaAdjustmentParameters} schemaAdjustmentParameters - An object containing parameters required for schema adjustments.
  * It includes the application schema, table definition ID, facet definition ID, and the V4 page information.
- * @returns {void} This function does not return any value.
  */
 function adjustAnalyticalConfiguration(schemaAdjustmentParameters) {
-    const { entityType, appSchema, tableDefinitionId, facetDefinitionId, v4Page, viewKey, dataForLineItem } = schemaAdjustmentParameters;
+    const { entityType, appSchema, tableDefinitionKey, facetDefinitionKey, v4Page, viewKey, dataForLineItem } = schemaAdjustmentParameters;
     // when the table view is created, the entity type may differ from the one used for the table
     // schemaAdjustmentParameters contains the entity type used for the view
     const lineItemRef = getLineItemRef(v4Page, entityType, viewKey, entityType?.annotations?.UI?.LineItem?.term, dataForLineItem.lineItemAnnotation?.qualifier);
     // set specific implementation for analytical configuration in the LR table
-    const tableDefinition = appSchema.definitions[tableDefinitionId];
+    const tableDefinition = appSchema.definitions[tableDefinitionKey];
     const analyticalConfigurationDefinitionName = viewKey
         ? ux_specification_types_1.DefinitionName.ViewAnalyticalConfiguration
         : ux_specification_types_1.DefinitionName.AnalyticalConfiguration;
     const analyticalConfigurationDefinition = appSchema.definitions[analyticalConfigurationDefinitionName] ??
-        (0, common_1.parseSchemaDefinition)(analyticalConfigurationDefinitionName, facetDefinitionId, appSchema);
+        (0, common_1.parseSchemaDefinition)(analyticalConfigurationDefinitionName, facetDefinitionKey, appSchema);
     const context = {
         page: v4Page,
         schema: analyticalConfigurationDefinition,
@@ -665,46 +643,61 @@ function adjustAnalyticalConfiguration(schemaAdjustmentParameters) {
  *
  * @param {SchemaAdjustmentParameters} schemaAdjustmentParameters - An object containing parameters required for schema adjustments.
  * It includes the application schema, table definition ID, facet definition ID, and the V4 page information.
- * @returns {void} This function does not return any value.
  */
 function adjustPopinLayout(schemaAdjustmentParameters) {
-    const { entityType, appSchema, tableDefinitionId, v4Page, viewKey, dataForLineItem } = schemaAdjustmentParameters;
+    const { entityType, appSchema, tableDefinitionKey, v4Page, viewKey, dataForLineItem } = schemaAdjustmentParameters;
     // when the table view is created, the entity type may differ from the one used for the table
     // schemaAdjustmentParameters contains the entity type used for the view
     const lineItemRef = getLineItemRef(v4Page, entityType, viewKey, entityType?.annotations?.UI?.LineItem?.term, dataForLineItem.lineItemAnnotation?.qualifier);
+    // set specific implementation for popinLayout in the LR table
+    const tableDefinition = appSchema.definitions[tableDefinitionKey];
+    const popinLayoutDefinition = tableDefinition.properties['popinLayout'];
+    const context = {
+        page: v4Page,
+        schema: popinLayoutDefinition,
+        parameters: {
+            lineItemRef,
+            tableDefinition
+        }
+    };
+    // for the ResponsiveTable (default table type) we allow to set the popin layout property
+    common_1.manifestDrivenSchemaProcessor.apply(ux_specification_types_1.RuleName.LRPopinLayoutForNonResponsiveTable, context);
 }
 /**
  * Adjusts the schema for a table by making necessary changes such as populating creation fields,
  * adjusting creation field definitions, and adding enum mappings for mass edit functionalities.
  *
  * @param {SchemaAdjustmentParameters} schemaAdjustmentParameters - Object containing the parameters required for schema adjustments. Includes the generate parameters, application schema, table definition ID, and facet definition ID.
- * @returns {void} This function does not return a value; it performs in-place adjustments to the schema provided through the input parameters.
  */
-function applyLRTableSchemaAdjustments(schemaAdjustmentParameters) {
-    const { entityType, appSchema, tableDefinitionId, facetDefinitionId } = schemaAdjustmentParameters;
+function applyLRSchemaAdjustments(schemaAdjustmentParameters) {
+    const { entityType, appSchema, tableDefinitionKey, facetDefinitionKey } = schemaAdjustmentParameters;
     // in the future, all postgeneration adjustments for the LR Page should be done here
     // populate the creation fields for the table with the data from the columns
-    (0, utils_1.initializeCreationModeSchema)(appSchema, facetDefinitionId, entityType, ux_specification_types_1.DefinitionName.TableCreationModeLR);
+    (0, utils_1.initializeCreationModeSchema)(appSchema, facetDefinitionKey, entityType, ux_specification_types_1.DefinitionName.TableCreationModeLR);
     // remove unnecessary properties from the creation mode aggregation according to the table type
     adjustCreationFieldsDefinition(schemaAdjustmentParameters);
     // remove unnecessary properties from the analytical configuration aggregation according to the table type
     adjustAnalyticalConfiguration(schemaAdjustmentParameters);
     adjustPopinLayout(schemaAdjustmentParameters);
     // add columns to a enum, in this case enableMassEdit -> visibleFields and ignoredFields
-    (0, utils_2.addEnumForEnableMassEdit)(appSchema, tableDefinitionId, facetDefinitionId, entityType);
+    (0, utils_2.addEnumForEnableMassEdit)(appSchema, tableDefinitionKey, facetDefinitionKey, entityType);
+    // add the custom action and custom action menu definition
+    (0, actions_1.configureCustomActionDefinition)(schemaAdjustmentParameters);
 }
 /**
  * Modifies the app schema, adds the right line item settings as derived from the visualization.
  *
- * @param {ViewsParameters} inputParameters - The parameters required for generating and defining the line items in the view schema.
- * @param {Definition} viewsDefinition - The existing schema definition for views that will be updated with new view line items.
- * @param {string} visualization - The visualization format or mode for the line items, used to determine the associated annotations.
- * @param {string} templateAnnotation - The template annotation to infer metadata for the line items.
- * @param {GenerateAppSchemaParameters} generateParameters - Parameters essential for schema generation, including OData service metadata.
- * @param {Page} page - The page object representing the context in which the view is being generated.
- * @returns {void} No return value.
+ * @param {ViewsParameters} inputParameters - Parameters containing details needed for the view line item addition, including the app schema, view key, and target annotation.
+ * @param {Definition} viewsDefinition - The definition object to which the view line items will be added.
+ * @param {string} visualization - The specific visualization type, typically used to determine the annotation term.
+ * @param {string} templateAnnotation - Annotation path or type related to the template.
+ * @param generateParameters - list of API input parameters
+ * @param generateParameters.serviceAVT - OData service AVT information
+ * @param generateParameters.entityType - entity type of the current page
+ * @param {Page} page - Represents the page in the application's structure where the view line items are to be added.
+ * @param {ExtensionLogger} logger - Logger for recording informational or error messages during the schema adjustment process.
  */
-function addViewLineItems(inputParameters, viewsDefinition, visualization, templateAnnotation, { serviceAVT, entityType }, page) {
+function addViewLineItems(inputParameters, viewsDefinition, visualization, templateAnnotation, { serviceAVT, entityType }, page, logger) {
     const tableId = `${ux_specification_types_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
     const viewId = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
     const lrTableView = (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.LRTableView, inputParameters.viewKey, inputParameters.appSchema);
@@ -738,21 +731,42 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         lineItemId: viewId
     };
     (0, utils_2.addLineItemsTypeToSchema)(dataForLineItem, ux_specification_types_1.DefinitionName.ViewTableColumn, ux_specification_types_1.DefinitionName.ViewCustomColumn, ux_specification_types_1.DefinitionName.ViewCustomAction);
+    // Table toolbar actions with custom actions
+    const sectionIdPrefix = inputParameters.entitySet ? `/${inputParameters.entitySet}/` : '';
+    const sectionIdInManifest = `${sectionIdPrefix}@${"com.sap.vocabularies.UI.v1.LineItem" /* UIAnnotationTerms.LineItem */}${visualization.split(ux_specification_types_1.Visualization.LineItem)[1]}`;
+    const schemaIdForToolbarActions = `${ux_specification_types_1.DefinitionName.Actions}<${viewId}>`;
+    const customActionDefinitionKey = `${ux_specification_types_1.DefinitionName.ViewCustomAction}<${viewId}>`;
+    // Anchor selection
+    (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewCustomActionPosition, viewId, inputParameters.appSchema);
+    const customActionPositionDefinitionKey = `${ux_specification_types_1.DefinitionName.ViewCustomActionPosition}<${viewId}>`;
+    const customActionDefinition = inputParameters.appSchema.definitions[customActionDefinitionKey];
+    customActionDefinition.properties.position.$ref =
+        `${common_1.DEFINITION_LINK_PREFIX}${customActionPositionDefinitionKey}`;
     const schemaAdjustmentParameters = {
+        logger: logger,
         appSchema: inputParameters.appSchema,
         v4Page: page.getPage(),
-        tableDefinitionId: tableId,
-        facetDefinitionId: viewId,
+        tableDefinitionKey: tableId,
+        facetDefinitionKey: viewId,
         viewKey: inputParameters.viewKey,
         entityType: inputParameters.targetEntityType || entityType,
-        dataForLineItem
+        dataForLineItem,
+        sectionActionsDefinitionKey: schemaIdForToolbarActions,
+        scopedCustomActionDefinitionKey: customActionDefinitionKey,
+        customActionDefinitionName: ux_specification_types_1.DefinitionName.ViewCustomAction,
+        sectionIdInManifest,
+        customActionPosition: customActionPositionDefinitionKey
     };
-    applyLRTableSchemaAdjustments(schemaAdjustmentParameters);
+    applyLRSchemaAdjustments(schemaAdjustmentParameters);
     // Add "manifestPath" for table properties
     addManifestPathsToPropertiesLR(inputParameters.appSchema, ux_specification_types_1.DefinitionName.LRTableView, lrTableView, {
         pageName: page.getPage().id,
         manifest: page.getApp().manifest,
-        targetAnnotation: inputParameters.targetAnnotation
+        targetAnnotation: inputParameters.targetAnnotation,
+        viewConfig: {
+            key: inputParameters.viewKey,
+            entitySet: inputParameters.entitySet
+        }
     });
 }
 /**
@@ -772,25 +786,6 @@ function addTagsToView(viewsDefinition, viewKey, namespace, view) {
     viewsDefinition.properties[viewKey][ux_specification_types_1.SchemaTag.key] = viewKey;
     viewsDefinition.properties[viewKey][ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.key, value: viewKey }];
 }
-/**
- * Adjusts the entity type if a different entity set is maintained for a view.
- *
- * @param {EntitySet} entitySet - actual entity set (AVT information)
- * @param view - the current view in manifest
- * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
- * @returns the target entity type
- */
-function getTargetEntityType(entitySet, view, generateParameters) {
-    let targetEntityType = generateParameters.entityType;
-    let viewEntitySet = entitySet;
-    if (view['entitySet'] && view['entitySet'] !== entitySet.name) {
-        viewEntitySet = generateParameters.serviceAVT?.entitySets.find((es) => {
-            return es.name === view['entitySet'];
-        });
-        targetEntityType = viewEntitySet.entityType;
-    }
-    return targetEntityType;
-}
 /**
  * Adds view custom extensions - custom column and custom action definitions.
  *
@@ -812,17 +807,6 @@ function addViewCustomExtensions(commonInputParameters, visualization, v4Page, l
     if (commonInputParameters.appSchema.definitions.Position) {
         delete commonInputParameters.appSchema.definitions.Position;
     }
-    // Table toolbar actions with custom actions
-    const schemaIdForToolbarActions = `${ux_specification_types_1.DefinitionName.Actions}<${sectionId}>`;
-    const customActionDefinitionKey = `${ux_specification_types_1.DefinitionName.ViewCustomAction}<${sectionId}>`;
-    (0, utils_2.addCustomActionDefinition)(commonInputParameters.appSchema, v4Page, logger, customActionDefinitionKey, schemaIdForToolbarActions, sectionIdInManifest);
-    // Anchor selection
-    (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewCustomActionPosition, sectionId, commonInputParameters.appSchema);
-    const customActionPositionDefinitionKey = `${ux_specification_types_1.DefinitionName.ViewCustomActionPosition}<${sectionId}>`;
-    const customActionDefinition = commonInputParameters.appSchema.definitions[customActionDefinitionKey];
-    customActionDefinition.properties.position.$ref =
-        `${common_1.DEFINITION_LINK_PREFIX}${customActionPositionDefinitionKey}`;
-    (0, utils_2.addEnumForActionAnchor)(commonInputParameters.appSchema, schemaIdForToolbarActions, customActionPositionDefinitionKey);
 }
 /**
  * Adds definition parts to a LR View (LineItem/Chart).
@@ -841,12 +825,12 @@ function addViewCustomExtensions(commonInputParameters, visualization, v4Page, l
 function addLRViewParts(visualization, viewsDefinition, commonInputParameters, { serviceAVT, entityType, logger }, page, uiAnnotations, view) {
     if (visualization?.indexOf(ux_specification_types_1.Visualization.LineItem) > -1) {
         //Add Line item view
-        addViewLineItems(commonInputParameters, viewsDefinition, visualization, commonInputParameters.targetAnnotation, { serviceAVT, entityType }, page);
+        addViewLineItems(commonInputParameters, viewsDefinition, visualization, commonInputParameters.targetAnnotation, { serviceAVT, entityType }, page, logger);
         addViewCustomExtensions(commonInputParameters, visualization, page.getPage(), logger);
     }
     else if (visualization?.indexOf('Chart') > -1) {
         //Add Chart view
-        addViewChart(commonInputParameters, uiAnnotations, commonInputParameters.appSchema, viewsDefinition, commonInputParameters.viewKey, commonInputParameters.title);
+        addViewChart(commonInputParameters, uiAnnotations, commonInputParameters.appSchema, viewsDefinition, commonInputParameters.viewKey, commonInputParameters.title, page);
     }
     else if (view['template']) {
         const titleOnHover = view['label'] || `Custom View (key: ${commonInputParameters.viewKey})`;
@@ -867,159 +851,6 @@ function addLRViewParts(visualization, viewsDefinition, commonInputParameters, {
         };
     }
 }
-/**
- * Add list report views to the app-specific schema.
- *
- * @param appSchema - app-specific JSON schema
- * @param viewsPaths - views' paths' section in the manifest
- * @param generateParameters - list of API input parameters
- * @param page - the current page object
- * @param tableDefinitionName - The name of the table definition in the schema
- */
-function addLRViews(appSchema, viewsPaths, generateParameters, page, tableDefinitionName) {
-    const tableDefinition = appSchema.definitions[tableDefinitionName];
-    tableDefinition.properties = {
-        annotationPath: tableDefinition.properties.annotationPath,
-        initialLoad: tableDefinition.properties.initialLoad,
-        views: tableDefinition.properties.views
-    };
-    const viewsDefinition = appSchema.definitions.MultiTableModeV4;
-    for (const view of viewsPaths) {
-        if (!view[ux_specification_types_1.SchemaTag.key]) {
-            continue;
-        }
-        let navPropName = undefined;
-        const targetEntityType = getTargetEntityType(generateParameters.entitySet, view, generateParameters);
-        const uiAnnotations = targetEntityType?.annotations.UI;
-        const { visualization, targetAnnotation, namespace, title } = analyzeViewAnnotation(view?.[ux_specification_types_1.SchemaTag.annotationPath], uiAnnotations, generateParameters.serviceAVT, view[ux_specification_types_1.SchemaTag.key], undefined, generateParameters.logger);
-        if (view['entitySet']) {
-            navPropName = generateParameters.entityType.navigationProperties.find((np) => {
-                return np.targetTypeName === namespace;
-            })?.name;
-        }
-        const viewKey = (0, common_1.prepareRef)(view[ux_specification_types_1.SchemaTag.key]);
-        const commonInputParameters = {
-            viewKey,
-            appSchema,
-            targetAnnotation,
-            navPropName,
-            targetEntityType,
-            title,
-            entitySet: view['entitySet']
-        };
-        addLRViewParts(visualization, viewsDefinition, commonInputParameters, generateParameters, page, uiAnnotations, view);
-        addTagsToView(viewsDefinition, viewKey, namespace, view);
-    }
-}
-/**
- * Adapts the table definition in schema.
- * Evaluates the path depending on if defaultTemplateAnnotationPath or Selection-/PresentationVariant is present.
- *
- * @param appSchema - the app-specific JSON schema
- * @param generateParameters - list of API input parameters
- * @param templateAnnotation - defaultTemplateAnnotationPath as registered in manifest
- * @param v4Page - the given page in manifest
- * @param alias - alias definition for the UI vocabulary
- * @param tableDefinitionName - The name of the table definition in the schema
- */
-function adaptTableDefinition(appSchema, generateParameters, templateAnnotation, v4Page, alias, tableDefinitionName) {
-    //here: tableDefinitionName = DefinitionName.Table
-    const tableDefinition = appSchema.definitions[tableDefinitionName];
-    const { visualization, targetAnnotation, namespace } = analyzeViewAnnotation(templateAnnotation, generateParameters.entityType?.annotations.UI, generateParameters.serviceAVT, undefined, ux_specification_types_1.Visualization.LineItem, generateParameters.logger);
-    if (visualization) {
-        const annotationTerm = visualization.split('.')[1];
-        const annotationTermInSchema = `${ux_specification_types_1.DefinitionName.LineItems}OfSPV::${(0, common_1.prepareRef)(annotationTerm)}`;
-        const spvTable = (appSchema.definitions[`${tableDefinitionName}SPV`] = JSON.parse(JSON.stringify(appSchema.definitions[tableDefinitionName])));
-        delete spvTable[ux_specification_types_1.SchemaTag.isViewNode];
-        (0, common_1.addDefinitionRef)(spvTable.properties.toolBar, ux_specification_types_1.DefinitionName.ToolBar, annotationTermInSchema);
-        // Switch from generic column to specific definition
-        spvTable[ux_specification_types_1.SchemaTag.annotationPath] = targetAnnotation;
-        spvTable.properties.columns = {};
-        (0, common_1.addDefinitionRef)(spvTable.properties.columns, annotationTermInSchema);
-        delete tableDefinition.properties;
-        (0, common_1.addDefinitionRef)(tableDefinition, `${tableDefinitionName}SPV`);
-        tableDefinition[ux_specification_types_1.SchemaTag.annotationPath] = `/${namespace}/@${templateAnnotation}`;
-        const lineItemAnnotation = generateParameters.entityType?.annotations.UI[annotationTerm];
-        if (!lineItemAnnotation) {
-            (0, extensionLogger_1.log)(generateParameters.logger, {
-                severity: "error" /* LogSeverity.Error */,
-                message: i18next_1.default.t('NOTARGET', { target: annotationTerm })
-            });
-        }
-        const dataForLineItem = {
-            isObjectPage: false,
-            appSchema,
-            lineItemAnnotation,
-            entityType: generateParameters.entityType,
-            oDataServiceAVT: generateParameters.serviceAVT,
-            lineItemId: annotationTermInSchema
-        };
-        (0, utils_2.addLineItemsTypeToSchema)(dataForLineItem);
-        const annotationTermQualifier = annotationTerm.split('#')?.[1];
-        const sectionIdInManifest = annotationTermQualifier
-            ? `@${"com.sap.vocabularies.UI.v1.LineItem" /* UIAnnotationTerms.LineItem */}#${annotationTermQualifier}`
-            : `@${"com.sap.vocabularies.UI.v1.LineItem" /* UIAnnotationTerms.LineItem */}`;
-        (0, utils_2.addCustomColumnDefinition)(appSchema, v4Page, generateParameters.logger, undefined, annotationTermInSchema, sectionIdInManifest);
-        (0, utils_2.addFragmentEnumForAnchor)(appSchema, annotationTermInSchema, v4Page, undefined, sectionIdInManifest);
-        const schemaAdjustmentParameters = {
-            appSchema,
-            v4Page,
-            tableDefinitionId: `${tableDefinitionName}SPV`,
-            facetDefinitionId: annotationTermInSchema,
-            dataForLineItem
-        };
-        applyLRTableSchemaAdjustments(schemaAdjustmentParameters);
-        // Table toolbar actions with custom actions
-        const schemaIdForToolbarActions = `${ux_specification_types_1.DefinitionName.Actions}<${annotationTermInSchema}>`;
-        const customColumnDefinitionName = (0, common_1.getCustomExtensionDefinitionName)(appSchema, annotationTermInSchema, ux_specification_types_1.DefinitionName.CustomTableAction);
-        (0, utils_2.addCustomActionDefinition)(appSchema, v4Page, generateParameters.logger, (0, common_1.getDefinitionKey)(customColumnDefinitionName), schemaIdForToolbarActions, sectionIdInManifest);
-        (0, utils_2.addEnumForActionAnchor)(appSchema, schemaIdForToolbarActions, ux_specification_types_1.DefinitionName.CustomActionPosition);
-    }
-    else {
-        tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ToolBarLR}`;
-        // Switch from generic column to specific definition
-        (0, common_1.addDefinitionRef)(tableDefinition.properties.columns, ux_specification_types_1.DefinitionName.LineItems);
-        const lineItemAnnotation = generateParameters.entityType?.annotations?.[alias]?.LineItem;
-        if (!lineItemAnnotation && !v4Page.options?.settings?.views?.paths) {
-            (0, extensionLogger_1.log)(generateParameters.logger, {
-                severity: "error" /* LogSeverity.Error */,
-                message: i18next_1.default.t('NOLINEITEMS')
-            });
-        }
-        const dataForLineItem = {
-            isObjectPage: false,
-            appSchema,
-            lineItemAnnotation,
-            entityType: generateParameters.entityType,
-            oDataServiceAVT: generateParameters.serviceAVT,
-            lineItemId: ux_specification_types_1.DefinitionName.LineItems
-        };
-        (0, utils_2.addLineItemsTypeToSchema)(dataForLineItem);
-        (0, utils_2.addCustomColumnDefinition)(appSchema, v4Page, generateParameters.logger);
-        (0, utils_2.addFragmentEnumForAnchor)(appSchema, ux_specification_types_1.DefinitionName.LineItems, v4Page);
-        const schemaAdjustmentParameters = {
-            appSchema,
-            v4Page,
-            tableDefinitionId: tableDefinitionName,
-            facetDefinitionId: ux_specification_types_1.DefinitionName.LineItems,
-            dataForLineItem
-        };
-        applyLRTableSchemaAdjustments(schemaAdjustmentParameters);
-        if (lineItemAnnotation && !v4Page.options?.settings?.views?.paths) {
-            tableDefinition[ux_specification_types_1.SchemaTag.annotationPath] = (0, common_1.createAnnotationPath)(generateParameters.entityType?.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
-        }
-        // Table toolbar actions with custom actions
-        const schemaIdForActions = `${ux_specification_types_1.DefinitionName.Actions}<${(0, common_1.prepareRef)(ux_specification_types_1.DefinitionName.LineItems)}>`;
-        (0, utils_2.addCustomActionDefinition)(appSchema, v4Page, generateParameters.logger, undefined, schemaIdForActions);
-        (0, utils_2.addEnumForActionAnchor)(appSchema, schemaIdForActions, ux_specification_types_1.DefinitionName.CustomActionPosition);
-    }
-    // Add "manifestPath" for table properties
-    addManifestPathsToPropertiesLR(appSchema, tableDefinitionName, tableDefinition, {
-        pageName: v4Page.id,
-        manifest: generateParameters.manifest,
-        targetAnnotation
-    });
-}
 /**
  * Checks for the default annotation path to use for LR table.
  *
@@ -1084,9 +915,13 @@ function addManifestPathsToPropertiesLR(appSchema, definitionName, definition, p
         // Default annotation path
         targetAnnotation = `@${"com.sap.vocabularies.UI.v1.LineItem" /* UIAnnotationTerms.LineItem */}`;
     }
+    const entitySet = pathParams.viewConfig?.entitySet;
+    if (entitySet) {
+        targetAnnotation = entitySet ? `/${entitySet}/${targetAnnotation}` : targetAnnotation;
+    }
     (0, utils_1.addManifestPathsToProperties)(appSchema, definitionName, definition, {
         ...pathParams,
-        pathsParts: [targetAnnotation, '', targetAnnotation]
+        pathsParts: [targetAnnotation, '', targetAnnotation, pathParams.viewConfig]
     });
 }
 /**