opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 16:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Refactor Search out-of-order fix (#68445)

Browse Source
This commit is contained in:
Josh Hunt
2023-05-18 16:14:59 +01:00
committed by GitHub
parent 560f49b3dc
commit 9e4b532979
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/commandPalette/actions/dashboardActions.ts
View File

@ -83,7 +83,7 @@ export async function getSearchResultActions(searchQuery: string): Promise<Comma
export function useSearchResults(searchQuery: string, isShowing: boolean) {
const [searchResults, setSearchResults] = useState<CommandPaletteAction[]>([]);
const [isFetchingSearchResults, setIsFetchingSearchResults] = useState(false);
const lastRequestTimestamp = useRef<number>();
const lastSearchTimestamp = useRef<number>(0);
// Hit dashboards API
useEffect(() => {
@ -91,19 +91,20 @@ export function useSearchResults(searchQuery: string, isShowing: boolean) {
if (isShowing && searchQuery.length > 0) {
setIsFetchingSearchResults(true);
debouncedSearch(searchQuery).then((resultActions) => {
// Only update the state if this is the most recent request
// We don't need to worry about clearing the isFetching state either
// If there's a later request in progress, this will clear it for us
if (!lastRequestTimestamp.current || timestamp > lastRequestTimestamp.current) {
// Only keep the results if it's was issued after the most recently resolved search.
// This prevents results showing out of order if first request is slower than later ones.
// We don't need to worry about clearing the isFetching state either - if there's a later
// request in progress, this will clear it for us
if (timestamp > lastSearchTimestamp.current) {
setSearchResults(resultActions);
setIsFetchingSearchResults(false);
lastRequestTimestamp.current = timestamp;
lastSearchTimestamp.current = timestamp;
}
});
} else {
setSearchResults([]);
setIsFetchingSearchResults(false);
lastRequestTimestamp.current = timestamp;
lastSearchTimestamp.current = timestamp;
}
}, [isShowing, searchQuery]);