diff --git a/flowsint-app/src/renderer/src/components/graphs/nodes-panel.tsx b/flowsint-app/src/renderer/src/components/graphs/nodes-panel.tsx
index 9c7c7119..57857767 100644
--- a/flowsint-app/src/renderer/src/components/graphs/nodes-panel.tsx
+++ b/flowsint-app/src/renderer/src/components/graphs/nodes-panel.tsx
@@ -20,10 +20,8 @@ import {
import type { GraphNode } from "@/stores/graph-store"
import { Checkbox } from "@/components/ui/checkbox"
-// Hauteur fixe pour chaque item (en pixels)
const ITEM_HEIGHT = 40
-// Function to extract all leaf-level node types from actionItems
const getAllNodeTypes = (actionItems: any[]) => {
const types: string[] = []
actionItems.forEach(item => {
diff --git a/flowsint-app/src/renderer/src/components/graphs/toolbar.tsx b/flowsint-app/src/renderer/src/components/graphs/toolbar.tsx
index 1d1b659e..f4dd40c6 100644
--- a/flowsint-app/src/renderer/src/components/graphs/toolbar.tsx
+++ b/flowsint-app/src/renderer/src/components/graphs/toolbar.tsx
@@ -1,19 +1,13 @@
import { Button } from "@/components/ui/button"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
-import { useConfirm } from "@/components/use-confirm-dialog"
import { useGraphControls } from "@/stores/graph-controls-store"
-import { useGraphStore } from "@/stores/graph-store"
import {
Maximize,
Minus,
- Trash,
ZoomIn,
RotateCw,
- GitPullRequestCreate,
- // GitFork,
Waypoints,
- Table,
MapPin,
List,
SlidersHorizontal,
@@ -21,11 +15,8 @@ import {
ArrowRightLeft
} from "lucide-react"
import { memo, useCallback } from "react"
-import { sketchService } from "@/api/sketch-service"
-import { useParams } from "@tanstack/react-router"
import { toast } from "sonner"
import { cn } from "@/lib/utils"
-// import { useKeyboardShortcut } from "@/hooks/use-keyboard-shortcut"
import ForceControls from './force-controls'
const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0
@@ -65,20 +56,13 @@ const ToolbarButton = memo(function ToolbarButton({
)
})
export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean }) {
- const { id: sketchId } = useParams({ from: "/_auth/dashboard/investigations/$investigationId/$type/$id" })
- const selectedNodes = useGraphStore((state) => state.selectedNodes || [])
const view = useGraphControls(s => s.view)
- const setOpenAddRelationDialog = useGraphStore((state) => state.setOpenAddRelationDialog)
const setView = useGraphControls((s) => s.setView)
- const removeNodes = useGraphStore((state) => state.removeNodes)
const zoomToFit = useGraphControls((s) => s.zoomToFit);
const zoomIn = useGraphControls((s) => s.zoomIn);
const zoomOut = useGraphControls((s) => s.zoomOut);
const onLayout = useGraphControls((s) => s.onLayout);
- const { confirm } = useConfirm()
const refetchGraph = useGraphControls((s) => s.refetchGraph)
- const clearSelectedNodes = useGraphStore((s) => s.clearSelectedNodes)
- // const nodesLength = useGraphStore((s) => s.getNodesLength())
const handleRefresh = useCallback(() => {
try {
@@ -89,32 +73,6 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean
}
}, [refetchGraph, onLayout]);
- const handleOpenRelationshipDialog = useCallback(() => {
- setOpenAddRelationDialog(true)
- }, [])
-
- const handleDeleteNodes = useCallback(async () => {
- if (!selectedNodes.length) return
- if (!await confirm({ title: `You are about to delete ${selectedNodes.length} node(s).`, message: "The action is irreversible." })) return
-
- toast.promise(
- (async () => {
- removeNodes(selectedNodes.map((n) => n.id))
- clearSelectedNodes()
- return sketchService.deleteNodes(sketchId, JSON.stringify({ nodeIds: selectedNodes.map((n) => n.id) }))
- })(),
- {
- loading: `Deleting ${selectedNodes.length} node(s)...`,
- success: 'Nodes deleted successfully.',
- error: 'Failed to delete nodes.'
- }
- )
- }, [selectedNodes, confirm, removeNodes, clearSelectedNodes, sketchId])
- const isMoreThanZero = selectedNodes.length > 0
- const isTwo = selectedNodes.length == 2
- // const isGraphOnly = nodesLength > 500
- // const isCosmoOnly = nodesLength > 3000
-
const handleForceLayout = useCallback(() => {
setView("force")
}, [setView])
@@ -136,60 +94,28 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean
onLayout && onLayout("dagre-tb")
}, [onLayout, setView])
- // const handleDagreLayoutLR = useCallback(() => {
- // setView("hierarchy")
- // onLayout && onLayout("dagre-lr")
- // }, [onLayout, setView])
-
- // const { isMac } = useKeyboardShortcut({
- // key: "y",
- // ctrlOrCmd: true,
- // callback: handleDagreLayoutTB
- // })
-
return (
- {/* }
- tooltip="Create relation"
- disabled={!isTwo}
+ < ToolbarButton
+ icon={}
+ tooltip="Zoom In"
+ onClick={zoomIn}
+ disabled={["table", "relationships"].includes(view)}
/>
}
- tooltip="Delete"
- disabled={!isMoreThanZero}
- badge={isMoreThanZero ? selectedNodes.length : null}
- /> */}
- {/* } tooltip="Filter" /> */}
- <>
- < ToolbarButton
- icon={}
- tooltip="Zoom In"
- onClick={zoomIn}
- disabled={["table", "relationships"].includes(view)}
- />
- }
- tooltip="Zoom Out"
- onClick={zoomOut}
- disabled={["table", "relationships"].includes(view)}
- />
- }
- tooltip="Fit to View"
- onClick={zoomToFit}
- disabled={["table", "relationships"].includes(view)}
- />
- >
- {/* }
- tooltip={isGraphOnly ? "Graph is too large to render in hierarchy layout" : `Hierarchy (${isMac ? '⌘' : 'ctrl'}+Y)`}
- onClick={handleDagreLayoutLR}
- disabled={isGraphOnly}
- /> */}
+ icon={}
+ tooltip="Zoom Out"
+ onClick={zoomOut}
+ disabled={["table", "relationships"].includes(view)}
+ />
+ }
+ tooltip="Fit to View"
+ onClick={zoomToFit}
+ disabled={["table", "relationships"].includes(view)}
+ />
+
}
tooltip={`Hierarchy (${isMac ? '⌘' : 'ctrl'}+Y)`}
@@ -199,7 +125,6 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean
icon={}
tooltip={"Graph view"}
onClick={handleForceLayout}
- // disabled={isCosmoOnly}
/>
}
@@ -216,13 +141,6 @@ export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean
tooltip={"Map view"}
onClick={handleMapLayout}
/>
- {/* }
- tooltip={"3D Graph"}
- onClick={handleForce3DLayout}
- disabled={isCosmoOnly}
- /> */}
- {/* } tooltip="Settings" /> */}
void;
-// zoomOut: () => void;
-// zoomToFit: () => void;
-// resetZoom: () => void;
-// }
-
-// export const useForceGraphControls = () => {
-// const graphRef = useRef();
-
-// const setGraphRef = useCallback((ref: any) => {
-// graphRef.current = ref;
-// }, []);
-
-// const zoomIn = useCallback(() => {
-// if (graphRef.current) {
-// const zoom = graphRef.current.zoom();
-// graphRef.current.zoom(zoom * 1.5);
-// }
-// }, []);
-
-// const zoomOut = useCallback(() => {
-// if (graphRef.current) {
-// const zoom = graphRef.current.zoom();
-// graphRef.current.zoom(zoom * 0.75);
-// }
-// }, []);
-
-// const zoomToFit = useCallback(() => {
-// if (graphRef.current) {
-// graphRef.current.zoomToFit(400);
-// }
-// }, []);
-
-// const resetZoom = useCallback(() => {
-// if (graphRef.current) {
-// graphRef.current.zoom(1);
-// graphRef.current.centerAt(0, 0);
-// }
-// }, []);
-
-// const controls: ForceGraphControls = {
-// zoomIn,
-// zoomOut,
-// zoomToFit,
-// resetZoom,
-// };
-
-// return {
-// controls,
-// setGraphRef,
-// };
-// };
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/layout/root.layout.tsx b/flowsint-app/src/renderer/src/components/layout/root.layout.tsx
index d7924d61..60c20d6f 100644
--- a/flowsint-app/src/renderer/src/components/layout/root.layout.tsx
+++ b/flowsint-app/src/renderer/src/components/layout/root.layout.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode } from "react"
+import { useEffect, type ReactNode } from "react"
import { Sidebar } from "./sidebar"
import { TopNavbar } from "./top-navbar"
import { StatusBar } from "./status-bar"
@@ -10,7 +10,7 @@ import { useLayoutStore } from "@/stores/layout-store"
// import NotesPanel from "../analyses/notes-panel"
import { useKeyboardShortcut } from "@/hooks/use-keyboard-shortcut"
import { useParams } from "@tanstack/react-router"
-import DetailsPanel from "../graphs/details-panel"
+import DetailsPanel from "../graphs/details-panel/details-panel"
import { useGraphStore } from "@/stores/graph-store"
interface LayoutProps {
@@ -27,11 +27,18 @@ export default function RootLayout({ children }: LayoutProps) {
const togglePanel = useLayoutStore(s => s.togglePanel)
const closePanel = useLayoutStore(s => s.closePanel)
const openPanel = useLayoutStore(s => s.openPanel)
- const toggleAnalysis = useLayoutStore(s => s.toggleAnalysis)
- const closeAnalysis = useLayoutStore(s => s.closeAnalysis)
- const openAnalysis = useLayoutStore(s => s.openAnalysis)
+ const closeDetails = useLayoutStore(s => s.closeDetails)
+ const openDetails = useLayoutStore(s => s.openDetails)
const currentNode = useGraphStore((s) => s.currentNode)
- const { investigationId, id } = useParams({ strict: false })
+ const { id } = useParams({ strict: false })
+
+ useEffect(() => {
+ if (!currentNode) {
+ closeDetails()
+ return
+ }
+ openDetails()
+ }, [currentNode])
// Set up keyboard shortcut for chat panel
@@ -102,7 +109,7 @@ export default function RootLayout({ children }: LayoutProps) {
{children}
- {isOpenDetails && id && (
+ {isOpenDetails && id && currentNode && (
<>
diff --git a/flowsint-app/src/renderer/src/components/table/nodes-view.tsx b/flowsint-app/src/renderer/src/components/table/nodes-view.tsx
index 55261956..73d93f84 100644
--- a/flowsint-app/src/renderer/src/components/table/nodes-view.tsx
+++ b/flowsint-app/src/renderer/src/components/table/nodes-view.tsx
@@ -69,12 +69,14 @@ export default function NodesTable({ nodes }: NodesTableProps) {
const [selectedType, setSelectedType] = useState("all");
const parentRef = useRef(null);
const setCurrentNode = useGraphStore(s => s.setCurrentNode)
- const setOpenNodeEditorModal = useGraphStore(s => s.setOpenNodeEditorModal)
+ // const setOpenNodeEditorModal = useGraphStore(s => s.setOpenNodeEditorModal)
const onNodeClick = useCallback((node: GraphNode) => {
setCurrentNode(node)
- setOpenNodeEditorModal(true)
- }, [setCurrentNode, setOpenNodeEditorModal])
+ // setOpenNodeEditorModal(true)
+ }, [setCurrentNode,
+ // setOpenNodeEditorModal
+ ])
// Filter nodes based on search and type
diff --git a/flowsint-app/src/renderer/src/components/table/relationships-view.tsx b/flowsint-app/src/renderer/src/components/table/relationships-view.tsx
index 779b9fd7..194b03ec 100644
--- a/flowsint-app/src/renderer/src/components/table/relationships-view.tsx
+++ b/flowsint-app/src/renderer/src/components/table/relationships-view.tsx
@@ -18,12 +18,7 @@ import {
SelectValue,
} from "@/components/ui/select";
import { CopyButton } from "../copy";
-
-export type RelationshipType = {
- source: GraphNode
- target: GraphNode
- edge: { label: string }
-}
+import { RelationshipType } from "@/types";
const ITEM_HEIGHT = 67; // Balanced spacing between items (55px card + 12px padding)
@@ -104,12 +99,14 @@ export default function RelationshipsTable() {
const [selectedType, setSelectedType] = useState("all");
const parentRef = useRef(null);
const setCurrentNode = useGraphStore(s => s.setCurrentNode)
- const setOpenNodeEditorModal = useGraphStore(s => s.setOpenNodeEditorModal)
+ // const setOpenNodeEditorModal = useGraphStore(s => s.setOpenNodeEditorModal)
const onNodeClick = useCallback((node: GraphNode) => {
setCurrentNode(node)
- setOpenNodeEditorModal(true)
- }, [setCurrentNode, setOpenNodeEditorModal])
+ // setOpenNodeEditorModal(true)
+ }, [setCurrentNode,
+ // setOpenNodeEditorModal
+ ])
// Filter relationships based on search and type
diff --git a/flowsint-app/src/renderer/src/components/transforms/context-menu.tsx b/flowsint-app/src/renderer/src/components/transforms/context-menu.tsx
index a5ce270f..95a288be 100644
--- a/flowsint-app/src/renderer/src/components/transforms/context-menu.tsx
+++ b/flowsint-app/src/renderer/src/components/transforms/context-menu.tsx
@@ -35,11 +35,18 @@ export default function ContextMenu({
}: GraphContextMenuProps) {
const setOpenParamsDialog = useTransformStore(s => s.setOpenParamsDialog)
+ const deleteNode = useTransformStore(s => s.deleteNode)
+
const handleOpenParamsModal = useCallback(() => {
setOpenParamsDialog(true, node as TransformNode)
setMenu(null)
}, [setOpenParamsDialog, node, setMenu])
+ const handleDeleteTransform = useCallback(() => {
+ deleteNode(node.id as string)
+ setMenu(null)
+ }, [deleteNode, node.id, setMenu])
+
return (
Edit
}
-