From c7798092d802836bf0d5478cbd88391958159e9b Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 21 Nov 2023 19:18:40 -0800 Subject: [PATCH] Remove app-specific menu items --- .run/Dev Desktop.run.xml | 3 +- src-tauri/src/main.rs | 26 ++------ src-tauri/src/window_menu.rs | 85 +++++++++++++++--------- src-web/components/core/Editor/index.tsx | 6 ++ src-web/lib/fallbackRequestName.ts | 3 +- 5 files changed, 69 insertions(+), 54 deletions(-) diff --git a/.run/Dev Desktop.run.xml b/.run/Dev Desktop.run.xml index 936d27f1..ea4d7d29 100644 --- a/.run/Dev Desktop.run.xml +++ b/.run/Dev Desktop.run.xml @@ -7,8 +7,7 @@ - - \ No newline at end of file + diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 775a5308..520678ee 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -789,28 +789,16 @@ fn main() { } fn is_dev() -> bool { - let env = option_env!("YAAK_ENV"); - env.unwrap_or("production") != "production" + #[cfg(dev)] { + return true; + } + #[cfg(not(dev))] { + return false; + } } fn create_window(handle: &AppHandle, url: Option<&str>) -> Window { - let mut app_menu = window_menu::os_default("Yaak".to_string().as_str()); - if is_dev() { - let submenu = Submenu::new( - "Developer", - Menu::new() - .add_item( - CustomMenuItem::new("refresh".to_string(), "Refresh") - .accelerator("CmdOrCtrl + Shift + r"), - ) - .add_item( - CustomMenuItem::new("toggle_devtools".to_string(), "Open Devtools") - .accelerator("CmdOrCtrl + Option + i"), - ), - ); - app_menu = app_menu.add_submenu(submenu); - } - + let app_menu = window_menu::os_default("Yaak".to_string().as_str()); let window_num = handle.windows().len(); let window_id = format!("wnd_{}", window_num); let mut win_builder = tauri::WindowBuilder::new( diff --git a/src-tauri/src/window_menu.rs b/src-tauri/src/window_menu.rs index e56a1213..52054eea 100644 --- a/src-tauri/src/window_menu.rs +++ b/src-tauri/src/window_menu.rs @@ -1,4 +1,5 @@ use tauri::{AboutMetadata, CustomMenuItem, Menu, MenuItem, Submenu}; +use crate::is_dev; pub fn os_default(#[allow(unused)] app_name: &str) -> Menu { let mut menu = Menu::new(); @@ -12,6 +13,11 @@ pub fn os_default(#[allow(unused)] app_name: &str) -> Menu { AboutMetadata::default(), )) .add_native_item(MenuItem::Separator) + .add_item( + CustomMenuItem::new("toggle_settings".to_string(), "Settings") + .accelerator("CmdOrCtrl+,"), + ) + .add_native_item(MenuItem::Separator) .add_native_item(MenuItem::Services) .add_native_item(MenuItem::Separator) .add_native_item(MenuItem::Hide) @@ -69,23 +75,23 @@ pub fn os_default(#[allow(unused)] app_name: &str) -> Menu { ) .add_item( CustomMenuItem::new("zoom_out".to_string(), "Zoom Out").accelerator("CmdOrCtrl+-"), - ) - .add_native_item(MenuItem::Separator) - .add_item( - CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar") - .accelerator("CmdOrCtrl+b"), - ) - .add_item( - CustomMenuItem::new("focus_sidebar".to_string(), "Focus Sidebar") - .accelerator("CmdOrCtrl+1"), - ) - .add_item( - CustomMenuItem::new("toggle_settings".to_string(), "Toggle Settings") - .accelerator("CmdOrCtrl+,"), - ) - .add_item( - CustomMenuItem::new("focus_url".to_string(), "Focus URL").accelerator("CmdOrCtrl+l"), ); + // .add_native_item(MenuItem::Separator) + // .add_item( + // CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar") + // .accelerator("CmdOrCtrl+b"), + // ) + // .add_item( + // CustomMenuItem::new("focus_sidebar".to_string(), "Focus Sidebar") + // .accelerator("CmdOrCtrl+1"), + // ) + // .add_item( + // CustomMenuItem::new("toggle_settings".to_string(), "Toggle Settings") + // .accelerator("CmdOrCtrl+,"), + // ) + // .add_item( + // CustomMenuItem::new("focus_url".to_string(), "Focus URL").accelerator("CmdOrCtrl+l"), + // ); menu = menu.add_submenu(Submenu::new("View", view_menu)); let mut window_menu = Menu::new(); @@ -98,22 +104,37 @@ pub fn os_default(#[allow(unused)] app_name: &str) -> Menu { window_menu = window_menu.add_native_item(MenuItem::CloseWindow); menu = menu.add_submenu(Submenu::new("Window", window_menu)); - menu = menu.add_submenu(Submenu::new( - "Workspace", - Menu::new() - .add_item( - CustomMenuItem::new("send_request".to_string(), "Send Request") - .accelerator("CmdOrCtrl+r"), - ) - .add_item( - CustomMenuItem::new("new_request".to_string(), "New Request") - .accelerator("CmdOrCtrl+n"), - ) - .add_item( - CustomMenuItem::new("duplicate_request".to_string(), "Duplicate Request") - .accelerator("CmdOrCtrl+d"), - ), - )); + // menu = menu.add_submenu(Submenu::new( + // "Workspace", + // Menu::new() + // .add_item( + // CustomMenuItem::new("send_request".to_string(), "Send Request") + // .accelerator("CmdOrCtrl+r"), + // ) + // .add_item( + // CustomMenuItem::new("new_request".to_string(), "New Request") + // .accelerator("CmdOrCtrl+n"), + // ) + // .add_item( + // CustomMenuItem::new("duplicate_request".to_string(), "Duplicate Request") + // .accelerator("CmdOrCtrl+d"), + // ), + // )); + + if is_dev() { + menu = menu.add_submenu(Submenu::new( + "Developer", + Menu::new() + .add_item( + CustomMenuItem::new("refresh".to_string(), "Refresh") + .accelerator("CmdOrCtrl + Shift + r"), + ) + .add_item( + CustomMenuItem::new("toggle_devtools".to_string(), "Open Devtools") + .accelerator("CmdOrCtrl + Option + i"), + ), + )); + } menu } diff --git a/src-web/components/core/Editor/index.tsx b/src-web/components/core/Editor/index.tsx index c51fbd2b..45f00f82 100644 --- a/src-web/components/core/Editor/index.tsx +++ b/src-web/components/core/Editor/index.tsx @@ -5,6 +5,12 @@ export type { EditorProps } from './Editor'; // showing any content // const editor = await import('./Editor'); +document.addEventListener('keydown', (e) => { + console.log('E', e.key); + e.preventDefault(); + e.stopPropagation(); +}); + export const Editor = editor.Editor; export const graphql = editor.graphql; export const getIntrospectionQuery = editor.getIntrospectionQuery; diff --git a/src-web/lib/fallbackRequestName.ts b/src-web/lib/fallbackRequestName.ts index 2be4395f..6746377b 100644 --- a/src-web/lib/fallbackRequestName.ts +++ b/src-web/lib/fallbackRequestName.ts @@ -7,7 +7,8 @@ export function fallbackRequestName(r: HttpRequest | null): string { return r.name; } - if (r.url.trim() === '') { + const withoutVariables = r.url.replace(/\$\{\[[^\]]+]}/g, ''); + if (withoutVariables.trim() === '') { return 'New Request'; }