From 7d4040405a17e22daed5a54596369b8daf0a038e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 17 Oct 2023 11:02:09 +0530 Subject: [PATCH] fix(UX): Preserve filters between list and report views --- frappe/public/js/frappe/list/list_view_select.js | 5 +++++ frappe/public/js/frappe/ui/group_by/group_by.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view_select.js b/frappe/public/js/frappe/list/list_view_select.js index daa16432b5..d00aba6c71 100644 --- a/frappe/public/js/frappe/list/list_view_select.js +++ b/frappe/public/js/frappe/list/list_view_select.js @@ -40,6 +40,11 @@ frappe.views.ListViewSelect = class ListViewSelect { set_route(view, calendar_name) { const route = [this.slug(), "view", view]; if (calendar_name) route.push(calendar_name); + + let search_params = cur_list?.get_search_params(); + if (search_params) { + frappe.route_options = Object.fromEntries(search_params); + } frappe.set_route(route); } diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index 0ed9c9e3db..2f218678ac 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -427,7 +427,7 @@ frappe.ui.GroupBy = class { } get_group_by_field_label() { - let field = this.group_by_fields[this.group_by_doctype].find( + let field = this.group_by_fields[this.group_by_doctype]?.find( (field) => field.fieldname == this.group_by_field ); return field?.label || field?.fieldname;