@bizdoc/core 1.13.0-next.14 → 1.13.0-next.15

package/fesm2020/bizdoc-core.mjs

@@ -2069,7 +2069,7 @@ const STRINGS = {
         ReceivedTime: 'Received {0}',
         ReceivedBy: 'Received by {0} {1}',
         ActionTakenBy: '{0} {1} this document on behalf of {2} {3}',
-        ActionTakenByTo: '{0} {1} this document to {2} on behalf of {3} {4}',
+        ActionTakenByTo: '{0} {1} this document on behalf of {3} to {2} {4}',
         YouTakenActionBy: '{0} {1} this document on your behalf {2}',
         YouTakenActionByTo: '{0} {1} this document to {2} on your behalf {3}',
         ActionTakenByYou: 'You {0} this document on behalf of {1} {2}',
@@ -13387,14 +13387,7 @@ class FlowViewComponent extends TraceBase {
     /** */
     async _prepare() {
         const { connectors: dconnectors, nodes: dnodes } = this.model.workflow;
-        const indicators = [], connectors = dconnectors.map(c => ({
-            sourceID: c.sourceId,
-            targetID: c.targetId,
-            addInfo: {
-                estimate: c.estimate,
-                time: c.time
-            }
-        })), nodes = [];
+        const indicators = [], connectors = [], nodes = [];
         let zIndex = 500;
         for (let node of dnodes) {
             if (nodes.find(n => n.id == node.id))
@@ -13449,29 +13442,6 @@ class FlowViewComponent extends TraceBase {
                                 }
                             }]
                     };
-                    r > 0 &&
-                        // more than one recipient to node,
-                        dconnectors.forEach(c => {
-                            if (c.targetId === node.id)
-                                // add inbound connectors
-                                connectors.push({
-                                    sourceID: c.sourceId,
-                                    targetID: nod.id,
-                                    addInfo: {
-                                        estimate: c.estimate
-                                    }
-                                });
-                            if (c.sourceId === node.id &&
-                                // add outbound no origin or originated by the recipient
-                                (!c.originId || c.originId === recipient.id))
-                                connectors.push({
-                                    sourceID: nod.id,
-                                    targetID: c.targetId,
-                                    addInfo: {
-                                        estimate: c.estimate
-                                    }
-                                });
-                        });
                     nodes.push(nod);
                     // add action indicator
                     if (recipient.action) {
@@ -13595,6 +13565,23 @@ class FlowViewComponent extends TraceBase {
                 }
             }
         }
+        for (let connector of dconnectors) {
+            let sources = nodes.filter(n => n.addInfo.node.id === connector.sourceId), targets = nodes.filter(n => n.addInfo.node.id === connector.targetId);
+            for (let source of sources) {
+                for (let target of targets) {
+                    if (!connector.originId || !source.addInfo.recipient ||
+                        connector.originId === source.addInfo.recipient.id)
+                        connectors.push({
+                            sourceID: source.id,
+                            targetID: target.id,
+                            addInfo: {
+                                estimate: connector.estimate,
+                                time: connector.time
+                            }
+                        });
+                }
+            }
+        }
         return { connectors, nodes, indicators };
     }
     /**