From 090388bf2cef7835d6fecd8b613eabf86b800030 Mon Sep 17 00:00:00 2001 From: wendrul <53628737+wendrul@users.noreply.github.com> Date: Tue, 20 May 2025 14:25:10 +0200 Subject: [PATCH] Add missing trigger pages to quick access menu (Ctrl + K) (#5780) * Add extra menu items on ctrl+k for other triggers * Fix run search container It used to be truncated when showing the ee message --- .../search/GlobalSearchModal.svelte | 148 +++++++++++++++--- 1 file changed, 123 insertions(+), 25 deletions(-) diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte index 9ca20adbe4..271389b007 100644 --- a/frontend/src/lib/components/search/GlobalSearchModal.svelte +++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte @@ -18,13 +18,16 @@ BoxesIcon, CalendarIcon, Code2Icon, + Database, DollarSignIcon, HomeIcon, LayoutDashboardIcon, Loader2, PlayIcon, + Route, Search, - SearchCode + SearchCode, + Unplug } from 'lucide-svelte' import JobPreview from '../runs/JobPreview.svelte' import Portal from '$lib/components/Portal.svelte' @@ -33,13 +36,14 @@ import ContentSearchInner from '../ContentSearchInner.svelte' import { goto } from '$app/navigation' import QuickMenuItem from '../search/QuickMenuItem.svelte' - import { devopsRole, enterpriseLicense, workspaceStore } from '$lib/stores' + import { devopsRole, enterpriseLicense, userStore, workspaceStore } from '$lib/stores' import uFuzzy from '@leeoniya/ufuzzy' import BarsStaggered from '../icons/BarsStaggered.svelte' import { scroll_into_view_if_needed_polyfill } from '../multiselect/utils' import { Alert } from '../common' import Popover from '../Popover.svelte' import Logs from 'lucide-svelte/icons/logs' + import { AwsIcon, GoogleCloudIcon, KafkaIcon, MqttIcon, NatsIcon } from '../icons' let open: boolean = false @@ -63,43 +67,122 @@ action: () => void icon?: any shortcutKey?: string + disabled?: boolean } let switchModeItems: quickMenuItem[] = [ { search_id: 'switchto:run-search', - label: 'Search across completed runs', + label: 'Search across completed runs' + ($enterpriseLicense ? '' : ' (EE)'), action: () => switchMode('runs'), shortcutKey: RUNS_PREFIX, - icon: Search + icon: Search, + disabled: false }, { search_id: 'switchto:content-search', label: 'Search scripts/flows/apps based on content', action: () => switchMode('content'), shortcutKey: CONTENT_SEARCH_PREFIX, - icon: SearchCode + icon: SearchCode, + disabled: false } ] + + // These items are searchable but do not appear initially on the menu. + let hiddenMenuItems = [ + { + search_id: 'nav:http_routes', + label: 'Go to HTTP routes', + action: () => gotoPage('/routes'), + icon: Route, + disabled: $userStore?.operator + }, + { + search_id: 'nav:web_sockets', + label: 'Go to WebSockets', + action: () => gotoPage('/websocket_triggers'), + icon: Unplug, + disabled: $userStore?.operator + }, + { + search_id: 'nav:postgres_triggers', + label: 'Go to Postgres triggers', + action: () => gotoPage('/postgres_triggers'), + icon: Database, + disabled: $userStore?.operator + }, + { + search_id: 'nav:kafka_triggers', + label: 'Go to Kafka triggers' + ($enterpriseLicense ? '' : ' (EE)'), + action: () => gotoPage('/kafka_triggers'), + icon: KafkaIcon, + disabled: $userStore?.operator + }, + { + search_id: 'nav:nats_triggers', + label: 'Go to NATS triggers' + ($enterpriseLicense ? '' : ' (EE)'), + action: () => gotoPage('/nats_triggers'), + icon: NatsIcon, + disabled: $userStore?.operator + }, + { + search_id: 'nav:sqs_triggers', + label: 'Go to SQS triggers' + ($enterpriseLicense ? '' : ' (EE)'), + action: () => gotoPage('/sqs_triggers'), + icon: AwsIcon, + disabled: $userStore?.operator + }, + { + search_id: 'nav:gcp_pub_sub', + label: 'Go to GCP Pub/Sub' + ($enterpriseLicense ? '' : ' (EE)'), + action: () => gotoPage('/gcp_triggers'), + icon: GoogleCloudIcon, + disabled: $userStore?.operator + }, + { + search_id: 'nav:mqtt_triggers', + label: 'Go to MQTT triggers', + action: () => gotoPage('/mqtt_triggers'), + icon: MqttIcon, + disabled: $userStore?.operator + } + ] + let defaultMenuItems: quickMenuItem[] = [ - { search_id: 'nav:home', label: 'Go to Home', action: () => gotoPage('/'), icon: HomeIcon }, - { search_id: 'nav:runs', label: 'Go to Runs', action: () => gotoPage('/runs'), icon: PlayIcon }, + { + search_id: 'nav:home', + label: 'Go to Home', + action: () => gotoPage('/'), + icon: HomeIcon, + disabled: false + }, + { + search_id: 'nav:runs', + label: 'Go to Runs', + action: () => gotoPage('/runs'), + icon: PlayIcon, + disabled: false + }, { search_id: 'nav:variables', label: 'Go to Variables', action: () => gotoPage('/variables'), - icon: DollarSignIcon + icon: DollarSignIcon, + disabled: false }, { search_id: 'nav:resources', label: 'Go to Resources', action: () => gotoPage('/resources'), - icon: BoxesIcon + icon: BoxesIcon, + disabled: false }, { - search_id: 'nav:schedules', + search_id: 'nav:schedules_triggers', label: 'Go to Schedules', action: () => gotoPage('/schedules'), - icon: CalendarIcon + icon: CalendarIcon, + disabled: false }, ...switchModeItems, { @@ -107,10 +190,13 @@ label: 'Explore windmill service logs', action: () => gotoPage('/service_logs'), shortcutKey: LOGS_PREFIX, - icon: Logs + icon: Logs, + disabled: !$devopsRole } ] + let defaultMenuItemsWithHidden = [...defaultMenuItems, ...hiddenMenuItems] + let itemMap = { default: defaultMenuItems as any[], 'switch-mode': switchModeItems, @@ -152,6 +238,7 @@ let uf = new uFuzzy(opts) let defaultMenuItemLabels = defaultMenuItems.map((item) => item.label) + let defaultMenuItemAndHiddenLabels = defaultMenuItemsWithHidden.map((item) => item.label) let switchModeItemLabels = switchModeItems.map((item) => item.label) function fuzzyFilter(filter: string, items: any[], itemsPlainText: string[]) { @@ -210,7 +297,14 @@ } if (tab === 'default') { - itemMap['default'] = fuzzyFilter(searchTerm, defaultMenuItems, defaultMenuItemLabels) + if (searchTerm === '') + itemMap['default'] = fuzzyFilter(searchTerm, defaultMenuItems, defaultMenuItemLabels) + else + itemMap['default'] = fuzzyFilter( + searchTerm, + defaultMenuItemsWithHidden, + defaultMenuItemAndHiddenLabels + ) if (combinedItems) { itemMap['default'] = itemMap['default'].concat( fuzzyFilter( @@ -552,20 +646,24 @@
{#if tab === 'default' || tab === 'switch-mode'} - {@const items = (itemMap[tab] ?? []).filter((e) => defaultMenuItems.includes(e))} + {@const items = (itemMap[tab] ?? []).filter((e) => + defaultMenuItemsWithHidden.includes(e) + )} {#if items.length > 0}
{#each items as el} - (selectedItem = el)} - id={el?.search_id} - hovered={el?.search_id === selectedItem?.search_id} - label={el?.label} - icon={el?.icon} - shortcutKey={el?.shortcutKey} - bind:mouseMoved - /> + {#if !el.disabled} + (selectedItem = el)} + id={el?.search_id} + hovered={el?.search_id === selectedItem?.search_id} + label={el?.label} + icon={el?.icon} + shortcutKey={el?.shortcutKey} + bind:mouseMoved + /> + {/if} {/each}
{/if} @@ -718,7 +816,7 @@
{:else} -
+
{#if searchTerm === RUNS_PREFIX}
Enter your search terms