@bizdoc/core 1.13.33 → 1.13.34

package/fesm2020/bizdoc-core.mjs

@@ -1017,7 +1017,7 @@ class SessionService {
         _config && _config.maps && this._loadMaps();
     }
     get profile() { return this._profile; }
-    get gender() { return this._profile.byGender || this._profile.gender; }
+    get gender() { return this.profile.byId ? this._profile.byGender : this._profile.gender; }
     get accentPalette() {
         const palette = MATERIAL_PALETTES[this.theme.accent];
         return this._constructpalette(palette);
@@ -2068,7 +2068,7 @@ const STRINGS = {
         YouSubstituteActionTakenTo: 'Document {0} to {1} by you instead of {2} {3}',
         Substituting: '{0} substituting {1}',
         SubstitutingForYou: '{0} substituting you',
-        YouSubstitute: 'You substituting {0}',
+        YouSubstituting: 'You substituting {0}',
         SubstitutingBy: '{0} by {2} substituting {1}',
         SubstitutingByYou: '{0} by you substituting {1}',
         SubstitutingYou: 'Substituting for you',
@@ -2624,9 +2624,9 @@ const STRINGS = {
         SubstitutingForFemale: 'במקום {0}',
         Substituting: '{0} מחליף את {1}',
         SubstitutingForYou: '{0} מחליף אותך',
-        YouSubstitute: 'את/ה מחליף את {0}',
-        YouSubstituteMale: 'אתה מחליף את {0}',
-        YouSubstituteFemale: 'את מחליפה את {0}',
+        YouSubstituting: 'את/ה מחליף את {0}',
+        YouSubstitutingMale: 'אתה מחליף את {0}',
+        YouSubstitutingFemale: 'את מחליפה את {0}',
         SubstitutingBy: '{0} מחליף את {1} דרך {2}',
         SubstitutingByYou: '{0} מחליף/פה את {1} דרכך}',
         SubstitutingByYouMale: '{0} מחליף את {1} דרכך}',
@@ -13967,15 +13967,18 @@ class FlowViewComponent extends TraceBase {
                 for (r = 0; r < recipients.length; r++) {
                     let recipient = recipients[r];
                     const { annotation, tooltip } = await this._note(node, recipient);
+                    const content = this._tooltip(tooltip);
                     const nod = {
                         id: r === 0 ? node.id : node.id + r.toString(),
                         shape: this._configuration[node.type].shape,
                         zIndex: zIndex++,
                         tooltip: {
-                            content: this._tooltip(tooltip),
+                            content,
                             position: 'TopCenter'
                         },
-                        constraints: Object.keys(tooltip).length ? NodeConstraints.Default : NodeConstraints.Default & ~NodeConstraints.Tooltip,
+                        constraints: content ?
+                            NodeConstraints.Default | NodeConstraints.Tooltip :
+                            NodeConstraints.Default,
                         addInfo: {
                             tooltip,
                             recipient,
@@ -14055,15 +14058,18 @@ class FlowViewComponent extends TraceBase {
             else {
                 const { state, annotation, tooltip } = await this._shape(node);
                 const { shape } = configuration;
+                const content = this._tooltip(tooltip);
                 nodes.push({
                     id: node.id,
                     shape,
                     zIndex: zIndex++,
                     tooltip: {
-                        content: this._tooltip(tooltip),
+                        content,
                         position: 'TopCenter'
                     },
-                    constraints: Object.keys(tooltip).length ? NodeConstraints.Default | NodeConstraints.Tooltip : NodeConstraints.Default,
+                    constraints: content ?
+                        NodeConstraints.Default | NodeConstraints.Tooltip :
+                        NodeConstraints.Default,
                     addInfo: {
                         tooltip,
                         node
@@ -14539,9 +14545,9 @@ class TraceViewComponent extends TraceBase {
                 step.fyi = recipient.fyi;
                 if (recipient.substituteId) {
                     if (recipient.byId) {
-                        if (recipient.byId === this._session.userId && !this._session.isImpersonating) {
+                        if (recipient.byId === this._session.userId) {
                             let who = await profileOf(recipient.userId);
-                            if (recipient.substituteId === this._session.userId && !this._session.isImpersonating)
+                            if (recipient.substituteId === this._session.userId)
                                 step.name = this._translate.get('ByYou', nameOf(who));
                             else {
                                 let substituting = await profileOf(recipient.substituteId);
@@ -14551,9 +14557,7 @@ class TraceViewComponent extends TraceBase {
                                 step.action = await actionBy(action, You, recipient.id);
                         }
                         else {
-                            let by = await profileOf(recipient.byId);
-                            let who = await profileOf(recipient.userId);
-                            let substituting = await profileOf(recipient.substituteId);
+                            let by = await profileOf(recipient.byId), who = await profileOf(recipient.userId), substituting = await profileOf(recipient.substituteId);
                             step.name = this._translate.get('SubstitutingBy', nameOf(who), nameOf(substituting), nameOf(by));
                             if (by.role)
                                 step.role = by.role;
@@ -14561,31 +14565,29 @@ class TraceViewComponent extends TraceBase {
                                 step.action = await actionBy(action, by.gender, recipient.id);
                         }
                     }
+                    else if (recipient.userId === this._session.userId) {
+                        let substituting = await profileOf(recipient.substituteId);
+                        step.name = this._translate.personalize('YouSubstituting', this._session.gender, nameOf(substituting));
+                        if (action)
+                            step.action = await actionBy(action, this._session.gender, recipient.id);
+                    }
+                    else if (recipient.substituteId === this._session.userId) {
+                        let who = await profileOf(recipient.userId);
+                        step.name = this._translate.personalize('SubstitutingForYou', who.gender, nameOf(who));
+                        if (action)
+                            step.action = await actionBy(action, who.gender, recipient.id);
+                    }
                     else {
-                        if (recipient.userId === this._session.userId && !this._session.isImpersonating) {
-                            let substituting = await profileOf(recipient.substituteId);
-                            step.name = this._translate.personalize('YouSubstitute', this._session.profile.byGender, nameOf(substituting));
-                            if (action)
-                                step.action = await actionBy(action, this._session.gender, recipient.id);
-                        }
-                        else if (recipient.substituteId === this._session.userId && !this._session.isImpersonating) {
-                            let who = await profileOf(recipient.userId);
-                            step.name = this._translate.personalize('SubstitutingForYou', who.gender, nameOf(who));
-                            if (action)
-                                step.action = await actionBy(action, who.gender, recipient.id);
-                        }
-                        else {
-                            let who = await profileOf(recipient.userId), substituting = await profileOf(recipient.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);
-                        }
+                        let who = await profileOf(recipient.userId), substituting = await profileOf(recipient.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);
                     }
                 }
                 else if (recipient.byId) {
-                    if (recipient.userId === this._session.userId && !this._session.isImpersonating) {
+                    if (recipient.userId === this._session.userId) {
                         let by = await profileOf(recipient.byId);
                         step.name = this._translate.get('YouBy', nameOf(by));
                         if (action)
@@ -14593,7 +14595,7 @@ class TraceViewComponent extends TraceBase {
                     }
                     else {
                         let who = await profileOf(recipient.userId);
-                        if (recipient.byId === this._session.userId && !this._session.isImpersonating) {
+                        if (recipient.byId === this._session.userId) {
                             step.name = this._translate.get('ByYou', nameOf(who));
                             if (action)
                                 step.action = await actionBy(action, You, recipient.id);
@@ -14609,7 +14611,7 @@ class TraceViewComponent extends TraceBase {
                     }
                 }
                 else {
-                    if (recipient.userId === this._session.userId && !this._session.isImpersonating) {
+                    if (recipient.userId === this._session.userId) {
                         step.name = this._translate.get('You');
                         if (action)
                             step.action = await actionBy(action, You, recipient.id);
@@ -14670,35 +14672,19 @@ class TraceViewComponent extends TraceBase {
                 }
             }
             if (recipient.substituteId) {
-                let who = await profileOf(recipient.userId);
-                if (recipient.byId) {
-                    if (recipient.byId === this._session.userId) {
-                        if (recipient.substituteId === this._session.userId)
-                            step.name = this._translate.get('ByYou', nameOf(who));
-                        else {
-                            let substituting = await profileOf(recipient.substituteId);
-                            step.name = this._translate.personalize('SubstitutingByYou', who.gender, nameOf(who), nameOf(substituting));
-                        }
-                    }
-                    else {
-                        let substituting = await profileOf(recipient.substituteId);
-                        let by = await profileOf(recipient.byId);
-                        step.name = this._translate.get('SubstitutingBy', nameOf(who), nameOf(substituting), nameOf(by));
-                        if (by.role)
-                            step.role = by.role;
-                    }
+                if (recipient.substituteId === this._session.userId) {
+                    let who = await profileOf(recipient.userId);
+                    step.name = this._translate.personalize('SubstitutingForYou', who.gender, nameOf(who));
+                }
+                else if (recipient.userId === this._session.userId) {
+                    let substituting = await profileOf(recipient.substituteId);
+                    step.name = this._translate.personalize('YouSubstituting', this._session.gender, nameOf(substituting));
                 }
                 else {
-                    if (recipient.substituteId === this._session.userId)
-                        step.name = this._translate.personalize('SubstitutingForYou', who.gender, nameOf(who));
-                    else if (recipient.userId === this._session.userId)
-                        step.name = this._translate.personalize('YouSubstitute', this._session.profile.byGender, nameOf(who));
-                    else {
-                        let substituting = await profileOf(recipient.substituteId);
-                        step.name = this._translate.personalize('Substituting', who.gender, nameOf(who), nameOf(substituting));
-                        if (who.role)
-                            step.role = who.role;
-                    }
+                    let who = await profileOf(recipient.userId), substituting = await profileOf(recipient.substituteId);
+                    step.name = this._translate.personalize('Substituting', who.gender, nameOf(who), nameOf(substituting));
+                    if (who.role)
+                        step.role = who.role;
                 }
             }
             else if (recipient.byId) {
@@ -14772,7 +14758,7 @@ class TraceViewComponent extends TraceBase {
             this._chat.open(userId);
     }
     /**
-     * model version compare, form component in 'compare' view mode
+     * model version compare
      * @param log
      */
     compare(log) {