@sap/ux-specification 1.142.8 → 1.142.10

package/dist/specification/src/sync/v4/generate/list-report/listReport.js

@@ -198,44 +198,125 @@ function applyCustomFilterFields(appSchema, selectionFieldsDefinition, v4Page) {
     }
 }
 /**
+ * Defines annotation-based actions for a chart toolbar by reading the UI.Chart Actions collection
+ * and adding definition for each action (DataFieldForAction, DataFieldForActionGroup, DataFieldForIntentBasedNavigation).
  *
  * @param appSchema - The app JSON schema to be updated
  * @param schemaIdForActions - The schema ID for the actions to be defined
  * @param annotations - The UI annotations for the given entity type
- * @param targetAnnotation - The target annotation for the actions
+ * @param targetAnnotation - The target annotation for a chart
  * @param entityType - The entity type as part of the AVT ConvertedMetadata
+ * @param oDataServiceAVT - Combined service metadata, as returned by annotation vocabularies tools.
  */
-function defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType) {
-    appSchema.definitions[schemaIdForActions] = JSON.parse(JSON.stringify(appSchema.definitions['Actions']));
-    const actions = appSchema.definitions[schemaIdForActions];
+function defineChartAnnotationActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType, oDataServiceAVT) {
+    const actions = appSchema?.definitions?.[schemaIdForActions];
     actions.properties = {};
     actions.additionalProperties = false;
     const chartAnnotation = annotations[targetAnnotation?.split(`${ux_specification_types_1.UIVOCABULARY}.`)[1]];
     if (chartAnnotation && chartAnnotation.Actions) {
         let i = 0;
         chartAnnotation.Actions.forEach((actionRecord) => {
-            const actionDefinition = (0, common_1.prepareRef)(`${ux_specification_types_1.DefinitionName.ChartToolBarAction}<${actionRecord.Action}>`);
-            const description = (0, common_1.getDataFieldDescription)(actionRecord, entityType);
-            const prefix = actionRecord.$Type.split(`${ux_specification_types_1.UIVOCABULARY}.`)[1];
-            const action = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
-                $ref: common_1.DEFINITION_LINK_PREFIX + actionDefinition,
-                description
-            });
-            //Add tags
-            action[ux_specification_types_1.SchemaTag.propertyIndex] = i;
-            action[ux_specification_types_1.SchemaTag.annotationType] = actionRecord.$Type;
-            action[ux_specification_types_1.SchemaTag.annotationPath] = `/${actionRecord.fullyQualifiedName}`;
-            //as ChartToolBarAction is an empty object, copy ViewToolBarAction and remove properties
-            appSchema.definitions[actionDefinition] = JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.ViewToolBarAction]));
-            // Apply decorators to the live definition (pass explicitly to avoid deep-copy in AppSchema constructor)
-            const actionDef = appSchema.definitions[actionDefinition];
-            new Decorator_1.Decorator({ schema: new sync_rules_1.AppSchema(appSchema) }).init(controls_1.ViewToolBarAction, undefined, actionDef);
-            appSchema.definitions[actionDefinition].properties = {};
-            appSchema.definitions[actionDefinition][ux_specification_types_1.SchemaTag.annotationPath] = actionRecord.fullyQualifiedName;
+            const strategy = common_1.dataFieldStrategyContext.getStrategy(actionRecord.$Type);
+            if (!strategy?.isBound(actionRecord)) {
+                const actionsAnnotationPath = (0, common_1.createAnnotationPath)(entityType.fullyQualifiedName, chartAnnotation.term, chartAnnotation.qualifier);
+                if (strategy?.addLineItemDefinition) {
+                    strategy.addLineItemDefinition({
+                        schemaContext: {
+                            appSchema,
+                            isObjectPage: false,
+                            annotation: chartAnnotation,
+                            annotationId: schemaIdForActions,
+                            entityType,
+                            oDataServiceAVT
+                        },
+                        actions,
+                        annotationPath: `${actionsAnnotationPath}/Actions`,
+                        annotationRecord: actionRecord,
+                        index: i
+                    });
+                }
+            }
+            /* incrementing i unconditionally ensures correct annotation paths reflect each action's true position in the annotations */
             i++;
         });
     }
 }
+/**
+ * Creates custom action (including menus) and custom action position definitions for a chart toolbar.
+ * Returns `undefined` when targetAnnotation is not set.
+ *
+ * @param appSchema - The app schema definition
+ * @param context - Decorator context containing app and page information
+ * @param schemaIdForActions - Schema definition key for the chart actions container
+ * @param viewKey - The key to distinguish between different view types
+ * @param targetAnnotation - The target annotation for a chart
+ * @param logger - Extension logger
+ * @param v4Page - The page configuration from manifest
+ * @param entitySet - Optional entity set for manifest path prefixing
+ */
+function defineChartCustomActions(appSchema, context, schemaIdForActions, viewKey, targetAnnotation, logger, v4Page, entitySet) {
+    if (!targetAnnotation) {
+        return;
+    }
+    let prefix = '';
+    // Add prefix with entitySet for ListReport multiview scenario
+    if (viewKey !== `${ux_specification_types_1.DefinitionName.ALPChart}`) {
+        const entitySetName = typeof entitySet === 'string' ? entitySet : entitySet?.name;
+        prefix = entitySetName ? `/${entitySetName}/` : '';
+    }
+    const customActionDefinitionName = `${ux_specification_types_1.DefinitionName.CustomTableAction}<${viewKey}>`;
+    const customActionPositionDefinitionName = `${ux_specification_types_1.DefinitionName.CustomActionPosition}<${viewKey}>`;
+    const customActionDefinition = (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.CustomTableAction, viewKey, appSchema);
+    (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.CustomActionPosition, viewKey, appSchema);
+    if (customActionDefinition.properties) {
+        customActionDefinition.properties['position']['$ref'] =
+            `${common_1.DEFINITION_LINK_PREFIX}${customActionPositionDefinitionName}`;
+    }
+    const chartSchemaAdjustmentParameters = {
+        context,
+        logger,
+        v4Page,
+        facetDefinitionKey: viewKey,
+        customActionPosition: customActionPositionDefinitionName,
+        customActionDefinitionName: customActionDefinitionName,
+        scopedCustomActionDefinitionKey: customActionDefinitionName,
+        sectionActionsDefinitionKey: schemaIdForActions,
+        sectionIdInManifest: `${prefix}${targetAnnotation.substring(targetAnnotation.lastIndexOf('@'))}`
+    };
+    applyLRSchemaAdjustments({ chart: chartSchemaAdjustmentParameters });
+}
+/**
+ * Sets up all chart toolbar actions:
+ * - assigns the actions $ref to the chart toolbar definition,
+ * - defines annotation-based actions and custom actions and menus.
+ *
+ * @param context - Decorator context containing app and page information
+ * @param idForToolbar - Schema definition key for the chart toolbar
+ * @param viewKey - The key to distinguish between different view types
+ * @param annotations - The UI annotations for the given entity type
+ * @param targetAnnotation - The target annotation for the chart
+ * @param entityType - The entity type as part of the AVT ConvertedMetadata
+ * @param entitySet - Optional entity set for manifest path prefixing
+ */
+function defineChartActions(context, idForToolbar, viewKey, annotations, targetAnnotation, entityType, entitySet) {
+    const appSchema = context.schema.get();
+    const schemaIdForActions = `${ux_specification_types_1.DefinitionName.Actions}<${viewKey}>`;
+    if (appSchema.definitions?.[idForToolbar]) {
+        // Create new actions definition based on generic schema Actions definition
+        appSchema.definitions[schemaIdForActions] = JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.Actions]));
+        appSchema.definitions[idForToolbar]['properties'][ux_specification_types_1.PropertyName.actions]['$ref'] =
+            common_1.DEFINITION_LINK_PREFIX + schemaIdForActions;
+        defineChartAnnotationActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType, context.app?.getAVT());
+        defineChartCustomActions(appSchema, context, schemaIdForActions, viewKey, targetAnnotation, context.logger, context.page?.target, entitySet);
+        let viewEntitySet;
+        if (viewKey !== `${ux_specification_types_1.DefinitionName.ALPChart}`) {
+            viewEntitySet = typeof entitySet === 'string' ? entitySet : entitySet?.name;
+        }
+        (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(appSchema, context.page?.target?.id, schemaIdForActions, context.app?.getManifest(), targetAnnotation, {
+            entitySet: viewEntitySet
+        });
+    }
+}
 /**
  * Finds the right visualization for a given view.
  *
@@ -429,18 +510,16 @@ function addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annot
  */
 function addALPViews(context, viewsPaths, generateParameters, templateAnnotation, v4Page, tableDefinitionName) {
     const appSchema = context.schema.get();
-    const annotations = generateParameters.entityType?.annotations.UI;
+    const { entitySet, entityType, manifest, serviceAVT, logger } = generateParameters;
+    const annotations = entityType?.annotations.UI;
     //1. Chart View
     const chartAnnotationPath = viewsPaths?.[0]?.['primary']?.[0]?.[ux_specification_types_1.SchemaTag.annotationPath];
-    const { targetAnnotation } = analyzeViewAnnotation(chartAnnotationPath, annotations, generateParameters.serviceAVT, 'primary', undefined, generateParameters.logger);
+    const { targetAnnotation } = analyzeViewAnnotation(chartAnnotationPath, annotations, serviceAVT, 'primary', undefined, logger);
     addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annotations);
-    // Copy toolbar
-    const schemaIdForActions = `Actions<ALPChart>`;
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ViewChartToolBar].properties.actions['$ref'] =
-        common_1.DEFINITION_LINK_PREFIX + schemaIdForActions;
-    defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, generateParameters.entityType);
+    // Copy toolbar and define chart actions
+    defineChartActions(context, ux_specification_types_1.DefinitionName.ViewChartToolBar, ux_specification_types_1.DefinitionName.ALPChart, annotations, targetAnnotation, entityType, entitySet);
     //2. Table View
-    const { visualization: tableVisualization, targetAnnotation: target } = analyzeViewAnnotation(viewsPaths?.[0]?.['secondary']?.[0]?.[ux_specification_types_1.SchemaTag.annotationPath], annotations, generateParameters.serviceAVT, 'secondary', undefined, generateParameters.logger);
+    const { visualization: tableVisualization, targetAnnotation: target } = analyzeViewAnnotation(viewsPaths?.[0]?.['secondary']?.[0]?.[ux_specification_types_1.SchemaTag.annotationPath], annotations, serviceAVT, 'secondary', undefined, logger);
     const tableDefinition = appSchema.definitions[tableDefinitionName];
     if (tableVisualization || templateAnnotation) {
         tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ToolBarLR}`;
@@ -479,38 +558,42 @@ function addALPViews(context, viewsPaths, generateParameters, templateAnnotation
         const dataForLineItem = {
             isObjectPage: false,
             appSchema,
-            lineItemAnnotation: generateParameters.entityType?.annotations.UI[annotationTerm],
-            entityType: generateParameters.entityType,
-            oDataServiceAVT: generateParameters.serviceAVT,
-            lineItemId: ux_specification_types_1.DefinitionName.LineItems
+            annotation: annotations[annotationTerm],
+            entityType,
+            oDataServiceAVT: serviceAVT,
+            annotationId: ux_specification_types_1.DefinitionName.LineItems
         };
         (0, utils_2.addLineItemsTypeToSchema)(dataForLineItem, ux_specification_types_1.DefinitionName.ViewTableColumn);
         if (target) {
             appSchema.definitions[ux_specification_types_1.DefinitionName.ALPTable][ux_specification_types_1.SchemaTag.annotationPath] = target;
         }
-        const schemaAdjustmentParameters = {
+        const tableSchemaAdjustmentParameters = {
             context,
-            logger: generateParameters.logger,
+            logger,
             v4Page,
             tableDefinitionKey: ux_specification_types_1.DefinitionName.ALPTable,
             facetDefinitionKey: ux_specification_types_1.DefinitionName.LineItems,
             dataForLineItem,
-            entityType: generateParameters.entityType,
-            entitySet: generateParameters.entitySet,
+            entityType,
+            entitySet,
             customActionDefinitionName: ux_specification_types_1.DefinitionName.CustomTableAction,
-            sectionActionsDefinitionKey: `${ux_specification_types_1.DefinitionName.Actions}<${(0, common_1.prepareRef)(ux_specification_types_1.DefinitionName.LineItems)}>`
+            sectionActionsDefinitionKey: `${ux_specification_types_1.DefinitionName.Actions}<${(0, common_1.prepareRef)(ux_specification_types_1.DefinitionName.LineItems)}>`,
+            isCapService: generateParameters.isCapService
         };
-        applyLRSchemaAdjustments(schemaAdjustmentParameters);
+        applyLRSchemaAdjustments({ table: tableSchemaAdjustmentParameters });
         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' }];
+        // Add "manifestPath" for ALP table columns and actions
+        (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(appSchema, v4Page.id, ux_specification_types_1.DefinitionName.LineItems, manifest);
+        (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(appSchema, v4Page.id, `${ux_specification_types_1.DefinitionName.Actions}<${(0, common_1.prepareRef)(ux_specification_types_1.DefinitionName.LineItems)}>`, manifest);
     }
-    (0, utils_2.addCustomColumnDefinition)(appSchema, v4Page, generateParameters.logger);
+    (0, utils_2.addCustomColumnDefinition)(appSchema, v4Page, logger);
     // Add "manifestPath" for table properties
     addManifestPathsToPropertiesLR(appSchema, ux_specification_types_1.DefinitionName.ALPTable, tableDefinition, {
         pageName: v4Page.id,
-        manifest: generateParameters.manifest,
+        manifest,
         targetAnnotation: target
     });
 }
@@ -518,27 +601,26 @@ function addALPViews(context, viewsPaths, generateParameters, templateAnnotation
  * Modifies the app schema, adds the right line chart settings.
  *
  * @param inputParameters - list of input parameters as collected by the calling instance
+ * @param context - decorator context containing app and page information
  * @param annotations - UI annotations of the given entityType
  * @returns the ID for the chart view in schema
  */
-function addViewChartDefinitions(inputParameters, annotations) {
-    const idForChart = `${ux_specification_types_1.DefinitionName.LRChartView}<${inputParameters.viewKey}>`;
-    inputParameters.appSchema.definitions[idForChart] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[ux_specification_types_1.DefinitionName.LRChartView]));
-    delete inputParameters.appSchema.definitions[idForChart][ux_specification_types_1.SchemaTag.isViewNode];
-    inputParameters.appSchema.definitions[idForChart][ux_specification_types_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
-    if (inputParameters.navPropName) {
-        inputParameters.appSchema.definitions[idForChart]['navigationProperty'] = inputParameters.navPropName;
+function addViewChartDefinitions(inputParameters, context, annotations) {
+    const appSchema = context.schema.get();
+    const { entitySet, navPropName, targetAnnotation, targetEntityType, viewKey } = inputParameters;
+    const idForChart = `${ux_specification_types_1.DefinitionName.LRChartView}<${viewKey}>`;
+    appSchema.definitions[idForChart] = JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.LRChartView]));
+    delete appSchema.definitions[idForChart][ux_specification_types_1.SchemaTag.isViewNode];
+    appSchema.definitions[idForChart][ux_specification_types_1.SchemaTag.annotationPath] = targetAnnotation;
+    if (navPropName) {
+        appSchema.definitions[idForChart]['navigationProperty'] = navPropName;
     }
     //Copy toolbar
-    const idForToolbar = `${ux_specification_types_1.DefinitionName.ViewChartToolBar}<${inputParameters.viewKey}>`;
-    inputParameters.appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[ux_specification_types_1.DefinitionName.ViewChartToolBar]));
-    inputParameters.appSchema.definitions[idForChart]['properties'].toolBar.$ref =
-        `${common_1.DEFINITION_LINK_PREFIX}${idForToolbar}`;
-    //Copy actions
-    const schemaIdForActions = `${ux_specification_types_1.DefinitionName.Actions}<${inputParameters.viewKey}>`;
-    defineActions(inputParameters.appSchema, schemaIdForActions, annotations, inputParameters.targetAnnotation, inputParameters.targetEntityType);
-    inputParameters.appSchema.definitions[idForToolbar]['properties'][ux_specification_types_1.PropertyName.actions]['$ref'] =
-        `${common_1.DEFINITION_LINK_PREFIX}${schemaIdForActions}`;
+    const idForToolbar = `${ux_specification_types_1.DefinitionName.ViewChartToolBar}<${viewKey}>`;
+    appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.ViewChartToolBar]));
+    appSchema.definitions[idForChart]['properties'].toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}${idForToolbar}`;
+    //Copy actions from annotations
+    defineChartActions(context, idForToolbar, viewKey, annotations, targetAnnotation, targetEntityType, entitySet);
     return idForChart;
 }
 /**
@@ -546,15 +628,16 @@ function addViewChartDefinitions(inputParameters, annotations) {
  *
  * @param inputParameters - list of input parameters as collected by the calling instance
  * @param UIAnnotations - AVT UI annotations of the given entity type
- * @param appSchema - app schema
+ * @param context - decorator context containing app and page information
  * @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.
  * @param app - Represents the overall application structure, providing access to the manifest.
  */
-function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title, page, app) {
-    const idForChart = addViewChartDefinitions(inputParameters, UIAnnotations);
+function addViewChart(inputParameters, UIAnnotations, context, viewsDefinition, viewKey, title, page, app) {
+    const appSchema = context.schema.get();
+    const idForChart = addViewChartDefinitions(inputParameters, context, UIAnnotations);
     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;
@@ -565,8 +648,8 @@ function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition
         description: title ? title : titleOnHover,
         title: titleOnHover
     };
-    // Add "manifestPath" for table properties
-    addManifestPathsToPropertiesLR(inputParameters.appSchema, ux_specification_types_1.DefinitionName.LRChartView, chartViewDefinition, {
+    // Add "manifestPath" for chart properties
+    addManifestPathsToPropertiesLR(appSchema, ux_specification_types_1.DefinitionName.LRChartView, chartViewDefinition, {
         pageName: page.target.id,
         manifest: app.manifest,
         targetAnnotation: inputParameters.targetAnnotation,
@@ -601,22 +684,29 @@ function getLineItemRef(v4Page, entityType, viewKey, lineItemTerm, lineItemQuali
 /**
  * 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.
+ * Adjusts the schema for the chart by adjusting custom action and custom action menu definitions.
  *
- * @param {SchemaAdjustmentParameters} schemaAdjustmentParameters - Object containing the parameters required for schema adjustments. Includes the generate parameters, application schema, table definition ID, and facet definition ID.
+ * @param {SchemaAdjustmentParameters} schemaAdjustmentParameters - Object containing the parameters required for schema adjustments of the table and chart.
  */
-function applyLRSchemaAdjustments(schemaAdjustmentParameters) {
-    const { entityType, tableDefinitionKey, facetDefinitionKey, context } = schemaAdjustmentParameters;
-    const appSchema = context.schema.get();
-    // 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, facetDefinitionKey, entityType, ux_specification_types_1.DefinitionName.TableCreationModeLR);
-    // Apply decorator-based visibility rules for table properties
-    applyTableDecorators(schemaAdjustmentParameters);
-    // add columns to a enum, in this case enableMassEdit -> visibleFields and ignoredFields
-    (0, utils_2.addEnumForEnableMassEdit)(appSchema, tableDefinitionKey, facetDefinitionKey, entityType);
-    (0, inlineEdit_1.adjustInlineEdit)(schemaAdjustmentParameters, facetDefinitionKey);
-    // add the custom action and custom action menu definition
-    (0, actions_1.configureCustomActionDefinition)(schemaAdjustmentParameters);
+function applyLRSchemaAdjustments({ table, chart }) {
+    // in the future, all postgeneration adjustments for the LR Page table should be done here
+    if (table) {
+        const { entityType, tableDefinitionKey, facetDefinitionKey, context } = table;
+        const appSchema = context.schema.get();
+        // populate the creation fields for the table with the data from the columns
+        (0, utils_1.initializeCreationModeSchema)(appSchema, facetDefinitionKey, entityType, ux_specification_types_1.DefinitionName.TableCreationModeLR);
+        // Apply decorator-based visibility rules for table properties
+        applyTableDecorators(table);
+        // add columns to a enum, in this case enableMassEdit -> visibleFields and ignoredFields
+        (0, utils_2.addEnumForEnableMassEdit)(appSchema, tableDefinitionKey, facetDefinitionKey, entityType);
+        (0, inlineEdit_1.adjustInlineEdit)(table, facetDefinitionKey);
+        // add the custom action and custom action menu definition
+        (0, actions_1.configureCustomActionDefinition)(table);
+    }
+    // in the future, all postgeneration adjustments for the LR Page chart should be done here
+    if (chart) {
+        (0, actions_1.configureCustomActionDefinition)(chart);
+    }
 }
 /**
  * Retrieves the table settings from the manifest for a given line item reference.
@@ -635,13 +725,13 @@ function getTableSettingsFromManifest(v4Page, lineItemRef) {
  * This function uses the @hide and @message decorators defined on the Table and TableCreationModeLR classes
  * to conditionally hide properties and show warning messages based on table type and settings.
  *
- * @param schemaAdjustmentParameters - Parameters containing schema, page, and table definition information
+ * @param tableSchemaAdjustmentParameters - Parameters containing schema, page, and table definition information
  */
-function applyTableDecorators(schemaAdjustmentParameters) {
-    const { tableDefinitionKey, facetDefinitionKey, v4Page, viewKey, entityType, dataForLineItem, context } = schemaAdjustmentParameters;
+function applyTableDecorators(tableSchemaAdjustmentParameters) {
+    const { tableDefinitionKey, facetDefinitionKey, v4Page, viewKey, entityType, dataForLineItem, context } = tableSchemaAdjustmentParameters;
     const appSchema = context.schema.get();
     // Get the line item reference for looking up table settings in manifest
-    const lineItemRef = getLineItemRef(v4Page, entityType, viewKey, entityType?.annotations?.UI?.LineItem?.term, dataForLineItem?.lineItemAnnotation?.qualifier);
+    const lineItemRef = getLineItemRef(v4Page, entityType, viewKey, entityType?.annotations?.UI?.LineItem?.term, dataForLineItem?.annotation?.qualifier);
     let schemaDefinitionName;
     if (viewKey) {
         // For multi-view scenario, initialize a view-specific personalization schema to isolate decorator messages per view
@@ -650,12 +740,19 @@ function applyTableDecorators(schemaAdjustmentParameters) {
     // Get table settings from manifest and build custom context for decorator evaluation
     const tableSettings = getTableSettingsFromManifest(v4Page, lineItemRef);
     // Check InsertRestrictions to determine if entity/navigation allows insertion
-    const { entitySet, navigationPath } = schemaAdjustmentParameters;
+    const { entitySet, navigationPath } = tableSchemaAdjustmentParameters;
     const isInsertable = (0, utils_1.getInsertableForEntitySet)(entitySet, navigationPath);
+    // Calculate available table types based on entity set capabilities
+    // For contained navigation (ContainsTarget=true), ensure we use the correct EntityType
+    const entitySetForCapabilities = (0, utils_1.ensureEntitySetWithCorrectType)(entitySet, dataForLineItem?.entityType);
+    // Use isCapService from parameters, default to false if not provided
+    // Pass minUI5Version to enable version-gated features (1.142.0+ for capability-based restrictions)
+    const tableTypeOptions = (0, utils_1.getTableTypeOptions)(entitySetForCapabilities, tableSchemaAdjustmentParameters.isCapService ?? false, context.app?.config.minUI5Version);
     const customContext = {
         ...tableSettings,
-        type: tableSettings?.type ?? exports.DEFAULT_TABLE_TYPE,
-        isInsertable
+        type: tableSettings?.type,
+        isInsertable,
+        availableTableTypes: tableTypeOptions.options
     };
     // Get the table definition to apply decorators to
     const tableDefinition = appSchema.definitions[tableDefinitionKey];
@@ -725,10 +822,11 @@ function applyTableDecorators(schemaAdjustmentParameters) {
  * @param generateParameters.serviceAVT - OData service AVT information
  * @param generateParameters.entityType - entity type of the current page
  * @param generateParameters.entitySet - The specified entity set for the view.
+ * @param generateParameters.isCapService - indicates whether the service is a CAP service
  * @param {DecoratorContext} context - The context object providing access to the application schema, page, and app information necessary for schema modifications.
  * @param {ExtensionLogger} logger - Logger for recording informational or error messages during the schema adjustment process.
  */
-function addViewLineItems(inputParameters, viewsDefinition, visualization, templateAnnotation, { serviceAVT, entityType, entitySet }, context, logger) {
+function addViewLineItems(inputParameters, viewsDefinition, visualization, templateAnnotation, { serviceAVT, entityType, entitySet, isCapService }, context, logger) {
     const { app, page } = context;
     const tableId = `${ux_specification_types_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
     const schemaIdForColumns = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
@@ -758,10 +856,10 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
     const dataForLineItem = {
         isObjectPage: false,
         appSchema: inputParameters.appSchema,
-        lineItemAnnotation: inputParameters.targetEntityType?.annotations.UI[annotationTerm],
+        annotation: inputParameters.targetEntityType?.annotations.UI[annotationTerm],
         entityType: inputParameters.targetEntityType,
         oDataServiceAVT: serviceAVT,
-        lineItemId: schemaIdForColumns
+        annotationId: schemaIdForColumns
     };
     (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
@@ -774,7 +872,7 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
     const customActionDefinition = inputParameters.appSchema.definitions[customActionDefinitionKey];
     customActionDefinition.properties.position.$ref =
         `${common_1.DEFINITION_LINK_PREFIX}${customActionPositionDefinitionKey}`;
-    const schemaAdjustmentParameters = {
+    const tableSchemaAdjustmentParameters = {
         logger: logger,
         context,
         v4Page: page.target,
@@ -789,9 +887,10 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         scopedCustomActionDefinitionKey: customActionDefinitionKey,
         customActionDefinitionName: ux_specification_types_1.DefinitionName.ViewCustomAction,
         sectionIdInManifest,
-        customActionPosition: customActionPositionDefinitionKey
+        customActionPosition: customActionPositionDefinitionKey,
+        isCapService
     };
-    applyLRSchemaAdjustments(schemaAdjustmentParameters);
+    applyLRSchemaAdjustments({ table: tableSchemaAdjustmentParameters });
     // Add "manifestPath" for table properties
     addManifestPathsToPropertiesLR(inputParameters.appSchema, ux_specification_types_1.DefinitionName.LRTableView, lrTableView, {
         pageName: page.target.id,
@@ -803,7 +902,9 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         }
     }, true);
     // Add "manifestPath" for view actions
-    (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(inputParameters.appSchema, page.target.id, schemaIdForActions, app.getManifest(), inputParameters.targetAnnotation, inputParameters.entitySet);
+    (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(inputParameters.appSchema, page.target.id, schemaIdForActions, app.getManifest(), inputParameters.targetAnnotation, {
+        entitySet: inputParameters.entitySet
+    });
 }
 /**
  * Adds the schema tags to a given view.
@@ -841,7 +942,9 @@ function addViewCustomExtensions(commonInputParameters, visualization, v4Page, m
     (0, utils_2.addCustomColumnDefinition)(commonInputParameters.appSchema, v4Page, logger, `${ux_specification_types_1.DefinitionName.ViewCustomColumn}<${schemaIdForColumns}>`, schemaIdForColumns, sectionIdInManifest);
     (0, utils_2.addFragmentEnumForAnchor)(commonInputParameters.appSchema, schemaIdForColumns, v4Page, `${ux_specification_types_1.DefinitionName.ViewPosition}<${schemaIdForColumns}>`, sectionIdInManifest);
     // Add "manifestPath" for view columns
-    (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(commonInputParameters.appSchema, v4Page.id, schemaIdForColumns, manifest, commonInputParameters.targetAnnotation, commonInputParameters.entitySet);
+    (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(commonInputParameters.appSchema, v4Page.id, schemaIdForColumns, manifest, commonInputParameters.targetAnnotation, {
+        entitySet: commonInputParameters.entitySet
+    });
     // Remove generic position
     if (commonInputParameters.appSchema.definitions.Position) {
         delete commonInputParameters.appSchema.definitions.Position;
@@ -870,7 +973,7 @@ function addLRViewParts(visualization, viewsDefinition, commonInputParameters, {
     }
     else if (visualization?.indexOf('Chart') > -1) {
         //Add Chart view
-        addViewChart(commonInputParameters, uiAnnotations, commonInputParameters.appSchema, viewsDefinition, commonInputParameters.viewKey, commonInputParameters.title, page, app);
+        addViewChart(commonInputParameters, uiAnnotations, context, viewsDefinition, commonInputParameters.viewKey, commonInputParameters.title, page, app);
     }
     else if (view['template']) {
         const titleOnHover = view['label'] || `Custom View (key: ${commonInputParameters.viewKey})`;