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

Fix potential error dragging to library that hasn't been loaded

Browse source 
https://forums.zotero.org/discussion/85136/unable-to-copy-items-between-libraries

Zotero.Relations.getByPredicateAndObject() is now async.
This commit is contained in:
Dan Stillman 2020-09-14 23:47:08 -04:00
parent 42e74fb8cc
commit 8fc316f727
7 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
chrome/content/zotero/import/mendeley/mendeleyImport.js
View file

@ -271,7 +271,7 @@ Zotero_Import_Mendeley.prototype._saveCollections = async function (libraryID, j
let collectionJSON = json[i]; let collectionJSON = json[i];
// Check if the collection was previously imported // Check if the collection was previously imported
let collection = this._findExistingCollection( let collection = await this._findExistingCollection(
libraryID, libraryID,
collectionJSON, collectionJSON,
collectionJSON.parentCollection ? keyMap.get(collectionJSON.parentCollection) : null collectionJSON.parentCollection ? keyMap.get(collectionJSON.parentCollection) : null
@ -305,7 +305,7 @@ Zotero_Import_Mendeley.prototype._saveCollections = async function (libraryID, j
}; };
Zotero_Import_Mendeley.prototype._findExistingCollection = function (libraryID, collectionJSON, parentCollection) { Zotero_Import_Mendeley.prototype._findExistingCollection = async function (libraryID, collectionJSON, parentCollection) {
// Don't use existing collections if the import is creating a top-level collection // Don't use existing collections if the import is creating a top-level collection
if (this.createNewCollection || !collectionJSON.relations) { if (this.createNewCollection || !collectionJSON.relations) {
return false; return false;
@ -314,7 +314,7 @@ Zotero_Import_Mendeley.prototype._findExistingCollection = function (libraryID,
var predicate = 'mendeleyDB:remoteFolderUUID'; var predicate = 'mendeleyDB:remoteFolderUUID';
var uuid = collectionJSON.relations[predicate]; var uuid = collectionJSON.relations[predicate];
var collections = Zotero.Relations.getByPredicateAndObject('collection', predicate, uuid) var collections = await Zotero.Relations.getByPredicateAndObject('collection', predicate, uuid)
.filter((c) => { .filter((c) => {
if (c.libraryID != libraryID) { if (c.libraryID != libraryID) {
return false; return false;
@ -829,7 +829,7 @@ Zotero_Import_Mendeley.prototype._saveItems = async function (libraryID, json) {
let itemJSON = json[i]; let itemJSON = json[i];
// Check if the item has been previously imported // Check if the item has been previously imported
let item = this._findExistingItem(libraryID, itemJSON, lastExistingParentItem); let item = await this._findExistingItem(libraryID, itemJSON, lastExistingParentItem);
if (item) { if (item) {
if (item.isRegularItem()) { if (item.isRegularItem()) {
lastExistingParentItem = item; lastExistingParentItem = item;
@ -872,7 +872,7 @@ Zotero_Import_Mendeley.prototype._saveItems = async function (libraryID, json) {
}; };
Zotero_Import_Mendeley.prototype._findExistingItem = function (libraryID, itemJSON, existingParentItem) { Zotero_Import_Mendeley.prototype._findExistingItem = async function (libraryID, itemJSON, existingParentItem) {
var predicate; var predicate;
// //
@ -936,7 +936,7 @@ Zotero_Import_Mendeley.prototype._findExistingItem = function (libraryID, itemJS
var existingItem; var existingItem;
predicate = 'mendeleyDB:documentUUID'; predicate = 'mendeleyDB:documentUUID';
if (itemJSON.relations[predicate]) { if (itemJSON.relations[predicate]) {
existingItem = this._getItemByRelation( existingItem = await this._getItemByRelation(
libraryID, libraryID,
predicate, predicate,
itemJSON.relations[predicate] itemJSON.relations[predicate]
@ -945,7 +945,7 @@ Zotero_Import_Mendeley.prototype._findExistingItem = function (libraryID, itemJS
if (!existingItem) { if (!existingItem) {
predicate = 'mendeleyDB:remoteDocumentUUID'; predicate = 'mendeleyDB:remoteDocumentUUID';
if (itemJSON.relations[predicate]) { if (itemJSON.relations[predicate]) {
existingItem = this._getItemByRelation( existingItem = await this._getItemByRelation(
libraryID, libraryID,
predicate, predicate,
itemJSON.relations[predicate] itemJSON.relations[predicate]
@ -962,8 +962,8 @@ Zotero_Import_Mendeley.prototype._findExistingItem = function (libraryID, itemJS
} }
Zotero_Import_Mendeley.prototype._getItemByRelation = function (libraryID, predicate, object) { Zotero_Import_Mendeley.prototype._getItemByRelation = async function (libraryID, predicate, object) {
var items = Zotero.Relations.getByPredicateAndObject('item', predicate, object) var items = await Zotero.Relations.getByPredicateAndObject('item', predicate, object)
.filter(item => item.libraryID == libraryID && !item.deleted); .filter(item => item.libraryID == libraryID && !item.deleted);
if (!items.length) { if (!items.length) {
return false; return false;

2
chrome/content/zotero/xpcom/data/dataObject.js
View file

@ -495,7 +495,7 @@ Zotero.DataObject.prototype._getLinkedObject = Zotero.Promise.coroutine(function
// Then try relations with this as an object // Then try relations with this as an object
if (bidirectional) { if (bidirectional) {
var thisURI = Zotero.URI['get' + this._ObjectType + 'URI'](this); var thisURI = Zotero.URI['get' + this._ObjectType + 'URI'](this);
var objects = Zotero.Relations.getByPredicateAndObject( let objects = yield Zotero.Relations.getByPredicateAndObject(
this._objectType, predicate, thisURI this._objectType, predicate, thisURI
); );
for (let i = 0; i < objects.length; i++) { for (let i = 0; i < objects.length; i++) {

4
chrome/content/zotero/xpcom/data/dataObjects.js
View file

@ -617,7 +617,7 @@ Zotero.DataObjects.prototype._loadRelations = Zotero.Promise.coroutine(function*
let objectURI = getURI(this); let objectURI = getURI(this);
// Related items are bidirectional, so include any pointing to this object // Related items are bidirectional, so include any pointing to this object
let objects = Zotero.Relations.getByPredicateAndObject( let objects = yield Zotero.Relations.getByPredicateAndObject(
Zotero.Relations.relatedItemPredicate, objectURI Zotero.Relations.relatedItemPredicate, objectURI
); );
for (let i = 0; i < objects.length; i++) { for (let i = 0; i < objects.length; i++) {
@ -625,7 +625,7 @@ Zotero.DataObjects.prototype._loadRelations = Zotero.Promise.coroutine(function*
} }
// Also include any owl:sameAs relations pointing to this object // Also include any owl:sameAs relations pointing to this object
objects = Zotero.Relations.getByPredicateAndObject( objects = yield Zotero.Relations.getByPredicateAndObject(
Zotero.Relations.linkedObjectPredicate, objectURI Zotero.Relations.linkedObjectPredicate, objectURI
); );
for (let i = 0; i < objects.length; i++) { for (let i = 0; i < objects.length; i++) {

6
chrome/content/zotero/xpcom/data/item.js
View file

@ -1517,7 +1517,7 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
// If undeleting, remove any merge-tracking relations // If undeleting, remove any merge-tracking relations
let predicate = Zotero.Relations.replacedItemPredicate; let predicate = Zotero.Relations.replacedItemPredicate;
let thisURI = Zotero.URI.getItemURI(this); let thisURI = Zotero.URI.getItemURI(this);
let mergeItems = Zotero.Relations.getByPredicateAndObject( let mergeItems = yield Zotero.Relations.getByPredicateAndObject(
'item', predicate, thisURI 'item', predicate, thisURI
); );
for (let mergeItem of mergeItems) { for (let mergeItem of mergeItems) {
@ -4172,12 +4172,12 @@ Zotero.Item.prototype._eraseData = Zotero.Promise.coroutine(function* (env) {
} }
// Remove related-item relations pointing to this item // Remove related-item relations pointing to this item
var relatedItems = Zotero.Relations.getByPredicateAndObject( var relatedItems = yield Zotero.Relations.getByPredicateAndObject(
'item', Zotero.Relations.relatedItemPredicate, Zotero.URI.getItemURI(this) 'item', Zotero.Relations.relatedItemPredicate, Zotero.URI.getItemURI(this)
); );
for (let relatedItem of relatedItems) { for (let relatedItem of relatedItems) {
relatedItem.removeRelatedItem(this); relatedItem.removeRelatedItem(this);
relatedItem.save({ yield relatedItem.save({
skipDateModifiedUpdate: true, skipDateModifiedUpdate: true,
skipEditCheck: env.options.skipEditCheck skipEditCheck: env.options.skipEditCheck
}); });

6
chrome/content/zotero/xpcom/data/relations.js
View file

@ -121,9 +121,9 @@ Zotero.Relations = new function () {
* @param {String} objectType - Type of relation to search for (e.g., 'item') * @param {String} objectType - Type of relation to search for (e.g., 'item')
* @param {String} predicate * @param {String} predicate
* @param {String} object * @param {String} object
* @return {Zotero.DataObject[]} * @return {Promise<Zotero.DataObject[]>}
*/ */
this.getByPredicateAndObject = function (objectType, predicate, object) { this.getByPredicateAndObject = async function (objectType, predicate, object) {
var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType); var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType);
if (predicate) { if (predicate) {
predicate = this._getPrefixAndValue(predicate).join(':'); predicate = this._getPrefixAndValue(predicate).join(':');
@ -135,7 +135,7 @@ Zotero.Relations = new function () {
if (!o || !o[predicateID] || !o[predicateID][object]) { if (!o || !o[predicateID] || !o[predicateID][object]) {
return []; return [];
} }
return objectsClass.get(Array.from(o[predicateID][object].values())); return objectsClass.getAsync(Array.from(o[predicateID][object].values()));
}; };

2
chrome/content/zotero/xpcom/integration.js
View file

@ -2307,7 +2307,7 @@ Zotero.Integration.URIMap.prototype.getZoteroItemForURIs = Zotero.Promise.corout
} catch(e) {} } catch(e) {}
// Try merged item mapping // Try merged item mapping
var replacer = Zotero.Relations.getByPredicateAndObject( var replacer = yield Zotero.Relations.getByPredicateAndObject(
'item', Zotero.Relations.replacedItemPredicate, uri 'item', Zotero.Relations.replacedItemPredicate, uri
); );
if (replacer.length && !replacer[0].deleted) { if (replacer.length && !replacer[0].deleted) {

6
test/tests/relationsTest.js
View file

@ -2,7 +2,7 @@
describe("Zotero.Relations", function () { describe("Zotero.Relations", function () {
describe("#getByPredicateAndObject()", function () { describe("#getByPredicateAndObject()", function () {
it("should return items matching predicate and object", function* () { it("should return items matching predicate and object", async function () {
var item = createUnsavedDataObject('item'); var item = createUnsavedDataObject('item');
item.setRelations({ item.setRelations({
"dc:relation": [ "dc:relation": [
@ -13,8 +13,8 @@ describe("Zotero.Relations", function () {
"http://zotero.org/groups/1/items/GSMRRSSM" "http://zotero.org/groups/1/items/GSMRRSSM"
] ]
}) })
yield item.saveTx(); await item.saveTx();
var objects = Zotero.Relations.getByPredicateAndObject( var objects = await Zotero.Relations.getByPredicateAndObject(
'item', 'owl:sameAs', 'http://zotero.org/groups/1/items/SRRMGSRM' 'item', 'owl:sameAs', 'http://zotero.org/groups/1/items/SRRMGSRM'
); );
assert.lengthOf(objects, 1); assert.lengthOf(objects, 1);