diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 021fc102e..4347b88ca 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -4,6 +4,7 @@ import { getRandomKeyByssmm, groupByFamily, isValidConnection, + nodeIconsLucide, } from "../../../../utils"; import { useContext, useEffect, useRef, useState } from "react"; import InputComponent from "../../../../components/inputComponent"; @@ -18,7 +19,7 @@ import InputFileComponent from "../../../../components/inputFileComponent"; import { TabsContext } from "../../../../contexts/tabsContext"; import IntComponent from "../../../../components/intComponent"; import PromptAreaComponent from "../../../../components/promptComponent"; -import { nodeNames, nodeIcons } from "../../../../utils"; +import { nodeNames } from "../../../../utils"; import React from "react"; import { nodeColors } from "../../../../utils"; import ShadTooltip from "../../../../components/ShadTooltipComponent"; @@ -89,12 +90,12 @@ export default function ParameterComponent({ )} >
- {React.createElement(nodeIcons[item.family])} + {React.createElement(nodeIconsLucide[item.family])}
{nodeNames[item.family] ?? ""}{" "} diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index cfdc34782..1668b1d4e 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -1,7 +1,21 @@ -import { classNames, nodeColors, nodeIcons, toTitleCase } from "../../utils"; +import { + classNames, + nodeColors, + nodeIconsLucide, + toTitleCase, +} from "../../utils"; import ParameterComponent from "./components/parameterComponent"; import { typesContext } from "../../contexts/typesContext"; -import { useContext, useState, useEffect, useRef } from "react"; +import { + useContext, + useState, + useEffect, + useRef, + ForwardRefExoticComponent, + ComponentType, + SVGProps, + ReactNode, +} from "react"; import { NodeDataType } from "../../types/flow"; import { alertContext } from "../../contexts/alertContext"; import { PopUpContext } from "../../contexts/popUpContext"; @@ -12,6 +26,7 @@ import NodeToolbarComponent from "../../pages/FlowPage/components/nodeToolbarCom import ShadTooltip from "../../components/ShadTooltipComponent"; import { useSSE } from "../../contexts/SSEContext"; +import { ReactElement } from "react-markdown/lib/react-markdown"; export default function GenericNode({ data, @@ -25,8 +40,9 @@ export default function GenericNode({ const { types, deleteNode } = useContext(typesContext); const { closePopUp, openPopUp } = useContext(PopUpContext); - - const Icon = nodeIcons[data.type] || nodeIcons[types[data.type]]; + // any to avoid type conflict + const Icon: any = + nodeIconsLucide[data.type] || nodeIconsLucide[types[data.type]]; const [validationStatus, setValidationStatus] = useState(null); // State for outline color const { sseData, isBuilding } = useSSE(); @@ -88,8 +104,13 @@ export default function GenericNode({ }} />
- -
{data.node.display_name}
+ +
+ {data.node.display_name} +
diff --git a/src/frontend/src/alerts/alertDropDown/components/singleAlertComponent/index.tsx b/src/frontend/src/alerts/alertDropDown/components/singleAlertComponent/index.tsx index ad505e23e..0eaf0cf5a 100644 --- a/src/frontend/src/alerts/alertDropDown/components/singleAlertComponent/index.tsx +++ b/src/frontend/src/alerts/alertDropDown/components/singleAlertComponent/index.tsx @@ -1,13 +1,8 @@ -import { - XCircleIcon, - XMarkIcon, - InformationCircleIcon, - CheckCircleIcon, -} from "@heroicons/react/24/outline"; import { Link } from "react-router-dom"; import { Transition } from "@headlessui/react"; import { useState } from "react"; import { SingleAlertComponentType } from "../../../../types/alerts"; +import { X, CheckCircle2, Info, XCircle } from "lucide-react"; export default function SingleAlert({ dropItem, @@ -34,7 +29,7 @@ export default function SingleAlert({ key={dropItem.id} >
-
@@ -81,7 +76,7 @@ export default function SingleAlert({ key={dropItem.id} >
-
@@ -127,7 +122,7 @@ export default function SingleAlert({ key={dropItem.id} >
-
diff --git a/src/frontend/src/alerts/alertDropDown/index.tsx b/src/frontend/src/alerts/alertDropDown/index.tsx index edd3bb23f..78d9c8553 100644 --- a/src/frontend/src/alerts/alertDropDown/index.tsx +++ b/src/frontend/src/alerts/alertDropDown/index.tsx @@ -1,11 +1,11 @@ import { useContext, useEffect, useRef } from "react"; import { alertContext } from "../../contexts/alertContext"; -import { XMarkIcon } from "@heroicons/react/24/solid"; -import { TrashIcon } from "@heroicons/react/24/outline"; import SingleAlert from "./components/singleAlertComponent"; import { AlertDropdownType } from "../../types/alerts"; import { PopUpContext } from "../../contexts/popUpContext"; import { useOnClickOutside } from "../hooks/useOnClickOutside"; +import { X, Trash2 } from "lucide-react"; + export default function AlertDropdown({}: AlertDropdownType) { const { closePopUp } = useContext(PopUpContext); const componentRef = useRef(null); @@ -36,13 +36,13 @@ export default function AlertDropdown({}: AlertDropdownType) { setTimeout(clearNotificationList, 100); }} > - + diff --git a/src/frontend/src/alerts/error/index.tsx b/src/frontend/src/alerts/error/index.tsx index bcabe764f..faa1088bd 100644 --- a/src/frontend/src/alerts/error/index.tsx +++ b/src/frontend/src/alerts/error/index.tsx @@ -1,7 +1,7 @@ import { Transition } from "@headlessui/react"; -import { XCircleIcon, XMarkIcon } from "@heroicons/react/24/outline"; import { useEffect, useState } from "react"; import { ErrorAlertType } from "../../types/alerts"; +import { XCircle } from "lucide-react"; export default function ErrorAlert({ title, @@ -43,7 +43,7 @@ export default function ErrorAlert({ >
-
diff --git a/src/frontend/src/components/promptComponent/index.tsx b/src/frontend/src/components/promptComponent/index.tsx index 7713da8e6..9752c0c10 100644 --- a/src/frontend/src/components/promptComponent/index.tsx +++ b/src/frontend/src/components/promptComponent/index.tsx @@ -1,10 +1,10 @@ -import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/outline"; import { useContext, useEffect, useState } from "react"; import { PopUpContext } from "../../contexts/popUpContext"; import { TextAreaComponentType } from "../../types/components"; import GenericModal from "../../modals/genericModal"; import { TypeModal } from "../../utils"; import { INPUT_STYLE } from "../../constants"; +import { ExternalLink } from "lucide-react"; export default function PromptAreaComponent({ value, @@ -74,7 +74,7 @@ export default function PromptAreaComponent({ }} > {!editNode && ( - + )}
diff --git a/src/frontend/src/components/textAreaComponent/index.tsx b/src/frontend/src/components/textAreaComponent/index.tsx index 4c0412994..4b4cd1582 100644 --- a/src/frontend/src/components/textAreaComponent/index.tsx +++ b/src/frontend/src/components/textAreaComponent/index.tsx @@ -1,10 +1,11 @@ -import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/outline"; import { useContext, useEffect, useState } from "react"; import { PopUpContext } from "../../contexts/popUpContext"; import { TextAreaComponentType } from "../../types/components"; import GenericModal from "../../modals/genericModal"; import { TypeModal } from "../../utils"; import { INPUT_STYLE } from "../../constants"; +import { ExternalLink } from "lucide-react"; + export default function TextAreaComponent({ value, onChange, @@ -76,7 +77,7 @@ export default function TextAreaComponent({ }} > {!editNode && ( - + )} diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx index 0f695cc16..8b373c4e2 100644 --- a/src/frontend/src/modals/ApiModal/index.tsx +++ b/src/frontend/src/modals/ApiModal/index.tsx @@ -1,4 +1,3 @@ -import { CodeBracketSquareIcon } from "@heroicons/react/24/outline"; import { useContext, useState } from "react"; import { PopUpContext } from "../../contexts/popUpContext"; import "ace-builds/src-noconflict/mode-python"; @@ -26,7 +25,7 @@ import { TabsList, TabsTrigger, } from "../../components/ui/tabs"; -import { Check, Clipboard } from "lucide-react"; +import { Check, Clipboard, Code2 } from "lucide-react"; export default function ApiModal({ flow }: { flow: FlowType }) { const [open, setOpen] = useState(true); @@ -88,7 +87,7 @@ export default function ApiModal({ flow }: { flow: FlowType }) { Code -