Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EC2 instances export uses wrong API param for previous month #4134

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/routes/details/awsBreakdown/awsBreakdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ const mapStateToProps = createMapStateToProps<AwsBreakdownOwnProps, BreakdownSta
<Instances costType={costType} currency={currency} />
) : undefined,
isAwsEc2InstancesToggleEnabled: FeatureToggleSelectors.selectIsAwsEc2InstancesToggleEnabled(state),
isDetailsDateRangeToggleEnabled: FeatureToggleSelectors.selectIsDetailsDateRangeToggleEnabled(state),
isProviderEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsProviderEmptyStateToggleEnabled(state),
providers: filterProviders(providers, ProviderType.aws),
providersError,
Expand Down
1 change: 1 addition & 0 deletions src/routes/details/awsBreakdown/instances/instances.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const Instances: React.FC<InstancesProps> = ({ costType, currency }) => {
reportQueryString={reportQueryString}
reportType={reportType}
showAggregateType={false}
timeScopeValue={timeScopeValue}
/>
);
};
Expand Down
1 change: 1 addition & 0 deletions src/routes/details/azureBreakdown/azureBreakdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const mapStateToProps = createMapStateToProps<AzureOwnProps, BreakdownStateProps
groupBy,
groupByValue,
historicalDataComponent: <HistoricalData currency={currency} timeScopeValue={timeScopeValue} />,
isDetailsDateRangeToggleEnabled: FeatureToggleSelectors.selectIsDetailsDateRangeToggleEnabled(state),
isProviderEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsProviderEmptyStateToggleEnabled(state),
providers: filterProviders(providers, ProviderType.azure),
providersError,
Expand Down
1 change: 1 addition & 0 deletions src/routes/details/ibmBreakdown/ibmBreakdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const mapStateToProps = createMapStateToProps<IbmBreakdownOwnProps, BreakdownSta
groupBy,
groupByValue,
historicalDataComponent: <HistoricalData currency={currency} timeScopeValue={timeScopeValue} />,
isDetailsDateRangeToggleEnabled: FeatureToggleSelectors.selectIsDetailsDateRangeToggleEnabled(state),
isProviderEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsProviderEmptyStateToggleEnabled(state),
providers: filterProviders(providers, ProviderType.ibm),
providersError,
Expand Down
1 change: 1 addition & 0 deletions src/routes/details/ociBreakdown/ociBreakdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const mapStateToProps = createMapStateToProps<OciOwnProps, BreakdownStateProps>(
groupBy,
groupByValue,
historicalDataComponent: <HistoricalData currency={currency} timeScopeValue={timeScopeValue} />,
isDetailsDateRangeToggleEnabled: FeatureToggleSelectors.selectIsDetailsDateRangeToggleEnabled(state),
isProviderEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsProviderEmptyStateToggleEnabled(state),
providers: filterProviders(providers, ProviderType.oci),
providersError,
Expand Down
4 changes: 3 additions & 1 deletion src/routes/details/ocpBreakdown/ocpBreakdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, BreakdownSta
const breadcrumbLabel = queryFromRoute[breadcrumbLabelKey] ? queryFromRoute[breadcrumbLabelKey] : undefined;
const title = queryFromRoute[breakdownTitleKey] ? queryFromRoute[breakdownTitleKey] : groupByValue;

return {
const test = {
breadcrumbLabel,
clusterInfoComponent: groupBy === 'cluster' ? <ClusterInfoModal clusterId={groupByValue} /> : undefined,
dataDetailsComponent:
Expand Down Expand Up @@ -133,6 +133,7 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, BreakdownSta
/>
),
isOptimizationsTab: queryFromRoute.optimizationsTab !== undefined,
isDetailsDateRangeToggleEnabled: FeatureToggleSelectors.selectIsDetailsDateRangeToggleEnabled(state),
isProviderEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsProviderEmptyStateToggleEnabled(state),
isVirtualizationToggleEnabled: FeatureToggleSelectors.selectIsVirtualizationToggleEnabled(state),
optimizationsComponent: groupBy === 'project' && groupByValue !== '*' ? <Optimizations /> : undefined,
Expand All @@ -153,6 +154,7 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, BreakdownSta
title,
virtualizationComponent: <Virtualization currency={currency} />,
};
return test;
});

const mapDispatchToProps: OcpBreakdownDispatchProps = {
Expand Down
1 change: 1 addition & 0 deletions src/routes/details/rhelBreakdown/rhelBreakdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const mapStateToProps = createMapStateToProps<RhelBreakdownOwnProps, BreakdownSt
groupBy,
groupByValue,
historicalDataComponent: <HistoricalData currency={currency} timeScopeValue={timeScopeValue} />,
isDetailsDateRangeToggleEnabled: FeatureToggleSelectors.selectIsDetailsDateRangeToggleEnabled(state),
isProviderEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsProviderEmptyStateToggleEnabled(state),
providers: filterProviders(providers, ProviderType.rhel),
providersFetchStatus,
Expand Down