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

Collection tree selection fixes

Browse source 
Fixes various logic around what gets selected when collections and
searches are moved to or restored from the trash (which has never been
exposed) or when they're erased
This commit is contained in:
Dan Stillman 2023-08-11 04:01:28 -04:00
parent c4eb9df716
commit 9dd182e9ca
3 changed files with 108 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

61
test/tests/collectionTreeTest.js
View file

@ -280,6 +280,67 @@ describe("Zotero.CollectionTree", function() {
assert.equal(selected, id);
});
describe(".deleted selection", function () {
for (let objectType of ['collection', 'search']) {
it(`should select next row when ${objectType} is moved to trash`, async function () {
var ran = Zotero.Utilities.randomString();
var o1 = await createDataObject(objectType, { name: ran + "AAA" });
var o2 = await createDataObject(objectType, { name: ran + "BBB" });
var o3 = await createDataObject(objectType, { name: ran + "CCC" });
await cv.selectByID(o2.treeViewID);
o2.deleted = true;
await o2.saveTx();
assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
});
it(`should maintain selection on ${objectType} when row above is moved to trash`, async function () {
var ran = Zotero.Utilities.randomString();
var o1 = await createDataObject(objectType, { name: ran + "AAA" });
var o2 = await createDataObject(objectType, { name: ran + "BBB" });
var o3 = await createDataObject(objectType, { name: ran + "CCC" });
assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
o1.deleted = true;
await o1.saveTx();
assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
});
it(`should maintain selection on trash when ${objectType} is restored`, async function () {
var o = await createDataObject(objectType, { deleted: true });
await cv.selectByID("T1");
o.deleted = false;
await o.saveTx();
assert.isTrue(zp.getCollectionTreeRow().isTrash());
// Row should have been added back
assert.isAbove(cv.getRowIndexByID(o.treeViewID), 0);
});
}
});
for (let objectType of ['collection', 'search']) {
it(`should select next row when ${objectType} is erased`, async function () {
var ran = Zotero.Utilities.randomString();
var o1 = await createDataObject(objectType, { name: ran + "AAA" });
var o2 = await createDataObject(objectType, { name: ran + "BBB" });
var o3 = await createDataObject(objectType, { name: ran + "CCC" });
await cv.selectByID(o2.treeViewID);
await o2.eraseTx();
assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
});
}
it("should update the editability of the current view", function* () {
var group = yield createGroup({
editable: false,