From f8809eef5922531a532790ac354d67c6bf314834 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 3 Feb 2023 13:44:57 +0000
Subject: [PATCH] Search: Fix not being able to clear sort value (#62557)

* user essentials mob! :trident:

lastFile:public/app/features/search/state/SearchStateManager.ts

* user essentials mob! :trident:

lastFile:public/app/features/search/page/components/ActionRow.tsx

* user essentials mob! :trident:

* remove searchSort state from localStorage when cleared

---------

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Joao Silva <joao.silva@grafana.com>
---
 public/app/features/search/page/components/ActionRow.tsx | 4 ++--
 public/app/features/search/state/SearchStateManager.ts   | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index 27fe51c9ab5..e1115360904 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -106,10 +106,10 @@ export const ActionRow: FC<Props> = ({
             />
           )}
           <SortPicker
-            onChange={(change) => onSortChange(change.value)}
+            onChange={(change) => onSortChange(change?.value)}
             value={state.sort}
             getSortOptions={getSortOptions}
-            placeholder={sortPlaceholder}
+            placeholder={sortPlaceholder || 'Sort'}
             isClearable
           />
         </HorizontalGroup>
diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 0b4d93d185c..9a7fa919417 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -115,6 +115,8 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   onSortChange = (sort: string | undefined) => {
     if (sort) {
       localStorage.setItem(SEARCH_SELECTED_SORT, sort);
+    } else {
+      localStorage.removeItem(SEARCH_SELECTED_SORT);
     }
 
     if (this.state.layout === SearchLayout.Folders) {
@@ -171,10 +173,6 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
       q.kind = ['dashboard', 'folder']; // skip panels
     }
 
-    if (q.query === '*' && !q.sort?.length) {
-      q.sort = 'name_sort';
-    }
-
     return q;
   }