github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(gui-client/linux): fix notifications (#4803)

Browse Source 
The clickable "Firezone 1.x is ready to download" notification still
isn't there. Tauri doesn't seem to have cross-platform clickable
notifications.
This commit is contained in:
Reactor Scram
2024-04-29 09:32:31 -05:00
committed by GitHub
parent c20ff5add6
commit 9cf72f2e3f
4 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
rust/Cargo.lock generated
View File

@@ -1923,7 +1923,7 @@ dependencies = [
"tauri-build",
"tauri-runtime",
"tauri-utils",
"tauri-winrt-notification",
"tauri-winrt-notification 0.2.0",
"thiserror",
"tokio",
"tokio-util",
@@ -3486,6 +3486,19 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
[[package]]
name = "mac-notification-sys"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64"
dependencies = [
"cc",
"dirs-next",
"objc-foundation",
"objc_id",
"time",
]
[[package]]
name = "mach2"
version = "0.4.2"
@@ -3878,6 +3891,19 @@ dependencies = [
"minimal-lexical",
]
[[package]]
name = "notify-rust"
version = "4.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226"
dependencies = [
"log",
"mac-notification-sys",
"serde",
"tauri-winrt-notification 0.1.3",
"zbus",
]
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@@ -6116,6 +6142,8 @@ dependencies = [
"heck 0.5.0",
"http 0.2.12",
"ignore",
"nix 0.26.4",
"notify-rust",
"objc",
"once_cell",
"open",
@@ -6285,6 +6313,16 @@ dependencies = [
"toml 0.7.8",
]
[[package]]
name = "tauri-winrt-notification"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2"
dependencies = [
"quick-xml 0.30.0",
"windows 0.51.1",
]
[[package]]
name = "tauri-winrt-notification"
version = "0.2.0"
@@ -7359,6 +7397,16 @@ dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows"
version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
dependencies = [
"windows-core 0.51.1",
"windows-targets 0.48.5",
]
[[package]]
name = "windows"
version = "0.52.0"
@@ -7399,6 +7447,15 @@ dependencies = [
"windows-tokens",
]
[[package]]
name = "windows-core"
version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows-core"
version = "0.52.0"

2
rust/gui-client/src-tauri/Cargo.toml
View File

@@ -38,7 +38,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
semver = { version = "1.0.22", features = ["serde"] }
subtle = "2.5.0"
tauri = { version = "1.6", features = [ "dialog", "shell-open-api", "system-tray" ] }
tauri = { version = "1.6", features = [ "dialog", "notification", "shell-open-api", "system-tray" ] }
tauri-runtime = "0.14.2"
tauri-utils = "1.5.3"
thiserror = { version = "1.0", default-features = false }

16
rust/gui-client/src-tauri/src/client/gui/os_linux.rs
View File

@@ -1,7 +1,7 @@
use super::{ControllerRequest, CtlrTx, Error};
use super::{ControllerRequest, CtlrTx};
use anyhow::Result;
use secrecy::{ExposeSecret, SecretString};
use tauri::Manager;
use tauri::{api::notification::Notification, Manager};
/// Open a URL in the user's default browser
pub(crate) fn open_url(app: &tauri::AppHandle, url: &SecretString) -> Result<()> {
@@ -10,8 +10,11 @@ pub(crate) fn open_url(app: &tauri::AppHandle, url: &SecretString) -> Result<()>
}
/// Show a notification in the bottom right of the screen
pub(crate) fn show_notification(_title: &str, _body: &str) -> Result<(), Error> {
// TODO
pub(crate) fn show_notification(title: &str, body: &str) -> Result<()> {
Notification::new(connlib_shared::BUNDLE_ID)
.title(title)
.body(body)
.show()?;
Ok(())
}
@@ -21,7 +24,8 @@ pub(crate) fn show_clickable_notification(
_body: &str,
_tx: CtlrTx,
_req: ControllerRequest,
) -> Result<(), Error> {
// TODO
) -> Result<()> {
// TODO: Tauri doesn't seem to have clickable notifications on Linux.
// No indication if it'll be in 2.x or if there's a good third-party replacement
Ok(())
}

6
rust/gui-client/src-tauri/src/client/gui/os_macos.rs
View File

@@ -1,5 +1,5 @@
//! This file is a stub only to do Tauri UI dev natively on a Mac.
use super::{ControllerRequest, CtlrTx, Error};
use super::{ControllerRequest, CtlrTx};
use anyhow::Result;
use secrecy::SecretString;
@@ -8,7 +8,7 @@ pub(crate) fn open_url(_app: &tauri::AppHandle, _url: &SecretString) -> Result<(
}
/// Show a notification in the bottom right of the screen
pub(crate) fn show_notification(_title: &str, _body: &str) -> Result<(), Error> {
pub(crate) fn show_notification(_title: &str, _body: &str) -> Result<()> {
unimplemented!()
}
@@ -18,6 +18,6 @@ pub(crate) fn show_clickable_notification(
_body: &str,
_tx: CtlrTx,
_req: ControllerRequest,
) -> Result<(), Error> {
) -> Result<()> {
unimplemented!()
}