From 86b683bb38f692863d37908fb7d609d53f302cf4 Mon Sep 17 00:00:00 2001 From: "Laurent Stukkens (LTU)" Date: Wed, 13 Jul 2022 16:36:03 +0200 Subject: [PATCH 1/3] [FIX] web: add hideCustomGroupBy option Prior to this commit, it was not possible to hide the 'Add Custom Group'. This commit adds this feature and associated tests. Hiding this menu entry can now be performed by adding `hideCustomGroupBy: false` in the `View`. This commit also uses `MAPPING` values in the components assignment of `ControlPanel` in order to improve code maintenance. task-2845729 --- .../src/search/control_panel/control_panel.js | 5 +- .../src/search/group_by_menu/group_by_menu.js | 7 ++ .../search/group_by_menu/group_by_menu.xml | 2 +- addons/web/static/src/search/search_model.js | 3 +- .../src/search/with_search/with_search.js | 1 + addons/web/static/src/views/view.js | 3 + .../tests/search/group_by_menu_tests.js | 65 +++++++++++++++++++ 7 files changed, 80 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/search/control_panel/control_panel.js b/addons/web/static/src/search/control_panel/control_panel.js index 9db06294bdf..f4cb99b373b 100644 --- a/addons/web/static/src/search/control_panel/control_panel.js +++ b/addons/web/static/src/search/control_panel/control_panel.js @@ -95,10 +95,7 @@ export class ControlPanel extends Component { } ControlPanel.components = { - ComparisonMenu, - FavoriteMenu, - FilterMenu, - GroupByMenu, + ...Object.values(MAPPING), Pager, SearchBar, }; diff --git a/addons/web/static/src/search/group_by_menu/group_by_menu.js b/addons/web/static/src/search/group_by_menu/group_by_menu.js index a99b034cdf2..4c5d8223561 100644 --- a/addons/web/static/src/search/group_by_menu/group_by_menu.js +++ b/addons/web/static/src/search/group_by_menu/group_by_menu.js @@ -26,6 +26,13 @@ export class GroupByMenu extends Component { useBus(this.env.searchModel, "update", this.render); } + /** + * @returns {boolean} + */ + get hideCustomGroupBy() { + return this.env.searchModel.hideCustomGroupBy || false; + } + /** * @returns {Object[]} */ diff --git a/addons/web/static/src/search/group_by_menu/group_by_menu.xml b/addons/web/static/src/search/group_by_menu/group_by_menu.xml index b2911a39b41..d6e90e5e0a4 100644 --- a/addons/web/static/src/search/group_by_menu/group_by_menu.xml +++ b/addons/web/static/src/search/group_by_menu/group_by_menu.xml @@ -43,7 +43,7 @@ - +