From fef810a32f02ffa09713e044ef69ce73ca70bc81 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Fri, 17 Mar 2023 08:06:31 +0000 Subject: [PATCH] [FIX] web: kanban: keep column folded when d&d a record MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In a grouped kanban view, drag a record and drop it in a folded column. Before this commit, it opened and loaded the target column. It shouldn't, the column should remain folded. This behavior has been introduced in v16 with the wowl views. This commit restores the legacy kanban behavior, which keeps the target column folded and thus doesn't load it. We ensure that the progressbar of the source column is correctly updated though. Task 3208098 closes odoo/odoo#115728 X-original-commit: d6d6e4f64ea379a6795b139c5fafd604b7e185eb Signed-off-by: Géry Debongnie Signed-off-by: Aaron Bohy (aab) --- .../static/src/views/kanban/kanban_model.js | 20 ++--- .../static/tests/views/kanban_view_tests.js | 80 ++++++++++++------- 2 files changed, 61 insertions(+), 39 deletions(-) diff --git a/addons/web/static/src/views/kanban/kanban_model.js b/addons/web/static/src/views/kanban/kanban_model.js index e5dce60d784..6b1f3ecf483 100644 --- a/addons/web/static/src/views/kanban/kanban_model.js +++ b/addons/web/static/src/views/kanban/kanban_model.js @@ -483,7 +483,6 @@ export class KanbanDynamicGroupList extends DynamicGroupList { } // Move from one group to another - const fullyLoadGroup = targetGroup.isFolded; if (dataGroupId !== targetGroupId) { const refIndex = targetGroup.list.records.findIndex((r) => r.id === refId); // Quick update: moves the record at the right position and notifies components @@ -510,24 +509,21 @@ export class KanbanDynamicGroupList extends DynamicGroupList { throw err; } - const promises = [this.updateGroupProgressData([sourceGroup, targetGroup], true)]; - if (fullyLoadGroup) { - // The group is folded: we need to load it - // In this case since we load after saving the record there is no - // need to reload the record nor to resequence the list. - promises.push(targetGroup.toggle()); - } else { - // Record can be loaded along with the group metadata + const promises = []; + const groupsToReload = [sourceGroup]; + if (!targetGroup.isFolded) { + groupsToReload.push(targetGroup); promises.push(record.load()); } - + promises.push(this.updateGroupProgressData(groupsToReload, true)); await Promise.all(promises); } - if (!fullyLoadGroup) { - // Only trigger resequence if the group hasn't been fully loaded + if (!targetGroup.isFolded) { + // Only trigger resequence if the group isn't folded await targetGroup.list.resequence(dataRecordId, refId); } + this.model.notify(); this.model.transaction.commit(dataRecordId); diff --git a/addons/web/static/tests/views/kanban_view_tests.js b/addons/web/static/tests/views/kanban_view_tests.js index 24208314a4e..8ffc282619b 100644 --- a/addons/web/static/tests/views/kanban_view_tests.js +++ b/addons/web/static/tests/views/kanban_view_tests.js @@ -12239,8 +12239,7 @@ QUnit.module("Views", (hooks) => { ); }); - QUnit.test("fold a column and drag record on it should unfold it", async (assert) => { - let searchReadProm; + QUnit.test("fold a column and drag record on it should not unfold it", async (assert) => { await makeView({ type: "kanban", resModel: "partner", @@ -12254,11 +12253,6 @@ QUnit.module("Views", (hooks) => { `, groupBy: ["product_id"], - async mockRPC(_route, { method }) { - if (method === "web_search_read") { - await searchReadProm; - } - }, }); assert.containsN(target, ".o_kanban_group", 2); @@ -12272,24 +12266,14 @@ QUnit.module("Views", (hooks) => { assert.hasClass(getColumn(1), "o_column_folded"); assert.strictEqual(getColumn(1).innerText, "xmo (2)"); - searchReadProm = makeDeferred(); - await dragAndDrop(".o_kanban_group:first-child .o_kanban_record", ".o_column_folded"); assert.containsN(getColumn(0), ".o_kanban_record", 1); assert.hasClass(getColumn(1), "o_column_folded"); assert.strictEqual(getColumn(1).innerText, "xmo (3)"); - - searchReadProm.resolve(); - await nextTick(); - - assert.containsN(getColumn(0), ".o_kanban_record", 1); - assert.doesNotHaveClass(getColumn(1), "o_column_folded"); - assert.containsN(getColumn(1), ".o_kanban_record", 3); }); - QUnit.test("drag record on initially folded column should load it", async (assert) => { - let searchReadProm; + QUnit.test("drag record on initially folded column should not unfold it", async (assert) => { await makeView({ type: "kanban", resModel: "partner", @@ -12308,8 +12292,6 @@ QUnit.module("Views", (hooks) => { const result = await performRPC(route, args); result.groups[1].__fold = true; return result; - } else if (args.method === "web_search_read") { - await searchReadProm; } }, }); @@ -12318,20 +12300,64 @@ QUnit.module("Views", (hooks) => { assert.hasClass(getColumn(1), "o_column_folded"); assert.strictEqual(getColumn(1).innerText, "xmo (2)"); - searchReadProm = makeDeferred(); - await dragAndDrop(".o_kanban_group:first-child .o_kanban_record", ".o_column_folded"); assert.containsN(getColumn(0), ".o_kanban_record", 1); assert.hasClass(getColumn(1), "o_column_folded"); assert.strictEqual(getColumn(1).innerText, "xmo (3)"); + }); - searchReadProm.resolve(); - await nextTick(); + QUnit.test("drag record to folded column, with progressbars", async (assert) => { + serverData.models.partner.records[0].bar = false; + await makeView({ + type: "kanban", + resModel: "partner", + serverData, + arch: /* xml */ ` + + + +
+ +
+ + + `, + groupBy: ["bar"], + }); - assert.containsN(getColumn(0), ".o_kanban_record", 1); - assert.doesNotHaveClass(getColumn(1), "o_column_folded"); - assert.containsN(getColumn(1), ".o_kanban_record", 3); + assert.containsN(target, ".o_kanban_group", 2); + assert.containsN(target, ".o_kanban_group:first-child .o_kanban_record", 2); + assert.containsN(target, ".o_kanban_group:nth-child(2) .o_kanban_record", 2); + assert.deepEqual( + getProgressBars(0).map((pb) => pb.style.width), + ["50%", "50%"] + ); + assert.deepEqual( + getProgressBars(1).map((pb) => pb.style.width), + ["50%", "50%"] + ); + assert.deepEqual(getCounters(), ["6", "26"]); + + const clickColumnAction = await toggleColumnActions(1); + await clickColumnAction("Fold"); + + assert.containsN(getColumn(0), ".o_kanban_record", 2); + assert.hasClass(getColumn(1), "o_column_folded"); + assert.strictEqual(getColumn(1).innerText, "Yes (2)"); + + await dragAndDrop( + ".o_kanban_group:first-child .o_kanban_record", + ".o_kanban_group:nth-child(2)" + ); + + assert.containsOnce(getColumn(0), ".o_kanban_record"); + assert.strictEqual(getColumn(1).innerText, "Yes (3)"); + assert.deepEqual( + getProgressBars(0).map((pb) => pb.style.width), + ["100%"] + ); + assert.deepEqual(getCounters(), ["-4"]); }); QUnit.test("quick create record in grouped kanban in a form view dialog", async (assert) => {