From 3d2ef991cad19772be1f41f7e829a2c23d2cff38 Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Wed, 11 Jan 2023 13:31:57 -0500 Subject: [PATCH] Details breakdown title and description are same https://issues.redhat.com/browse/COST-3380 --- src/routes/views/details/azureDetails/detailsTable.tsx | 2 +- src/routes/views/details/gcpDetails/detailsTable.tsx | 2 +- src/routes/views/details/ibmDetails/detailsTable.tsx | 2 +- src/routes/views/details/ociDetails/detailsTable.tsx | 2 +- src/routes/views/details/ocpDetails/detailsTable.tsx | 2 +- src/routes/views/details/rhelDetails/detailsTable.tsx | 2 +- src/routes/views/utils/paths.ts | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/routes/views/details/azureDetails/detailsTable.tsx b/src/routes/views/details/azureDetails/detailsTable.tsx index eec92fbf4..044081d94 100644 --- a/src/routes/views/details/azureDetails/detailsTable.tsx +++ b/src/routes/views/details/azureDetails/detailsTable.tsx @@ -132,11 +132,11 @@ class DetailsTableBase extends React.Component { {label} diff --git a/src/routes/views/details/gcpDetails/detailsTable.tsx b/src/routes/views/details/gcpDetails/detailsTable.tsx index 56fc71d4b..58d1caa85 100644 --- a/src/routes/views/details/gcpDetails/detailsTable.tsx +++ b/src/routes/views/details/gcpDetails/detailsTable.tsx @@ -132,11 +132,11 @@ class DetailsTableBase extends React.Component { {label} diff --git a/src/routes/views/details/ibmDetails/detailsTable.tsx b/src/routes/views/details/ibmDetails/detailsTable.tsx index a9916bf9f..13ddad054 100644 --- a/src/routes/views/details/ibmDetails/detailsTable.tsx +++ b/src/routes/views/details/ibmDetails/detailsTable.tsx @@ -132,11 +132,11 @@ class DetailsTableBase extends React.Component { {label} diff --git a/src/routes/views/details/ociDetails/detailsTable.tsx b/src/routes/views/details/ociDetails/detailsTable.tsx index 2f8985d7c..8b66842e6 100644 --- a/src/routes/views/details/ociDetails/detailsTable.tsx +++ b/src/routes/views/details/ociDetails/detailsTable.tsx @@ -132,11 +132,11 @@ class DetailsTableBase extends React.Component { {label} diff --git a/src/routes/views/details/ocpDetails/detailsTable.tsx b/src/routes/views/details/ocpDetails/detailsTable.tsx index 5734b1523..94bae00da 100644 --- a/src/routes/views/details/ocpDetails/detailsTable.tsx +++ b/src/routes/views/details/ocpDetails/detailsTable.tsx @@ -192,12 +192,12 @@ class DetailsTableBase extends React.Component { {label} diff --git a/src/routes/views/details/rhelDetails/detailsTable.tsx b/src/routes/views/details/rhelDetails/detailsTable.tsx index 34b7ddbbf..6ab5441f8 100644 --- a/src/routes/views/details/rhelDetails/detailsTable.tsx +++ b/src/routes/views/details/rhelDetails/detailsTable.tsx @@ -189,11 +189,11 @@ class DetailsTableBase extends React.Component { {label} diff --git a/src/routes/views/utils/paths.ts b/src/routes/views/utils/paths.ts index e00a096ab..8d7c75d16 100644 --- a/src/routes/views/utils/paths.ts +++ b/src/routes/views/utils/paths.ts @@ -10,22 +10,22 @@ export const getBreakdownPath = ({ groupBy, id, isPlatformCosts, - label, router, + title, }: { basePath: string; description: string; // Used to display a description in the breakdown header groupBy: string | number; id: string | number; // group_by[account]= param in the breakdown page isPlatformCosts?: boolean; - label: string; router: RouteComponentProps; + title: string | number; // Used to display a title in the breakdown header }) => { const queryFromRoute = parseQuery(router.location.search); const newQuery = { ...queryFromRoute, - ...(description && description !== label && { [breakdownDescKey]: description }), - ...(isPlatformCosts && { [breakdownTitleKey]: label }), + ...(description && description !== title && { [breakdownDescKey]: description }), + ...(title && { [breakdownTitleKey]: title }), group_by: { [groupBy]: isPlatformCosts ? '*' : id, // Use ID here -- see https://github.com/project-koku/koku-ui/pull/2821 },