diff --git a/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogs.tsx b/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogs.tsx index b40a3d528..5d65592ae 100644 --- a/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogs.tsx +++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogs.tsx @@ -48,9 +48,9 @@ const ExploreLogs: FC = () => { const newPeriod = getPeriod(); setPeriod(newPeriod); - fetchLogs(newPeriod); - fetchLogHits(newPeriod); - + fetchLogs(newPeriod).then((isSuccess) => { + isSuccess && fetchLogHits(newPeriod); + }).catch(e => e); setSearchParamsFromKeys( { query, "g0.range_input": duration, @@ -90,7 +90,7 @@ const ExploreLogs: FC = () => { onRun={handleRunQuery} onChangeMarkdownParsing={handleChangeMarkdownParsing} /> - {isLoading && } + {isLoading && } {error && {error}} {!error && ( = ({ logHits, period, error, isLoading }) = "vm-block_mobile": isMobile, })} > - {isLoading && } + {isLoading && } {!error && noDataMessage && (
{noDataMessage} diff --git a/app/vmui/packages/vmui/src/pages/ExploreLogs/hooks/useFetchLogs.ts b/app/vmui/packages/vmui/src/pages/ExploreLogs/hooks/useFetchLogs.ts index 8f8332c27..2cc9ae47b 100644 --- a/app/vmui/packages/vmui/src/pages/ExploreLogs/hooks/useFetchLogs.ts +++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/hooks/useFetchLogs.ts @@ -52,20 +52,23 @@ export const useFetchLogs = (server: string, query: string, limit: number) => { setError(text); setLogs([]); setIsLoading(prev => ({ ...prev, [id]: false })); - return; + return false; } const lines = text.split("\n").filter(line => line).slice(0, limit); const data = lines.map(parseLineToJSON).filter(line => line) as Logs[]; setLogs(data); + setIsLoading(prev => ({ ...prev, [id]: false })); + return true; } catch (e) { + setIsLoading(prev => ({ ...prev, [id]: false })); if (e instanceof Error && e.name !== "AbortError") { setError(String(e)); console.error(e); setLogs([]); } + return false; } - setIsLoading(prev => ({ ...prev, [id]: false })); }, [url, query, limit]); return {