Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

feat(frontend): add graph search functionality to new builder (#12395)

Abhimanyu Yadav3e86544bfee0
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewControlPanel.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewControlPanel.tsx
index b4624c85e1..1f9c529aa8 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewControlPanel.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewControlPanel.tsx
@@ -1,13 +1,14 @@
import { cn } from "@/lib/utils";
-import React, { memo } from "react";
+import { memo } from "react";
import { BlockMenu } from "./NewBlockMenu/BlockMenu/BlockMenu";
-import { useNewControlPanel } from "./useNewControlPanel";
-import { Separator } from "@/components/__legacy__/ui/separator";
+import { Separator } from "@/components/ui/separator";
import { NewSaveControl } from "./NewSaveControl/NewSaveControl";
+import { GraphSearchMenu } from "./NewSearchGraph/GraphMenu/GraphMenu";
import { UndoRedoButtons } from "./UndoRedoButtons";
+import { useGraphSearchShortcut } from "./useGraphSearchShortcut";
-export const NewControlPanel = memo(() => {
- useNewControlPanel({});
+export const NewControlPanel = memo(function NewControlPanel() {
+ useGraphSearchShortcut();
return (
<section
@@ -18,6 +19,8 @@ export const NewControlPanel = memo(() => {
<div className="flex flex-col items-center justify-center rounded-[1rem] p-0">
<BlockMenu />
<Separator className="text-[#E1E1E1]" />
+ <GraphSearchMenu />
+ <Separator className="text-[#E1E1E1]" />
<NewSaveControl />
<Separator className="text-[#E1E1E1]" />
<UndoRedoButtons />
@@ -27,5 +30,3 @@ export const NewControlPanel = memo(() => {
});
export default NewControlPanel;
-
-NewControlPanel.displayName = "NewControlPanel";
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/GraphMenu.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/GraphMenu.tsx
index f732a1a456..3455d3081e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/GraphMenu.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/GraphMenu.tsx
@@ -1,58 +1,77 @@
-import { CustomNode } from "../../../FlowEditor/nodes/CustomNode/CustomNode";
+"use client";
+
+import { useControlPanelStore } from "@/app/(platform)/build/stores/controlPanelStore";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from "@/components/__legacy__/ui/popover";
-import { MagnifyingGlassIcon } from "@phosphor-icons/react";
-import React from "react";
+} from "@/components/molecules/Popover/Popover";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from "@/components/atoms/Tooltip/BaseTooltip";
+import { isMacPlatform } from "@/lib/platform";
+import { MagnifyingGlass } from "@phosphor-icons/react";
+import { useReactFlow } from "@xyflow/react";
+import { useCallback, useMemo } from "react";
import { ControlPanelButton } from "../../ControlPanelButton";
import { GraphSearchContent } from "../GraphMenuContent/GraphContent";
import { useGraphMenu } from "./useGraphMenu";
-interface GraphSearchMenuProps {
- nodes: CustomNode[];
- blockMenuSelected: "save" | "block" | "search" | "";
- setBlockMenuSelected: React.Dispatch<
- React.SetStateAction<"" | "save" | "block" | "search">
- >;
- onNodeSelect: (nodeId: string) => void;
- onNodeHover?: (nodeId: string | null) => void;
-}
+export function GraphSearchMenu() {
+ const nodes = useNodeStore((state) => state.nodes);
+ const { graphSearchOpen, setGraphSearchOpen } = useControlPanelStore();
+ const reactFlow = useReactFlow();
-export const GraphSearchMenu: React.FC<GraphSearchMenuProps> = ({
- nodes,
- blockMenuSelected,
- setBlockMenuSelected,
- onNodeSelect,
- onNodeHover,
-}) => {
- const {
- open,
- searchQuery,
- setSearchQuery,
- filteredNodes,
- handleNodeSelect,
- handleOpenChange,
- } = useGraphMenu({
- nodes,
- blockMenuSelected,
- setBlockMenuSelected,
- onNodeSelect,
- });
+ const isMac = useMemo(() => isMacPlatform(), []);
+
+ const onNodeSelect = useCallback(
+ (nodeID: string) => {
+ reactFlow.fitView({
+ nodes: [{ id: nodeID }],
+ duration: 600,
+ maxZoom: 1.5,
+ padding: 0.5,
+ });
+ },
+ [reactFlow],
+ );
+
+ const { searchQuery, setSearchQuery, filteredNodes, handleNodeSelect } =
+ useGraphMenu({
+ nodes,
+ onNodeSelect,
+ });
return (
- <Popover open={open} onOpenChange={handleOpenChange}>
- <PopoverTrigger className="hover:cursor-pointer">
- <ControlPanelButton
- data-id="graph-search-control-popover-trigger"
- data-testid="graph-search-control-button"
- selected={blockMenuSelected === "search"}
- className="rounded-none"
- >
- <MagnifyingGlassIcon className="size-5" strokeWidth={2} />
- </ControlPanelButton>
- </PopoverTrigger>
+ <Popover
+ open={graphSearchOpen}
+ onOpenChange={(open: boolean) => {
+ setGraphSearchOpen(open);
+ if (!open) {
+ setSearchQuery("");
+ }
+ }}
+ >
+ <Tooltip delayDuration={100}>
+ <TooltipTrigger asChild>
+ <PopoverTrigger asChild className="hover:cursor-pointer">
+ <ControlPanelButton
+ data-id="graph-search-control-popover-trigger"
+ data-testid="graph-search-control-button"
+ selected={graphSearchOpen}
+ className="rounded-none"
+ >
+ <MagnifyingGlass className="size-5" />
+ </ControlPanelButton>
+ </PopoverTrigger>
+ </TooltipTrigger>
+ <TooltipContent side="right">
+ Search Graph ({isMac ? "Cmd" : "Ctrl"}+F)
+ </TooltipContent>
+ </Tooltip>
<PopoverContent
side="right"
@@ -66,9 +85,8 @@ export const GraphSearchMenu: React.FC<GraphSearchMenuProps> = ({
onSearchChange={setSearchQuery}
filteredNodes={filteredNodes}
onNodeSelect={handleNodeSelect}
- onNodeHover={onNodeHover}
/>
</PopoverContent>
</Popover>
);
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/useGraphMenu.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/useGraphMenu.ts
index 271962f2a1..72d2825631 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/useGraphMenu.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenu/useGraphMenu.ts
@@ -1,41 +1,26 @@
-import { useGraphSearch } from "../GraphMenuSearchBar/useGraphMenuSearchBar";
+import { useControlPanelStore } from "@/app/(platform)/build/stores/controlPanelStore";
import { CustomNode } from "../../../FlowEditor/nodes/CustomNode/CustomNode";
+import { useGraphSearch } from "../GraphMenuSearchBar/useGraphMenuSearchBar";
interface UseGraphMenuProps {
nodes: CustomNode[];
- blockMenuSelected: "save" | "block" | "search" | "";
- setBlockMenuSelected: React.Dispatch<
- React.SetStateAction<"" | "save" | "block" | "search">
- >;
- onNodeSelect: (nodeId: string) => void;
+ onNodeSelect: (nodeID: string) => void;
}
-export const useGraphMenu = ({
- nodes,
- setBlockMenuSelected,
- onNodeSelect,
-}: UseGraphMenuProps) => {
- const { open, setOpen, searchQuery, setSearchQuery, filteredNodes } =
- useGraphSearch(nodes);
+export function useGraphMenu({ nodes, onNodeSelect }: UseGraphMenuProps) {
+ const { setGraphSearchOpen } = useControlPanelStore();
+ const { searchQuery, setSearchQuery, filteredNodes } = useGraphSearch(nodes);
- const handleNodeSelect = (nodeId: string) => {
- onNodeSelect(nodeId);
- setOpen(false);
+ function handleNodeSelect(nodeID: string) {
+ onNodeSelect(nodeID);
+ setGraphSearchOpen(false);
setSearchQuery("");
- setBlockMenuSelected("");
- };
-
- const handleOpenChange = (newOpen: boolean) => {
- setOpen(newOpen);
- setBlockMenuSelected(newOpen ? "search" : "");
- };
+ }
return {
- open,
searchQuery,
setSearchQuery,
filteredNodes,
handleNodeSelect,
- handleOpenChange,
};
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/GraphContent.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/GraphContent.tsx
index d45b1e7534..07093b7b8d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/GraphContent.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/GraphContent.tsx
@@ -1,47 +1,36 @@
-import React from "react";
-import { Separator } from "@/components/__legacy__/ui/separator";
-import { ScrollArea } from "@/components/__legacy__/ui/scroll-area";
-import { beautifyString, categoryColorMap } from "@/lib/utils";
+import { Separator } from "@/components/ui/separator";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { beautifyString, cn } from "@/lib/utils";
import { SearchableNode } from "../GraphMenuSearchBar/useGraphMenuSearchBar";
-import { TextRenderer } from "@/components/__legacy__/ui/render";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
- TooltipProvider,
-} from "@/components/atoms/Tooltip/BaseTooltip";
+import { ArrowBendUpRight } from "@phosphor-icons/react";
import { GraphMenuSearchBar } from "../GraphMenuSearchBar/GraphMenuSearchBar";
+import { getNodeInputOutputSummary } from "./helpers";
import { useGraphContent } from "./useGraphContent";
-interface GraphSearchContentProps {
+interface Props {
searchQuery: string;
onSearchChange: (query: string) => void;
filteredNodes: SearchableNode[];
- onNodeSelect: (nodeId: string) => void;
- onNodeHover?: (nodeId: string | null) => void;
+ onNodeSelect: (nodeID: string) => void;
}
-export const GraphSearchContent: React.FC<GraphSearchContentProps> = ({
+export function GraphSearchContent({
searchQuery,
onSearchChange,
filteredNodes,
onNodeSelect,
- onNodeHover,
-}) => {
- const {
- selectedIndex,
- setSelectedIndex,
- handleKeyDown,
- getNodeInputOutputSummary,
- } = useGraphContent({
- searchQuery,
- filteredNodes,
- onNodeSelect,
- });
+}: Props) {
+ const { selectedIndex, setSelectedIndex, setItemRef, handleKeyDown } =
+ useGraphContent({
+ searchQuery,
+ filteredNodes,
+ onNodeSelect,
+ });
+
+ const trimmedQuery = searchQuery?.trim();
return (
<div className="flex h-full w-full flex-col">
- {/* Search Bar */}
<GraphMenuSearchBar
searchQuery={searchQuery}
onSearchChange={onSearchChange}
@@ -50,104 +39,82 @@ export const GraphSearchContent: React.FC<GraphSearchContentProps> = ({
<Separator className="h-[1px] w-full text-zinc-300" />
- {/* Search Results */}
<div className="flex-1 overflow-hidden">
- {searchQuery && (
- <div className="px-4 py-2 text-xs text-gray-500">
+ {trimmedQuery && (
+ <div className="px-4 pt-3 text-xs text-zinc-500">
Found {filteredNodes.length} node
{filteredNodes.length !== 1 ? "s" : ""}
</div>
)}
<ScrollArea className="h-full w-full">
- {filteredNodes.length === 0 ? (
- <div className="flex h-32 items-center justify-center text-sm text-gray-500 dark:text-gray-400">
- {searchQuery
- ? "No nodes found matching your search"
- : "Start typing to search nodes"}
- </div>
- ) : (
- filteredNodes.map((node, index) => {
- // Safety check for node data
- if (!node || !node.data) {
- return null;
- }
+ <div role="listbox" className="space-y-3 px-4 py-4">
+ {filteredNodes.length === 0 ? (
+ <div className="flex h-32 items-center justify-center text-sm text-zinc-500">
+ {trimmedQuery
+ ? "No nodes found matching your search"
+ : "Start typing to search nodes"}
+ </div>
+ ) : (
+ filteredNodes.map((node, index) => {
+ if (!node?.data) return null;
- const nodeTitle =
- (node.data?.metadata?.customized_name as string) ||
- beautifyString(node.data?.title || "").replace(/ Block$/, "");
- const nodeType = beautifyString(node.data?.title || "").replace(
- / Block$/,
- "",
- );
+ const nodeTitle =
+ (node.data.metadata?.customized_name as string) ||
+ beautifyString(node.data.title || "").replace(/ Block$/, "");
+ const nodeType = beautifyString(node.data.title || "").replace(
+ / Block$/,
+ "",
+ );
+ const description =
+ getNodeInputOutputSummary(node) ||
+ node.data.description ||
+ "";
- return (
- <TooltipProvider key={node.id}>
- <Tooltip delayDuration={300}>
- <TooltipTrigger asChild>
- <div
- className={`mx-4 my-2 flex h-20 cursor-pointer rounded-lg border border-zinc-200 bg-white ${
- index === selectedIndex
- ? "border-zinc-400 shadow-md"
- : "hover:border-zinc-300 hover:shadow-sm"
- }`}
- onClick={() => onNodeSelect(node.id)}
- onMouseEnter={() => {
- setSelectedIndex(index);
- onNodeHover?.(node.id);
- }}
- onMouseLeave={() => onNodeHover?.(null)}
- >
- <div
- className={`h-full w-3 rounded-l-[7px] ${
- (node.data?.categories?.[0]?.category &&
- categoryColorMap[
- node.data.categories[0].category
- ]) ||
- "bg-gray-300 dark:bg-slate-700"
- }`}
- />
- <div className="mx-3 flex flex-1 items-center justify-between">
- <div className="mr-2 min-w-0">
- <span className="block truncate pb-1 text-sm font-semibold text-zinc-800">
- <TextRenderer
- value={nodeTitle}
- truncateLengthLimit={45}
- />
- </span>
- <span className="block break-all text-xs font-normal text-zinc-500">
- <TextRenderer
- value={
- getNodeInputOutputSummary(node) ||
- node.data?.description ||
- ""
- }
- truncateLengthLimit={165}
- />
- </span>
- </div>
- </div>
- </div>
- </TooltipTrigger>
- <TooltipContent side="right" className="max-w-xs">
- <div className="space-y-1">
- <div className="font-semibold">
- Node Type: {nodeType}
- </div>
- {!!node.data?.metadata?.customized_name && (
- <div className="text-xs text-gray-500">
- Custom Name:{" "}
- {String(node.data.metadata.customized_name)}
- </div>
+ const hasCustomName = !!node.data.metadata?.customized_name;
+
+ return (
+ <div
+ key={node.id}
+ ref={(el) => setItemRef(index, el)}
+ role="option"
+ aria-selected={index === selectedIndex}
+ tabIndex={index === selectedIndex ? 0 : -1}
+ className={cn(
+ "flex h-16 w-full cursor-pointer items-center gap-3 rounded-[0.75rem] bg-zinc-50 px-[0.875rem] py-[0.625rem]",
+ index === selectedIndex
+ ? "bg-zinc-100 ring-1 ring-zinc-300"
+ : "hover:bg-zinc-100",
+ )}
+ onClick={() => onNodeSelect(node.id)}
+ onMouseEnter={() => setSelectedIndex(index)}
+ >
+ <div className="flex flex-1 flex-col items-start gap-0.5 overflow-hidden">
+ <div className="flex items-center gap-2">
+ <span className="line-clamp-1 font-sans text-sm font-medium leading-[1.375rem] text-zinc-800">
+ {nodeTitle}
+ </span>
+ {hasCustomName && (
+ <span className="shrink-0 rounded-[0.75rem] bg-zinc-200 px-2 font-sans text-xs leading-5 text-zinc-500">
+ {nodeType}
+ </span>
)}
</div>
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
- );
- })
- )}
+ {description && (
+ <span className="line-clamp-1 font-sans text-xs font-normal leading-5 text-zinc-500">
+ {description}
+ </span>
+ )}
+ </div>
+ <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-[0.5rem] bg-zinc-700">
+ <ArrowBendUpRight className="h-4 w-4 text-zinc-50" />
+ </div>
+ </div>
+ );
+ })
+ )}
+ </div>
</ScrollArea>
</div>
</div>
);
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/helpers.ts
new file mode 100644
index 0000000000..5f45876e0a
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/helpers.ts
@@ -0,0 +1,22 @@
+import { SearchableNode } from "../GraphMenuSearchBar/useGraphMenuSearchBar";
+
+export function getNodeInputOutputSummary(node: SearchableNode) {
+ if (!node?.data) return "";
+
+ const inputs = Object.keys(node.data.inputSchema?.properties || {});
+ const outputs = Object.keys(node.data.outputSchema?.properties || {});
+ const parts = [];
+
+ if (inputs.length > 0) {
+ parts.push(
+ `Inputs: ${inputs.slice(0, 3).join(", ")}${inputs.length > 3 ? "..." : ""}`,
+ );
+ }
+ if (outputs.length > 0) {
+ parts.push(
+ `Outputs: ${outputs.slice(0, 3).join(", ")}${outputs.length > 3 ? "..." : ""}`,
+ );
+ }
+
+ return parts.join(" | ");
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/useGraphContent.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/useGraphContent.ts
index ccb1e21aca..a7b4bb2721 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/useGraphContent.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuContent/useGraphContent.ts
@@ -1,64 +1,63 @@
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
import { SearchableNode } from "../GraphMenuSearchBar/useGraphMenuSearchBar";
interface UseGraphContentProps {
searchQuery: string;
filteredNodes: SearchableNode[];
- onNodeSelect: (nodeId: string) => void;
+ onNodeSelect: (nodeID: string) => void;
}
-export const useGraphContent = ({
+export function useGraphContent({
searchQuery,
filteredNodes,
onNodeSelect,
-}: UseGraphContentProps) => {
+}: UseGraphContentProps) {
const [selectedIndex, setSelectedIndex] = useState(0);
+ const itemRefs = useRef<Map<number, HTMLDivElement>>(new Map());
useEffect(() => {
setSelectedIndex(0);
}, [searchQuery]);
- const handleKeyDown = (e: React.KeyboardEvent) => {
- if (e.key === "ArrowDown") {
+ useEffect(() => {
+ const el = itemRefs.current.get(selectedIndex);
+ if (el) {
+ el.scrollIntoView({ block: "nearest" });
+ }
+ }, [selectedIndex]);
+
+ const setItemRef = useCallback((index: number, el: HTMLDivElement | null) => {
+ if (el) {
+ itemRefs.current.set(index, el);
+ } else {
+ itemRefs.current.delete(index);
+ }
+ }, []);
+
+ function handleKeyDown(e: React.KeyboardEvent) {
+ if (e.key === "ArrowDown" && filteredNodes.length > 0) {
e.preventDefault();
setSelectedIndex((prev) => Math.min(prev + 1, filteredNodes.length - 1));
- } else if (e.key === "ArrowUp") {
+ } else if (e.key === "ArrowUp" && filteredNodes.length > 0) {
e.preventDefault();
setSelectedIndex((prev) => Math.max(prev - 1, 0));
} else if (e.key === "Enter" && filteredNodes.length > 0) {
e.preventDefault();
- onNodeSelect(filteredNodes[selectedIndex].id);
- }
- };
-
- const getNodeInputOutputSummary = (node: SearchableNode) => {
- // Safety check for node data
- if (!node || !node.data) {
- return "";
- }
-
- const inputs = Object.keys(node.data?.inputSchema?.properties || {});
- const outputs = Object.keys(node.data?.outputSchema?.properties || {});
- const parts = [];
-
- if (inputs.length > 0) {
- parts.push(
- `Inputs: ${inputs.slice(0, 3).join(", ")}${inputs.length > 3 ? "..." : ""}`,
- );
- }
- if (outputs.length > 0) {
- parts.push(
- `Outputs: ${outputs.slice(0, 3).join(", ")}${outputs.length > 3 ? "..." : ""}`,
+ const safeIndex = Math.max(
+ 0,
+ Math.min(selectedIndex, filteredNodes.length - 1),
);
+ const node = filteredNodes[safeIndex];
+ if (node) {
+ onNodeSelect(node.id);
+ }
}
-
- return parts.join(" | ");
- };
+ }
return {
selectedIndex,
setSelectedIndex,
+ setItemRef,
handleKeyDown,
- getNodeInputOutputSummary,
};
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuSearchBar/useGraphMenuSearchBar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuSearchBar/useGraphMenuSearchBar.tsx
index fe9d0c1bae..77941d5534 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuSearchBar/useGraphMenuSearchBar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSearchGraph/GraphMenuSearchBar/useGraphMenuSearchBar.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo, useDeferredValue } from "react";
+import { useDeferredValue, useMemo, useState } from "react";
import { CustomNode } from "../../../FlowEditor/nodes/CustomNode/CustomNode";
import { beautifyString } from "@/lib/utils";
import jaro from "jaro-winkler";
@@ -8,8 +8,7 @@ export type SearchableNode = CustomNode & {
matchedFields?: string[];
};
-export const useGraphSearch = (nodes: CustomNode[]) => {
- const [open, setOpen] = useState(false);
+export function useGraphSearch(nodes: CustomNode[]) {
const [searchQuery, setSearchQuery] = useState("");
const deferredSearchQuery = useDeferredValue(searchQuery);
@@ -42,13 +41,11 @@ export const useGraphSearch = (nodes: CustomNode[]) => {
}, [nodes, deferredSearchQuery]);
return {
- open,
- setOpen,
searchQuery,
setSearchQuery,
filteredNodes,
};
-};
+}
function calculateNodeScore(
node: CustomNode,
@@ -65,7 +62,7 @@ function calculateNodeScore(
// Prepare searchable text with defensive checks
const nodeTitle = (node.data?.title || "").toLowerCase(); // This includes the ID
- const nodeId = (node.id || "").toLowerCase();
+ const nodeID = (node.id || "").toLowerCase();
const nodeDescription = (node.data?.description || "").toLowerCase();
const blockType = (node.data?.title || "").toLowerCase();
const beautifiedBlockType = beautifyString(blockType).toLowerCase();
@@ -85,7 +82,7 @@ function calculateNodeScore(
if (
customizedName.includes(query) ||
nodeTitle.includes(query) ||
- nodeId.includes(query) ||
+ nodeID.includes(query) ||
blockType.includes(query) ||
beautifiedBlockType.includes(query)
) {
@@ -133,7 +130,7 @@ function calculateNodeScore(
const titleSimilarity = Math.max(
jaro(customizedName, query),
jaro(nodeTitle, query),
- jaro(nodeId, query),
+ jaro(nodeID, query),
jaro(beautifiedBlockType, query),
);
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/useGraphSearchShortcut.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/useGraphSearchShortcut.ts
new file mode 100644
index 0000000000..918cec87d2
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/useGraphSearchShortcut.ts
@@ -0,0 +1,18 @@
+import { useControlPanelStore } from "@/app/(platform)/build/stores/controlPanelStore";
+import { useEffect } from "react";
+
+export function useGraphSearchShortcut() {
+ const { setGraphSearchOpen } = useControlPanelStore();
+
+ useEffect(() => {
+ function handleKeyDown(e: KeyboardEvent) {
+ if ((e.metaKey || e.ctrlKey) && e.key === "f") {
+ e.preventDefault();
+ setGraphSearchOpen(true);
+ }
+ }
+
+ document.addEventListener("keydown", handleKeyDown);
+ return () => document.removeEventListener("keydown", handleKeyDown);
+ }, [setGraphSearchOpen]);
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/useNewControlPanel.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/useNewControlPanel.ts
deleted file mode 100644
index 4d06271b68..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/useNewControlPanel.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useState } from "react";
-
-export interface NewControlPanelProps {
- visualizeBeads?: "no" | "static" | "animate";
-}
-
-export const useNewControlPanel = ({
- visualizeBeads: _visualizeBeads,
-}: NewControlPanelProps) => {
- const [blockMenuSelected, setBlockMenuSelected] = useState<
- "save" | "block" | "search" | ""
- >("");
-
- return {
- blockMenuSelected,
- setBlockMenuSelected,
- };
-};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts
index 5dcb11c121..7b0051fc3b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts
@@ -3,11 +3,13 @@ import { create } from "zustand";
type ControlPanelStore = {
blockMenuOpen: boolean;
saveControlOpen: boolean;
+ graphSearchOpen: boolean;
forceOpenBlockMenu: boolean;
forceOpenSave: boolean;
setBlockMenuOpen: (open: boolean) => void;
setSaveControlOpen: (open: boolean) => void;
+ setGraphSearchOpen: (open: boolean) => void;
setForceOpenBlockMenu: (force: boolean) => void;
setForceOpenSave: (force: boolean) => void;
@@ -17,6 +19,7 @@ type ControlPanelStore = {
export const useControlPanelStore = create<ControlPanelStore>((set) => ({
blockMenuOpen: false,
saveControlOpen: false,
+ graphSearchOpen: false,
forceOpenBlockMenu: false,
forceOpenSave: false,
@@ -24,10 +27,12 @@ export const useControlPanelStore = create<ControlPanelStore>((set) => ({
setForceOpenSave: (force) => set({ forceOpenSave: force }),
setBlockMenuOpen: (open) => set({ blockMenuOpen: open }),
setSaveControlOpen: (open) => set({ saveControlOpen: open }),
+ setGraphSearchOpen: (open) => set({ graphSearchOpen: open }),
reset: () =>
set({
blockMenuOpen: false,
saveControlOpen: false,
+ graphSearchOpen: false,
forceOpenBlockMenu: false,
forceOpenSave: false,
}),
diff --git a/autogpt_platform/frontend/src/lib/platform.ts b/autogpt_platform/frontend/src/lib/platform.ts
new file mode 100644
index 0000000000..cf1c4a5f63
--- /dev/null
+++ b/autogpt_platform/frontend/src/lib/platform.ts
@@ -0,0 +1,12 @@
+export function isMacPlatform(): boolean {
+ if (typeof navigator === "undefined") return false;
+ return /Mac|iPhone|iPad|iPod/.test(navigator.platform);
+}
+
+export function isEditableElement(el: Element | null): boolean {
+ return (
+ el instanceof HTMLInputElement ||
+ el instanceof HTMLTextAreaElement ||
+ (el instanceof HTMLElement && el.isContentEditable)
+ );
+}