From 2321160340c02acb587e1cdd3086c41133d0031e Mon Sep 17 00:00:00 2001
From: Ivona Josipovic <josipovic.ivona@gmail.com>
Date: Wed, 8 Nov 2023 08:44:25 +0100
Subject: [PATCH 1/4] Filter fix Signed-off-by: Ivona Josipovic

Signed-off-by: Ivona Josipovic <josipovic.ivona@gmail.com>
---
 .../src/components/Select/Select.tsx          | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index 918ce301fb..85597dc22e 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -218,15 +218,21 @@ export function SelectComponent(props: SelectProps) {
           renderValue={s =>
             multiple && (value as any[]).length !== 0 ? (
               <Box className={classes.chips}>
-                {(s as string[]).map(selectedValue => (
-                  <Chip
-                    key={items.find(el => el.value === selectedValue)?.value}
-                    label={items.find(el => el.value === selectedValue)?.label}
-                    clickable
-                    onDelete={handleDelete(selectedValue)}
-                    className={classes.chip}
-                  />
-                ))}
+                {(s as string[]).map(selectedValue =>
+                  items.find(el => el.value === selectedValue) ? (
+                    <Chip
+                      key={items.find(el => el.value === selectedValue)?.value}
+                      label={
+                        items.find(el => el.value === selectedValue)?.label
+                      }
+                      clickable
+                      onDelete={handleDelete(selectedValue)}
+                      className={classes.chip}
+                    />
+                  ) : (
+                    false
+                  ),
+                )}
               </Box>
             ) : (
               <Typography>

From e07570a740e8da47d2c96c2c241b49c925e1fcea Mon Sep 17 00:00:00 2001
From: Ivona Josipovic <josipovic.ivona@gmail.com>
Date: Wed, 8 Nov 2023 10:21:20 +0100
Subject: [PATCH 2/4] Added changelog

Signed-off-by: Ivona Josipovic <josipovic.ivona@gmail.com>
---
 .changeset/many-lemons-arrive.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/many-lemons-arrive.md

diff --git a/.changeset/many-lemons-arrive.md b/.changeset/many-lemons-arrive.md
new file mode 100644
index 0000000000..d2b6e1b7d7
--- /dev/null
+++ b/.changeset/many-lemons-arrive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Fixed bug in Select component where a broken filter was showing when an invalid initialState was passed.

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 3/4] 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>

From ec2cee2ded029e53d335933d3ddde79e6a6c5eaa Mon Sep 17 00:00:00 2001
From: Ivona Josipovic <josipovic.ivona@gmail.com>
Date: Mon, 13 Nov 2023 11:12:26 +0100
Subject: [PATCH 4/4] Update changeset

Signed-off-by: Ivona Josipovic <josipovic.ivona@gmail.com>
---
 .changeset/many-lemons-arrive.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/many-lemons-arrive.md b/.changeset/many-lemons-arrive.md
index 5a1542a19b..11b97ec1fa 100644
--- a/.changeset/many-lemons-arrive.md
+++ b/.changeset/many-lemons-arrive.md
@@ -2,4 +2,4 @@
 '@backstage/core-components': patch
 ---
 
-Fixed `Select` component default filter state.
+Fixed an issue causing the `Select` component to show empty chips when some of the selected values did not match any item