Merge pull request #3417 from dlabrecq/breadcrumb

Fix missing breadcrumb
project-koku · Oct 2, 2023 · 40f8f45 · 40f8f45
2 parents f1f5db3 + 3a3ec53
commit 40f8f45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 37 deletions.
diff --git a/src/routes/details/components/breakdown/breakdownHeader.tsx b/src/routes/details/components/breakdown/breakdownHeader.tsx
@@ -57,28 +57,6 @@ interface BreakdownHeaderDispatchProps {
 type BreakdownHeaderProps = BreakdownHeaderOwnProps & BreakdownHeaderStateProps & WrappedComponentProps;
 
 class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
-  // private buildDetailsLink = url => {
-  //   const { groupBy, query, router } = this.props;
-  //
-  //   let groupByKey = groupBy;
-  //   let value = '*';
-  //
-  //   // Retrieve org unit used by the details page
-  //   if (query[orgUnitIdKey]) {
-  //     groupByKey = orgUnitIdKey;
-  //     value = query[orgUnitIdKey];
-  //   }
-  //
-  //   const queryState = getQueryState(router.location, 'details');
-  //   const newQuery = {
-  //     ...(queryState && queryState),
-  //     group_by: {
-  //       [groupByKey]: value,
-  //     },
-  //   };
-  //   return `${url}?${getQueryRoute(newQuery)}`;
-  // };
-
   private getBackToLink = groupByKey => {
     const { breadcrumb, intl, router, tagPathsType } = this.props;
 
@@ -95,19 +73,6 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
     );
   };
 
-  // private getBackToLink = groupByKey => {
-  //   const { detailsURL, intl, router, tagPathsType } = this.props;
-  //
-  //   return (
-  //     <Link to={this.buildDetailsLink(detailsURL)} state={{ ...router.location.state }}>
-  //       {intl.formatMessage(messages.breakdownBackToDetails, {
-  //         value: intl.formatMessage(messages.breakdownBackToTitles, { value: tagPathsType }),
-  //         groupBy: groupByKey,
-  //       })}
-  //     </Link>
-  //   );
-  // };
-
   private getTotalCost = () => {
     const { costDistribution, report } = this.props;
 

diff --git a/src/routes/utils/queryNavigate.ts b/src/routes/utils/queryNavigate.ts
@@ -7,7 +7,7 @@ import { getRouteForQuery } from './query';
 
 export const handleOnCurrencySelected = (query: Query, router: RouteComponentProps) => {
   const newQuery = queryUtils.handleOnCurrencySelected(query);
-  router.navigate(getRouteForQuery(newQuery, router.location), { replace: true }); // Don't reset pagination
+  router.navigate(getRouteForQuery(newQuery, router.location), { replace: true, state: router.location.state }); // Don't reset pagination
 };
 
 export const handleOnCostTypeSelected = (query: Query, router: RouteComponentProps) => {
@@ -17,7 +17,7 @@ export const handleOnCostTypeSelected = (query: Query, router: RouteComponentPro
 
 export const handleOnCostDistributionSelected = (query: Query, router: RouteComponentProps) => {
   const newQuery = queryUtils.handleOnCostDistributionSelected(query);
-  router.navigate(getRouteForQuery(newQuery, router.location), { replace: true }); // Don't reset pagination
+  router.navigate(getRouteForQuery(newQuery, router.location), { replace: true, state: router.location.state }); // Don't reset pagination
 };
 
 export const handleOnFilterAdded = (query: Query, router: RouteComponentProps, filter: Filter) => {