@sap/ux-specification 1.90.25 → 1.90.28

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

@@ -11,7 +11,7 @@ const extensionLogger_1 = require("../../../extensionLogger");
 const common_1 = require("../../common");
 /**
  * Adds the selection fields to the app schema, as properties of the Filterbar
- * @param entityType - the entity type as part of the AVT ConverterOutput
+ * @param entityType - the entity type as part of the AVT ConvertedMetadata
  * @param appSchema - the app specific schema that shall get enhanced
  * @param selectionFieldsAnnotation - the UI.SelectionField annotation
  */
@@ -39,17 +39,19 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
         i++;
     });
 }
+/**
+ * Convert alias prefix of visualization if different from @UI (e.g. SAP__UI)
+ * @param visualization visualization of an (Selection)PresentationVariant
+ * @param alias - the given alias or namespace of the OData annotations
+ * @returns the converted visualization
+ */
 function convertVisualization(visualization, alias) {
-    if (!visualization) {
-        return;
-    }
-    if (visualization.startsWith(`@${common_1.UIVOCABULARY}`)) {
-        visualization = visualization.replace(common_1.UIVOCABULARY, '@UI');
+    if (visualization && !visualization.startsWith(`@${alias}`)) {
+        return visualization.replace(visualization.split('.')[0], '@UI');
     }
-    else if (!visualization.startsWith(`@${alias}`)) {
-        visualization = visualization.replace(visualization.split('.')[0], '@UI');
+    else {
+        return visualization;
     }
-    return visualization;
 }
 function defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType) {
     appSchema.definitions[schemaIdForActions] = JSON.parse(JSON.stringify(appSchema.definitions['Actions']));
@@ -61,7 +63,7 @@ function defineActions(appSchema, schemaIdForActions, annotations, targetAnnotat
         let i = 0;
         chartAnnotation.Actions.forEach((actionRecord) => {
             const actionDefinition = common_1.prepareRef(`${v4_1.DefinitionName.ChartToolBarAction}<${actionRecord.Action}>`);
-            const description = common_1.getDatafieldDescription(actionRecord, entityType);
+            const description = common_1.getDataFieldDescription(actionRecord, entityType);
             const prefix = actionRecord.$Type.split(`${common_1.UIVOCABULARY}.`)[1];
             const action = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
                 $ref: common_1.DEFINITION_LINK_PREFIX + actionDefinition,
@@ -120,6 +122,22 @@ function findTheRightVisualization(allVisualizations, alias, namespace, viewKey,
     }
     return { visualization, targetAnnotation };
 }
+/**
+ * An annotationPath must be analyzed, to find the right target annotation and visualization
+ *
+ */
+function analyzeChartAnnotation(namespace, annotationPath, annotationAVT, viewKey) {
+    const visualization = '@UI.Chart';
+    const targetAnnotationFullName = `/${namespace}/@${annotationPath}`;
+    let chartTitle;
+    if (annotationAVT['Title']) {
+        chartTitle = annotationAVT['Title'];
+    }
+    else {
+        chartTitle = `Chart View (${viewKey})`;
+    }
+    return { visualization, targetAnnotation: targetAnnotationFullName, chartTitle };
+}
 /**
  * An annotationPath must be analyzed, to find the right target annotation and visualization
  * @param annotationPath - given annotationPath
@@ -127,57 +145,76 @@ function findTheRightVisualization(allVisualizations, alias, namespace, viewKey,
  * @param viewKey - allows to distinguish the different view types (LR or ALP)
  * @param visualizationType - allows to find the right visualization if there are many.
  * @returns { visualization: string describing the visualization of the annotation,
- *            targetAnnotation: the target annotation behind the visualization }
+ *            targetAnnotation: the target annotation behind the visualization
+ *            namespace: namespace of the annotation,
+ *            title: title to be shown, derived from the annotation }
  */
 function analyzeViewAnnotation(annotationPath, uIAnnotations, generateParameters, viewKey, visualizationType) {
     let namespace = undefined;
+    let title = `View (${viewKey})`;
     const annotationInManifest = annotationPath === null || annotationPath === void 0 ? void 0 : annotationPath.split(`${common_1.UIVOCABULARY}.`)[1];
     const annotationAVT = annotationInManifest && uIAnnotations[annotationInManifest];
     if (!annotationAVT) {
-        return { visualization: undefined, targetAnnotation: undefined, namespace };
+        return { visualization: undefined, targetAnnotation: undefined, namespace, title };
     }
     namespace = annotationAVT.fullyQualifiedName.split('@com.sap.vocabularies.UI.v1.')[0];
     const alias = common_1.findAlias(common_1.UIVOCABULARY, generateParameters.serviceAVT);
     if (annotationInManifest.startsWith('PresentationVariant')) {
         const { visualization, targetAnnotation } = findTheRightVisualization(annotationAVT.Visualizations, alias, namespace, viewKey, visualizationType);
-        return { visualization, targetAnnotation, namespace };
+        if (annotationAVT.Text) {
+            title = annotationAVT.Text;
+        }
+        return { visualization, targetAnnotation, namespace, title };
     }
     else if (annotationInManifest.startsWith('SelectionPresentationVariant')) {
         const { visualization, targetAnnotation } = findTheRightVisualization(annotationAVT.PresentationVariant.Visualizations, alias, namespace, viewKey, visualizationType);
-        return { visualization, targetAnnotation, namespace };
+        if (annotationAVT.Text) {
+            title = annotationAVT.Text;
+        }
+        return { visualization, targetAnnotation, namespace, title };
+    }
+    else if (annotationInManifest.startsWith('SelectionVariant')) {
+        const visualization = '@UI.LineItem';
+        const targetAnnotation = `/${namespace}/@com.sap.vocabularies.UI.v1.LineItem`;
+        title = annotationAVT.Text ? annotationAVT.Text : `Table View (${viewKey})`;
+        return { visualization, targetAnnotation, namespace, title };
     }
-    else if (annotationInManifest.startsWith(v4_1.FacetBase.LineItem)) {
+    else if (annotationInManifest.startsWith('LineItem')) {
         const visualization = '@UI.LineItem';
         const targetAnnotation = `/${namespace}/@${annotationPath}`;
-        return { visualization, targetAnnotation, namespace };
+        title = annotationAVT.Text ? annotationAVT.Text : `Table View (${viewKey})`;
+        return { visualization, targetAnnotation, namespace, title };
     }
     else if (annotationInManifest.startsWith('Chart')) {
-        const visualization = '@UI.Chart';
-        const targetAnnotation = `/${namespace}/@${annotationPath}`;
-        return { visualization, targetAnnotation, namespace };
+        const { visualization, targetAnnotation, chartTitle } = analyzeChartAnnotation(namespace, annotationPath, annotationAVT, viewKey);
+        return { visualization, targetAnnotation, namespace, title: chartTitle };
     }
+    return { visualization: undefined, targetAnnotation: undefined, namespace, title };
 }
 /**
  * Adds the ALP chart view to the app-specific schema
  * @param {Definition} appSchema - app-specific JSON schema
  * @param targetAnnotation - target annotation of the chart view, as determined by analyzeViewAnnotation
- * @param {Array<Object>} viewsPaths - views' paths' section in the manifest
  * @param annotations - UI annotations, as determined by AVT
  */
-function addALPChartView(appSchema, targetAnnotation, viewsPaths, annotations) {
+function addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annotations) {
     const chartView = appSchema.definitions[v4_1.DefinitionName.ALPChartView];
     appSchema.definitions[v4_1.DefinitionName.ALPChart] = JSON.parse(JSON.stringify(chartView));
     delete appSchema.definitions[v4_1.DefinitionName.ALPChart][v4_1.SchemaTag.isViewNode];
-    appSchema.definitions[v4_1.DefinitionName.ALPChart][v4_1.SchemaTag.annotationPath] = targetAnnotation;
+    if (targetAnnotation) {
+        appSchema.definitions[v4_1.DefinitionName.ALPChart][v4_1.SchemaTag.annotationPath] = targetAnnotation;
+    }
     appSchema.definitions[v4_1.DefinitionName.ALPChart].properties.annotationPath[v4_1.SchemaTag.hidden] = true;
-    delete chartView.properties;
+    chartView.properties.annotationPath[v4_1.SchemaTag.hidden] = true;
     chartView.additionalProperties = false;
     chartView.description = `Chart (key: primary)`;
     chartView.title = `Chart`;
     chartView.$ref = `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.ALPChart}`;
-    const viewAnnotation = viewsPaths[0]['primary'][0].annotationPath.split('com.sap.vocabularies.UI.v1.')[1];
-    const pathParts = annotations[viewAnnotation].fullyQualifiedName.split('@');
-    chartView[v4_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
+    if (chartAnnotationPath) {
+        const viewAnnotation = chartAnnotationPath.split(v4_1.UIVOCABULARYDOT)[1];
+        const pathParts = annotations[viewAnnotation].fullyQualifiedName.split('@');
+        chartView[v4_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
+    }
     chartView[v4_1.SchemaTag.artifactType] = common_1.ArtifactType.Manifest;
     chartView[v4_1.SchemaTag.key] = 'primary';
 }
@@ -188,15 +225,15 @@ function addALPChartView(appSchema, targetAnnotation, viewsPaths, annotations) {
  * @param {EntityType} entityType - actual entity type of the page's entitySet
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param templateAnnotation - defaultTemplateAnnotationPath as registered in manifest
+ * @param {SapUiAppPageV4} v4Page - actual page in the manifest
  */
 function addALPViews(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation) {
     var _a, _b, _c, _d, _e, _f;
     const annotations = entityType.annotations.UI;
     //1. Chart View
-    const { visualization, targetAnnotation } = analyzeViewAnnotation((_c = (_b = (_a = viewsPaths === null || viewsPaths === void 0 ? void 0 : viewsPaths[0]) === null || _a === void 0 ? void 0 : _a['primary']) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c[v4_1.SchemaTag.annotationPath], annotations, generateParameters, 'primary');
-    if (visualization && visualization.indexOf('Chart') > -1) {
-        addALPChartView(appSchema, targetAnnotation, viewsPaths, annotations);
-    }
+    const chartAnnotationPath = (_c = (_b = (_a = viewsPaths === null || viewsPaths === void 0 ? void 0 : viewsPaths[0]) === null || _a === void 0 ? void 0 : _a['primary']) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c[v4_1.SchemaTag.annotationPath];
+    const { visualization, targetAnnotation } = analyzeViewAnnotation(chartAnnotationPath, annotations, generateParameters, 'primary');
+    addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annotations);
     // Copy toolbar
     const schemaIdForActions = `Actions<ALPChart>`;
     appSchema.definitions[v4_1.DefinitionName.ViewChartToolBar].properties.actions['$ref'] =
@@ -234,10 +271,10 @@ function addALPViews(appSchema, viewsPaths, entityType, generateParameters, temp
     let annotationTerm, viewAnnotation;
     if (tableVisualization && tableVisualization.indexOf(v4_1.FacetBase.LineItem) > -1) {
         annotationTerm = tableVisualization.split('.')[1];
-        viewAnnotation = viewsPaths[0]['secondary'][0].annotationPath.split('com.sap.vocabularies.UI.v1.')[1];
+        viewAnnotation = viewsPaths[0]['secondary'][0].annotationPath.split(v4_1.UIVOCABULARYDOT)[1];
     }
     else if (templateAnnotation) {
-        annotationTerm = viewAnnotation = templateAnnotation.split('com.sap.vocabularies.UI.v1.')[1];
+        annotationTerm = viewAnnotation = templateAnnotation.split(v4_1.UIVOCABULARYDOT)[1];
     }
     if (annotationTerm) {
         utils_1.addLineItemsType(appSchema, entityType.annotations.UI[annotationTerm], entityType, generateParameters.serviceAVT, v4_1.DefinitionName.LineItems, v4_1.DefinitionName.ViewTableColumn);
@@ -247,37 +284,145 @@ function addALPViews(appSchema, viewsPaths, entityType, generateParameters, temp
         tableView[v4_1.SchemaTag.key] = 'secondary';
     }
 }
-function copyTableDefinitions(viewKey, appSchema, targetAnnotation, navPropName) {
-    const idForTable = `${v4_1.DefinitionName.LRTableView}<${viewKey}>`;
-    appSchema.definitions[idForTable] = JSON.parse(JSON.stringify(appSchema.definitions[v4_1.DefinitionName.LRTableView]));
-    delete appSchema.definitions[idForTable][v4_1.SchemaTag.isViewNode];
-    appSchema.definitions[idForTable][v4_1.SchemaTag.annotationPath] = targetAnnotation;
-    if (navPropName) {
-        appSchema.definitions[idForTable]['navigationProperty'] = navPropName;
+/**
+ * Modifies the app schema, adds the right line chart settings
+ * @param inputParameters - list of input parameters as collected by the calling instance
+ * @param annotations - UI annotations of the given entityType
+ * @returns the ID for the chart view in schema
+ */
+function addViewChartDefinitions(inputParameters, annotations) {
+    const idForChart = `${v4_1.DefinitionName.LRChartView}<${inputParameters.viewKey}>`;
+    inputParameters.appSchema.definitions[idForChart] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[v4_1.DefinitionName.LRChartView]));
+    delete inputParameters.appSchema.definitions[idForChart][v4_1.SchemaTag.isViewNode];
+    inputParameters.appSchema.definitions[idForChart][v4_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
+    if (inputParameters.navPropName) {
+        inputParameters.appSchema.definitions[idForChart]['navigationProperty'] = inputParameters.navPropName;
     }
     //Copy toolbar
-    //const idForToolbar = `${DefinitionName.ToolBar}<${viewKey}>`;
-    //appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(appSchema.definitions[DefinitionName.ToolBar]));
-    appSchema.definitions[idForTable]['properties'].toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.ToolBar}<${v4_1.DefinitionName.LineItemsOfView}::${viewKey}>`;
-    return idForTable;
+    const idForToolbar = `${v4_1.DefinitionName.ViewChartToolBar}<${inputParameters.viewKey}>`;
+    inputParameters.appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[v4_1.DefinitionName.ViewChartToolBar]));
+    inputParameters.appSchema.definitions[idForChart]['properties'].toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}${idForToolbar}`;
+    //Copy actions
+    const schemaIdForActions = `${v4_1.DefinitionName.Actions}<${inputParameters.viewKey}>`;
+    defineActions(inputParameters.appSchema, schemaIdForActions, annotations, inputParameters.targetAnnotation, inputParameters.targetEntityType);
+    inputParameters.appSchema.definitions[idForToolbar]['properties'][common_1.PropertyName.actions]['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${schemaIdForActions}`;
+    return idForChart;
 }
-function copyChartDefinitions(viewKey, appSchema, targetAnnotation, navPropName, annotations, entityType) {
-    const idForChart = `${v4_1.DefinitionName.LRChartView}<${viewKey}>`;
-    appSchema.definitions[idForChart] = JSON.parse(JSON.stringify(appSchema.definitions[v4_1.DefinitionName.LRChartView]));
-    delete appSchema.definitions[idForChart][v4_1.SchemaTag.isViewNode];
-    appSchema.definitions[idForChart][v4_1.SchemaTag.annotationPath] = targetAnnotation;
-    if (navPropName) {
-        appSchema.definitions[idForChart]['navigationProperty'] = navPropName;
+/**
+ * Adds the definition of a chart view to the app schema
+ * @param inputParameters - list of input parameters as collected by the calling instance
+ * @param UIAnnotations - AVT UI annotations of the gven entity type
+ * @param appSchema - app schema
+ * @param viewsDefinition - the views definition in app schema (MultiTableModeV4)
+ * @param viewKey - view key
+ * @param title - view title
+ */
+function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title) {
+    const idForChart = addViewChartDefinitions(inputParameters, UIAnnotations);
+    appSchema.definitions[idForChart].properties.annotationPath[v4_1.SchemaTag.hidden] = true;
+    appSchema.definitions[idForChart].properties.index[v4_1.SchemaTag.hidden] = true;
+    appSchema.definitions[idForChart].properties.entitySet[v4_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
+    };
+}
+/**
+ * Modifies the app schema, adds the right line item settings as derived from the visualization
+ * @param inputParameters - list of input parameters as collected by the calling instance
+ * @param viewsDefinition - the views definition in app schema (MultiTableModeV4)
+ * @param visualization - visualization from the given (S)PV
+ * @param templateAnnotation - defaultTemplateAnnotationPath as registered in manifest
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ */
+function addViewLineItems(inputParameters, viewsDefinition, visualization, templateAnnotation, generateParameters) {
+    const tableId = `${v4_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
+    const viewId = `${v4_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
+    const lrTableView = common_1.parseSchemaDefinition(v4_1.DefinitionName.LRTableView, inputParameters.viewKey, inputParameters.appSchema);
+    delete lrTableView[v4_1.SchemaTag.isViewNode];
+    lrTableView[v4_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
+    if (inputParameters.navPropName) {
+        lrTableView['navigationProperty'] = inputParameters.navPropName;
     }
     //Copy toolbar
-    const idForToolbar = `${v4_1.DefinitionName.ViewChartToolBar}<${viewKey}>`;
-    appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(appSchema.definitions[v4_1.DefinitionName.ViewChartToolBar]));
-    appSchema.definitions[idForChart]['properties'].toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}${idForToolbar}`;
-    //Copy actions
-    const schemaIdForActions = `${v4_1.DefinitionName.Actions}<${viewKey}>`;
-    defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType);
-    appSchema.definitions[idForToolbar]['properties']['actions']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${schemaIdForActions}`;
-    return idForChart;
+    common_1.addDefinitionRef(lrTableView.properties.toolBar, v4_1.DefinitionName.ToolBar, viewId);
+    const title = `Table View (key: ${inputParameters.viewKey})`;
+    viewsDefinition.properties[inputParameters.viewKey] = {
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${tableId}`,
+        description: inputParameters.title || title,
+        title
+    };
+    common_1.addDefinitionRef(lrTableView.properties.columns, viewId);
+    lrTableView.properties.annotationPath[v4_1.SchemaTag.hidden] = true;
+    lrTableView.properties.index[v4_1.SchemaTag.hidden] = true;
+    lrTableView.properties.entitySet[v4_1.SchemaTag.hidden] = true;
+    const annotationTerm = (visualization === null || visualization === void 0 ? void 0 : visualization.split('.')[1]) || templateAnnotation.split(v4_1.UIVOCABULARYDOT)[1];
+    utils_1.addLineItemsType(inputParameters.appSchema, inputParameters.targetEntityType.annotations.UI[annotationTerm], inputParameters.targetEntityType, generateParameters.serviceAVT, viewId, v4_1.DefinitionName.ViewTableColumn);
+}
+/**
+ * Adds the schema tags to a given view
+ * @param viewsDefinition - the views definition in app schema (MultiTableModeV4)
+ * @param viewKey - key property of the view
+ * @param namespace - target namespace for annotations
+ * @param view - the given view
+ */
+function addTagsToView(viewsDefinition, viewKey, namespace, view) {
+    viewsDefinition.properties[viewKey][v4_1.SchemaTag.isViewNode] = true;
+    viewsDefinition.properties[viewKey][v4_1.SchemaTag.annotationPath] = namespace
+        ? `/${namespace}/@${view[v4_1.SchemaTag.annotationPath]}`
+        : undefined;
+    viewsDefinition.properties[viewKey][v4_1.SchemaTag.artifactType] = common_1.ArtifactType.Manifest;
+    viewsDefinition.properties[viewKey][v4_1.SchemaTag.key] = 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
+ * @param {EntityType} entityType - actual entity type of the page's entitySet
+ * @returns the target entity type
+ */
+function getTargetEntityType(entitySet, view, generateParameters, entityType) {
+    let targetEntityType = 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 definition parts to a LR View (LineItem/Chart)
+ * @param {string} templateAnnotation - defaultTemplateAnnotationPath as registered in manifest
+ * @param {string} visualization - visualization of the annotation
+ * @param viewsDefinition - the views definition in app schema (MultiTableModeV4)
+ * @param {object} commonInputParameters - list of input parameters as collected by the calling instance
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ * @param {SapUiAppPageV4} v4Page - the given page in manifest
+ * @param uiAnnotations - UI annotations of the given entityType
+ */
+function addLRViewParts(templateAnnotation, visualization, viewsDefinition, commonInputParameters, generateParameters, v4Page, uiAnnotations) {
+    if (templateAnnotation || (visualization === null || visualization === void 0 ? void 0 : visualization.indexOf(v4_1.Visualization.LineItem)) > -1) {
+        //Add Line item view
+        addViewLineItems(commonInputParameters, viewsDefinition, visualization, templateAnnotation, generateParameters);
+    }
+    else if ((visualization === null || visualization === void 0 ? void 0 : visualization.indexOf('Chart')) > -1) {
+        //Add Chart view
+        addViewChart(commonInputParameters, uiAnnotations, commonInputParameters.appSchema, viewsDefinition, commonInputParameters.viewKey, commonInputParameters.title);
+    }
+    else {
+        const titleOnHover = `View (key: ${commonInputParameters.viewKey})`;
+        viewsDefinition.properties[commonInputParameters.viewKey] = {
+            description: commonInputParameters.title || titleOnHover,
+            title: titleOnHover,
+            // Default view - use table view reference as default
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.LRTableView}`
+        };
+    }
 }
 /**
  * Add list report views to the app-specific schema
@@ -286,102 +431,39 @@ function copyChartDefinitions(viewKey, appSchema, targetAnnotation, navPropName,
  * @param {EntityType} entityType - actual entity type of the page's entitySet
  * @param {EntitySet} entitySet - actual entity set (AVT information)
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
- * @param templateAnnotation - defaultTemplateAnnotationPath as registered in manifest
+ * @param {string} templateAnnotation - defaultTemplateAnnotationPath as registered in manifest
+ * @param {SapUiAppPageV4} v4Page - the given page in manifest
  */
-function addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, templateAnnotation) {
+function addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, templateAnnotation, v4Page) {
     var _a;
     if (!viewsPaths) {
         return;
     }
     const viewsDefinition = appSchema.definitions.MultiTableModeV4;
-    for (let index = 0; index < viewsPaths.length; index++) {
-        const view = viewsPaths[index];
+    for (const view of viewsPaths) {
         if (!view[v4_1.SchemaTag.key]) {
             continue;
         }
-        let targetEntityType = entityType;
-        let viewEntitySet = entitySet;
         let navPropName = undefined;
-        if (view['entitySet'] && view['entitySet'] !== entitySet.name) {
-            viewEntitySet = generateParameters.serviceAVT.entitySets.find((es) => {
-                return es.name === view['entitySet'];
-            });
-            targetEntityType = viewEntitySet.entityType;
-        }
-        const annotations = targetEntityType.annotations.UI;
-        const { visualization, targetAnnotation, namespace } = analyzeViewAnnotation(view === null || view === void 0 ? void 0 : view[v4_1.SchemaTag.annotationPath], annotations, generateParameters, view[v4_1.SchemaTag.key]);
+        const targetEntityType = getTargetEntityType(entitySet, view, generateParameters, entityType);
+        const uiAnnotations = targetEntityType.annotations.UI;
+        const { visualization, targetAnnotation, namespace, title } = analyzeViewAnnotation(view === null || view === void 0 ? void 0 : view[v4_1.SchemaTag.annotationPath], uiAnnotations, generateParameters, view[v4_1.SchemaTag.key]);
         if (view['entitySet']) {
             navPropName = (_a = entityType.navigationProperties.find((np) => {
                 return np.targetTypeName === namespace;
             })) === null || _a === void 0 ? void 0 : _a.name;
         }
-        //Add Line item view
         const viewKey = common_1.prepareRef(view[v4_1.SchemaTag.key]);
-        if (templateAnnotation || (visualization && visualization.indexOf(v4_1.Visualization.LineItem) > -1)) {
-            //Copy table
-            const tableDefinitionName = copyTableDefinitions(viewKey, appSchema, targetAnnotation, navPropName);
-            viewsDefinition.properties[viewKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${tableDefinitionName}`,
-                description: `Table View (key: ${viewKey})`,
-                title: `Table View (${viewKey})`
-            };
-            appSchema.definitions[tableDefinitionName].properties.columns = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.LineItemsOfView}::${viewKey}`
-            };
-            appSchema.definitions[tableDefinitionName].properties.annotationPath[v4_1.SchemaTag.hidden] =
-                true;
-            appSchema.definitions[tableDefinitionName].properties.entitySet[v4_1.SchemaTag.hidden] = true;
-            const annotationTerm = visualization
-                ? visualization.split('.')[1]
-                : templateAnnotation.split('com.sap.vocabularies.UI.v1.')[1];
-            utils_1.addLineItemsType(appSchema, targetEntityType.annotations.UI[annotationTerm], targetEntityType, generateParameters.serviceAVT, `${v4_1.DefinitionName.LineItemsOfView}::${viewKey}`, v4_1.DefinitionName.ViewTableColumn);
-        }
-        else if (visualization && visualization.indexOf('Chart') > -1) {
-            //Add Chart view
-            const idForChart = copyChartDefinitions(viewKey, appSchema, targetAnnotation, navPropName, annotations, targetEntityType);
-            appSchema.definitions[idForChart].properties.annotationPath[v4_1.SchemaTag.hidden] = true;
-            appSchema.definitions[idForChart].properties.entitySet[v4_1.SchemaTag.hidden] = true;
-            viewsDefinition.properties[viewKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${idForChart}`,
-                description: `Chart View (key: ${viewKey})`,
-                title: `Chart View (${viewKey})`
-            };
-        }
-        else {
-            viewsDefinition.properties[viewKey] = {
-                description: `View (key: ${viewKey})`,
-                title: `View (${viewKey})`,
-                properties: {},
-                additionalProperties: false
-            };
-        }
-        viewsDefinition.properties[viewKey][v4_1.SchemaTag.isViewNode] = true;
-        viewsDefinition.properties[viewKey][v4_1.SchemaTag.propertyIndex] = index;
-        viewsDefinition.properties[viewKey][v4_1.SchemaTag.annotationPath] = namespace
-            ? `/${namespace}/@${view[v4_1.SchemaTag.annotationPath]}`
-            : undefined;
-        viewsDefinition.properties[viewKey][v4_1.SchemaTag.artifactType] = common_1.ArtifactType.Manifest;
-        viewsDefinition.properties[viewKey][v4_1.SchemaTag.key] = viewKey;
-    }
-}
-/**
- * Add views to schema (LR or ALP)
- * @param {Definition} appSchema - app-specific JSON schema
- * @param {SapUiAppPageV4} v4Page - actual page in the manifest
- * @param {EntityType} entityType - actual entity type (AVT information)
- * @param {EntitySet} entitySet - actual entity set (AVT information)
- * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
- */
-function addViews(appSchema, v4Page, entityType, entitySet, generateParameters) {
-    var _a, _b, _c, _d, _e;
-    const viewsPaths = (_c = (_b = (_a = v4Page.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.views) === null || _c === void 0 ? void 0 : _c.paths;
-    const templateAnnotation = (_e = (_d = v4Page.options) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.defaultTemplateAnnotationPath;
-    if (generateParameters.templateType === common_1.TemplateType.ListReportObjectPageV4) {
-        addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, templateAnnotation);
-        appSchema.properties['chart'][v4_1.SchemaTag.hidden] = true;
-    }
-    else if (generateParameters.templateType === common_1.TemplateType.AnalyticalListPageV4) {
-        addALPViews(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation);
+        const commonInputParameters = {
+            viewKey,
+            appSchema,
+            targetAnnotation,
+            navPropName,
+            targetEntityType,
+            title
+        };
+        addLRViewParts(templateAnnotation, visualization, viewsDefinition, commonInputParameters, generateParameters, v4Page, uiAnnotations);
+        addTagsToView(viewsDefinition, viewKey, namespace, view);
     }
 }
 /**
@@ -393,43 +475,66 @@ function addViews(appSchema, v4Page, entityType, entitySet, generateParameters)
  * @param appSchema - the app-specific JSON schema
  * @param alias - alias definition for the UI vocabulary
  */
-function adaptTableDefinition(v4Page, entityType, generateParameters, appSchema, alias) {
-    var _a, _b, _c, _d;
+function adaptTableDefinition(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation, v4Page, alias) {
+    var _a, _b;
     //here: tableDefinitionName = DefinitionName.Table
     const tableDefinitionName = utils_1.alignSchemaWithTemplateType(appSchema, generateParameters);
-    const templateAnnotation = (_b = (_a = v4Page.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.defaultTemplateAnnotationPath;
     if (templateAnnotation) {
         const { visualization, targetAnnotation, namespace } = analyzeViewAnnotation(templateAnnotation, entityType.annotations.UI, generateParameters, undefined, v4_1.Visualization.LineItem);
         if (visualization) {
             const annotationTerm = visualization.split('.')[1];
             const annotationTermInSchema = `${v4_1.DefinitionName.LineItems}OfSPV::${common_1.prepareRef(annotationTerm)}`;
-            appSchema.definitions[`${tableDefinitionName}SPV`] = JSON.parse(JSON.stringify(appSchema.definitions[tableDefinitionName]));
-            delete appSchema.definitions[`${tableDefinitionName}SPV`][v4_1.SchemaTag.isViewNode];
-            appSchema.definitions[`${tableDefinitionName}SPV`].properties['toolBar']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.ToolBar}<${annotationTermInSchema}>`;
-            appSchema.definitions[tableDefinitionName]['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${tableDefinitionName}SPV`;
-            delete appSchema.definitions[`${tableDefinitionName}`].properties;
-            appSchema.definitions[`${tableDefinitionName}`][v4_1.SchemaTag.annotationPath] = `/${namespace}/@${templateAnnotation}`;
+            const spvTable = (appSchema.definitions[`${tableDefinitionName}SPV`] = JSON.parse(JSON.stringify(appSchema.definitions[tableDefinitionName])));
+            delete spvTable[v4_1.SchemaTag.isViewNode];
+            common_1.addDefinitionRef(spvTable.properties.toolBar, v4_1.DefinitionName.ToolBar, annotationTermInSchema);
             // Switch from generic column to specific definition
-            appSchema.definitions[`${tableDefinitionName}SPV`].properties['columns'] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${annotationTermInSchema}`
-            };
-            appSchema.definitions[`${tableDefinitionName}SPV`][v4_1.SchemaTag.annotationPath] = targetAnnotation;
+            spvTable[v4_1.SchemaTag.annotationPath] = targetAnnotation;
+            spvTable.properties.columns = {};
+            common_1.addDefinitionRef(spvTable.properties.columns, annotationTermInSchema);
+            const tableDefinition = appSchema.definitions[tableDefinitionName];
+            delete tableDefinition.properties;
+            common_1.addDefinitionRef(tableDefinition, `${tableDefinitionName}SPV`);
+            tableDefinition[v4_1.SchemaTag.annotationPath] = `/${namespace}/@${templateAnnotation}`;
             const lineItemAnnotation = entityType.annotations.UI[annotationTerm];
             utils_1.addLineItemsType(appSchema, lineItemAnnotation, entityType, generateParameters.serviceAVT, annotationTermInSchema);
         }
     }
+    else if (viewsPaths) {
+        const tableDefinition = appSchema.definitions[tableDefinitionName];
+        delete tableDefinition.properties.toolBar;
+        delete tableDefinition.properties.columns;
+    }
     else {
         const tableDefinition = appSchema.definitions[tableDefinitionName];
         tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.ToolBarLR}`;
         // Switch from generic column to specific definition
-        tableDefinition.properties['columns'] = {
-            $ref: common_1.DEFINITION_LINK_PREFIX + v4_1.DefinitionName.LineItems
-        };
-        utils_1.addLineItemsType(appSchema, (_d = (_c = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _c === void 0 ? void 0 : _c[alias]) === null || _d === void 0 ? void 0 : _d.LineItem, entityType, generateParameters.serviceAVT, v4_1.DefinitionName.LineItems);
+        common_1.addDefinitionRef(tableDefinition.properties.columns, v4_1.DefinitionName.LineItems);
+        utils_1.addLineItemsType(appSchema, (_b = (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _a === void 0 ? void 0 : _a[alias]) === null || _b === void 0 ? void 0 : _b.LineItem, entityType, generateParameters.serviceAVT, v4_1.DefinitionName.LineItems);
     }
 }
 /**
- * Generates an app specific schema for the FE V4 Listreport from the generic schema.
+ * Add views to schema (LR or ALP)
+ * @param {Definition} appSchema - app-specific JSON schema
+ * @param {SapUiAppPageV4} v4Page - actual page in the manifest
+ * @param {EntityType} entityType - actual entity type (AVT information)
+ * @param {EntitySet} entitySet - actual entity set (AVT information)
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ */
+function addTableAndViews(appSchema, v4Page, entityType, entitySet, generateParameters, alias) {
+    var _a, _b, _c, _d, _e;
+    const viewsPaths = (_c = (_b = (_a = v4Page.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.views) === null || _c === void 0 ? void 0 : _c.paths;
+    const templateAnnotation = (_e = (_d = v4Page.options) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.defaultTemplateAnnotationPath;
+    if (generateParameters.templateType === common_1.TemplateType.ListReportObjectPageV4) {
+        adaptTableDefinition(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation, v4Page, alias);
+        addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, templateAnnotation, v4Page);
+        appSchema.properties[common_1.PropertyName.chart][v4_1.SchemaTag.hidden] = true;
+    }
+    else if (generateParameters.templateType === common_1.TemplateType.AnalyticalListPageV4) {
+        addALPViews(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation);
+    }
+}
+/**
+ * Generates an app specific schema for the FE V4 ListReport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param genericSchema  - generic JSON schema of an object page
@@ -446,7 +551,7 @@ function generateListReportSchemaV4(generateParameters, genericSchema, entitySet
     //Add selection fields
     const selectionFieldAnnotation = (_b = (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _a === void 0 ? void 0 : _a[alias]) === null || _b === void 0 ? void 0 : _b.SelectionFields;
     addSelectionFields(entityType, appSchema, selectionFieldAnnotation);
-    appSchema.properties['defaultTemplateAnnotationPath'][v4_1.SchemaTag.hidden] = true;
+    appSchema.properties[common_1.PropertyName.defaultTemplateAnnotationPath][v4_1.SchemaTag.hidden] = true;
     //enum for annotation path as part of QuickVarianSelection
     common_1.addEnumForSingleTabVariant(entityType, appSchema, v4_1.DefinitionName.AnnotationPathAsObject);
     if (generateParameters.manifest) {
@@ -467,15 +572,10 @@ function generateListReportSchemaV4(generateParameters, genericSchema, entitySet
         if (!v4Page) {
             return appSchema;
         }
-        if (generateParameters.templateType === common_1.TemplateType.ListReportObjectPageV4) {
-            //LR table definition
-            adaptTableDefinition(v4Page, entityType, generateParameters, appSchema, alias);
-        }
-        // Handle LR & ALP views
-        addViews(appSchema, v4Page, entityType, entitySet, generateParameters);
+        addTableAndViews(appSchema, v4Page, entityType, entitySet, generateParameters, alias);
     }
-    delete appSchema.definitions['GenericColumns'];
-    delete appSchema.definitions['Action'];
+    delete appSchema.definitions.GenericColumns;
+    delete appSchema.definitions.Action;
     return appSchema;
 }
 exports.generateListReportSchemaV4 = generateListReportSchemaV4;