@sap/ux-specification 1.90.24 → 1.90.27

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

@@ -19,7 +19,7 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
     const selectionFieldsDefinition = appSchema['definitions'].SelectionFields;
     selectionFieldsDefinition.additionalProperties = false;
     selectionFieldsDefinition.properties = {};
-    selectionFieldsDefinition.annotationPath = common_1.createAnnotationPath(entityType.fullyQualifiedName, "com.sap.vocabularies.UI.v1.SelectionFields" /* SelectionFields */);
+    selectionFieldsDefinition[v4_1.SchemaTag.annotationPath] = common_1.createAnnotationPath(entityType.fullyQualifiedName, "com.sap.vocabularies.UI.v1.SelectionFields" /* SelectionFields */);
     if (!selectionFieldsAnnotation) {
         return;
     }
@@ -31,11 +31,11 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
             description = common_1.getLabelForPropertyPath(selectionField, entityType);
         }
         selectionFieldsDefinition['properties'][fieldDefinition] = {
-            $ref: common_1.DEFINITION_LINK_PREFIX + fieldDefinition,
-            propertyIndex: i
+            $ref: common_1.DEFINITION_LINK_PREFIX + fieldDefinition
         };
+        selectionFieldsDefinition['properties'][fieldDefinition][v4_1.SchemaTag.propertyIndex] = i;
         const dataType = common_1.determineDataType(selectionField);
-        appSchema['definitions'][fieldDefinition] = Object.assign({ type: 'object', properties: {}, description, annotationPath: `${selectionFieldsDefinition.annotationPath}/${i}`, isViewNode: true, additionalProperties: false, annotationType: selectionField === null || selectionField === void 0 ? void 0 : selectionField.type }, (dataType && { dataType }));
+        appSchema['definitions'][fieldDefinition] = Object.assign({ type: 'object', properties: {}, description, annotationPath: `${selectionFieldsDefinition[v4_1.SchemaTag.annotationPath]}/${i}`, isViewNode: true, additionalProperties: false, annotationType: selectionField === null || selectionField === void 0 ? void 0 : selectionField.type }, (dataType && { dataType }));
         i++;
     });
 }
@@ -52,7 +52,8 @@ function convertVisualization(visualization, alias) {
     return visualization;
 }
 function defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType) {
-    const actions = (appSchema.definitions[schemaIdForActions] = JSON.parse(JSON.stringify(appSchema.definitions['Actions'])));
+    appSchema.definitions[schemaIdForActions] = JSON.parse(JSON.stringify(appSchema.definitions['Actions']));
+    const actions = appSchema.definitions[schemaIdForActions];
     actions.properties = {};
     actions.additionalProperties = false;
     const chartAnnotation = annotations[targetAnnotation === null || targetAnnotation === void 0 ? void 0 : targetAnnotation.split(`${common_1.UIVOCABULARY}.`)[1]];
@@ -60,32 +61,34 @@ 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];
-            actions['properties'][`${prefix}::${actionRecord.Action}`] = {
+            const action = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
                 $ref: common_1.DEFINITION_LINK_PREFIX + actionDefinition,
-                description,
-                propertyIndex: i,
-                annotationType: actionRecord.$Type,
-                annotationPath: `/${actionRecord.fullyQualifiedName}`
-            };
+                description
+            });
+            //Add tags
+            action[v4_1.SchemaTag.propertyIndex] = i;
+            action[v4_1.SchemaTag.annotationType] = actionRecord.$Type;
+            action[v4_1.SchemaTag.annotationPath] = `/${actionRecord.fullyQualifiedName}`;
             //as ChartToolBarAction is an empty objec, copy ViewToolBarAction and remove properties
-            appSchema['definitions'][actionDefinition] = JSON.parse(JSON.stringify(appSchema['definitions'][v4_1.DefinitionName.ViewToolBarAction]));
-            appSchema['definitions'][actionDefinition]['properties'] = {};
-            appSchema['definitions'][actionDefinition]['annotationPath'] = actionRecord.fullyQualifiedName;
+            appSchema.definitions[actionDefinition] = JSON.parse(JSON.stringify(appSchema.definitions[v4_1.DefinitionName.ViewToolBarAction]));
+            appSchema.definitions[actionDefinition].properties = {};
+            appSchema.definitions[actionDefinition][v4_1.SchemaTag.annotationPath] = actionRecord.fullyQualifiedName;
             i++;
         });
     }
 }
 /**
- * Finds the right visualization for the given view
- * @param viewKey - view key (primary, secondary, or anything else)
+ * Finds the right visualization for a given view
  * @param allVisualizations - list of visualizations for the given (S)PV
  * @param alias - alias definition for the relevant namespace
  * @param namespace - namespace for the UI annotations
+ * @param viewKey - view key: primary, secondary, or anything else; may also be undefined. The first visualization is taken in this case.
+ * @param visualizationType - allows to find the right visualization if there are many.
  * @returns the value of the first fitting visualization
  */
-function findTheRightVisualization(viewKey, allVisualizations, alias, namespace) {
+function findTheRightVisualization(allVisualizations, alias, namespace, viewKey, visualizationType) {
     var _a;
     let visualization, visualizationObject, targetAnnotation;
     if (allVisualizations) {
@@ -96,11 +99,16 @@ function findTheRightVisualization(viewKey, allVisualizations, alias, namespace)
         }
         else if (viewKey === 'secondary') {
             visualizationObject = allVisualizations.find((vis) => {
-                return vis['value'].indexOf('LineItem') > -1;
+                return vis['value'].indexOf(v4_1.FacetBase.LineItem) > -1;
             });
         }
         else {
-            visualizationObject = allVisualizations[0];
+            if (visualizationType) {
+                visualizationObject = allVisualizations.find((v) => v['value'].indexOf(visualizationType) > -1);
+            }
+            else {
+                visualizationObject = allVisualizations[0];
+            }
         }
         visualization = convertVisualization(visualizationObject === null || visualizationObject === void 0 ? void 0 : visualizationObject['value'], alias);
         if ((_a = visualizationObject === null || visualizationObject === void 0 ? void 0 : visualizationObject['$target']) === null || _a === void 0 ? void 0 : _a.fullyQualifiedName) {
@@ -113,70 +121,120 @@ function findTheRightVisualization(viewKey, allVisualizations, alias, namespace)
     return { visualization, targetAnnotation };
 }
 /**
- * The view annotationPath must be analyzed, to find the right target annotation and visualization
- * @param view - given view entry in manifest
+ * An annotationPath must be analyzed, to find the right target annotation and visualization
+ *
+ */
+function analyzeChartAnnotation(namespace, annotationPath, annotationAVT, viewKey, uIAnnotations) {
+    const visualization = '@UI.Chart';
+    const targetAnnotationFullName = `/${namespace}/@${annotationPath}`;
+    let chartTitle;
+    if (annotationAVT.Text) {
+        chartTitle = annotationAVT.Text;
+    }
+    else {
+        const targetAnnotationArray = annotationPath.split('.');
+        const targetAnnotation = uIAnnotations[targetAnnotationArray[targetAnnotationArray.length - 1]];
+        if (targetAnnotation.Title) {
+            chartTitle = targetAnnotation.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
  * @param uIAnnotations - annotations of UI namespace of the given entityType
- * @param viewKey - allows to distinguish the different view or visualization types
+ * @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(view, uIAnnotations, generateParameters, viewKey) {
-    var _a;
+function analyzeViewAnnotation(annotationPath, uIAnnotations, generateParameters, viewKey, visualizationType) {
     let namespace = undefined;
-    const annotationInManifest = (_a = view === null || view === void 0 ? void 0 : view['annotationPath']) === null || _a === void 0 ? void 0 : _a.split(`${common_1.UIVOCABULARY}.`)[1];
-    const annotationAVT = uIAnnotations[annotationInManifest];
+    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(viewKey, annotationAVT.Visualizations, alias, namespace);
-        return { visualization, targetAnnotation, namespace };
+        const { visualization, targetAnnotation } = findTheRightVisualization(annotationAVT.Visualizations, alias, namespace, viewKey, visualizationType);
+        if (annotationAVT.Text) {
+            title = annotationAVT.Text;
+        }
+        return { visualization, targetAnnotation, namespace, title };
     }
     else if (annotationInManifest.startsWith('SelectionPresentationVariant')) {
-        const { visualization, targetAnnotation } = findTheRightVisualization(viewKey, annotationAVT.PresentationVariant.Visualizations, alias, namespace);
-        return { visualization, targetAnnotation, namespace };
+        const { visualization, targetAnnotation } = findTheRightVisualization(annotationAVT.PresentationVariant.Visualizations, alias, namespace, viewKey, visualizationType);
+        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('LineItem')) {
         const visualization = '@UI.LineItem';
-        const targetAnnotation = `/${namespace}/@${view['annotationPath']}`;
-        return { visualization, targetAnnotation, namespace };
+        const targetAnnotation = `/${namespace}/@${annotationPath}`;
+        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}/@${view['annotationPath']}`;
-        return { visualization, targetAnnotation, namespace };
+        const { visualization, targetAnnotation, chartTitle } = analyzeChartAnnotation(namespace, annotationPath, annotationAVT, viewKey, uIAnnotations);
+        return { visualization, targetAnnotation, namespace, title: chartTitle };
     }
+    return { visualization: undefined, targetAnnotation: undefined, namespace, title };
 }
 /**
- * Add ALP views to the app-specific schema
+ * 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) {
+    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;
+    appSchema.definitions[v4_1.DefinitionName.ALPChart].properties.annotationPath[v4_1.SchemaTag.hidden] = true;
+    delete chartView.properties;
+    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(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';
+}
+/**
+ * Adds the ALP views to the app-specific schema
  * @param {Definition} appSchema - app-specific JSON schema
  * @param {Array<Object>} viewsPaths - views' paths' section in the manifest
  * @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
  */
-function addALPViews(appSchema, viewsPaths, entityType, generateParameters) {
-    var _a, _b, _c, _d;
+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((_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], annotations, generateParameters, 'primary');
+    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) {
-        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]['isViewNode'];
-        appSchema.definitions[v4_1.DefinitionName.ALPChart]['annotationPath'] = targetAnnotation;
-        appSchema.definitions[v4_1.DefinitionName.ALPChart].properties.annotationPath['hidden'] = true;
-        delete chartView.properties;
-        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['annotationPath'] = `/${pathParts[0]}/@${pathParts[1]}`;
-        chartView['artifactType'] = common_1.ArtifactType.Manifest;
-        chartView['key'] = 'primary';
+        addALPChartView(appSchema, targetAnnotation, viewsPaths, annotations);
     }
     // Copy toolbar
     const schemaIdForActions = `Actions<ALPChart>`;
@@ -184,23 +242,23 @@ function addALPViews(appSchema, viewsPaths, entityType, generateParameters) {
         common_1.DEFINITION_LINK_PREFIX + schemaIdForActions;
     defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType);
     //2. Table View
-    const { visualization: tableVisualization, targetAnnotation: target } = analyzeViewAnnotation((_d = (_c = viewsPaths === null || viewsPaths === void 0 ? void 0 : viewsPaths[0]) === null || _c === void 0 ? void 0 : _c['secondary']) === null || _d === void 0 ? void 0 : _d[0], annotations, generateParameters, 'secondary');
+    const { visualization: tableVisualization, targetAnnotation: target } = analyzeViewAnnotation((_f = (_e = (_d = viewsPaths === null || viewsPaths === void 0 ? void 0 : viewsPaths[0]) === null || _d === void 0 ? void 0 : _d['secondary']) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f[v4_1.SchemaTag.annotationPath], annotations, generateParameters, 'secondary');
     const tableDefinitionName = utils_1.alignSchemaWithTemplateType(appSchema, generateParameters);
     const tableDefinition = appSchema.definitions[tableDefinitionName];
-    if (tableVisualization) {
+    if (tableVisualization || templateAnnotation) {
         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 + 'LineItems'
+            $ref: common_1.DEFINITION_LINK_PREFIX + v4_1.DefinitionName.LineItems
         };
-        tableDefinition.properties.annotationPath['hidden'] = true;
+        tableDefinition.properties.annotationPath[v4_1.SchemaTag.hidden] = true;
     }
     else {
         tableDefinition.properties = {};
     }
     const tableView = appSchema.definitions[v4_1.DefinitionName.ALPTableView];
     appSchema.definitions[v4_1.DefinitionName.ALPTable] = JSON.parse(JSON.stringify(tableView));
-    delete appSchema.definitions[v4_1.DefinitionName.ALPTable]['isViewNode'];
+    delete appSchema.definitions[v4_1.DefinitionName.ALPTable][v4_1.SchemaTag.isViewNode];
     tableView.additionalProperties = false;
     tableView.description = `Table (key: secondary)`;
     tableView.title = `Table`;
@@ -208,51 +266,116 @@ function addALPViews(appSchema, viewsPaths, entityType, generateParameters) {
         delete tableView.properties;
         tableView.$ref = `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.ALPTable}`;
     }
-    else {
+    else if (!templateAnnotation) {
         tableView.properties = {};
     }
-    tableView['artifactType'] = common_1.ArtifactType.Manifest;
-    if (tableVisualization && tableVisualization.indexOf('LineItem') > -1) {
-        const annotationTerm = tableVisualization.split('.')[1];
-        utils_1.addLineItemsType(appSchema, entityType.annotations.UI[annotationTerm], entityType, generateParameters.serviceAVT);
-        appSchema.definitions[v4_1.DefinitionName.ALPTable]['annotationPath'] = target;
-        const viewAnnotation = viewsPaths[0]['secondary'][0].annotationPath.split('com.sap.vocabularies.UI.v1.')[1];
+    tableView[v4_1.SchemaTag.artifactType] = common_1.ArtifactType.Manifest;
+    let annotationTerm, viewAnnotation;
+    if (tableVisualization && tableVisualization.indexOf(v4_1.FacetBase.LineItem) > -1) {
+        annotationTerm = tableVisualization.split('.')[1];
+        viewAnnotation = viewsPaths[0]['secondary'][0].annotationPath.split(v4_1.UIVOCABULARYDOT)[1];
+    }
+    else if (templateAnnotation) {
+        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);
+        appSchema.definitions[v4_1.DefinitionName.ALPTable][v4_1.SchemaTag.annotationPath] = target;
         const pathParts = annotations[viewAnnotation].fullyQualifiedName.split('@');
-        tableView['annotationPath'] = `/${pathParts[0]}/@${pathParts[1]}`;
-        tableView['key'] = 'secondary';
+        tableView[v4_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
+        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]['isViewNode'];
-    appSchema.definitions[idForTable]['annotationPath'] = targetAnnotation;
-    if (navPropName) {
-        appSchema.definitions[idForTable]['navigationProperty'] = navPropName;
+/**
+ * Modifies the app schema, adds the right line chart settings
+ * @param inputParameters - list of input paramaters 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}<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]['isViewNode'];
-    appSchema.definitions[idForChart]['annotationPath'] = targetAnnotation;
-    if (navPropName) {
-        appSchema.definitions[idForChart]['navigationProperty'] = navPropName;
+/**
+ * Modifies the app schema, adds the right line item settings as derived from the visualization
+ * @param inputParameters - list of input paramaters as collected by the calling instance
+ * @param viewsDefinition - the views definitio  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 idForTable = `${v4_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
+    inputParameters.appSchema.definitions[idForTable] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[v4_1.DefinitionName.LRTableView]));
+    delete inputParameters.appSchema.definitions[idForTable][v4_1.SchemaTag.isViewNode];
+    inputParameters.appSchema.definitions[idForTable][v4_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
+    if (inputParameters.navPropName) {
+        inputParameters.appSchema.definitions[idForTable]['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;
+    inputParameters.appSchema.definitions[idForTable]['properties'].toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.ToolBar}<${v4_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}>`;
+    viewsDefinition.properties[inputParameters.viewKey] = {
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${idForTable}`,
+        description: `Table View (key: ${inputParameters.viewKey})`,
+        title: inputParameters.title
+    };
+    inputParameters.appSchema.definitions[idForTable].properties.columns = {
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`
+    };
+    inputParameters.appSchema.definitions[idForTable].properties.annotationPath[v4_1.SchemaTag.hidden] =
+        true;
+    inputParameters.appSchema.definitions[idForTable].properties.index[v4_1.SchemaTag.hidden] = true;
+    inputParameters.appSchema.definitions[idForTable].properties.entitySet[v4_1.SchemaTag.hidden] = true;
+    const annotationTerm = visualization ? visualization.split('.')[1] : templateAnnotation.split(v4_1.UIVOCABULARYDOT)[1];
+    utils_1.addLineItemsType(inputParameters.appSchema, inputParameters.targetEntityType.annotations.UI[annotationTerm], inputParameters.targetEntityType, generateParameters.serviceAVT, `${v4_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`, v4_1.DefinitionName.ViewTableColumn);
+}
+/**
+ * Adds the schema tags to a given view
+ * @param viewsDefinition - the views definitio  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;
 }
 /**
  * Add list report views to the app-specific schema
@@ -261,78 +384,62 @@ 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
  */
-function addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters) {
+function addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, templateAnnotation) {
     var _a;
     if (!viewsPaths) {
         return;
     }
     const viewsDefinition = appSchema.definitions.MultiTableModeV4;
-    for (let index = 0; index < viewsPaths.length; index++) {
-        const view = viewsPaths[index];
-        if (!view['key']) {
+    for (const view of viewsPaths) {
+        if (!view[v4_1.SchemaTag.key]) {
             continue;
         }
-        const viewKey = view['key'].replace('#', '::');
-        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 targetEntityType = getTargetEntityType(entitySet, view, generateParameters, entityType);
         const annotations = targetEntityType.annotations.UI;
-        const { visualization, targetAnnotation, namespace } = analyzeViewAnnotation(view, annotations, generateParameters, view['key']);
+        const { visualization, targetAnnotation, namespace, title } = analyzeViewAnnotation(view === null || view === void 0 ? void 0 : view[v4_1.SchemaTag.annotationPath], annotations, 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;
         }
+        const viewKey = common_1.prepareRef(view[v4_1.SchemaTag.key]);
+        const commonInputParameters = {
+            viewKey,
+            appSchema,
+            targetAnnotation,
+            navPropName,
+            targetEntityType,
+            title
+        };
         //Add Line item view
-        if (visualization && visualization.indexOf('LineItem') > -1) {
+        if (templateAnnotation || (visualization && visualization.indexOf(v4_1.Visualization.LineItem) > -1)) {
             //Copy table
-            const idForTable = copyTableDefinitions(viewKey, appSchema, targetAnnotation, navPropName);
-            viewsDefinition.properties[viewKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${idForTable}`,
-                description: `Table View (key: ${viewKey})`,
-                title: `Table View (${viewKey})`
-            };
-            appSchema['definitions'][idForTable].properties.columns = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}LineItemsOfView::${viewKey}`
-            };
-            appSchema['definitions'][idForTable].properties.annotationPath['hidden'] = true;
-            appSchema['definitions'][idForTable].properties.entitySet['hidden'] = true;
-            const annotationTerm = visualization.split('.')[1];
-            utils_1.addLineItemsType(appSchema, targetEntityType.annotations.UI[annotationTerm], targetEntityType, generateParameters.serviceAVT, v4_1.DefinitionName.ViewTableColumn, `LineItemsOfView::${viewKey}`);
+            addViewLineItems(commonInputParameters, viewsDefinition, visualization, templateAnnotation, generateParameters);
         }
         else if (visualization && visualization.indexOf('Chart') > -1) {
             //Add Chart view
-            const idForChart = copyChartDefinitions(viewKey, appSchema, targetAnnotation, navPropName, annotations, targetEntityType);
-            appSchema['definitions'][idForChart].properties.annotationPath['hidden'] = true;
-            appSchema['definitions'][idForChart].properties.entitySet['hidden'] = true;
+            const idForChart = addViewChartDefinitions(commonInputParameters, annotations);
+            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;
             viewsDefinition.properties[viewKey] = {
                 $ref: `${common_1.DEFINITION_LINK_PREFIX}${idForChart}`,
                 description: `Chart View (key: ${viewKey})`,
-                title: `Chart View (${viewKey})`
+                title
             };
         }
         else {
             viewsDefinition.properties[viewKey] = {
                 description: `View (key: ${viewKey})`,
-                title: `View (${viewKey})`,
-                properties: {},
-                additionalProperties: false
+                title,
+                // Default view - use table view reference as default
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.LRTableView}`
             };
         }
-        viewsDefinition.properties[viewKey]['isViewNode'] = true;
-        viewsDefinition.properties[viewKey]['propertyIndex'] = index;
-        viewsDefinition.properties[viewKey]['annotationPath'] = namespace
-            ? `/${namespace}/@${view['annotationPath']}`
-            : undefined;
-        viewsDefinition.properties[viewKey]['artifactType'] = common_1.ArtifactType.Manifest;
-        viewsDefinition.properties[viewKey]['key'] = viewKey;
+        addTagsToView(viewsDefinition, viewKey, namespace, view);
     }
 }
 /**
@@ -344,14 +451,59 @@ function addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParame
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  */
 function addViews(appSchema, v4Page, entityType, entitySet, generateParameters) {
-    var _a, _b, _c;
+    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);
-        appSchema.properties['chart']['hidden'] = true;
+        addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, templateAnnotation);
+        appSchema.properties[common_1.PropertyName.chart][v4_1.SchemaTag.hidden] = true;
     }
     else if (generateParameters.templateType === common_1.TemplateType.AnalyticalListPageV4) {
-        addALPViews(appSchema, viewsPaths, entityType, generateParameters);
+        addALPViews(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation);
+    }
+}
+/**
+ * Adapts the table definition in schema.
+ * If defaultTemplateAnnotationPath is present, evaluates the SelectionPresentationVariant.
+ * @param {SapUiAppPageV4} v4Page - the given page in manifest
+ * @param {EntityType} entityType - the current entity type, as defined in AVT
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ * @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;
+    //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}`;
+            // 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;
+            const lineItemAnnotation = entityType.annotations.UI[annotationTerm];
+            utils_1.addLineItemsType(appSchema, lineItemAnnotation, entityType, generateParameters.serviceAVT, annotationTermInSchema);
+        }
+    }
+    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);
     }
 }
 /**
@@ -365,24 +517,16 @@ function addViews(appSchema, v4Page, entityType, entitySet, generateParameters)
  * @returns {object} application-specific schema of the list report
  */
 function generateListReportSchemaV4(generateParameters, genericSchema, entitySet, templateName) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
     const entityType = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType;
     const alias = common_1.findAlias(common_1.UIVOCABULARY, generateParameters.serviceAVT);
     //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[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.templateType === common_1.TemplateType.ListReportObjectPageV4) {
-        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);
-        const tableDefinitionName = utils_1.alignSchemaWithTemplateType(appSchema, generateParameters);
-        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 + 'LineItems'
-        };
-    }
     if (generateParameters.manifest) {
         //Find page in targets
         const pages = generateParameters.manifest[__1.ManifestSection.ui5].routing.targets;
@@ -401,11 +545,15 @@ 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);
     }
-    delete appSchema.definitions['GenericColumns'];
-    delete appSchema.definitions['Action'];
+    delete appSchema.definitions.GenericColumns;
+    delete appSchema.definitions.Action;
     return appSchema;
 }
 exports.generateListReportSchemaV4 = generateListReportSchemaV4;