From d87d23c44e7c7d601fd4ef7a7c4ad54bfccda694 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Mon, 4 Jan 2021 23:52:20 -0500
Subject: [PATCH 1/3] Fix phantom all state

---
 plugins/search/src/components/Filters/Filters.tsx         | 2 +-
 .../search/src/components/SearchResult/SearchResult.tsx   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/search/src/components/Filters/Filters.tsx b/plugins/search/src/components/Filters/Filters.tsx
index 7bd344e12e..888a583547 100644
--- a/plugins/search/src/components/Filters/Filters.tsx
+++ b/plugins/search/src/components/Filters/Filters.tsx
@@ -103,7 +103,7 @@ export const Filters = ({
           >
             {filterOptions.kind.map(filter => (
               <MenuItem
-                selected={filter === 'All'}
+                selected={filter === ''}
                 dense
                 key={filter}
                 value={filter}
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index 4bbb15e229..f81cd4f66d 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -127,7 +127,7 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
 
   const [showFilters, toggleFilters] = useState(false);
   const [selectedFilters, setSelectedFilters] = useState<FiltersState>({
-    selected: 'All',
+    selected: '',
     checked: [],
   });
 
@@ -146,7 +146,7 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
       // apply filters
 
       // filter on selected
-      if (selectedFilters.selected !== 'All') {
+      if (selectedFilters.selected !== '') {
         withFilters = results.filter((result: Result) =>
           selectedFilters.selected.includes(result.kind),
         );
@@ -192,7 +192,7 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
 
   const resetFilters = () => {
     setSelectedFilters({
-      selected: 'All',
+      selected: '',
       checked: [],
     });
   };
@@ -259,7 +259,7 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
                 searchQuery={searchQuery}
                 numberOfResults={filteredResults.length}
                 numberOfSelectedFilters={
-                  (selectedFilters.selected !== 'All' ? 1 : 0) +
+                  (selectedFilters.selected !== '' ? 1 : 0) +
                   selectedFilters.checked.length
                 }
                 handleToggleFilters={() => toggleFilters(!showFilters)}

From 01707438bf2da858ffca8f515c9445b0a802c7fb Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Mon, 4 Jan 2021 23:54:08 -0500
Subject: [PATCH 2/3] Add changeset

---
 .changeset/loud-vans-pretend.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/loud-vans-pretend.md

diff --git a/.changeset/loud-vans-pretend.md b/.changeset/loud-vans-pretend.md
new file mode 100644
index 0000000000..1c18f0094f
--- /dev/null
+++ b/.changeset/loud-vans-pretend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': patch
+---
+
+Fix Material-UI error for search filtering

From 1e64b6f789c64a2485985806b66096c1099cb9b1 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Mon, 4 Jan 2021 23:59:13 -0500
Subject: [PATCH 3/3] Update wording

---
 .changeset/loud-vans-pretend.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/loud-vans-pretend.md b/.changeset/loud-vans-pretend.md
index 1c18f0094f..1e2498284b 100644
--- a/.changeset/loud-vans-pretend.md
+++ b/.changeset/loud-vans-pretend.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-search': patch
 ---
 
-Fix Material-UI error for search filtering
+Fix Material-UI warning for search filtering