@sap/ux-specification 1.84.51 → 1.84.53

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

@@ -16,13 +16,13 @@ const common_1 = require("../../common");
  * @param selectionFieldsAnnotation - the UI.SelectionField annotation
  */
 function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
-    const selectionFieldsDefinition = appSchema['definitions'].SelectionFields;
+    const selectionFieldsDefinition = appSchema.definitions.SelectionFields;
     selectionFieldsDefinition.additionalProperties = false;
     selectionFieldsDefinition.properties = {};
     if (!entityType) {
         return;
     }
-    selectionFieldsDefinition[common_1.SchemaTag.annotationPath] = common_1.createAnnotationPath(entityType.fullyQualifiedName, "com.sap.vocabularies.UI.v1.SelectionFields" /* SelectionFields */);
+    selectionFieldsDefinition[ux_specification_types_1.SchemaTag.annotationPath] = common_1.createAnnotationPath(entityType.fullyQualifiedName, "com.sap.vocabularies.UI.v1.SelectionFields" /* SelectionFields */);
     if (!selectionFieldsAnnotation) {
         return;
     }
@@ -33,21 +33,33 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
         if (selectionField.type === 'PropertyPath') {
             description = common_1.getLabelForPropertyPath(selectionField, entityType);
         }
-        selectionFieldsDefinition['properties'][fieldDefinition] = {
+        selectionFieldsDefinition.properties[fieldDefinition] = {
             $ref: common_1.DEFINITION_LINK_PREFIX + fieldDefinition
         };
-        selectionFieldsDefinition['properties'][fieldDefinition][common_1.SchemaTag.propertyIndex] = i;
+        selectionFieldsDefinition.properties[fieldDefinition][ux_specification_types_1.SchemaTag.propertyIndex] = i;
         const dataType = common_1.determineDataType(selectionField);
-        appSchema['definitions'][fieldDefinition] = {
+        appSchema.definitions[fieldDefinition] = {
             type: 'object',
             properties: {},
             description,
-            annotationPath: `${selectionFieldsDefinition[common_1.SchemaTag.annotationPath]}/${i}`,
-            isViewNode: true,
             additionalProperties: false,
-            annotationType: selectionField?.type,
             ...(dataType && { dataType })
         };
+        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}` }
+        ];
+        if (selectionField.$target?.fullyQualifiedName.indexOf('@') > -1) {
+            appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.target] = selectionField.$target.fullyQualifiedName
+                .split('@')[0]
+                .split('/')[0];
+        }
+        else if (selectionField.$target?.fullyQualifiedName) {
+            appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.target] =
+                selectionField.$target.fullyQualifiedName.split('/')[0];
+        }
+        appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.annotationType] = selectionField?.type;
+        appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.annotationPath] = `${selectionFieldsDefinition[ux_specification_types_1.SchemaTag.annotationPath]}/${i}`;
         i++;
     });
 }
@@ -70,25 +82,25 @@ function defineActions(appSchema, schemaIdForActions, annotations, targetAnnotat
     const actions = appSchema.definitions[schemaIdForActions];
     actions.properties = {};
     actions.additionalProperties = false;
-    const chartAnnotation = annotations[targetAnnotation?.split(`${common_1.UIVOCABULARY}.`)[1]];
+    const chartAnnotation = annotations[targetAnnotation?.split(`${ux_specification_types_1.UIVOCABULARY}.`)[1]];
     if (chartAnnotation && chartAnnotation.Actions) {
         let i = 0;
         chartAnnotation.Actions.forEach((actionRecord) => {
-            const actionDefinition = common_1.prepareRef(`${common_1.DefinitionName.ChartToolBarAction}<${actionRecord.Action}>`);
+            const actionDefinition = common_1.prepareRef(`${ux_specification_types_1.DefinitionName.ChartToolBarAction}<${actionRecord.Action}>`);
             const description = common_1.getDataFieldDescription(actionRecord, entityType);
-            const prefix = actionRecord.$Type.split(`${common_1.UIVOCABULARY}.`)[1];
+            const prefix = actionRecord.$Type.split(`${ux_specification_types_1.UIVOCABULARY}.`)[1];
             const action = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
                 $ref: common_1.DEFINITION_LINK_PREFIX + actionDefinition,
                 description
             });
             //Add tags
-            action[common_1.SchemaTag.propertyIndex] = i;
-            action[common_1.SchemaTag.annotationType] = actionRecord.$Type;
-            action[common_1.SchemaTag.annotationPath] = `/${actionRecord.fullyQualifiedName}`;
+            action[ux_specification_types_1.SchemaTag.propertyIndex] = i;
+            action[ux_specification_types_1.SchemaTag.annotationType] = actionRecord.$Type;
+            action[ux_specification_types_1.SchemaTag.annotationPath] = `/${actionRecord.fullyQualifiedName}`;
             //as ChartToolBarAction is an empty object, copy ViewToolBarAction and remove properties
-            appSchema.definitions[actionDefinition] = JSON.parse(JSON.stringify(appSchema.definitions[common_1.DefinitionName.ViewToolBarAction]));
+            appSchema.definitions[actionDefinition] = JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.ViewToolBarAction]));
             appSchema.definitions[actionDefinition].properties = {};
-            appSchema.definitions[actionDefinition][common_1.SchemaTag.annotationPath] = actionRecord.fullyQualifiedName;
+            appSchema.definitions[actionDefinition][ux_specification_types_1.SchemaTag.annotationPath] = actionRecord.fullyQualifiedName;
             i++;
         });
     }
@@ -112,7 +124,7 @@ function findTheRightVisualization(allVisualizations, alias, namespace, viewKey,
         }
         else if (viewKey === 'secondary') {
             visualizationObject = allVisualizations.find((vis) => {
-                return vis['value'].indexOf(common_1.FacetBase.LineItem) > -1;
+                return vis['value'].indexOf(ux_specification_types_1.FacetBase.LineItem) > -1;
             });
         }
         else {
@@ -128,7 +140,7 @@ function findTheRightVisualization(allVisualizations, alias, namespace, viewKey,
             targetAnnotation = `/${namespace}/${visualizationObject['$target'].fullyQualifiedName.split(namespace)[1]}`;
         }
         else if (visualization) {
-            targetAnnotation = `/${namespace}/` + visualization.replace(`UI`, common_1.UIVOCABULARY);
+            targetAnnotation = `/${namespace}/` + visualization.replace(`UI`, ux_specification_types_1.UIVOCABULARY);
         }
     }
     return { visualization, targetAnnotation };
@@ -164,14 +176,14 @@ function analyzeChartAnnotation(namespace, annotationPath, annotationAVT, viewKe
 function analyzeViewAnnotation(annotationPath, uIAnnotations, generateParameters, viewKey, visualizationType) {
     let namespace = undefined, title;
     const UILINEITEM = '@UI.LineItem';
-    const annotationInManifest = annotationPath?.split(`${common_1.UIVOCABULARY}.`)[1];
+    const annotationInManifest = annotationPath?.split(`${ux_specification_types_1.UIVOCABULARY}.`)[1];
     const annotationAVT = annotationInManifest && uIAnnotations[annotationInManifest];
     if (!annotationAVT) {
         return { visualization: undefined, targetAnnotation: undefined, namespace, title: `View (${viewKey})` };
     }
     title = annotationAVT.Text;
     namespace = annotationAVT.fullyQualifiedName.split('@com.sap.vocabularies.UI.v1.')[0];
-    const alias = common_1.findAlias(common_1.UIVOCABULARY, generateParameters.serviceAVT);
+    const alias = common_1.findAlias(ux_specification_types_1.UIVOCABULARY, generateParameters.serviceAVT);
     if (annotationInManifest.startsWith('PresentationVariant')) {
         const { visualization, targetAnnotation } = findTheRightVisualization(annotationAVT.Visualizations, alias, namespace, viewKey, visualizationType);
         title = title || `View (${viewKey})`;
@@ -181,7 +193,7 @@ function analyzeViewAnnotation(annotationPath, uIAnnotations, generateParameters
         let { visualization, targetAnnotation } = findTheRightVisualization(annotationAVT.PresentationVariant.Visualizations, alias, namespace, viewKey, visualizationType);
         if (!visualization) {
             visualization = UILINEITEM; // default visualization
-            targetAnnotation = `/${namespace}/` + visualization.replace(`UI`, common_1.UIVOCABULARY); // default targetAnnotation
+            targetAnnotation = `/${namespace}/` + visualization.replace(`UI`, ux_specification_types_1.UIVOCABULARY); // default targetAnnotation
         }
         title = title || `View (${viewKey})`;
         return { visualization, targetAnnotation, namespace, title };
@@ -211,25 +223,26 @@ function analyzeViewAnnotation(annotationPath, uIAnnotations, generateParameters
  * @param annotations - UI annotations, as determined by AVT
  */
 function addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annotations) {
-    const chartView = appSchema.definitions[common_1.DefinitionName.ALPChartView];
-    appSchema.definitions[common_1.DefinitionName.ALPChart] = JSON.parse(JSON.stringify(chartView));
-    delete appSchema.definitions[common_1.DefinitionName.ALPChart][common_1.SchemaTag.isViewNode];
+    const chartView = appSchema.definitions[ux_specification_types_1.DefinitionName.ALPChartView];
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ALPChart] = JSON.parse(JSON.stringify(chartView));
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ALPChart][ux_specification_types_1.SchemaTag.isViewNode];
     if (targetAnnotation) {
-        appSchema.definitions[common_1.DefinitionName.ALPChart][common_1.SchemaTag.annotationPath] = targetAnnotation;
+        appSchema.definitions[ux_specification_types_1.DefinitionName.ALPChart][ux_specification_types_1.SchemaTag.annotationPath] = targetAnnotation;
     }
-    appSchema.definitions[common_1.DefinitionName.ALPChart].properties.annotationPath[common_1.SchemaTag.hidden] = true;
-    chartView.properties.annotationPath[common_1.SchemaTag.hidden] = true;
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ALPChart].properties.annotationPath[ux_specification_types_1.SchemaTag.hidden] = true;
+    chartView.properties.annotationPath[ux_specification_types_1.SchemaTag.hidden] = true;
     chartView.additionalProperties = false;
     chartView.description = `Chart (key: primary)`;
     chartView.title = `Chart`;
-    chartView.$ref = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ALPChart}`;
+    chartView.$ref = `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ALPChart}`;
     if (chartAnnotationPath) {
-        const viewAnnotation = chartAnnotationPath.split(common_1.UIVOCABULARYDOT)[1];
+        const viewAnnotation = chartAnnotationPath.split(ux_specification_types_1.UIVOCABULARYDOT)[1];
         const pathParts = annotations[viewAnnotation].fullyQualifiedName.split('@');
-        chartView[common_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
+        chartView[ux_specification_types_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
     }
-    chartView[common_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
-    chartView[common_1.SchemaTag.key] = 'primary';
+    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' }];
 }
 /**
  * Adds the ALP views to the app-specific schema
@@ -242,49 +255,49 @@ function addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annot
 function addALPViews(appSchema, viewsPaths, entityType, generateParameters, templateAnnotation, tableDefinitionName) {
     const annotations = entityType.annotations.UI;
     //1. Chart View
-    const chartAnnotationPath = viewsPaths?.[0]?.['primary']?.[0]?.[common_1.SchemaTag.annotationPath];
+    const chartAnnotationPath = viewsPaths?.[0]?.['primary']?.[0]?.[ux_specification_types_1.SchemaTag.annotationPath];
     const { targetAnnotation } = analyzeViewAnnotation(chartAnnotationPath, annotations, generateParameters, 'primary');
     addALPChartView(appSchema, chartAnnotationPath, targetAnnotation, annotations);
     // Copy toolbar
     const schemaIdForActions = `Actions<ALPChart>`;
-    appSchema.definitions[common_1.DefinitionName.ViewChartToolBar].properties.actions['$ref'] =
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ViewChartToolBar].properties.actions['$ref'] =
         common_1.DEFINITION_LINK_PREFIX + schemaIdForActions;
     defineActions(appSchema, schemaIdForActions, annotations, targetAnnotation, entityType);
     //2. Table View
-    const { visualization: tableVisualization, targetAnnotation: target } = analyzeViewAnnotation(viewsPaths?.[0]?.['secondary']?.[0]?.[common_1.SchemaTag.annotationPath], annotations, generateParameters, 'secondary');
+    const { visualization: tableVisualization, targetAnnotation: target } = analyzeViewAnnotation(viewsPaths?.[0]?.['secondary']?.[0]?.[ux_specification_types_1.SchemaTag.annotationPath], annotations, generateParameters, 'secondary');
     const tableDefinition = appSchema.definitions[tableDefinitionName];
     if (tableVisualization || templateAnnotation) {
-        tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ToolBarLR}`;
+        tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ToolBarLR}`;
         // Switch from generic column to specific definition
         tableDefinition.properties['columns'] = {
-            $ref: common_1.DEFINITION_LINK_PREFIX + common_1.DefinitionName.LineItems
+            $ref: common_1.DEFINITION_LINK_PREFIX + ux_specification_types_1.DefinitionName.LineItems
         };
-        tableDefinition.properties.annotationPath[common_1.SchemaTag.hidden] = true;
+        tableDefinition.properties.annotationPath[ux_specification_types_1.SchemaTag.hidden] = true;
     }
     else {
         tableDefinition.properties = {};
     }
-    const tableView = appSchema.definitions[common_1.DefinitionName.ALPTableView];
-    appSchema.definitions[common_1.DefinitionName.ALPTable] = JSON.parse(JSON.stringify(tableView));
-    delete appSchema.definitions[common_1.DefinitionName.ALPTable][common_1.SchemaTag.isViewNode];
+    const tableView = appSchema.definitions[ux_specification_types_1.DefinitionName.ALPTableView];
+    appSchema.definitions[ux_specification_types_1.DefinitionName.ALPTable] = JSON.parse(JSON.stringify(tableView));
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ALPTable][ux_specification_types_1.SchemaTag.isViewNode];
     tableView.additionalProperties = false;
     tableView.description = `Table (key: secondary)`;
     tableView.title = `Table`;
     if (tableVisualization) {
         delete tableView.properties;
-        tableView.$ref = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ALPTable}`;
+        tableView.$ref = `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ALPTable}`;
     }
     else if (!templateAnnotation) {
         tableView.properties = {};
     }
-    tableView[common_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
+    tableView[ux_specification_types_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
     let annotationTerm, viewAnnotation;
-    if (tableVisualization && tableVisualization.indexOf(common_1.FacetBase.LineItem) > -1) {
+    if (tableVisualization && tableVisualization.indexOf(ux_specification_types_1.FacetBase.LineItem) > -1) {
         annotationTerm = tableVisualization.split('.')[1];
-        viewAnnotation = viewsPaths[0]['secondary'][0].annotationPath.split(common_1.UIVOCABULARYDOT)[1];
+        viewAnnotation = viewsPaths[0]['secondary'][0].annotationPath.split(ux_specification_types_1.UIVOCABULARYDOT)[1];
     }
     else if (templateAnnotation) {
-        annotationTerm = viewAnnotation = templateAnnotation.split(common_1.UIVOCABULARYDOT)[1];
+        annotationTerm = viewAnnotation = templateAnnotation.split(ux_specification_types_1.UIVOCABULARYDOT)[1];
     }
     if (annotationTerm) {
         const dataForLineItem = {
@@ -292,13 +305,16 @@ function addALPViews(appSchema, viewsPaths, entityType, generateParameters, temp
             lineItemAnnotation: entityType.annotations.UI[annotationTerm],
             entityType,
             oDataServiceAVT: generateParameters.serviceAVT,
-            lineItemId: common_1.DefinitionName.LineItems
+            lineItemId: ux_specification_types_1.DefinitionName.LineItems
         };
-        utils_1.addLineItemsTypeToSchema(dataForLineItem, common_1.DefinitionName.ViewTableColumn);
-        appSchema.definitions[common_1.DefinitionName.ALPTable][common_1.SchemaTag.annotationPath] = target;
+        utils_1.addLineItemsTypeToSchema(dataForLineItem, ux_specification_types_1.DefinitionName.ViewTableColumn);
+        if (target) {
+            appSchema.definitions[ux_specification_types_1.DefinitionName.ALPTable][ux_specification_types_1.SchemaTag.annotationPath] = target;
+        }
         const pathParts = annotations[viewAnnotation].fullyQualifiedName.split('@');
-        tableView[common_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
-        tableView[common_1.SchemaTag.key] = 'secondary';
+        tableView[ux_specification_types_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
+        tableView[ux_specification_types_1.SchemaTag.key] = 'secondary';
+        tableView[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.key, value: 'secondary' }];
     }
 }
 /**
@@ -308,21 +324,21 @@ function addALPViews(appSchema, viewsPaths, entityType, generateParameters, temp
  * @returns the ID for the chart view in schema
  */
 function addViewChartDefinitions(inputParameters, annotations) {
-    const idForChart = `${common_1.DefinitionName.LRChartView}<${inputParameters.viewKey}>`;
-    inputParameters.appSchema.definitions[idForChart] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[common_1.DefinitionName.LRChartView]));
-    delete inputParameters.appSchema.definitions[idForChart][common_1.SchemaTag.isViewNode];
-    inputParameters.appSchema.definitions[idForChart][common_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
+    const idForChart = `${ux_specification_types_1.DefinitionName.LRChartView}<${inputParameters.viewKey}>`;
+    inputParameters.appSchema.definitions[idForChart] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[ux_specification_types_1.DefinitionName.LRChartView]));
+    delete inputParameters.appSchema.definitions[idForChart][ux_specification_types_1.SchemaTag.isViewNode];
+    inputParameters.appSchema.definitions[idForChart][ux_specification_types_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
     if (inputParameters.navPropName) {
         inputParameters.appSchema.definitions[idForChart]['navigationProperty'] = inputParameters.navPropName;
     }
     //Copy toolbar
-    const idForToolbar = `${common_1.DefinitionName.ViewChartToolBar}<${inputParameters.viewKey}>`;
-    inputParameters.appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[common_1.DefinitionName.ViewChartToolBar]));
+    const idForToolbar = `${ux_specification_types_1.DefinitionName.ViewChartToolBar}<${inputParameters.viewKey}>`;
+    inputParameters.appSchema.definitions[idForToolbar] = JSON.parse(JSON.stringify(inputParameters.appSchema.definitions[ux_specification_types_1.DefinitionName.ViewChartToolBar]));
     inputParameters.appSchema.definitions[idForChart]['properties'].toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}${idForToolbar}`;
     //Copy actions
-    const schemaIdForActions = `${common_1.DefinitionName.Actions}<${inputParameters.viewKey}>`;
+    const schemaIdForActions = `${ux_specification_types_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}`;
+    inputParameters.appSchema.definitions[idForToolbar]['properties'][ux_specification_types_1.PropertyName.actions]['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${schemaIdForActions}`;
     return idForChart;
 }
 /**
@@ -336,9 +352,9 @@ function addViewChartDefinitions(inputParameters, annotations) {
  */
 function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition, viewKey, title) {
     const idForChart = addViewChartDefinitions(inputParameters, UIAnnotations);
-    appSchema.definitions[idForChart].properties.annotationPath[common_1.SchemaTag.hidden] = true;
-    appSchema.definitions[idForChart].properties.index[common_1.SchemaTag.hidden] = true;
-    appSchema.definitions[idForChart].properties.entitySet[common_1.SchemaTag.hidden] = true;
+    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 titleOnHover = `Chart View (key: ${viewKey})`;
     viewsDefinition.properties[viewKey] = {
         $ref: `${common_1.DEFINITION_LINK_PREFIX}${idForChart}`,
@@ -355,16 +371,16 @@ function addViewChart(inputParameters, UIAnnotations, appSchema, viewsDefinition
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  */
 function addViewLineItems(inputParameters, viewsDefinition, visualization, templateAnnotation, generateParameters) {
-    const tableId = `${common_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
-    const viewId = `${common_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
-    const lrTableView = common_1.parseSchemaDefinition(common_1.DefinitionName.LRTableView, inputParameters.viewKey, inputParameters.appSchema);
-    delete lrTableView[common_1.SchemaTag.isViewNode];
-    lrTableView[common_1.SchemaTag.annotationPath] = inputParameters.targetAnnotation;
+    const tableId = `${ux_specification_types_1.DefinitionName.LRTableView}<${inputParameters.viewKey}>`;
+    const viewId = `${ux_specification_types_1.DefinitionName.LineItemsOfView}::${inputParameters.viewKey}`;
+    const lrTableView = 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;
     if (inputParameters.navPropName) {
         lrTableView['navigationProperty'] = inputParameters.navPropName;
     }
     //Copy toolbar
-    common_1.addDefinitionRef(lrTableView.properties.toolBar, common_1.DefinitionName.ToolBar, viewId);
+    common_1.addDefinitionRef(lrTableView.properties.toolBar, ux_specification_types_1.DefinitionName.ToolBar, viewId);
     const title = `Table View (key: ${inputParameters.viewKey})`;
     viewsDefinition.properties[inputParameters.viewKey] = {
         $ref: `${common_1.DEFINITION_LINK_PREFIX}${tableId}`,
@@ -372,10 +388,10 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         title
     };
     common_1.addDefinitionRef(lrTableView.properties.columns, viewId);
-    lrTableView.properties.annotationPath[common_1.SchemaTag.hidden] = true;
-    lrTableView.properties.index[common_1.SchemaTag.hidden] = true;
-    lrTableView.properties.entitySet[common_1.SchemaTag.hidden] = true;
-    const annotationTerm = visualization?.split('.')[1] || templateAnnotation.split(common_1.UIVOCABULARYDOT)[1];
+    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;
+    const annotationTerm = visualization?.split('.')[1] || templateAnnotation.split(ux_specification_types_1.UIVOCABULARYDOT)[1];
     const dataForLineItem = {
         appSchema: inputParameters.appSchema,
         lineItemAnnotation: inputParameters.targetEntityType.annotations.UI[annotationTerm],
@@ -383,7 +399,7 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
         oDataServiceAVT: generateParameters.serviceAVT,
         lineItemId: viewId
     };
-    utils_1.addLineItemsTypeToSchema(dataForLineItem, common_1.DefinitionName.ViewTableColumn);
+    utils_1.addLineItemsTypeToSchema(dataForLineItem, ux_specification_types_1.DefinitionName.ViewTableColumn);
 }
 /**
  * Adds the schema tags to a given view
@@ -393,12 +409,13 @@ function addViewLineItems(inputParameters, viewsDefinition, visualization, templ
  * @param view - the given view
  */
 function addTagsToView(viewsDefinition, viewKey, namespace, view) {
-    viewsDefinition.properties[viewKey][common_1.SchemaTag.isViewNode] = true;
-    viewsDefinition.properties[viewKey][common_1.SchemaTag.annotationPath] = namespace
-        ? `/${namespace}/@${view[common_1.SchemaTag.annotationPath]}`
+    viewsDefinition.properties[viewKey][ux_specification_types_1.SchemaTag.isViewNode] = true;
+    viewsDefinition.properties[viewKey][ux_specification_types_1.SchemaTag.annotationPath] = namespace
+        ? `/${namespace}/@${view[ux_specification_types_1.SchemaTag.annotationPath]}`
         : undefined;
-    viewsDefinition.properties[viewKey][common_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
-    viewsDefinition.properties[viewKey][common_1.SchemaTag.key] = viewKey;
+    viewsDefinition.properties[viewKey][ux_specification_types_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
+    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
@@ -445,7 +462,7 @@ function addLRViewParts(visualization, viewsDefinition, commonInputParameters, g
             description: commonInputParameters.title || titleOnHover,
             title: titleOnHover,
             // Default view - use table view reference as default
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.TableViewExtension}`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.TableViewExtension}`
         };
     }
     else {
@@ -454,7 +471,7 @@ function addLRViewParts(visualization, viewsDefinition, commonInputParameters, g
             description: commonInputParameters.title || titleOnHover,
             title: titleOnHover,
             // Default view - use table view reference as default
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.LRTableView}`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.LRTableView}`
         };
     }
 }
@@ -477,19 +494,19 @@ function addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParame
     };
     const viewsDefinition = appSchema.definitions.MultiTableModeV4;
     for (const view of viewsPaths) {
-        if (!view[common_1.SchemaTag.key]) {
+        if (!view[ux_specification_types_1.SchemaTag.key]) {
             continue;
         }
         let navPropName = undefined;
         const targetEntityType = getTargetEntityType(entitySet, view, generateParameters, entityType);
         const uiAnnotations = targetEntityType.annotations.UI;
-        const { visualization, targetAnnotation, namespace, title } = analyzeViewAnnotation(view?.[common_1.SchemaTag.annotationPath], uiAnnotations, generateParameters, view[common_1.SchemaTag.key]);
+        const { visualization, targetAnnotation, namespace, title } = analyzeViewAnnotation(view?.[ux_specification_types_1.SchemaTag.annotationPath], uiAnnotations, generateParameters, view[ux_specification_types_1.SchemaTag.key]);
         if (view['entitySet']) {
             navPropName = entityType.navigationProperties.find((np) => {
                 return np.targetTypeName === namespace;
             })?.name;
         }
-        const viewKey = common_1.prepareRef(view[common_1.SchemaTag.key]);
+        const viewKey = common_1.prepareRef(view[ux_specification_types_1.SchemaTag.key]);
         const commonInputParameters = {
             viewKey,
             appSchema,
@@ -517,17 +534,17 @@ function adaptTableDefinition(appSchema, entityType, generateParameters, templat
     const { visualization, targetAnnotation, namespace } = analyzeViewAnnotation(templateAnnotation, entityType.annotations.UI, generateParameters, undefined, ux_specification_types_1.Visualization.LineItem);
     if (visualization) {
         const annotationTerm = visualization.split('.')[1];
-        const annotationTermInSchema = `${common_1.DefinitionName.LineItems}OfSPV::${common_1.prepareRef(annotationTerm)}`;
+        const annotationTermInSchema = `${ux_specification_types_1.DefinitionName.LineItems}OfSPV::${common_1.prepareRef(annotationTerm)}`;
         const spvTable = (appSchema.definitions[`${tableDefinitionName}SPV`] = JSON.parse(JSON.stringify(appSchema.definitions[tableDefinitionName])));
-        delete spvTable[common_1.SchemaTag.isViewNode];
-        common_1.addDefinitionRef(spvTable.properties.toolBar, common_1.DefinitionName.ToolBar, annotationTermInSchema);
+        delete spvTable[ux_specification_types_1.SchemaTag.isViewNode];
+        common_1.addDefinitionRef(spvTable.properties.toolBar, ux_specification_types_1.DefinitionName.ToolBar, annotationTermInSchema);
         // Switch from generic column to specific definition
-        spvTable[common_1.SchemaTag.annotationPath] = targetAnnotation;
+        spvTable[ux_specification_types_1.SchemaTag.annotationPath] = targetAnnotation;
         spvTable.properties.columns = {};
         common_1.addDefinitionRef(spvTable.properties.columns, annotationTermInSchema);
         delete tableDefinition.properties;
         common_1.addDefinitionRef(tableDefinition, `${tableDefinitionName}SPV`);
-        tableDefinition[common_1.SchemaTag.annotationPath] = `/${namespace}/@${templateAnnotation}`;
+        tableDefinition[ux_specification_types_1.SchemaTag.annotationPath] = `/${namespace}/@${templateAnnotation}`;
         const lineItemAnnotation = entityType.annotations.UI[annotationTerm];
         const dataForLineItem = {
             appSchema,
@@ -539,20 +556,20 @@ function adaptTableDefinition(appSchema, entityType, generateParameters, templat
         utils_1.addLineItemsTypeToSchema(dataForLineItem);
     }
     else {
-        tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ToolBarLR}`;
+        tableDefinition.properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ToolBarLR}`;
         // Switch from generic column to specific definition
-        common_1.addDefinitionRef(tableDefinition.properties.columns, common_1.DefinitionName.LineItems);
+        common_1.addDefinitionRef(tableDefinition.properties.columns, ux_specification_types_1.DefinitionName.LineItems);
         const lineItemAnnotation = entityType?.annotations?.[alias]?.LineItem;
         const dataForLineItem = {
             appSchema,
             lineItemAnnotation,
             entityType,
             oDataServiceAVT: generateParameters.serviceAVT,
-            lineItemId: common_1.DefinitionName.LineItems
+            lineItemId: ux_specification_types_1.DefinitionName.LineItems
         };
         utils_1.addLineItemsTypeToSchema(dataForLineItem);
         if (lineItemAnnotation) {
-            tableDefinition[common_1.SchemaTag.annotationPath] = common_1.createAnnotationPath(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
+            tableDefinition[ux_specification_types_1.SchemaTag.annotationPath] = common_1.createAnnotationPath(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
         }
     }
 }
@@ -563,13 +580,13 @@ function adaptTableDefinition(appSchema, entityType, generateParameters, templat
  * @returns {string} annotation term
  */
 function getDefaultAnnotationPath(v4Page, entityType, templateType) {
-    if (v4Page.options.settings?.views?.paths && templateType === common_1.TemplateType.ListReportObjectPageV4) {
+    if (v4Page.options.settings?.views?.paths && templateType === ux_specification_types_1.TemplateType.ListReportObjectPageV4) {
         return;
     }
     if (v4Page.options.settings?.defaultTemplateAnnotationPath) {
         return v4Page.options.settings.defaultTemplateAnnotationPath;
     }
-    if (templateType === common_1.TemplateType.ListReportObjectPageV4) {
+    if (templateType === ux_specification_types_1.TemplateType.ListReportObjectPageV4) {
         return (entityType.annotations.UI?.SelectionPresentationVariant?.term ||
             entityType.annotations.UI?.PresentationVariant?.term);
     }
@@ -586,7 +603,7 @@ function addTableAndViews(appSchema, v4Page, entityType, entitySet, generatePara
     const viewsPaths = v4Page.options?.settings?.views?.paths;
     const defaultAnnotation = getDefaultAnnotationPath(v4Page, entityType, generateParameters.templateType);
     const tableDefinitionName = utils_1.alignSchemaWithTemplateType(appSchema, generateParameters);
-    if (generateParameters.templateType === common_1.TemplateType.ListReportObjectPageV4) {
+    if (generateParameters.templateType === ux_specification_types_1.TemplateType.ListReportObjectPageV4) {
         if (viewsPaths) {
             addLRViews(appSchema, viewsPaths, entityType, entitySet, generateParameters, v4Page, tableDefinitionName);
         }
@@ -596,9 +613,9 @@ function addTableAndViews(appSchema, v4Page, entityType, entitySet, generatePara
             }
             adaptTableDefinition(appSchema, entityType, generateParameters, defaultAnnotation, v4Page, alias, tableDefinitionName);
         }
-        appSchema.properties[common_1.PropertyName.chart][common_1.SchemaTag.hidden] = true;
+        appSchema.properties[ux_specification_types_1.PropertyName.chart][ux_specification_types_1.SchemaTag.hidden] = true;
     }
-    else if (generateParameters.templateType === common_1.TemplateType.AnalyticalListPageV4) {
+    else if (generateParameters.templateType === ux_specification_types_1.TemplateType.AnalyticalListPageV4) {
         addALPViews(appSchema, viewsPaths, entityType, generateParameters, defaultAnnotation, tableDefinitionName);
     }
 }
@@ -615,13 +632,13 @@ function addTableAndViews(appSchema, v4Page, entityType, entitySet, generatePara
 function generateListReportSchemaV4(generateParameters, genericSchema, entitySet, templateName) {
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
     const entityType = entitySet?.entityType;
-    const alias = generateParameters.serviceAVT && common_1.findAlias(common_1.UIVOCABULARY, generateParameters.serviceAVT);
+    const alias = generateParameters.serviceAVT && common_1.findAlias(ux_specification_types_1.UIVOCABULARY, generateParameters.serviceAVT);
     //Add selection fields
     const selectionFieldAnnotation = alias && entityType?.annotations?.[alias]?.SelectionFields;
     addSelectionFields(entityType, appSchema, selectionFieldAnnotation);
-    appSchema.properties[common_1.PropertyName.defaultTemplateAnnotationPath][common_1.SchemaTag.hidden] = true;
+    appSchema.properties[ux_specification_types_1.PropertyName.defaultTemplateAnnotationPath][ux_specification_types_1.SchemaTag.hidden] = true;
     //enum for annotation path as part of QuickVariantSelection
-    common_1.addEnumForSingleTabVariant(entityType, appSchema, common_1.DefinitionName.AnnotationPathAsObject);
+    common_1.addEnumForSingleTabVariant(entityType, appSchema, ux_specification_types_1.DefinitionName.AnnotationPathAsObject);
     if (generateParameters.manifest) {
         //Find page in targets
         const pages = generateParameters.manifest[ux_specification_types_1.ManifestSection.ui5].routing
@@ -631,7 +648,7 @@ function generateListReportSchemaV4(generateParameters, genericSchema, entitySet
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOPAGES', { appId: generateParameters.manifest['sap.app']['id'] }),
                 location: {
-                    path: common_1.MANIFESTPATH,
+                    path: ux_specification_types_1.MANIFESTPATH,
                     range: [ux_specification_types_1.ManifestSection.generic]
                 }
             });