From 4d2ae388a923d7051d43d93b054f13ce05d66299 Mon Sep 17 00:00:00 2001
From: sanjaycal <sanjay.calgary@gmail.com>
Date: Thu, 27 Feb 2025 12:21:05 -0500
Subject: [PATCH] Made frontend work with new api with id and metadata
---
.../Experiment/Workflows/NewNodeModal.tsx | 2 -
.../Experiment/Workflows/WorkflowCanvas.tsx | 49 ++++++++++++++-----
2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/renderer/components/Experiment/Workflows/NewNodeModal.tsx b/src/renderer/components/Experiment/Workflows/NewNodeModal.tsx
index d9fe123a..30cf6045 100644
--- a/src/renderer/components/Experiment/Workflows/NewNodeModal.tsx
+++ b/src/renderer/components/Experiment/Workflows/NewNodeModal.tsx
@@ -62,7 +62,6 @@ export default function NewNodeModal({
const node = {
name: name,
type: 'TRAIN',
- out: (config.nodes.length + 1).toString(),
template: template,
};
await fetch(
@@ -78,7 +77,6 @@ export default function NewNodeModal({
const node = {
name: name,
type: 'EVAL',
- out: (config.nodes.length + 1).toString(),
template: template,
};
await fetch(
diff --git a/src/renderer/components/Experiment/Workflows/WorkflowCanvas.tsx b/src/renderer/components/Experiment/Workflows/WorkflowCanvas.tsx
index 41c3206d..0f3c3b79 100644
--- a/src/renderer/components/Experiment/Workflows/WorkflowCanvas.tsx
+++ b/src/renderer/components/Experiment/Workflows/WorkflowCanvas.tsx
@@ -14,18 +14,30 @@ import CustomNode from './CustomNode';
const nodeTypes = { customNode: CustomNode };
function generateNodes(workflow: any) {
+ const workflowConfig = JSON.parse(workflow?.config);
+
+ if (workflowConfig.nodes.length == 0) {
+ return [];
+ }
+
let out: any[] = [];
- let currentTask = '0';
+ let currentTask = workflowConfig.nodes[0].id;
let position = 0;
- const workflowConfig = JSON.parse(workflow?.config);
console.log(workflowConfig);
- while (currentTask < workflowConfig.nodes.length) {
+ while (currentTask != 'END') {
+ let currentNode = {};
+ workflowConfig.nodes.forEach((node) => {
+ if (node.id == currentTask) {
+ currentNode = node;
+ }
+ });
+
const data = {
- label: workflowConfig.nodes[currentTask].name,
- jobType: workflowConfig.nodes[currentTask].type,
- template: workflowConfig.nodes[currentTask].template,
+ label: currentNode.name,
+ jobType: currentNode.type,
+ template: currentNode.template,
};
const nextNode = {
id: currentTask,
@@ -35,31 +47,42 @@ function generateNodes(workflow: any) {
};
out.push(nextNode);
position += 120;
- currentTask = workflowConfig.nodes[currentTask].out;
+ currentTask = currentNode.out;
}
return out;
}
function generateEdges(workflow: any) {
+ const workflowConfig = JSON.parse(workflow?.config);
+ if (workflowConfig.nodes.length <= 1) {
+ return [];
+ }
+
let out: any[] = [];
- let currentTask = '0';
- let ids = '0';
+ let currentTask = workflowConfig.nodes[0].id;
+ let ids = workflowConfig.nodes[0].id;
- const workflowConfig = JSON.parse(workflow?.config);
console.log(workflowConfig);
- while (currentTask < workflowConfig.nodes.length) {
+ while (currentTask != 'END') {
+ let currentNode = {};
+ workflowConfig.nodes.forEach((node) => {
+ if (node.id == currentTask) {
+ currentNode = node;
+ }
+ });
+
out.push({
id: ids,
source: currentTask,
- target: workflowConfig.nodes[currentTask].out,
+ target: currentNode.out,
markerEnd: {
type: 'arrow',
},
});
ids += 1;
- currentTask = workflowConfig.nodes[currentTask].out;
+ currentTask = currentNode.out;
}
return out;
--
GitLab