refactor: compose TopBar center slot with server-specific controls
Some checks failed
CI / cleanup-branch (push) Has been skipped
CI / build (push) Failing after 52s
CI / docker (push) Has been skipped
CI / deploy (push) Has been skipped
CI / deploy-feature (push) Has been skipped

Update to @cameleer/design-system@0.1.40 which decomposes TopBar into a
composable shell. Move status filters, time range, search trigger, and
auto-refresh toggle from the DS TopBar into LayoutShell as composed
children. Fixes cameleer/cameleer-saas#53.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-10 17:06:03 +02:00
parent f0658cbd07
commit 2863ceef12
3 changed files with 43 additions and 8 deletions

8
ui/package-lock.json generated
View File

@@ -9,7 +9,7 @@
"version": "0.0.0",
"hasInstallScript": true,
"dependencies": {
"@cameleer/design-system": "^0.1.39",
"@cameleer/design-system": "^0.1.40",
"@tanstack/react-query": "^5.90.21",
"lucide-react": "^1.7.0",
"openapi-fetch": "^0.17.0",
@@ -279,9 +279,9 @@
}
},
"node_modules/@cameleer/design-system": {
"version": "0.1.39",
"resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.39/design-system-0.1.39.tgz",
"integrity": "sha512-fKJp00KR/KLe/8WeG1yj0NXb+6eJCQL79CJ3j2vRXFWSAhFDgTucASHd2NJRQSWBH1mQXE88AuyUonHvRKZRZA==",
"version": "0.1.40",
"resolved": "https://gitea.siegeln.net/api/packages/cameleer/npm/%40cameleer%2Fdesign-system/-/0.1.40/design-system-0.1.40.tgz",
"integrity": "sha512-RfSomx02Aj52r5Gco2hK1vCcbqSGl05+PUk1wUB+BnvNJRs0Heb1TQ8f9mxAjC017vbbnPlYdOhAphHTI23XSQ==",
"dependencies": {
"lucide-react": "^1.7.0",
"react": "^19.0.0",

View File

@@ -15,7 +15,7 @@
"postinstall": "node -e \"const fs=require('fs');fs.mkdirSync('public',{recursive:true});fs.copyFileSync('node_modules/@cameleer/design-system/assets/cameleer3-logo.svg','public/favicon.svg')\""
},
"dependencies": {
"@cameleer/design-system": "^0.1.39",
"@cameleer/design-system": "^0.1.40",
"@tanstack/react-query": "^5.90.21",
"lucide-react": "^1.7.0",
"openapi-fetch": "^0.17.0",

View File

@@ -6,6 +6,10 @@ import {
SidebarTree,
StatusDot,
TopBar,
SearchTrigger,
AutoRefreshToggle,
ButtonGroup,
TimeRangeDropdown,
CommandPalette,
CommandPaletteProvider,
GlobalFilterProvider,
@@ -15,7 +19,7 @@ import {
useGlobalFilters,
useStarred,
} from '@cameleer/design-system';
import type { SearchResult, SidebarTreeNode, DropdownItem } from '@cameleer/design-system';
import type { SearchResult, SidebarTreeNode, DropdownItem, ButtonGroupItem } from '@cameleer/design-system';
import sidebarLogo from '@cameleer/design-system/assets/cameleer3-logo.svg';
import { Box, Settings, FileText, ChevronRight, Square, Pause, Star, X, User } from 'lucide-react';
import { AboutMeDialog } from './AboutMeDialog';
@@ -264,6 +268,13 @@ function StarredList({ items, onNavigate, onRemove }: { items: StarredItem[]; on
/* Section state keys */
/* ------------------------------------------------------------------ */
const STATUS_ITEMS: ButtonGroupItem[] = [
{ value: 'completed', label: 'OK', color: 'var(--success)' },
{ value: 'warning', label: 'Warn', color: 'var(--warning)' },
{ value: 'failed', label: 'Error', color: 'var(--error)' },
{ value: 'running', label: 'Running', color: 'var(--running)' },
]
const SK_APPS = 'sidebar:section:apps';
const SK_ADMIN = 'sidebar:section:admin';
const SK_COLLAPSED = 'sidebar:collapsed';
@@ -276,7 +287,8 @@ function LayoutContent() {
const navigate = useNavigate();
const location = useLocation();
const queryClient = useQueryClient();
const { timeRange, autoRefresh, refreshTimeRange } = useGlobalFilters();
const globalFilters = useGlobalFilters();
const { timeRange, autoRefresh, refreshTimeRange } = globalFilters;
// --- Role checks ----------------------------------------------------
const isAdmin = useIsAdmin();
@@ -754,7 +766,30 @@ function LayoutContent() {
user={username ? { name: username } : undefined}
userMenuItems={userMenuItems}
onLogout={handleLogout}
>
<SearchTrigger onClick={() => setPaletteOpen(true)} />
<ButtonGroup
items={STATUS_ITEMS}
value={globalFilters.statusFilters}
onChange={(selected) => {
const current = globalFilters.statusFilters
for (const v of selected) {
if (!current.has(v)) globalFilters.toggleStatus(v as 'completed' | 'warning' | 'failed' | 'running')
}
for (const v of current) {
if (!selected.has(v)) globalFilters.toggleStatus(v as 'completed' | 'warning' | 'failed' | 'running')
}
}}
/>
<TimeRangeDropdown
value={globalFilters.timeRange}
onChange={globalFilters.setTimeRange}
/>
<AutoRefreshToggle
active={globalFilters.autoRefresh}
onChange={globalFilters.setAutoRefresh}
/>
</TopBar>
<AboutMeDialog open={aboutMeOpen} onClose={() => setAboutMeOpen(false)} />
<CommandPalette
key={isAdminPage ? 'admin' : 'ops'}