A modern platform for visual, flexible, and extensible graph-based investigations. For cybersecurity analysts and investigators.
feat(app): update toolbars layout
dextmorgnffd44968adc4
diff --git a/flowsint-app/src/components/sketches/toolbar.tsx b/flowsint-app/src/components/sketches/toolbar.tsxindex 69c76ec0..375971e4 100644--- a/flowsint-app/src/components/sketches/toolbar.tsx+++ b/flowsint-app/src/components/sketches/toolbar.tsx@@ -3,22 +3,21 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltipimport { useConfirm } from '@/components/use-confirm-dialog'import { cn } from '@/lib/utils'import { useGraphControls } from '@/stores/graph-controls-store'-import { useGraphSaveStatus } from '@/stores/graph-save-status-store'import { useGraphStore } from '@/stores/graph-store'import {FunnelPlus,GitFork,GitPullRequestArrow,- LassoSelect,Maximize,Merge,Minus,RotateCw,ZoomIn,- ChevronDown,- SquareDashed,Focus,- Download+ Download,+ LassoSelect,+ ChevronDown,+ SquareDashed} from 'lucide-react'import { memo, useCallback } from 'react'import { toast } from 'sonner'@@ -70,7 +69,7 @@ export const ToolbarButton = memo(function ToolbarButton({'h-7 relative items-center shadow-none',!showLabel && 'w-7',toggled &&- 'bg-primary/30 border-primary/40 text-primary hover:bg-primary/40 hover:text-primary'+ 'bg-primary/30 border-primary/40 text-primary hover:bg-primary/40 hover:text-primary')}>{icon} {showLabel && <span className="hidden md:block">{tooltip}</span>}@@ -86,6 +85,24 @@ export const ToolbarButton = memo(function ToolbarButton({</Tooltip>)})++const FloatingBar = ({+ children,+ className+}: {+ children: React.ReactNode+ className?: string+}) => (+ <div+ className={cn(+ 'absolute z-50 flex items-center gap-0.5 rounded-lg border bg-card p-1',+ className+ )}+ >+ {children}+ </div>+)+export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean }) {const { confirm } = useConfirm()const { id: sketchId } = useParams({ strict: false })@@ -105,7 +122,6 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: booleanconst setOpenAddRelationDialog = useGraphStore((state) => state.setOpenAddRelationDialog)const setOpenMergeDialog = useGraphStore((state) => state.setOpenMergeDialog)const filters = useGraphStore((s) => s.filters)- const saveStatus = useGraphSaveStatus((s) => s.saveStatus)useKeyboard('s',@@ -188,7 +204,7 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: booleanif (!sketchId) returntry {if (format === 'png') {- await exportToPNG("null", "null")+ await exportToPNG('null', 'null')} else {await sketchService.exportSketch(sketchId, format)}@@ -204,34 +220,16 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: booleanconst areExactlyTwoSelected = selectedNodes.length === 2const areMergeable =- selectedNodes.length > 1 &&- selectedNodes.every((n) => n.nodeType === selectedNodes[0].nodeType)+ selectedNodes.length > 1 && selectedNodes.every((n) => n.nodeType === selectedNodes[0].nodeType)const hasFilters = !(filters.types.every((t) => t.checked) || filters.types.every((t) => !t.checked))return (- <div className="flex justify-between h-10 z-50 items-center gap-6 overflow-x-auto overflow-y-hidden hide-scrollbar w-full border-b bg-card p-1 px-2">- <div className="flex h-full items-center gap-2">- <div className="flex gap-1">- <ToolbarButton- icon={<GitPullRequestArrow className="h-4 w-4 opacity-70" />}- tooltip="Connect"- onClick={handleOpenAddRelationDialog}- disabled={!areExactlyTwoSelected}- badge={areExactlyTwoSelected ? 2 : null}- />- <ToolbarButton- icon={<Merge className="h-4 w-4 opacity-70" />}- tooltip="Merge"- onClick={handleOpenMergeDialog}- disabled={!areMergeable}- badge={areMergeable ? selectedNodes.length : null}- />- <PathFinder />- </div>- <Separator decorative orientation="vertical" />- <div className="flex gap-1">+ <>+ {/* Bottom-left: Zoom controls */}+ {(view === 'graph' || view === 'map') && (+ <FloatingBar className="bottom-3 left-3"><ToolbarButtonicon={<ZoomIn className="h-4 w-4 opacity-70" />}tooltip="Zoom In"@@ -256,32 +254,35 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: booleanonClick={zoomToSelection}disabled={view !== 'graph' || isSelectorModeActive || selectedNodes.length < 2}/>- </div>- <Separator decorative orientation="vertical" />- <div className="flex gap-0.5">- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="ghost"- size="icon"- onClick={handleToggleSelector}- disabled={view !== 'graph'}- className={cn(- 'h-7 w-7 rounded relative items-center shadow-none',- isSelectorModeActive &&- 'bg-primary/30 border-primary/40 text-primary hover:bg-primary/40 hover:text-primary'- )}- >- {selectionMode === 'lasso' ? (- <LassoSelect className="h-4 w-4 opacity-70" />- ) : (- <SquareDashed className="h-4 w-4 opacity-70" />- )}- </Button>- </TooltipTrigger>- <TooltipContent>Select (hold S)</TooltipContent>- </Tooltip>- <div>+ </FloatingBar>+ )}++ {/* Left middle: Selection, Actions & Layout */}+ {view === 'graph' && (+ <FloatingBar className="left-3 top-1/2 -translate-y-1/2 flex-col">+ <div className="flex flex-col items-center">+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="ghost"+ size="icon"+ onClick={handleToggleSelector}+ disabled={view !== 'graph'}+ className={cn(+ 'h-7 w-7 rounded relative items-center shadow-none',+ isSelectorModeActive &&+ 'bg-primary/30 border-primary/40 text-primary hover:bg-primary/40 hover:text-primary'+ )}+ >+ {selectionMode === 'lasso' ? (+ <LassoSelect className="h-4 w-4 opacity-70" />+ ) : (+ <SquareDashed className="h-4 w-4 opacity-70" />+ )}+ </Button>+ </TooltipTrigger>+ <TooltipContent>Select (hold S)</TooltipContent>+ </Tooltip><DropdownMenu><DropdownMenuTrigger asChild><div>@@ -292,9 +293,9 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: booleansize="icon"disabled={view !== 'graph'}className={cn(- 'h-7 w-5 px-0 rounded relative items-center shadow-none',+ 'h-3! w-5 px-0 rounded relative items-center shadow-none',isSelectorModeActive &&- 'bg-primary/30 border-primary/40 text-primary hover:bg-primary/40 hover:text-primary'+ 'bg-primary/30 border-primary/40 text-primary hover:bg-primary/40 hover:text-primary')}><ChevronDown className="h-3 w-3 opacity-50" />@@ -322,41 +323,54 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean</DropdownMenuContent></DropdownMenu></div>- </div>- <Separator orientation="vertical" />- <div>- <Filters>- <ToolbarButton- disabled={isLoading}- icon={<FunnelPlus className={cn('h-4 w-4 opacity-70')} />}- tooltip="Filters"- showLabel- toggled={hasFilters}- />- </Filters>- </div>- <Separator orientation="vertical" />- <div className="flex items-center gap-1">- <>- <ToolbarButton- icon={<NetworkIcon className="h-4 w-4 opacity-70" />}- tooltip={'Force layout'}- onClick={handleApplyForceLayout}- disabled={isLoading || view !== 'graph'}- />- <ToolbarButton- icon={<GitFork strokeWidth={1.4} className="h-4 w-4 opacity-70 rotate-180" />}- tooltip={'Hierarchy layout'}- onClick={handleApplyHierarchyLayout}- disabled={isLoading || view !== 'graph'}- />- </>- </div>- <Separator decorative orientation="vertical" />- {/* Center: View Toggle Group */}+ <Separator className="w-full" />+ <ToolbarButton+ icon={<GitPullRequestArrow className="h-4 w-4 opacity-70" />}+ tooltip="Connect"+ onClick={handleOpenAddRelationDialog}+ disabled={!areExactlyTwoSelected}+ badge={areExactlyTwoSelected ? 2 : null}+ />+ <ToolbarButton+ icon={<Merge className="h-4 w-4 opacity-70" />}+ tooltip="Merge"+ onClick={handleOpenMergeDialog}+ disabled={!areMergeable}+ badge={areMergeable ? selectedNodes.length : null}+ />+ <PathFinder />+ <Separator className="w-full" />+ <ToolbarButton+ icon={<NetworkIcon className="h-4 w-4 opacity-70" />}+ tooltip="Force layout"+ onClick={handleApplyForceLayout}+ disabled={isLoading || view !== 'graph'}+ />+ <ToolbarButton+ icon={<GitFork strokeWidth={1.4} className="h-4 w-4 opacity-70 rotate-180" />}+ tooltip="Hierarchy layout"+ onClick={handleApplyHierarchyLayout}+ disabled={isLoading || view !== 'graph'}+ />+ </FloatingBar>+ )}++ <FloatingBar className="top-3 left-1/2 -translate-x-1/2"><ViewToggle view={view} setView={setView} />- </div>- <div className="flex item-center gap-2">+ <Separator orientation="vertical" className="h-5" />+ <Filters>+ <ToolbarButton+ disabled={isLoading}+ icon={<FunnelPlus className={cn('h-4 w-4 opacity-70')} />}+ tooltip="Filters"+ toggled={hasFilters}+ />+ </Filters>+ </FloatingBar>++ {/* Top right: Status, Export, Reload */}+ <FloatingBar className="top-3 right-3">+ <SaveStatusIndicator /><DropdownMenu><DropdownMenuTrigger asChild><div>@@ -386,8 +400,7 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: booleanicon={<RotateCw className={cn('h-4 w-4 opacity-70', isLoading && 'animate-spin')} />}tooltip="Refresh"/>- <SaveStatusIndicator />- </div>- </div>+ </FloatingBar>+ </>)})diff --git a/flowsint-app/src/components/sketches/view-toggle.tsx b/flowsint-app/src/components/sketches/view-toggle.tsxindex d2523708..e5f2f6d9 100644--- a/flowsint-app/src/components/sketches/view-toggle.tsx+++ b/flowsint-app/src/components/sketches/view-toggle.tsx@@ -1,49 +1,41 @@--import { List, ArrowRightLeft, MapPin, ChevronDown } from "lucide-react"-import {- DropdownMenu,- DropdownMenuContent,- DropdownMenuRadioGroup,- DropdownMenuRadioItem,- DropdownMenuTrigger,-} from "@/components/ui/dropdown-menu"-import { Button } from "@/components/ui/button"-import { NetworkIcon } from "../icons/network"+import { List, ArrowRightLeft, MapPin } from 'lucide-react'+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'+import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'+import { NetworkIcon } from '../icons/network'interface ViewToggleProps {- view: "graph" | "table" | "relationships" | "map"- setView: (view: "graph" | "table" | "relationships" | "map") => void+ view: 'graph' | 'table' | 'relationships' | 'map'+ setView: (view: 'graph' | 'table' | 'relationships' | 'map') => void}-export function ViewToggle({ view, setView }: ViewToggleProps) {- const views = [- { value: "graph", icon: NetworkIcon, label: "Graph" },- { value: "table", icon: List, label: "Table" },- { value: "relationships", icon: ArrowRightLeft, label: "Relationships" },- { value: "map", icon: MapPin, label: "Map" },- ] as const-- const currentView = views.find((v) => v.value === view)- const CurrentIcon = currentView?.icon || NetworkIcon+const views = [+ { value: 'graph', icon: NetworkIcon, label: 'Graph' },+ { value: 'table', icon: List, label: 'Table' },+ { value: 'relationships', icon: ArrowRightLeft, label: 'Relationships' },+ { value: 'map', icon: MapPin, label: 'Map' }+] as const- return (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="ghost" size="sm" className="gap-2 bg-transparent">- <CurrentIcon strokeWidth={1.6} className="h-4 w-4 opacity-70" />- {currentView?.label} <ChevronDown />- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuRadioGroup value={view} onValueChange={(value) => setView(value as typeof view)}>- {views.map(({ value, icon: Icon, label }) => (- <DropdownMenuRadioItem key={value} value={value}>- <Icon strokeWidth={1.4} className="h-4 w-4 opacity-70" />- {label}- </DropdownMenuRadioItem>- ))}- </DropdownMenuRadioGroup>- </DropdownMenuContent>- </DropdownMenu>- )-}\ No newline at end of file+export function ViewToggle({ view, setView }: ViewToggleProps) {+ return (+ <ToggleGroup+ type="single"+ value={view}+ onValueChange={(v) => v && setView(v as typeof view)}+ >+ {views.map(({ value, icon: Icon, label }) => (+ <Tooltip key={value}>+ <TooltipTrigger asChild>+ <ToggleGroupItem+ value={value}+ aria-label={label}+ className="h-7 w-7 p-0"+ >+ <Icon className="h-4 w-4" />+ </ToggleGroupItem>+ </TooltipTrigger>+ <TooltipContent>{label}</TooltipContent>+ </Tooltip>+ ))}+ </ToggleGroup>+ )+}