From c120e220dd726466829723a073b74def8ae91f90 Mon Sep 17 00:00:00 2001
From: Victor Perera <v-vperera@expediagroup.com>
Date: Fri, 8 Oct 2021 17:31:07 -0500
Subject: [PATCH] EntityFilterType hidden and settled

Signed-off-by: Victor Perera <v-vperera@expediagroup.com>
---
 .../app/.changeset/spotty-mayflies-refuse.md  |  5 +++++
 .../EntityTypePicker/EntityTypePicker.tsx     | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/.changeset/spotty-mayflies-refuse.md

diff --git a/packages/app/.changeset/spotty-mayflies-refuse.md b/packages/app/.changeset/spotty-mayflies-refuse.md
new file mode 100644
index 0000000000..8f98365677
--- /dev/null
+++ b/packages/app/.changeset/spotty-mayflies-refuse.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+EntityTypePicker can be hidden and initially settled like EntityKindPicker
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
index bc30bf5b17..799598b5f7 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
@@ -22,7 +22,15 @@ import { useEntityTypeFilter } from '../../hooks/useEntityTypeFilter';
 import { alertApiRef, useApi } from '@backstage/core-plugin-api';
 import { Select } from '@backstage/core-components';
 
-export const EntityTypePicker = () => {
+type EntityTypeFilterProps = {
+  initialFilter?: string;
+  hidden?: boolean;
+};
+
+export const EntityTypePicker = ({
+  hidden,
+  initialFilter,
+}: EntityTypeFilterProps) => {
   const alertApi = useApi(alertApiRef);
   const { error, availableTypes, selectedTypes, setSelectedTypes } =
     useEntityTypeFilter();
@@ -34,7 +42,10 @@ export const EntityTypePicker = () => {
         severity: 'error',
       });
     }
-  }, [error, alertApi]);
+    if (initialFilter) {
+      setSelectedTypes([initialFilter]);
+    }
+  }, [error, alertApi, initialFilter, setSelectedTypes]);
 
   if (availableTypes.length === 0 || error) return null;
 
@@ -46,7 +57,7 @@ export const EntityTypePicker = () => {
     })),
   ];
 
-  return (
+  return !hidden ? (
     <Box pb={1} pt={1}>
       <Select
         label="Type"
@@ -57,5 +68,5 @@ export const EntityTypePicker = () => {
         }
       />
     </Box>
-  );
+  ) : null;
 };