From 0f93aeaf8f980cf6cde4a3370962748ea19b8181 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Mon, 7 Mar 2022 10:26:13 -0600
Subject: [PATCH] Refactored based on feedback

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 .../CatalogKindHeader.test.tsx                  |  4 ++--
 .../CatalogKindHeader/CatalogKindHeader.tsx     | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
index 7783278eda..a7dc18eae2 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
@@ -158,7 +158,7 @@ describe('<CatalogKindHeader />', () => {
         <MockEntityListContextProvider
           value={{
             updateFilters,
-            queryParameters: { kind: ['templates'] },
+            queryParameters: { kind: ['template'] },
           }}
         >
           <CatalogKindHeader />
@@ -166,7 +166,7 @@ describe('<CatalogKindHeader />', () => {
       </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
-      kind: new EntityKindFilter('templates'),
+      kind: new EntityKindFilter('template'),
     });
   });
 });
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index 5124f95086..27184bafef 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -59,20 +59,17 @@ export function CatalogKindHeader(props: CatalogKindHeaderProps) {
       .getEntityFacets({ facets: ['kind'] })
       .then(response => response.facets.kind?.map(f => f.value).sort() || []);
   });
-  const { updateFilters, queryParameters } = useEntityList();
+  const {
+    updateFilters,
+    queryParameters: { kind: kindParameter },
+  } = useEntityList();
 
   const queryParamKind = useMemo(
-    () =>
-      ([queryParameters.kind].flat()[0] ?? initialFilter).toLocaleLowerCase(
-        'en-US',
-      ),
-    [initialFilter, queryParameters],
+    () => [kindParameter].flat()[0],
+    [kindParameter],
   );
-
   const [selectedKind, setSelectedKind] = useState(
-    ([queryParameters.kind].flat()[0] ?? initialFilter).toLocaleLowerCase(
-      'en-US',
-    ),
+    queryParamKind ?? initialFilter,
   );
 
   useEffect(() => {