@bizdoc/core 1.13.0-next.11 → 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) {
@@ -13554,9 +13524,7 @@ class FlowViewComponent extends TraceBase {
                             offset: shape.type === 'Path' ? {
                                 y: 1
                             } : { x: .5 },
-                            style: {
-                            //bold: true
-                            },
+                            style: {},
                             verticalAlignment: shape.type === 'Path' ? 'Top' : 'Center'
                         }]
                 });
@@ -13597,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 };
     }
     /**
@@ -13712,17 +13697,21 @@ class FlowViewComponent extends TraceBase {
         }
         if (recipient.replied) {
             const time = this._fromNow(recipient.replied);
+            const targets = this.model.recipients.filter(r => r.originId === recipient.id), to = [];
+            if (targets.length)
+                for (let sibling of targets) {
+                    const who = await this._accounts.get(sibling.userId).toPromise();
+                    to.push(who.name);
+                }
             if (recipient.byId) {
                 if (recipient.byId === this._session.profile.byId) {
                     const action = this._action(recipient.action, this._session.profile.byGender);
-                    if (recipient.originId) {
-                        const origin = this.model.recipients.find(r => r.id === recipient.originId);
-                        const to = await this._accounts.get(origin.userId).toPromise();
+                    if (to.length) {
                         if (recipient.userId === this._session.profile.userId)
-                            tooltip.note = this._translate.get('ActionTakenByYouTo', action, to.name, this._session.profile.name, time);
+                            tooltip.note = this._translate.get('ActionTakenByYouTo', action, this._translate.join(to), this._session.profile.name, time);
                         else {
                             const who = await this._accounts.get(recipient.userId).toPromise();
-                            tooltip.note = this._translate.get('ActionTakenByYouTo', action, to.name, who.name, time);
+                            tooltip.note = this._translate.get('ActionTakenByYouTo', action, this._translate.join(to), who.name, time);
                         }
                     }
                     else if (recipient.userId === this._session.profile.userId)
@@ -13736,40 +13725,34 @@ class FlowViewComponent extends TraceBase {
                     const by = await this._accounts.get(recipient.byId).toPromise();
                     const action = this._action(recipient.action, by.gender);
                     if (recipient.userId === this._session.profile.userId) {
-                        if (recipient.originId) {
-                            const origin = this.model.recipients.find(r => r.id === recipient.originId);
-                            const to = await this._accounts.get(origin.userId).toPromise();
-                            tooltip.note = this._translate.get('YouTakenActionByTo', by.name, action, to.name, time);
+                        if (to.length) {
+                            tooltip.note = this._translate.get('YouTakenActionByTo', by.name, action, this._translate.join(to), time);
                         }
                         else
                             tooltip.note = this._translate.get('YouTakenActionBy', by.name, action, time);
                     }
                     else {
                         const who = await this._accounts.get(recipient.userId).toPromise();
-                        if (recipient.originId) {
-                            const origin = this.model.recipients.find(r => r.id === recipient.originId);
-                            const to = await this._accounts.get(origin.userId).toPromise();
-                            tooltip.note = this._translate.get('ActionTakenByTo', by.name, action, to.name, who.name, time);
+                        if (to.length) {
+                            tooltip.note = this._translate.get('ActionTakenByTo', by.name, action, this._translate.join(to), who.name, time);
                         }
                         else
                             tooltip.note = this._translate.get('ActionTakenBy', by.name, action, who.name, time);
                     }
                 }
             }
-            else if (recipient.originId) {
-                const origin = this.model.recipients.find(r => r.id === recipient.originId);
-                const to = await this._accounts.get(origin.userId).toPromise();
+            else if (to.length) {
                 if (recipient.userId === this._session.profile.userId) {
                     const action = this._action(recipient.action, this._session.profile.gender);
                     if (this._session.isImpersonating)
-                        tooltip.note = this._translate.get('ActionTakenTo', this._session.profile.name, action, to.name, time);
+                        tooltip.note = this._translate.get('ActionTakenTo', this._session.profile.name, action, this._translate.join(to), time);
                     else
-                        tooltip.note = this._translate.get('YouTakenActionTo', action, to.name, time);
+                        tooltip.note = this._translate.get('YouTakenActionTo', action, this._translate.join(to), time);
                 }
                 else {
                     const who = await this._accounts.get(recipient.userId).toPromise();
                     const action = this._action(recipient.action, who.gender);
-                    tooltip.note = this._translate.get('ActionTakenTo', who.name, action, to.name);
+                    tooltip.note = this._translate.get('ActionTakenTo', who.name, action, this._translate.join(to));
                 }
             }
             else if (this._session.isImpersonating) {
@@ -13786,17 +13769,18 @@ class FlowViewComponent extends TraceBase {
                 tooltip.note = this._translate.get('ActionTaken', who.name, action, time);
             }
         }
-        else if (!node.estimate) {
-            const time = this._fromNow(recipient.received);
-            if (this._session.isImpersonating)
-                tooltip.note = this._translate.personalize('ReceivedBy', this._session.profile.gender, this._session.profile.name, time);
-            else
-                tooltip.note = this._translate.get('YouReceived', time);
-        }
         else if (!recipient.estimate) {
-            const who = await this._accounts.get(recipient.userId).toPromise();
             const time = this._fromNow(recipient.received);
-            tooltip.note = this._translate.personalize('ReceivedTime', who.gender, time);
+            if (recipient.userId === this._session.userId) {
+                if (this._session.isImpersonating)
+                    tooltip.note = this._translate.personalize('ReceivedBy', this._session.profile.gender, this._session.profile.name, time);
+                else
+                    tooltip.note = this._translate.get('YouReceived', time);
+            }
+            else {
+                const who = await this._accounts.get(recipient.userId).toPromise();
+                tooltip.note = this._translate.personalize('ReceivedTime', who.gender, time);
+            }
         }
         if (recipient.substitutingId) {
             if (recipient.substitutingId === this._session.userId)
@@ -13955,14 +13939,13 @@ class TraceViewComponent extends TraceBase {
                 if (to.length) {
                     const users = [];
                     for (let who of to) {
-                        let profile = await me._accounts.get(who.substitutingId || who.userId).toPromise();
+                        let profile = await profileOf(who.substitutingId || who.userId);
                         users.push(nameOf(profile));
                     }
                     return me._translate.get('ActionTo', name, me._translate.join(users));
                 }
             }
-            else
-                return name;
+            return name;
         }
         const trace = [];
         for (let l of log) {
@@ -14079,7 +14062,7 @@ class TraceViewComponent extends TraceBase {
             }
         }
         for (let recipient of recipients) {
-            if (!recipient.pending && !recipient.estimate)
+            if (!recipient.pending && !recipient.estimate && !recipient.fyi)
                 continue;
             let step = {
                 time: recipient.received,