Merge pull request #4010 from dlabrecq/export

Refactor export to support EC2 instances
project-koku · Sep 10, 2024 · 318e8f9 · 318e8f9
2 parents e3a8a5b + 600cd7c
commit 318e8f9
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 9 deletions.
diff --git a/src/routes/details/awsBreakdown/instances/instancesTable.tsx b/src/routes/details/awsBreakdown/instances/instancesTable.tsx
@@ -197,9 +197,10 @@ const InstancesTable: React.FC<InstancesTableProps> = ({
     // There is no group by for instances, but we use it to format messages
     return (
       <Actions
-        groupBy={'instance'}
+        groupBy={'resource_id'}
         isDisabled={isDisabled}
         item={item}
+        isTimeScoped
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
         reportType={reportType}

diff --git a/src/routes/details/awsDetails/detailsTable.tsx b/src/routes/details/awsDetails/detailsTable.tsx
@@ -2,7 +2,7 @@ import 'routes/components/dataTable/dataTable.scss';
 
 import type { Query } from 'api/queries/query';
 import type { AwsReport } from 'api/reports/awsReports';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -222,6 +222,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
       />
     );
   };

diff --git a/src/routes/details/azureDetails/detailsTable.tsx b/src/routes/details/azureDetails/detailsTable.tsx
@@ -2,7 +2,7 @@ import 'routes/components/dataTable/dataTable.scss';
 
 import type { Query } from 'api/queries/query';
 import type { AzureReport } from 'api/reports/azureReports';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -194,6 +194,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
       />
     );
   };

diff --git a/src/routes/details/components/actions/actions.tsx b/src/routes/details/components/actions/actions.tsx
@@ -17,6 +17,7 @@ import { withRouter } from 'utils/router';
 interface DetailsActionsOwnProps extends WrappedComponentProps, RouterComponentProps {
   groupBy?: string;
   isDisabled?: boolean;
+  isTimeScoped?: boolean;
   item: ComputedReportItem;
   reportPathsType: ReportPathsType;
   reportQueryString: string;
@@ -52,14 +53,16 @@ class DetailsActionsBase extends React.Component<DetailsActionsProps, DetailsAct
   }
 
   private getExportModal = () => {
-    const { groupBy, item, reportPathsType, reportQueryString, reportType, showAggregateType } = this.props;
+    const { groupBy, isTimeScoped, item, reportPathsType, reportQueryString, reportType, showAggregateType } =
+      this.props;
     const { isExportModalOpen } = this.state;
 
     return (
       <ExportModal
         count={1}
         groupBy={groupBy}
         isOpen={isExportModalOpen}
+        isTimeScoped={isTimeScoped}
         items={[item]}
         onClose={this.handleExportModalClose}
         reportPathsType={reportPathsType}

diff --git a/src/routes/details/gcpDetails/detailsTable.tsx b/src/routes/details/gcpDetails/detailsTable.tsx
@@ -2,7 +2,7 @@ import 'routes/components/dataTable/dataTable.scss';
 
 import type { Query } from 'api/queries/query';
 import type { GcpReport } from 'api/reports/gcpReports';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -194,6 +194,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
       />
     );
   };

diff --git a/src/routes/details/ibmDetails/detailsTable.tsx b/src/routes/details/ibmDetails/detailsTable.tsx
@@ -2,7 +2,7 @@ import 'routes/components/dataTable/dataTable.scss';
 
 import type { Query } from 'api/queries/query';
 import type { IbmReport } from 'api/reports/ibmReports';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -194,6 +194,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
       />
     );
   };

diff --git a/src/routes/details/ociDetails/detailsTable.tsx b/src/routes/details/ociDetails/detailsTable.tsx
@@ -2,7 +2,7 @@ import 'routes/components/dataTable/dataTable.scss';
 
 import type { Query } from 'api/queries/query';
 import type { OciReport } from 'api/reports/ociReports';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -194,6 +194,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
       />
     );
   };

diff --git a/src/routes/details/ocpDetails/detailsTable.tsx b/src/routes/details/ocpDetails/detailsTable.tsx
@@ -4,7 +4,7 @@ import { Label, Tooltip } from '@patternfly/react-core';
 import AsyncComponent from '@redhat-cloud-services/frontend-components/AsyncComponent';
 import type { Query } from 'api/queries/query';
 import type { OcpReport, OcpReportItem } from 'api/reports/ocpReports';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -373,6 +373,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
         showPriceListOption={groupBy === 'cluster'}
       />
     );

diff --git a/src/routes/details/rhelDetails/detailsTable.tsx b/src/routes/details/rhelDetails/detailsTable.tsx
@@ -2,7 +2,7 @@ import 'routes/components/dataTable/dataTable.scss';
 
 import { Label } from '@patternfly/react-core';
 import type { Query } from 'api/queries/query';
-import { ReportPathsType } from 'api/reports/report';
+import { ReportPathsType, ReportType } from 'api/reports/report';
 import type { RhelReport } from 'api/reports/rhelReports';
 import messages from 'locales/messages';
 import React from 'react';
@@ -287,6 +287,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
         item={item}
         reportPathsType={reportPathsType}
         reportQueryString={reportQueryString}
+        reportType={ReportType.cost}
         showPriceListOption={groupBy === 'cluster'}
       />
     );