Update swarm state with spawnRate and numUsers

andrewbaldwin44 · Jan 8, 2024 · 4c4b79b · 4c4b79b
1 parent fe47974
commit 4c4b79b
Show file tree

Hide file tree

Showing 6 changed files with 251 additions and 259 deletions.
diff --git a/locust/webui/dist/assets/index-01afe4fa.js b/locust/webui/dist/assets/index-01afe4fa.js
diff --git a/locust/webui/dist/assets/index-d4b87b54.js b/locust/webui/dist/assets/index-d4b87b54.js
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-01afe4fa.js"></script>
+    <script type="module" crossorigin src="/assets/index-d4b87b54.js"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/locust/webui/src/components/SwarmForm/SwarmEditForm.tsx b/locust/webui/src/components/SwarmForm/SwarmEditForm.tsx
@@ -6,13 +6,13 @@ import { useStartSwarmMutation } from 'redux/api/swarm';
 import { ISwarmState } from 'redux/slice/swarm.slice';
 import { IRootState } from 'redux/store';
 
-type ISwarmFormInput = Pick<ISwarmState, 'spawnRate' | 'userCount'>;
+type ISwarmFormInput = Pick<ISwarmState, 'spawnRate' | 'numUsers'>;
 
 interface ISwarmForm extends ISwarmFormInput {
   onSubmit: () => void;
 }
 
-function SwarmEditForm({ onSubmit, spawnRate, userCount }: ISwarmForm) {
+function SwarmEditForm({ onSubmit, numUsers, spawnRate }: ISwarmForm) {
   const [startSwarm] = useStartSwarmMutation();
 
   const onEditSwarm = (inputData: ISwarmFormInput) => {
@@ -28,7 +28,7 @@ function SwarmEditForm({ onSubmit, spawnRate, userCount }: ISwarmForm) {
       <Form<ISwarmFormInput> onSubmit={onEditSwarm}>
         <Box sx={{ my: 2, display: 'flex', flexDirection: 'column', rowGap: 4 }}>
           <TextField
-            defaultValue={userCount || 1}
+            defaultValue={numUsers || 1}
             label='Number of users (peak concurrency)'
             name='userCount'
           />
@@ -48,9 +48,9 @@ function SwarmEditForm({ onSubmit, spawnRate, userCount }: ISwarmForm) {
   );
 }
 
-const storeConnector = ({ swarm: { spawnRate, userCount } }: IRootState) => ({
+const storeConnector = ({ swarm: { spawnRate, numUsers } }: IRootState) => ({
   spawnRate,
-  userCount,
+  numUsers,
 });
 
 export default connect(storeConnector)(SwarmEditForm);
diff --git a/locust/webui/src/components/SwarmForm/SwarmForm.tsx b/locust/webui/src/components/SwarmForm/SwarmForm.tsx
@@ -62,7 +62,13 @@ function SwarmForm({
   const [startSwarm] = useStartSwarmMutation();
 
   const onStartSwarm = (inputData: ISwarmFormInput) => {
-    setSwarm({ state: SWARM_STATE.RUNNING, host: inputData.host || host });
+    setSwarm({
+      state: SWARM_STATE.RUNNING,
+      host: inputData.host || host,
+      runTime: inputData.runTime,
+      spawnRate: Number(inputData.spawnRate) || null,
+      numUsers: Number(inputData.userCount) || null,
+    });
 
     startSwarm(inputData);
   };
@@ -85,7 +91,6 @@ function SwarmForm({
               <Select label='Shape Class' name='shapeClass' options={availableShapeClasses} />
             </>
           )}
-
           <TextField
             defaultValue={(isShape && '-') || numUsers || 1}
             disabled={!!isShape}

diff --git a/locust/webui/src/redux/slice/swarm.slice.ts b/locust/webui/src/redux/slice/swarm.slice.ts
@@ -21,7 +21,7 @@ export interface ISwarmState {
   numUsers: number | null;
   overrideHostWarning: boolean;
   percentilesToChart: number[];
-  runTime?: number;
+  runTime?: string | number;
   showUserclassPicker: boolean;
   spawnRate: number | null;
   state: string;