Search/ActionRow: drill placeholder to SortPicker (#56475)

This commit is contained in:
Leon Sorokin
2022-10-13 13:30:20 -06:00
committed by GitHub
parent 145b970557
commit 5acda40248
3 changed files with 11 additions and 1 deletions
@@ -26,6 +26,7 @@ interface Props {
onTagFilterChange: (tags: string[]) => void; onTagFilterChange: (tags: string[]) => void;
getTagOptions: () => Promise<TermCount[]>; getTagOptions: () => Promise<TermCount[]>;
getSortOptions: () => Promise<SelectableValue[]>; getSortOptions: () => Promise<SelectableValue[]>;
sortPlaceholder?: string;
onDatasourceChange: (ds?: string) => void; onDatasourceChange: (ds?: string) => void;
includePanels: boolean; includePanels: boolean;
setIncludePanels: (v: boolean) => void; setIncludePanels: (v: boolean) => void;
@@ -57,6 +58,7 @@ export const ActionRow: FC<Props> = ({
onTagFilterChange, onTagFilterChange,
getTagOptions, getTagOptions,
getSortOptions, getSortOptions,
sortPlaceholder,
onDatasourceChange, onDatasourceChange,
query, query,
showStarredFilter, showStarredFilter,
@@ -116,7 +118,13 @@ export const ActionRow: FC<Props> = ({
value={layout} value={layout}
/> />
)} )}
<SortPicker onChange={onSortChange} value={query.sort?.value} getSortOptions={getSortOptions} isClearable /> <SortPicker
onChange={onSortChange}
value={query.sort?.value}
getSortOptions={getSortOptions}
placeholder={sortPlaceholder}
isClearable
/>
</HorizontalGroup> </HorizontalGroup>
</div> </div>
</div> </div>
@@ -337,6 +337,7 @@ export const SearchView = ({
onTagFilterChange={onTagFilterChange} onTagFilterChange={onTagFilterChange}
getTagOptions={getTagOptions} getTagOptions={getTagOptions}
getSortOptions={getGrafanaSearcher().getSortOptions} getSortOptions={getGrafanaSearcher().getSortOptions}
sortPlaceholder={getGrafanaSearcher().sortPlaceholder}
onDatasourceChange={onDatasourceChange} onDatasourceChange={onDatasourceChange}
query={query} query={query}
includePanels={includePanels!} includePanels={includePanels!}
@@ -71,4 +71,5 @@ export interface GrafanaSearcher {
starred: (query: SearchQuery) => Promise<QueryResponse>; starred: (query: SearchQuery) => Promise<QueryResponse>;
tags: (query: SearchQuery) => Promise<TermCount[]>; tags: (query: SearchQuery) => Promise<TermCount[]>;
getSortOptions: () => Promise<SelectableValue[]>; getSortOptions: () => Promise<SelectableValue[]>;
sortPlaceholder?: string;
} }