From 5de50c70c6764284061ed206904e107104d4e38a Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 22 Oct 2024 14:27:12 -0700
Subject: [PATCH] Fix workspace/request creation race

---
 src-web/hooks/useCreateGrpcRequest.ts | 9 +++++++--
 src-web/hooks/useCreateHttpRequest.ts | 9 +++++++--
 src-web/hooks/useCreateWorkspace.ts   | 7 ++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src-web/hooks/useCreateGrpcRequest.ts b/src-web/hooks/useCreateGrpcRequest.ts
index 4a9f4d2d..fdc177bb 100644
--- a/src-web/hooks/useCreateGrpcRequest.ts
+++ b/src-web/hooks/useCreateGrpcRequest.ts
@@ -19,7 +19,7 @@ export function useCreateGrpcRequest() {
     Partial<Pick<GrpcRequest, 'name' | 'sortPriority' | 'folderId'>>
   >({
     mutationKey: ['create_grpc_request'],
-    mutationFn: (patch) => {
+    mutationFn: async (patch) => {
       if (workspace === null) {
         throw new Error("Cannot create grpc request when there's no active workspace");
       }
@@ -33,11 +33,16 @@ export function useCreateGrpcRequest() {
         }
       }
       patch.folderId = patch.folderId || activeRequest?.folderId;
-      return invokeCmd('cmd_create_grpc_request', {
+      const request = await invokeCmd<GrpcRequest>('cmd_create_grpc_request', {
         workspaceId: workspace.id,
         name: '',
         ...patch,
       });
+
+      // Give some time for the workspace to sync to the local store
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      return request;
     },
     onSettled: () => trackEvent('grpc_request', 'create'),
     onSuccess: async (request) => {
diff --git a/src-web/hooks/useCreateHttpRequest.ts b/src-web/hooks/useCreateHttpRequest.ts
index 2fabe999..13693895 100644
--- a/src-web/hooks/useCreateHttpRequest.ts
+++ b/src-web/hooks/useCreateHttpRequest.ts
@@ -15,7 +15,7 @@ export function useCreateHttpRequest() {
 
   return useMutation<HttpRequest, unknown, Partial<HttpRequest>>({
     mutationKey: ['create_http_request'],
-    mutationFn: (patch = {}) => {
+    mutationFn: async (patch = {}) => {
       if (workspace === null) {
         throw new Error("Cannot create request when there's no active workspace");
       }
@@ -29,9 +29,14 @@ export function useCreateHttpRequest() {
         }
       }
       patch.folderId = patch.folderId || activeRequest?.folderId;
-      return invokeCmd('cmd_create_http_request', {
+      const request = await invokeCmd<HttpRequest>('cmd_create_http_request', {
         request: { workspaceId: workspace.id, ...patch },
       });
+
+      // Give some time for the workspace to sync to the local store
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      return request;
     },
     onSettled: () => trackEvent('http_request', 'create'),
     onSuccess: async (request) => {
diff --git a/src-web/hooks/useCreateWorkspace.ts b/src-web/hooks/useCreateWorkspace.ts
index 61ebf3d1..7b8c8179 100644
--- a/src-web/hooks/useCreateWorkspace.ts
+++ b/src-web/hooks/useCreateWorkspace.ts
@@ -18,7 +18,12 @@ export function useCreateWorkspace() {
         placeholder: 'My Workspace',
         confirmText: 'Create',
       });
-      return invokeCmd('cmd_create_workspace', { name });
+      const workspace = await invokeCmd<Workspace>('cmd_create_workspace', { name });
+
+      // Give some time for the workspace to sync to the local store
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      return workspace;
     },
     onSuccess: async (workspace) => {
       routes.navigate('workspace', { workspaceId: workspace.id });