diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index f68c3ea73..e081cf490 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -14,6 +14,7 @@ import TabsManagerComponent from "./pages/FlowPage/components/tabsManagerCompone import { ErrorBoundary } from "react-error-boundary"; import CrashErrorComponent from "./components/CrashErrorComponent"; import { TabsContext } from "./contexts/tabsContext"; +import { getVersion } from "./controllers/API"; export default function App() { let { setCurrent, setShowSideBar, setIsStackedOpen } = @@ -49,11 +50,9 @@ export default function App() { // Initialize state variable for the version const [version, setVersion] = useState(""); useEffect(() => { - fetch("/version") - .then((res) => res.json()) - .then((data) => { - setVersion(data.version); - }); + getVersion().then((response) => { + setVersion(response.data.version); + }); }, []); // Use effect hook to update alertsList when a new alert is added useEffect(() => { diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 86eaf299d..c449296ef 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -33,6 +33,7 @@ import { NodeToolbar } from "reactflow"; import NodeToolbarComponent from "../../pages/FlowPage/components/nodeToolbarComponent"; import ShadTooltip from "../../components/ShadTooltipComponent"; +import { postValidateNode } from "../../controllers/API"; export default function GenericNode({ data, selected, @@ -62,17 +63,13 @@ export default function GenericNode({ const validateNode = useCallback( debounce(async () => { try { - const response = await fetch(`/validate/node/${data.id}`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify(reactFlowInstance.toObject()), - }); + const response = await postValidateNode( + data.id, + reactFlowInstance.toObject() + ); if (response.status === 200) { - let jsonResponse = await response.json(); - let jsonResponseParsed = await JSON.parse(jsonResponse); + let jsonResponseParsed = await JSON.parse(response.data); setValidationStatus(jsonResponseParsed); } } catch (error) { @@ -148,11 +145,10 @@ export default function GenericNode({ "Validating..." ) : (
- {validationStatus.params - .split("\n") - .map((line, index) => ( -
{line}
- ))} + {validationStatus.params || + "" + .split("\n") + .map((line, index) =>
{line}
)}
) } diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx index 405187647..e74806c7b 100644 --- a/src/frontend/src/modals/codeAreaModal/index.tsx +++ b/src/frontend/src/modals/codeAreaModal/index.tsx @@ -8,7 +8,7 @@ import "ace-builds/src-noconflict/theme-twilight"; import "ace-builds/src-noconflict/ext-language_tools"; // import "ace-builds/webpack-resolver"; import { darkContext } from "../../contexts/darkContext"; -import { checkCode } from "../../controllers/API"; +import { postValidateCode } from "../../controllers/API"; import { alertContext } from "../../contexts/alertContext"; import { TabsContext } from "../../contexts/tabsContext"; import { @@ -81,7 +81,7 @@ export default function CodeAreaModal({