Merge pull request #4204 from dlabrecq/ocp2

Fix when costDistribution dropdown is shown

Author: dlabrecq

src/routes/details/ocpDetails/detailsHeader.tsx

@@ -12,7 +12,6 @@ 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 { Currency } from 'routes/components/currency';
 import { DateRange } from 'routes/components/dateRange';
@@ -130,8 +129,6 @@ class DetailsHeaderBase extends React.Component<DetailsHeaderProps, DetailsHeade
     const { currentDateRangeType } = this.state;
 
     const showContent = report && !providersError && providers?.meta?.count > 0;
-    const showCostDistribution = costDistribution === ComputedReportItemValueType.distributed; // Always show -- see https://issues.redhat.com/browse/COST-5870
-
     const { cost, infrastructureCost, supplementaryCost } = getTotalCost(report, costDistribution);
 
     return (
@@ -169,7 +166,7 @@ class DetailsHeaderBase extends React.Component<DetailsHeaderProps, DetailsHeade
                   timeScopeValue={timeScopeValue}
                 />
               </FlexItem>
-              {showCostDistribution && (
+              {costDistribution && (
                 <FlexItem>
                   <CostDistribution costDistribution={costDistribution} onSelect={onCostDistributionSelect} />
                 </FlexItem>

src/routes/explorer/explorerHeader.tsx

@@ -16,7 +16,6 @@ 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';
@@ -304,9 +303,8 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps, ExplorerHe
     const tagPathsType = getTagReportPathsType(perspective);
 
     const showContent = report && !providersError && providers?.meta?.count > 0;
-    const showCostDistribution = costDistribution === ComputedReportItemValueType.distributed; // Always show -- see https://issues.redhat.com/browse/COST-5870
-
     const { cost, infrastructureCost, supplementaryCost } = getTotalCost(report, costDistribution);
+
     const dateRange = intl.formatDateTimeRange(new Date(startDate + 'T00:00:00'), new Date(endDate + 'T00:00:00'), {
       day: 'numeric',
       month: 'long',
@@ -349,7 +347,7 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps, ExplorerHe
                   tagPathsType={tagPathsType}
                 />
               </FlexItem>
-              {showCostDistribution && (
+              {costDistribution && (
                 <FlexItem>
                   <CostDistribution costDistribution={costDistribution} onSelect={onCostDistributionSelect} />
                 </FlexItem>