diff --git a/apps/tauri/README.md b/apps/tauri/README.md index 45d019ad..31b75d38 100644 --- a/apps/tauri/README.md +++ b/apps/tauri/README.md @@ -54,7 +54,7 @@ pnpm install pnpm tauri dev ``` -You should get an empty Querya splash window and an `app_info` IPC line in the UI. +You should get the shell chrome and an `app_info` status line. **Open SQLite…** uses the native file dialog and `db_connect_sqlite` IPC (live connection list in the sidebar). ### Scripts diff --git a/apps/tauri/package.json b/apps/tauri/package.json index 574f973c..0fed140c 100644 --- a/apps/tauri/package.json +++ b/apps/tauri/package.json @@ -12,6 +12,7 @@ }, "dependencies": { "@tauri-apps/api": "^2", + "@tauri-apps/plugin-dialog": "^2.8.4", "@tauri-apps/plugin-opener": "^2", "pinia": "^3.0.3", "vue": "^3.5.13" diff --git a/apps/tauri/pnpm-lock.yaml b/apps/tauri/pnpm-lock.yaml index 6a5c1f91..b3cf45c3 100644 --- a/apps/tauri/pnpm-lock.yaml +++ b/apps/tauri/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@tauri-apps/api': specifier: ^2 version: 2.12.4 + '@tauri-apps/plugin-dialog': + specifier: ^2.8.4 + version: 2.8.4 '@tauri-apps/plugin-opener': specifier: ^2 version: 2.7.3 @@ -440,6 +443,9 @@ packages: engines: {node: '>= 10'} hasBin: true + '@tauri-apps/plugin-dialog@2.8.4': + resolution: {integrity: sha512-+6ZOiXenOaxXwb8qCbBPdT2jX2cFPaVVHGIskrpmJLpmWj+qKRTD6X/z9x7hTdSQn7NedcoXCkWGej4a7dC4lw==} + '@tauri-apps/plugin-opener@2.7.3': resolution: {integrity: sha512-Nm+v7vLBCDzYZxrmCJhpMgtPsPsKt5myMs7SMU/aBjPOmAFI1RrHfhMz7t5KlxjMOzRcelyNq1/j0pmC9SmBVA==} @@ -918,6 +924,10 @@ snapshots: '@tauri-apps/cli-win32-ia32-msvc': 2.12.4 '@tauri-apps/cli-win32-x64-msvc': 2.12.4 + '@tauri-apps/plugin-dialog@2.8.4': + dependencies: + '@tauri-apps/api': 2.12.4 + '@tauri-apps/plugin-opener@2.7.3': dependencies: '@tauri-apps/api': 2.12.4 diff --git a/apps/tauri/src-tauri/Cargo.lock b/apps/tauri/src-tauri/Cargo.lock index 47211644..ec663386 100644 --- a/apps/tauri/src-tauri/Cargo.lock +++ b/apps/tauri/src-tauri/Cargo.lock @@ -2348,6 +2348,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.13.2", "block2", + "libc", "objc2", "objc2-core-foundation", ] @@ -2789,6 +2790,7 @@ dependencies = [ "serde_json", "tauri", "tauri-build", + "tauri-plugin-dialog", "tauri-plugin-opener", "uuid", ] @@ -2931,6 +2933,32 @@ dependencies = [ "web-sys", ] +[[package]] +name = "rfd" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20dafead71c16a34e1ff357ddefc8afc11e7d51d6d2b9fbd07eaa48e3e540220" +dependencies = [ + "block2", + "dispatch2", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "libc", + "log", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "percent-encoding", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.61.2", +] + [[package]] name = "rusqlite" version = "0.32.1" @@ -3698,6 +3726,48 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tauri-plugin-dialog" +version = "2.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce0fb9c2b6d34a9720627ed930ebc8af26f61e648695aecaeb03d5c33c5896f5" +dependencies = [ + "log", + "raw-window-handle", + "rfd", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "tauri-plugin-fs", + "thiserror 2.0.21", + "url", +] + +[[package]] +name = "tauri-plugin-fs" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d58eb1d4984e535f47a642ffec09a2da6f5c18a12b5902d12126cb7626d628b" +dependencies = [ + "anyhow", + "dunce", + "glob", + "log", + "objc2-foundation", + "percent-encoding", + "schemars 0.8.22", + "serde", + "serde_json", + "serde_repr", + "tauri", + "tauri-plugin", + "tauri-utils", + "thiserror 2.0.21", + "toml 1.2.1+spec-1.1.0", + "url", +] + [[package]] name = "tauri-plugin-opener" version = "2.7.3" diff --git a/apps/tauri/src-tauri/Cargo.toml b/apps/tauri/src-tauri/Cargo.toml index 28fc52f3..0f087046 100644 --- a/apps/tauri/src-tauri/Cargo.toml +++ b/apps/tauri/src-tauri/Cargo.toml @@ -15,6 +15,7 @@ tauri-build = { version = "2", features = [] } [dependencies] tauri = { version = "2", features = [] } tauri-plugin-opener = "2" +tauri-plugin-dialog = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" uuid = { version = "1", features = ["v4", "serde"] } diff --git a/apps/tauri/src-tauri/capabilities/default.json b/apps/tauri/src-tauri/capabilities/default.json index af99e77a..905d6ee6 100644 --- a/apps/tauri/src-tauri/capabilities/default.json +++ b/apps/tauri/src-tauri/capabilities/default.json @@ -6,6 +6,8 @@ "permissions": [ "core:default", "opener:default", + "dialog:default", + "dialog:allow-open", "core:window:allow-close", "core:window:allow-minimize", "core:window:allow-maximize", diff --git a/apps/tauri/src-tauri/src/commands.rs b/apps/tauri/src-tauri/src/commands.rs new file mode 100644 index 00000000..648a9528 --- /dev/null +++ b/apps/tauri/src-tauri/src/commands.rs @@ -0,0 +1,28 @@ +use crate::connection::{ + ConnectionConfig, ConnectionError, ConnectionId, ConnectionManager, ConnectionRegistry, +}; +use tauri::State; + +#[tauri::command] +pub fn db_connect_sqlite( + path: String, + registry: State<'_, ConnectionRegistry>, +) -> Result { + registry.connect(ConnectionConfig::Sqlite { path }) +} + +#[tauri::command] +pub fn db_disconnect( + id: ConnectionId, + registry: State<'_, ConnectionRegistry>, +) -> Result<(), ConnectionError> { + registry.disconnect(&id) +} + +#[tauri::command] +pub fn db_is_connected( + id: ConnectionId, + registry: State<'_, ConnectionRegistry>, +) -> bool { + registry.is_connected(&id) +} diff --git a/apps/tauri/src-tauri/src/lib.rs b/apps/tauri/src-tauri/src/lib.rs index da0a4df0..f89547b9 100644 --- a/apps/tauri/src-tauri/src/lib.rs +++ b/apps/tauri/src-tauri/src/lib.rs @@ -1,3 +1,4 @@ +mod commands; mod connection; pub use connection::{ @@ -5,6 +6,8 @@ pub use connection::{ DriverKind, }; +use commands::{db_connect_sqlite, db_disconnect, db_is_connected}; + #[tauri::command] fn app_info() -> serde_json::Value { serde_json::json!({ @@ -30,8 +33,15 @@ fn host_platform() -> String { pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_opener::init()) + .plugin(tauri_plugin_dialog::init()) .manage(ConnectionRegistry::new()) - .invoke_handler(tauri::generate_handler![app_info, host_platform]) + .invoke_handler(tauri::generate_handler![ + app_info, + host_platform, + db_connect_sqlite, + db_disconnect, + db_is_connected, + ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/apps/tauri/src/App.vue b/apps/tauri/src/App.vue index 7e737e2a..b9f39a93 100644 --- a/apps/tauri/src/App.vue +++ b/apps/tauri/src/App.vue @@ -1,10 +1,12 @@