From 65630a9bcbe54d3380569f04d7979a5e506e3ad9 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
Date: Fri, 11 Nov 2022 08:16:53 -0600
Subject: [PATCH] Changes based on feedback

Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
---
 .changeset/lovely-walls-guess.md              | 20 +++++++------------
 packages/app/src/components/Root/Root.tsx     | 20 +++++++------------
 .../packages/app/src/components/Root/Root.tsx | 20 +++++++------------
 3 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/.changeset/lovely-walls-guess.md b/.changeset/lovely-walls-guess.md
index edf068c7e3..eab92d8e9e 100644
--- a/.changeset/lovely-walls-guess.md
+++ b/.changeset/lovely-walls-guess.md
@@ -44,45 +44,39 @@ To add this to an existing Backstage instance you will need to make the followin
      <SidebarSubmenu title="Catalog">
        <SidebarSubmenuItem
          title="Domains"
-         to="catalog?filters%5Bkind%5D=domain"
+         to="catalog?filters[kind]=domain"
          icon={DomainIcon}
        />
        <SidebarSubmenuItem
          title="Systems"
-         to="catalog?filters%5Bkind%5D=system"
+         to="catalog?filters[kind]=system"
          icon={SystemIcon}
        />
        <SidebarSubmenuItem
          title="Components"
-         to="catalog?filters%5Bkind%5D=component"
+         to="catalog?filters[kind]=component"
          icon={ComponentIcon}
        />
        <SidebarSubmenuItem
          title="APIs"
-         to="catalog?filters%5Bkind%5D=api"
+         to="catalog?filters[kind]=api"
          icon={ApiIcon}
        />
        <SidebarDivider />
        <SidebarSubmenuItem
          title="Resources"
-         to="catalog?filters%5Bkind%5D=resource"
+         to="catalog?filters[kind]=resource"
          icon={ResourceIcon}
        />
        <SidebarDivider />
-       <SidebarSubmenuItem
-         title="Templates"
-         to="catalog?filters%5Bkind%5D=template"
-         icon={CreateComponentIcon}
-       />
-       <SidebarDivider />
        <SidebarSubmenuItem
          title="Groups"
-         to="catalog?filters%5Bkind%5D=group"
+         to="catalog?filters[kind]=group"
          icon={GroupIcon}
        />
        <SidebarSubmenuItem
          title="Users"
-         to="catalog?filters%5Bkind%5D=user"
+         to="catalog?filters[kind]=user"
          icon={UserIcon}
        />
      </SidebarSubmenu>
diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
index 7bec873d49..8cec54326a 100644
--- a/packages/app/src/components/Root/Root.tsx
+++ b/packages/app/src/components/Root/Root.tsx
@@ -106,45 +106,39 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
           <SidebarSubmenu title="Catalog">
             <SidebarSubmenuItem
               title="Domains"
-              to="catalog?filters%5Bkind%5D=domain"
+              to="catalog?filters[kind]=domain"
               icon={DomainIcon}
             />
             <SidebarSubmenuItem
               title="Systems"
-              to="catalog?filters%5Bkind%5D=system"
+              to="catalog?filters[kind]=system"
               icon={SystemIcon}
             />
             <SidebarSubmenuItem
               title="Components"
-              to="catalog?filters%5Bkind%5D=component"
+              to="catalog?filters[kind]=component"
               icon={ComponentIcon}
             />
             <SidebarSubmenuItem
               title="APIs"
-              to="catalog?filters%5Bkind%5D=api"
+              to="catalog?filters[kind]=api"
               icon={ApiIcon}
             />
             <SidebarDivider />
             <SidebarSubmenuItem
               title="Resources"
-              to="catalog?filters%5Bkind%5D=resource"
+              to="catalog?filters[kind]=resource"
               icon={ResourceIcon}
             />
             <SidebarDivider />
-            <SidebarSubmenuItem
-              title="Templates"
-              to="catalog?filters%5Bkind%5D=template"
-              icon={CreateComponentIcon}
-            />
-            <SidebarDivider />
             <SidebarSubmenuItem
               title="Groups"
-              to="catalog?filters%5Bkind%5D=group"
+              to="catalog?filters[kind]=group"
               icon={GroupIcon}
             />
             <SidebarSubmenuItem
               title="Users"
-              to="catalog?filters%5Bkind%5D=user"
+              to="catalog?filters[kind]=user"
               icon={UserIcon}
             />
           </SidebarSubmenu>
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
index b6f883ab2f..0acaba7470 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
@@ -78,45 +78,39 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
           <SidebarSubmenu title="Catalog">
             <SidebarSubmenuItem
               title="Domains"
-              to="catalog?filters%5Bkind%5D=domain"
+              to="catalog?filters[kind]=domain"
               icon={DomainIcon}
             />
             <SidebarSubmenuItem
               title="Systems"
-              to="catalog?filters%5Bkind%5D=system"
+              to="catalog?filters[kind]=system"
               icon={SystemIcon}
             />
             <SidebarSubmenuItem
               title="Components"
-              to="catalog?filters%5Bkind%5D=component"
+              to="catalog?filters[kind]=component"
               icon={ComponentIcon}
             />
             <SidebarSubmenuItem
               title="APIs"
-              to="catalog?filters%5Bkind%5D=api"
+              to="catalog?filters[kind]=api"
               icon={ApiIcon}
             />
             <SidebarDivider />
             <SidebarSubmenuItem
               title="Resources"
-              to="catalog?filters%5Bkind%5D=resource"
+              to="catalog?filters[kind]=resource"
               icon={ResourceIcon}
             />
             <SidebarDivider />
-            <SidebarSubmenuItem
-              title="Templates"
-              to="catalog?filters%5Bkind%5D=template"
-              icon={CreateComponentIcon}
-            />
-            <SidebarDivider />
             <SidebarSubmenuItem
               title="Groups"
-              to="catalog?filters%5Bkind%5D=group"
+              to="catalog?filters[kind]=group"
               icon={GroupIcon}
             />
             <SidebarSubmenuItem
               title="Users"
-              to="catalog?filters%5Bkind%5D=user"
+              to="catalog?filters[kind]=user"
               icon={UserIcon}
             />
           </SidebarSubmenu>