fix: Use more robust method for creating the Welcome workspace (#176)

Author: BinaryMuse

backend/src/commands/workspaces.rs

@@ -6,13 +6,15 @@ use tauri::{ipc::Channel, path::BaseDirectory, AppHandle, Manager, State};
 use crate::{
     state::AtuinState,
     workspaces::{
-        fs_ops::WorkspaceDirInfo, manager::WorkspaceEvent, offline_runbook::OfflineRunbook,
+        fs_ops::{WorkspaceConfig, WorkspaceDirInfo},
+        manager::WorkspaceEvent,
+        offline_runbook::OfflineRunbook,
         workspace::WorkspaceError,
     },
 };
 
 #[tauri::command]
-pub async fn copy_welcome_workspace(app: AppHandle) -> Result<String, String> {
+pub async fn copy_welcome_workspace(app: AppHandle, id: String) -> Result<String, String> {
     let welcome_path = app
         .path()
         .resolve("resources/welcome", BaseDirectory::Resource)
@@ -39,6 +41,17 @@ pub async fn copy_welcome_workspace(app: AppHandle) -> Result<String, String> {
 
     copy_dir_all(&welcome_path, &target_path).map_err(|e| e.to_string())?;
 
+    // Overwrite the ID in the copied `atuin.toml` file with the given ID
+    let config_path = target_path.join("atuin.toml");
+    let mut config = WorkspaceConfig::from_file(&config_path)
+        .await
+        .map_err(|e| e.to_string())?;
+    config.workspace.id = id;
+    let contents = toml::to_string(&config).map_err(|e| e.to_string())?;
+    tokio::fs::write(config_path, contents)
+        .await
+        .map_err(|e| e.to_string())?;
+
     Ok(target_path.to_string_lossy().to_string())
 }
 

src/lib/workspace_setup.ts

@@ -10,7 +10,6 @@ import { AtuinSharedStateAdapter } from "./shared_state/adapter";
 import { uuidv7 } from "uuidv7";
 import Logger from "./logger";
 import { Rc } from "@binarymuse/ts-stdlib";
-import { createWorkspace } from "./workspaces/commands";
 import { TabIcon } from "@/state/store/ui_state";
 import { invoke } from "@tauri-apps/api/core";
 import { DialogBuilder } from "@/components/Dialogs/dialog";
@@ -57,8 +56,9 @@ export default async function doWorkspaceSetup(): Promise<void> {
       logger.info("Unable to fetch workspaces from server; creating default workspace");
 
       let workspacePath: string | null = null;
+      let welcomeWorkspaceId = uuidv7();
       try {
-        workspacePath = await invoke<string>("copy_welcome_workspace");
+        workspacePath = await invoke<string>("copy_welcome_workspace", { id: welcomeWorkspaceId });
       } catch (err) {
         await new DialogBuilder()
           .title("Failed to create welcome workspace")
@@ -72,14 +72,12 @@ export default async function doWorkspaceSetup(): Promise<void> {
       }
 
       let name = "Welcome to Atuin";
-      let id = uuidv7();
       workspace = new Workspace({
-        id: id,
+        id: welcomeWorkspaceId,
         name: name,
         folder: workspacePath,
         online: 0,
       });
-      await createWorkspace(workspacePath, id, name);
       await workspace.save();
     }