FOUR-17558:"Preview" in the "my tasks" filter is not displayed over t…

…he corresponding task.
ProcessMaker · Aug 2, 2024 · 0de81e0 · 0de81e0
1 parent fe5c579
commit 0de81e0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 42 deletions.
diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
@@ -10,11 +10,7 @@
             {{ $t(title) }}
           </p>
           <template v-if="dataControl.dropdownShow === 'requests'">
-            <b-dropdown
-              variant="outline-secondary"
-              offset="-70"
-              no-caret
-            >
+            <b-dropdown variant="outline-secondary" offset="-70" no-caret>
               <template #button-content>
                 <i class="fas fa-caret-down" />
               </template>
@@ -26,7 +22,9 @@
                 </span>
               </b-dropdown-item>
               <b-dropdown-item
-                @click="handleDropdownSelection('requests_filter', 'as_participant')"
+                @click="
+                  handleDropdownSelection('requests_filter', 'as_participant')
+                "
               >
                 <span class="item-text">
                   {{ $t("As Participant") }}
@@ -42,11 +40,7 @@
       <div class="ml-auto d-flex align-items-center">
         <template v-if="dataControl.dropdownShow === 'requests'">
           <div class="mr-4">
-            <b-dropdown
-              variant="outline-secondary"
-              offset="-50"
-              size="sm"
-            >
+            <b-dropdown variant="outline-secondary" offset="-50" size="sm">
               <template #button-content>
                 <span class="text-capitalize">
                   {{ $t(titleDropdown) }}
@@ -66,11 +60,7 @@
         </template>
         <template v-if="dataControl.dropdownShow === 'tasks'">
           <div class="mr-4">
-            <b-dropdown
-              variant="outline-secondary"
-              offset="-50"
-              size="sm"
-            >
+            <b-dropdown variant="outline-secondary" offset="-50" size="sm">
               <template #button-content>
                 <span class="text-capitalize">
                   {{ $t(titleDropdown) }}
@@ -82,7 +72,7 @@
                 @click="handleDropdownSelection('tasks', option)"
               >
                 <span class="item-text">
-                {{ $t(option) }}
+                  {{ $t(option) }}
                 </span>
               </b-dropdown-item>
             </b-dropdown>
@@ -122,7 +112,6 @@
     </div>
     <div class="card-body list-table">
       <template v-if="listOption === 'My Tasks'">
-        <Recommendations :dashboard="true" />
         <FormTasks @tasksCount="getData"></FormTasks>
       </template>
       <template v-if="verifyListCase()">
@@ -140,12 +129,8 @@ import FormTasks from "./form-tasks.vue";
 import FormRequests from "./form-requests.vue";
 import FormNewRequest from "./form-new-request.vue";
 
-const Recommendations = (resolve) => {
-  resolve(window.SharedComponents?.Recommendations || { template: "<span></span>" });
-};
-
 export default {
-  components: { FormTasks, FormRequests, FormNewRequest, Recommendations },
+  components: { FormTasks, FormRequests, FormNewRequest },
   mixins: [],
   props: ["listOption"],
   data() {
@@ -170,11 +155,7 @@ export default {
         "Overdue",
         "View All"
       ],
-      requestFilterDropdown: [
-        "View All",
-        "Completed",
-        "In Progress",
-      ]
+      requestFilterDropdown: ["View All", "Completed", "In Progress"]
     };
   },
   watch: {
@@ -331,8 +312,8 @@ export default {
 }
 
 .item-text {
-  color: #42526E;
-  font-family: 'Open Sans', sans-serif;
+  color: #42526e;
+  font-family: "Open Sans", sans-serif;
   font-size: 14px;
   font-weight: 400;
   line-height: 21px;
@@ -343,13 +324,13 @@ export default {
 .dropdown-menu {
   padding: 0px;
   width: 180px;
-  box-shadow: 0px 4px 8px 0px #0000001A;
+  box-shadow: 0px 4px 8px 0px #0000001a;
   border-radius: 4px;
 }
 
 .dropdown-item {
   padding: 13px 12px;
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Open Sans", sans-serif;
   font-size: 16px;
   font-weight: 400;
   line-height: 21.79px;
@@ -361,10 +342,10 @@ export default {
 .btn-outline-secondary:not(:disabled):not(.disabled):active,
 .btn-outline-secondary:not(:disabled):not(.disabled).active,
 .show > .btn-outline-secondary.dropdown-toggle {
-    background: none;
-    color: #228fed;
-    border: none;
-    box-shadow: none;
+  background: none;
+  color: #228fed;
+  border: none;
+  box-shadow: none;
 }
 
 .head-filter {

diff --git a/src/components/renderer/form-tasks.vue b/src/components/renderer/form-tasks.vue
@@ -1,5 +1,6 @@
 <template>
   <div v-if="showTable">
+    <Recommendations :dashboard="true" />
     <filter-table
       table-name="form-tasks"
       :headers="tableHeaders"
@@ -137,8 +138,15 @@ import datatableMixin from "../../mixins/datatable";
 import formEmpty from "./form-empty-table.vue";
 
 const uniqIdsMixin = createUniqIdsMixin();
+
+const Recommendations = (resolve) => {
+  resolve(
+    window.SharedComponents?.Recommendations || { template: "<span></span>" }
+  );
+};
+
 export default {
-  components: { formEmpty },
+  components: { formEmpty, Recommendations },
   mixins: [uniqIdsMixin, datatableMixin],
   data() {
     return {
@@ -162,10 +170,8 @@ export default {
         }
       ],
       advancedFilter: "",
-      tasksPreview:
-        (window.SharedComponents && window.SharedComponents.TasksHome) || {},
-      taskTooltip:
-        (window.SharedComponents && window.SharedComponents.TaskTooltip) || {},
+      tasksPreview: window.SharedComponents?.TasksHome || {},
+      taskTooltip: window.SharedComponents?.TaskTooltip || {},
       rowPosition: {},
       ellipsisShow: false,
       isTooltipVisible: false,
@@ -535,6 +541,7 @@ export default {
         });
     },
     handleRowMouseover(row) {
+      debugger;
       if (this.ellipsisShow) {
         this.isTooltipVisible = !this.disableRuleTooltip;
         this.clearHideTimer();
@@ -568,7 +575,11 @@ export default {
 
       const rightBorderX = rect.right;
 
-      const bottomBorderY = yPosition - topAdjust - elementHeight + 100;
+      let bottomBorderY = yPosition - topAdjust - elementHeight + 100;
+
+      if (document.getElementsByClassName("recommendation").length > 0) {
+        bottomBorderY += 60;
+      }
 
       this.rowPosition = {
         x: rightBorderX,