diff --git a/src/frontend/package.json b/src/frontend/package.json index 930843c6e..8d7d25d88 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -118,4 +118,4 @@ "typescript": "^5.2.2", "vite": "^4.4.9" } -} \ No newline at end of file +} diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index aa6632031..cb5fd731a 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -33,7 +33,7 @@ import { nodeIconsLucide, nodeNames, } from "../../../../utils/styleUtils"; -import { classNames, extractIdFromLongId, groupByFamily } from "../../../../utils/utils"; +import { classNames, groupByFamily } from "../../../../utils/utils"; export default function ParameterComponent({ left, @@ -48,7 +48,7 @@ export default function ParameterComponent({ required = false, optionalHandle = null, info = "", - proxy + proxy, }: ParameterComponentType): JSX.Element { const ref = useRef(null); const refHtml = useRef(null); @@ -185,10 +185,13 @@ export default function ParameterComponent({ (info !== "" ? " flex items-center" : "") } > - {proxy ? ({proxy.id}}> - - {title} - ):title} + {proxy ? ( + {proxy.id}}> + {title} + + ) : ( + title + )} {required ? " *" : ""}
{info !== "" && ( @@ -302,7 +305,11 @@ export default function ParameterComponent({ ) : left === true && type === "code" ? (
{ data.node = nodeClass; @@ -338,7 +345,11 @@ export default function ParameterComponent({ ) : left === true && type === "prompt" ? (
{ data.node = nodeClass; diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index b9ab48432..c9bc74f2a 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -1,21 +1,26 @@ -import { cloneDeep, get } from "lodash"; +import { cloneDeep } from "lodash"; import { useContext, useEffect, useState } from "react"; -import { NodeToolbar, XYPosition, useUpdateNodeInternals } from "reactflow"; +import { NodeToolbar, useUpdateNodeInternals } from "reactflow"; import ShadTooltip from "../../components/ShadTooltipComponent"; import Tooltip from "../../components/TooltipComponent"; import IconComponent from "../../components/genericIconComponent"; +import InputComponent from "../../components/inputComponent"; +import { Textarea } from "../../components/ui/textarea"; import { useSSE } from "../../contexts/SSEContext"; import { TabsContext } from "../../contexts/tabsContext"; import { typesContext } from "../../contexts/typesContext"; import NodeToolbarComponent from "../../pages/FlowPage/components/nodeToolbarComponent"; import { validationStatusType } from "../../types/components"; import { NodeDataType } from "../../types/flow"; -import { cleanEdges, getGroupStatus, handleKeyDown, scapedJSONStringfy } from "../../utils/reactflowUtils"; +import { + cleanEdges, + getGroupStatus, + handleKeyDown, + scapedJSONStringfy, +} from "../../utils/reactflowUtils"; import { nodeColors, nodeIconsLucide } from "../../utils/styleUtils"; import { classNames, toTitleCase } from "../../utils/utils"; import ParameterComponent from "./components/parameterComponent"; -import InputComponent from "../../components/inputComponent"; -import { Textarea } from "../../components/ui/textarea"; export default function GenericNode({ data: olddata, @@ -66,7 +71,9 @@ export default function GenericNode({ // New useEffect to watch for changes in sseData and update validation status useEffect(() => { - const relevantData = data.node?.flow ? getGroupStatus(data.node.flow, sseData) : sseData[data.id]; + const relevantData = data.node?.flow + ? getGroupStatus(data.node.flow, sseData) + : sseData[data.id]; if (relevantData) { // Extract validation information from relevantData and update the validationStatus state setValidationStatus(relevantData); @@ -105,8 +112,8 @@ export default function GenericNode({ iconColor={`${nodeColors[types[data.type]]}`} />
- {data.node?.flow && inputName ? -
+ {data.node?.flow && inputName ? ( +
{ @@ -123,13 +130,17 @@ export default function GenericNode({ password={false} blurOnEnter={true} /> -
: -
setInputName(true)}> +
+ ) : ( + +
setInputName(true)} + > {data.node?.display_name}
- } - + )}
@@ -151,10 +162,10 @@ export default function GenericNode({
{typeof validationStatus.params === "string" ? validationStatus.params - .split("\n") - .map((line: string, index: number) => ( -
{line}
- )) + .split("\n") + .map((line: string, index: number) => ( +
{line}
+ )) : ""}
) @@ -192,7 +203,7 @@ export default function GenericNode({
- {data.node?.flow && inputDescription ? + {data.node?.flow && inputDescription ? (