Merge pull request #4201 from dlabrecq/cost-5870

Make Overhead Costs dropdown always available
project-koku · Feb 19, 2025 · 8841997 · 8841997
2 parents 18d9726 + 1f04ac6
commit 8841997
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/routes/details/ocpDetails/detailsHeader.tsx b/src/routes/details/ocpDetails/detailsHeader.tsx
@@ -131,7 +131,7 @@ class DetailsHeaderBase extends React.Component<DetailsHeaderProps, DetailsHeade
     const { currentDateRangeType } = this.state;
 
     const showContent = report && !providersError && providers?.meta?.count > 0;
-    const showCostDistribution = groupBy === 'project' && report?.meta?.distributed_overhead === true;
+    const showCostDistribution = costDistribution === ComputedReportItemValueType.distributed; // Always show -- see https://issues.redhat.com/browse/COST-5870
 
     let cost: string | React.ReactNode = <EmptyValueState />;
     let supplementaryCost: string | React.ReactNode = <EmptyValueState />;

diff --git a/src/routes/explorer/explorerHeader.tsx b/src/routes/explorer/explorerHeader.tsx
@@ -16,6 +16,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
+import { ComputedReportItemValueType } from 'routes/components/charts/common';
 import { CostDistribution } from 'routes/components/costDistribution';
 import { CostType } from 'routes/components/costType';
 import { Currency } from 'routes/components/currency';
@@ -280,7 +281,6 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps, ExplorerHe
       perspective,
       providersFetchStatus,
       query,
-      report,
       startDate,
     } = this.props;
 
@@ -299,7 +299,7 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps, ExplorerHe
     const resourcePathsType = getResourcePathsType(perspective);
     const tagPathsType = getTagReportPathsType(perspective);
 
-    const showCostDistribution = costDistribution && report?.meta?.distributed_overhead === true;
+    const showCostDistribution = costDistribution === ComputedReportItemValueType.distributed; // Always show -- see https://issues.redhat.com/browse/COST-5870
 
     return (
       <header style={styles.header}>

diff --git a/src/routes/explorer/explorerTable.tsx b/src/routes/explorer/explorerTable.tsx
@@ -135,8 +135,7 @@ class ExplorerTableBase extends React.Component<ExplorerTableProps, ExplorerTabl
 
     const isGroupByProject = groupBy === 'project';
     const showPlatformCosts = perspective === PerspectiveType.ocp && isGroupByProject;
-    const showCostDistribution =
-      costDistribution === ComputedReportItemValueType.distributed && report?.meta?.distributed_overhead === true;
+    const showCostDistribution = costDistribution === ComputedReportItemValueType.distributed; // Always show -- see https://issues.redhat.com/browse/COST-5870
 
     const computedItems = getUnsortedComputedReportItems<any, any>({
       report,