Merge pull request #2573 from andrewbaldwin44/bugfix/fix-spawning

Fix Spwaning State Never Updates to Running
locustio · Jan 30, 2024 · 8af3493 · 8af3493
2 parents a4ab5a4 + 5b5b1d8
commit 8af3493
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 36 deletions.
diff --git a/locust/webui/dist/assets/auth-2586839b.js.map b/locust/webui/dist/assets/auth-2586839b.js.map
diff --git a/locust/webui/dist/assets/auth-5e21717c.js.map b/locust/webui/dist/assets/auth-5e21717c.js.map
diff --git a/locust/webui/dist/assets/index-a83a5dd9.js → locust/webui/dist/assets/index-833f9228.js b/locust/webui/dist/assets/index-a83a5dd9.js → locust/webui/dist/assets/index-833f9228.js
diff --git a/...t/webui/dist/assets/index-a83a5dd9.js.map → ...t/webui/dist/assets/index-833f9228.js.map b/...t/webui/dist/assets/index-a83a5dd9.js.map → ...t/webui/dist/assets/index-833f9228.js.map
diff --git a/locust/webui/dist/auth.html b/locust/webui/dist/auth.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
 
     <title>Locust</title>
-    <script type="module" crossorigin src="/assets/index-a83a5dd9.js"></script>
+    <script type="module" crossorigin src="/assets/index-833f9228.js"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/locust/webui/dist/index.html b/locust/webui/dist/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
 
     <title>Locust</title>
-    <script type="module" crossorigin src="/assets/index-a83a5dd9.js"></script>
+    <script type="module" crossorigin src="/assets/index-833f9228.js"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/locust/webui/src/components/Layout/Navbar/SwarmMonitor.tsx b/locust/webui/src/components/Layout/Navbar/SwarmMonitor.tsx
@@ -30,7 +30,7 @@ function SwarmMonitor({
         <Typography variant='button'>Status</Typography>
         <Typography variant='button'>{state}</Typography>
       </Box>
-      {state === SWARM_STATE.RUNNING && (
+      {(state === SWARM_STATE.RUNNING || state === SWARM_STATE.SPAWNING) && (
         <>
           <Divider flexItem orientation='vertical' />
           <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>

diff --git a/locust/webui/src/hooks/useSwarmUi.ts b/locust/webui/src/hooks/useSwarmUi.ts
@@ -78,10 +78,7 @@ export default function useSwarmUi() {
   };
 
   useEffect(() => {
-    if (
-      statsData &&
-      (statsData.state === SWARM_STATE.STOPPED || statsData.state === SWARM_STATE.SPAWNING)
-    ) {
+    if (statsData) {
       setSwarm({ state: statsData.state });
     }
   }, [statsData && statsData.state]);