@sap/ux-specification 1.96.52 → 1.96.54

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

@@ -11,7 +11,51 @@ const ux_specification_types_1 = require("@sap/ux-specification-types");
 const listReport_1 = require("./listReport");
 const i18next_1 = __importDefault(require("i18next"));
 const extensionLogger_1 = require("../../../extensionLogger");
-const ROOT_PROPERTIES_ORDER = ['filterBar', 'table', 'footer'];
+const ROOT_PROPERTIES_ORDER = [
+    'filterBar',
+    'keyPerformanceIndicators',
+    'chart',
+    'table',
+    'footer'
+];
+/**
+ * Returns LineItem and Chart vizualizations from UI annotations based of qualifier.
+ * @param {v2.SapUiAppPageV2} v2Page - actual page in the manifest
+ * @param {EntityTypeAnnotations_UI} uIAnnotations - annotations of UI namespace of the given entityType
+ */
+function getVisualizations(v2Page, uIAnnotations) {
+    const qualifier = v2Page?.component?.settings?.qualifier;
+    const selectionPresentationVariant = uIAnnotations[`SelectionPresentationVariant#${qualifier}`];
+    const presentationVariant = selectionPresentationVariant !== undefined ? selectionPresentationVariant['PresentationVariant'] : undefined;
+    const vizualizations = presentationVariant !== undefined ? presentationVariant['Visualizations'] : [];
+    let lineItem;
+    let chart;
+    for (const i in vizualizations) {
+        const vizualization = vizualizations[i];
+        if (vizualization.value.includes('@com.sap.vocabularies.UI.v1.LineItem')) {
+            const lineItemName = vizualization.value.replace(ux_specification_types_1.UIVOCABULARYALPHADOT, '');
+            lineItem = uIAnnotations[lineItemName];
+        }
+        else if (vizualization.value.includes('@com.sap.vocabularies.UI.v1.Chart')) {
+            const chartName = vizualization.value.replace(ux_specification_types_1.UIVOCABULARYALPHADOT, '');
+            chart = uIAnnotations[chartName];
+        }
+    }
+    return {
+        lineItem,
+        chart
+    };
+}
+/**
+ * Adds missing annotation path to chart definition.
+ * @param {Definition} appSchema - app specific JSON schema
+ * @param {Chart} chartAnnotation - chart annotation data
+ */
+function addChart(appSchema, chartAnnotation) {
+    const chartSettings = appSchema.definitions[ux_specification_types_1.DefinitionName.ChartSettings];
+    const pathParts = chartAnnotation.fullyQualifiedName.split('@');
+    chartSettings[ux_specification_types_1.SchemaTag.annotationPath] = `/${pathParts[0]}/@${pathParts[1]}`;
+}
 /**
  * Generates an app specific schema out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.
@@ -45,25 +89,29 @@ function generateAnalyticalListReportSchemaV2(generateParameters, genericSchema)
     if (!entityType) {
         (0, extensionLogger_1.log)(generateParameters.logger, {
             severity: "error" /* LogSeverity.Error */,
-            message: i18next_1.default.t('NOENTITYTYPE4SET', { entitySetName: generateParameters.entitySet?.name }),
-            location: {
-                path: ux_specification_types_1.METADATAPATH
-            }
+            message: i18next_1.default.t('NOENTITYTYPE4SET', { entitySetName: generateParameters.entitySet?.name })
         });
     }
     else {
         // 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 { lineItem, chart } = getVisualizations(v2Page, annotations);
+        const lineItemAnnotation = lineItem || annotations.LineItem;
+        const chartAnnotation = chart || annotations.Chart;
         //handle line items
-        const lineItemAnnotation = entityType?.annotations?.UI?.LineItem;
         (0, utils_1.addLineItemsType)(appSchema, lineItemAnnotation, entityType);
+        // handle chart item
+        if (chartAnnotation) {
+            addChart(appSchema, chartAnnotation);
+        }
         //handle filter fields
         const selectionFieldAnnotation = entityType?.annotations?.UI?.SelectionFields;
         (0, utils_1.addSelectionFields)(appSchema, selectionFieldAnnotation, entityType);
         //add fields for createWithParameterDialog
         (0, common_1.addFieldsType)(appSchema, entityType);
-        const pageKeys = [];
-        const v2Page = (0, import_1.findAnalyticalListPage)(generateParameters.manifest[ux_specification_types_1.ManifestSection.generic].pages, pageKeys, generateParameters.logger);
         if (!v2Page) {
             (0, extensionLogger_1.log)(generateParameters.logger, {
                 severity: "error" /* LogSeverity.Error */,

package/dist/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/src/sync/v2/generate/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/generate.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAA+B,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAiDpH;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CACzC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAUR;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CACzC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAUR;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qCAAqC,CACjD,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAUR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExF"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/generate.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAA+B,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AA8CpH;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CACzC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAUR;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CACzC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAUR;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qCAAqC,CACjD,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAUR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExF"}

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

@@ -39,10 +39,7 @@ function prepareGenerationV2(annotations, logger, manifest, fragments, entitySet
     if (!generateParameters.entitySet) {
         (0, extensionLogger_1.log)(generateParameters.logger, {
             severity: "error" /* LogSeverity.Error */,
-            message: i18next_1.default.t('ENTITYSETNOTFOUND', { entitySetName: entitySet }),
-            location: {
-                path: ux_specification_types_1.METADATAPATH
-            }
+            message: i18next_1.default.t('ENTITYSETNOTFOUND', { entitySetName: entitySet })
         });
     }
     return generateParameters;

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

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/generate.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA6D;AAC7D,6CAA0D;AAC1D,6CAA0D;AAC1D,iEAA8E;AAC9E,iDAA8D;AAE9D,wEAA4G;AAC5G,8DAAyE;AACzE,sDAA8B;AAC9B,8DAA+C;AAC/C,6CAA8C;AAE9C;;;;;;;;;GASG;AACH,SAAS,mBAAmB,CACxB,WAAuB,EACvB,MAAuB,EACvB,QAAkB,EAClB,SAAqB,EACrB,SAAiB,EACjB,YAA0B;IAE1B,IAAA,eAAQ,GAAE,CAAC;IAEX,MAAM,UAAU,GAAG,IAAA,+BAAuB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAgC;QACpD,YAAY;QACZ,oBAAoB,EAAE,6CAAoB,CAAC,EAAE;QAC7C,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACT,CAAC;IACF,kBAAkB,CAAC,SAAS,GAAG,IAAA,2CAA2B,EAAC,SAAS,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACrG,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;QAC/B,IAAA,qBAAG,EAAC,kBAAkB,CAAC,MAAM,EAAE;YAC3B,QAAQ,iCAAmB;YAC3B,OAAO,EAAE,iBAAO,CAAC,CAAC,CAAC,mBAAmB,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;YACrE,QAAQ,EAAE;gBACN,IAAI,EAAE,qCAAY;aACrB;SACJ,CAAC,CAAC;KACN;IACD,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAkB,EAClB,SAAsB,EACtB,MAAwB;IAExB,MAAM,kBAAkB,GAAG,mBAAmB,CAC1C,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,EACT,SAAS,EACT,qCAAY,CAAC,sBAAsB,CACtC,CAAC;IACF,OAAO,IAAA,uCAA0B,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AACzE,CAAC;AAjBD,sEAiBC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAkB,EAClB,SAAsB,EACtB,MAAwB;IAExB,MAAM,kBAAkB,GAAG,mBAAmB,CAC1C,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,EACT,SAAS,EACT,qCAAY,CAAC,sBAAsB,CACtC,CAAC;IACF,OAAO,IAAA,uCAA0B,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AACzE,CAAC;AAjBD,sEAiBC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,qCAAqC,CACjD,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAkB,EAClB,SAAsB,EACtB,MAAwB;IAExB,MAAM,kBAAkB,GAAG,mBAAmB,CAC1C,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,EACT,SAAS,EACT,qCAAY,CAAC,oBAAoB,CACpC,CAAC;IACF,OAAO,IAAA,2DAAoC,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AACnF,CAAC;AAjBD,sFAiBC;AAED;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAAC,aAAqB,EAAE,QAAkB;IAC5E,OAAO,IAAA,2CAA4B,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACjE,CAAC;AAFD,wDAEC"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/generate.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA6D;AAC7D,6CAA0D;AAC1D,6CAA0D;AAC1D,iEAA8E;AAC9E,iDAA8D;AAE9D,wEAA8F;AAC9F,8DAAyE;AACzE,sDAA8B;AAC9B,8DAA+C;AAC/C,6CAA8C;AAE9C;;;;;;;;;GASG;AACH,SAAS,mBAAmB,CACxB,WAAuB,EACvB,MAAuB,EACvB,QAAkB,EAClB,SAAqB,EACrB,SAAiB,EACjB,YAA0B;IAE1B,IAAA,eAAQ,GAAE,CAAC;IAEX,MAAM,UAAU,GAAG,IAAA,+BAAuB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAgC;QACpD,YAAY;QACZ,oBAAoB,EAAE,6CAAoB,CAAC,EAAE;QAC7C,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACT,CAAC;IACF,kBAAkB,CAAC,SAAS,GAAG,IAAA,2CAA2B,EAAC,SAAS,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACrG,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;QAC/B,IAAA,qBAAG,EAAC,kBAAkB,CAAC,MAAM,EAAE;YAC3B,QAAQ,iCAAmB;YAC3B,OAAO,EAAE,iBAAO,CAAC,CAAC,CAAC,mBAAmB,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;SACxE,CAAC,CAAC;KACN;IACD,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAkB,EAClB,SAAsB,EACtB,MAAwB;IAExB,MAAM,kBAAkB,GAAG,mBAAmB,CAC1C,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,EACT,SAAS,EACT,qCAAY,CAAC,sBAAsB,CACtC,CAAC;IACF,OAAO,IAAA,uCAA0B,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AACzE,CAAC;AAjBD,sEAiBC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAkB,EAClB,SAAsB,EACtB,MAAwB;IAExB,MAAM,kBAAkB,GAAG,mBAAmB,CAC1C,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,EACT,SAAS,EACT,qCAAY,CAAC,sBAAsB,CACtC,CAAC;IACF,OAAO,IAAA,uCAA0B,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AACzE,CAAC;AAjBD,sEAiBC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,qCAAqC,CACjD,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAkB,EAClB,SAAsB,EACtB,MAAwB;IAExB,MAAM,kBAAkB,GAAG,mBAAmB,CAC1C,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,EACT,SAAS,EACT,qCAAY,CAAC,oBAAoB,CACpC,CAAC;IACF,OAAO,IAAA,2DAAoC,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AACnF,CAAC;AAjBD,sFAiBC;AAED;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAAC,aAAqB,EAAE,QAAkB;IAC5E,OAAO,IAAA,2CAA4B,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACjE,CAAC;AAFD,wDAEC"}

package/dist/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":"AAgBA,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,CA2GR"}
+{"version":3,"file":"listReport.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"AAwBA,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,CAgHR"}

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

@@ -54,24 +54,19 @@ function generateListReportSchemaV2(generateParameters, genericSchema) {
     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.MULTISELECTTABLE].properties.toolBar['$ref'] = lrToolBar;
     appSchema.definitions[types_1.INLINEDELETETABLE] = responsiveTableInlineDelete;
-    appSchema.definitions[types_1.INLINEDELETETABLE].properties.toolBar['$ref'] = lrToolBar;
     appSchema.definitions[types_1.TREETABLE] = treeTableDefinition;
-    appSchema.definitions[types_1.TREETABLE].properties.toolBar['$ref'] = lrToolBar;
     appSchema.definitions[types_1.ANALYTICALTABLE] = analyticalTableDefinition;
-    appSchema.definitions[types_1.ANALYTICALTABLE].properties.toolBar['$ref'] = lrToolBar;
     appSchema.definitions[types_1.GRIDTABLE] = gridTableDefinition;
-    appSchema.definitions[types_1.GRIDTABLE].properties.toolBar['$ref'] = lrToolBar;
+    types_1.LINEITEMTABLETYPES.forEach((tableType) => {
+        appSchema.definitions[tableType].properties.toolBar['$ref'] = lrToolBar;
+    });
     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 }),
-                location: {
-                    path: ux_specification_types_1.METADATAPATH
-                }
+                message: i18next_1.default.t('NOENTITYTYPE4SET', { entitySetName: generateParameters.entitySet?.name })
             });
         }
     }
@@ -80,6 +75,11 @@ function generateListReportSchemaV2(generateParameters, genericSchema) {
         (0, utils_1.addStandardHeaderActions)(appSchema);
         //handle line items
         const lineItemAnnotation = entityType?.annotations?.UI?.LineItem;
+        if (lineItemAnnotation) {
+            types_1.LINEITEMTABLETYPES.forEach((tableType) => {
+                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);
         //handle filter fields
         const selectionFieldAnnotation = entityType?.annotations?.UI?.SelectionFields;

package/dist/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/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;AAorBrC;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,MAAM,GACtB,MAAM,CA0FR"}
+{"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;AA2rBrC;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,MAAM,GACtB,MAAM,CA0FR"}

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateObjectPageSchemaV2 = void 0;
 const ux_specification_types_1 = require("@sap/ux-specification-types");
 const common_1 = require("../../common");
-const common_2 = require("../../common");
 const utils_1 = require("./utils");
 const import_1 = require("../import");
 const extensionLogger_1 = require("../../../extensionLogger");
@@ -48,7 +47,7 @@ function addFlexChangeForSection(appSchema, schemaSection, property, sectionType
     if (!controlType) {
         return;
     }
-    (0, common_2.addPatternForBindingChangeOfEnumOP)(appSchema, schemaSection, property);
+    (0, common_1.addPatternForBindingChangeOfEnumOP)(appSchema, schemaSection, property);
     schemaSection.properties[property][ux_specification_types_1.SchemaTag.controlType] = controlType;
 }
 /**
@@ -58,19 +57,19 @@ function addFlexChangeForSection(appSchema, schemaSection, property, sectionType
  * @param actionAnnotation - annotation as present in AVT ConvertedMetadata
  * @param headerActions - list of header actions, to be enhanced
  */
-function addHeaderActionCallBackV2(entityType, appSchema, actionAnnotation, headerActions, oDataServiceAVT) {
-    return (item, index) => {
+function addHeaderActionCallBackV2(entityType, appSchema, identification, headerActions, oDataServiceAVT) {
+    identification?.forEach((item, index) => {
         if (!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) {
-            const { actionName, actionId, namespace } = (0, common_2.getActionNameAndId)(item, oDataServiceAVT);
+            const { actionName, actionId, namespace } = (0, common_1.getActionNameAndId)(item, oDataServiceAVT);
             //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 actionDefinitionKey = `ObjectPageHeaderAction<${(0, common_2.prepareRef)(actionId)}>`;
+            const actionDefinitionKey = `ObjectPageHeaderAction<${(0, common_1.prepareRef)(actionId)}>`;
             appSchema.definitions[actionDefinitionKey] = JSON.parse(JSON.stringify(appSchema.definitions['ObjectPageHeaderAction']));
-            const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
-            appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
+            const convertedIdentification = item.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
+            appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}`;
             appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.actionType] = ux_specification_types_1.ActionType.Annotation;
             appSchema.definitions[actionDefinitionKey].description = description;
             appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.keys] = [
@@ -80,35 +79,35 @@ function addHeaderActionCallBackV2(entityType, appSchema, actionAnnotation, head
                 appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.target] = namespace;
             }
             headerActions.properties[actionId] = {
-                $ref: `${common_2.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
             };
         }
-    };
+    });
 }
 /**
  * Callback for adding a single action to footerActions of V2
  * @param {EntityType} entityType - current entity type
  * @param {Definition} appSchema Schema of the app
  * @param {Definition} footerActions - list of footer actions, to be enhanced
- * @param {String} convertedIdentification - converted UI.Identification term
+ * @param {String} identification - converted UI.Identification term
  */
-function addFooterActionCallBackV2(entityType, appSchema, footerActions, convertedIdentification) {
-    return (item, index) => {
+function addFooterActionCallBackV2(entityType, appSchema, footerActions, identification) {
+    identification.forEach((item) => {
         if (item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* UIAnnotationTypes.DataFieldForAction */) {
-            const action = (0, StableIdHelper_1.getStableIdPartFromDataField)(item);
-            const actionId = action.split('::').splice(1).join('::');
+            const actionId = (0, StableIdHelper_1.getStableIdPartFromDataField)(item).split('::').splice(1).join('::');
             const description = (0, common_1.getDataFieldDescription)(item, entityType);
-            const actionDefinitionKey = (0, common_2.prepareRef)(`${ux_specification_types_1.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
+            const actionDefinitionKey = (0, common_1.prepareRef)(`${ux_specification_types_1.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
+            const convertedIdentification = item.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */}`);
             appSchema.definitions[actionDefinitionKey] = {
                 ...JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterAction])),
                 description,
-                annotationPath: `/${convertedIdentification}/${index}`
+                annotationPath: `/${convertedIdentification}`
             };
             footerActions.properties[actionId] = {
-                $ref: `${common_2.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+                $ref: `${common_1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
             };
         }
-    };
+    });
 }
 /**
  * Method ensures that definitions for custom columns are created for passed entitySet.
@@ -174,7 +173,7 @@ function addAppSchemaDefinition(appSchema, appSchemaSection, sectionType, mainSe
  * @param {string} definitionKey key which the section should point to
  */
 function addSectionReference(sections, key, definitionKey) {
-    sections.properties[key] = { $ref: `${common_2.DEFINITION_LINK_PREFIX}${definitionKey}` };
+    sections.properties[key] = { $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}` };
 }
 /**
  * Reuse function for all table types, copies and adapts the generic definition
@@ -184,10 +183,10 @@ function addSectionReference(sections, key, definitionKey) {
  * @param appSchema - app-specific schema, to be updated
  */
 function addTableDefinition(tableType, facetId, facet, appSchema) {
-    const schemaId = (0, common_2.prepareRef)(`${tableType}<${facetId}>`);
+    const schemaId = (0, common_1.prepareRef)(`${tableType}<${facetId}>`);
     appSchema.definitions[schemaId] = JSON.parse(JSON.stringify(appSchema.definitions[tableType]));
-    appSchema.definitions[schemaId]['properties']['columns']['$ref'] = common_2.DEFINITION_LINK_PREFIX + facetId;
-    appSchema.definitions[schemaId].properties.toolBar['$ref'] = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetId}>`;
+    appSchema.definitions[schemaId]['properties']['columns']['$ref'] = common_1.DEFINITION_LINK_PREFIX + facetId;
+    appSchema.definitions[schemaId].properties.toolBar['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetId}>`;
     appSchema.definitions[schemaId][ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
     if (facet.ID !== undefined) {
         appSchema.definitions[schemaId].title = ux_specification_types_1.FacetTitlePrefix + facet.ID;
@@ -195,11 +194,11 @@ function addTableDefinition(tableType, facetId, facet, appSchema) {
     }
     appSchema.definitions[schemaId].description = ux_specification_types_1.DefinitionName.Table;
     //adjust quickVariantSelection
-    appSchema.definitions[schemaId].properties['quickVariantSelection']['$ref'] = `${common_2.DEFINITION_LINK_PREFIX}QuickVariantSelectionOP<${facetId}>`;
+    appSchema.definitions[schemaId].properties['quickVariantSelection']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}QuickVariantSelectionOP<${facetId}>`;
     appSchema.definitions[`QuickVariantSelectionOP<${facetId}>`] = JSON.parse(JSON.stringify(appSchema.definitions['QuickVariantSelectionOP']));
     appSchema.definitions[`QuickVariant<${facetId}>`] = JSON.parse(JSON.stringify(appSchema.definitions['QuickVariant']));
-    appSchema.definitions[`QuickVariantSelectionOP<${facetId}>`].properties.variants.patternProperties['^[0-9]+$']['$ref'] = `${common_2.DEFINITION_LINK_PREFIX}QuickVariant<${facetId}>`;
-    (0, common_2.addEnumForSingleTabVariant)(facet.entityType, appSchema, `QuickVariant<${facetId}>`);
+    appSchema.definitions[`QuickVariantSelectionOP<${facetId}>`].properties.variants.patternProperties['^[0-9]+$']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}QuickVariant<${facetId}>`;
+    (0, common_1.addEnumForSingleTabVariant)(facet.entityType, appSchema, `QuickVariant<${facetId}>`);
 }
 /**
  * Adds definitions for line items in object page sections to the app schema
@@ -217,29 +216,29 @@ function handleLineItem(generateParameters, facetKey, appSchema, facet, facets,
     }
     const navigationProperty = facetKey.split('::')[0];
     const schemaIdForOpSection = `${sectionType}<${facetKey}>`;
-    appSchema.definitions[schemaIdForOpSection] = (0, common_2.createDefaultSection)(appSchema, facet, facetKey);
+    appSchema.definitions[schemaIdForOpSection] = (0, common_1.createDefaultSection)(appSchema, facet, facetKey);
     const appSchemaSection = appSchema.definitions[schemaIdForOpSection];
     addAppSchemaDefinition(appSchema, appSchemaSection, sectionType, types_1.SectionTypeV2.SectionTable);
     appSchemaSection.properties.table = JSON.parse(JSON.stringify(appSchema.definitions[types_1.SectionTypeV2.SectionTable]['properties'][ux_specification_types_1.PropertyName.table]));
     appSchemaSection.properties.table.anyOf = [
         {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithMultiSelect<${facetKey}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithMultiSelect<${facetKey}>`
         },
         {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithInlineDelete<${facetKey}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTableWithInlineDelete<${facetKey}>`
         },
         {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPageAnalyticalTable<${facetKey}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageAnalyticalTable<${facetKey}>`
         },
         {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPageGridTable<${facetKey}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageGridTable<${facetKey}>`
         },
         {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}ObjectPageTreeTable<${facetKey}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageTreeTable<${facetKey}>`
         }
     ];
     appSchemaSection[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
-    (0, common_2.addSectionTitleAndDescription)(facet, appSchemaSection, facetKey);
+    (0, common_1.addSectionTitleAndDescription)(facet, appSchemaSection, facetKey);
     addTableDefinition('ObjectPageResponsiveTableWithMultiSelect', facetKey, facet, appSchema);
     addTableDefinition('ObjectPageResponsiveTableWithInlineDelete', facetKey, facet, appSchema);
     addTableDefinition('ObjectPageGridTable', facetKey, facet, appSchema);
@@ -247,7 +246,7 @@ function handleLineItem(generateParameters, facetKey, appSchema, facet, facets,
     addTableDefinition('ObjectPageAnalyticalTable', facetKey, facet, appSchema);
     let customColumnDefinitionKey;
     // Find target entity
-    const targetEntitySet = (0, common_2.determineEntitySetOfFacet)(facet, generateParameters.serviceAVT);
+    const targetEntitySet = (0, common_1.determineEntitySetOfEntityType)(facet.entityType, generateParameters.serviceAVT);
     if (targetEntitySet) {
         // Make sure that custom columns definitions are created for passed entity
         customColumnDefinitionKey = ensureCustomColumnDefinitionExists(appSchema, generateParameters.manifest, targetEntitySet.name, facet.entityType.name, generateParameters.serviceAVT, facet, facetKey, generateParameters.fragments);
@@ -267,7 +266,7 @@ function handleLineItem(generateParameters, facetKey, appSchema, facet, facets,
  * @param {SectionTypeV2} sectionType (sub)section type
  */
 function handleSubSection(appSchema, definitionKey, facet, facetId, sectionType) {
-    appSchema.definitions[definitionKey] = (0, common_2.createDefaultSection)(appSchema, facet, facetId);
+    appSchema.definitions[definitionKey] = (0, common_1.createDefaultSection)(appSchema, facet, facetId);
     const appSchemaSection = appSchema.definitions[definitionKey];
     addAppSchemaDefinition(appSchema, appSchemaSection, sectionType, types_1.SectionTypeV2.SubSection);
     appSchemaSection.properties.subsections = {
@@ -287,7 +286,7 @@ function handleSubSection(appSchema, definitionKey, facet, facetId, sectionType)
  * @param {SectionTypeV2} sectionType (sub)section type
  */
 function handleSectionChart(appSchema, definitionKey, facet, facetKey, sectionType) {
-    appSchema.definitions[definitionKey] = (0, common_2.createDefaultSection)(appSchema, facet, facetKey);
+    appSchema.definitions[definitionKey] = (0, common_1.createDefaultSection)(appSchema, facet, facetKey);
     const appSchemaSection = appSchema.definitions[definitionKey];
     addAppSchemaDefinition(appSchema, appSchemaSection, sectionType, types_1.SectionTypeV2.SectionChart);
 }
@@ -301,7 +300,7 @@ function handleSectionChart(appSchema, definitionKey, facet, facetKey, sectionTy
  * @return {object} returns filled form section in app schema.
  */
 function handleFormSection(appSchema, definitionKey, facet, facetKey, sectionType) {
-    appSchema.definitions[definitionKey] = (0, common_2.createDefaultSection)(appSchema, facet, facetKey);
+    appSchema.definitions[definitionKey] = (0, common_1.createDefaultSection)(appSchema, facet, facetKey);
     const appSchemaSection = appSchema.definitions[definitionKey];
     addAppSchemaDefinition(appSchema, appSchemaSection, sectionType, types_1.SectionTypeV2.SectionForm);
     appSchemaSection[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
@@ -387,7 +386,7 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, i
             handleLineItem(generateParameters, facetKey, appSchema, facet, facets, sectionType);
             //add fields for createWithParameterDialog
             const floorplanSuffix = 'OP';
-            (0, common_2.addFieldsType)(appSchema, facet.entityType, floorplanSuffix);
+            (0, common_1.addFieldsType)(appSchema, facet.entityType, floorplanSuffix);
             break;
         }
         case types_1.SectionTypeV2.SectionChart:
@@ -399,22 +398,22 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, i
         case types_1.SectionTypeV2.SectionForm:
         case types_1.SectionTypeV2.SubSectionForm: {
             const appSchemaSection = handleFormSection(appSchema, definitionKey, facet, facetKey, sectionType);
-            (0, common_2.handleForm)(ux_specification_types_1.SectionType.Section, facet, appSchemaSection, appSchema, ux_specification_types_1.FioriElementsVersion.v2, facetKey);
+            (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_2.handleAddressContact)(facet, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, undefined, 'V2');
+            (0, common_1.handleAddressContact)(facet, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, undefined, 'V2');
             break;
         }
         case types_1.SectionTypeV2.SubSectionAddress:
         case types_1.SectionTypeV2.SubSectionContact: {
-            (0, common_2.handleAddressContact)(facet, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, ux_specification_types_1.SectionType.SubSection, 'V2');
+            (0, common_1.handleAddressContact)(facet, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, ux_specification_types_1.SectionType.SubSection, 'V2');
             break;
         }
         default: {
             // Other facets -> only default properties of ObjectPageSection
-            sections.properties[facetKey] = (0, common_2.createDefaultSection)(appSchema, facet, facetKey);
+            sections.properties[facetKey] = (0, common_1.createDefaultSection)(appSchema, facet, facetKey);
         }
     }
 }
@@ -434,7 +433,7 @@ function addSections(generateParameters, appSchema, pages) {
         return;
     }
     // Get facet annotations
-    const facets = (0, common_2.getObjectPageFacets)(generateParameters.entitySet?.entityType, generateParameters.serviceAVT, ux_specification_types_1.FioriElementsVersion.v2, generateParameters.logger);
+    const facets = (0, common_1.getObjectPageFacets)(generateParameters.entitySet?.entityType, generateParameters.serviceAVT, ux_specification_types_1.FioriElementsVersion.v2, generateParameters.logger);
     if (!facets || Object.keys(facets).length === 0) {
         return;
     }
@@ -461,13 +460,14 @@ function addSections(generateParameters, appSchema, pages) {
  * Add Object Page Header to app-specific schema
  *
  * @param {object} appSchema Schema of the app
+ * @param {EntitySet} entitySet - current entity set
  * @param {EntityType} entityType - current entity type
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-function addHeader(appSchema, entityType, oDataServiceAVT) {
-    (0, common_2.addCommonHeaderSchema)(appSchema, entityType);
+function addHeader(appSchema, entitySet, entityType, oDataServiceAVT) {
+    (0, common_1.addCommonHeaderSchema)(appSchema, entityType);
     //Add header actions
-    (0, common_2.addHeaderActions)(appSchema, entityType, oDataServiceAVT, addHeaderActionCallBackV2, true);
+    (0, common_1.addHeaderActions)(appSchema, entityType, entitySet, oDataServiceAVT, addHeaderActionCallBackV2, true);
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
@@ -479,9 +479,9 @@ function addHeader(appSchema, entityType, oDataServiceAVT) {
 function addRelatedFacetKeysType(schema, entityType, oDataServiceAVT, logger) {
     // Find sections from annotation
     // And create new definition in schema as enum with description
-    const facetSections = (0, common_2.getObjectPageFacetSection)(entityType, oDataServiceAVT, logger, undefined, true);
+    const facetSections = (0, common_1.getObjectPageFacetSection)(entityType, oDataServiceAVT, logger, undefined, true);
     if (facetSections) {
-        (0, common_2.addDefinitionForRelatedFacetKeys)(schema, ['ObjectPageCustomSectionFragment', 'ObjectPageCustomSectionView'], facetSections, ['ID', 'key']);
+        (0, common_1.addDefinitionForRelatedFacetKeys)(schema, ['ObjectPageCustomSectionFragment', 'ObjectPageCustomSectionView'], facetSections, ['ID', 'key']);
     }
 }
 /**
@@ -502,7 +502,7 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema) {
     }
     // Change reference to generated sections
     appSchema.properties[ux_specification_types_1.PropertyName.sections] = {
-        $ref: common_2.DEFINITION_LINK_PREFIX + 'Sections'
+        $ref: common_1.DEFINITION_LINK_PREFIX + 'Sections'
     };
     const entityType = generateParameters.entitySet?.entityType;
     generateParameters.entityType = entityType;
@@ -519,7 +519,7 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema) {
         return appSchema;
     }
     // Add header
-    addHeader(appSchema, entityType, generateParameters.serviceAVT);
+    addHeader(appSchema, generateParameters.entitySet, entityType, generateParameters.serviceAVT);
     // Add sections
     appSchema.definitions[ux_specification_types_1.DefinitionName.Sections] = {
         type: 'object',
@@ -544,7 +544,7 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema) {
             delete appSchema.properties[ux_specification_types_1.PropertyName.sections];
         }
     }
-    (0, common_2.addFooterActions)(appSchema, generateParameters, ux_specification_types_1.FioriElementsVersion.v2, addFooterActionCallBackV2, pages);
+    (0, common_1.addFooterActions)(appSchema, generateParameters, ux_specification_types_1.FioriElementsVersion.v2, addFooterActionCallBackV2, pages);
     // Eliminate generic definitions
     delete appSchema.definitions['GenericSections'];
     delete appSchema.definitions['GenericSubSections'];