From 9c230f42371ebf275f5e83cd82e88221110b5f07 Mon Sep 17 00:00:00 2001 From: andrea Date: Thu, 27 Jun 2024 21:55:05 +0200 Subject: [PATCH] [MIG] web_group_expand: migrate to V17 --- web_group_expand/README.rst | 3 +++ web_group_expand/__manifest__.py | 2 +- web_group_expand/readme/CONTRIBUTORS.md | 2 ++ .../static/description/index.html | 4 +++ .../static/src/js/list_controller.esm.js | 26 +++++++++++-------- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/web_group_expand/README.rst b/web_group_expand/README.rst index 9b9fba576..edbedfb55 100644 --- a/web_group_expand/README.rst +++ b/web_group_expand/README.rst @@ -73,6 +73,9 @@ Contributors - Manuel Calero - Alvaro Estebanez (brain-tec AG) - Mayank Patel +- `360ERP `__: + + - Andrea Stirpe Maintainers ----------- diff --git a/web_group_expand/__manifest__.py b/web_group_expand/__manifest__.py index 9931860e9..fdc8e440d 100644 --- a/web_group_expand/__manifest__.py +++ b/web_group_expand/__manifest__.py @@ -1,7 +1,7 @@ { "name": "Group Expand Buttons", "category": "Web", - "version": "16.0.1.0.0", + "version": "17.0.1.0.0", "license": "AGPL-3", "author": "OpenERP SA, " "AvanzOSC, " diff --git a/web_group_expand/readme/CONTRIBUTORS.md b/web_group_expand/readme/CONTRIBUTORS.md index 79d3c423f..46e553711 100644 --- a/web_group_expand/readme/CONTRIBUTORS.md +++ b/web_group_expand/readme/CONTRIBUTORS.md @@ -6,3 +6,5 @@ - Manuel Calero \<\> - Alvaro Estebanez (brain-tec AG) \<\> - Mayank Patel \<\> +- [360ERP](https://www.360erp.com): + - Andrea Stirpe diff --git a/web_group_expand/static/description/index.html b/web_group_expand/static/description/index.html index a9bf7cc44..5dcbb7132 100644 --- a/web_group_expand/static/description/index.html +++ b/web_group_expand/static/description/index.html @@ -416,6 +416,10 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
  • Manuel Calero <manuelcalerosolis@gmail.com>
  • Alvaro Estebanez (brain-tec AG) <alvaro.estebanez@bt-group.com>
  • Mayank Patel <mayankpatel3555@gmail.com>
    • +
  • 360ERP:
      +
    • Andrea Stirpe
      • +
    +
    • diff --git a/web_group_expand/static/src/js/list_controller.esm.js b/web_group_expand/static/src/js/list_controller.esm.js index 0ef08270b..2e737c167 100644 --- a/web_group_expand/static/src/js/list_controller.esm.js +++ b/web_group_expand/static/src/js/list_controller.esm.js @@ -3,28 +3,33 @@ import {patch} from "@web/core/utils/patch"; import {ListController} from "@web/views/list/list_controller"; -patch(ListController.prototype, "web_group_expand.ListController", { +function flatten(arr) { + return arr.reduce((flat, toFlatten) => { + return flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten); + }, []); +} + +patch(ListController.prototype, { async expandAllGroups() { // We expand layer by layer. So first we need to find the highest // layer that's not already fully expanded. let layer = this.model.root.groups; while (layer.length) { const closed = layer.filter(function (group) { - return group.isFolded; + return group._config.isFolded; }); if (closed.length) { // This layer is not completely expanded, expand it await layer.forEach((group) => { - group.isFolded = false; + group._config.isFolded = false; }); break; } // This layer is completely expanded, move to the next - layer = _.flatten( + layer = flatten( layer.map(function (group) { return group.list.groups || []; - }), - true + }) ); } await this.model.root.load(); @@ -36,18 +41,17 @@ patch(ListController.prototype, "web_group_expand.ListController", { // layer that's not already fully collapsed. let layer = this.model.root.groups; while (layer.length) { - const next = _.flatten( + const next = flatten( layer.map(function (group) { return group.list.groups || []; - }), - true + }) ).filter(function (group) { - return !group.isFolded; + return !group._config.isFolded; }); if (!next.length) { // Next layer is fully collapsed, so collapse this one await layer.forEach((group) => { - group.isFolded = true; + group._config.isFolded = true; }); break; }