Fix workspace creation, reveal sync dir, and don't update timestamps on sync/import

src-web/commands/commands.tsx

@@ -1,4 +1,4 @@
-import type { Folder, Workspace } from '@yaakapp-internal/models';
+import type { Folder } from '@yaakapp-internal/models';
 import { applySync, calculateSync } from '@yaakapp-internal/sync';
 import { Banner } from '../components/core/Banner';
 import { InlineCode } from '../components/core/InlineCode';
@@ -10,21 +10,8 @@ import { showConfirm } from '../lib/confirm';
 import { fallbackRequestName } from '../lib/fallbackRequestName';
 import { pluralizeCount } from '../lib/pluralize';
 import { showPrompt } from '../lib/prompt';
-import { router } from '../lib/router';
 import { invokeCmd } from '../lib/tauri';
 
-export const createWorkspace = createFastMutation<Workspace, void, Partial<Workspace>>({
-  mutationKey: ['create_workspace'],
-  mutationFn: (patch) => invokeCmd<Workspace>('cmd_update_workspace', { workspace: patch }),
-  onSuccess: async (workspace) => {
-    await router.navigate({
-      to: '/workspaces/$workspaceId',
-      params: { workspaceId: workspace.id },
-    });
-  },
-  onSettled: () => trackEvent('workspace', 'create'),
-});
-
 export const createFolder = createFastMutation<
   Folder | null,
   void,
@@ -66,8 +53,10 @@ export const syncWorkspace = createFastMutation<
   mutationFn: async ({ workspaceId, syncDir }) => {
     const ops = (await calculateSync(workspaceId, syncDir)) ?? [];
     if (ops.length === 0) {
+      console.log('Nothing to sync', workspaceId, syncDir, ops);
       return;
     }
+    console.log('syncing workspace', workspaceId, syncDir, ops);
 
     const dbOps = ops.filter((o) => o.type.startsWith('db'));
 

src-web/commands/openWorkspaceFromSyncDir.tsx

@@ -4,7 +4,7 @@ import { createFastMutation } from '../hooks/useFastMutation';
 import { showSimpleAlert } from '../lib/alert';
 import { router } from '../lib/router';
 
-export const openWorkspace = createFastMutation({
+export const openWorkspaceFromSyncDir = createFastMutation({
   mutationKey: [],
   mutationFn: async () => {
     const dir = await open({

src-web/commands/switchWorkspace.tsx

@@ -0,0 +1,42 @@
+import { createFastMutation } from '../hooks/useFastMutation';
+import { getRecentCookieJars } from '../hooks/useRecentCookieJars';
+import { getRecentEnvironments } from '../hooks/useRecentEnvironments';
+import { getRecentRequests } from '../hooks/useRecentRequests';
+import { router } from '../lib/router';
+import { invokeCmd } from '../lib/tauri';
+
+export const switchWorkspace = createFastMutation({
+  mutationKey: ['open_workspace'],
+  mutationFn: async ({
+    workspaceId,
+    inNewWindow,
+  }: {
+    workspaceId: string;
+    inNewWindow: boolean;
+  }) => {
+    const environmentId = (await getRecentEnvironments(workspaceId))[0] ?? undefined;
+    const requestId = (await getRecentRequests(workspaceId))[0] ?? undefined;
+    const cookieJarId = (await getRecentCookieJars(workspaceId))[0] ?? undefined;
+    const search = {
+      environment_id: environmentId,
+      cookie_jar_id: cookieJarId,
+      request_id: requestId,
+    };
+
+    if (inNewWindow) {
+      const location = router.buildLocation({
+        to: '/workspaces/$workspaceId',
+        params: { workspaceId },
+        search,
+      });
+      await invokeCmd<void>('cmd_new_main_window', { url: location.href });
+      return;
+    }
+
+    await router.navigate({
+      to: '/workspaces/$workspaceId',
+      params: { workspaceId },
+      search,
+    });
+  },
+});

src-web/commands/upsertWorkspace.ts

@@ -0,0 +1,19 @@
+import type { Workspace } from '@yaakapp-internal/models';
+import { createFastMutation } from '../hooks/useFastMutation';
+import { trackEvent } from '../lib/analytics';
+import { invokeCmd } from '../lib/tauri';
+
+export const upsertWorkspace = createFastMutation<
+  Workspace,
+  void,
+  Workspace | Partial<Omit<Workspace, 'id'>>
+>({
+  mutationKey: ['upsert_workspace'],
+  mutationFn: (workspace) => invokeCmd<Workspace>('cmd_update_workspace', { workspace }),
+  onSuccess: async (workspace) => {
+    const isNew = workspace.createdAt == workspace.updatedAt;
+
+    if (isNew) trackEvent('workspace', 'create');
+    else trackEvent('workspace', 'update');
+  },
+});

src-web/commands/upsertWorkspaceMeta.ts

@@ -7,7 +7,7 @@ import { invokeCmd } from '../lib/tauri';
 export const upsertWorkspaceMeta = createFastMutation<
   WorkspaceMeta,
   unknown,
-  Partial<WorkspaceMeta>
+  WorkspaceMeta | (Partial<Omit<WorkspaceMeta, 'id'>> & { workspaceId: string })
 >({
   mutationKey: ['update_workspace_meta'],
   mutationFn: async (patch) => {