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

Fix Import Wizard navigates to the incorrect page. Fix #4300

Browse source 
"Continue" button is now disabled until all checks are completed.
This commit is contained in:
Tom Najdek 2024-07-01 12:54:56 +02:00
parent 76caebdd8a
commit 390b65f2ab
No known key found for this signature in database
GPG key ID: EEC61A7B4C667D77
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
chrome/content/zotero/import/importWizard.js
View file

@ -62,20 +62,14 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
async init() { async init() {
const { mendeleyCode, libraryID, pageID, relinkOnly } = window.arguments[0].wrappedJSObject ?? {}; const { mendeleyCode, libraryID, pageID, relinkOnly } = window.arguments[0].wrappedJSObject ?? {};
this.libraryID = libraryID; this.libraryID = libraryID;
const predicateID = Zotero.RelationPredicates.getID('mendeleyDB:documentUUID');
if (predicateID) {
const relSQL = 'SELECT ROWID FROM itemRelations WHERE predicateID = ? LIMIT 1';
this.mendeleyHasPreviouslyImported = !!(await Zotero.DB.valueQueryAsync(relSQL, predicateID));
}
const extensions = await Zotero.getInstalledExtensions();
this.isZotfileInstalled = !!extensions.find(extName => extName.match(/^ZotFile((?!disabled).)*$/));
this.mendeleyImporterVersion = parseInt((await Zotero.DB.valueQueryAsync("SELECT value FROM settings WHERE setting='mendeleyImport' AND key='version'")) || 0);
this.wizard = document.getElementById('import-wizard'); this.wizard = document.getElementById('import-wizard');
// disable "continue" button until everything is ready
this.wizard.canAdvance = false;
// install event handlers
this.wizard.getPageById('page-start') this.wizard.getPageById('page-start')
.addEventListener('pageadvanced', this.onImportSourceAdvance.bind(this)); .addEventListener('pageadvanced', this.onImportSourceAdvance.bind(this));
this.wizard.getPageById('page-mendeley-online-intro') this.wizard.getPageById('page-mendeley-online-intro')
@ -118,18 +112,32 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
this.wizard.addEventListener('pageshow', this.updateFocus.bind(this)); this.wizard.addEventListener('pageshow', this.updateFocus.bind(this));
this.wizard.addEventListener('wizardcancel', this.onCancel.bind(this)); this.wizard.addEventListener('wizardcancel', this.onCancel.bind(this));
const shouldCreateCollection = await this.getShouldCreateCollection();
document.getElementById('create-collection').checked = shouldCreateCollection;
// wizard.shadowRoot content isn't exposed to our css // wizard.shadowRoot content isn't exposed to our css
this.wizard.shadowRoot this.wizard.shadowRoot
.querySelector('.wizard-header-label').style.fontSize = '16px'; .querySelector('.wizard-header-label').style.fontSize = '16px';
// Run async checks. This should be near instantaneous in most cases (unless the DB is busy). See #4300
const predicateID = Zotero.RelationPredicates.getID('mendeleyDB:documentUUID');
if (predicateID) {
const relSQL = 'SELECT ROWID FROM itemRelations WHERE predicateID = ? LIMIT 1';
this.mendeleyHasPreviouslyImported = !!(await Zotero.DB.valueQueryAsync(relSQL, predicateID));
}
const extensions = await Zotero.getInstalledExtensions();
this.isZotfileInstalled = !!extensions.find(extName => extName.match(/^ZotFile((?!disabled).)*$/));
this.mendeleyImporterVersion = parseInt((await Zotero.DB.valueQueryAsync("SELECT value FROM settings WHERE setting='mendeleyImport' AND key='version'")) || 0);
const shouldCreateCollection = await this.getShouldCreateCollection();
document.getElementById('create-collection').checked = shouldCreateCollection;
if (relinkOnly) { if (relinkOnly) {
document.getElementById('relink-only-checkbox').checked = true; document.getElementById('relink-only-checkbox').checked = true;
this.onRelinkOnlyChange(); this.onRelinkOnlyChange();
} }
// Re-enable "continue" button, now that everything is ready
this.wizard.canAdvance = true;
if (pageID) { if (pageID) {
this.wizard.goTo(pageID); this.wizard.goTo(pageID);
} }