GUI billing reports: fix storage reports for storages with the same name

epam · Nov 12, 2024 · 87a55ec · 87a55ec
1 parent 4127fd0
commit 87a55ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/client/src/components/billing/reports/charts/bar-chart.js b/client/src/components/billing/reports/charts/bar-chart.js
@@ -84,7 +84,8 @@ function getMaximum (...values) {
 function filterTopData (data, top, dataSample = 'value') {
   const sortedData = Object.keys(data || {})
     .map((key) => ({
-      name: key,
+      key,
+      name: data[key].name || key,
       item: data[key],
       value: getItemSampleValue(data[key], dataSample)
     }))
@@ -163,8 +164,8 @@ function BarChart (
     datasets.find((o) => !o.isPrevious) ||
     datasets[0];
   const filteredData = filterTopData(data, top, currentDataset ? currentDataset.sample : 'value');
-  const groups = filteredData.map(d => d.name);
-  const displayGroups = groups.map(itemNameFn);
+  const groupIds = filteredData.map(d => d.key);
+  const displayGroups = filteredData.map(d => itemNameFn(d.name));
   const processedDatasets = datasets.map((dataset) => {
     const {
       isPrevious = false,
@@ -323,13 +324,14 @@ function BarChart (
       [HighlightTicksPlugin.id]: {
         highlightTickFn,
         request,
+        tickValues: groupIds,
         axis: 'x-axis'
       },
       [BarchartDataLabelPlugin.id]: {
         valueFormatter
       },
       [ChartClickPlugin.id]: {
-        handler: onSelect ? index => onSelect({key: groups[index]}) : undefined,
+        handler: onSelect ? index => onSelect({key: groupIds[index]}) : undefined,
         scaleHandler: onScaleSelect,
         axis: 'x-axis'
       }

diff --git a/client/src/components/billing/reports/charts/extensions/highlight-ticks-plugin.js b/client/src/components/billing/reports/charts/extensions/highlight-ticks-plugin.js
@@ -22,7 +22,8 @@ const plugin = {
     const {
       axis = 'x-axis',
       highlightTickFn,
-      request
+      request,
+      tickValues
     } = configuration;
     if (!chart || typeof highlightTickFn !== 'function') {
       return;
@@ -31,7 +32,8 @@ const plugin = {
     if (ticks && ticks.length) {
       for (const tick of ticks) {
         const storage = (request || {}).value;
-        const value = (storage || {})[tick.value];
+        const tickValue = tickValues ? tickValues[tick._index] : tick.value;
+        const value = (storage || {})[tickValue];
         tick.major = highlightTickFn(value, tick);
       }
     }

diff --git a/client/src/models/billing/get-grouped-storages.js b/client/src/models/billing/get-grouped-storages.js
@@ -25,8 +25,9 @@ export class GetGroupedStorages extends BaseBillingRequest {
 
     (raw && raw.length ? raw : []).forEach(i => {
       let name = i.info && i.info.name ? i.info.name : i.groupingInfo.STORAGE;
+      const id = i.groupingInfo.id || '';
       if (name && name !== 'unknown') {
-        res[name] = {
+        res[`${name}-${id}`] = {
           name,
           owner: emptyIfUnknown(i.groupingInfo.owner),
           created: emptyIfUnknown(i.groupingInfo.created),