scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-10 03:28:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't treat a selected saved search as a collection

Browse source 
Collections and saved searches can be selected together, so a
collection-item change called getDescendents() on rows that don't have
it and compared search IDs against collection IDs.
This commit is contained in:
Dan Stillman 2026-07-29 12:55:41 -04:00
parent c92c75eb36
commit e45871fa9d
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/collectionViewItemTree.jsx
View file

@ -632,18 +632,21 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
// 'collection-item' ids are in the form collectionID-itemID
if (type == 'collection-item') {
if (!collectionTreeRow.isCollection()) {
// Collections can be selected alongside saved searches, which have no
// subcollections of their own
let selectedCollections = collectionTreeRows.filter(row => row.isCollection());
if (!selectedCollections.length) {
return;
}
var visibleSubcollections = Zotero.Prefs.get('recursiveCollections')
? collectionTreeRows.map(row => row.ref.getDescendents(false, 'collection')).flat()
? selectedCollections.map(row => row.ref.getDescendents(false, 'collection')).flat()
: [];
var splitIDs = [];
for (let id of ids) {
let [collectionID, itemID] = id.split('-');
// Include if an item in one of the selected collections or a visible subcollection
if (collectionTreeRows.some(row => row.ref.id == collectionID)
if (selectedCollections.some(row => row.ref.id == collectionID)
|| visibleSubcollections.some(c => collectionID == c.id)) {
splitIDs.push(itemID);
}

27
test/tests/collectionViewItemTreeTest.js
View file

@ -1233,6 +1233,33 @@ describe("CollectionViewItemTree", function () {
assert.equal(quickSearch.value, "item");
});
it("should add an item to a collection when a saved search is also selected", async function () {
Zotero.Prefs.set('recursiveCollections', true);
let logError = sinon.spy(Zotero, 'logError');
try {
let collection = await createDataObject('collection');
let subcollection = await createDataObject('collection', { parentID: collection.id });
let search = await createDataObject('search');
await cv.selectByID("C" + collection.id);
await waitForItemsLoad(win);
cv.selection.toggleSelect(cv.getRowIndexByID("S" + search.id));
await zp.onCollectionSelected();
await zp.itemsView.waitForLoad();
// With recursiveCollections, an item added to a subcollection shows in
// the parent collection's view
let item = await createDataObject('item', { collections: [subcollection.id] });
assert.isNumber(zp.itemsView.getRowIndexByID(item.id));
assert.deepEqual(logError.getCalls().map(call => String(call.args[0])), []);
}
finally {
logError.restore();
Zotero.Prefs.clear('recursiveCollections');
await selectLibrary(win);
}
});
describe("Change parent item", function () {
let item1, item2, attachment1, highlight1;