From 990f704f6562a884a8226a995a4d43d0dd053bf6 Mon Sep 17 00:00:00 2001
From: Fabio Guachalla <fabio.guachalla@processmaker.com>
Date: Wed, 21 Dec 2022 11:10:01 -0400
Subject: [PATCH] PMCORE-4027[28891-29654] Case history and case data showing
 previous case information

Corrections

add overlay

CR
---
 .../home/caseDetail/CaseHistory.vue           | 19 ++++++++-----------
 resources/assets/js/components/tabs/Tab.vue   |  2 +-
 resources/assets/js/components/tabs/Tabs.vue  |  1 -
 .../js/home/AdvancedSearch/AdvancedSearch.vue |  8 ++++++--
 resources/assets/js/home/MyCases/MyCases.vue  |  6 +++++-
 resources/assets/js/home/TabsCaseDetail.vue   |  2 +-
 .../engine/methods/cases/caseHistory_Ajax.php |  2 +-
 .../engine/templates/cases/caseHistory.js     |  3 ++-
 8 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/resources/assets/js/components/home/caseDetail/CaseHistory.vue b/resources/assets/js/components/home/caseDetail/CaseHistory.vue
index 27ce8b258..b4c6475e7 100644
--- a/resources/assets/js/components/home/caseDetail/CaseHistory.vue
+++ b/resources/assets/js/components/home/caseDetail/CaseHistory.vue
@@ -5,7 +5,7 @@
       ref="IFrameCaseHistory"
       title="IFrameCaseHistory"
       frameborder="0"
-      :src="path"
+      :src="url"
       :height="height"
       allowfullscreen
     ></iframe>
@@ -16,25 +16,22 @@
 export default {
   name: "CaseHistory",
   props: {
-    data: Object,
+    historyData: Object,
   },
   data() {
     return {
+      url: "",
       height: "500px",
       width: "100%",
       diffHeight: 10,
     };
   },
-  computed: {
-    path() {
-      let url =
-        window.config.SYS_SERVER_AJAX +
-        window.config.SYS_URI +
-        `cases/ajaxListener?action=caseHistory`;
-      return url;
-    },
+  computed: {},
+  mounted() {
+    this.url = window.config.SYS_SERVER_AJAX +
+      window.config.SYS_URI +
+      `cases/ajaxListener?action=caseHistory&appUid=` + this.data.APP_UID;
   },
-  mounted() {},
   methods: {
     classBtn(cls) {
       return "btn v-btn-request " + cls;
diff --git a/resources/assets/js/components/tabs/Tab.vue b/resources/assets/js/components/tabs/Tab.vue
index 5adedfabf..68e8d44be 100644
--- a/resources/assets/js/components/tabs/Tab.vue
+++ b/resources/assets/js/components/tabs/Tab.vue
@@ -1,6 +1,6 @@
 <template>
   <section
-    v-show="isActive"
+    v-if="isActive"
     :aria-hidden="!isActive"
     class="tabs-component-panel"
     :id="computedId"
diff --git a/resources/assets/js/components/tabs/Tabs.vue b/resources/assets/js/components/tabs/Tabs.vue
index 081d7217e..86b837e49 100644
--- a/resources/assets/js/components/tabs/Tabs.vue
+++ b/resources/assets/js/components/tabs/Tabs.vue
@@ -66,7 +66,6 @@ export default {
     const previousSelectedTabHash = expiringStorage.get(this.storageKey);
     if (this.findTab(previousSelectedTabHash)) {
       this.selectTab(previousSelectedTabHash);
-      return;
     }
     if (
       this.options.defaultTabHash !== null &&
diff --git a/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue b/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue
index ebc32ed47..4f593a30c 100755
--- a/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue
+++ b/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue
@@ -25,6 +25,7 @@
 
         <modal-new-request ref="newRequest"></modal-new-request>
         <settings-popover :options="formatColumnSettings(options.headings)" target="pm-dr-column-settings" @onUpdateColumnSettings="onUpdateColumnSettings" :key="random+1" :selected="formatColumnSelected(columns)"/>
+        <b-overlay :show="showOverlay" rounded="sm">
         <v-server-table
             :data="tableData"
             :columns="columns"
@@ -79,6 +80,7 @@
                 </div>
             </div>
         </v-server-table>
+        </b-overlay>
         <vue-simple-context-menu
             :elementId="idContextMenu"
             :options="contextMenuItems"
@@ -201,7 +203,7 @@ export default {
                 },
                 sortable: ["case_number"],
                 requestFunction(data) {
-                    return this.$parent.$parent.getCasesForVueTable(data);
+                    return this.$parent.$parent.$parent.getCasesForVueTable(data);
                 },
                 customFilters: ["myfilter"]
             },
@@ -214,7 +216,8 @@ export default {
                 "DRAFT": this.$i18n.t("ID_IN_DRAFT"),
                 "PAUSED": this.$i18n.t("ID_PAUSED"),
                 "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED")
-            }
+            },
+            showOverlay: false,
         };
     },
     mounted() {
@@ -239,6 +242,7 @@ export default {
                 }, 400);
             } else if (self.clickCount === 2) {
                 clearTimeout(self.singleClickTimer);
+                self.showOverlay = true;
                 self.clickCount = 0;
                 self.openCaseDetail(event.row);
             }
diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue
index a915c9ffb..8f628ba73 100755
--- a/resources/assets/js/home/MyCases/MyCases.vue
+++ b/resources/assets/js/home/MyCases/MyCases.vue
@@ -27,6 +27,7 @@
             :key="random + 1"
             :selected="formatColumnSelected(columns)"
         />
+        <b-overlay :show="showOverlay" rounded="sm">
         <v-server-table
             :data="tableData"
             :columns="columns"
@@ -76,6 +77,7 @@
                 </div>
             </div>
         </v-server-table>
+        </b-overlay>
         <ModalComments
             ref="modal-comments"
             @postNotes="onPostNotes"
@@ -206,7 +208,7 @@ export default {
                         ? this.settings.orderBy
                         : {},
                 requestFunction(data) {
-                    return this.$parent.$parent.getCasesForVueTable(data);
+                    return this.$parent.$parent.$parent.getCasesForVueTable(data);
                 },
                 settings: {
                     actions: {
@@ -235,6 +237,7 @@ export default {
                 UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
             },
             clearSortState: this.settings && this.settings.orderBy && this.settings.orderBy.column,
+            showOverlay: false,
         };
     },
     mounted() {
@@ -323,6 +326,7 @@ export default {
                 }, 400);
             } else if (self.clickCount === 2) {
                 clearTimeout(self.singleClickTimer);
+                self.showOverlay = true;
                 self.clickCount = 0;
                 self.openCaseDetail(event.row);
             }
diff --git a/resources/assets/js/home/TabsCaseDetail.vue b/resources/assets/js/home/TabsCaseDetail.vue
index df454fe37..a36056548 100644
--- a/resources/assets/js/home/TabsCaseDetail.vue
+++ b/resources/assets/js/home/TabsCaseDetail.vue
@@ -15,7 +15,7 @@
         </ProcessMap>
       </tab>
       <tab :name="$t('ID_CASE_HISTORY')">
-        <CaseHistory :data="dataCase"> </CaseHistory>
+        <CaseHistory :historyData="dataCase"> </CaseHistory>
       </tab>
       <tab :name="$t('ID_DYNAFORM_HISTORY')">
         <ChangeLog :caseData="dataCase"> </ChangeLog>
diff --git a/workflow/engine/methods/cases/caseHistory_Ajax.php b/workflow/engine/methods/cases/caseHistory_Ajax.php
index c6c4cc446..d394ff5f2 100644
--- a/workflow/engine/methods/cases/caseHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseHistory_Ajax.php
@@ -8,7 +8,7 @@ $actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null;
 switch ($actionAjax) {
     case 'historyGridList_JXP':
         global $G_PUBLISH;
-        $appUid = $_SESSION['APPLICATION'];
+        $appUid = isset($_REQUEST['appUid']) ? $_REQUEST['appUid'] : $_SESSION['APPLICATION'];
         $case = new ClassesCases();
         $fields = $case->loadCase($appUid);
         $criteria = Cases::getTransferHistoryCriteria($fields['APP_NUMBER']);
diff --git a/workflow/engine/templates/cases/caseHistory.js b/workflow/engine/templates/cases/caseHistory.js
index 70ef1f309..fe89f2af3 100644
--- a/workflow/engine/templates/cases/caseHistory.js
+++ b/workflow/engine/templates/cases/caseHistory.js
@@ -179,11 +179,12 @@
   //!!historyGridList|changeLog
 
   function historyGridList(){
+      var appUid = this.window.location.search.substr(27);
       store = new Ext.data.GroupingStore({
         proxy : new Ext.data.HttpProxy
         (
           {
-            url: 'caseHistory_Ajax.php?actionAjax=historyGridList_JXP'
+            url: 'caseHistory_Ajax.php?actionAjax=historyGridList_JXP&appUid=' + appUid
           }
         ),