From 2ef4ce357c7c860120f2c995f09cf4681fcd1f20 Mon Sep 17 00:00:00 2001 From: Guilhem Lemouel Date: Fri, 30 Oct 2026 02:18:38 -0700 Subject: [PATCH] refactor: drop the group data pages option and keep data as a sidebar section Co-Authored-By: Claude Opus 5.5 --- .../lib/components/ExploreAssetButton.svelte | 75 +++++++++++++-- .../src/lib/components/assets/exploreAsset.ts | 67 -------------- .../sidebar/DataStoresMenuItems.svelte | 91 ------------------- .../components/sidebar/SettingsMenu.svelte | 8 -- .../components/sidebar/SidebarContent.svelte | 77 ++-------------- .../components/sidebar/sidebarPrefs.svelte.ts | 4 +- 6 files changed, 77 insertions(+), 245 deletions(-) delete mode 100644 frontend/src/lib/components/assets/exploreAsset.ts delete mode 100644 frontend/src/lib/components/sidebar/DataStoresMenuItems.svelte diff --git a/frontend/src/lib/components/ExploreAssetButton.svelte b/frontend/src/lib/components/ExploreAssetButton.svelte index e2d21aa1ee..de0d70e26e 100644 --- a/frontend/src/lib/components/ExploreAssetButton.svelte +++ b/frontend/src/lib/components/ExploreAssetButton.svelte @@ -1,5 +1,15 @@ - - -{#each groups.current ?? [] as group (group.title)} -
-

{group.title}

- {#each group.stores as store (`${store.asset.kind}:${store.asset.path}`)} - exploreAsset(store.asset, { workspace: $operatingWorkspace })} - > -
- {#if store.asset.kind === 'ducklake'} - - {:else if store.asset.kind === 'datatable'} - - {:else} - - {/if} - {store.label} - {store.action} -
-
- {/each} -{/each} diff --git a/frontend/src/lib/components/sidebar/SettingsMenu.svelte b/frontend/src/lib/components/sidebar/SettingsMenu.svelte index 118c0082b4..e7c35111d3 100644 --- a/frontend/src/lib/components/sidebar/SettingsMenu.svelte +++ b/frontend/src/lib/components/sidebar/SettingsMenu.svelte @@ -22,7 +22,6 @@ GraduationCap, PanelLeft, Star, - Database, FolderOpen, Users } from 'lucide-svelte' @@ -248,13 +247,6 @@ icon: Star, toggle: sidebarPrefs.favorites.val, action: () => (sidebarPrefs.favorites.val = !sidebarPrefs.favorites.val) - }, - { - displayName: 'Group data pages', - description: 'Variables, Resources and Assets under one Data menu, rather than a Data section', - icon: Database, - toggle: !sidebarPrefs.splitData.val, - action: () => (sidebarPrefs.splitData.val = !sidebarPrefs.splitData.val) } ] }, diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte index 8aa4c483d7..e2def5e336 100644 --- a/frontend/src/lib/components/sidebar/SidebarContent.svelte +++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte @@ -53,8 +53,6 @@ getServiceIcon } from '../triggers/native/utils' import type { NativeServiceName } from '$lib/gen/types.gen' - import DataStoresMenuItems from './DataStoresMenuItems.svelte' - import { sidebarPrefs } from './sidebarPrefs.svelte' import { Menubar, Menu, @@ -62,7 +60,7 @@ MenuItem, MeltButton } from '$lib/components/meltComponents' - import MenuButton, { sidebarClasses } from './MenuButton.svelte' + import MenuButton from './MenuButton.svelte' import SidebarSectionHeader from './SidebarSectionHeader.svelte' import GoogleCloudIcon from '../icons/triggers/GoogleCloudIcon.svelte' import AzureIcon from '../icons/triggers/AzureIcon.svelte' @@ -233,29 +231,14 @@ })) .filter((l) => !excludeMainLabels.includes(l.label)) ) - // Main-menu pages folded under one menu each, to keep the nav short. - const MAIN_MENU_GROUPS = [ - { - label: 'Data', - icon: Database, - members: ['Variables', 'Resources', 'Assets'], - aiId: 'sidebar-menu-data', - aiDescription: 'Menu with the variables, resources and assets pages' - } - ] - const groupedLabels = new Set(MAIN_MENU_GROUPS.flatMap((g) => g.members)) - let ungroupedMainLinks = $derived(mainMenuLinks.filter((l) => !groupedLabels.has(l.label))) - // A disabled MenuLink renders nothing, so its page leaves the menu, and a group with no + // Main-menu pages listed in a collapsible Data section of their own, as Triggers. + const DATA_LABELS = ['Variables', 'Resources', 'Assets'] + let ungroupedMainLinks = $derived(mainMenuLinks.filter((l) => !DATA_LABELS.includes(l.label))) + // A disabled MenuLink renders nothing, so its page leaves the section, and a section with no // page left leaves the nav. - let menuGroups = $derived( - MAIN_MENU_GROUPS.map((g) => ({ - ...g, - links: mainMenuLinks.filter((l) => g.members.includes(l.label) && !l.disabled) - })).filter((g) => g.links.length > 0) + let dataLinks = $derived( + mainMenuLinks.filter((l) => DATA_LABELS.includes(l.label) && !l.disabled) ) - // "Customize sidebar" can unfold the Data menu into a collapsible section of the nav, as Triggers. - let mainMenuGroups = $derived(sidebarPrefs.splitData.val ? [] : menuGroups) - let dataSection = $derived(sidebarPrefs.splitData.val ? menuGroups[0] : undefined) const dataSectionCollapsed = useLocalStorageValue( 'windmill_data_section_collapsed', false, @@ -540,52 +523,10 @@ {#each ungroupedMainLinks as menuLink (menuLink.href ?? menuLink.label)} {/each} - - {#snippet children({ createMenu })} - {#each mainMenuGroups as group (group.label)} - {@const onGroupPage = group.links.some((l) => page.url.pathname.startsWith(l.href))} - - {#snippet triggr({ trigger })} - - {/snippet} - {#snippet children({ item })} - {#each group.links as link (link.href)} - -
- - {link.label} -
-
- {/each} - {#if group.label === 'Data'} - - {/if} - {/snippet} -
- {/each} - {/snippet} -
{/if} {#if showMain} - {#if dataSection} + {#if dataLinks.length > 0}
@@ -598,7 +539,7 @@ {/if} {#if isCollapsed || !dataSectionCollapsed.val}
- {#each dataSection.links as menuLink (menuLink.href)} + {#each dataLinks as menuLink (menuLink.href)} {/each}
diff --git a/frontend/src/lib/components/sidebar/sidebarPrefs.svelte.ts b/frontend/src/lib/components/sidebar/sidebarPrefs.svelte.ts index 53ba8154e3..f0486721b6 100644 --- a/frontend/src/lib/components/sidebar/sidebarPrefs.svelte.ts +++ b/frontend/src/lib/components/sidebar/sidebarPrefs.svelte.ts @@ -4,7 +4,5 @@ import { useLocalStorageValue } from '$lib/svelte5Utils.svelte' * menu that flips a choice and the sidebar that reads it share one value. */ export const sidebarPrefs = { /** The starred items as a section of their own. */ - favorites: useLocalStorageValue('windmill_sidebar_show_favorites', false, 'boolean'), - /** Variables, Resources and Assets as a collapsible Data section instead of one Data menu. */ - splitData: useLocalStorageValue('windmill_sidebar_split_data', true, 'boolean') + favorites: useLocalStorageValue('windmill_sidebar_show_favorites', false, 'boolean') }