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

Fix connector save timing out with Advanced Search

Browse source 
Report: https://forums.zotero.org/discussion/127760/connector-conflict-with-advanced-search

Also restore Advanced Search tests that depend on the item tree. They
were disabled due to React timing issues. Hopefully with these changes
the initialization of the tree is more robust.
This commit is contained in:
Adomas Venčkauskas 2025-10-31 12:27:52 +02:00 • committed by Adomas Ven
parent 2d6deda04a
commit 49130c71d8
4 changed files with 47 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/advancedSearch.js
View file

@ -35,6 +35,7 @@ var ZoteroAdvancedSearch = new function () {
this.onItemActivate = onItemActivate;
this.itemsView = false;
this._loadedDeferred = Zotero.Promise.defer();
var _searchBox;
var _libraryID;
@ -69,7 +70,7 @@ var ZoteroAdvancedSearch = new function () {
columns,
});
this.itemsView.changeCollectionTreeRow({
await this.itemsView.changeCollectionTreeRow({
ref: _searchBox.search,
visibilityGroup: 'default',
isSearchMode: () => true,
@ -89,6 +90,7 @@ var ZoteroAdvancedSearch = new function () {
// Focus the first field in the window
Services.focus.moveFocus(window, null, Services.focus.MOVEFOCUS_FORWARD, 0);
this._loadedDeferred.resolve();
}
this.onUnload = function () {

2
chrome/content/zotero/libraryTree.js
View file

@ -200,8 +200,8 @@ var LibraryTree = class LibraryTree extends React.Component {
try {
await Zotero.Promise.resolve(this.props.onSelectionChange(this.selection));
} catch (e) {}
this.runListeners('select');
}
this.runListeners('select');
}
_onSelectionChangeDebounced = Zotero.Utilities.debounce(this._onSelectionChange, 100)

14
test/tests/advancedSearchTest.js
View file

@ -16,18 +16,13 @@ describe("Advanced Search", function () {
win.close();
});
// TEMP: React timing issue - figure this out
it.skip("should perform a search", function* () {
it("should perform a search", function* () {
var item = yield createDataObject('item', { setTitle: true });
var promise = waitForWindow('chrome://zotero/content/advancedSearch.xhtml', async (win) => {
// Wait for the itemsView to be initialized in the onload listener of the window
while (!win.ZoteroAdvancedSearch.itemsView) {
await Zotero.Promise.delay(5);
}
});
var promise = waitForWindow('chrome://zotero/content/advancedSearch.xhtml');
zp.openAdvancedSearchWindow();
var searchWin = yield promise;
yield searchWin.ZoteroAdvancedSearch._loadedDeferred.promise;
// Add condition
var searchBox = searchWin.document.getElementById('zotero-search-box');
@ -37,9 +32,10 @@ describe("Advanced Search", function () {
// Run search and wait for results
var o = searchWin.ZoteroAdvancedSearch;
yield o.search();
var iv = o.itemsView;
yield iv.waitForLoad();
yield o.search();
yield iv.waitForLoad();
// Check results
assert.equal(iv.rowCount, 1);

38
test/tests/itemTreeTest.js
View file

@ -1864,4 +1864,42 @@ describe("Zotero.ItemTree", function () {
assert.include(text, toplevelItemTwo.getDisplayTitle());
});
});
describe('Advanced Search', function () {
describe('#notify', function () {
it('should resolve the returned promise when an item is selected', async function() {
var item = await createDataObject('item', { setTitle: true });
var promise = waitForWindow('chrome://zotero/content/advancedSearch.xhtml');
zp.openAdvancedSearchWindow();
var searchWin = await promise;
await searchWin.ZoteroAdvancedSearch._loadedDeferred.promise;
// Add condition
var searchBox = searchWin.document.getElementById('zotero-search-box');
var s = new Zotero.Search();
s.addCondition('title', 'is', item.getField('title'))
searchBox.search = s;
// Run search and wait for results
var o = searchWin.ZoteroAdvancedSearch;
var iv = o.itemsView;
await iv.waitForLoad();
await o.search();
await iv.waitForLoad();
// Check results
assert.equal(iv.rowCount, 1);
// Make sure an item is selected (otherwise notify resolves fine)
await iv.selectItem(item.id);
assert.equal(iv.selection.count, 1);
let notifySpy = sinon.spy(iv, 'notify');
await createDataObject('item');
assert.isTrue(notifySpy.calledOnce);
await notifySpy.returnValues[0];
notifySpy.restore();
});
});
});
})