From 28767a3d8a5db130a9da9da6b076c215afe4b293 Mon Sep 17 00:00:00 2001
From: Ivona Josipovic <josipovic.ivona@gmail.com>
Date: Thu, 9 Nov 2023 09:34:45 +0100
Subject: [PATCH] Refactoring

Signed-off-by: Ivona Josipovic <josipovic.ivona@gmail.com>
---
 .changeset/many-lemons-arrive.md                  |  2 +-
 .../src/components/Select/Select.tsx              | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.changeset/many-lemons-arrive.md b/.changeset/many-lemons-arrive.md
index d2b6e1b7d7..5a1542a19b 100644
--- a/.changeset/many-lemons-arrive.md
+++ b/.changeset/many-lemons-arrive.md
@@ -2,4 +2,4 @@
 '@backstage/core-components': patch
 ---
 
-Fixed bug in Select component where a broken filter was showing when an invalid initialState was passed.
+Fixed `Select` component default filter state.
diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index 85597dc22e..ec7f87eb94 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -218,21 +218,20 @@ export function SelectComponent(props: SelectProps) {
           renderValue={s =>
             multiple && (value as any[]).length !== 0 ? (
               <Box className={classes.chips}>
-                {(s as string[]).map(selectedValue =>
-                  items.find(el => el.value === selectedValue) ? (
+                {(s as string[]).map(selectedValue => {
+                  const item = items.find(el => el.value === selectedValue);
+                  return item ? (
                     <Chip
-                      key={items.find(el => el.value === selectedValue)?.value}
-                      label={
-                        items.find(el => el.value === selectedValue)?.label
-                      }
+                      key={item?.value}
+                      label={item?.label}
                       clickable
                       onDelete={handleDelete(selectedValue)}
                       className={classes.chip}
                     />
                   ) : (
                     false
-                  ),
-                )}
+                  );
+                })}
               </Box>
             ) : (
               <Typography>