From 5acda40248f9e92d056ba6253919001b8c38d315 Mon Sep 17 00:00:00 2001 From: Leon Sorokin Date: Thu, 13 Oct 2022 14:30:20 -0500 Subject: [PATCH] Search/ActionRow: drill placeholder to SortPicker (#56475) --- .../app/features/search/page/components/ActionRow.tsx | 10 +++++++++- .../app/features/search/page/components/SearchView.tsx | 1 + public/app/features/search/service/types.ts | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx index e7f5ff81785..176545f8738 100644 --- a/public/app/features/search/page/components/ActionRow.tsx +++ b/public/app/features/search/page/components/ActionRow.tsx @@ -26,6 +26,7 @@ interface Props { onTagFilterChange: (tags: string[]) => void; getTagOptions: () => Promise; getSortOptions: () => Promise; + sortPlaceholder?: string; onDatasourceChange: (ds?: string) => void; includePanels: boolean; setIncludePanels: (v: boolean) => void; @@ -57,6 +58,7 @@ export const ActionRow: FC = ({ onTagFilterChange, getTagOptions, getSortOptions, + sortPlaceholder, onDatasourceChange, query, showStarredFilter, @@ -116,7 +118,13 @@ export const ActionRow: FC = ({ value={layout} /> )} - + diff --git a/public/app/features/search/page/components/SearchView.tsx b/public/app/features/search/page/components/SearchView.tsx index 9fdda74f371..bca000ba2e0 100644 --- a/public/app/features/search/page/components/SearchView.tsx +++ b/public/app/features/search/page/components/SearchView.tsx @@ -337,6 +337,7 @@ export const SearchView = ({ onTagFilterChange={onTagFilterChange} getTagOptions={getTagOptions} getSortOptions={getGrafanaSearcher().getSortOptions} + sortPlaceholder={getGrafanaSearcher().sortPlaceholder} onDatasourceChange={onDatasourceChange} query={query} includePanels={includePanels!} diff --git a/public/app/features/search/service/types.ts b/public/app/features/search/service/types.ts index 282772f4777..80df1640822 100644 --- a/public/app/features/search/service/types.ts +++ b/public/app/features/search/service/types.ts @@ -71,4 +71,5 @@ export interface GrafanaSearcher { starred: (query: SearchQuery) => Promise; tags: (query: SearchQuery) => Promise; getSortOptions: () => Promise; + sortPlaceholder?: string; }