Skip to content

Commit

Permalink
fix(UX): Add group by information in report view URLs (#23547) (#23745)
Browse files Browse the repository at this point in the history
* fix: support group by in report view URL

* fix: store sort field and order in URL

* Revert "fix: store sort field and order in URL"

This reverts commit 4cb65f8.

(cherry picked from commit cbd61b4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
  • Loading branch information
mergify[bot] and ankush committed Dec 12, 2023
1 parent 4c7124c commit 07ade2c
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions frappe/public/js/frappe/views/reports/report_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -1674,4 +1674,34 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {

return items.map((i) => Object.assign(i, { standard: true }));
}

get_search_params() {
let search_params = super.get_search_params();
let config = this.group_by_control.get_settings();
if (config) {
search_params.append(
"_group_by",
JSON.stringify([config.group_by, config.aggregate_on, config.aggregate_function])
);
}
return search_params;
}

parse_filters_from_route_options() {
if (frappe.route_options?._group_by) {
try {
let config = JSON.parse(frappe.route_options._group_by);
this.group_by_control.apply_settings({
group_by: config[0],
aggregate_on: config[1],
aggregate_function: config[2],
});
delete frappe.route_options["_group_by"];
} catch (e) {
console.warn("Failed to parse group by from URL", e);
}
}

return super.parse_filters_from_route_options();
}
};

0 comments on commit 07ade2c

Please sign in to comment.