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

apply quickSearch filter to trashed collections

Browse source 
Fixes: #4686
This commit is contained in:
Bogdan Abaev 2024-09-13 10:25:34 -07:00
parent 8de36726a0
commit 32ba7a551a
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/itemTree.jsx
View file

@ -229,7 +229,7 @@ var ItemTree = class ItemTree extends LibraryTree {
// So that they are displayed among deleted items
newSearchItems = newSearchItems
.concat(await this.collectionTreeRow.getTrashedCollections())
.concat(await Zotero.Searches.getDeleted(this.collectionTreeRow.ref.libraryID));
.concat(await this.collectionTreeRow.getTrashedSearches());
}
// TEMP: Hide annotations
newSearchItems = newSearchItems.filter(item => !item.isAnnotation());

11
chrome/content/zotero/xpcom/collectionTreeRow.js
View file

@ -271,6 +271,7 @@ Zotero.CollectionTreeRow.prototype.getChildren = function () {
// Returns the list of deleted collections in the trash.
// Subcollections of deleted collections are filtered out.
// Accounts for case-insensitive quickSearch.
Zotero.CollectionTreeRow.prototype.getTrashedCollections = async function () {
if (!this.isTrash()) {
return [];
@ -281,7 +282,15 @@ Zotero.CollectionTreeRow.prototype.getTrashedCollections = async function () {
for (let d of deleted) {
deletedParents.add(d.key);
}
return deleted.filter(d => !d.parentKey || !deletedParents.has(d.parentKey));
return deleted.filter(d => d.getDisplayTitle().toLowerCase().includes(this.searchText.toLowerCase())
&& (!d.parentKey || !deletedParents.has(d.parentKey)));
};
// Returns the list of deleted searches in the trash.
// Accounts for case-insensitive quickSearch.
Zotero.CollectionTreeRow.prototype.getTrashedSearches = async function () {
let deleted = await Zotero.Searches.getDeleted(this.ref.libraryID);
return deleted.filter(d => d.getDisplayTitle().toLowerCase().includes(this.searchText.toLowerCase()));
};

25
test/tests/itemTreeTest.js
View file

@ -826,10 +826,11 @@ describe("Zotero.ItemTree", function() {
})
for (let objectType of ['collection', 'search']) {
it(`should remove ${objectType} from trash on delete`, async function (){
// eslint-disable-next-line no-loop-func
it(`should remove ${objectType} from trash on delete`, async function () {
var o1 = await createDataObject(objectType, { deleted: true });
var o2 = await createDataObject(objectType, { deleted: true });
var o3 = await createDataObject(objectType, { deleted: true });
var o2 = await createDataObject(objectType, { deleted: true });
var o3 = await createDataObject(objectType, { deleted: true });
// Go to trash
await selectTrash(win);
@ -842,7 +843,23 @@ describe("Zotero.ItemTree", function() {
assert.isFalse(zp.itemsView.getRowIndexByID(o1.treeViewID));
assert.isFalse(zp.itemsView.getRowIndexByID(o2.treeViewID));
assert.isFalse(zp.itemsView.getRowIndexByID(o3.treeViewID));
})
});
// eslint-disable-next-line no-loop-func
it(`should apply quicksearch filter to deleted ${objectType} in trash`, async function () {
var matched = await createDataObject(objectType, { deleted: true });
var excluded = await createDataObject(objectType, { deleted: true });
await selectTrash(win);
let quickSearch = win.document.getElementById('zotero-tb-search-textbox');
quickSearch.value = matched.getDisplayTitle();
quickSearch.doCommand();
await itemsView._refreshPromise;
assert.isNumber(itemsView.getRowIndexByID(matched.treeViewID));
assert.isFalse(itemsView.getRowIndexByID(excluded.treeViewID));
});
}
});