Merge pull request #2878 from andrewbaldwin44/bugfix/chart-fix

Webui Remove chart initial data fetch
locustio · Aug 30, 2024 · b65dd78 · b65dd78
2 parents 4e29bf6 + cd1ec17
commit b65dd78
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/locust/webui/src/hooks/tests/useFetchStats.test.tsx b/locust/webui/src/hooks/tests/useFetchStats.test.tsx
@@ -1,4 +1,4 @@
-import { act, waitFor } from '@testing-library/react';
+import { act } from '@testing-library/react';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import { beforeAll, afterEach, afterAll, describe, expect, test, vi } from 'vitest';
@@ -23,27 +23,32 @@ function MockHook() {
 }
 
 describe('useFetchStats', () => {
-  beforeAll(() => server.listen());
+  beforeAll(() => {
+    server.listen();
+    vi.useFakeTimers();
+  });
   afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
+  afterAll(() => {
+    server.close();
+    vi.useRealTimers();
+  });
 
   test('should fetch request stats and update UI accordingly', async () => {
     const { store } = renderWithProvider(<MockHook />, {
       swarm: { state: SWARM_STATE.RUNNING },
     });
 
-    await waitFor(() => {
-      if (!store.getState().ui.stats.length) {
-        throw new Error();
-      }
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(2000);
+    });
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(2000);
     });
 
     expect(store.getState().ui.stats).toEqual(statsResponseTransformed.stats);
   });
 
   test('should add markers to charts between tests', async () => {
-    vi.useFakeTimers();
-
     const testStopTime = new Date().toISOString();
 
     const { store } = renderWithProvider(<MockHook />, {
@@ -62,6 +67,9 @@ describe('useFetchStats', () => {
       store.dispatch(swarmActions.setSwarm({ state: SWARM_STATE.RUNNING }));
     });
 
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(2000);
+    });
     await act(async () => {
       await vi.advanceTimersByTimeAsync(2000);
     });

diff --git a/locust/webui/src/hooks/useFetchStats.ts b/locust/webui/src/hooks/useFetchStats.ts
@@ -17,7 +17,6 @@ export default function useFetchStats() {
   const updateChartMarkers = useAction(uiActions.updateChartMarkers);
   const swarm = useSelector(({ swarm }) => swarm);
   const previousSwarmState = useRef(swarm.state);
-  const hasSetInitStats = useRef(false);
   const [shouldAddMarker, setShouldAddMarker] = useState(false);
 
   const { data: statsData, refetch: refetchStats } = useGetStatsQuery();
@@ -89,17 +88,6 @@ export default function useFetchStats() {
     }
   }, [statsData && statsData.state]);
 
-  useEffect(() => {
-    if (statsData) {
-      if (!hasSetInitStats.current) {
-        // handle setting stats on first load
-        updateStats();
-      }
-
-      hasSetInitStats.current = true;
-    }
-  }, [statsData]);
-
   useInterval(updateStats, STATS_REFETCH_INTERVAL, {
     shouldRunInterval: !!statsData && shouldRunRefetchInterval,
   });