diff --git a/desktop/docs/UI_FEEDBACK.md b/desktop/docs/UI_FEEDBACK.md index 91dba17b1..69ef43ad9 100644 --- a/desktop/docs/UI_FEEDBACK.md +++ b/desktop/docs/UI_FEEDBACK.md @@ -34,7 +34,7 @@ Single source of truth for how the shell surfaces status, errors, and confirmati **Use for:** destructive actions, import-with-issues, closing unsaved observation tabs. -- `confirmDestructiveAction()` for destructive flows (always strict production-tier wording). +- `confirmDestructiveAction()` for destructive flows (clear, profile-scoped wording). - `confirm()` from `@tauri-apps/plugin-dialog` for save-anyway / import-anyway / tab discard (Save / Don't save / Cancel via separate flows). ## Retired patterns diff --git a/desktop/package.json b/desktop/package.json index eaf8ab25a..cd523288f 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,7 +1,7 @@ { "name": "ode-desktop", "private": true, - "version": "1.1.1", + "version": "1.2.0", "packageManager": "pnpm@10.33.2", "type": "module", "scripts": { diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock index aca5128db..ba6862051 100644 --- a/desktop/src-tauri/Cargo.lock +++ b/desktop/src-tauri/Cargo.lock @@ -2600,7 +2600,7 @@ dependencies = [ [[package]] name = "odedesktop" -version = "1.1.1" +version = "1.2.0" dependencies = [ "chrono", "futures-util", diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index 7a6e011c9..b78a4c426 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "odedesktop" -version = "1.1.1" +version = "1.2.0" description = "ODE Desktop" authors = ["OpenDataEnsemble.org"] edition = "2024" diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs index f8f9de340..9d7c74085 100644 --- a/desktop/src-tauri/src/lib.rs +++ b/desktop/src-tauri/src/lib.rs @@ -103,16 +103,6 @@ pub struct BundleFormSpec { pub ui_schema: Value, } -/// Client-side guardrail for confirmations (not interpreted by Synkronus). -#[derive(Debug, Clone, Copy, Serialize, Deserialize, Default, PartialEq, Eq)] -#[serde(rename_all = "lowercase")] -enum ProfileEnvironment { - #[default] - Production, - Staging, - Development, -} - #[derive(Debug, Clone, Copy, Serialize, Deserialize, Default, PartialEq, Eq)] #[serde(rename_all = "snake_case")] enum DefaultAppMode { @@ -132,8 +122,6 @@ struct ServerProfile { database_path: String, attachments_path: Option, #[serde(default)] - environment: ProfileEnvironment, - #[serde(default)] default_app_mode: DefaultAppMode, #[serde(default)] custom_app_developer_mode: bool, @@ -847,7 +835,6 @@ fn default_app_config(data_dir: &Path) -> AppConfigFile { workspace_path: Some(workspace_dir.to_string_lossy().to_string()), database_path: db_path.to_string_lossy().to_string(), attachments_path: None, - environment: ProfileEnvironment::default(), default_app_mode: DefaultAppMode::default(), custom_app_developer_mode: false, custom_app_local_folder: None, @@ -870,7 +857,6 @@ fn migrate_legacy_workspace(workspace_path: &str, _data_dir: &Path) -> AppConfig workspace_path: Some(workspace_path.to_string()), database_path: db.to_string_lossy().to_string(), attachments_path: None, - environment: ProfileEnvironment::default(), default_app_mode: DefaultAppMode::default(), custom_app_developer_mode: false, custom_app_local_folder: None, diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json index b9e978466..a82c8b562 100644 --- a/desktop/src-tauri/tauri.conf.json +++ b/desktop/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "ODE Desktop", - "version": "1.1.1", + "version": "1.2.0", "identifier": "org.opendataensemble.custodian", "build": { "beforeDevCommand": "pnpm dev", diff --git a/desktop/src/components/ObservationIndexPrompt.tsx b/desktop/src/components/ObservationIndexPrompt.tsx index f06b387ca..bed1b3f38 100644 --- a/desktop/src/components/ObservationIndexPrompt.tsx +++ b/desktop/src/components/ObservationIndexPrompt.tsx @@ -67,8 +67,8 @@ export function ObservationIndexPrompt() {

- Indexes are created on this profile's production database (the - same store used for sync and observations). This is not limited to + Indexes are created in this profile's local database (the same + store used for sync and observations). This is not limited to developer mode or the dev mirror folder.