Fix deleting a workspace not updating the view (Kong#6850)

jackkav · Mar 13, 2024 · d5854eb · d5854eb
1 parent f829009
commit d5854eb
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 26 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
@@ -167,7 +167,7 @@
     "react-aria": "3.23.1",
     "react-aria-components": "^1.0.0-alpha.6",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.14.1",
+    "react-router-dom": "^6.19.0",
     "react-stately": "3.21.0",
     "react-use": "^17.4.0",
     "reselect": "^4.1.5",

diff --git a/packages/insomnia/src/ui/context/app/insomnia-event-stream-context.tsx b/packages/insomnia/src/ui/context/app/insomnia-event-stream-context.tsx
@@ -151,7 +151,10 @@ export const InsomniaEventStreamProvider: FC<PropsWithChildren> = ({ children })
                 method: 'POST',
               });
             } else if (event.type === 'FileDeleted' && event.team === organizationId && event.project === remoteId) {
-              revalidate();
+              syncProjectsFetcher.submit({}, {
+                action: `/organization/${organizationId}/sync-projects`,
+                method: 'POST',
+              });
             } else if (['BranchDeleted', 'FileChanged'].includes(event.type) && event.team === organizationId && event.project === remoteId) {
               syncDataFetcher.submit({}, {
                 method: 'POST',

diff --git a/packages/insomnia/src/ui/index.tsx b/packages/insomnia/src/ui/index.tsx
@@ -119,6 +119,7 @@ const router = createMemoryRouter(
         {
           path: 'onboarding/*',
           element: <Onboarding />,
+          errorElement: <ErrorRoute />,
         },
         {
           path: 'onboarding/migrate',

diff --git a/packages/insomnia/src/ui/routes/error.tsx b/packages/insomnia/src/ui/routes/error.tsx
@@ -24,9 +24,10 @@ export const ErrorRoute: FC = () => {
     return err?.message || 'Unknown error';
   };
   const getErrorStack = (err: any) => {
-    if (isRouteErrorResponse(err)) {
+    if ('error' in err) {
       return err.error?.stack;
     }
+
     return err?.stack;
   };
 

diff --git a/packages/insomnia/src/ui/routes/remote-collections.tsx b/packages/insomnia/src/ui/routes/remote-collections.tsx
@@ -1,4 +1,4 @@
-import { ActionFunction, LoaderFunction } from 'react-router-dom';
+import { ActionFunction, LoaderFunction, redirect } from 'react-router-dom';
 
 import { database, Operation } from '../../common/database';
 import { isNotNullOrUndefined } from '../../common/misc';
@@ -267,7 +267,9 @@ export const syncDataLoader: LoaderFunction = async ({ params }): Promise<SyncDa
 };
 
 export const checkoutBranchAction: ActionFunction = async ({ request, params }) => {
-  const { workspaceId } = params;
+  const { organizationId, projectId, workspaceId } = params;
+  invariant(typeof organizationId === 'string', 'Organization Id is required');
+  invariant(typeof projectId === 'string', 'Project Id is required');
   invariant(typeof workspaceId === 'string', 'Workspace Id is required');
   const formData = await request.formData();
   const branch = formData.get('branch');
@@ -285,7 +287,7 @@ export const checkoutBranchAction: ActionFunction = async ({ request, params })
     };
   }
 
-  return {};
+  return redirect(`/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/debug`);
 };
 
 export const mergeBranchAction: ActionFunction = async ({ request, params }) => {

diff --git a/packages/insomnia/src/ui/routes/workspace.tsx b/packages/insomnia/src/ui/routes/workspace.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { LoaderFunction, Outlet, useLoaderData } from 'react-router-dom';
+import { LoaderFunction, Outlet } from 'react-router-dom';
 
 import { isLoggedIn } from '../../account/session';
 import { SortOrder } from '../../common/constants';
@@ -256,9 +256,7 @@ export const workspaceLoader: LoaderFunction = async ({
 };
 
 const WorkspaceRoute = () => {
-  const workspaceData = useLoaderData() as WorkspaceLoaderData;
-  const branch = workspaceData.activeWorkspaceMeta.cachedGitRepositoryBranch;
-  return <Outlet key={branch} />;
+  return <Outlet />;
 };
 
 export default WorkspaceRoute;