From e4484ec1dde7b50a54d1399daa8f1512183a2022 Mon Sep 17 00:00:00 2001
From: Fabio Guachalla <fabio.guachalla@processmaker.com>
Date: Fri, 26 Nov 2021 11:31:48 -0400
Subject: [PATCH] PMCORE-3509:In version 3.7.0 the inbox the send by field
 displays the undefined username after a script task

Correction

Style
---
 .../assets/js/admin/Modals/ModalPreview.vue   | 58 +++++++--------
 .../components/vuetable/CurrentUserCell.vue   | 15 +++-
 .../js/home/CustomCaseList/CustomCaseList.vue | 73 +++++++------------
 resources/assets/js/home/Inbox/Inbox.vue      | 64 +++++++---------
 resources/assets/js/home/Paused/Paused.vue    | 68 +++++++----------
 .../assets/js/home/Unassigned/Unassigned.vue  | 66 +++++++----------
 6 files changed, 147 insertions(+), 197 deletions(-)

diff --git a/resources/assets/js/admin/Modals/ModalPreview.vue b/resources/assets/js/admin/Modals/ModalPreview.vue
index 1013426a7..b08f2b58b 100644
--- a/resources/assets/js/admin/Modals/ModalPreview.vue
+++ b/resources/assets/js/admin/Modals/ModalPreview.vue
@@ -29,12 +29,7 @@
                     <TaskCell :data="props.row.TASK" />
                 </div>
                 <div slot="send_by" slot-scope="props">
-                    <template v-if="showUserTooltip" >
-                        <CurrentUserCell :data="props.row.USER_DATA" />
-                    </template>
-                    <template v-else>
-                        {{ props.row.USER_DATA }}
-                    </template>
+                    <CurrentUserCell :data="props.row.USER_DATA" />
                 </div>
                 <div slot="current_user" slot-scope="props">
                     {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -110,8 +105,7 @@ export default {
                 DRAFT: this.$i18n.t("ID_IN_DRAFT"),
                 PAUSED: this.$i18n.t("ID_PAUSED"),
                 UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
-            },
-            showUserTooltip: true
+            }
         }
     },
     mounted() {
@@ -256,29 +250,31 @@ export default {
         formatUser(data) {
             var dataFormat = [],
                 userDataFormat;
-            if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
-                this.showUserTooltip = true;
-                userDataFormat = utils.userNameDisplayFormat({
-                    userName: data.user_tooltip.usr_firstname,
-                    firstName: data.user_tooltip.usr_lastname,
-                    lastName: data.user_tooltip.usr_username,
-                    format: window.config.FORMATS.format || null
-                });
-                dataFormat.push({
-                    USERNAME_DISPLAY_FORMAT: userDataFormat,
-                    EMAIL: data.user_tooltip.usr_email,
-                    POSITION: data.user_tooltip.usr_position,
-                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                        window.config.SYS_URI +
-                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                    UNASSIGNED: userDataFormat !== "" ? true : false
-                });
-            } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
-                this.showUserTooltip = false;
-                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
-            } else {
-                this.showUserTooltip = false;
-                dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
+            switch (data.key_name) {
+                case 'user_tooltip':
+                    userDataFormat = utils.userNameDisplayFormat({
+                        userName: data.user_tooltip.usr_firstname,
+                        firstName: data.user_tooltip.usr_lastname,
+                        lastName: data.user_tooltip.usr_username,
+                        format: window.config.FORMATS.format || null
+                    });
+                    dataFormat.push({
+                        USERNAME_DISPLAY_FORMAT: userDataFormat,
+                        EMAIL: data.user_tooltip.usr_email,
+                        POSITION: data.user_tooltip.usr_position,
+                        AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                            window.config.SYS_URI +
+                            `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                        UNASSIGNED: userDataFormat !== "" ? true : false,
+                        SHOW_TOOLTIP: true
+                    });
+                    break;
+                case 'dummy_task':
+                    dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                    break;
+                default:
+                    dataFormat = "";
+                    break;
             }
             return dataFormat;
         }
diff --git a/resources/assets/js/components/vuetable/CurrentUserCell.vue b/resources/assets/js/components/vuetable/CurrentUserCell.vue
index e4fc4e264..0a64b14fc 100644
--- a/resources/assets/js/components/vuetable/CurrentUserCell.vue
+++ b/resources/assets/js/components/vuetable/CurrentUserCell.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="data.length" class="grouped-cell">
+    <div v-if="showTooltip" class="grouped-cell">
         <div v-for="(item, index) in data" v-bind:key="item.TITLE" class="d-flex">
             <div class="avatar" :id="id + index">
                 <b-avatar
@@ -36,6 +36,11 @@
             </div>
         </div>
     </div>
+    <div v-else class="grouped-cell">
+        <span class="col ellipsis">
+            {{ data }}
+        </span>
+    </div>
 </template>
 
 <script>
@@ -47,6 +52,14 @@ export default {
             id: "avatar-" + _.random(1000000)
         };
     },
+    computed: {
+        /**
+         * Verify if data is an array.
+         */
+        showTooltip() {
+            return typeof this.data !== 'string'
+        }
+    },
     methods: {
         /**
          * Generates the mail link
diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
index 75ddc2859..52a27de21 100644
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -63,12 +63,7 @@
                 <TaskCell :data="props.row.TASK" />
             </div>
             <div slot="send_by" slot-scope="props">
-                <template v-if="showUserTooltip" >
-                    <CurrentUserCell :data="props.row.USER_DATA" />
-                </template>
-                <template v-else>
-                    {{ props.row.USER_DATA }}
-                </template>
+                <CurrentUserCell :data="props.row.USER_DATA" />
             </div>
             <div slot="current_user" slot-scope="props">
                 {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -149,12 +144,7 @@
                         {{ props["item"]["PRIORITY"] }}
                     </span>
                     <span v-else-if="column === 'send_by'" class="v-card-text-light">
-                        <template v-if="showUserTooltip" >
-                            <CurrentUserCell :data="props.item.USER_DATA" />
-                        </template>
-                        <template v-else>
-                            {{ props.item.USER_DATA }}
-                        </template>
+                        <CurrentUserCell :data="props.item.USER_DATA" />
                     </span>
                     <span  v-else class="v-card-text-light">
                         {{ props["item"][column] }}
@@ -208,12 +198,7 @@
                         {{ props["item"]["PRIORITY"] }}
                     </span>
                     <span v-else-if="column === 'send_by'" class="v-card-text-light">
-                        <template v-if="showUserTooltip" >
-                            <CurrentUserCell :data="props.item.USER_DATA" />
-                        </template>
-                        <template v-else>
-                            {{ props.item.USER_DATA }}
-                        </template>
+                        <CurrentUserCell :data="props.item.USER_DATA" />
                     </span>
                     <span  v-else class="v-card-text-light">
                         {{ props["item"][column] }}
@@ -591,8 +576,7 @@ export default {
                     makeTagText: function (params, data) {
                         return  `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`;
                     }
-                },
-                showUserTooltip: true
+                }
             }
         };
     },
@@ -900,32 +884,31 @@ export default {
         formatUser(data) {
             var dataFormat = [],
                 userDataFormat;
-            if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
-                this.showUserTooltip = true;
-                userDataFormat = utils.userNameDisplayFormat({
-                    userName: data.user_tooltip.usr_firstname,
-                    firstName: data.user_tooltip.usr_lastname,
-                    lastName: data.user_tooltip.usr_username,
-                    format: window.config.FORMATS.format || null,
-                });
-                dataFormat.push({
-                    USERNAME_DISPLAY_FORMAT: userDataFormat,
-                    EMAIL: data.user_tooltip.usr_email,
-                    POSITION: data.user_tooltip.usr_position,
-                    AVATAR:
-                        userDataFormat !== ""
-                            ? window.config.SYS_SERVER_AJAX +
+            switch (data.key_name) {
+                case 'user_tooltip':
+                    userDataFormat = utils.userNameDisplayFormat({
+                        userName: data.user_tooltip.usr_firstname,
+                        firstName: data.user_tooltip.usr_lastname,
+                        lastName: data.user_tooltip.usr_username,
+                        format: window.config.FORMATS.format || null
+                    });
+                    dataFormat.push({
+                        USERNAME_DISPLAY_FORMAT: userDataFormat,
+                        EMAIL: data.user_tooltip.usr_email,
+                        POSITION: data.user_tooltip.usr_position,
+                        AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
                             window.config.SYS_URI +
-                            `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}`
-                            : "",
-                    UNASSIGNED: userDataFormat !== "" ? true : false,
-                });
-            } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
-                this.showUserTooltip = false;
-                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
-            } else {
-                this.showUserTooltip = false;
-                dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
+                            `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                        UNASSIGNED: userDataFormat !== "" ? true : false,
+                        SHOW_TOOLTIP: true
+                    });
+                    break;
+                case 'dummy_task':
+                    dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                    break;
+                default:
+                    dataFormat = "";
+                    break;
             }
             return dataFormat;
         },
diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue
index c8d134ee2..4165abc15 100644
--- a/resources/assets/js/home/Inbox/Inbox.vue
+++ b/resources/assets/js/home/Inbox/Inbox.vue
@@ -54,12 +54,7 @@
         <TaskCell :data="props.row.TASK" />
       </div>
       <div slot="send_by" slot-scope="props">
-        <template v-if="showUserTooltip" >
           <CurrentUserCell :data="props.row.USER_DATA" />
-        </template>
-        <template v-else>
-          {{ props.row.USER_DATA }}
-        </template>
       </div>
       <div slot="current_user" slot-scope="props">
         {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -154,12 +149,7 @@
           >{{ props["headings"][props.column] }} :</span
         >
         <span class="v-card-text-light">
-          <template v-if="showUserTooltip" >
             <CurrentUserCell :data="props.item.USER_DATA" />
-          </template>
-          <template v-else>
-            {{ props.item.USER_DATA }}
-          </template>
         </span>
       </div>
     </VueCardView>
@@ -240,12 +230,7 @@
           >{{ props["headings"][props.column] }} :</span
         >
         <span class="v-card-text-light">
-          <template v-if="showUserTooltip" >
             <CurrentUserCell :data="props.item.USER_DATA" />
-          </template>
-          <template v-else>
-            {{ props.item.USER_DATA }}
-          </template>
         </span>
       </div>
     </VueListView>
@@ -399,7 +384,6 @@ export default {
       },
       showEllipsis: false,
       dataSubtitle: null,
-      showUserTooltip: true
     };
   },
   created() {
@@ -611,29 +595,31 @@ export default {
     formatUser(data) {
         var dataFormat = [],
             userDataFormat;
-        if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
-            this.showUserTooltip = true;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                    window.config.SYS_URI +
-                    `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false
-            });    
-        } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
-            this.showUserTooltip = false;
-            dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
-        } else {
-            this.showUserTooltip = false;
-            dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
+        switch (data.key_name) {
+            case 'user_tooltip':
+                userDataFormat = utils.userNameDisplayFormat({
+                    userName: data.user_tooltip.usr_firstname,
+                    firstName: data.user_tooltip.usr_lastname,
+                    lastName: data.user_tooltip.usr_username,
+                    format: window.config.FORMATS.format || null
+                });
+                dataFormat.push({
+                    USERNAME_DISPLAY_FORMAT: userDataFormat,
+                    EMAIL: data.user_tooltip.usr_email,
+                    POSITION: data.user_tooltip.usr_position,
+                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                        window.config.SYS_URI +
+                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                    UNASSIGNED: userDataFormat !== "" ? true : false,
+                    SHOW_TOOLTIP: true
+                });
+                break;
+            case 'dummy_task':
+                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                break;
+            default:
+                dataFormat = "";
+                break;
         }
         return dataFormat;
     },
diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue
index 7af75ca65..91455ffab 100644
--- a/resources/assets/js/home/Paused/Paused.vue
+++ b/resources/assets/js/home/Paused/Paused.vue
@@ -52,12 +52,7 @@
         <TaskCell :data="props.row.TASK" />
       </div>
       <div slot="send_by" slot-scope="props">
-        <template v-if="showUserTooltip" >
           <CurrentUserCell :data="props.row.USER_DATA" />
-        </template>
-        <template v-else>
-          {{ props.row.USER_DATA }}
-        </template>
       </div>
       <div slot="current_user" slot-scope="props">
         {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -152,12 +147,7 @@
           >{{ props["headings"][props.column] }} :</span
         >
         <span class="v-card-text-light">
-          <template v-if="showUserTooltip" >
             <CurrentUserCell :data="props.item.USER_DATA" />
-          </template>
-          <template v-else>
-            {{ props.item.USER_DATA }}
-          </template>
         </span>
       </div>
     </VueCardView>
@@ -238,12 +228,7 @@
           >{{ props["headings"][props.column] }} :</span
         >
         <span class="v-card-text-light">
-          <template v-if="showUserTooltip" >
             <CurrentUserCell :data="props.item.USER_DATA" />
-          </template>
-          <template v-else>
-            {{ props.item.USER_DATA }}
-          </template>
         </span>
       </div>
     </VueListView>
@@ -397,8 +382,7 @@ export default {
         buttons: {}
       },
       showEllipsis: false,
-      dataSubtitle: null,
-      showUserTooltip: true
+      dataSubtitle: null
     };
   },
   created() {
@@ -605,30 +589,32 @@ export default {
     formatUser(data) {
         var dataFormat = [],
             userDataFormat;
-        if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
-            this.showUserTooltip = true;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                    window.config.SYS_URI +
-                    `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false
-            });
-          } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
-              this.showUserTooltip = false;
-              dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
-          } else {
-              this.showUserTooltip = false;
-              dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
-          }
+        switch (data.key_name) {
+            case 'user_tooltip':
+                userDataFormat = utils.userNameDisplayFormat({
+                    userName: data.user_tooltip.usr_firstname,
+                    firstName: data.user_tooltip.usr_lastname,
+                    lastName: data.user_tooltip.usr_username,
+                    format: window.config.FORMATS.format || null
+                });
+                dataFormat.push({
+                    USERNAME_DISPLAY_FORMAT: userDataFormat,
+                    EMAIL: data.user_tooltip.usr_email,
+                    POSITION: data.user_tooltip.usr_position,
+                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                        window.config.SYS_URI +
+                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                    UNASSIGNED: userDataFormat !== "" ? true : false,
+                    SHOW_TOOLTIP: true
+                });
+                break;
+            case 'dummy_task':
+                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                break;
+            default:
+                dataFormat = "";
+                break;
+        }
         return dataFormat;
     },
     /**
diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue
index 5da720e18..8be01cd1a 100644
--- a/resources/assets/js/home/Unassigned/Unassigned.vue
+++ b/resources/assets/js/home/Unassigned/Unassigned.vue
@@ -50,12 +50,7 @@
         <TaskCell :data="props.row.TASK" />
       </div>
       <div slot="send_by" slot-scope="props">
-        <template v-if="showUserTooltip" >
           <CurrentUserCell :data="props.row.USER_DATA" />
-        </template>
-        <template v-else>
-          {{ props.row.USER_DATA }}
-        </template>
       </div>
       <div slot="due_date" slot-scope="props">
         {{ props.row.DUE_DATE }}
@@ -147,12 +142,7 @@
           >{{ props["headings"][props.column] }} :</span
         >
         <span class="v-card-text-light">
-          <template v-if="showUserTooltip" >
             <CurrentUserCell :data="props.item.USER_DATA" />
-          </template>
-          <template v-else>
-            {{ props.item.USER_DATA }}
-          </template>
         </span>
       </div>
     </VueCardView>
@@ -233,12 +223,7 @@
           >{{ props["headings"][props.column] }} :</span
         >
         <span class="v-card-text-light">
-          <template v-if="showUserTooltip" >
             <CurrentUserCell :data="props.item.USER_DATA" />
-          </template>
-          <template v-else>
-            {{ props.item.USER_DATA }}
-          </template>
         </span>
       </div>
     </VueListView>
@@ -389,8 +374,7 @@ export default {
         buttons: {}
       },
       showEllipsis: false,
-      dataSubtitle: null,
-      showUserTooltip: true
+      dataSubtitle: null
     };
   },
   mounted() {
@@ -562,29 +546,31 @@ export default {
     formatUser(data) {
         var dataFormat = [],
             userDataFormat;
-        if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
-            this.showUserTooltip = true;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                    window.config.SYS_URI +
-                    `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false
-            });
-        } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
-            this.showUserTooltip = false;
-            dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
-        } else {
-            this.showUserTooltip = false;
-            dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
+        switch (data.key_name) {
+            case 'user_tooltip':
+                userDataFormat = utils.userNameDisplayFormat({
+                    userName: data.user_tooltip.usr_firstname,
+                    firstName: data.user_tooltip.usr_lastname,
+                    lastName: data.user_tooltip.usr_username,
+                    format: window.config.FORMATS.format || null
+                });
+                dataFormat.push({
+                    USERNAME_DISPLAY_FORMAT: userDataFormat,
+                    EMAIL: data.user_tooltip.usr_email,
+                    POSITION: data.user_tooltip.usr_position,
+                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                        window.config.SYS_URI +
+                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                    UNASSIGNED: userDataFormat !== "" ? true : false,
+                    SHOW_TOOLTIP: true
+                });
+                break;
+            case 'dummy_task':
+                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                break;
+            default:
+                dataFormat = "";
+                break;
         }
         return dataFormat;
     },