pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: properly resequence newly created kanban column

Browse Source 
**Issue:** https://watch.screencastify.com/v/5ewbfVCuC0cAyVil9hqW

**Solution:**

We always reorder all the records when one of the records don't have
`sequence` (handleField) information.

closes odoo/odoo#103459

X-original-commit: 2dededb2cea3b9f60a7bd27c282ec7b5db9456a0
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
This commit is contained in:
Joseph Caburnay
2022-10-18 23:08:59 +02:00
parent 57e8201768
commit fd8633e345
2 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/views/relational_model.js
+14 -11
View File
@@ -1707,18 +1707,21 @@ class DynamicList extends DataPoint {
// Determine what records need to be modified
const firstIndex = Math.min(fromIndex, toIndex);
const lastIndex = Math.max(fromIndex, toIndex) + 1;
let reorderAll = false;
let lastSequence = (asc ? -1 : 1) * Infinity;
for (let index = 0; index < records.length; index++) {
const sequence = getSequence(records[index]);
if (
((index < firstIndex || index >= lastIndex) &&
((asc && lastSequence >= sequence) || (!asc && lastSequence <= sequence))) ||
(index >= firstIndex && index < lastIndex && lastSequence === sequence)
) {
reorderAll = true;
let reorderAll = records.some((record) => record.data[handleField] === undefined);
if (!reorderAll) {
let lastSequence = (asc ? -1 : 1) * Infinity;
for (let index = 0; index < records.length; index++) {
const sequence = getSequence(records[index]);
if (
((index < firstIndex || index >= lastIndex) &&
((asc && lastSequence >= sequence) ||
(!asc && lastSequence <= sequence))) ||
(index >= firstIndex && index < lastIndex && lastSequence === sequence)
) {
reorderAll = true;
}
lastSequence = sequence;
}
lastSequence = sequence;
}
// Perform the resequence in the list of records
addons/web/static/tests/views/kanban_view_tests.js
+64
View File
@@ -7554,6 +7554,70 @@ QUnit.module("Views", (hooks) => {
assert.deepEqual(getCardTexts(), ["2", "4", "1", "3"]);
});
QUnit.test(
"resequence all when create(ing) a new record + partial resequencing",
async (assert) => {
let resequenceOffset;
await makeView({
type: "kanban",
resModel: "partner",
serverData,
arch: /* xml */ `
<kanban>
<field name="product_id"/>
<templates>
<t t-name="kanban-box">
<div><field name="id"/></div>
</t>
</templates>
</kanban>
`,
groupBy: ["product_id"],
mockRPC(route, params) {
if (route === "/web/dataset/resequence") {
assert.step(JSON.stringify({ ids: params.ids, offset: params.offset }));
resequenceOffset = params.offset || 0;
return true;
}
if (params.method === "read") {
// Important to simulate the server returning the new sequence.
const [ids, fields] = params.args;
return ids.map((id, index) => ({
id,
[fields[0]]: resequenceOffset + index,
}));
}
},
});
await createColumn();
await editColumnName("foo");
await validateColumn();
assert.verifySteps([JSON.stringify({ ids: [3, 5, 6] })]);
await editColumnName("bar");
await validateColumn();
assert.verifySteps([JSON.stringify({ ids: [3, 5, 6, 7] })]);
await editColumnName("baz");
await validateColumn();
assert.verifySteps([JSON.stringify({ ids: [3, 5, 6, 7, 8] })]);
await editColumnName("boo");
await validateColumn();
assert.verifySteps([JSON.stringify({ ids: [3, 5, 6, 7, 8, 9] })]);
// When rearranging, only resequence the affected records. In this example,
// dragging column 2 to column 4 should only resequence [5, 6, 7] to [6, 7, 5]
// with offset 1.
await dragAndDrop(
".o_kanban_group:nth-child(2) .o_column_title",
".o_kanban_group:nth-child(4)"
);
assert.verifySteps([JSON.stringify({ ids: [6, 7, 5], offset: 1 })]);
}
);
QUnit.test("prevent resequence columns if groups_draggable=false", async (assert) => {
serverData.models.product.fields.sequence = { type: "integer" };