fix: fixes, handle loop workflows when ordering

Author: pyphilia

src/js/app.js

@@ -150,7 +150,7 @@ export let app;
         "$setInputValueInElement",
         "$setTextValueInElement",
         "$addLink",
-        "deleteLink",
+        "$deleteLink",
         "$moveSelectedElements",
         "$resizeElement",
         "$openWorkflow",

src/js/constants/messages.js

@@ -5,4 +5,7 @@ export const MESSAGE_PASTE_ERROR = "Nothing was previously copied";
 export const MESSAGE_SAVE_SUCCESS = "Workflow saved!";
 export const MESSAGE_SAVE_ERROR = "The workflow couldn't be saved";
 
+export const MESSAGE_LOOP =
+  "There exist a loop in the workflow, it cannot be installed";
+
 export const NO_PARAMETER_TEXT = "No parameter";

src/js/elements/orderElement.js

@@ -1,5 +1,7 @@
 import { app } from "../app";
 import * as joint from "jointjs";
+import { fireAlert } from "../utils/alerts";
+import { MESSAGE_LOOP } from "../constants/messages";
 
 /**
  * order graph elements from source to target
@@ -47,29 +49,56 @@ export const orderGraph = graph => {
 
 /**
  * get elements in order, from source to target
+ * if a loop is found, it still orders the element
+ * and return isLoop set to true
  */
 export const getOrderedElements = () => {
-  const order = [];
   const { graph } = app;
 
+  const order = [];
+  let isLoop = false;
+
   const addedBoxId = [];
 
   let subgraph = new joint.dia.Graph();
   subgraph.addCells(graph.getCells());
 
   do {
-    const sources = subgraph.getSources();
+    let sources = subgraph.getSources();
+
+    // if no root is found, but there are still elements
+    // it means there is a loop
+    if (!sources.length) {
+      sources = [subgraph.getElements()[0]];
+      fireAlert("danger", MESSAGE_LOOP);
+      isLoop = true;
+    }
+
     for (const source of sources) {
       order.push(source);
       addedBoxId.push(source.attributes.boxId);
     }
+
     let remainingEls = subgraph
       .getElements()
       .filter(el => !sources.includes(el));
     let remainingCells = subgraph.getSubgraph(remainingEls);
+
+    // if already added elements are in the graph again, there is a loop
+    if (
+      remainingCells.filter(el => addedBoxId.includes(el.attributes.boxId))
+        .length
+    ) {
+      fireAlert("danger", MESSAGE_LOOP);
+      isLoop = true;
+    }
+
+    remainingCells = remainingCells.filter(
+      el => !addedBoxId.includes(el.attributes.boxId)
+    );
     subgraph = new joint.dia.Graph();
     subgraph.addCells(remainingCells);
   } while (subgraph.getElements().length);
 
-  return order;
+  return { elements: order, isLoop };
 };

src/js/workflows/saveWorkflow.js

@@ -13,7 +13,9 @@ import { getOrderedElements } from "../elements/orderElement";
  * @param {boolean} installation if true, send an installation request
  */
 export const saveWorkflow = async (jsonGraph, installation = false) => {
-  const orderedElements = getOrderedElements().filter(
+  const { elements, isLoop } = getOrderedElements();
+
+  const orderedElements = elements.filter(
     ({ attributes: { category } }) => category === CATEGORY_SERVICE
   );
 
@@ -43,7 +45,8 @@ export const saveWorkflow = async (jsonGraph, installation = false) => {
             Value
           });
           _inputs.parameters[paramName] = DivaServices.parseParameterValue(
-            Value
+            Value,
+            paramType
           );
         }
         const validity = Validation.checkValue(Value, paramType, values);
@@ -158,7 +161,8 @@ export const saveWorkflow = async (jsonGraph, installation = false) => {
   // set found errors in log
   app.$refs.log.setLogMessages(log);
 
-  await API.saveWorkflow(xml, app.workflowId, installation);
+  const isInstallation = installation && !isLoop;
+  await API.saveWorkflow(xml, app.workflowId, isInstallation);
 
   return request;
 };