From faa73cd366e8f50f8d10ee19826f51e7319adbbb Mon Sep 17 00:00:00 2001 From: Willie Date: Fri, 20 Mar 2026 00:08:01 +0800 Subject: [PATCH] refactor(ui): remove structured view panel, move Save to PageHeader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Structured view doesn't benefit from an assistant panel — the accordion already shows all rule details inline. Remove panel from structured view, restoring full-width layout. Move Save button from the YAML editor Card header to the PageHeader actions (top-right), lifted via onSaveStateChange callback. --- ui/src/pages/AuditRulesPage.tsx | 311 ++++++++++++-------------------- ui/src/pages/AuditRulesYaml.tsx | 54 +----- 2 files changed, 130 insertions(+), 235 deletions(-) diff --git a/ui/src/pages/AuditRulesPage.tsx b/ui/src/pages/AuditRulesPage.tsx index 797641e27..d2b29b139 100644 --- a/ui/src/pages/AuditRulesPage.tsx +++ b/ui/src/pages/AuditRulesPage.tsx @@ -10,6 +10,7 @@ import { EyeOff, ChevronsDownUp, ChevronsUpDown, + Save, } from 'lucide-react'; import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query'; import Card from '../components/Card'; @@ -64,11 +65,16 @@ export default function AuditRulesPage() { const [expandedRules, setExpandedRules] = useState>(new Set()); const [showResetConfirm, setShowResetConfirm] = useState(false); - // Selection + cross-view state - const [selectedRuleId, setSelectedRuleId] = useState(null); - const [selectedPattern, setSelectedPattern] = useState(null); - const [pendingRegexTest, setPendingRegexTest] = useState<{ regex: string; exclude?: string } | null>(null); - const [pendingJumpToId, setPendingJumpToId] = useState(null); + // YAML view save state (lifted from AuditRulesYaml via callback) + const [yamlDirty, setYamlDirty] = useState(false); + const [yamlSaving, setYamlSaving] = useState(false); + const yamlSaveRef = useRef<(() => void) | null>(null); + + const handleYamlSaveStateChange = useCallback((dirty: boolean, saving: boolean, onSave: () => void) => { + setYamlDirty(dirty); + setYamlSaving(saving); + yamlSaveRef.current = onSave; + }, []); // Panel collapsed state (shared with AuditRulesYaml) const [panelCollapsed, setPanelCollapsed] = useState(() => { @@ -85,18 +91,6 @@ export default function AuditRulesPage() { }); }, []); - // Cmd+B handler for panel toggle (both views) - useEffect(() => { - const handler = (e: KeyboardEvent) => { - if ((e.metaKey || e.ctrlKey) && e.key === 'b') { - e.preventDefault(); - togglePanel(); - } - }; - window.addEventListener('keydown', handler); - return () => window.removeEventListener('keydown', handler); - }, [togglePanel]); - // Measure sticky toolbar height for nested sticky group headers const toolbarRef = useRef(null); const [toolbarHeight, setToolbarHeight] = useState(0); @@ -225,41 +219,6 @@ export default function AuditRulesPage() { }; }, [compiled.data]); - // Derived: selected rule / pattern rules for assistant panel - const selectedRule = useMemo(() => { - if (!selectedRuleId || !compiled.data) return null; - return compiled.data.rules.find(r => r.id === selectedRuleId) ?? null; - }, [selectedRuleId, compiled.data]); - - const patternRules = useMemo(() => { - if (!selectedPattern || !compiled.data) return []; - return compiled.data.rules.filter(r => r.pattern === selectedPattern); - }, [selectedPattern, compiled.data]); - - // Selection callbacks - const handleRuleSelect = useCallback((ruleId: string) => { - setSelectedRuleId(ruleId); - setSelectedPattern(null); - }, []); - - const handlePatternSelect = useCallback((pattern: string) => { - setSelectedPattern(pattern); - setSelectedRuleId(null); - }, []); - - // Cross-view jump handlers - const handleTestRegex = useCallback(() => { - if (!selectedRule) return; - setPendingRegexTest({ regex: selectedRule.regex, exclude: selectedRule.exclude }); - setViewMode('yaml'); - }, [selectedRule]); - - const handleEditInYaml = useCallback(() => { - if (!selectedRule) return; - setPendingJumpToId(selectedRule.id); - setViewMode('yaml'); - }, [selectedRule]); - const togglePatternExpanded = useCallback((pattern: string) => { setExpandedPatterns((prev) => { const next = new Set(prev); @@ -267,21 +226,16 @@ export default function AuditRulesPage() { else next.add(pattern); return next; }); - handlePatternSelect(pattern); - }, [handlePatternSelect]); + }, []); const toggleRuleExpanded = useCallback((id: string) => { setExpandedRules((prev) => { const next = new Set(prev); - if (next.has(id)) { - next.delete(id); - } else { - next.add(id); - handleRuleSelect(id); - } + if (next.has(id)) next.delete(id); + else next.add(id); return next; }); - }, [handleRuleSelect]); + }, []); const expandAll = useCallback(() => { setExpandedPatterns(new Set(groupedRules.map(([p]) => p))); @@ -333,6 +287,17 @@ export default function AuditRulesPage() { <> Rule Browser )} + {viewMode === 'yaml' && ( + + )} {viewMode === 'structured' && stats.custom > 0 && ( - )} - - - - {/* Pattern accordion list */} - {groupedRules.length === 0 ? ( - - ) : ( -
- {groupedRules.map(([pattern, rules]) => ( - togglePatternExpanded(pattern)} - onToggleRuleExpand={toggleRuleExpanded} - onToggleRule={handleToggleRule} - onTogglePattern={handleTogglePattern} - onSetSeverity={handleSetSeverity} - onSetPatternSeverity={handleSetPatternSeverity} - isToggling={toggleMutation.isPending} - /> - ))} -
- )} - - -
-
- - {}} + {/* Search + expand/collapse */} +
+
+ - + setSearch(e.target.value)} + placeholder="Search by ID, message, regex, or pattern..." + className="!pl-9" + /> +
+ {groupedRules.length > 1 && ( + + )}
-
+ + {/* Pattern accordion list */} + {groupedRules.length === 0 ? ( + + ) : ( +
+ {groupedRules.map(([pattern, rules]) => ( + togglePatternExpanded(pattern)} + onToggleRuleExpand={toggleRuleExpanded} + onToggleRule={handleToggleRule} + onTogglePattern={handleTogglePattern} + onSetSeverity={handleSetSeverity} + onSetPatternSeverity={handleSetPatternSeverity} + isToggling={toggleMutation.isPending} + /> + ))} +
+ )} + )} {/* ─── YAML Editor View ─── */} @@ -489,10 +421,7 @@ export default function AuditRulesPage() { panelCollapsed={panelCollapsed} onTogglePanel={togglePanel} isProjectMode={isProjectMode} - pendingRegexTest={pendingRegexTest} - onPendingRegexTestConsumed={() => setPendingRegexTest(null)} - pendingJumpToId={pendingJumpToId} - onPendingJumpToIdConsumed={() => setPendingJumpToId(null)} + onSaveStateChange={handleYamlSaveStateChange} /> )} diff --git a/ui/src/pages/AuditRulesYaml.tsx b/ui/src/pages/AuditRulesYaml.tsx index c69e37305..abb52b198 100644 --- a/ui/src/pages/AuditRulesYaml.tsx +++ b/ui/src/pages/AuditRulesYaml.tsx @@ -28,10 +28,7 @@ interface AuditRulesYamlProps { panelCollapsed: boolean; onTogglePanel: () => void; isProjectMode: boolean; - pendingRegexTest?: { regex: string; exclude?: string } | null; - onPendingRegexTestConsumed?: () => void; - pendingJumpToId?: string | null; - onPendingJumpToIdConsumed?: () => void; + onSaveStateChange?: (dirty: boolean, saving: boolean, onSave: () => void) => void; } /* ────────────────────────────────────────────────────────────────────── @@ -73,10 +70,7 @@ export default function AuditRulesYaml({ panelCollapsed, onTogglePanel, isProjectMode, - pendingRegexTest, - onPendingRegexTestConsumed, - pendingJumpToId, - onPendingJumpToIdConsumed, + onSaveStateChange, }: AuditRulesYamlProps) { const queryClient = useQueryClient(); const { toast } = useToast(); @@ -138,31 +132,7 @@ export default function AuditRulesYaml({ return extractExcludeNearby(lines, idx) ?? undefined; }, [cursorRegex, cursorLine, raw]); - // ─── Cross-view pending state ─── - const effectiveRegex = pendingRegexTest?.regex ?? cursorRegex; - const effectiveExclude = pendingRegexTest?.exclude ?? cursorExclude; - - // Consume pendingRegexTest after it's been applied - useEffect(() => { - if (pendingRegexTest) { - onPendingRegexTestConsumed?.(); - } - }, [pendingRegexTest]); // eslint-disable-line react-hooks/exhaustive-deps - - // Consume pendingJumpToId: scroll editor to matching `id:` line - useEffect(() => { - if (pendingJumpToId && editorRef.current) { - const doc = editorRef.current.state.doc.toString(); - const lines = doc.split('\n'); - const idx = lines.findIndex(l => l.trim().startsWith(`id: ${pendingJumpToId}`)); - if (idx >= 0) { - const lineInfo = editorRef.current.state.doc.line(idx + 1); - editorRef.current.dispatch({ selection: { anchor: lineInfo.from }, scrollIntoView: true }); - editorRef.current.focus(); - } - onPendingJumpToIdConsumed?.(); - } - }, [pendingJumpToId]); // eslint-disable-line react-hooks/exhaustive-deps + // (onSaveStateChange effect moved after handleSave declaration) // ─── Linter (stable ref pattern from ConfigPage) ─── const errorsRef = useRef([]); @@ -204,6 +174,11 @@ export default function AuditRulesYaml({ saveRef.current = handleSave; + // Notify parent of save state for PageHeader Save button + useEffect(() => { + onSaveStateChange?.(dirty, saving, handleSave); + }, [dirty, saving, handleSave, onSaveStateChange]); + const saveKeymap = useMemo( () => keymap.of([{ @@ -313,15 +288,6 @@ export default function AuditRulesYaml({ {rawQuery.data!.path} - {dirty && ( - - unsaved - - )} - {panelCollapsed && ( } @@ -373,8 +339,8 @@ export default function AuditRulesYaml({ collapsed={panelCollapsed} onToggleCollapse={onTogglePanel} onRevert={handleRevert} - cursorRegex={effectiveRegex} - cursorExclude={effectiveExclude} + cursorRegex={cursorRegex} + cursorExclude={cursorExclude} />