move useLocation hook inside component (#1570)

weaveworks · Mar 2, 2022 · 31442b0 · 31442b0
1 parent fcaf2eb
commit 31442b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ui/components/Breadcrumbs.tsx b/ui/components/Breadcrumbs.tsx
@@ -1,4 +1,6 @@
+import qs from "query-string";
 import React from "react";
+import { useLocation } from "react-router-dom";
 import styled from "styled-components";
 import useNavigation from "../hooks/navigation";
 import { getPageLabel, getParentNavValue, V2Routes } from "../lib/nav";
@@ -17,6 +19,7 @@ const CrumbLink = styled(Link)`
 export const Breadcrumbs = () => {
   const { currentPage } = useNavigation();
   const parentValue = getParentNavValue(currentPage);
+  const parsed = qs.parse(useLocation().search);
 
   return (
     <Flex align>
@@ -35,7 +38,7 @@ export const Breadcrumbs = () => {
         to={currentPage}
         textProps={parentValue === currentPage && { bold: true }}
       >
-        {getPageLabel(currentPage)}
+        {getPageLabel(currentPage, parsed && (parsed.name as string))}
       </CrumbLink>
     </Flex>
   );

diff --git a/ui/lib/nav.ts b/ui/lib/nav.ts
@@ -1,5 +1,4 @@
 import qs from "query-string";
-import { useLocation } from "react-router-dom";
 import { SourceRefSourceKind } from "./api/core/types.pb";
 import { PageRoute } from "./types";
 
@@ -42,8 +41,7 @@ export const getParentNavValue = (
   }
 };
 
-export const getPageLabel = (currentPage: string): string => {
-  const parsed = qs.parse(useLocation().search);
+export const getPageLabel = (currentPage: string, name?: string): string => {
   switch (currentPage) {
     case V2Routes.Automations:
       return "Applications";
@@ -56,7 +54,7 @@ export const getPageLabel = (currentPage: string): string => {
     case V2Routes.GitRepo:
     case V2Routes.HelmChart:
     case V2Routes.Bucket:
-      return parsed.name as string;
+      return name;
   }
 };