fix: conflict in rebasing

Kong · Sep 20, 2024 · c4e9528 · c4e9528
1 parent 3775da7
commit c4e9528
Showing 1 changed file with 6 additions and 24 deletions.
diff --git a/packages/insomnia/src/ui/routes/runner.tsx b/packages/insomnia/src/ui/routes/runner.tsx
@@ -92,23 +92,10 @@ async function aggregateAllTimelines(errorMsg: string | null, testResult: Runner
   return timelines;
 }
 
-interface RunnerSettings {
-  iterations: number;
-  delay: number;
-  iterationData: UploadDataType[];
-  file: File | null;
+interface RunnerAdvancedSettings {
   bail: boolean;
 }
 
-// TODO: remove this when the suite management is introduced
-let tempRunnerSettings: RunnerSettings = {
-  iterations: 1,
-  delay: 0,
-  iterationData: [],
-  file: null,
-  bail: true,
-};
-
 export const Runner: FC<{}> = () => {
   const [searchParams, setSearchParams] = useSearchParams();
   const [shouldRefresh, setShouldRefresh] = useState(false);
@@ -143,15 +130,6 @@ export const Runner: FC<{}> = () => {
     setSearchParams({});
   }
 
-  // const [iterations, setIterations] = useState(tempRunnerSettings?.iterations || 1);
-  // const [delay, setDelay] = useState(tempRunnerSettings?.delay || 0);
-  // const [uploadData, setUploadData] = useState<UploadDataType[]>(tempRunnerSettings?.iterationData || []);
-  // const [file, setFile] = useState<File | null>(tempRunnerSettings?.file || null);
-  const [runnerAdvancedSettings, setAdvancedRunnerSettings] = useState({
-    bail: tempRunnerSettings?.bail || true as boolean,
-  });
-  const toggleBail = () => setAdvancedRunnerSettings({ ...runnerAdvancedSettings, bail: !runnerAdvancedSettings.bail });
-
   const { organizationId, projectId, workspaceId } = useParams() as {
     organizationId: string;
     projectId: string;
@@ -163,7 +141,11 @@ export const Runner: FC<{}> = () => {
   const [delay, setDelay] = useLocalStorage<number>(localStorageKey + 'delay', { defaultValue: 0 });
   const [uploadData, setUploadData] = useLocalStorage<UploadDataType[]>(localStorageKey + 'iterationData', { defaultValue: [] });
   const [file, setFile] = useLocalStorage<File | null>(localStorageKey + 'file', { defaultValue: null });
+  const [runnerAdvancedSettings, setAdvancedRunnerSettings] = useLocalStorage<RunnerAdvancedSettings>(localStorageKey + 'bail', { defaultValue: { bail: true } });
+  const toggleBail = () => setAdvancedRunnerSettings({ ...runnerAdvancedSettings, bail: !runnerAdvancedSettings.bail });
+
   invariant(iterationCount, 'iterationCount should not be null');
+
   const { settings } = useRootLoaderData();
   const { collection } = useRouteLoaderData(':workspaceId') as WorkspaceLoaderData;
   const [showUploadModal, setShowUploadModal] = useState(false);
@@ -296,7 +278,7 @@ export const Runner: FC<{}> = () => {
         iterationCount,
         userUploadEnvs,
         delay,
-        runnerAdvancedSettings,
+        runnerAdvancedSettings: { ...runnerAdvancedSettings },
       },
       {
         method: 'post',