diff --git a/internal/api/teams_config_handler.go b/internal/api/teams_config_handler.go index 152c47a4..6add757b 100644 --- a/internal/api/teams_config_handler.go +++ b/internal/api/teams_config_handler.go @@ -23,13 +23,13 @@ func NewTeamsConfigHandler(db *sql.DB) *TeamsConfigHandler { } } -type teamsConfigResponse struct { +type TeamsConfigResponse struct { Configured bool `json:"configured"` BotAppID string `json:"bot_app_id,omitempty"` TenantID string `json:"tenant_id,omitempty"` } -type teamsConfigUpdateRequest struct { +type TeamsConfigUpdateRequest struct { BotAppID string `json:"bot_app_id"` BotPassword string `json:"bot_password"` } @@ -43,12 +43,12 @@ func (h *TeamsConfigHandler) GetTeamsConfig(c echo.Context) error { cfg, err := h.storage.GetTeamsConfig(c.Request().Context(), permCtx.OrgID) if err != nil { if err == sql.ErrNoRows { - return c.JSON(http.StatusOK, teamsConfigResponse{Configured: false}) + return c.JSON(http.StatusOK, TeamsConfigResponse{Configured: false}) } return echo.NewHTTPError(http.StatusInternalServerError, "failed to get Teams config") } - return c.JSON(http.StatusOK, teamsConfigResponse{ + return c.JSON(http.StatusOK, TeamsConfigResponse{ Configured: true, BotAppID: cfg.BotAppID, TenantID: cfg.TenantID, @@ -65,7 +65,7 @@ func (h *TeamsConfigHandler) UpdateTeamsConfig(c echo.Context) error { return echo.NewHTTPError(http.StatusForbidden, "only owners can configure Teams integration") } - var req teamsConfigUpdateRequest + var req TeamsConfigUpdateRequest if err := c.Bind(&req); err != nil { return echo.NewHTTPError(http.StatusBadRequest, "invalid request body") } @@ -97,7 +97,7 @@ func (h *TeamsConfigHandler) UpdateTeamsConfig(c echo.Context) error { log.Printf("[TeamsConfig] Org %d: Teams bot configured with app ID %s", permCtx.OrgID, req.BotAppID) - return c.JSON(http.StatusOK, teamsConfigResponse{ + return c.JSON(http.StatusOK, TeamsConfigResponse{ Configured: true, BotAppID: cfg.BotAppID, }) diff --git a/osv-scanner.toml b/osv-scanner.toml index 62c1233e..74d0eb54 100644 --- a/osv-scanner.toml +++ b/osv-scanner.toml @@ -1,8 +1,4 @@ # OSV ignore list -[[ignoredVulns]] -id = "GHSA-64mm-vxmg-q3vj" -reason = "Webpack dev-server proxy configuration does not use the vulnerable host+path router option, and it is a development-only dependency that is never deployed to production." - [[ignoredVulns]] id = "GO-2026-5932" reason = "False positive — golang.org/x/crypto/openpgp sub-package is never imported by this project; only golang.org/x/crypto/bcrypt is used." diff --git a/ui/package-lock.json b/ui/package-lock.json index cf767164..d7eda5c2 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -29,6 +29,7 @@ "react-dom": "^19.0.0", "react-hook-form": "^7.62.0", "react-hot-toast": "^2.6.0", + "react-icons": "^5.7.0", "react-redux": "^9.2.0", "react-router": "^7.18.0", "react-router-dom": "^7.18.0", @@ -17162,6 +17163,15 @@ "react-dom": ">=16" } }, + "node_modules/react-icons": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.7.0.tgz", + "integrity": "sha512-LBLy340Rzqy6+/yVhZKT3B/QpP1BZaesGqasf09HPOBzRarcDIFH0WwXlXQfE7q7ipxK4MSiC5DIBWURCny6fw==", + "license": "MIT", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", diff --git a/ui/package.json b/ui/package.json index 742d5f4e..7372429d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -103,6 +103,7 @@ "react-dom": "^19.0.0", "react-hook-form": "^7.62.0", "react-hot-toast": "^2.6.0", + "react-icons": "^5.7.0", "react-redux": "^9.2.0", "react-router": "^7.18.0", "react-router-dom": "^7.18.0", diff --git a/ui/src/components/Connector/ProviderSelection.tsx b/ui/src/components/Connector/ProviderSelection.tsx index 23f65667..eef35999 100644 --- a/ui/src/components/Connector/ProviderSelection.tsx +++ b/ui/src/components/Connector/ProviderSelection.tsx @@ -23,7 +23,7 @@ const ProviderSelection: React.FC = () => { - + +); + +// A group nested inside another group (not used by any current data, but rendered flat/always-open +// as a fallback so a future 3-level entry degrades gracefully instead of needing a 3rd hover layer). +const NestedGroupFallback: React.FC<{ node: MegaMenuGroupNode; goTo: (path: string) => void }> = ({ node, goTo }) => ( +
  • +
    {node.name}
    + +
    • +); + +// Renders one top-level nav category. Which of its groups is expanded is tracked here, at the +// column level, and only collapses when the mouse leaves the WHOLE column (not a single row) — +// otherwise moving from an open group down to a sibling link collapses the group mid-transit and +// the target jumps out from under the cursor. +const SectionColumn: React.FC<{ section: MegaMenuSection; goTo: (path: string) => void; isHighlighted?: boolean; forceExpandAll?: boolean }> = ({ section, goTo, isHighlighted, forceExpandAll }) => { + // Groups a user has hovered stay expanded — switching to a sibling group must never collapse + // another one, since collapsing shifts content under the cursor and closes everything. + const [openGroups, setOpenGroups] = useState>(new Set()); + const closeTimerRef = useRef | null>(null); + + const cancelClose = () => { + if (closeTimerRef.current) { + clearTimeout(closeTimerRef.current); + closeTimerRef.current = null; + } + }; + + const scheduleClose = () => { + cancelClose(); + closeTimerRef.current = setTimeout(() => setOpenGroups(new Set()), 300); + }; + + const openGroup = (name: string) => { + cancelClose(); + setOpenGroups((prev) => (prev.has(name) ? prev : new Set(prev).add(name))); + }; + + return ( +
    + {section.items && section.items.length > 0 && ( + <> +
    + {section.icon} + {section.name} +
    +
      + {section.items.map((node: MegaMenuNode) => { + if (node.kind === 'link') { + return ; + } + const isOpen = forceExpandAll || openGroups.has(node.name); + return ( +
    • +
      openGroup(node.name)} + className={classNames( + 'flex cursor-default items-center gap-1 whitespace-nowrap rounded-lg px-2 py-1.5 text-left text-xs font-medium transition-colors', + isOpen ? 'bg-slate-700/60 text-white' : 'text-slate-300 hover:bg-slate-700/60 hover:text-white' + )} + > + + {node.icon && {node.icon}} + {node.name} + + + + +
      + {isOpen && ( +
        + {node.children.map((child) => ( + child.kind === 'link' + ? + : + ))} +
      + )} +
      • + ); + })} +
    + + )} +
    + ); +}; + +const SearchResultRow: React.FC<{ entry: MegaMenuSearchEntry; isFirst: boolean; goTo: (path: string) => void }> = ({ entry, isFirst, goTo }) => ( +
  • + +
    • +); + +export const NavMegaMenu: React.FC = ({ isOpen, onClose, sections, highlightKey, searchFocusToken }) => { + const navigate = useNavigate(); + const [query, setQuery] = useState(''); + const [isAllExpanded, setIsAllExpanded] = useState(false); + const inputRef = useRef(null); + + const searchEntries = useMemo(() => flattenMegaMenuSections(sections), [sections]); + + const results = useMemo(() => { + const trimmed = query.trim(); + if (!trimmed) return []; + return searchEntries + .map((entry) => ({ entry, score: scoreSearchEntry(entry, trimmed) })) + .filter((s): s is { entry: MegaMenuSearchEntry; score: number } => s.score !== null) + .sort((a, b) => a.score - b.score) + .slice(0, 8) + .map((s) => s.entry); + }, [searchEntries, query]); + + useEffect(() => { + if (!isOpen) { + setQuery(''); + setIsAllExpanded(false); + } + }, [isOpen]); + + useEffect(() => { + if (searchFocusToken) inputRef.current?.focus(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [searchFocusToken]); + + useEffect(() => { + if (!isOpen) return; + const handleKeyDown = (event: KeyboardEvent) => { + if (event.key === 'Escape') onClose(); + }; + document.addEventListener('keydown', handleKeyDown); + return () => document.removeEventListener('keydown', handleKeyDown); + }, [isOpen, onClose]); + + if (!isOpen) return null; + + const goTo = (path: string) => { + navigate(path); + onClose(); + }; + + const handleSearchKeyDown = (event: React.KeyboardEvent) => { + if (event.key === 'Enter' && results.length > 0) { + goTo(results[0].path); + } + }; + + return ( +
    +
    +
    + + + + setQuery(event.target.value)} + onKeyDown={handleSearchKeyDown} + onMouseEnter={(event) => event.currentTarget.focus()} + placeholder="Search actions..." + className="w-full rounded-lg border border-slate-700/60 bg-slate-800/70 py-2 pl-10 pr-16 text-sm text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500" + /> + + {shortcutKeyLabel()} + +
    + +
    + + {query.trim() ? ( +
    +
    + {results.length === 0 ? ( +

    No matches for "{query}"

    + ) : ( +
      + {results.map((entry, index) => ( + + ))} +
    + )} +
    +
    + ) : ( +
    + {sections + .filter((section) => section.items && section.items.length > 0) + .map((section) => ( + + ))} +
    + )} +
    + ); +}; + +export default NavMegaMenu; diff --git a/ui/src/components/Navbar/Navbar.tsx b/ui/src/components/Navbar/Navbar.tsx index 7973cd82..4b3c63cc 100644 --- a/ui/src/components/Navbar/Navbar.tsx +++ b/ui/src/components/Navbar/Navbar.tsx @@ -8,6 +8,9 @@ import { useOrgContext } from '../../hooks/useOrgContext'; import { isCloudMode } from '../../utils/deploymentMode'; import apiClient from '../../api/apiClient'; import { useAppSelector } from '../../store/configureStore'; +import { buildMegaMenuSections, filterMegaMenuSection, MegaMenuContext } from './megaMenuData'; +import { NavMegaMenu } from './NavMegaMenu'; +import { shortcutKeyLabel } from '../../utils/platform'; type NavbarBillingStatusResponse = { billing: { @@ -573,6 +576,11 @@ const testNavLink: NavLink = { export const Navbar: React.FC = ({ title, activePage = 'dashboard', onNavigate, onLogout }) => { const [isOpen, setIsOpen] = useState(false); + const [isMegaMenuOpen, setIsMegaMenuOpen] = useState(false); + const [hoveredNavKey, setHoveredNavKey] = useState(null); + const [searchFocusToken, setSearchFocusToken] = useState(0); + const megaMenuCloseTimerRef = useRef | null>(null); + const navRef = useRef(null); const { isDevMode } = useSystemInfo(); const { isSuperAdmin, currentOrg } = useOrgContext(); @@ -593,13 +601,89 @@ export const Navbar: React.FC = ({ title, activePage = 'dashboard', // Conditionally include test middleware link based on dev mode const navLinks = isDevMode ? [...filteredBaseLinks, testNavLink] : filteredBaseLinks; + const megaMenuContext: MegaMenuContext = { + isSuperAdmin, + hasOrg: Boolean(currentOrg), + orgRole: currentOrg?.role, + isDevMode, + }; + + const filteredMegaMenuSections = buildMegaMenuSections() + .filter(section => { + if (section.devOnly) return isDevMode; + if (section.requiresSuperAdmin) return isSuperAdmin; + if (section.requiresOwnerOrAdmin) return canManageCurrentOrg; + return true; + }) + .map(section => filterMegaMenuSection(section, megaMenuContext)); + const handleNavClick = (target: string) => { if (onNavigate) onNavigate(target); setIsOpen(false); + setIsMegaMenuOpen(false); + }; + + const openMegaMenu = () => { + if (megaMenuCloseTimerRef.current) { + clearTimeout(megaMenuCloseTimerRef.current); + megaMenuCloseTimerRef.current = null; + } + setIsMegaMenuOpen(true); }; + // Whether the cursor is "inside" the nav can't be tracked with plain onMouseEnter/onMouseLeave + // on