@sap/ux-specification 1.124.33 → 1.124.35

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

@@ -11,20 +11,18 @@ exports.analyzeViewAnnotation = analyzeViewAnnotation;
 exports.addALPViews = addALPViews;
 exports.addTagsToView = addTagsToView;
 exports.addLRViewParts = addLRViewParts;
-exports.getDefaultAnnotationPath = getDefaultAnnotationPath;
 exports.addHeaderActions = addHeaderActions;
 exports.addManifestPathsToPropertiesLR = addManifestPathsToPropertiesLR;
 exports.generateListReportSchemaV4 = generateListReportSchemaV4;
-const utils_1 = require("../utils/utils");
-const utils_2 = require("../utils/utils");
+const utils_1 = require("../../utils");
+const utils_2 = require("../../utils");
 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 Page_1 = require("../sync-rules/Page");
-const App_1 = require("../sync-rules/App");
-const AppSchema_1 = require("../sync-rules/AppSchema");
+const extensionLogger_1 = require("../../../../extensionLogger");
+const common_1 = require("../../../common");
+const sync_rules_1 = require("../../sync-rules");
 const ListReportUtils_1 = require("./ListReportUtils");
+const controls_1 = require("../../export/controls");
 const ROOT_PROPERTIES_ORDER = ['header', 'filterBar', 'chart', 'table'];
 const UILINEITEM = '@UI.LineItem';
 /**
@@ -38,6 +36,7 @@ const UILINEITEM = '@UI.LineItem';
  * @returns {Definition} - the updated selection fields definition
  */
 function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation, selectionFieldsDefinition, qualifier) {
+    // No @validity check needed here
     if (!selectionFieldsDefinition) {
         selectionFieldsDefinition = appSchema.definitions[ux_specification_types_1.DefinitionName.SelectionFields];
         selectionFieldsDefinition.additionalProperties = false;
@@ -49,8 +48,9 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation, se
     if (selectionFieldsAnnotation) {
         let i = 0;
         selectionFieldsAnnotation?.forEach((selectionField) => {
+            const value = selectionField.value ?? `UnknownField${i}`;
             let description = selectionField.value;
-            const fieldDefinition = 'SelectionField::' + (0, common_1.prepareRef)(selectionField.value);
+            const fieldDefinition = 'SelectionField::' + (0, common_1.prepareRef)(value);
             if (selectionField.type === 'PropertyPath') {
                 description = (0, common_1.getLabelForPropertyPath)(selectionField, entityType);
             }
@@ -66,10 +66,14 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation, se
                 additionalProperties: false,
                 ...(dataType && { dataType })
             };
+            if (selectionField.value === undefined) {
+                // Add message about unresolvable value for selection field
+                (0, common_1.addMessageToSchema)(appSchema.definitions[fieldDefinition], {
+                    text: i18next_1.default.t('UNRESOLVABLE_VALUE_OF_SELECTION_FIELD')
+                });
+            }
             appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
-            appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.keys] = [
-                { name: ux_specification_types_1.SchemaKeyName.value, value: `${selectionField.value}` }
-            ];
+            appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.value, value: `${value}` }];
             if (selectionField.$target?.fullyQualifiedName.indexOf('@') > -1) {
                 appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.target] = selectionField.$target.fullyQualifiedName
                     .split('@')[0]
@@ -128,6 +132,7 @@ function getPropertiesIndex(selectionFields, entityType) {
  * @param selectionFields - The selection fields annotation to be processed
  */
 function addVisualFilters(entityType, appSchema, visualFiltersManifest, selectionFields) {
+    // No @validity check needed here
     const propertiesIndex = getPropertiesIndex(selectionFields, entityType);
     const visualFilters = appSchema.definitions[ux_specification_types_1.DefinitionName.VisualFilters];
     visualFilters.properties = {};
@@ -169,6 +174,8 @@ function applyCustomFilterFields(appSchema, selectionFieldsDefinition, v4Page) {
     };
     (0, utils_2.addCustomFilterFieldDefinition)(appSchema, selectionFieldsDefinition, v4Page);
     const customSectionDefinition = appSchema.definitions[ux_specification_types_1.DefinitionName.CustomFilterFieldPosition];
+    // Instantiate for @validity check
+    new controls_1.CustomFilterFieldPosition().init();
     if (typeof customSectionDefinition === 'object') {
         (0, common_1.addDescriptiveEnumDefinition)(appSchema, selectionFieldsDefinition, {
             schema: customSectionDefinition,
@@ -242,6 +249,8 @@ function defineActions(appSchema, schemaIdForActions, annotations, targetAnnotat
             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]));
+            // Instantiate for @validity check
+            new controls_1.ViewToolBarAction().init();
             appSchema.definitions[actionDefinition].properties = {};
             appSchema.definitions[actionDefinition][ux_specification_types_1.SchemaTag.annotationPath] = actionRecord.fullyQualifiedName;
             i++;
@@ -425,6 +434,8 @@ function addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annot
     chartView[ux_specification_types_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
     chartView[ux_specification_types_1.SchemaTag.key] = 'primary';
     chartView[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.key, value: 'primary' }];
+    // Instantiate for @validity check
+    new controls_1.ALPChart().init();
 }
 /**
  * Adds the ALP views to the app-specific schema.
@@ -510,7 +521,7 @@ function addALPViews(appSchema, viewsPaths, generateParameters, templateAnnotati
     addManifestPathsToPropertiesLR(appSchema, ux_specification_types_1.DefinitionName.ALPTable, tableDefinition, {
         pageName: v4Page.id,
         manifest: generateParameters.manifest,
-        targetAnnotation
+        targetAnnotation: target
     });
 }
 /**
@@ -549,33 +560,50 @@ 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.
+ * @param app - Represents the overall application structure, providing access to the manifest.
  */
-function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title) {
+function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title, page, app) {
     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.target.id,
+        manifest: app.manifest,
+        targetAnnotation: inputParameters.targetAnnotation,
+        viewConfig: {
+            key: viewKey,
+            entitySet: inputParameters.entitySet
+        }
+    });
 }
 /**
  * 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 app - the application object containing manifest and other app-specific information.
+ * @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, app, logger) {
     const tableId = `${ux_specification_types_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
-    const viewId = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
+    const schemaIdForColumns = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
+    const schemaIdForActions = `${ux_specification_types_1.DefinitionName.Actions}<${schemaIdForColumns}>`;
     const lrTableView = (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.LRTableView, inputParameters.viewKey, inputParameters.appSchema);
     delete lrTableView[ux_specification_types_1.SchemaTag.isViewNode];
     lrTableView[ux_specification_types_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
@@ -586,14 +614,14 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         lrTableView['entitySet'] = inputParameters.entitySet;
     }
     //Copy toolbar
-    (0, common_1.addDefinitionRef)(lrTableView.properties.toolBar, ux_specification_types_1.DefinitionName.ToolBar, viewId);
+    (0, common_1.addDefinitionRef)(lrTableView.properties.toolBar, ux_specification_types_1.DefinitionName.ToolBar, schemaIdForColumns);
     const title = `Table View (key: ${inputParameters.viewKey})`;
     viewsDefinition.properties[inputParameters.viewKey] = {
         $ref: `${common_1.DEFINITION_LINK_PREFIX}${tableId}`,
         description: inputParameters.title || title,
         title
     };
-    (0, common_1.addDefinitionRef)(lrTableView.properties.columns, viewId);
+    (0, common_1.addDefinitionRef)(lrTableView.properties.columns, schemaIdForColumns);
     lrTableView.properties.annotationPath[ux_specification_types_1.SchemaTag.hidden] = true;
     lrTableView.properties.index[ux_specification_types_1.SchemaTag.hidden] = true;
     lrTableView.properties.entitySet[ux_specification_types_1.SchemaTag.hidden] = true;
@@ -604,13 +632,18 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         lineItemAnnotation: inputParameters.targetEntityType?.annotations.UI[annotationTerm],
         entityType: inputParameters.targetEntityType,
         oDataServiceAVT: serviceAVT,
-        lineItemId: viewId
+        lineItemId: schemaIdForColumns
     };
     (0, utils_2.addLineItemsTypeToSchema)(dataForLineItem, ux_specification_types_1.DefinitionName.ViewTableColumn, ux_specification_types_1.DefinitionName.ViewCustomColumn, ux_specification_types_1.DefinitionName.ViewCustomAction);
+    // 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
+        pageName: page.target.id,
+        manifest: app.manifest,
+        targetAnnotation: inputParameters.targetAnnotation,
+        viewConfig: {
+            key: inputParameters.viewKey,
+            entitySet: inputParameters.entitySet
+        }
     });
 }
 /**
@@ -630,57 +663,43 @@ 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.
  *
  * @param commonInputParameters - list of input parameters as collected by the calling instance
  * @param visualization - visualization of the annotation
  * @param v4Page - the given page in manifest
+ * @param manifest - The application manifest
  * @param logger - extension logger
  */
-function addViewCustomExtensions(commonInputParameters, visualization, v4Page, logger) {
-    const sectionId = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${commonInputParameters.viewKey}`;
+function addViewCustomExtensions(commonInputParameters, visualization, v4Page, manifest, logger) {
+    const schemaIdForColumns = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${commonInputParameters.viewKey}`;
     const sectionIdPrefix = commonInputParameters.entitySet ? `/${commonInputParameters.entitySet}/` : '';
     const sectionIdInManifest = `${sectionIdPrefix}@${"com.sap.vocabularies.UI.v1.LineItem" /* UIAnnotationTerms.LineItem */}${visualization.split(ux_specification_types_1.Visualization.LineItem)[1]}`;
-    const viewColumnDefinition = (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewCustomColumn, sectionId, commonInputParameters.appSchema);
-    (0, common_1.addDefinitionRef)(viewColumnDefinition.properties.position, ux_specification_types_1.DefinitionName.ViewPosition, sectionId);
-    (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewPosition, sectionId, commonInputParameters.appSchema);
-    (0, utils_2.addCustomColumnDefinition)(commonInputParameters.appSchema, v4Page, logger, `${ux_specification_types_1.DefinitionName.ViewCustomColumn}<${sectionId}>`, sectionId, sectionIdInManifest);
-    (0, utils_2.addFragmentEnumForAnchor)(commonInputParameters.appSchema, sectionId, v4Page, `${ux_specification_types_1.DefinitionName.ViewPosition}<${sectionId}>`, sectionIdInManifest);
+    const viewColumnDefinition = (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewCustomColumn, schemaIdForColumns, commonInputParameters.appSchema);
+    (0, common_1.addDefinitionRef)(viewColumnDefinition.properties.position, ux_specification_types_1.DefinitionName.ViewPosition, schemaIdForColumns);
+    (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewPosition, schemaIdForColumns, commonInputParameters.appSchema);
+    (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);
     // Remove generic position
     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}>`;
+    const schemaIdForToolbarActions = `${ux_specification_types_1.DefinitionName.Actions}<${schemaIdForColumns}>`;
+    const customActionDefinitionKey = `${ux_specification_types_1.DefinitionName.ViewCustomAction}<${schemaIdForColumns}>`;
     (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}>`;
+    (0, common_1.parseSchemaDefinition)(ux_specification_types_1.DefinitionName.ViewCustomActionPosition, schemaIdForColumns, commonInputParameters.appSchema);
+    const customActionPositionDefinitionKey = `${ux_specification_types_1.DefinitionName.ViewCustomActionPosition}<${schemaIdForColumns}>`;
     const customActionDefinition = commonInputParameters.appSchema.definitions[customActionDefinitionKey];
     customActionDefinition.properties.position.$ref =
         `${common_1.DEFINITION_LINK_PREFIX}${customActionPositionDefinitionKey}`;
     (0, utils_2.addEnumForActionAnchor)(commonInputParameters.appSchema, schemaIdForToolbarActions, customActionPositionDefinitionKey);
+    // Add "manifestPath" for view actions
+    (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(commonInputParameters.appSchema, v4Page.id, schemaIdForToolbarActions, manifest, commonInputParameters.targetAnnotation, commonInputParameters.entitySet);
 }
 /**
  * Adds definition parts to a LR View (LineItem/Chart).
@@ -693,18 +712,19 @@ function addViewCustomExtensions(commonInputParameters, visualization, v4Page, l
  * @param generateParameters.entityType - entity type of the current page
  * @param generateParameters.logger - extension logger
  * @param page - the current page object
+ * @param app - the application object containing manifest and other app-specific information.
  * @param uiAnnotations - UI annotations of the given entityType
  * @param view - the given view
  */
-function addLRViewParts(visualization, viewsDefinition, commonInputParameters, { serviceAVT, entityType, logger }, page, uiAnnotations, view) {
+function addLRViewParts(visualization, viewsDefinition, commonInputParameters, { serviceAVT, entityType, logger }, page, app, 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);
-        addViewCustomExtensions(commonInputParameters, visualization, page.getPage(), logger);
+        addViewLineItems(commonInputParameters, viewsDefinition, visualization, commonInputParameters.targetAnnotation, { serviceAVT, entityType }, page, app, logger);
+        addViewCustomExtensions(commonInputParameters, visualization, page.target, app.getManifest(), 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, app);
     }
     else if (view['template']) {
         const titleOnHover = view['label'] || `Custom View (key: ${commonInputParameters.viewKey})`;
@@ -725,157 +745,19 @@ 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);
-        // 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);
-        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.
  *
- * @param v4Page - actual page in the manifest
- * @param entityType - actual entity type (AVT information)
- * @param templateType - The type of template being used (e.g., ListReportObjectPageV4 or AnalyticalListPageV4)
+ * @param page - the current page object
  * @returns annotation term
  */
-function getDefaultAnnotationPath(v4Page, entityType, templateType) {
-    if (v4Page.options.settings?.views?.paths && templateType === ux_specification_types_1.TemplateType.ListReportObjectPageV4) {
+function getDefaultAnnotationPath(page) {
+    const { entity: { type: entityType }, template: { type: templateType }, target } = page;
+    if (target?.options?.settings?.views?.paths && templateType === ux_specification_types_1.TemplateType.ListReportObjectPageV4) {
         return;
     }
-    if (v4Page.options.settings?.defaultTemplateAnnotationPath) {
-        return v4Page.options.settings.defaultTemplateAnnotationPath;
+    if (target?.options?.settings?.defaultTemplateAnnotationPath) {
+        return target?.options?.settings.defaultTemplateAnnotationPath;
     }
     if (templateType === ux_specification_types_1.TemplateType.ListReportObjectPageV4) {
         return (entityType?.annotations.UI?.SelectionPresentationVariant?.term ||
@@ -915,8 +797,9 @@ function addHeaderActions(appSchema, v4Page, logger) {
  * @param definitionName - The name of the definition/class whose properties are being processed.
  * @param definition - The definition object containing property schemas.
  * @param pathParams - Additional context required to compute manifest paths.
+ * @param handleRelative - A flag indicating whether to use relative paths for definition properties.
  */
-function addManifestPathsToPropertiesLR(appSchema, definitionName, definition, pathParams) {
+function addManifestPathsToPropertiesLR(appSchema, definitionName, definition, pathParams, handleRelative = false) {
     let targetAnnotation = undefined;
     if (pathParams.targetAnnotation) {
         const annotationParts = pathParams.targetAnnotation?.split('/');
@@ -926,10 +809,19 @@ 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: [
+            pathParams.sectionId ? undefined : targetAnnotation,
+            pathParams.columnKey ? pathParams.columnKey : '',
+            targetAnnotation,
+            pathParams.viewConfig
+        ]
+    }, handleRelative);
 }
 /**
  * Adds 'manifestPath' to static nodes in schema.
@@ -938,6 +830,8 @@ function addManifestPathsToPropertiesLR(appSchema, definitionName, definition, p
  * @param pathParams - Additional context required to compute manifest paths.
  */
 function addManifestPathsToStaticNodes(appSchema, pathParams) {
+    // Add "manifestPath" for current page
+    appSchema['manifestPath'] = (0, utils_1.getPageManifestPath)(pathParams);
     // Root level - rules stored on page class level
     addManifestPathsToPropertiesLR(appSchema, ux_specification_types_1.PageTypeV4.ListReport, appSchema, pathParams);
     // Other definitions
@@ -962,17 +856,24 @@ class ListReportPage {
      * @param contextPath - context path of the page
      */
     constructor(generateParameters, schema, templateName, contextPath) {
-        this.schema = new AppSchema_1.AppSchema(schema);
-        this.app = (0, App_1.createApp)(generateParameters.manifest, generateParameters.serviceAVT, generateParameters.logger);
-        this.page = new Page_1.Page(this.app, { name: templateName, type: generateParameters.templateType }, generateParameters.entitySet, contextPath);
+        const template = { name: templateName, type: generateParameters.templateType };
+        this.appSchema = new sync_rules_1.AppSchema(schema);
+        this.app = (0, sync_rules_1.createApp)(generateParameters.manifest, generateParameters.serviceAVT, generateParameters.logger);
+        this.page = new sync_rules_1.Page(this.app, template, generateParameters.entitySet, generateParameters.entityType, contextPath);
+        this.logger = this.app.logger;
+        this.page.addConfig({
+            isALP: template.type === ux_specification_types_1.TemplateType.AnalyticalListPageV4,
+            views: this.page.target?.options?.settings.views,
+            defaultAnnotation: getDefaultAnnotationPath(this.page)
+        });
     }
     /**
      * Cleans up the schema by hiding specific properties and removing unnecessary definitions.
      */
     cleanup() {
-        this.schema.hide(this.schema.getRootProperty([ux_specification_types_1.PropertyName.defaultTemplateAnnotationPath]));
-        this.schema.cleanup(['GenericColumns', 'Action']);
-        (0, common_1.updatePropertyIndices)(this.schema.getSchema(), ROOT_PROPERTIES_ORDER);
+        this.appSchema.hide(this.appSchema.getRootProperty([ux_specification_types_1.PropertyName.defaultTemplateAnnotationPath]));
+        this.appSchema.cleanup(['GenericColumns', 'Action']);
+        (0, common_1.updatePropertyIndices)(this.appSchema.get(), ROOT_PROPERTIES_ORDER);
     }
     /**
      * Generates the finalized schema for the List Report page.
@@ -980,20 +881,33 @@ class ListReportPage {
      * @returns The finalized schema for List Report page
      */
     generate() {
-        new ListReportUtils_1.GeneralListReportSettings(this.schema, this.page, this.app.getLogger()).instantiate();
-        if (!this.page.getPage()) {
-            return this.schema.finalize();
+        const params = {
+            appSchema: this.appSchema,
+            app: this.app,
+            page: this.page,
+            logger: this.logger
+        };
+        new ListReportUtils_1.GeneralListReportSettings(params).init();
+        if (!this.page.target) {
+            return this.appSchema.get();
         }
-        new ListReportUtils_1.Header(this.schema, this.page, this.app.getLogger()).instantiate();
-        new ListReportUtils_1.FilterBar(this.schema, this.page, this.app.getLogger()).instantiate();
-        new ListReportUtils_1.TableAndViews(this.schema, this.page, this.app.getLogger()).instantiate();
+        new controls_1.Header(params).init();
+        new controls_1.HeaderActions(params).init();
+        new controls_1.CustomHeaderAction(params).init();
+        new ListReportUtils_1.FilterBar(params).init();
+        new ListReportUtils_1.TableAndViews(params).init();
         // Add "manifestPath" for properties in static nodes
-        addManifestPathsToStaticNodes(this.schema.getSchema(), {
-            pageName: this.page.getPage().id,
+        addManifestPathsToStaticNodes(this.appSchema.get(), {
+            pageName: this.page.target.id,
             manifest: this.app.getManifest()
         });
+        // Add "manifestPath" for custom header actions
+        const definitionNames = [ux_specification_types_1.DefinitionName.HeaderActions];
+        definitionNames.forEach((definitionName) => {
+            (0, ListReportUtils_1.addManifestPathsToDefinitionPropertiesLR)(this.appSchema.get(), this.page.target.id, definitionName, this.app.getManifest());
+        });
         this.cleanup();
-        return this.schema.finalize();
+        return this.appSchema.get();
     }
 }
 /**
@@ -1010,7 +924,7 @@ function generateListReportSchemaV4(generateParameters, genericSchema, templateN
     const listReport = new ListReportPage(generateParameters, genericSchema, templateName, contextPath);
     if (!listReport.app.getManifest()) {
         listReport.cleanup();
-        return listReport.schema.finalize();
+        return listReport.appSchema.get();
     }
     return listReport.generate();
 }