tidy up

Kong · Jun 18, 2024 · 0a65e7d · 0a65e7d
1 parent 831aa75
commit 0a65e7d
Showing 1 changed file with 6 additions and 27 deletions.
diff --git a/packages/insomnia/src/ui/routes/request.tsx b/packages/insomnia/src/ui/routes/request.tsx
@@ -366,13 +366,8 @@ export const sendAction: ActionFunction = async ({ request, params }) => {
   const { shouldPromptForPathAfterResponse, ignoreUndefinedEnvVariable } = await request.json() as SendActionParams;
   try {
     window.main.startExecution({ requestId });
-    window.main.addExecutionStep({
-      requestId,
-      stepName: 'Executing pre-request script',
-    }
-    );
-
     const requestData = await fetchRequestData(requestId);
+    window.main.addExecutionStep({ requestId, stepName: 'Executing pre-request script' });
     const mutatedContext = await getPreRequestScriptOutput(requestData, workspaceId);
     window.main.completeExecutionStep({ requestId });
     if (mutatedContext === null) {
@@ -382,12 +377,7 @@ export const sendAction: ActionFunction = async ({ request, params }) => {
     const afterResponseScript = `${mutatedContext.request.afterResponseScript}`;
     mutatedContext.request.afterResponseScript = '';
 
-    window.main.addExecutionStep({
-      requestId,
-      stepName: 'Rendering request',
-    }
-    );
-
+    window.main.addExecutionStep({ requestId, stepName: 'Rendering request' });
     const renderedResult = await tryToInterpolateRequest(
       mutatedContext.request,
       mutatedContext.environment,
@@ -397,6 +387,7 @@ export const sendAction: ActionFunction = async ({ request, params }) => {
       ignoreUndefinedEnvVariable,
     );
     const renderedRequest = await tryToTransformRequestWithPlugins(renderedResult);
+    window.main.completeExecutionStep({ requestId });
 
     // TODO: remove this temporary hack to support GraphQL variables in the request body properly
     if (renderedRequest && renderedRequest.body?.text && renderedRequest.body?.mimeType === 'application/graphql') {
@@ -411,13 +402,7 @@ export const sendAction: ActionFunction = async ({ request, params }) => {
       }
     }
 
-    window.main.completeExecutionStep({ requestId });
-    window.main.addExecutionStep({
-      requestId,
-      stepName: 'Sending request',
-    }
-    );
-
+    window.main.addExecutionStep({ requestId, stepName: 'Sending request' });
     const response = await sendCurlAndWriteTimeline(
       renderedRequest,
       mutatedContext.clientCertificates,
@@ -426,25 +411,19 @@ export const sendAction: ActionFunction = async ({ request, params }) => {
       requestData.timelinePath,
       requestData.responseId
     );
+    window.main.completeExecutionStep({ requestId });
 
     const requestMeta = await models.requestMeta.getByParentId(requestId);
     invariant(requestMeta, 'RequestMeta not found');
     const responsePatch = await responseTransform(response, requestData.activeEnvironmentId, renderedRequest, renderedResult.context);
     const is2XXWithBodyPath = responsePatch.statusCode && responsePatch.statusCode >= 200 && responsePatch.statusCode < 300 && responsePatch.bodyPath;
     const shouldWriteToFile = shouldPromptForPathAfterResponse && is2XXWithBodyPath;
 
-    window.main.completeExecutionStep({ requestId });
     mutatedContext.request.afterResponseScript = afterResponseScript;
     if (requestData.request.afterResponseScript) {
-      window.main.addExecutionStep({
-        requestId,
-        stepName: 'Executing after-response script',
-      }
-      );
-
       const baseEnvironment = await models.environment.getOrCreateForParentId(workspaceId);
       const cookieJar = await models.cookieJar.getOrCreateForParentId(workspaceId);
-
+      window.main.addExecutionStep({ requestId, stepName: 'Executing after-response script' });
       const postMutatedContext = await tryToExecuteAfterResponseScript({
         ...requestData,
         ...mutatedContext,