Fix active cookie jar and improve routing

src-web/hooks/useActiveCookieJar.ts

@@ -18,6 +18,8 @@ export function useActiveCookieJar() {
 export function useEnsureActiveCookieJar() {
   const cookieJars = useCookieJars();
   const [activeCookieJarId, setActiveCookieJarId] = useActiveCookieJarId();
+
+  // Set the active cookie jar to the first one, if none set
   useEffect(() => {
     if (cookieJars == null) return; // Hasn't loaded yet
     if (cookieJars.find((j) => j.id === activeCookieJarId)) {

src-web/hooks/useActiveRequestId.ts

@@ -1,7 +1,6 @@
 import { useParams } from 'react-router-dom';
-import type { RouteParamsRequest } from './useAppRoutes';
 
 export function useActiveRequestId(): string | null {
-  const { requestId } = useParams<RouteParamsRequest>();
+  const { requestId } = useParams();
   return requestId ?? null;
 }

src-web/hooks/useActiveWorkspace.ts

@@ -1,7 +1,6 @@
 import type { Workspace } from '@yaakapp-internal/models';
 import { useMemo } from 'react';
 import { useParams } from 'react-router-dom';
-import type { RouteParamsWorkspace } from './useAppRoutes';
 import { useWorkspaces } from './useWorkspaces';
 
 export function useActiveWorkspace(): Workspace | null {
@@ -15,6 +14,6 @@ export function useActiveWorkspace(): Workspace | null {
 }
 
 function useActiveWorkspaceId(): string | null {
-  const { workspaceId } = useParams<RouteParamsWorkspace>();
+  const { workspaceId } = useParams();
   return workspaceId ?? null;
 }

src-web/hooks/useAppRoutes.tsx

@@ -1,22 +1,19 @@
-import type { Environment } from '@yaakapp-internal/models';
 import { useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { QUERY_COOKIE_JAR_ID } from './useActiveCookieJar';
 import { QUERY_ENVIRONMENT_ID } from './useActiveEnvironment';
-import { useActiveRequestId } from './useActiveRequestId';
-import { useActiveWorkspace } from './useActiveWorkspace';
 
 export type RouteParamsWorkspace = {
   workspaceId: string;
-  environmentId?: string;
-  cookieJarId?: string;
+  environmentId: string | null;
+  cookieJarId: string | null;
 };
 
 export type RouteParamsRequest = RouteParamsWorkspace & {
   requestId: string;
 };
 
-export const routePaths = {
+export const paths = {
   workspaces() {
     return '/workspaces';
   },
@@ -52,44 +49,21 @@ export const routePaths = {
 };
 
 export function useAppRoutes() {
-  const activeWorkspace = useActiveWorkspace();
-  const requestId = useActiveRequestId();
   const nav = useNavigate();
 
   const navigate = useCallback(
-    <T extends keyof typeof routePaths>(path: T, ...params: Parameters<(typeof routePaths)[T]>) => {
+    <T extends keyof typeof paths>(path: T, ...params: Parameters<(typeof paths)[T]>) => {
       // Not sure how to make TS work here, but it's good from the
       // outside caller perspective.
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const resolvedPath = routePaths[path](...(params as any));
+      const resolvedPath = paths[path](...(params as any));
       nav(resolvedPath);
     },
     [nav],
   );
 
-  const setEnvironment = useCallback(
-    (environment: Environment | null) => {
-      if (activeWorkspace == null) {
-        navigate('workspaces');
-      } else if (requestId == null) {
-        navigate('workspace', {
-          workspaceId: activeWorkspace.id,
-          environmentId: environment == null ? undefined : environment.id,
-        });
-      } else {
-        navigate('request', {
-          workspaceId: activeWorkspace.id,
-          environmentId: environment == null ? undefined : environment.id,
-          requestId,
-        });
-      }
-    },
-    [navigate, activeWorkspace, requestId],
-  );
-
   return {
-    paths: routePaths,
+    paths,
     navigate,
-    setEnvironment,
   };
 }

src-web/hooks/useCreateGrpcRequest.ts

@@ -3,6 +3,7 @@ import type { GrpcRequest } from '@yaakapp-internal/models';
 import {useSetAtom} from "jotai";
 import { trackEvent } from '../lib/analytics';
 import { invokeCmd } from '../lib/tauri';
+import {useActiveCookieJar} from "./useActiveCookieJar";
 import { useActiveEnvironment } from './useActiveEnvironment';
 import { useActiveRequest } from './useActiveRequest';
 import { useActiveWorkspace } from './useActiveWorkspace';
@@ -13,6 +14,7 @@ import {updateModelList} from "./useSyncModelStores";
 export function useCreateGrpcRequest() {
   const workspace = useActiveWorkspace();
   const [activeEnvironment] = useActiveEnvironment();
+  const [activeCookieJar] = useActiveCookieJar();
   const activeRequest = useActiveRequest();
   const routes = useAppRoutes();
   const setGrpcRequests = useSetAtom(grpcRequestsAtom);
@@ -51,7 +53,8 @@ export function useCreateGrpcRequest() {
       routes.navigate('request', {
         workspaceId: request.workspaceId,
         requestId: request.id,
-        environmentId: activeEnvironment?.id,
+        environmentId: activeEnvironment?.id ?? null,
+        cookieJarId: activeCookieJar?.id ?? null,
       });
     },
   });

src-web/hooks/useCreateHttpRequest.ts

@@ -3,6 +3,7 @@ import type { HttpRequest } from '@yaakapp-internal/models';
 import { useSetAtom } from 'jotai/index';
 import { trackEvent } from '../lib/analytics';
 import { invokeCmd } from '../lib/tauri';
+import { useActiveCookieJar } from './useActiveCookieJar';
 import { useActiveEnvironment } from './useActiveEnvironment';
 import { useActiveRequest } from './useActiveRequest';
 import { useActiveWorkspace } from './useActiveWorkspace';
@@ -13,6 +14,7 @@ import { updateModelList } from './useSyncModelStores';
 export function useCreateHttpRequest() {
   const workspace = useActiveWorkspace();
   const [activeEnvironment] = useActiveEnvironment();
+  const [activeCookieJar] = useActiveCookieJar();
   const activeRequest = useActiveRequest();
   const routes = useAppRoutes();
   const setHttpRequests = useSetAtom(httpRequestsAtom);
@@ -25,7 +27,7 @@ export function useCreateHttpRequest() {
       }
       if (patch.sortPriority === undefined) {
         if (activeRequest != null) {
-          // Place above currently-active request
+          // Place above currently active request
           patch.sortPriority = activeRequest.sortPriority - 0.0001;
         } else {
           // Place at the very top
@@ -45,7 +47,8 @@ export function useCreateHttpRequest() {
       routes.navigate('request', {
         workspaceId: request.workspaceId,
         requestId: request.id,
-        environmentId: activeEnvironment?.id,
+        environmentId: activeEnvironment?.id ?? null,
+        cookieJarId: activeCookieJar?.id ?? null,
       });
     },
   });

src-web/hooks/useCreateWorkspace.ts

@@ -4,7 +4,7 @@ import { useSetAtom } from 'jotai/index';
 import { invokeCmd } from '../lib/tauri';
 import { useAppRoutes } from './useAppRoutes';
 import { usePrompt } from './usePrompt';
-import {updateModelList} from "./useSyncModelStores";
+import { updateModelList } from './useSyncModelStores';
 import { workspacesAtom } from './useWorkspaces';
 
 export function useCreateWorkspace() {
@@ -34,7 +34,11 @@ export function useCreateWorkspace() {
       // Optimistic update
       setWorkspaces(updateModelList(workspace));
 
-      routes.navigate('workspace', { workspaceId: workspace.id });
+      routes.navigate('workspace', {
+        workspaceId: workspace.id,
+        environmentId: null,
+        cookieJarId: null,
+      });
     },
   });
 }

src-web/hooks/useDuplicateGrpcRequest.ts

@@ -2,6 +2,7 @@ import { useMutation } from '@tanstack/react-query';
 import type { GrpcRequest } from '@yaakapp-internal/models';
 import { trackEvent } from '../lib/analytics';
 import { invokeCmd } from '../lib/tauri';
+import {useActiveCookieJar} from "./useActiveCookieJar";
 import { useActiveEnvironment } from './useActiveEnvironment';
 import { useActiveWorkspace } from './useActiveWorkspace';
 import { useAppRoutes } from './useAppRoutes';
@@ -16,6 +17,7 @@ export function useDuplicateGrpcRequest({
 }) {
   const activeWorkspace = useActiveWorkspace();
   const [activeEnvironment] = useActiveEnvironment();
+  const [activeCookieJar] = useActiveCookieJar();
   const routes = useAppRoutes();
 
   return useMutation<GrpcRequest, string>({
@@ -36,7 +38,8 @@ export function useDuplicateGrpcRequest({
         routes.navigate('request', {
           workspaceId: activeWorkspace.id,
           requestId: request.id,
-          environmentId: activeEnvironment?.id,
+          environmentId: activeEnvironment?.id ?? null,
+          cookieJarId: activeCookieJar?.id ?? null,
         });
       }
     },

src-web/hooks/useDuplicateHttpRequest.ts

@@ -2,6 +2,7 @@ import { useMutation } from '@tanstack/react-query';
 import type { HttpRequest } from '@yaakapp-internal/models';
 import { trackEvent } from '../lib/analytics';
 import { invokeCmd } from '../lib/tauri';
+import {useActiveCookieJar} from "./useActiveCookieJar";
 import { useActiveEnvironment } from './useActiveEnvironment';
 import { useActiveWorkspace } from './useActiveWorkspace';
 import { useAppRoutes } from './useAppRoutes';
@@ -15,6 +16,7 @@ export function useDuplicateHttpRequest({
 }) {
   const activeWorkspace = useActiveWorkspace();
   const [activeEnvironment] = useActiveEnvironment();
+  const [activeCookieJar] = useActiveCookieJar();
   const routes = useAppRoutes();
   return useMutation<HttpRequest, string>({
     mutationKey: ['duplicate_http_request', id],
@@ -28,7 +30,8 @@ export function useDuplicateHttpRequest({
         routes.navigate('request', {
           workspaceId: activeWorkspace.id,
           requestId: request.id,
-          environmentId: activeEnvironment?.id,
+          environmentId: activeEnvironment?.id ?? null,
+          cookieJarId: activeCookieJar?.id ?? null,
         });
       }
     },

src-web/hooks/useImportData.tsx

@@ -66,7 +66,8 @@ export function useImportData() {
     if (importedWorkspace != null) {
       routes.navigate('workspace', {
         workspaceId: importedWorkspace.id,
-        environmentId: imported.environments[0]?.id,
+        environmentId: imported.environments[0]?.id ?? null,
+        cookieJarId: null,
       });
     }
 

src-web/hooks/useOpenSettings.tsx

@@ -12,7 +12,11 @@ export function useOpenSettings() {
       if (workspace == null) return;
 
       await invokeCmd('cmd_new_child_window', {
-        url: routes.paths.workspaceSettings({ workspaceId: workspace.id }),
+        url: routes.paths.workspaceSettings({
+          workspaceId: workspace.id,
+          cookieJarId: null,
+          environmentId: null,
+        }),
         label: 'settings',
         title: 'Yaak Settings',
         innerSize: [600, 550],

src-web/hooks/useOpenWorkspace.ts

@@ -17,9 +17,9 @@ export function useOpenWorkspace() {
       workspaceId: string;
       inNewWindow: boolean;
     }) => {
-      const environmentId = (await getRecentEnvironments(workspaceId))[0];
-      const requestId = (await getRecentRequests(workspaceId))[0];
-      const cookieJarId = (await getRecentCookieJars(workspaceId))[0];
+      const environmentId = (await getRecentEnvironments(workspaceId))[0] ?? null;
+      const requestId = (await getRecentRequests(workspaceId))[0] ?? null;
+      const cookieJarId = (await getRecentCookieJars(workspaceId))[0] ?? null;
       const baseArgs = { workspaceId, environmentId, cookieJarId } as const;
       if (inNewWindow) {
         const path =

src-web/hooks/useTemplateFunctions.ts

@@ -13,6 +13,7 @@ export function useTemplateFunctions() {
     // Fetch periodically until functions are returned
     // NOTE: visibilitychange (refetchOnWindowFocus) does not work on Windows, so we'll rely on this logic
     //  to refetch things until that's working again
+    // TODO: Update plugin system to wait for plugins to initialize before sending the first event to them
     refetchInterval: numFns > 0 ? Infinity : 500,
     refetchOnMount: true,
     queryFn: async () => {