@bizdoc/core 3.9.2 → 3.9.3

package/fesm2022/bizdoc-core.mjs

@@ -499,6 +499,10 @@ const MATERIAL_PALETTES = {
 };
 
 const IMAGE_TYPE = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
+const START_CAP = /^[A-Z][^A-Z]/;
+function decapitalize(str) {
+    return str.replace(START_CAP, e => e.toLowerCase());
+}
 function anyKeys(obj) {
     return obj && Object.keys(obj).find(k => obj[k] != null && obj[k] !== undefined) !== undefined;
 }
@@ -9144,21 +9148,21 @@ class ExpandedItemComponent {
             return name;
         switch (gender) {
             case 'adjective':
-                return (action.adjective || action.past || action.title).toLowerCase();
+                return decapitalize(action.adjective || action.past || action.title);
             case 'you':
                 const gender = this._session.gender;
-                return ((gender === 'Male' ? (action.youMale || action.you) :
+                return decapitalize((gender === 'Male' ? (action.youMale || action.you) :
                     gender === 'Female' ? (action.youFemale || action.you) :
                         action.you) || action.past ||
-                    action.title).toLowerCase();
+                    action.title);
             case 'Male':
-                return (action.pastMale || action.past ||
-                    action.title).toLowerCase();
+                return decapitalize(action.pastMale || action.past ||
+                    action.title);
             case 'Female':
-                return (action.pastFemale || action.past ||
-                    action.title).toLowerCase();
+                return decapitalize(action.pastFemale || action.past ||
+                    action.title);
             default:
-                return (action.past || action.title).toLowerCase();
+                return decapitalize(action.past || action.title);
         }
     }
     _fromNow(date) {
@@ -9731,7 +9735,7 @@ class BrowseItemsComponent {
     }
     _getActionAdjective(name, plural) {
         const action = this._session.profile.actions.find(a => a.name === name);
-        return ((plural ? (action.adjectivePlural || action.adjective) : action.adjective) || action.title).toLowerCase();
+        return decapitalize((plural ? (action.adjectivePlural || action.adjective) : action.adjective) || action.title);
     }
     ngOnDestroy() {
         this._destroy.next();
@@ -10047,7 +10051,7 @@ class ComposeFormComponent {
     }
     _getActionAdjective(name) {
         const action = this._session.profile.actions.find(a => a.name === name);
-        return (action.adjective || action.past || action.title).toLowerCase();
+        return decapitalize(action.adjective || action.past || action.title);
     }
     /**
      *
@@ -15744,24 +15748,24 @@ class FlowViewComponent extends TraceBase {
             if (recipients.length) {
                 let r = 0;
                 do {
-                    var recipient = recipients[r];
+                    let { userId, estimate } = recipients[r];
                     let exists = false;
                     // remove duplicate user recipient on same node
                     let j = 0;
                     while (j < r && !exists) {
-                        if (recipients[j].userId === recipient.userId)
+                        if (recipients[j].userId === userId)
                             exists = true;
                         else
                             j++;
                     }
                     if (exists)
-                        recipients.splice(recipient.estimate ? r : j, 1);
+                        recipients.splice(estimate ? r : j, 1);
                     else
                         r++;
                 } while (r < recipients.length);
                 for (r = 0; r < recipients.length; r++) {
-                    let recipient = recipients[r];
-                    const { annotation, tooltip } = await this._note(node, recipient), content = this._tooltip(tooltip), id = r === 0 ? node.id : node.id + r.toString();
+                    let recipient = recipients[r], { userId, actionId, escalated, fyi, pending } = recipient;
+                    let { annotation, tooltip } = await this._note(node, recipient), content = this._tooltip(tooltip), id = r === 0 ? node.id : node.id + r.toString();
                     nodes.push({
                         id,
                         width: 50,
@@ -15770,8 +15774,8 @@ class FlowViewComponent extends TraceBase {
                             strokeWidth: 2,
                             //opacity: node.estimate ? .6 : 1,
                             strokeColor: node.estimate ? this.dimColor : this._accentColor,
-                            fill: !node.estimate && recipient.pending ?
-                                this._session.getAccent(recipient.userId === this._session.userId ? 500 : 400) : this.transparentColor
+                            fill: !node.estimate && pending ?
+                                this._session.getAccent(userId === this._session.userId ? 500 : 400) : this.transparentColor
                         },
                         shape: this._configuration[node.type].shape,
                         zIndex: zIndex++,
@@ -15803,9 +15807,9 @@ class FlowViewComponent extends TraceBase {
                             }]
                     });
                     // add action indicator
-                    if (recipient.actionId) {
-                        const action = this._session.profile.actions.find(a => a.name === recipient.actionId);
-                        action.shape && !recipient.pending &&
+                    if (actionId) {
+                        const action = this._session.profile.actions.find(a => a.name === actionId);
+                        action.shape && !pending &&
                             indicators.push({
                                 id: id + 'action',
                                 width: 15,
@@ -15827,7 +15831,7 @@ class FlowViewComponent extends TraceBase {
                             });
                     }
                     // fyi indicator
-                    recipient.fyi &&
+                    fyi &&
                         indicators.push({
                             id: id + 'fyi',
                             width: 15,
@@ -15848,7 +15852,7 @@ class FlowViewComponent extends TraceBase {
                             }
                         });
                     // escalate indicator
-                    recipient.escalated &&
+                    escalated &&
                         indicators.push({
                             id: id + 'escalate',
                             width: 15,
@@ -16124,66 +16128,67 @@ class FlowViewComponent extends TraceBase {
     async _note(node, recipient) {
         const tooltip = {};
         let annotation;
+        const { userId, id, pending, fyi, roleId, escalated, originId, replied, repliedBy, actionId, estimate, substituteId, received } = recipient;
         // you
-        if (recipient.userId === this._session.userId) {
+        if (userId === this._session.userId) {
             if (this._session.isImpersonating)
                 annotation = this._session.profile.name;
             else
                 annotation = this._translate.get('You');
-            if (recipient.role) {
-                const role = this._roleName(recipient.role);
-                tooltip.role = `- ${role}`;
+            if (roleId) {
+                const roleName = this._roleName(roleId);
+                tooltip.role = `- ${roleName}`;
             }
         }
         else 
         // someone else
         {
-            const who = await firstValueFrom(this._accounts.get(recipient.userId));
+            const who = await firstValueFrom(this._accounts.get(userId));
             annotation = who.name;
             if (who.role)
                 tooltip.role = `- ${who.role}`;
-            else if (recipient.role) {
-                const role = this._roleName(recipient.role);
-                tooltip.role = `- ${role}`;
+            else if (roleId) {
+                const roleName = this._roleName(roleId);
+                tooltip.role = `- ${roleName}`;
             }
         }
-        if (recipient.replied) {
-            const ago = dayjs(recipient.replied).fromNow();
-            const targets = this.model.recipients.filter(r => r.originId === recipient.id), to = [];
+        if (replied) {
+            const ago = dayjs(replied).fromNow();
+            const targets = this.model.recipients.filter(r => r.originId === id), to = [];
             if (targets.length)
                 for (let sibling of targets) {
                     const who = await firstValueFrom(this._accounts.get(sibling.userId));
                     to.push(who.name);
                 }
-            if (recipient.repliedBy) {
-                if (recipient.repliedBy === this._session.profile.byId) {
-                    const action = this._action(recipient.actionId, this._session.profile.byGender);
+            if (repliedBy) {
+                if (repliedBy === this._session.profile.byId) {
+                    const action = this._action(actionId, this._session.profile.byGender);
                     if (to.length) {
-                        if (recipient.userId === this._session.profile.userId)
+                        if (userId === this._session.profile.userId)
                             tooltip.note = this._translate.get('ActionTakenByYouTo', action, this._translate.join(to), this._session.profile.name, ago);
                         else {
-                            const who = await firstValueFrom(this._accounts.get(recipient.userId));
+                            const who = await firstValueFrom(this._accounts.get(userId));
                             tooltip.note = this._translate.get('ActionTakenByYouTo', action, this._translate.join(to), who.name, ago);
                         }
                     }
-                    else if (recipient.userId === this._session.profile.userId)
+                    else if (userId === this._session.profile.userId)
                         tooltip.note = this._translate.get('ActionTakenByYou', action, this._session.profile.name, ago);
                     else {
-                        const who = await firstValueFrom(this._accounts.get(recipient.userId));
+                        const who = await firstValueFrom(this._accounts.get(userId));
                         tooltip.note = this._translate.get('ActionTakenByYou', action, who.name, ago);
                     }
                 }
                 else {
-                    const by = await firstValueFrom(this._accounts.get(recipient.repliedBy));
-                    const action = this._action(recipient.actionId, by.gender);
-                    if (recipient.userId === this._session.profile.userId) {
+                    const by = await firstValueFrom(this._accounts.get(repliedBy));
+                    const action = this._action(actionId, by.gender);
+                    if (userId === this._session.profile.userId) {
                         if (to.length)
                             tooltip.note = this._translate.get('YouTakenActionByTo', by.name, action, this._translate.join(to), ago);
                         else
                             tooltip.note = this._translate.get('YouTakenActionBy', by.name, action, ago);
                     }
                     else {
-                        const who = await firstValueFrom(this._accounts.get(recipient.userId));
+                        const who = await firstValueFrom(this._accounts.get(userId));
                         if (to.length)
                             tooltip.note = this._translate.get('ActionTakenByTo', by.name, action, this._translate.join(to), who.name, ago);
                         else
@@ -16192,80 +16197,80 @@ class FlowViewComponent extends TraceBase {
                 }
             }
             else if (to.length) {
-                if (recipient.userId === this._session.profile.userId) {
-                    const action = this._action(recipient.actionId, this._session.profile.gender);
+                if (userId === this._session.profile.userId) {
+                    const action = this._action(actionId, this._session.profile.gender);
                     if (this._session.isImpersonating)
                         tooltip.note = this._translate.get('ActionTakenTo', this._session.profile.name, action, this._translate.join(to), ago);
                     else
                         tooltip.note = this._translate.get('YouTakenActionTo', action, this._translate.join(to), ago);
                 }
                 else {
-                    const who = await firstValueFrom(this._accounts.get(recipient.userId));
-                    const action = this._action(recipient.actionId, who.gender);
+                    const who = await firstValueFrom(this._accounts.get(userId));
+                    const action = this._action(actionId, who.gender);
                     tooltip.note = this._translate.get('ActionTakenTo', who.name, action, this._translate.join(to), ago);
                 }
             }
             else if (this._session.isImpersonating) {
-                const action = this._action(recipient.actionId, this._session.profile.gender);
+                const action = this._action(actionId, this._session.profile.gender);
                 tooltip.note = this._translate.get('ActionTaken', this._session.profile.name, action, ago);
             }
-            else if (recipient.userId === this._session.profile.userId) {
-                const action = this._action(recipient.actionId, You);
+            else if (userId === this._session.profile.userId) {
+                const action = this._action(actionId, You);
                 tooltip.note = this._translate.get('YouTakenAction', action, ago);
             }
             else {
-                const who = await firstValueFrom(this._accounts.get(recipient.userId));
-                const action = this._action(recipient.actionId, who.gender);
+                const who = await firstValueFrom(this._accounts.get(userId));
+                const action = this._action(actionId, who.gender);
                 tooltip.note = this._translate.get('ActionTaken', who.name, action, ago);
             }
         }
-        else if (!recipient.estimate) {
-            const ago = dayjs(recipient.received).fromNow();
-            if (recipient.userId === this._session.userId) {
+        else if (!estimate) {
+            const ago = dayjs(received).fromNow();
+            if (userId === this._session.userId) {
                 if (this._session.isImpersonating)
                     tooltip.note = this._translate.personalize('ReceivedBy', this._session.profile.gender, this._session.profile.name, ago);
                 else
                     tooltip.note = this._translate.get('YouReceived', ago);
             }
             else {
-                const who = await firstValueFrom(this._accounts.get(recipient.userId));
+                const who = await firstValueFrom(this._accounts.get(userId));
                 tooltip.note = this._translate.personalize('ReceivedTime', who.gender, ago);
             }
         }
-        if (recipient.substituteId) {
-            if (recipient.substituteId === this._session.userId)
+        if (substituteId) {
+            if (substituteId === this._session.userId)
                 tooltip.substituting = this._translate.personalize('SubstitutingYou', this._session.gender);
             else {
-                const substituting = await firstValueFrom(this._accounts.get(recipient.substituteId));
+                const substituting = await firstValueFrom(this._accounts.get(substituteId));
                 tooltip.substituting = this._translate.personalize('SubstitutingFor', substituting.gender, substituting.name);
             }
         }
-        if (recipient.originId && !recipient.replied) {
-            const origin = this.model.recipients.find(r => r.id === recipient.originId), action = this._session.profile.actions.find(a => a.name === origin.actionId), adjective = action.adjective || action.past || action.title;
+        if (originId && !replied) {
+            const origin = this.model.recipients.find(r => r.id === originId), action = this._action(origin.actionId, 'adjective');
             if ((origin.repliedBy || origin.userId) === this._session.userId)
-                tooltip.substituting = this._translate.get('ActionByYou', adjective);
+                tooltip.substituting = this._translate.get('ActionByYou', action);
             else if (origin.repliedBy) {
                 const who = await firstValueFrom(this._accounts.get(origin.userId));
                 const by = await firstValueFrom(this._accounts.get(origin.repliedBy));
-                tooltip.substituting = this._translate.get('ActionByBy', adjective, by.name, who.name);
+                tooltip.substituting = this._translate.get('ActionByBy', action, by.name, who.name);
             }
             else {
                 const who = await firstValueFrom(this._accounts.get(origin.userId));
-                tooltip.substituting = this._translate.get('ActionBy', adjective, who.name);
+                tooltip.substituting = this._translate.get('ActionBy', action, who.name);
             }
         }
-        if (recipient.escalated) {
-            const escalation = this.model.log.find(l => l.type === 'Escalation' && l.recipientId === recipient.originId);
+        if (escalated) {
+            const escalation = this.model.log.find(l => l.type === 'Escalation' && l.recipientId === originId);
             const who = await firstValueFrom(this._accounts.get(escalation.userId));
             const duration = this._duration.transform(dayjs.duration(escalation.duration, 's'));
             tooltip.escalation = this._translate.get('EscalatedFrom', who.name, duration);
         }
-        if (recipient.replied) {
-            const duration = dayjs(recipient.replied).diff(recipient.received, 's');
+        if (replied) {
+            const duration = dayjs(replied).diff(received, 's');
             tooltip.duration = this._translate.get('DurationTime', this._duration.transform(duration));
         }
-        else if (recipient.pending) {
-            if (recipient.estimate)
+        else if (pending) {
+            if (estimate)
                 tooltip.estimatedTime = this._timeEstimate(node);
             else if (node.standardTime) {
                 const diff = node.standardTime - dayjs().diff(node.time, 's');
@@ -16275,21 +16280,35 @@ class FlowViewComponent extends TraceBase {
         }
         else if (node.standardTime)
             tooltip.standardTime = this._translate.get('NodeStandardTime', this._duration.transform(node.standardTime));
-        if (recipient.fyi)
+        if (fyi)
             tooltip.fyi = this._translate.get('FYI');
         return { annotation, tooltip };
     }
+    /**
+     *
+     * @param name
+     * @param gender
+     * @returns
+     */
     _action(name, gender) {
         const action = this._session.profile.actions.find(a => a.name === name);
-        if (gender === You) {
-            const gender = this._session.gender, you = gender === 'Male' ? action?.youMale :
-                gender === 'Female' ? action?.youFemale :
-                    null;
-            return (you || action?.you || action?.past || action?.title || name).toLowerCase();
+        if (!action)
+            return name;
+        switch (gender) {
+            case 'adjective':
+                return decapitalize(action.adjective || action.past || action.title);
+            case You:
+                const gender = this._session.gender, you = gender === 'Male' ? action.youMale :
+                    gender === 'Female' ? action.youFemale :
+                        null;
+                return decapitalize(you || action.you || action.past || action.title);
+            case 'Male':
+                return decapitalize(action.pastMale || action.past || action.title);
+            case 'Female':
+                return decapitalize(action.pastFemale || action.past || action.title);
+            default:
+                return decapitalize(action.past || action.title);
         }
-        const past = gender === 'Male' ? action?.pastMale :
-            gender === 'Female' ? action?.pastFemale : null;
-        return (past || action?.past || action?.title || name).toLowerCase();
     }
     ngOnDestroy() {
         this.diagram?.destroy();
@@ -16457,90 +16476,90 @@ class TraceViewComponent extends TraceBase {
             };
             trace.push(step);
             if (l.recipientId) {
-                let recipient = recipients.find(r => r.id === l.recipientId);
-                if (recipient.role)
-                    step.role = this._roleName(recipient.role);
-                step.fyi = recipient.fyi;
-                if (recipient.substituteId) {
-                    if (recipient.repliedBy) {
-                        if (recipient.repliedBy === this._session.userId) {
-                            let who = await profileOf(recipient.userId);
-                            if (recipient.substituteId === this._session.userId)
+                let recipient = recipients.find(r => r.id === l.recipientId), { roleId, fyi, id, repliedBy, substituteId, userId } = recipient;
+                if (roleId)
+                    step.role = this._roleName(roleId);
+                step.fyi = fyi;
+                if (substituteId) {
+                    if (repliedBy) {
+                        if (repliedBy === this._session.userId) {
+                            let who = await profileOf(userId);
+                            if (substituteId === this._session.userId)
                                 step.name = this._translate.get('ByYou', nameOf(who));
                             else {
-                                let substituting = await profileOf(recipient.substituteId);
+                                let substituting = await profileOf(substituteId);
                                 step.name = this._translate.personalize('SubstitutingByYou', who.gender, nameOf(who), nameOf(substituting));
                             }
                             if (action)
-                                step.action = await actionBy(action, You, recipient.id);
+                                step.action = await actionBy(action, You, id);
                         }
                         else {
-                            let by = await profileOf(recipient.repliedBy), who = await profileOf(recipient.userId), substituting = await profileOf(recipient.substituteId);
+                            let by = await profileOf(repliedBy), who = await profileOf(userId), substituting = await profileOf(substituteId);
                             step.name = this._translate.get('SubstitutingBy', nameOf(who), nameOf(substituting), nameOf(by));
                             if (by.role)
                                 step.role = by.role;
                             if (action)
-                                step.action = await actionBy(action, by.gender, recipient.id);
+                                step.action = await actionBy(action, by.gender, id);
                         }
                     }
-                    else if (recipient.userId === this._session.userId) {
-                        let substituting = await profileOf(recipient.substituteId);
+                    else if (userId === this._session.userId) {
+                        let substituting = await profileOf(substituteId);
                         step.name = this._translate.personalize('YouSubstituting', this._session.gender, nameOf(substituting));
                         if (action)
-                            step.action = await actionBy(action, this._session.gender, recipient.id);
+                            step.action = await actionBy(action, this._session.gender, id);
                     }
-                    else if (recipient.substituteId === this._session.userId) {
-                        let who = await profileOf(recipient.userId);
+                    else if (substituteId === this._session.userId) {
+                        let who = await profileOf(userId);
                         step.name = this._translate.personalize('SubstitutingForYou', who.gender, nameOf(who));
                         if (action)
-                            step.action = await actionBy(action, who.gender, recipient.id);
+                            step.action = await actionBy(action, who.gender, id);
                     }
                     else {
-                        let who = await profileOf(recipient.userId), substituting = await profileOf(recipient.substituteId);
+                        let who = await profileOf(userId), substituting = await profileOf(substituteId);
                         step.name = this._translate.personalize('Substituting', who.gender, nameOf(who), nameOf(substituting));
                         if (who.role)
                             step.role = who.role;
                         if (action)
-                            step.action = await actionBy(action, who.gender, recipient.id);
+                            step.action = await actionBy(action, who.gender, id);
                     }
                 }
-                else if (recipient.repliedBy) {
-                    if (recipient.userId === this._session.userId) {
-                        let by = await profileOf(recipient.repliedBy);
+                else if (repliedBy) {
+                    if (userId === this._session.userId) {
+                        let by = await profileOf(repliedBy);
                         step.name = this._translate.get('YouBy', nameOf(by));
                         if (action)
-                            step.action = await actionBy(action, by.gender, recipient.id);
+                            step.action = await actionBy(action, by.gender, id);
                     }
                     else {
-                        let who = await profileOf(recipient.userId);
-                        if (recipient.repliedBy === this._session.userId) {
+                        let who = await profileOf(userId);
+                        if (repliedBy === this._session.userId) {
                             step.name = this._translate.get('ByYou', nameOf(who));
                             if (action)
-                                step.action = await actionBy(action, You, recipient.id);
+                                step.action = await actionBy(action, You, id);
                         }
                         else {
-                            let by = await profileOf(recipient.repliedBy);
+                            let by = await profileOf(repliedBy);
                             step.name = this._translate.get('By', nameOf(who), nameOf(by));
                             if (by.role)
                                 step.role = by.role;
                             if (action)
-                                step.action = await actionBy(action, by.gender, recipient.id);
+                                step.action = await actionBy(action, by.gender, id);
                         }
                     }
                 }
                 else {
-                    if (recipient.userId === this._session.userId) {
+                    if (userId === this._session.userId) {
                         step.name = this._translate.get('You');
                         if (action)
-                            step.action = await actionBy(action, You, recipient.id);
+                            step.action = await actionBy(action, You, id);
                     }
                     else {
-                        let who = await profileOf(recipient.userId);
+                        let who = await profileOf(userId);
                         step.name = nameOf(who);
                         if (who.role)
                             step.role = who.role;
                         if (action)
-                            step.action = await actionBy(action, who.gender, recipient.id);
+                            step.action = await actionBy(action, who.gender, id);
                     }
                 }
             }
@@ -16572,23 +16591,24 @@ class TraceViewComponent extends TraceBase {
             }
         }
         for (let recipient of recipients) {
-            if (!recipient.pending && !recipient.estimate)
+            const { repliedBy, originId, note, escalated, pending, substituteId, actionId, userId, estimate, fyi, received, roleId, nodeId } = recipient;
+            if (!pending && !estimate)
                 continue;
             let step = {
-                time: recipient.received,
-                fyi: recipient.fyi,
-                estimate: recipient.estimate,
-                pending: recipient.pending,
-                action: recipient.actionId,
-                note: recipient.note,
-                type: recipient.estimate ? 'Estimate' : 'Pending',
-                duration: recipient.pending ? dayjs().diff(recipient.received, 's') : null,
-                role: recipient.role ? this._roleName(recipient.role) : null
+                time: received,
+                fyi,
+                estimate,
+                pending,
+                action: actionId,
+                note,
+                type: estimate ? 'Estimate' : 'Pending',
+                duration: pending ? dayjs().diff(received, 's') : null,
+                role: roleId ? this._roleName(roleId) : null
             };
-            if (recipient.nodeId) {
-                const node = this.model.workflow.nodes.find(n => n.id === recipient.nodeId);
+            if (nodeId) {
+                const node = this.model.workflow.nodes.find(n => n.id === nodeId);
                 if (node) {
-                    if (recipient.estimate) {
+                    if (estimate) {
                         const { min, max } = super._estimateTime(node);
                         if (max)
                             step.durationMin = min,
@@ -16596,36 +16616,36 @@ class TraceViewComponent extends TraceBase {
                     }
                 }
             }
-            if (recipient.substituteId) {
-                if (recipient.substituteId === this._session.userId) {
-                    let who = await profileOf(recipient.userId);
+            if (substituteId) {
+                if (substituteId === this._session.userId) {
+                    let who = await profileOf(userId);
                     step.name = this._translate.personalize('SubstitutingForYou', who.gender, nameOf(who));
                 }
-                else if (recipient.userId === this._session.userId) {
-                    let substituting = await profileOf(recipient.substituteId);
+                else if (userId === this._session.userId) {
+                    let substituting = await profileOf(substituteId);
                     step.name = this._translate.personalize('YouSubstituting', this._session.gender, nameOf(substituting));
                 }
                 else {
-                    let who = await profileOf(recipient.userId), substituting = await profileOf(recipient.substituteId);
+                    let who = await profileOf(userId), substituting = await profileOf(substituteId);
                     step.name = this._translate.personalize('Substituting', who.gender, nameOf(who), nameOf(substituting));
                     if (who.role)
                         step.role = who.role;
                 }
             }
-            else if (recipient.repliedBy) {
-                let who = await profileOf(recipient.userId);
-                if (recipient.repliedBy === this._session.userId)
+            else if (repliedBy) {
+                let who = await profileOf(userId);
+                if (repliedBy === this._session.userId)
                     step.name = this._translate.get('ByYou', nameOf(who));
                 else {
-                    let by = await profileOf(recipient.repliedBy);
+                    let by = await profileOf(repliedBy);
                     step.name = this._translate.get('By', nameOf(who), nameOf(by));
                     if (by.role)
                         step.role = by.role;
                 }
             }
-            else if (recipient.escalated) {
-                let escalation = this.model.log.find(l => l.type === 'Escalation' && l.recipientId === recipient.originId);
-                let to = await profileOf(recipient.userId);
+            else if (escalated) {
+                let escalation = this.model.log.find(l => l.type === 'Escalation' && l.recipientId === originId);
+                let to = await profileOf(userId);
                 if (escalation.userId === this._session.userId)
                     step.name = this._translate.get('EscalatedByYou', nameOf(to));
                 else {
@@ -16634,10 +16654,10 @@ class TraceViewComponent extends TraceBase {
                 }
             }
             else {
-                if (recipient.userId === this._session.userId)
+                if (userId === this._session.userId)
                     step.name = this._translate.get('You');
                 else {
-                    let who = await profileOf(recipient.userId);
+                    let who = await profileOf(userId);
                     step.name = nameOf(who);
                     if (who.role)
                         step.role = who.role;
@@ -28988,8 +29008,8 @@ let TimelineViewComponent = class TimelineViewComponent {
                     task.name = this._translate.get('WhoSubstituting', u[0].name, u[1].name);
                     if (u[0].role)
                         task.name += `, ${u[0].role}`;
-                    if (r.role) {
-                        const role = this._session.profile.roles.find(o => o.name === r.role);
+                    if (r.roleId) {
+                        const role = this._session.profile.roles.find(o => o.name === r.roleId);
                         if (role)
                             task.name += `, ${role.name}`;
                     }
@@ -29001,8 +29021,8 @@ let TimelineViewComponent = class TimelineViewComponent {
                     task.name = u.name;
                     if (u.role)
                         task.name += `, ${u.role}`;
-                    else if (r.role) {
-                        const role = this._session.profile.roles.find(o => o.name === r.role);
+                    else if (r.roleId) {
+                        const role = this._session.profile.roles.find(o => o.name === r.roleId);
                         if (role)
                             task.name += `, ${role.name}`;
                     }