fix: Count call on timeRange change

parseablehq · Jan 8, 2025 · fa78d0c · fa78d0c
1 parent 9755746
commit fa78d0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/pages/Stream/Views/Explore/useLogsFetcher.ts b/src/pages/Stream/Views/Explore/useLogsFetcher.ts
@@ -15,15 +15,14 @@ const useLogsFetcher = (props: { isStoreSyncing: boolean }) => {
 	const { currentOffset, currentPage, pageData, totalCount } = tableOpts;
 	const { getQueryData, loading: logsLoading, error: errorMessage } = useQueryLogs();
 
-	const { refetchCount, isCountLoading, isCountRefetching } = useFetchCount();
+	const { isCountLoading, isCountRefetching } = useFetchCount();
 	const hasContentLoaded = !isCountLoading && !logsLoading && !isCountRefetching;
 	const hasNoData = hasContentLoaded && !errorMessage && pageData.length === 0;
 	const showTable = hasContentLoaded && !hasNoData && !errorMessage;
 
 	useEffect(() => {
 		setAppStore(syncTimeRange);
 		setLogsStore(setCleanStoreForStreamChange);
-		refetchCount();
 	}, [currentStream]);
 
 	useEffect(() => {

diff --git a/src/pages/Stream/index.tsx b/src/pages/Stream/index.tsx
@@ -15,6 +15,7 @@ import { useParams } from 'react-router-dom';
 import { STREAM_VIEWS } from '@/constants/routes';
 import LogsView from './Views/Explore/LogsView';
 import useParamsController from './hooks/useParamsController';
+import { useFetchCount } from '@/hooks/useQueryResult';
 
 const { streamChangeCleanup, toggleSideBar } = streamStoreReducers;
 
@@ -24,18 +25,23 @@ const Stream: FC = () => {
 	const [currentStream] = useAppStore((store) => store.currentStream);
 	const { isStoreSynced } = useParamsController();
 	const [maximized] = useAppStore((store) => store.maximized);
+	const [timeRange] = useAppStore((store) => store.timeRange);
 	const [instanceConfig] = useAppStore((store) => store.instanceConfig);
 	const [, setStreamStore] = useStreamStore((store) => store.sideBarOpen);
+	const { refetchCount } = useFetchCount();
 
 	useHotkeys([['mod+/', () => setStreamStore((store) => toggleSideBar(store))]]);
 
 	useEffect(() => {
 		if (isStoreSynced) {
 			if (!_.isEmpty(currentStream)) {
-				if (view === 'explore') setStreamStore(streamChangeCleanup);
+				if (view === 'explore') {
+					setStreamStore(streamChangeCleanup);
+					refetchCount();
+				}
 			}
 		}
-	}, [isStoreSynced, currentStream]);
+	}, [isStoreSynced, currentStream, timeRange]);
 
 	const sideBarWidth = SECONDARY_SIDEBAR_WIDTH;