From 994ddf7e6f37523f1472d3bf832f76241440c724 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 11 Jun 2024 15:45:10 +0100
Subject: [PATCH] RecentlyDeleted: Remove search box (#89043)

* RecentlyDeleted: Remove search box

* i18n
---
 .../components/BrowseFilters.tsx              |  2 +-
 .../manage-dashboards/RecentlyDeletedPage.tsx | 10 --------
 .../search/page/components/ActionRow.tsx      | 24 +++++++++----------
 public/locales/en-US/grafana.json             |  5 ----
 public/locales/pseudo-LOCALE/grafana.json     |  5 ----
 5 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/public/app/features/browse-dashboards/components/BrowseFilters.tsx b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
index 43e64d57cc2..2e339fbd012 100644
--- a/public/app/features/browse-dashboards/components/BrowseFilters.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseFilters.tsx
@@ -11,11 +11,11 @@ export function BrowseFilters() {
     <div>
       <ActionRow
         showStarredFilter
+        showLayout
         state={searchState}
         getTagOptions={stateManager.getTagOptions}
         getSortOptions={getGrafanaSearcher().getSortOptions}
         sortPlaceholder={getGrafanaSearcher().sortPlaceholder}
-        includePanels={searchState.includePanels ?? false}
         onLayoutChange={stateManager.onLayoutChange}
         onStarredFilterChange={stateManager.onStarredFilterChange}
         onSortChange={stateManager.onSortChange}
diff --git a/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx b/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx
index 6994dc243ea..12f08f4bd6d 100644
--- a/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx
+++ b/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx
@@ -1,9 +1,7 @@
 import React, { memo, useEffect } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import { FilterInput } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
-import { t } from 'app/core/internationalization';
 import { ActionRow } from 'app/features/search/page/components/ActionRow';
 import { getGrafanaSearcher } from 'app/features/search/service';
 
@@ -37,19 +35,11 @@ const RecentlyDeletedPage = memo(() => {
   return (
     <Page navId="dashboards/recentlyDeleted">
       <Page.Contents>
-        <FilterInput
-          placeholder={t('recentlyDeleted.filter.placeholder', 'Search for dashboards')}
-          value={searchState.query}
-          escapeRegex={false}
-          onChange={(e) => stateManager.onQueryChange(e)}
-        />
         <ActionRow
-          showStarredFilter={false}
           state={searchState}
           getTagOptions={stateManager.getTagOptions}
           getSortOptions={getGrafanaSearcher().getSortOptions}
           sortPlaceholder={getGrafanaSearcher().sortPlaceholder}
-          includePanels={false}
           onLayoutChange={stateManager.onLayoutChange}
           onSortChange={stateManager.onSortChange}
           onTagFilterChange={stateManager.onTagFilterChange}
diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index 7e1b67e7f69..f76ac3009ce 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -21,21 +21,21 @@ function getLayoutOptions() {
   ];
 }
 
-interface Props {
+interface ActionRowProps {
+  state: SearchState;
+  showStarredFilter?: boolean;
+  showLayout?: boolean;
+  sortPlaceholder?: string;
+
   onLayoutChange: (layout: SearchLayout) => void;
   onSortChange: (value?: string) => void;
   onStarredFilterChange?: (event: FormEvent<HTMLInputElement>) => void;
   onTagFilterChange: (tags: string[]) => void;
   getTagOptions: () => Promise<TermCount[]>;
   getSortOptions: () => Promise<SelectableValue[]>;
-  sortPlaceholder?: string;
   onDatasourceChange: (ds?: string) => void;
   onPanelTypeChange: (pt?: string) => void;
-  includePanels: boolean;
   onSetIncludePanels: (v: boolean) => void;
-  state: SearchState;
-  showStarredFilter?: boolean;
-  hideLayout?: boolean;
 }
 
 export function getValidQueryLayout(q: SearchState): SearchLayout {
@@ -52,20 +52,20 @@ export function getValidQueryLayout(q: SearchState): SearchLayout {
 }
 
 export const ActionRow = ({
+  state,
+  showStarredFilter,
+  showLayout,
+  sortPlaceholder,
   onLayoutChange,
   onSortChange,
   onStarredFilterChange = () => {},
   onTagFilterChange,
   getTagOptions,
   getSortOptions,
-  sortPlaceholder,
   onDatasourceChange,
   onPanelTypeChange,
   onSetIncludePanels,
-  state,
-  showStarredFilter,
-  hideLayout,
-}: Props) => {
+}: ActionRowProps) => {
   const styles = useStyles2(getStyles);
   const layout = getValidQueryLayout(state);
 
@@ -113,7 +113,7 @@ export const ActionRow = ({
       </Stack>
 
       <Stack gap={2}>
-        {!hideLayout && (
+        {showLayout && (
           <RadioButtonGroup
             options={getLayoutOptions()}
             disabledOptions={disabledOptions}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 0dd9c2396a3..dcacf1d1098 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -1479,11 +1479,6 @@
     },
     "query-editor-not-exported": "Data source plugin does not export any Query Editor component"
   },
-  "recentlyDeleted": {
-    "filter": {
-      "placeholder": "Search for dashboards"
-    }
-  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Auto refresh turned off. Choose refresh time interval",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index cc96daa200b..2bb814bc727 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -1479,11 +1479,6 @@
     },
     "query-editor-not-exported": "Đäŧä şőūřčę pľūģįʼn đőęş ʼnőŧ ęχpőřŧ äʼny Qūęřy Ēđįŧőř čőmpőʼnęʼnŧ"
   },
-  "recentlyDeleted": {
-    "filter": {
-      "placeholder": "Ŝęäřčĥ ƒőř đäşĥþőäřđş"
-    }
-  },
   "refresh-picker": {
     "aria-label": {
       "choose-interval": "Åūŧő řęƒřęşĥ ŧūřʼnęđ őƒƒ. Cĥőőşę řęƒřęşĥ ŧįmę įʼnŧęřväľ",