diff --git a/TODO.txt b/TODO.txt index 3f8f2da..f27bda7 100644 --- a/TODO.txt +++ b/TODO.txt @@ -219,16 +219,16 @@ Safe deletes: R3. Desktop: real directory + files (Tauri) -------------------------------------------------------------------------------- -[ ] Add "Workspace folder" concept: +[x] Add "Workspace folder" concept: - pick directory - remember last workspace path -[ ] Implement directory listing: +[x] Implement directory listing: - show *.inkfinite.json files in workspace - tree view with folders -[ ] Implement file actions: +[x] Implement file actions: - [x] New: create new file - - [ ] Rename: rename file (Tauri command needed) - - [ ] Delete: delete file (Tauri command needed) + - [x] Rename: rename file (Tauri command needed) + - [x] Delete: delete file (Tauri command needed) - [x] Open: load file into editor - [x] Export: save JSON @@ -239,10 +239,10 @@ R3. Desktop: real directory + files (Tauri) R4. Parity behaviors -------------------------------------------------------------------------------- -[ ] Same shortcuts: +[x] Same shortcuts: - Ctrl/Cmd+O opens file browser - Ctrl/Cmd+N creates board -[ ] Consistent metadata display: +[x] Consistent metadata display: - name + updatedAt in both modes (DoD): diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs index 6dba14f..1f7b5e5 100644 --- a/apps/desktop/src-tauri/src/lib.rs +++ b/apps/desktop/src-tauri/src/lib.rs @@ -1,3 +1,117 @@ +use std::fs; +use std::path::{Path, PathBuf}; +use tauri::AppHandle; + +#[derive(serde::Serialize, serde::Deserialize)] +pub struct FileEntry { + pub path: String, + pub name: String, + pub is_dir: bool, +} + +/// Read directory contents and return matching files +#[tauri::command] +fn read_directory(directory: String, pattern: Option) -> Result, String> { + let path = Path::new(&directory); + if !path.exists() { + return Err(format!("Directory does not exist: {}", directory)); + } + if !path.is_dir() { + return Err(format!("Path is not a directory: {}", directory)); + } + + let entries = fs::read_dir(path).map_err(|e| format!("Failed to read directory: {}", e))?; + + let mut results = Vec::new(); + let pattern = pattern.unwrap_or_else(|| "*.inkfinite.json".to_string()); + + for entry in entries { + let entry = entry.map_err(|e| format!("Failed to read entry: {}", e))?; + let entry_path = entry.path(); + let metadata = entry + .metadata() + .map_err(|e| format!("Failed to read metadata: {}", e))?; + + let name = entry.file_name().to_string_lossy().to_string(); + + if metadata.is_file() { + if pattern.contains('*') { + let pattern_without_star = pattern.replace('*', ""); + if !name.contains(&pattern_without_star) { + continue; + } + } else if !name.ends_with(&pattern) { + continue; + } + } + + results.push(FileEntry { + path: entry_path.to_string_lossy().to_string(), + name, + is_dir: metadata.is_dir(), + }); + } + + // Sort: directories first, then files, alphabetically + results.sort_by(|a, b| { + if a.is_dir == b.is_dir { + a.name.to_lowercase().cmp(&b.name.to_lowercase()) + } else if a.is_dir { + std::cmp::Ordering::Less + } else { + std::cmp::Ordering::Greater + } + }); + + Ok(results) +} + +/// Rename a file +#[tauri::command] +fn rename_file(old_path: String, new_path: String) -> Result<(), String> { + let old = Path::new(&old_path); + let new = Path::new(&new_path); + + if !old.exists() { + return Err(format!("Source file does not exist: {}", old_path)); + } + + fs::rename(old, new).map_err(|e| format!("Failed to rename file: {}", e))?; + + Ok(()) +} + +/// Delete a file +#[tauri::command] +fn delete_file(file_path: String) -> Result<(), String> { + let path = Path::new(&file_path); + + if !path.exists() { + return Err(format!("File does not exist: {}", file_path)); + } + + if path.is_dir() { + return Err(format!("Path is a directory, not a file: {}", file_path)); + } + + fs::remove_file(path).map_err(|e| format!("Failed to delete file: {}", e))?; + + Ok(()) +} + +/// Pick a workspace directory using the system folder picker +#[tauri::command] +async fn pick_workspace_directory(app: AppHandle) -> Result, String> { + use tauri_plugin_dialog::{DialogExt, MessageDialogKind}; + + let result = app.dialog().file().blocking_pick_folder(); + + match result { + Some(path) => Ok(Some(path.to_string_lossy().to_string())), + None => Ok(None), + } +} + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() @@ -5,6 +119,12 @@ pub fn run() { .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_store::Builder::default().build()) + .invoke_handler(tauri::generate_handler![ + read_directory, + rename_file, + delete_file, + pick_workspace_directory + ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/apps/web/src/lib/canvas/Canvas.svelte b/apps/web/src/lib/canvas/Canvas.svelte index a01e038..5e37ea1 100644 --- a/apps/web/src/lib/canvas/Canvas.svelte +++ b/apps/web/src/lib/canvas/Canvas.svelte @@ -82,7 +82,8 @@ bind:open={c.fileBrowser.open} onUpdate={c.fileBrowser.handleUpdate} fetchInspectorData={c.fileBrowser.fetchInspectorData} - onClose={c.fileBrowser.handleClose} /> + onClose={c.fileBrowser.handleClose} + desktopRepo={c.desktop.repo} /> {/if} diff --git a/apps/web/src/lib/canvas/canvas-store.svelte.ts b/apps/web/src/lib/canvas/canvas-store.svelte.ts index b94f4cc..f80cf1a 100644 --- a/apps/web/src/lib/canvas/canvas-store.svelte.ts +++ b/apps/web/src/lib/canvas/canvas-store.svelte.ts @@ -1,15 +1,10 @@ -import { createInputAdapter, type InputAdapter } from "$lib/input"; +import { createInputAdapter } from "$lib/input"; +import type { InputAdapter } from "$lib/input"; import type { DesktopDocRepo } from "$lib/persistence/desktop"; import { createPlatformRepo, detectPlatform } from "$lib/platform"; +import { createPersistenceManager, createSnapStore, createStatusStore } from "$lib/status"; +import type { SnapStore, StatusStore } from "$lib/status"; import { - createPersistenceManager, - createSnapStore, - createStatusStore, - type SnapStore, - type StatusStore, -} from "$lib/status"; -import { - type Action, ArrowTool, Camera, createId, @@ -21,9 +16,6 @@ import { getShapesOnCurrentPage, InkfiniteDB, LineTool, - type LoadedDoc, - type PersistenceSink, - type PersistentDocRepo, RectTool, routeAction, SelectTool, @@ -32,8 +24,8 @@ import { SnapshotCommand, Store, TextTool, - type Viewport, } from "inkfinite-core"; +import type { Action, LoadedDoc, PersistenceSink, PersistentDocRepo, Viewport } from "inkfinite-core"; import { createRenderer, type Renderer } from "inkfinite-renderer"; import { onDestroy, onMount } from "svelte"; import { SvelteSet } from "svelte/reactivity"; @@ -251,6 +243,22 @@ export function createCanvasController(bindings: CanvasControllerBindings) { if (action.type !== "key-down") { return null; } + + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + // Global shortcuts (work regardless of selection) + if (primaryModifier && (action.key === "o" || action.key === "O")) { + // Open file browser + fileBrowser.handleOpen(); + return null; + } + + if (primaryModifier && (action.key === "n" || action.key === "N")) { + // New board - open file browser in create mode + fileBrowser.handleOpen(); + return null; + } + const selectionIds = state.ui.selectionIds; if (selectionIds.length === 0) { return null; @@ -290,7 +298,6 @@ export function createCanvasController(bindings: CanvasControllerBindings) { } } - const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; if (primaryModifier && (action.key === "d" || action.key === "D")) { return duplicateSelection(state); } diff --git a/apps/web/src/lib/canvas/controllers/desktop-file-controller.svelte.ts b/apps/web/src/lib/canvas/controllers/desktop-file-controller.svelte.ts index db84780..d8bc528 100644 --- a/apps/web/src/lib/canvas/controllers/desktop-file-controller.svelte.ts +++ b/apps/web/src/lib/canvas/controllers/desktop-file-controller.svelte.ts @@ -15,6 +15,10 @@ export class DesktopFileController { private onLoadDoc: (boardId: string, doc: LoadedDoc) => void, ) {} + get repo(): DesktopDocRepo | null { + return this.getDesktopRepo(); + } + private updateFileState = () => { const desktopRepo = this.getDesktopRepo(); if (!desktopRepo) { diff --git a/apps/web/src/lib/filebrowser/FileBrowser.svelte b/apps/web/src/lib/filebrowser/FileBrowser.svelte index 00bb0c7..4a83fe4 100644 --- a/apps/web/src/lib/filebrowser/FileBrowser.svelte +++ b/apps/web/src/lib/filebrowser/FileBrowser.svelte @@ -1,6 +1,7 @@ @@ -166,6 +203,40 @@ + {#if desktopRepo} +
+ {#if workspaceDir} +
+ + + {workspaceDir.split('/').pop() || workspaceDir} + + + +
+ {:else} + +
Recent files mode
+ {/if} +
+ {/if} +
{ + const store = await getStore(); + const workspace = (await store.get(WORKSPACE_DIR_KEY)) || null; + return workspace; + } + + async function setWorkspaceDir(path: string | null): Promise { + const store = await getStore(); + await store.set(WORKSPACE_DIR_KEY, path); + await store.save(); + } + + async function pickWorkspaceDir(): Promise { + const result = await invoke("pick_workspace_directory"); + if (result) { + await setWorkspaceDir(result); + } + return result; + } + + async function readDirectory(directory: string, pattern?: string): Promise { + const entries = await invoke("read_directory", { directory, pattern: pattern || "*.inkfinite.json" }); + + return entries.map((e) => ({ path: e.path, name: e.name, isDir: e.is_dir })); + } + + async function renameFile(oldPath: string, newPath: string): Promise { + await invoke("rename_file", { oldPath, newPath }); + } + + async function deleteFile(path: string): Promise { + await invoke("delete_file", { filePath: path }); + } + return { showOpenDialog, showSaveDialog, @@ -91,5 +125,11 @@ export function createDesktopFileOps(): DesktopFileOps { addRecentFile, removeRecentFile, clearRecentFiles, + getWorkspaceDir, + setWorkspaceDir, + pickWorkspaceDir, + readDirectory, + renameFile, + deleteFile, }; } diff --git a/apps/web/src/lib/persistence/desktop.ts b/apps/web/src/lib/persistence/desktop.ts index 419cf97..823ab50 100644 --- a/apps/web/src/lib/persistence/desktop.ts +++ b/apps/web/src/lib/persistence/desktop.ts @@ -19,6 +19,9 @@ export type DesktopDocRepo = PersistentDocRepo & { kind: "desktop"; getCurrentFile(): FileHandle | null; openFromDialog(): Promise<{ boardId: string; doc: LoadedDoc }>; + getWorkspaceDir(): Promise; + setWorkspaceDir(path: string | null): Promise; + pickWorkspaceDir(): Promise; }; export function isDesktopRepo(repo: PersistentDocRepo): repo is DesktopDocRepo { @@ -63,17 +66,42 @@ export function createDesktopDocRepo(fileOps: DesktopFileOps): DesktopDocRepo { } async function listBoards(): Promise { - const recent = await fileOps.getRecentFiles(); + const workspaceDir = await fileOps.getWorkspaceDir(); const boards: BoardMeta[] = []; - for (const handle of recent) { + if (workspaceDir) { + // Workspace mode: list files from workspace directory try { - const content = await fileOps.readFile(handle.path); - const fileData = parseDesktopFile(content); - boards.push(fileData.board); - boardFiles.set(fileData.board.id, handle); - } catch { - await fileOps.removeRecentFile(handle.path); + const entries = await fileOps.readDirectory(workspaceDir, "*.inkfinite.json"); + + for (const entry of entries) { + if (entry.isDir) continue; + + try { + const content = await fileOps.readFile(entry.path); + const fileData = parseDesktopFile(content); + boards.push(fileData.board); + boardFiles.set(fileData.board.id, { path: entry.path, name: entry.name }); + } catch (error) { + console.warn(`Failed to load board from ${entry.path}:`, error); + } + } + } catch (error) { + console.error("Failed to read workspace directory:", error); + } + } else { + // Recent files mode + const recent = await fileOps.getRecentFiles(); + + for (const handle of recent) { + try { + const content = await fileOps.readFile(handle.path); + const fileData = parseDesktopFile(content); + boards.push(fileData.board); + boardFiles.set(fileData.board.id, handle); + } catch { + await fileOps.removeRecentFile(handle.path); + } } } @@ -101,9 +129,19 @@ export function createDesktopDocRepo(fileOps: DesktopFileOps): DesktopDocRepo { shapeOrder: { [page.id]: [] }, }); - const path = await fileOps.showSaveDialog(`${name || "Untitled"}.inkfinite.json`); - if (!path) { - throw new Error("Save cancelled"); + const workspaceDir = await fileOps.getWorkspaceDir(); + let path: string | null; + + if (workspaceDir) { + // Workspace mode: save directly in workspace directory + const fileName = `${name || "Untitled"}.inkfinite.json`; + path = `${workspaceDir}/${fileName}`; + } else { + // Recent files mode: show save dialog + path = await fileOps.showSaveDialog(`${name || "Untitled"}.inkfinite.json`); + if (!path) { + throw new Error("Save cancelled"); + } } await fileOps.writeFile(path, serializeDesktopFile(fileData)); @@ -111,7 +149,10 @@ export function createDesktopDocRepo(fileOps: DesktopFileOps): DesktopDocRepo { const handle = { path, name: path.split("/").pop() || name }; setCurrentState(handle, board, loadedDocFromFileData(fileData)); - await fileOps.addRecentFile(handle); + if (!workspaceDir) { + await fileOps.addRecentFile(handle); + } + return boardId; } @@ -123,26 +164,78 @@ export function createDesktopDocRepo(fileOps: DesktopFileOps): DesktopDocRepo { throw new Error("No board loaded"); } - currentBoard = { ...currentBoard, name, updatedAt: Date.now() }; - - const fileData = createFileData( - currentBoard, - currentDoc.pages, - currentDoc.shapes, - currentDoc.bindings, - currentDoc.order, - ); + const oldPath = currentFile.path; + const workspaceDir = await fileOps.getWorkspaceDir(); + + // If we're renaming the file itself (in workspace mode) + if (workspaceDir) { + const dir = oldPath.substring(0, oldPath.lastIndexOf("/")); + const newFileName = `${name}.inkfinite.json`; + const newPath = `${dir}/${newFileName}`; + + // Update board metadata + currentBoard = { ...currentBoard, name, updatedAt: Date.now() }; + + const fileData = createFileData( + currentBoard, + currentDoc.pages, + currentDoc.shapes, + currentDoc.bindings, + currentDoc.order, + ); + + // Write to new path and delete old file (atomic rename not always possible cross-filesystem) + await fileOps.writeFile(newPath, serializeDesktopFile(fileData)); + + if (newPath !== oldPath) { + try { + await fileOps.deleteFile(oldPath); + } catch (error) { + console.warn("Failed to delete old file:", error); + } + } - await fileOps.writeFile(currentFile.path, serializeDesktopFile(fileData)); - boardFiles.set(currentBoard.id, currentFile); + // Update current file handle + const newHandle = { path: newPath, name: newFileName }; + currentFile = newHandle; + boardFiles.set(currentBoard.id, newHandle); + } else { + // Recent files mode: just update the content + currentBoard = { ...currentBoard, name, updatedAt: Date.now() }; + + const fileData = createFileData( + currentBoard, + currentDoc.pages, + currentDoc.shapes, + currentDoc.bindings, + currentDoc.order, + ); + + await fileOps.writeFile(currentFile.path, serializeDesktopFile(fileData)); + boardFiles.set(currentBoard.id, currentFile); + } } async function deleteBoard(boardId: string): Promise { const handle = boardFiles.get(boardId); + const workspaceDir = await fileOps.getWorkspaceDir(); + if (handle) { - await fileOps.removeRecentFile(handle.path); + if (workspaceDir) { + // Workspace mode: actually delete the file + try { + await fileOps.deleteFile(handle.path); + } catch (error) { + console.error("Failed to delete file:", error); + throw error; + } + } else { + // Recent files mode: just remove from recent list + await fileOps.removeRecentFile(handle.path); + } boardFiles.delete(boardId); } + if (currentBoard?.id === boardId) { currentFile = null; currentBoard = null; @@ -300,6 +393,9 @@ export function createDesktopDocRepo(fileOps: DesktopFileOps): DesktopDocRepo { importBoard, getCurrentFile: () => currentFile, openFromDialog, + getWorkspaceDir: () => fileOps.getWorkspaceDir(), + setWorkspaceDir: (path: string | null) => fileOps.setWorkspaceDir(path), + pickWorkspaceDir: () => fileOps.pickWorkspaceDir(), }; } diff --git a/apps/web/src/lib/tests/desktop-workspace.test.ts b/apps/web/src/lib/tests/desktop-workspace.test.ts new file mode 100644 index 0000000..e9fe712 --- /dev/null +++ b/apps/web/src/lib/tests/desktop-workspace.test.ts @@ -0,0 +1,295 @@ +/** + * Unit tests for desktop workspace functionality + */ + +import { createDesktopDocRepo } from "$lib/persistence/desktop"; +import type { DesktopFileOps, DirectoryEntry } from "inkfinite-core"; +import { beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Desktop workspace mode", () => { + let fileOps: DesktopFileOps; + let mockWorkspaceDir: string | null; + let mockFiles: Map; + let mockDirectoryEntries: DirectoryEntry[]; + + beforeEach(() => { + mockWorkspaceDir = null; + mockFiles = new Map(); + mockDirectoryEntries = []; + + fileOps = { + showOpenDialog: vi.fn(async () => "/test/path.inkfinite.json"), + showSaveDialog: vi.fn(async (defaultName?: string) => `/test/${defaultName || "file.inkfinite.json"}`), + readFile: vi.fn(async (path: string) => { + const content = mockFiles.get(path); + if (!content) throw new Error(`File not found: ${path}`); + return content; + }), + writeFile: vi.fn(async (path: string, content: string) => { + mockFiles.set(path, content); + }), + getRecentFiles: vi.fn(async () => []), + addRecentFile: vi.fn(async () => {}), + removeRecentFile: vi.fn(async () => {}), + clearRecentFiles: vi.fn(async () => {}), + getWorkspaceDir: vi.fn(async () => mockWorkspaceDir), + setWorkspaceDir: vi.fn(async (path: string | null) => { + mockWorkspaceDir = path; + }), + pickWorkspaceDir: vi.fn(async () => { + mockWorkspaceDir = "/test/workspace"; + return mockWorkspaceDir; + }), + readDirectory: vi.fn(async (_directory: string, _pattern?: string) => { + return mockDirectoryEntries; + }), + renameFile: vi.fn(async (oldPath: string, newPath: string) => { + const content = mockFiles.get(oldPath); + if (!content) throw new Error(`File not found: ${oldPath}`); + mockFiles.set(newPath, content); + mockFiles.delete(oldPath); + }), + deleteFile: vi.fn(async (path: string) => { + if (!mockFiles.has(path)) throw new Error(`File not found: ${path}`); + mockFiles.delete(path); + }), + }; + }); + + describe("Workspace directory management", () => { + it("should get workspace directory", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/test/workspace"; + const dir = await repo.getWorkspaceDir(); + expect(dir).toBe("/test/workspace"); + }); + + it("should set workspace directory", async () => { + const repo = createDesktopDocRepo(fileOps); + await repo.setWorkspaceDir("/new/workspace"); + expect(mockWorkspaceDir).toBe("/new/workspace"); + }); + + it("should clear workspace directory", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/test/workspace"; + await repo.setWorkspaceDir(null); + expect(mockWorkspaceDir).toBeNull(); + }); + + it("should pick workspace directory", async () => { + const repo = createDesktopDocRepo(fileOps); + const dir = await repo.pickWorkspaceDir(); + expect(dir).toBe("/test/workspace"); + expect(mockWorkspaceDir).toBe("/test/workspace"); + }); + }); + + describe("listBoards with workspace mode", () => { + it("should list boards from workspace directory", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/workspace"; + + const board1Content = JSON.stringify({ + board: { id: "board-1", name: "Board 1", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: {}, shapes: {}, bindings: {} }, + order: { pageIds: [], shapeOrder: {} }, + }); + + const board2Content = JSON.stringify({ + board: { id: "board-2", name: "Board 2", createdAt: 1500, updatedAt: 2500 }, + doc: { pages: {}, shapes: {}, bindings: {} }, + order: { pageIds: [], shapeOrder: {} }, + }); + + mockFiles.set("/workspace/board1.inkfinite.json", board1Content); + mockFiles.set("/workspace/board2.inkfinite.json", board2Content); + + mockDirectoryEntries = [ + { path: "/workspace/board1.inkfinite.json", name: "board1.inkfinite.json", isDir: false }, + { path: "/workspace/board2.inkfinite.json", name: "board2.inkfinite.json", isDir: false }, + ]; + + const boards = await repo.listBoards(); + + expect(boards).toHaveLength(2); + expect(boards[0].name).toBe("Board 2"); // Sorted by updatedAt descending + expect(boards[1].name).toBe("Board 1"); + }); + + it("should skip directories when listing workspace", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/workspace"; + + const boardContent = JSON.stringify({ + board: { id: "board-1", name: "Board 1", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: {}, shapes: {}, bindings: {} }, + order: { pageIds: [], shapeOrder: {} }, + }); + + mockFiles.set("/workspace/board.inkfinite.json", boardContent); + + mockDirectoryEntries = [{ path: "/workspace/board.inkfinite.json", name: "board.inkfinite.json", isDir: false }, { + path: "/workspace/subfolder", + name: "subfolder", + isDir: true, + }]; + + const boards = await repo.listBoards(); + + expect(boards).toHaveLength(1); + expect(boards[0].name).toBe("Board 1"); + }); + + it("should fall back to recent files when no workspace set", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = null; + + const boardContent = JSON.stringify({ + board: { id: "board-1", name: "Recent Board", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: {}, shapes: {}, bindings: {} }, + order: { pageIds: [], shapeOrder: {} }, + }); + + mockFiles.set("/recent/board.inkfinite.json", boardContent); + + fileOps.getRecentFiles = vi.fn( + async () => [{ path: "/recent/board.inkfinite.json", name: "board.inkfinite.json" }] + ); + + const boards = await repo.listBoards(); + + expect(boards).toHaveLength(1); + expect(boards[0].name).toBe("Recent Board"); + }); + }); + + describe("createBoard with workspace mode", () => { + it("should save new board in workspace directory", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/workspace"; + + const boardId = await repo.createBoard("Test Board"); + + expect(boardId).toBeTruthy(); + expect(mockFiles.has("/workspace/Test Board.inkfinite.json")).toBe(true); + + const fileContent = mockFiles.get("/workspace/Test Board.inkfinite.json")!; + const data = JSON.parse(fileContent); + expect(data.board.name).toBe("Test Board"); + }); + + it("should show save dialog when no workspace set", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = null; + + await repo.createBoard("Test Board"); + + expect(fileOps.showSaveDialog).toHaveBeenCalledWith("Test Board.inkfinite.json"); + }); + }); + + describe("renameBoard with workspace mode", () => { + it("should rename file and update content in workspace mode", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/workspace"; + + const originalPath = "/workspace/Original.inkfinite.json"; + const boardContent = JSON.stringify({ + board: { id: "board-1", name: "Original", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: { "page-1": { id: "page-1", name: "Page 1", shapeIds: [] } }, shapes: {}, bindings: {} }, + order: { pageIds: ["page-1"], shapeOrder: { "page-1": [] } }, + }); + + mockFiles.set(originalPath, boardContent); + mockDirectoryEntries = [{ path: originalPath, name: "Original.inkfinite.json", isDir: false }]; + + // List boards first to populate boardFiles map + await repo.listBoards(); + await repo.openBoard("board-1"); + await repo.renameBoard("board-1", "Renamed"); + + const newPath = "/workspace/Renamed.inkfinite.json"; + expect(mockFiles.has(newPath)).toBe(true); + + const newContent = mockFiles.get(newPath)!; + const data = JSON.parse(newContent); + expect(data.board.name).toBe("Renamed"); + }); + + it("should update content only in recent files mode", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = null; + + const path = "/recent/board.inkfinite.json"; + const boardContent = JSON.stringify({ + board: { id: "board-1", name: "Original", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: { "page-1": { id: "page-1", name: "Page 1", shapeIds: [] } }, shapes: {}, bindings: {} }, + order: { pageIds: ["page-1"], shapeOrder: { "page-1": [] } }, + }); + + mockFiles.set(path, boardContent); + fileOps.getRecentFiles = vi.fn(async () => [{ path, name: "board.inkfinite.json" }]); + + // List boards first to populate boardFiles map + await repo.listBoards(); + await repo.openBoard("board-1"); + await repo.renameBoard("board-1", "Renamed"); + + // File path should not change in recent files mode + expect(mockFiles.has(path)).toBe(true); + + const newContent = mockFiles.get(path)!; + const data = JSON.parse(newContent); + expect(data.board.name).toBe("Renamed"); + }); + }); + + describe("deleteBoard with workspace mode", () => { + it("should delete file in workspace mode", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = "/workspace"; + + const path = "/workspace/board.inkfinite.json"; + const boardContent = JSON.stringify({ + board: { id: "board-1", name: "Board", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: {}, shapes: {}, bindings: {} }, + order: { pageIds: [], shapeOrder: {} }, + }); + + mockFiles.set(path, boardContent); + mockDirectoryEntries = [{ path, name: "board.inkfinite.json", isDir: false }]; + + const boards = await repo.listBoards(); + expect(boards).toHaveLength(1); + + await repo.deleteBoard("board-1"); + + expect(mockFiles.has(path)).toBe(false); + expect(fileOps.deleteFile).toHaveBeenCalledWith(path); + }); + + it("should remove from recent files in non-workspace mode", async () => { + const repo = createDesktopDocRepo(fileOps); + mockWorkspaceDir = null; + + const path = "/recent/board.inkfinite.json"; + const boardContent = JSON.stringify({ + board: { id: "board-1", name: "Board", createdAt: 1000, updatedAt: 2000 }, + doc: { pages: {}, shapes: {}, bindings: {} }, + order: { pageIds: [], shapeOrder: {} }, + }); + + mockFiles.set(path, boardContent); + fileOps.getRecentFiles = vi.fn(async () => [{ path, name: "board.inkfinite.json" }]); + + const boards = await repo.listBoards(); + expect(boards).toHaveLength(1); + + await repo.deleteBoard("board-1"); + + expect(fileOps.removeRecentFile).toHaveBeenCalledWith(path); + expect(fileOps.deleteFile).not.toHaveBeenCalled(); + }); + }); +}); diff --git a/apps/web/src/lib/tests/keyboard-shortcuts.test.ts b/apps/web/src/lib/tests/keyboard-shortcuts.test.ts new file mode 100644 index 0000000..daa190e --- /dev/null +++ b/apps/web/src/lib/tests/keyboard-shortcuts.test.ts @@ -0,0 +1,222 @@ +/** + * Unit tests for keyboard shortcuts (Cmd+O, Cmd+N) + */ + +import type { KeyDownAction } from "inkfinite-core"; +import { describe, expect, it, vi } from "vitest"; + +describe("Keyboard shortcuts", () => { + describe("Cmd+O / Ctrl+O (Open file browser)", () => { + it("should trigger with Cmd+O on Mac", () => { + const action: KeyDownAction = { + type: "key-down", + key: "o", + code: "KeyO", + modifiers: { ctrl: false, shift: false, alt: false, meta: true }, + repeat: false, + timestamp: Date.now(), + }; + + const handleOpen = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "o" || action.key === "O")) { + handleOpen(); + } + + expect(handleOpen).toHaveBeenCalled(); + }); + + it("should trigger with Ctrl+O on Windows/Linux", () => { + const action: KeyDownAction = { + type: "key-down", + key: "o", + code: "KeyO", + modifiers: { ctrl: true, shift: false, alt: false, meta: false }, + repeat: false, + timestamp: Date.now(), + }; + + const handleOpen = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "o" || action.key === "O")) { + handleOpen(); + } + + expect(handleOpen).toHaveBeenCalled(); + }); + + it("should handle uppercase O", () => { + const action: KeyDownAction = { + type: "key-down", + key: "O", + code: "KeyO", + modifiers: { ctrl: false, shift: true, alt: false, meta: true }, + repeat: false, + timestamp: Date.now(), + }; + + const handleOpen = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "o" || action.key === "O")) { + handleOpen(); + } + + expect(handleOpen).toHaveBeenCalled(); + }); + + it("should not trigger without modifier", () => { + const action: KeyDownAction = { + type: "key-down", + key: "o", + code: "KeyO", + modifiers: { ctrl: false, shift: false, alt: false, meta: false }, + repeat: false, + timestamp: Date.now(), + }; + + const handleOpen = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "o" || action.key === "O")) { + handleOpen(); + } + + expect(handleOpen).not.toHaveBeenCalled(); + }); + }); + + describe("Cmd+N / Ctrl+N (New board)", () => { + it("should trigger with Cmd+N on Mac", () => { + const action: KeyDownAction = { + type: "key-down", + key: "n", + code: "KeyN", + modifiers: { ctrl: false, shift: false, alt: false, meta: true }, + repeat: false, + timestamp: Date.now(), + }; + + const handleNew = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "n" || action.key === "N")) { + handleNew(); + } + + expect(handleNew).toHaveBeenCalled(); + }); + + it("should trigger with Ctrl+N on Windows/Linux", () => { + const action: KeyDownAction = { + type: "key-down", + key: "n", + code: "KeyN", + modifiers: { ctrl: true, shift: false, alt: false, meta: false }, + repeat: false, + timestamp: Date.now(), + }; + + const handleNew = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "n" || action.key === "N")) { + handleNew(); + } + + expect(handleNew).toHaveBeenCalled(); + }); + + it("should handle uppercase N", () => { + const action: KeyDownAction = { + type: "key-down", + key: "N", + code: "KeyN", + modifiers: { ctrl: false, shift: true, alt: false, meta: true }, + repeat: false, + timestamp: Date.now(), + }; + + const handleNew = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "n" || action.key === "N")) { + handleNew(); + } + + expect(handleNew).toHaveBeenCalled(); + }); + + it("should not trigger without modifier", () => { + const action: KeyDownAction = { + type: "key-down", + key: "n", + code: "KeyN", + modifiers: { ctrl: false, shift: false, alt: false, meta: false }, + repeat: false, + timestamp: Date.now(), + }; + + const handleNew = vi.fn(); + const primaryModifier = action.modifiers.meta || action.modifiers.ctrl; + + if (primaryModifier && (action.key === "n" || action.key === "N")) { + handleNew(); + } + + expect(handleNew).not.toHaveBeenCalled(); + }); + }); + + describe("Other existing shortcuts", () => { + it("should not conflict with Cmd+D (duplicate)", () => { + const actionD: KeyDownAction = { + type: "key-down", + key: "d", + code: "KeyD", + modifiers: { ctrl: false, shift: false, alt: false, meta: true }, + repeat: false, + timestamp: Date.now(), + }; + + const handleOpen = vi.fn(); + const handleDuplicate = vi.fn(); + const primaryModifier = actionD.modifiers.meta || actionD.modifiers.ctrl; + + if (primaryModifier && (actionD.key === "o" || actionD.key === "O")) { + handleOpen(); + } else if (primaryModifier && (actionD.key === "d" || actionD.key === "D")) { + handleDuplicate(); + } + + expect(handleOpen).not.toHaveBeenCalled(); + expect(handleDuplicate).toHaveBeenCalled(); + }); + + it("should not conflict with arrow key navigation", () => { + const actionArrow: KeyDownAction = { + type: "key-down", + key: "ArrowLeft", + code: "ArrowLeft", + modifiers: { ctrl: false, shift: false, alt: false, meta: false }, + repeat: false, + timestamp: Date.now(), + }; + + const handleOpen = vi.fn(); + const handleNav = vi.fn(); + const primaryModifier = actionArrow.modifiers.meta || actionArrow.modifiers.ctrl; + + if (primaryModifier && (actionArrow.key === "o" || actionArrow.key === "O")) { + handleOpen(); + } else if (actionArrow.key.startsWith("Arrow")) { + handleNav(); + } + + expect(handleOpen).not.toHaveBeenCalled(); + expect(handleNav).toHaveBeenCalled(); + }); + }); +}); diff --git a/apps/web/src/lib/tests/persistence.desktop.test.ts b/apps/web/src/lib/tests/persistence.desktop.test.ts index 2660186..2b18527 100644 --- a/apps/web/src/lib/tests/persistence.desktop.test.ts +++ b/apps/web/src/lib/tests/persistence.desktop.test.ts @@ -14,6 +14,7 @@ function createFakeFileOps() { const recent: FileHandle[] = []; let nextOpen: string | null = null; let nextSave: string | null = null; + let workspaceDir: string | null = null; const ops: DesktopFileOps = { async showOpenDialog() { @@ -52,6 +53,33 @@ function createFakeFileOps() { async clearRecentFiles() { recent.splice(0, recent.length); }, + async getWorkspaceDir() { + return workspaceDir; + }, + async setWorkspaceDir(path) { + workspaceDir = path; + }, + async pickWorkspaceDir() { + workspaceDir = "/tmp/workspace"; + return workspaceDir; + }, + async readDirectory(_directory, _pattern) { + return []; + }, + async renameFile(oldPath, newPath) { + const content = files.get(oldPath); + if (content === undefined) { + throw new Error(`Missing file: ${oldPath}`); + } + files.set(newPath, content); + files.delete(oldPath); + }, + async deleteFile(path) { + if (!files.has(path)) { + throw new Error(`Missing file: ${path}`); + } + files.delete(path); + }, }; return { diff --git a/packages/core/src/persistence/desktop.ts b/packages/core/src/persistence/desktop.ts index f5ca10a..f9546d2 100644 --- a/packages/core/src/persistence/desktop.ts +++ b/packages/core/src/persistence/desktop.ts @@ -12,6 +12,11 @@ export type DesktopFileData = { board: BoardMeta; doc: Document; order: DocOrder */ export type FileHandle = { path: string; name: string }; +/** + * Directory entry from file system + */ +export type DirectoryEntry = { path: string; name: string; isDir: boolean }; + /** * Desktop-specific operations interface. * Implementation lives in apps/desktop using @tauri-apps/plugin-* APIs. @@ -56,6 +61,36 @@ export interface DesktopFileOps { * Clear all recent files */ clearRecentFiles(): Promise; + + /** + * Get current workspace directory + */ + getWorkspaceDir(): Promise; + + /** + * Set workspace directory + */ + setWorkspaceDir(path: string | null): Promise; + + /** + * Show directory picker and set as workspace + */ + pickWorkspaceDir(): Promise; + + /** + * Read directory contents (filtered by pattern) + */ + readDirectory(directory: string, pattern?: string): Promise; + + /** + * Rename a file on disk + */ + renameFile(oldPath: string, newPath: string): Promise; + + /** + * Delete a file from disk + */ + deleteFile(path: string): Promise; } /**