@sap/ux-specification 1.108.29 → 1.108.31

package/dist/specification/src/sync/v2/generate/analyticalListReport.js

@@ -20,26 +20,20 @@ const ROOT_PROPERTIES_ORDER = [
     'table',
     'footer'
 ];
-/**
- *
- * @param annotationTerm "unqualified" annotation term that can be specified whithin a visualization (i.e. "LineItem" or "Chart")
- * @param visualization one visualization of a PresentationVariant
- * @returns empty string if the visualization does not match the annotationTerm. Otherwise the value of the visualization stripped by the reference to the ui vocabulary
- */
-function retrieveNameWithoutVocabulary(annotationTerm, visualization) {
-    // check whether the value of the visualization specifies the fully qualified annotation term if yes, return the value without the vocabulary prefix, otherwise the empty string
-    const visualizationValue = visualization.value;
-    return visualizationValue.includes(ux_specification_types_1.UIVOCABULARYALPHADOT + annotationTerm) // replace includes with startsWith?
-        ? visualizationValue.replace(ux_specification_types_1.UIVOCABULARYALPHADOT, '')
-        : '';
-}
 /**
  * Returns LineItem and Chart annotations used for the ALP. Reproduces logic from Fiori Elements ALP implementation (function createWorkingContext in ALP specific AnnotationHelper).
  * @param {v2.SapUiAppPageV2} v2Page - actual page in the manifest
  * @param {EntityTypeAnnotations_UI} uIAnnotations - annotations of UI namespace of the given entityType
  */
 function getLineItemAndChartAnnotation(v2Page, uIAnnotations, logger) {
-    const qualifier = v2Page?.component?.settings?.qualifier; // qualifier from the manifest (if it has been configured)
+    const settings = v2Page?.component?.settings;
+    if ((0, utils_1.hasPropertyTypeError)(settings, 'qualifier', logger)) {
+        return {
+            lineItemAnnotation: undefined,
+            chartAnnotation: undefined
+        }; // return undefined in case there is an error in the settings
+    }
+    const qualifier = settings?.qualifier; // qualifier from the manifest (if it has been configured)
     // retrieve the definition of the specified annotation for the qualifier which has been retrieved from the manifest settings
     const getAnnotationWithQualifier = function (annotationTerm) {
         const annotationPath = annotationTerm + (qualifier ? '#' + qualifier : '');
@@ -68,8 +62,9 @@ function getLineItemAndChartAnnotation(v2Page, uIAnnotations, logger) {
     let lineItemName = ''; // the name that will be used to retrieve the LineItem from uiAnnotations
     let chartName = ''; // the name that will be used to retrieve the Chart from uiAnnotations
     visualizations.some(function (visualization) {
-        lineItemName = lineItemName || retrieveNameWithoutVocabulary(types_2.FacetBase.LineItem, visualization);
-        chartName = chartName || retrieveNameWithoutVocabulary(types_2.FacetBase.Chart, visualization);
+        lineItemName =
+            lineItemName || (0, utils_1.retrieveNameWithoutVocabularyFromVisualization)(types_2.FacetBase.LineItem, visualization);
+        chartName = chartName || (0, utils_1.retrieveNameWithoutVocabularyFromVisualization)(types_2.FacetBase.Chart, visualization);
         return lineItemName && chartName; // end loop as soon as names of LineItem and Chart have both been identified
     });
     // If the above logic did not identify a name for the LineItem/Chart then still the corresponding annotation (but without qualifier) will be used
@@ -107,7 +102,6 @@ function addChart(appSchema, chartAnnotation) {
  * 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 a list report
- * @param entityTypeName - the base entity type of the given page
  */
 function generateAnalyticalListReportSchemaV2(generateParameters, genericSchema) {
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
@@ -132,24 +126,18 @@ function generateAnalyticalListReportSchemaV2(generateParameters, genericSchema)
     (0, utils_1.removeElementsFromEnum)(appSchema.definitions.TableColumnExtensionTypeV2['enum'], [
         ux_specification_types_1.v2.TableColumnExtensionTypeV2.TreeTableColumnsExtension
     ]);
-    const entityType = generateParameters.entitySet?.entityType;
-    if (!entityType) {
-        (0, extensionLogger_1.log)(generateParameters.logger, {
-            severity: "error" /* LogSeverity.Error */,
-            message: i18next_1.default.t('NOENTITYTYPE4SET', { entitySetName: generateParameters.entitySet?.name })
-        });
-    }
-    else {
+    const { entityType, uIAnnotations } = (0, utils_1.getUIAnnotationForEntitySet)(generateParameters); // would log an error in case these entities are missing
+    if (uIAnnotations) {
+        // then entityType is there as well
         // handle header actions
         (0, utils_1.addStandardHeaderActions)(appSchema);
         const pageKeys = [];
         const v2Page = (0, import_1.findAnalyticalListPage)(generateParameters.manifest[ux_specification_types_1.ManifestSection.generic].pages, pageKeys, generateParameters.logger);
-        const annotations = entityType?.annotations?.UI;
-        const { lineItemAnnotation, chartAnnotation } = getLineItemAndChartAnnotation(v2Page, annotations, generateParameters.logger);
+        const { lineItemAnnotation, chartAnnotation } = getLineItemAndChartAnnotation(v2Page, uIAnnotations, generateParameters.logger);
         //handle line items
         if (lineItemAnnotation) {
             types_1.ALPTABLETYPES.forEach((tableType) => {
-                appSchema.definitions[tableType][ux_specification_types_1.SchemaTag.annotationPath] = (0, common_1.createAnnotationPath)(entityType?.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
+                appSchema.definitions[tableType][ux_specification_types_1.SchemaTag.annotationPath] = (0, common_1.createAnnotationPath)(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
             });
         }
         (0, utils_1.addLineItemsType)(appSchema, lineItemAnnotation, entityType);
@@ -158,7 +146,7 @@ function generateAnalyticalListReportSchemaV2(generateParameters, genericSchema)
             addChart(appSchema, chartAnnotation);
         }
         //handle filter fields
-        const selectionFieldAnnotation = entityType?.annotations?.UI?.SelectionFields;
+        const selectionFieldAnnotation = uIAnnotations.SelectionFields;
         (0, utils_1.addSelectionFields)(appSchema, selectionFieldAnnotation, entityType);
         //add fields for createWithParameterDialog
         (0, common_1.addFieldsType)(appSchema, entityType);

package/dist/specification/src/sync/v2/generate/analyticalListReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyticalListReport.js","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/analyticalListReport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyticalListReport.js","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/analyticalListReport.ts"],"names":[],"mappings":"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"}

package/dist/specification/src/sync/v2/generate/listReport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listReport.d.ts","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAI/E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,iBAAiB,GACnC,IAAI,CAIN;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,UAAU,GAC1B,MAAM,CAwHR"}
+{"version":3,"file":"listReport.d.ts","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAK3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAM/E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,iBAAiB,GACnC,IAAI,CAIN;AAwGD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,UAAU,GAC1B,MAAM,CAmGR"}

package/dist/specification/src/sync/v2/generate/listReport.js

@@ -11,7 +11,9 @@ const i18next_1 = __importDefault(require("i18next"));
 const ux_specification_types_1 = require("@sap/ux-specification-types");
 const extensionLogger_1 = require("../../../extensionLogger");
 const types_1 = require("../types");
+const types_2 = require("../../../../../types/src/common/types");
 const ROOT_PROPERTIES_ORDER = ['filterBar', 'table', 'footer'];
+const UIVOCABULARYDOT = ux_specification_types_1.UIVOCABULARYALPHADOT.substring(1); // reference to the ui vocabluary without leading '@' but with trailing'.'
 /**
  * Adds the enum types for QuickVariant and QuickVariantX, based on the entity type annotations
  * @param {EntityType} entityType
@@ -25,6 +27,95 @@ function addEnumForVariantPaths(entityType, entitySet, appSchema, oDataServiceAV
     (0, common_1.addEnumForVariantEntitySet)(oDataServiceAVT, appSchema, 'QuickVariantX');
 }
 exports.addEnumForVariantPaths = addEnumForVariantPaths;
+/**
+ * Adds an enum filled with existing UI annotations for annotationPath property in FilterBar
+ * @param {EntityType} entityType
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+function addEnumForFilterBarAnnotationPath(entityType, appSchema, definitionName) {
+    const annoPath = appSchema.definitions[definitionName].properties.annotationPath;
+    const validAnnotations = [
+        "com.sap.vocabularies.UI.v1.SelectionPresentationVariant" /* UIAnnotationTerms.SelectionPresentationVariant */,
+        "com.sap.vocabularies.UI.v1.SelectionVariant" /* UIAnnotationTerms.SelectionVariant */,
+        "com.sap.vocabularies.UI.v1.PresentationVariant" /* UIAnnotationTerms.PresentationVariant */
+    ];
+    (0, common_1.addEnumForValidAnnotations)(entityType, validAnnotations, annoPath);
+}
+// Helper function for getLineItemAnnotation which determines the presentation variant to be used. The parameters of both functions have identical meaning.
+function getPresentationVariantForLineItem(uIAnnotations, settings, logger) {
+    let presentationVariant; // the presentation variant to be used to determine the LineItem
+    const annotationPath = settings?.annotationPath;
+    // Note: annotationPath (if it exists) contains the fully qualified annotation name (starting with UIVOCABULARYDOT) which would be a member of enum UIAnnotationTerms.
+    // Inside uiAnnotations the unqualified annotation names are used as keys. They can be found in enum FacetBase or obtained from the terms above by removing UIVOCABULARYDOT.
+    if (annotationPath) {
+        const isSPV = annotationPath.includes("com.sap.vocabularies.UI.v1.SelectionPresentationVariant" /* UIAnnotationTerms.SelectionPresentationVariant */);
+        const isPV = !isSPV && annotationPath.includes("com.sap.vocabularies.UI.v1.PresentationVariant" /* UIAnnotationTerms.PresentationVariant */);
+        if (isSPV || isPV) {
+            const accessor = annotationPath.replace(UIVOCABULARYDOT, '');
+            const uiAnnotation = uIAnnotations[accessor]; // the ui annotation specified by the annotationPath if it exists
+            if (uiAnnotation) {
+                if (isPV) {
+                    presentationVariant = uiAnnotation;
+                }
+                else {
+                    // SPV case
+                    presentationVariant = uiAnnotation[types_2.FacetBase.PresentationVariant];
+                    if (presentationVariant &&
+                        presentationVariant.fullyQualifiedName.includes(types_2.FacetBase.SelectionPresentationVariant)) {
+                        presentationVariant = uIAnnotations[types_2.FacetBase.PresentationVariant]; // inline presentation variants are ignored, use standard presentation variant instead
+                    }
+                }
+            }
+            else {
+                // annotationPath is pointing to a selection presentation variant or a presentation variant but the corresponding annotation does not exist
+                (0, extensionLogger_1.log)(logger, {
+                    severity: "warning" /* LogSeverity.Warning */,
+                    message: i18next_1.default.t('NOANNOTATIONFORPATH', { annotationPath: annotationPath })
+                });
+                // If the annotationPath has specified a non-existing selection presentation variant fall back to the standard presentation variant
+                if (isSPV) {
+                    presentationVariant = uIAnnotations[types_2.FacetBase.PresentationVariant];
+                }
+            }
+        }
+        else {
+            // annotationPath exists but does not point to a selection presentation variant or presentation variant (should point to a selection variant then)
+            presentationVariant = uIAnnotations[types_2.FacetBase.PresentationVariant]; // use standard presentation variant in this case
+        }
+    }
+    else {
+        presentationVariant = uIAnnotations[types_2.FacetBase.PresentationVariant];
+    }
+    return presentationVariant;
+}
+// Determine the LineItemAnnotation to be used for the LR.
+// Reproduces logic from Fiori Elements LR implementation (function createWorkingContext in LR specific AnnotationHelper).
+function getLineItemAnnotation(uIAnnotations, settings, // an object (actually a piece of the manifest) possessing an optional property annotationPath which would define the path to the PresentationVariant
+logger // used in case an error/warning is detected while determining the result
+) {
+    if ((0, utils_1.hasPropertyTypeError)(settings, 'annotationPath', logger)) {
+        return undefined; // return undefined in case there is an error in the settings
+    }
+    const presentationVariant = getPresentationVariantForLineItem(uIAnnotations, settings, logger); // the presentation variant to be used to determine the LineItem (if there is one)
+    // If a PV could be determined LineItem should be defined as a visualization of the PV.
+    const visualizations = presentationVariant?.Visualizations || [];
+    let lineItemName = ''; // the name that will be used to retrieve the LineItem from uiAnnotations
+    visualizations.some(function (visualization) {
+        lineItemName = (0, utils_1.retrieveNameWithoutVocabularyFromVisualization)(types_2.FacetBase.LineItem, visualization);
+        return lineItemName; // end loop as soon as name of LineItem has been identified
+    });
+    // If the above logic did not identify a name for the LineItem then still the corresponding annotation (but without qualifier) will be used
+    lineItemName = lineItemName || types_2.FacetBase.LineItem;
+    const lineItem = uIAnnotations[lineItemName];
+    if (!lineItem) {
+        (0, extensionLogger_1.log)(logger, {
+            severity: "warning" /* LogSeverity.Warning */,
+            message: i18next_1.default.t('NOLINEITEMFORPATH', { annotationPath: lineItemName })
+        });
+    }
+    return lineItem;
+}
 /**
  * Generates an app specific schema for the FE V2 Listreport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.
@@ -34,63 +125,43 @@ exports.addEnumForVariantPaths = addEnumForVariantPaths;
  */
 function generateListReportSchemaV2(generateParameters, genericSchema) {
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
-    appSchema.properties.table['anyOf']['0']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.MULTISELECTTABLE;
-    appSchema.properties.table['anyOf']['1']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.INLINEDELETETABLE;
-    appSchema.properties.table['anyOf']['2']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.TREETABLE;
-    appSchema.properties.table['anyOf']['3']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.ANALYTICALTABLE;
-    appSchema.properties.table['anyOf']['4']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.GRIDTABLE;
-    const responsiveTableMultiSelect = JSON.parse(JSON.stringify(genericSchema.definitions.ResponsiveTableWithMultiSelect));
-    const responsiveTableInlineDelete = JSON.parse(JSON.stringify(genericSchema.definitions.ResponsiveTableWithInlineDelete));
-    const treeTableDefinition = JSON.parse(JSON.stringify(genericSchema.definitions.TreeTable));
-    const analyticalTableDefinition = JSON.parse(JSON.stringify(genericSchema.definitions.AnalyticalTable));
-    const gridTableDefinition = JSON.parse(JSON.stringify(genericSchema.definitions.GridTable));
     const lrLineItems = {
         $ref: common_1.DEFINITION_LINK_PREFIX + ux_specification_types_1.DefinitionName.LineItems
     };
-    responsiveTableMultiSelect.properties.columns = lrLineItems;
-    responsiveTableInlineDelete.properties.columns = lrLineItems;
-    treeTableDefinition.properties.columns = lrLineItems;
-    analyticalTableDefinition.properties.columns = lrLineItems;
-    gridTableDefinition.properties.columns = lrLineItems;
     const lrToolBar = common_1.DEFINITION_LINK_PREFIX + ux_specification_types_1.DefinitionName.ToolBarLR;
-    appSchema.definitions[types_1.MULTISELECTTABLE] = responsiveTableMultiSelect;
-    appSchema.definitions[types_1.INLINEDELETETABLE] = responsiveTableInlineDelete;
-    appSchema.definitions[types_1.TREETABLE] = treeTableDefinition;
-    appSchema.definitions[types_1.ANALYTICALTABLE] = analyticalTableDefinition;
-    appSchema.definitions[types_1.GRIDTABLE] = gridTableDefinition;
-    types_1.LINEITEMTABLETYPES.forEach((tableType) => {
-        appSchema.definitions[tableType].properties.toolBar['$ref'] = lrToolBar;
+    types_1.LINEITEMTABLETYPES.forEach((tableType, i) => {
+        appSchema.properties.table['anyOf'][i.toString()]['$ref'] = common_1.DEFINITION_LINK_PREFIX + tableType;
+        const tableTypeRaw = tableType.replace('<LineItems>', '');
+        const localGenericSchema = JSON.parse(JSON.stringify(genericSchema.definitions[tableTypeRaw]));
+        localGenericSchema.properties.columns = lrLineItems;
+        localGenericSchema.properties.toolBar['$ref'] = lrToolBar;
+        appSchema.definitions[tableType] = localGenericSchema;
     });
-    const entityType = generateParameters.entitySet?.entityType;
-    if (!entityType) {
-        if (generateParameters.entitySet?.name) {
-            (0, extensionLogger_1.log)(generateParameters.logger, {
-                severity: "error" /* LogSeverity.Error */,
-                message: i18next_1.default.t('NOENTITYTYPE4SET', { entitySetName: generateParameters.entitySet?.name })
-            });
-        }
-    }
-    else {
+    const { entityType, uIAnnotations } = (0, utils_1.getUIAnnotationForEntitySet)(generateParameters); // would log an error in case these entities are missing
+    if (uIAnnotations) {
+        // then entityType is there as well
+        // retrieve page definition of root page from manifest
+        const pageKeys = [];
+        const v2Page = (0, import_1.findListReportPageV2)(generateParameters.manifest[ux_specification_types_1.ManifestSection.generic].pages, pageKeys);
         // handle standard header actions
         (0, utils_1.addStandardHeaderActions)(appSchema);
         //handle line items
-        const lineItemAnnotation = entityType?.annotations?.UI?.LineItem;
+        const lineItemAnnotation = getLineItemAnnotation(uIAnnotations, v2Page?.component?.settings, generateParameters.logger);
         if (lineItemAnnotation) {
+            const annotationPath = (0, common_1.createAnnotationPath)(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
             types_1.LINEITEMTABLETYPES.forEach((tableType) => {
-                appSchema.definitions[tableType][ux_specification_types_1.SchemaTag.annotationPath] = (0, common_1.createAnnotationPath)(entityType?.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
+                appSchema.definitions[tableType][ux_specification_types_1.SchemaTag.annotationPath] = annotationPath;
             });
         }
         (0, utils_1.addLineItemsType)(appSchema, lineItemAnnotation, entityType);
         //handle filter fields
-        const selectionFieldAnnotation = entityType?.annotations?.UI?.SelectionFields;
+        const selectionFieldAnnotation = uIAnnotations.SelectionFields;
         (0, utils_1.addSelectionFields)(appSchema, selectionFieldAnnotation, entityType);
         //add fields for createWithParameterDialog
         (0, common_1.addFieldsType)(appSchema, entityType);
         // add entityProperties to a enum, in this case MultiEdit -> ignoredFields
         appSchema.definitions.MultiEdit.properties.ignoredFields['items']['enum'] = [];
         (0, utils_1.addEntityPropertiesToEnum)(appSchema.definitions.MultiEdit.properties.ignoredFields['items']['enum'], entityType);
-        const pageKeys = [];
-        const v2Page = (0, import_1.findListReportPageV2)(generateParameters.manifest[ux_specification_types_1.ManifestSection.generic].pages, pageKeys);
         if (!v2Page) {
             (0, extensionLogger_1.log)(generateParameters.logger, {
                 severity: "error" /* LogSeverity.Error */,
@@ -104,7 +175,7 @@ function generateListReportSchemaV2(generateParameters, genericSchema) {
         }
         (0, utils_1.addTableColumnExtensions)(appSchema, entityType, v2Page, generateParameters.manifest, generateParameters.fragments);
         addEnumForVariantPaths(entityType, generateParameters.entitySet, appSchema, generateParameters.serviceAVT);
-        (0, common_1.addEnumForFilterBarAnnotationPath)(entityType, appSchema, ux_specification_types_1.DefinitionName.ListReportFilterBar);
+        addEnumForFilterBarAnnotationPath(entityType, appSchema, ux_specification_types_1.DefinitionName.ListReportFilterBar);
         (0, common_1.addEnumFieldGroupAnnotationPath)(entityType, appSchema, ux_specification_types_1.DefinitionName.MultiEditV2);
         //Delete generic definitions
         delete appSchema.definitions.ResponsiveTableWithMultiSelect;

package/dist/specification/src/sync/v2/generate/listReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"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"}

package/dist/specification/src/sync/v2/generate/objectPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/objectPage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAKR,2BAA2B,EAE9B,MAAM,6BAA6B,CAAC;AAozBrC;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,MAAM,GACtB,MAAM,CA8FR"}
+{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../../src/sync/v2/generate/objectPage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAKR,2BAA2B,EAE9B,MAAM,6BAA6B,CAAC;AA+yBrC;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,MAAM,GACtB,MAAM,CA8FR"}

package/dist/specification/src/sync/v2/generate/objectPage.js

@@ -61,18 +61,19 @@ function addFlexChangeForSection(appSchema, schemaSection, property, sectionType
  * Callback for adding a single action to headerActions of V2
  * @param {EntityType} entityType - current entity type
  * @param {object} appSchema Schema of the app
- * @param actionAnnotation - annotation as present in AVT ConvertedMetadata
+ * @param identification - UI.Identification annotation as present in AVT ConvertedMetadata
  * @param headerActions - list of header actions, to be enhanced
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  */
-function addHeaderActionCallBackV2(entityType, appSchema, identification, headerActions, oDataServiceAVT) {
+function addHeaderActionCallBackV2(entityType, appSchema, identification, headerActions, generateParameters) {
     identification?.forEach((item) => {
         if (!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) {
-            const { actionName, actionId, namespace } = (0, common_1.getActionNameAndId)(item, oDataServiceAVT);
+            const { actionName, actionId, namespace } = (0, common_1.getActionNameAndId)(item, generateParameters.serviceAVT);
             //actionId is used as key in V2, as this is the right part for building the full stable ID
             if (!actionId) {
                 return;
             }
-            const description = item.Label || actionName;
+            const description = (item.Label || actionName);
             const actionDefinitionKey = `ObjectPageHeaderAction<${(0, common_1.prepareRef)(actionId)}>`;
             appSchema.definitions[actionDefinitionKey] = JSON.parse(JSON.stringify(appSchema.definitions['ObjectPageHeaderAction']));
             const convertedIdentification = item.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
@@ -261,8 +262,10 @@ function handleLineItem(generateParameters, facetKey, appSchema, facet, facets,
         customColumnDefinitionKey = ensureCustomColumnDefinitionExists(appSchema, generateParameters.manifest, targetEntitySet.name, facet.entityType.name, generateParameters.serviceAVT, facet, facetKey, generateParameters.fragments);
     }
     for (const facetItem in facets) {
-        if (facets[facetItem].base === ux_specification_types_1.FacetBase.LineItem && facetItem.includes(navigationProperty)) {
-            (0, utils_1.addLineItemsType)(appSchema, facets[facetItem].target, facets[facetItem].entityType, facetItem, customColumnDefinitionKey);
+        const facet = facets[facetItem];
+        if (facet.base === ux_specification_types_1.FacetBase.LineItem &&
+            (facet.ID === navigationProperty || facetItem.includes(navigationProperty))) {
+            (0, utils_1.addLineItemsType)(appSchema, facet.target, facet.entityType, facet.ID || facetItem, customColumnDefinitionKey);
         }
     }
 }
@@ -397,7 +400,7 @@ function getSectionType(facetType, isSubSection, isHeaderFacet) {
  * @return {string} reference key
  */
 function getReferenceKey(facet, facetKey, sectionType) {
-    let referenceKey = facetKey;
+    let referenceKey = facet.ID || facetKey;
     if (sectionType === (types_1.SectionTypeV2.Section || types_1.SectionTypeV2.SubSection)) {
         referenceKey = referenceKey.replace(`@${"com.sap.vocabularies.UI.v1.Facets" /* UIAnnotationTerms.Facets */}`, facet.base);
     }
@@ -434,7 +437,7 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, i
         }
         case types_1.SectionTypeV2.SectionTable:
         case types_1.SectionTypeV2.SubSectionTable: {
-            handleLineItem(generateParameters, facetKey, appSchema, facet, facets, sectionType);
+            handleLineItem(generateParameters, referenceKey, appSchema, facet, facets, sectionType);
             //add fields for createWithParameterDialog
             const floorplanSuffix = 'OP';
             (0, common_1.addFieldsType)(appSchema, facet.entityType, floorplanSuffix);
@@ -443,39 +446,39 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, i
         case types_1.SectionTypeV2.SectionChart:
         case types_1.SectionTypeV2.SubSectionChart: {
             //handle reference facet (if comprising chart)
-            handleSectionChart(appSchema, definitionKey, facet, facetKey, sectionType);
+            handleSectionChart(appSchema, definitionKey, facet, referenceKey, sectionType);
             break;
         }
         case types_1.SectionTypeV2.SectionForm:
         case types_1.SectionTypeV2.SubSectionForm: {
-            const appSchemaSection = handleFormSection(appSchema, definitionKey, facet, facetKey, sectionType);
+            const appSchemaSection = handleFormSection(appSchema, definitionKey, facet, referenceKey, sectionType);
             (0, common_1.handleForm)(ux_specification_types_1.SectionType.Section, facet, appSchemaSection, appSchema, ux_specification_types_1.FioriElementsVersion.v2, facetKey);
             break;
         }
         case types_1.SectionTypeV2.SectionAddress:
         case types_1.SectionTypeV2.SectionContact: {
-            (0, common_1.handleAddressContact)(facet, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, undefined, 'V2');
+            (0, common_1.handleAddressContact)(facet, referenceKey, sections, appSchema, ux_specification_types_1.SectionType.Section, undefined, 'V2');
             break;
         }
         case types_1.SectionTypeV2.SubSectionAddress:
         case types_1.SectionTypeV2.SubSectionContact: {
-            (0, common_1.handleAddressContact)(facet, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, ux_specification_types_1.SectionType.SubSection, 'V2');
+            (0, common_1.handleAddressContact)(facet, referenceKey, sections, appSchema, ux_specification_types_1.SectionType.Section, ux_specification_types_1.SectionType.SubSection, 'V2');
             break;
         }
         case types_1.SectionTypeV2.HeaderSectionForm:
         case types_1.SectionTypeV2.HeaderSectionChart:
         case types_1.SectionTypeV2.HeaderSectionAddress: {
-            handleHeaderFacet(appSchema, definitionKey, facet, facetKey, sectionType);
+            handleHeaderFacet(appSchema, definitionKey, facet, referenceKey, sectionType);
             break;
         }
         case types_1.SectionTypeV2.HeaderSectionDataPoint: {
-            handleHeaderFacet(appSchema, definitionKey, facet, facetKey, sectionType);
+            handleHeaderFacet(appSchema, definitionKey, facet, referenceKey, sectionType);
             addDataPointHeaderFacetDataType(appSchema, definitionKey, facet);
             break;
         }
         default: {
             // Other facets -> only default properties of ObjectPageSection
-            sections.properties[facetKey] = (0, common_1.createDefaultSection)(appSchema, facet, facetKey);
+            sections.properties[facetKey] = (0, common_1.createDefaultSection)(appSchema, facet, referenceKey);
         }
     }
 }
@@ -557,10 +560,10 @@ function addSections(generateParameters, appSchema, pages) {
  * @param {EntityType} entityType - current entity type
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-function addHeader(appSchema, entitySet, entityType, oDataServiceAVT) {
+function addHeader(appSchema, generateParameters, entityType) {
     (0, common_1.addCommonHeaderSchema)(appSchema, entityType);
     //Add header actions
-    (0, common_1.addHeaderActions)(appSchema, entityType, entitySet, oDataServiceAVT, addHeaderActionCallBackV2, true);
+    (0, common_1.addHeaderActions)(appSchema, entityType, generateParameters, addHeaderActionCallBackV2, undefined, true);
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
@@ -612,7 +615,7 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema) {
         return appSchema;
     }
     // Add header
-    addHeader(appSchema, generateParameters.entitySet, entityType, generateParameters.serviceAVT);
+    addHeader(appSchema, generateParameters, entityType);
     // Add sections
     appSchema.definitions[ux_specification_types_1.DefinitionName.Sections] = {
         type: 'object',