fix: change orderElements process, fixes

Author: pyphilia

src/js/elements/orderElement.js

@@ -1,4 +1,5 @@
 import { app } from "../app";
+import * as joint from "jointjs";
 
 /**
  * order graph elements from source to target
@@ -50,32 +51,25 @@ export const orderGraph = graph => {
 export const getOrderedElements = () => {
   const order = [];
   const { graph } = app;
-  const sources = graph.getSources();
 
   const addedBoxId = [];
 
-  for (const source of sources) {
-    order.push(source);
-    addedBoxId.push(source.attributes.boxId);
-
-    let children = graph.getNeighbors(source, { outbound: true });
-    do {
-      let allChildren = [];
-      const noDuplicates = children.filter(
-        ({ attributes: { boxId } }) => !addedBoxId.includes(boxId)
-      );
-      //.sort((a,b) => graph.getNeighbors(b).length - graph.getNeighbors(a).length)
+  let subgraph = new joint.dia.Graph();
+  subgraph.addCells(graph.getCells());
 
-      for (const child of noDuplicates) {
-        order.push(child);
-        addedBoxId.push(child.attributes.boxId);
-        allChildren = allChildren.concat(
-          graph.getNeighbors(child, { outbound: true })
-        );
-      }
+  do {
+    const sources = subgraph.getSources();
+    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);
+    subgraph = new joint.dia.Graph();
+    subgraph.addCells(remainingCells);
+  } while (subgraph.getElements().length);
 
-      children = allChildren;
-    } while (children.length);
-  }
   return order;
 };

src/js/workflows/saveWorkflow.js

@@ -24,7 +24,7 @@ export const saveWorkflow = async (jsonGraph, installation = false) => {
 
   for (const [i, { attributes: box }] of orderedElements.entries()) {
     const { type, boxId } = box;
-    const Name = DivaServices.buildNameForRequest(type);
+    const Name = DivaServices.buildServiceNameForRequest(type, boxId);
     const No = i;
     const Inputs = { Parameter: [], Data: [] };
 

yarn.lock

@@ -2747,7 +2747,7 @@ diffie-hellman@^5.0.0:
 
 "divaservices-utils@https://github.com/pyphilia/divaservices-utils":
   version "1.0.0"
-  resolved "https://github.com/pyphilia/divaservices-utils#dc3bf6dd7dd75e0c7d02526d713ff665eddfd8a6"
+  resolved "https://github.com/pyphilia/divaservices-utils#c3a31e1c287ce1f479352f993e5796e91903bd0d"
   dependencies:
     eslint "^6.6.0"
     node-fetch "^2.6.0"