Billing enhancements: storage layers (#3080) - export layers, backpor…

…ted to stage/0.16/uat
epam · Mar 20, 2023 · 4c2bb78 · 4c2bb78
1 parent 6829fc8
commit 4c2bb78
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/client/src/components/billing/navigation/aggregate.js b/client/src/components/billing/navigation/aggregate.js
@@ -70,6 +70,15 @@ export function getStorageClassName (storageClass) {
   }
 }
 
+export function getAllStorageClasses () {
+  return [
+    'DEEP_ARCHIVE',
+    'GLACIER',
+    'GLACIER_IR',
+    'STANDARD'
+  ];
+}
+
 export function getStorageClassByAggregate (aggregate) {
   return getBillingGroupingOrderAggregate(aggregate);
 }

diff --git a/client/src/components/billing/reports/export/export-consumer.js b/client/src/components/billing/reports/export/export-consumer.js
@@ -54,7 +54,8 @@ class ExportConsumer extends React.Component {
       user,
       group,
       types: typesPayload = [],
-      filters: extraFilters = {}
+      filters: extraFilters = {},
+      properties: extraProperties
     } = exportConfiguration;
     const {
       start,
@@ -88,7 +89,8 @@ class ExportConsumer extends React.Component {
       types,
       from: start.format('YYYY-MM-DD'),
       to: end.format('YYYY-MM-DD'),
-      filters
+      filters,
+      properties: extraProperties
     };
     return new Promise((resolve, reject) => {
       const request = new XMLHttpRequest();

diff --git a/client/src/components/billing/reports/storage-report.js b/client/src/components/billing/reports/storage-report.js
@@ -60,7 +60,8 @@ import {
   parseStorageAggregate,
   StorageAggregate,
   DEFAULT_STORAGE_CLASS_ORDER,
-  getStorageClassByAggregate
+  getStorageClassByAggregate,
+  getAllStorageClasses
 } from '../navigation/aggregate';
 import {
   getDetailsDatasetsByStorageClassAndMetrics,
@@ -389,6 +390,28 @@ class StorageReports extends React.Component {
     return (dataItem) => getItemDetailsByMetrics(dataItem, metrics);
   }
 
+  @computed
+  get getExportProperties () {
+    const {
+      type,
+      filters = {}
+    } = this.props;
+    const {
+      storageAggregate
+    } = filters;
+    if (!/^object$/i.test(type)) {
+      return () => undefined;
+    }
+    const total = !storageAggregate || storageAggregate === StorageAggregate.default;
+    const storageClass = total
+      ? getAllStorageClasses()
+      : [getStorageClassByAggregate(storageAggregate)];
+    return {
+      includeStorageOldVersions: true,
+      includeStorageClasses: storageClass
+    };
+  }
+
   renderSelectedLayerButton = () => {
     const {filters} = this.props;
     const {storageAggregate} = filters;
@@ -460,7 +483,8 @@ class StorageReports extends React.Component {
                   cloudRegionId.length > 0
                     ? cloudRegionId
                     : undefined
-                }
+                },
+                properties: this.getExportProperties
               }}
             >
               <Layout