Fix #283 fix delete graph

app/components/graph/DeleteGraph.tsx

@@ -5,7 +5,7 @@ export default function DeleteGraph({ graphName, isOpen, onOpen, onDeleteGraph,
     graphName: string
     isOpen: boolean
     onOpen: (open: boolean) => void
-    onDeleteGraph: () => void
+    onDeleteGraph: (option: string) => void
     isSchema: boolean
 }) {
 
@@ -19,7 +19,7 @@ export default function DeleteGraph({ graphName, isOpen, onOpen, onDeleteGraph,
 
         if (result.ok) {
             Toast(`${type} ${graphName} deleted`, "Success")
-            onDeleteGraph()
+            onDeleteGraph(graphName)
         }
     }
 

app/components/ui/combobox.tsx

@@ -24,16 +24,16 @@ interface ComboboxProps {
   setSelectedValue: (value: string) => void,
   isSchema?: boolean
   defaultOpen?: boolean
-  onOpenChange?: (open:boolean) => void
+  onOpenChange?: (open: boolean) => void
 }
 
 export default function Combobox({ isSelectGraph, disabled = false, inTable, type, options, setOptions, selectedValue = "", setSelectedValue, isSchema = false, defaultOpen = false, onOpenChange }: ComboboxProps) {
 
   const [open, setOpen] = useState<boolean>(defaultOpen)
   const [optionName, setOptionName] = useState<string>("")
   const [editable, setEditable] = useState<string>("")
-  const [isUploadOpen, setIsUploadOpen] = useState<boolean>(false)
-  const [isDeleteOpen, setIsDeleteOpen] = useState<boolean>(false)
+  const [isUploadOpen, setIsUploadOpen] = useState<string>()
+  const [isDeleteOpen, setIsDeleteOpen] = useState<string>()
   const onExport = async (graphName: string) => {
     const result = await securedFetch(`api/graph/${prepareArg(graphName)}/export`, {
       method: "GET"
@@ -57,6 +57,7 @@ export default function Combobox({ isSelectGraph, disabled = false, inTable, typ
   }
 
   const handelDelete = (option: string) => {
+
     if (!setOptions) return
     setOptions(prev => prev.filter(name => name !== option))
     if (selectedValue !== option) return
@@ -92,7 +93,7 @@ export default function Combobox({ isSelectGraph, disabled = false, inTable, typ
       <DropdownMenu open={open} onOpenChange={(o) => {
         setOpen(o)
         if (onOpenChange) onOpenChange(o)
-        }}>
+      }}>
         <DropdownMenuTrigger asChild>
           <Button
             disabled={disabled}
@@ -192,24 +193,24 @@ export default function Combobox({ isSelectGraph, disabled = false, inTable, typ
                               disabled
                               variant="button"
                               icon={<UploadIcon />}
-                              onClick={() => setIsUploadOpen(true)}
+                              onClick={() => setIsUploadOpen(option)}
                             />
                           </DropdownMenuItem>
                           <DropdownMenuItem className="p-2">
                             <Button
                               variant="button"
                               icon={<Trash2 />}
-                              onClick={() => setIsDeleteOpen(true)}
+                              onClick={() => setIsDeleteOpen(option)}
                             />
                           </DropdownMenuItem>
                         </DropdownMenuContent>
                       </DropdownMenu>
-                      <UploadGraph open={isUploadOpen} onOpenChange={setIsUploadOpen} />
+                      <UploadGraph open={isUploadOpen === option} onOpenChange={(o) => setIsUploadOpen(o ? option : "")} />
                       <DeleteGraph
                         graphName={option}
-                        isOpen={isDeleteOpen}
-                        onOpen={setIsDeleteOpen}
-                        onDeleteGraph={() => handelDelete(option)}
+                        isOpen={isDeleteOpen === option}
+                        onOpen={(o) => setIsDeleteOpen(o ? option : "")}
+                        onDeleteGraph={handelDelete}
                         isSchema={isSchema}
                       />
                     </TableCell>

app/graph/GraphView.tsx

@@ -175,6 +175,11 @@ const GraphView = forwardRef(({ graph, runQuery, historyQuery, setNodesCount, se
         setQuery(historyQuery)
     }, [historyQuery])
 
+    useEffect(() => {
+        setSelectedElement(undefined)
+        setSelectedElements([])
+    }, [graph.Id])
+
     const handelSetSelectedElement = (element?: ElementDataDefinition) => {
         setSelectedElement(element)
         if (element) {

app/schema/SchemaView.tsx

@@ -122,6 +122,7 @@ export default function SchemaView({ schema, setNodesCount, setEdgesCount }: Pro
 
     useEffect(() => {
         setSelectedElement(undefined)
+        setSelectedElements([])
     }, [schema.Id])
 
     useEffect(() => {