mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Sort multiple levels of items when generating API JSON

Browse source 
Added Zotero.DataObjects.sortByParent() to sort child items immediately
after their parent items. Zotero.DataObjects.sortByLevel(), which is
used for collections, sorts each level together, but that's less
appropriate for items where, e.g., an embedded-image attachment should
immediately follow the note that depends on it.
This commit is contained in:
Dan Stillman 2020-09-08 04:02:25 -04:00
parent f662b58331
commit a94323fc15
8 changed files with 362 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

44
test/tests/collectionsTest.js
View file

@ -83,48 +83,4 @@ describe("Zotero.Collections", function () {
assert.notInstanceOf(collection, Zotero.Feed);
});
});
describe("#sortByLevel()", function () {
it("should return collections sorted from top-level to deepest", function* () {
// - A
// - B
// - C
// - D
// - E
// - F
// - G
// - H
// - I
// Leave out B and G
// Order should be {A, E}, {D, F}, {C, I}, {H} (internal order is undefined)
var check = function (arr) {
assert.sameMembers(arr.slice(0, 2), [c1.id, c5.id]);
assert.sameMembers(arr.slice(2, 4), [c4.id, c6.id]);
assert.sameMembers(arr.slice(4, 6), [c3.id, c9.id]);
assert.equal(arr[6], c8.id);
};
var c1 = yield createDataObject('collection', { "name": "A" });
var c2 = yield createDataObject('collection', { "name": "B", parentID: c1.id });
var c3 = yield createDataObject('collection', { "name": "C", parentID: c2.id });
var c4 = yield createDataObject('collection', { "name": "D", parentID: c1.id });
var c5 = yield createDataObject('collection', { "name": "E" });
var c6 = yield createDataObject('collection', { "name": "F", parentID: c5.id });
var c7 = yield createDataObject('collection', { "name": "G", parentID: c6.id });
var c8 = yield createDataObject('collection', { "name": "H", parentID: c7.id });
var c9 = yield createDataObject('collection', { "name": "I", parentID: c6.id });
var arr = Zotero.Collections.sortByLevel([c1, c3, c4, c5, c6, c8, c9].map(c => c.id));
//Zotero.debug(arr.map(id => Zotero.Collections.get(id).name));
check(arr);
// Check reverse order
arr = Zotero.Collections.sortByLevel([c1, c3, c4, c5, c6, c8, c9].reverse().map(c => c.id));
//Zotero.debug(arr.map(id => Zotero.Collections.get(id).name));
check(arr);
});
});
})