From 7e77ecb5a29c38ead418f54536ba259df57a01a1 Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Fri, 22 Oct 2021 16:21:04 -0400 Subject: [PATCH] PMCORE-3442:FE The PMFCaseLink does not work when the action=sent Error index Corrections --- .../js/home/CustomCaseList/CustomCaseList.vue | 5 ++-- resources/assets/js/home/Draft/Draft.vue | 5 ++-- resources/assets/js/home/Home.vue | 9 +++--- resources/assets/js/home/Inbox/Inbox.vue | 5 ++-- resources/assets/js/home/MyCases/MyCases.vue | 29 +++++++++++++++---- resources/assets/js/home/Paused/Paused.vue | 5 ++-- resources/assets/js/home/XCase.vue | 2 +- .../src/ProcessMaker/BusinessModel/Cases.php | 1 - 8 files changed, 38 insertions(+), 23 deletions(-) diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue index b9396e769..827e3d55d 100644 --- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue +++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue @@ -658,9 +658,8 @@ export default { DEL_INDEX: params.del_index, }); this.$emit("cleanDefaultOption"); - } - //force to search in the parallel tasks - if (params && params.openapplicationuid) { + } else if (params && params.openapplicationuid) { + //force to search in the parallel tasks this.onUpdateFilters({ params: [ { diff --git a/resources/assets/js/home/Draft/Draft.vue b/resources/assets/js/home/Draft/Draft.vue index 4e0f568ea..949fb11f5 100644 --- a/resources/assets/js/home/Draft/Draft.vue +++ b/resources/assets/js/home/Draft/Draft.vue @@ -426,9 +426,8 @@ export default { DEL_INDEX: params.del_index }); this.$emit("cleanDefaultOption"); - } - //force to search in the parallel tasks - if (params && params.openapplicationuid) { + } else if (params && params.openapplicationuid) { + //force to search in the parallel tasks this.onUpdateFilters({ params: [ { diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index a71391c07..0fa340acb 100755 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -65,7 +65,7 @@ import TaskReassignments from "./TaskReassignments"; import AdvancedSearch from "./AdvancedSearch/AdvancedSearch.vue"; import LegacyFrame from "./LegacyFrame"; import CustomCaseList from "./CustomCaseList/CustomCaseList.vue" - +import utils from "../utils/utils" import api from "./../api/index"; import eventBus from './EventBus/eventBus' import _ from "lodash"; @@ -286,7 +286,8 @@ export default { * Set default cases menu option */ setDefaultCasesMenu(data) { - let menuItem = _.find(data, function(o) { + let params, + menuItem = _.find(data, function(o) { return o.id === window.config._nodeId; }); if (menuItem && menuItem.href) { @@ -295,8 +296,8 @@ export default { } else { this.page = "MyCases"; } - if (window.config._nodeId === "CASES_SENT" && this.defaultOption.indexOf('openApplicationUid') > 0) { - this.cleanDefaultOption(); + params = utils.getAllUrlParams(this.defaultOption); + if (params.action === 'mycases' && params.filter === '') { this.showAlert(this.$i18n.t("ID_NO_PERMISSION_NO_PARTICIPATED_CASES")); } this.settings = this.config.setting[this.page]; diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue index 7ef212d47..5822f4313 100644 --- a/resources/assets/js/home/Inbox/Inbox.vue +++ b/resources/assets/js/home/Inbox/Inbox.vue @@ -461,9 +461,8 @@ export default { DEL_INDEX: params.del_index, }); this.$emit("cleanDefaultOption"); - } - //force to search in the parallel tasks - if (params && params.openapplicationuid) { + } else if (params && params.openapplicationuid) { + //force to search in the parallel tasks this.onUpdateFilters({ params: [ { diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue index 83efe41b8..e89c272aa 100644 --- a/resources/assets/js/home/MyCases/MyCases.vue +++ b/resources/assets/js/home/MyCases/MyCases.vue @@ -273,10 +273,19 @@ export default { let params; if (this.defaultOption) { params = utils.getAllUrlParams(this.defaultOption); - if (params && params.app_uid && params.del_index) { - this.openCase({ - APP_UID: params.app_uid, - DEL_INDEX: params.del_index, + if (params && params.openapplicationuid) { + this.onUpdateFilters({ + params: [ + { + fieldId: "caseNumber", + filterVar: "caseNumber", + label: "", + options: [], + value: params.openapplicationuid, + autoShow: false, + }, + ], + refresh: false, }); this.$emit("cleanDefaultOption"); } @@ -360,10 +369,20 @@ export default { let header = window.config._nodeId, filters = this.headers, filter, - i; + i, + params; if (header === "CASES_TO_REVISE") { filter = "SUPERVISING"; } + params = utils.getAllUrlParams(window.config.defaultOption); + if (params.action === 'mycases' && params.filter !== '') { + if (params.filter === 'inprogress') { + filter = 'IN_PROGRESS' + } + if (params.filter === 'completed') { + filter = 'COMPLETED' + } + } for (i = 0; i < filters.length; i += 1) { if (filters[i].item === filter) { filters[i].onClick(filters[i]); diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index f5f0bc717..e5469d9ca 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -460,9 +460,8 @@ export default { DEL_INDEX: params.del_index }); this.$emit("cleanDefaultOption"); - } - //force to search in the parallel tasks - if (params && params.openapplicationuid) { + } else if (params && params.openapplicationuid) { + //force to search in the parallel tasks this.onUpdateFilters({ params: [ { diff --git a/resources/assets/js/home/XCase.vue b/resources/assets/js/home/XCase.vue index e1cb815c0..d5edc0195 100644 --- a/resources/assets/js/home/XCase.vue +++ b/resources/assets/js/home/XCase.vue @@ -58,7 +58,7 @@ export default { setTimeout(() => { let that = this; - if (this.dataCase.APP_UID) { + if (this.dataCase.APP_UID && this.dataCase.PRO_UID) { api.cases.debugStatus(this.dataCase) .then((response) => { if (response.data) { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index aaa3cfbcd..4924b3be8 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -2473,7 +2473,6 @@ class Cases 'DEL_INDEX' => [], 'PRO_UID' => $record['PRO_UID'] ]; - $arrayData['DEL_INDEX'][] = $record['DEL_INDEX']; foreach ($result as $record) { $arrayData['DEL_INDEX'][] = $record['DEL_INDEX']; }