diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 737a02fc3..690ace7af 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -159,18 +159,18 @@ export default function GenericNode({ <> {Object.keys(data.node.template) - .filter((templateName) => templateName.charAt(0) !== "_") - .map((templateName: string, idx) => ( + .filter((templateField) => templateField.charAt(0) !== "_") + .map((templateField: string, idx) => (
- {data.node.template[templateName].show && - !data.node.template[templateName].advanced ? ( + {data.node.template[templateField].show && + !data.node.template[templateField].advanced ? ( ) : ( diff --git a/src/frontend/src/components/codeTabsComponent/index.tsx b/src/frontend/src/components/codeTabsComponent/index.tsx index eabb2db1b..62cc87f36 100644 --- a/src/frontend/src/components/codeTabsComponent/index.tsx +++ b/src/frontend/src/components/codeTabsComponent/index.tsx @@ -230,60 +230,60 @@ export default function CodeTabsComponent({ {Object.keys(node["data"]["node"]["template"]) .filter( - (templateName) => - templateName.charAt(0) !== "_" && - node.data.node.template[templateName] + (templateField) => + templateField.charAt(0) !== "_" && + node.data.node.template[templateField] .show && - (node.data.node.template[templateName] + (node.data.node.template[templateField] .type === "str" || - node.data.node.template[templateName] + node.data.node.template[templateField] .type === "bool" || - node.data.node.template[templateName] + node.data.node.template[templateField] .type === "float" || - node.data.node.template[templateName] + node.data.node.template[templateField] .type === "code" || - node.data.node.template[templateName] + node.data.node.template[templateField] .type === "prompt" || - node.data.node.template[templateName] + node.data.node.template[templateField] .type === "file" || - node.data.node.template[templateName] + node.data.node.template[templateField] .type === "int") ) - .map((templateName, index) => { + .map((templateField, index) => { return ( - {templateName} + {templateField}
{node.data.node.template[ - templateName + templateField ].type === "str" && !node.data.node.template[ - templateName + templateField ].options ? (
{node.data.node.template[ - templateName + templateField ].list ? ( { @@ -293,7 +293,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -301,18 +301,18 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} /> ) : node.data.node.template[ - templateName + templateField ].multiline ? ( @@ -323,16 +323,16 @@ export default function CodeTabsComponent({ value={ !node.data.node .template[ - templateName + templateField ].value || node.data.node .template[ - templateName + templateField ].value === "" ? "" : node.data.node .template[ - templateName + templateField ].value } onChange={(target) => { @@ -342,7 +342,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -351,7 +351,7 @@ export default function CodeTabsComponent({ target, node.data.node .template[ - templateName + templateField ] ); }} @@ -364,20 +364,20 @@ export default function CodeTabsComponent({ disabled={false} password={ node.data.node.template[ - templateName + templateField ].password ?? false } value={ !node.data.node.template[ - templateName + templateField ].value || node.data.node.template[ - templateName + templateField ].value === "" ? "" : node.data.node .template[ - templateName + templateField ].value } onChange={(target) => { @@ -387,7 +387,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -395,7 +395,7 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} @@ -403,14 +403,14 @@ export default function CodeTabsComponent({ )}
) : node.data.node.template[ - templateName + templateField ].type === "bool" ? (
{" "} { @@ -420,7 +420,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = e; return newInputList; }); @@ -428,7 +428,7 @@ export default function CodeTabsComponent({ node["data"]["id"], e, node.data.node.template[ - templateName + templateField ] ); }} @@ -437,19 +437,19 @@ export default function CodeTabsComponent({ />
) : node.data.node.template[ - templateName + templateField ].type === "file" ? ( @@ -459,7 +459,7 @@ export default function CodeTabsComponent({ disabled={false} value={ node.data.node.template[ - templateName + templateField ].value ?? "" } onChange={( @@ -467,26 +467,26 @@ export default function CodeTabsComponent({ ) => {}} fileTypes={ node.data.node.template[ - templateName + templateField ].fileTypes } suffixes={ node.data.node.template[ - templateName + templateField ].suffixes } onFileChange={( value: any ) => { node.data.node.template[ - templateName + templateField ].file_path = value; }} >
) : node.data.node.template[ - templateName + templateField ].type === "float" ? (
{ @@ -511,7 +511,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -519,17 +519,17 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} />
) : node.data.node.template[ - templateName + templateField ].type === "str" && node.data.node.template[ - templateName + templateField ].options ? (
{ @@ -547,7 +547,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -555,26 +555,26 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} value={ !node.data.node.template[ - templateName + templateField ].value || node.data.node.template[ - templateName + templateField ].value === "" ? "" : node.data.node.template[ - templateName + templateField ].value } >
) : node.data.node.template[ - templateName + templateField ].type === "int" ? (
{ @@ -599,7 +599,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -607,26 +607,26 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} />
) : node.data.node.template[ - templateName + templateField ].type === "prompt" ? ( @@ -636,15 +636,15 @@ export default function CodeTabsComponent({ disabled={false} value={ !node.data.node.template[ - templateName + templateField ].value || node.data.node.template[ - templateName + templateField ].value === "" ? "" : node.data.node .template[ - templateName + templateField ].value } onChange={(target) => { @@ -654,7 +654,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -662,7 +662,7 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} @@ -670,17 +670,17 @@ export default function CodeTabsComponent({
) : node.data.node.template[ - templateName + templateField ].type === "code" ? ( { @@ -709,7 +709,7 @@ export default function CodeTabsComponent({ newInputList[ index ].data.node.template[ - templateName + templateField ].value = target; return newInputList; }); @@ -717,7 +717,7 @@ export default function CodeTabsComponent({ node["data"]["id"], target, node.data.node.template[ - templateName + templateField ] ); }} @@ -725,7 +725,7 @@ export default function CodeTabsComponent({ ) : node.data.node.template[ - templateName + templateField ].type === "Any" ? ( "-" ) : ( diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx index a7ceac170..307e48208 100644 --- a/src/frontend/src/modals/ApiModal/index.tsx +++ b/src/frontend/src/modals/ApiModal/index.tsx @@ -184,16 +184,16 @@ const ApiModal = forwardRef( flow["data"]["nodes"].forEach((node) => { Object.keys(node["data"]["node"]["template"]) .filter( - (templateName) => - templateName.charAt(0) !== "_" && - node.data.node.template[templateName].show && - (node.data.node.template[templateName].type === "str" || - node.data.node.template[templateName].type === "bool" || - node.data.node.template[templateName].type === "float" || - node.data.node.template[templateName].type === "code" || - node.data.node.template[templateName].type === "prompt" || - node.data.node.template[templateName].type === "file" || - node.data.node.template[templateName].type === "int") + (templateField) => + templateField.charAt(0) !== "_" && + node.data.node.template[templateField].show && + (node.data.node.template[templateField].type === "str" || + node.data.node.template[templateField].type === "bool" || + node.data.node.template[templateField].type === "float" || + node.data.node.template[templateField].type === "code" || + node.data.node.template[templateField].type === "prompt" || + node.data.node.template[templateField].type === "file" || + node.data.node.template[templateField].type === "int") ) .map((n, i) => { arrNodesWithValues.push(node["id"]); diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 9bd6db214..e036f0360 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -9,17 +9,17 @@ import { classNames } from "../../../../utils/utils"; export default function NodeToolbarComponent({ data, setData, deleteNode }) { const [nodeLength, setNodeLength] = useState( Object.keys(data.node.template).filter( - (templateName) => - templateName.charAt(0) !== "_" && - data.node.template[templateName].show && - (data.node.template[templateName].type === "str" || - data.node.template[templateName].type === "bool" || - data.node.template[templateName].type === "float" || - data.node.template[templateName].type === "code" || - data.node.template[templateName].type === "prompt" || - data.node.template[templateName].type === "file" || - data.node.template[templateName].type === "Any" || - data.node.template[templateName].type === "int") + (templateField) => + templateField.charAt(0) !== "_" && + data.node.template[templateField].show && + (data.node.template[templateField].type === "str" || + data.node.template[templateField].type === "bool" || + data.node.template[templateField].type === "float" || + data.node.template[templateField].type === "code" || + data.node.template[templateField].type === "prompt" || + data.node.template[templateField].type === "file" || + data.node.template[templateField].type === "Any" || + data.node.template[templateField].type === "int") ).length );