Merge pull request #2914 from fletelli42/url-in-template-arg

Url in template arg

locust/web.py

@@ -629,7 +629,7 @@ def update_template_args(self):
             else None
         )
 
-        self.template_args = {
+        new_template_args = {
             "locustfile": self.environment.locustfile,
             "state": self.environment.runner.state,
             "is_distributed": is_distributed,
@@ -658,6 +658,8 @@ def update_template_args(self):
             "percentiles_to_statistics": stats_module.PERCENTILES_TO_STATISTICS,
         }
 
+        self.template_args = {**self.template_args, **new_template_args}
+
     def _update_shape_class(self, shape_class_name):
         if shape_class_name:
             shape_class = self.environment.available_shape_classes[shape_class_name]

locust/webui/src/global.d.ts

@@ -1,13 +1,5 @@
-import { PaletteMode } from '@mui/material';
-
-import type { ISwarmState } from 'redux/slice/swarm.slice';
-import { IAuthArgs } from 'types/auth.types';
-import { IReportTemplateArgs } from 'types/swarm.types';
+import { IWindow } from 'types/window.types';
 
 declare global {
-  interface Window {
-    templateArgs: IReportTemplateArgs | ISwarmState;
-    authArgs: IAuthArgs;
-    theme?: PaletteMode;
-  }
+  interface Window extends IWindow {}
 }

locust/webui/src/lib.tsx

@@ -27,7 +27,7 @@ export { tabConfig } from 'components/Tabs/Tabs.constants';
 export { store as locustStore } from 'redux/store';
 
 export type { IRootState } from 'redux/store';
-
+export type { IWindow } from 'types/window.types';
 export type { ITab } from 'types/tab.types';
 
 export interface IExtendedTableStructure<StatKey> {

locust/webui/src/types/window.types.ts

@@ -0,0 +1,11 @@
+import { PaletteMode } from '@mui/material';
+
+import type { ISwarmState } from 'redux/slice/swarm.slice';
+import { IAuthArgs } from 'types/auth.types';
+import { IReportTemplateArgs } from 'types/swarm.types';
+
+export interface IWindow {
+  templateArgs: IReportTemplateArgs | ISwarmState;
+  authArgs: IAuthArgs;
+  theme?: PaletteMode;
+}