refactor: modify workflow schema

Author: pyphilia

src/js/app.js

@@ -183,8 +183,7 @@ export let app;
       currentDataElements: {
         deep: true,
         handler(newValue, oldValue) {
-          const difference = findDifferenceBy(newValue, oldValue, "boxId");
-          console.log("TCL: handler -> newValue", difference);
+          // const difference = findDifferenceBy(newValue, oldValue, "boxId");
           // for (const { boxId, defaultParams } of difference) {
           //   setSelectValueInElement(boxId, defaultParams[Types.SELECT.type]);
           //   setInputValueInElement(boxId, defaultParams[Types.NUMBER.type]);

src/js/layout/utils.js

@@ -186,7 +186,6 @@ i++;
 */
 
 export const buildPortAttrs = (name, type, typeAllowed) => {
-  console.log("TCL: buildPortAttrs -> type", type);
   const showPortDetails = layoutSettingsApp.isShowPortsDetailsChecked();
   const showPorts = layoutSettingsApp.isShowPortsChecked();
   const typeAllowedShort = shortenString(typeAllowed.join(", "), 25);
@@ -228,7 +227,6 @@ export const createPort = (param, group) => {
         typeAllowed[0].indexOf("/") < 0
           ? typeAllowed[0].length
           : typeAllowed[0].indexOf("/");
-      console.log("TCL: typeEnd", typeEnd);
       type = typeAllowed[0].substr(
         //@TODO diff types ?
         0,

src/js/workflows/readWorkflow.js

@@ -17,6 +17,7 @@ export const readWorkflow = async id => {
 
   const elements = [];
   const links = [];
+  const linksTmp = [];
 
   xml2js.parseString(xml, async (err, json) => {
     if (!json.WorkflowDefinition.Steps) {
@@ -27,12 +28,15 @@ export const readWorkflow = async id => {
 
     for (const step of Step) {
       const {
-        Id: [id], // from saveWorkflow, id  is defined with the boxId
+        // Id: [id], // from saveWorkflow, id  is defined with the boxId
+        No: [no],
         Inputs: [inputs],
         Name: [name],
         Service: [service]
       } = step;
 
+      const boxId = generateUniqueId();
+
       const webserviceObj = getWebserviceById(service.Key[0]);
       if (webserviceObj.length) {
         alert("step ", name, " not found");
@@ -46,7 +50,7 @@ export const readWorkflow = async id => {
       if (Parameter) {
         for (const param of Parameter) {
           const {
-            paramName: [name],
+            Name: [name],
             Value: [value]
           } = param;
 
@@ -57,46 +61,56 @@ export const readWorkflow = async id => {
         }
       }
 
-      // store links
       if (Data) {
         for (const port of Data) {
           const {
             Value: [value],
             Name: [portName]
           } = port;
-          const {
-            Ref: [ref],
-            ServiceOutputName: [serviceName]
-          } = value.WorkflowStep[0];
-
-          const source = {
-            boxId: ref,
-            portName: serviceName
-          };
-          const target = { boxId: id, portName };
-          links.push({
-            id: generateUniqueId(),
-            source,
-            target
-          });
+          linksTmp.push({ targetBoxId: boxId, value, portName });
         }
       }
 
-      const information = { id };
+      const information = { boxId };
 
       // add element
       const param = buildElementFromName(webserviceObj.name);
 
       const element = {
+        no,
         ...param,
         information,
         defaultParams,
-        boxId: id
+        boxId
       };
 
       elements.push(element);
     }
   });
 
+  for (const link of linksTmp) {
+    const { targetBoxId, value, portName } = link;
+
+    // store links
+    const {
+      Ref: [ref],
+      ServiceOutputName: [serviceName]
+    } = value.WorkflowStep[0];
+
+    // find corresponding step with given ref
+    const sourceStep = elements.find(({ no }) => no == ref);
+    const sourceBoxId = sourceStep.boxId;
+    const source = {
+      boxId: sourceBoxId,
+      portName: serviceName
+    };
+    const target = { boxId: targetBoxId, portName };
+    links.push({
+      id: generateUniqueId(),
+      source,
+      target
+    });
+  }
+
   app.openWorkflow({ elements, links });
 };

src/js/workflows/saveWorkflow.js

@@ -34,13 +34,19 @@ export const saveWorkflow = jsonGraph => {
           const { value: Value, defaultValue, values } = options;
           if (Value != defaultValue.toString()) {
             Inputs.Parameter.push({
-              paramName,
+              Name: paramName,
               Value
             });
           }
           const validity = Validation.checkValue(Value, paramType, values);
           if (!validity) {
-            log.push({ value: Value, paramName, paramType, name: type, boxId });
+            log.push({
+              value: Value,
+              Name: paramName,
+              paramType,
+              name: type,
+              boxId
+            });
           }
         }
       }
@@ -86,7 +92,7 @@ export const saveWorkflow = jsonGraph => {
     const sourceWebservice = Steps.Step.find(el => el.Id == sourceId);
 
     if (sourceWebservice) {
-      const { Id: Ref } = sourceWebservice;
+      const { No: Ref } = sourceWebservice;
       const p = {
         Name: link.target.portName,
         Value: {
@@ -123,6 +129,12 @@ export const saveWorkflow = jsonGraph => {
   console.log(allFiles); //@TODO send to server to upload as zip
   console.log(JSON.stringify(data));
 
+  // remove Id to match relax validation schema
+  for (const step of Steps.Step) {
+    console.log("TCL: step", step);
+    delete step.Id;
+  }
+
   const builder = new xml2js.Builder({ rootName: "Steps" });
   const xml = builder.buildObject(Steps);
   console.log("TCL: xml", xml);