{isPresent(instanceInfo) &&
diff --git a/new-ui/src/pages/compact/CompactLocationsPage/style.scss b/new-ui/src/pages/compact/CompactLocationsPage/style.scss
index 65b91847..e5107c8f 100644
--- a/new-ui/src/pages/compact/CompactLocationsPage/style.scss
+++ b/new-ui/src/pages/compact/CompactLocationsPage/style.scss
@@ -1,7 +1,7 @@
#compact-locations-page {
display: flex;
flex-flow: column;
- min-height: 100dvh;
+ height: 100dvh;
> .compact-footer {
display: flex;
@@ -21,11 +21,22 @@
min-height: 0;
row-gap: var(--spacing-sm);
+ &.windows {
+ scrollbar-gutter: stable;
+ overflow-y: scroll;
+
+ > .locations {
+ padding-right: 6px;
+ }
+ }
+
> .locations {
display: flex;
flex-flow: column;
row-gap: var(--spacing-sm);
width: 100%;
+ box-sizing: border-box;
+ padding-right: 6px;
}
}
}
diff --git a/new-ui/src/routes/__root.tsx b/new-ui/src/routes/__root.tsx
index 0bf72615..0ba07739 100644
--- a/new-ui/src/routes/__root.tsx
+++ b/new-ui/src/routes/__root.tsx
@@ -1,5 +1,6 @@
import type { QueryClient } from '@tanstack/react-query';
import { createRootRouteWithContext, Outlet } from '@tanstack/react-router';
+import { TauriEventProvider } from '../shared/providers/TauriEventProvider';
interface RouterContext {
queryClient: QueryClient;
@@ -12,5 +13,9 @@ export const Route = createRootRouteWithContext
()({
});
function RootComponent() {
- return ;
+ return (
+
+
+
+ );
}
diff --git a/new-ui/src/routes/empty.tsx b/new-ui/src/routes/empty.tsx
index d0197839..7753c91e 100644
--- a/new-ui/src/routes/empty.tsx
+++ b/new-ui/src/routes/empty.tsx
@@ -1,9 +1,22 @@
-import { createFileRoute } from '@tanstack/react-router';
+import { useQuery } from '@tanstack/react-query';
+import { createFileRoute, useNavigate } from '@tanstack/react-router';
+import { useEffect } from 'react';
+
+import { hasAnyVisibleLocationsQueryOptions } from '../shared/rust-api/query';
export const Route = createFileRoute('/empty')({
component: RouteComponent,
});
function RouteComponent() {
- return Hello "/empty"!
;
+ const navigate = useNavigate();
+ const { data: hasLocations } = useQuery(hasAnyVisibleLocationsQueryOptions);
+
+ useEffect(() => {
+ if (hasLocations === true) {
+ void navigate({ to: '/' });
+ }
+ }, [hasLocations, navigate]);
+
+ return ;
}
diff --git a/new-ui/src/shared/providers/TauriEventProvider.tsx b/new-ui/src/shared/providers/TauriEventProvider.tsx
index 94aabbc2..fee0bfa1 100644
--- a/new-ui/src/shared/providers/TauriEventProvider.tsx
+++ b/new-ui/src/shared/providers/TauriEventProvider.tsx
@@ -26,11 +26,13 @@ export const TauriEventProvider = ({ children }: PropsWithChildren) => {
listen(TauriEvent.InstanceUpdate, () => {
void queryClient.invalidateQueries({ queryKey: ['instances'] });
void queryClient.invalidateQueries({ queryKey: ['locations'] });
+ void queryClient.invalidateQueries({ queryKey: ['has-any-visible-locations'] });
}),
listen(TauriEvent.LocationUpdate, () => {
void queryClient.invalidateQueries({ queryKey: ['locations'] });
void queryClient.invalidateQueries({ queryKey: ['location-details'] });
+ void queryClient.invalidateQueries({ queryKey: ['has-any-visible-locations'] });
}),
listen(TauriEvent.AppVersionFetch, () => {
@@ -41,6 +43,7 @@ export const TauriEventProvider = ({ children }: PropsWithChildren) => {
void queryClient.invalidateQueries({ queryKey: ['settings'] });
void queryClient.invalidateQueries({ queryKey: ['provisioning-config'] });
void queryClient.invalidateQueries({ queryKey: ['instances'] });
+ void queryClient.invalidateQueries({ queryKey: ['has-any-visible-locations'] });
}),
listen(TauriEvent.DeadConnectionDropped, () => {
diff --git a/new-ui/src/shared/rust-api/api.ts b/new-ui/src/shared/rust-api/api.ts
index 435966e9..282afd73 100644
--- a/new-ui/src/shared/rust-api/api.ts
+++ b/new-ui/src/shared/rust-api/api.ts
@@ -41,6 +41,9 @@ const saveDeviceConfig = (args: SaveConfigArgs): Promise =>
invoke(TauriCommand.AllLocations, { instanceId });
+const hasAnyVisibleLocations = (): Promise =>
+ invoke(TauriCommand.HasAnyVisibleLocations);
+
const getLocationDetails = (args: LocationDetailsArgs): Promise =>
invoke(TauriCommand.LocationInterfaceDetails, args);
@@ -139,6 +142,7 @@ export const api = {
saveDeviceConfig,
// Locations
getLocations,
+ hasAnyVisibleLocations,
getLocationDetails,
updateLocationRouting,
setLocationMfaMethod,
diff --git a/new-ui/src/shared/rust-api/query.ts b/new-ui/src/shared/rust-api/query.ts
index d42ef1a6..0d44f3ce 100644
--- a/new-ui/src/shared/rust-api/query.ts
+++ b/new-ui/src/shared/rust-api/query.ts
@@ -21,6 +21,11 @@ export const getLocationsQueryOptions = (instanceId: number) =>
queryFn: () => api.getLocations(instanceId),
});
+export const hasAnyVisibleLocationsQueryOptions = queryOptions({
+ queryKey: ['has-any-visible-locations'] as const,
+ queryFn: () => api.hasAnyVisibleLocations(),
+});
+
export const getLocationDetailsQueryOptions = (args: LocationDetailsArgs) =>
queryOptions({
queryKey: ['location-details', args.locationId, args.connectionType] as const,
diff --git a/new-ui/src/shared/rust-api/types.ts b/new-ui/src/shared/rust-api/types.ts
index 708d1b51..4f161038 100644
--- a/new-ui/src/shared/rust-api/types.ts
+++ b/new-ui/src/shared/rust-api/types.ts
@@ -73,6 +73,7 @@ export const TauriCommand = {
SaveDeviceConfig: 'save_device_config',
// Locations
AllLocations: 'all_locations',
+ HasAnyVisibleLocations: 'has_any_visible_locations',
LocationInterfaceDetails: 'location_interface_details',
UpdateLocationRouting: 'update_location_routing',
SetLocationMfaMethod: 'set_location_mfa_method',
diff --git a/new-ui/src/shared/scss/_base.scss b/new-ui/src/shared/scss/_base.scss
index 1efbcd5b..fc20585f 100644
--- a/new-ui/src/shared/scss/_base.scss
+++ b/new-ui/src/shared/scss/_base.scss
@@ -71,3 +71,21 @@ ol {
margin: 0;
padding: 0;
}
+
+::-webkit-scrollbar {
+ width: 4px;
+}
+
+::-webkit-scrollbar-track {
+ background: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+ background: transparent;
+ border-radius: 100px;
+}
+
+* {
+ scrollbar-width: thin;
+ scrollbar-color: var(--fg-white-50) transparent;
+}
diff --git a/src-tauri/permissions/default.toml b/src-tauri/permissions/default.toml
index 610c903d..11d31ed3 100644
--- a/src-tauri/permissions/default.toml
+++ b/src-tauri/permissions/default.toml
@@ -3,6 +3,7 @@ identifier = "allow-app-commands"
description = "Allow all application commands for both UI windows (old-ui and new-ui)."
commands.allow = [
"all_locations",
+ "has_any_visible_locations",
"save_device_config",
"all_instances",
"connect",
diff --git a/src-tauri/src/bin/defguard-client.rs b/src-tauri/src/bin/defguard-client.rs
index 34a85400..15c10029 100644
--- a/src-tauri/src/bin/defguard-client.rs
+++ b/src-tauri/src/bin/defguard-client.rs
@@ -156,6 +156,7 @@ fn main() {
let app = Builder::default()
.invoke_handler(tauri::generate_handler![
all_locations,
+ has_any_visible_locations,
save_device_config,
all_instances,
connect,
@@ -194,8 +195,8 @@ fn main() {
])
.on_window_event(|window, event| {
if let WindowEvent::CloseRequested { api, .. } = event {
- // Only prevent close on the tray (new-ui) window; let other windows close normally.
- if window.label() == NEW_UI_WINDOW_ID {
+ let label = window.label();
+ if label == NEW_UI_WINDOW_ID || label == OLD_UI_WINDOW_ID {
#[cfg(not(target_os = "macos"))]
let _ = window.hide();
@@ -351,6 +352,15 @@ fn main() {
let state = AppState::new(config, provisioning_config);
app.manage(state);
+ // Pre-build both windows hidden so they can be shown/hidden without recreation.
+ if let Err(e) = WindowManager::build_tray_window(app_handle) {
+ warn!("Failed to pre-build tray window: {e}");
+ }
+ if let Err(e) = WindowManager::build_full_window(app_handle) {
+ warn!("Failed to pre-build full window: {e}");
+ }
+
+ // Decide which window to show based on platform and available locations.
#[cfg(target_os = "linux")]
{
let _ = WindowManager::open_full_view(app_handle);
@@ -363,7 +373,7 @@ fn main() {
if has_locations {
WindowManager::open_tray(app_handle)?;
} else {
- info!("No locations found, spawning full view on startup.");
+ info!("No locations found, showing full view on startup.");
let _ = WindowManager::open_full_view(app_handle);
}
}
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index af70e7ba..4b989311 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -567,6 +567,26 @@ pub async fn all_locations(instance_id: Id) -> Result, Error>
Ok(location_info)
}
+/// Returns `true` if there is at least one visible (non-service) location across all instances.
+/// Shares the same visibility filter as [`all_locations`] (`include_service_locations = false`).
+#[tauri::command(async)]
+pub async fn has_any_visible_locations() -> Result {
+ trace!("Checking whether any visible locations exist.");
+ let instances = Instance::all(&*DB_POOL).await?;
+ for instance in &instances {
+ let locations = Location::find_by_instance_id(&*DB_POOL, instance.id, false).await?;
+ if !locations.is_empty() {
+ trace!(
+ "Found at least one visible location in instance {}.",
+ instance.name
+ );
+ return Ok(true);
+ }
+ }
+ trace!("No visible locations found.");
+ Ok(false)
+}
+
#[derive(Serialize, Debug)]
pub struct LocationInterfaceDetails {
pub location_id: Id,
diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs
index 4339c6bd..b4efd353 100644
--- a/src-tauri/src/tray.rs
+++ b/src-tauri/src/tray.rs
@@ -8,6 +8,8 @@ use tauri::{
use tauri::tray::{MouseButton, MouseButtonState, TrayIconEvent};
+#[cfg(not(target_os = "linux"))]
+use crate::window_manager::WindowManager;
use crate::{
active_connections::{get_connection_id_by_type, ACTIVE_CONNECTIONS},
appstate::AppState,
@@ -38,8 +40,7 @@ fn store_tray_click_position(app: &AppHandle, event: &TrayIconEvent) {
button_state: MouseButtonState::Down,
rect,
..
- }
- | TrayIconEvent::DoubleClick { rect, .. } => Some(rect.position.to_physical(1.0)),
+ } => Some(rect.position.to_physical(1.0)),
_ => None,
};
@@ -141,30 +142,9 @@ async fn generate_tray_menu(app: &AppHandle) -> Result, Error
pub async fn setup_tray(app: &AppHandle) -> Result<(), Error> {
let tray_menu = generate_tray_menu(app).await?;
- // On macOS, always show menu under system tray icon.
- #[cfg(target_os = "macos")]
- TrayIconBuilder::with_id(TRAY_ICON_ID)
- .menu(&tray_menu)
- .show_menu_on_left_click(true)
- .on_tray_icon_event(|icon, event| {
- store_tray_click_position(icon.app_handle(), &event);
- if let TrayIconEvent::Click {
- button: MouseButton::Left,
- button_state: MouseButtonState::Up,
- ..
- } = event
- {
- show_new_ui_window_near_tray(icon.app_handle());
- }
- })
- .on_menu_event(handle_tray_menu_event)
- .build(app)?;
- // On other systems (especially Windows), system tray menu is on right-click,
- // and double-click shows the main window.
- #[cfg(not(target_os = "macos"))]
TrayIconBuilder::with_id(TRAY_ICON_ID)
.menu(&tray_menu)
- .show_menu_on_left_click(false)
+ .show_menu_on_left_click(cfg!(target_os = "macos"))
.on_tray_icon_event(|icon, event| {
store_tray_click_position(icon.app_handle(), &event);
if let TrayIconEvent::Click {
@@ -173,7 +153,29 @@ pub async fn setup_tray(app: &AppHandle) -> Result<(), Error> {
..
} = event
{
- show_new_ui_window_near_tray(icon.app_handle());
+ let app = icon.app_handle();
+ let any_visible = [NEW_UI_WINDOW_ID, OLD_UI_WINDOW_ID].iter().any(|id| {
+ app.get_webview_window(id)
+ .and_then(|w| w.is_visible().ok())
+ .unwrap_or(false)
+ });
+ if any_visible {
+ hide_visible_windows(app);
+ } else {
+ #[cfg(not(target_os = "linux"))]
+ {
+ let has_locations = tauri::async_runtime::block_on(
+ crate::window_manager::has_non_service_locations(),
+ );
+ if has_locations {
+ show_new_ui_window_near_tray(app);
+ } else {
+ let _ = WindowManager::open_full_view(app);
+ }
+ }
+ #[cfg(target_os = "linux")]
+ show_new_ui_window_near_tray(app);
+ }
}
})
.on_menu_event(handle_tray_menu_event)
@@ -197,16 +199,15 @@ pub(crate) async fn reload_tray_menu(app: &AppHandle) {
}
}
-fn hide_main_window(app: &AppHandle) {
+fn hide_visible_windows(app: &AppHandle) {
#[cfg(target_os = "macos")]
if let Err(err) = app.hide() {
warn!("Failed to hide application: {err}");
}
- #[cfg(not(target_os = "macos"))]
- for window_id in [NEW_UI_WINDOW_ID, OLD_UI_WINDOW_ID] {
- if let Some(window) = app.get_webview_window(window_id) {
+ for (id, window) in app.webview_windows() {
+ if window.is_visible().unwrap_or(false) {
if let Err(err) = window.hide() {
- warn!("Failed to hide window {window_id}: {err}");
+ warn!("Failed to hide window {id}: {err}");
}
}
}
@@ -224,11 +225,8 @@ pub fn show_main_window(app: &AppHandle) {
if let Err(err) = app.show() {
warn!("Failed to show application: {err}");
}
- #[cfg(not(target_os = "macos"))]
- {
- if let Err(err) = window.show() {
- warn!("Failed to show main window: {err}");
- }
+ if let Err(err) = window.show() {
+ warn!("Failed to show main window: {err}");
}
let _ = window.set_focus();
}
@@ -243,7 +241,7 @@ pub fn handle_tray_menu_event(app: &AppHandle, event: MenuEvent) {
handle.exit(0);
}
TRAY_EVENT_SHOW => show_new_ui_window_near_tray(app),
- TRAY_EVENT_HIDE => hide_main_window(app),
+ TRAY_EVENT_HIDE => hide_visible_windows(app),
TRAY_EVENT_UPDATES => {
let _ = webbrowser::open(SUBSCRIBE_UPDATES_LINK);
}
diff --git a/src-tauri/src/window_manager/mod.rs b/src-tauri/src/window_manager/mod.rs
index 780e41cc..d821fd48 100644
--- a/src-tauri/src/window_manager/mod.rs
+++ b/src-tauri/src/window_manager/mod.rs
@@ -58,6 +58,7 @@ impl WindowManager {
.title("Defguard")
.inner_size(OLD_UI_WIDTH, OLD_UI_HEIGHT)
.decorations(true)
+ .visible(false)
.build()
}
}
@@ -93,29 +94,14 @@ pub fn swap_to_old_ui(app: AppHandle) {
tauri::async_runtime::spawn(async move {
// Sleep briefly to let the IPC handler return
tokio::time::sleep(std::time::Duration::from_millis(50)).await;
- tracing::info!("swap_to_old_ui task: Opening full view");
- match WindowManager::open_full_view(&app) {
- Ok(_) => {
- tracing::info!(
- "swap_to_old_ui task: open_full_view succeeded, sleeping before destroy"
- );
- tokio::time::sleep(std::time::Duration::from_millis(150)).await;
- if let Some(w) = tauri::Manager::get_webview_window(&app, NEW_UI_WINDOW_ID) {
- tracing::info!("swap_to_old_ui task: Destroying new-ui window");
- if let Err(e) = w.destroy() {
- tracing::error!(
- "swap_to_old_ui task: Failed to destroy new-ui window: {:?}",
- e
- );
- }
- } else {
- tracing::warn!("swap_to_old_ui task: new-ui window not found to destroy");
- }
- }
- Err(e) => {
- tracing::error!("swap_to_old_ui task: open_full_view failed: {:?}", e);
+ if let Some(w) = tauri::Manager::get_webview_window(&app, NEW_UI_WINDOW_ID) {
+ if let Err(e) = w.hide() {
+ tracing::error!("swap_to_old_ui task: Failed to hide new-ui window: {:?}", e);
}
}
+ if let Err(e) = WindowManager::open_full_view(&app) {
+ tracing::error!("swap_to_old_ui task: Failed to open full view: {:?}", e);
+ }
});
}
@@ -125,15 +111,15 @@ pub fn close_tray_window(app: AppHandle) {
tauri::async_runtime::spawn(async move {
tokio::time::sleep(std::time::Duration::from_millis(50)).await;
if let Some(w) = tauri::Manager::get_webview_window(&app, NEW_UI_WINDOW_ID) {
- tracing::info!("close_tray_window task: Destroying new-ui window");
- if let Err(e) = w.destroy() {
+ tracing::info!("close_tray_window task: Hiding new-ui window");
+ if let Err(e) = w.hide() {
tracing::error!(
- "close_tray_window task: Failed to destroy new-ui window: {:?}",
+ "close_tray_window task: Failed to hide new-ui window: {:?}",
e
);
}
} else {
- tracing::warn!("close_tray_window task: new-ui window not found to destroy");
+ tracing::warn!("close_tray_window task: new-ui window not found");
}
});
}
@@ -143,19 +129,11 @@ pub fn swap_to_new_ui(app: AppHandle) {
tracing::info!("swap_to_new_ui called");
tauri::async_runtime::spawn(async move {
tokio::time::sleep(std::time::Duration::from_millis(50)).await;
- tracing::info!("swap_to_new_ui task: Showing new UI window");
show_new_ui_window(&app);
- tokio::time::sleep(std::time::Duration::from_millis(150)).await;
if let Some(w) = tauri::Manager::get_webview_window(&app, OLD_UI_WINDOW_ID) {
- tracing::info!("swap_to_new_ui task: Destroying old-ui window");
- if let Err(e) = w.destroy() {
- tracing::error!(
- "swap_to_new_ui task: Failed to destroy old-ui window: {:?}",
- e
- );
+ if let Err(e) = w.hide() {
+ tracing::error!("swap_to_new_ui task: Failed to hide old-ui window: {:?}", e);
}
- } else {
- tracing::warn!("swap_to_new_ui task: old-ui window not found to destroy");
}
});
}