diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index ea0003d1f..3a009f571 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -18,25 +18,56 @@ export let cases = { keys: {} }); }, - draft(data) { + inbox(data) { + let service = "INBOX_LIST", + keys = {}; + if (data && data.id) { + service = "INBOX_CUSTOM_LIST"; + keys["id"] = data.id; + } return Api.get({ - service: "DRAFT_LIST", + service, + params: data.filters, + keys + }); + }, + draft(data) { + let service = "DRAFT_LIST", + keys = {}; + if (data && data.id) { + service = "DRAFT_CUSTOM_LIST"; + keys["id"] = data.id; + } + return Api.get({ + service, params: data, - keys: {} + keys }); }, paused(data) { + let service = "PAUSED_LIST", + keys = {}; + if (data && data.id) { + service = "PAUSED_CUSTOM_LIST"; + keys["id"] = data.id; + } return Api.get({ - service: "PAUSED_LIST", + service, params: data, - keys: {} + keys }); }, unassigned(data) { + let service = "UNASSIGNED_LIST", + keys = {}; + if (data && data.id) { + service = "UNASSIGNED_CUSTOM_LIST"; + keys["id"] = data.id; + } return Api.get({ - service: "UNASSIGNED_LIST", + service, params: data, - keys: {} + keys }); }, summary(data) { diff --git a/resources/assets/js/api/Services.js b/resources/assets/js/api/Services.js index 215bbd3ba..e874cc744 100644 --- a/resources/assets/js/api/Services.js +++ b/resources/assets/js/api/Services.js @@ -72,5 +72,9 @@ GET_CONFIG: "/home/config/{id}/{name}", PAUSE_CASE: "/cases/{app_uid}/pause", REASSIGN_CASE: "/cases/{app_uid}/reassign-case", - REASSIGN_USERS: "/light/userstoreassign/{task_uid}" + REASSIGN_USERS: "/light/userstoreassign/{task_uid}", + INBOX_CUSTOM_LIST: "/home/inbox/{id}", + DRAFT_CUSTOM_LIST: "/home/draft/{id}", + PAUSED_CUSTOM_LIST: "/home/paused/{id}", + UNASSIGNED_CUSTOM_LIST: "/home/unassigned/{id}" }; \ No newline at end of file diff --git a/resources/assets/js/components/utils/CustomTooltip.vue b/resources/assets/js/components/utils/CustomTooltip.vue index abb42dd3d..15fd13efd 100644 --- a/resources/assets/js/components/utils/CustomTooltip.vue +++ b/resources/assets/js/components/utils/CustomTooltip.vue @@ -5,7 +5,7 @@ :title="labelTooltip" > {{ data.title }} - + {{ labelTooltip }} @@ -45,7 +45,7 @@ export default { * Reset the delay and hide the tooltip */ unhoverHandler() { - let key = `tooltip-${this.data.id}`; + let key = `tooltip-${this.data.page}`; this.labelTooltip = ""; this.$refs[key].$emit("close"); }, @@ -54,8 +54,8 @@ export default { */ setTooltip() { let that = this; - api.menu.getTooltip(that.data.id).then((response) => { - let key = `tooltip-${that.data.id}`; + api.menu.getTooltip(that.data.page).then((response) => { + let key = `tooltip-${that.data.page}`; that.labelTooltip = response.data.label; that.$refs[key].$emit("open"); }); diff --git a/resources/assets/js/components/vuetable/SettingsPopover.vue b/resources/assets/js/components/vuetable/SettingsPopover.vue index 5a0e73850..38b205f76 100644 --- a/resources/assets/js/components/vuetable/SettingsPopover.vue +++ b/resources/assets/js/components/vuetable/SettingsPopover.vue @@ -40,7 +40,7 @@ -
+
@@ -491,6 +491,7 @@ export default { * @param {object} item */ openCase(item) { + debugger; this.$emit("onUpdateDataCase", { APP_UID: item.APP_UID, DEL_INDEX: item.DEL_INDEX, @@ -557,6 +558,7 @@ export default { * @param {object} data */ updateDataEllipsis(data) { + debugger; let that = this; this.showEllipsis = !this.showEllipsis; if (this.showEllipsis) { diff --git a/resources/assets/js/home/Draft/defaultMixins.js b/resources/assets/js/home/Draft/defaultMixins.js index eb1762c6b..db7efd865 100644 --- a/resources/assets/js/home/Draft/defaultMixins.js +++ b/resources/assets/js/home/Draft/defaultMixins.js @@ -50,7 +50,6 @@ export default { priority: this.$i18n.t("ID_PRIORITY") }, columns: [ - "detail", "case_number", "case_title", "process_name", diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index 42f3a47cf..24d792b50 100644 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -26,6 +26,7 @@ :defaultOption="defaultOption" :settings="config.setting[page]" :filters="filters" + :data="pageData" @onSubmitFilter="onSubmitFilter" @onRemoveFilter="onRemoveFilter" @onUpdatePage="onUpdatePage" @@ -53,6 +54,7 @@ import XCase from "./XCase"; import TaskReassignments from "./TaskReassignments"; import AdvancedSearch from "./AdvancedSearch/AdvancedSearch.vue"; import LegacyFrame from "./LegacyFrame"; +import CustomCaseList from "./CustomCaseList/CustomCaseList.vue" import api from "./../api/index"; import eventBus from './EventBus/eventBus' @@ -71,7 +73,8 @@ export default { Paused, Unassigned, CaseDetail, - LegacyFrame + LegacyFrame, + CustomCaseList, }, data() { return { @@ -105,7 +108,8 @@ export default { CASES_TO_REASSIGN: "task-reassignments", CASES_FOLDERS: "my-documents" }, - defaultOption: window.config.defaultOption || '' + defaultOption: window.config.defaultOption || '', + pageData: {} }; }, mounted() { @@ -243,11 +247,11 @@ export default { newData = data, auxId; for (i = 0; i < data.length; i += 1) { - auxId = data[i].id || ""; + auxId = data[i].page || ""; if (auxId !== "" && this.menuMap[auxId]) { - newData[i].id = this.menuMap[auxId]; + newData[i].page = this.menuMap[auxId]; } else if (newData[i].href) { - newData[i].id = "LegacyFrame"; + newData[i].page = "LegacyFrame"; } // Tasks group need pie chart icon if (data[i].header && data[i].id === "FOLDERS") { @@ -267,8 +271,7 @@ export default { } } } - if (data[i].id === "inbox" || data[i].id === "draft" - || data[i].id === "paused" || data[i].id === "unassigned") { + if (data[i].customCasesList) { data[i]["child"] = this.sortCustomCasesList( data[i].customCasesList, this.config.setting[this.page] && @@ -345,7 +348,7 @@ export default { this.defaultOption = ""; }, OnClickSidebarItem(item) { - if (item.item.page && item.item.page === "/advanced-search") { + if (item.item.page && item.item.page === "advanced-search") { this.page = "advanced-search"; this.filters = item.item.filters; this.pageId = item.item.id; @@ -355,11 +358,21 @@ export default { this.filters = []; this.pageId = null; this.pageUri = item.item.href; - this.page = item.item.id || "MyCases"; + this.page = item.item.page || "MyCases"; + if (!item.item.customCasesList) { + this.page = "custom-case-list"; + this.pageData = { + pageUri: item.item.pageUri, + pageParent: item.item.page, + pageName: item.item.title, + pageIcon: item.item.icon, + customListId: item.item.id + } + } if (this.page === this.lastPage && this.$refs["component"] && this.$refs["component"].updateView) { - this.$refs["component"].updateView(); + this.$refs["component"].updateView(this.pageData); } this.lastPage = this.page; } diff --git a/resources/assets/sass/menu.scss b/resources/assets/sass/menu.scss index badd7792d..6034f633d 100755 --- a/resources/assets/sass/menu.scss +++ b/resources/assets/sass/menu.scss @@ -111,7 +111,7 @@ } .vsm--link_level-2>.vsm--icon { - margin-top: 8px; + margin-top: 0px; } .v-sidebar-menu .vsm--arrow { diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Home.php b/workflow/engine/src/ProcessMaker/Services/Api/Home.php index 8cd465936..3595d012c 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Home.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Home.php @@ -657,6 +657,7 @@ class Home extends Api $option->href = $menuInstance->Options[$i]; $option->id = $menuInstance->Id[$i]; $option->title = $menuInstance->Labels[$i]; + $option->page = $menuInstance->Id[$i]; $option->icon = $menuInstance->Icons[$i]; } @@ -669,7 +670,7 @@ class Home extends Api foreach ($filters as $filter) { $childFilter = new stdClass(); $childFilter->id = $filter->id; - $childFilter->page = '/advanced-search'; + $childFilter->page = 'advanced-search'; $childFilter->href = "{$childFilter->page}/{$filter->id}"; $childFilter->title = $filter->name; $childFilter->icon = 'fas fa-circle'; @@ -699,7 +700,8 @@ class Home extends Api "id" => $value['id'], "title" => $value['name'], "description" => $value['description'], - "icon" => $value['iconList'] + "icon" => $value['iconList'], + "page" => $mapKeys[$menuInstance->Id[$i]] ]; } }