cbbff600a6
- Just a single huge commit. This has been developed over too long a
time, required many tiny changes across too many files and has seen too
many iterations to be separated into separate commits.
The original branch with all the messy commits will be kept around for
posterity
bb220ad0f2...adomasven:feature/react-item-tree
- Replaces XUL <tree> element across the whole zotero client codebase
with a custom supermegafast virtualized-table inspired by
react-virtualized yet mimicking old XUL treeview API. The
virtualized-table sits on top on a raw-to-the-metal,
interpreted-at-runtime JS based windowing solution inspired by
react-window. React-based solutions could not be used because they were
slow and Zotero UI needs to be responsive and be able to
display thousands of rows in a treeview without any slowdowns.
- Attempts were made at making this screen-reader friendly, but yet to
be tested with something like JAWS
- RTL-friendly
- Styling and behaviour across all platforms was copied as closely as
possible to the original XUL tree
- Instead of row-based scroll snapping this has smooth-scrolling. If
you're using arrow keys to browse through the tree then it effectively
snap-scrolls. Current CSS snap scroll attributes do not seem to work in
the way we would require even on up-to-date browsers, yet alone the ESR
version of FX that Zotero is on. JS solutions are either terrible for
performance or produce inexcusable jitter.
- When dragging-and-dropping items the initial drag freezes the UI for
a fairly jarring amount of time. Does not seem to be fixable due to
the synchronous code that needs to be run in the dragstart handler.
Used to be possible to run that code async with the XUL tree.
- Item tree column picker no longer has a dedicated button. Just
right-click the columns. The column preferences (width, order, etc) are
no longer handled by XUL, which required a custom serialization and
storage solution that throws warnings in the developer console due to
the amount of data being stored. Might cause temporary freezing on HDDs
upon column resize/reorder/visibility toggling.
- Context menu handling code basically unchanged, but any UI changes
that plugins may have wanted to do (including adding new columns) will
have to be redone by them. No serious thought has gone into how plugin
developers would achieve that yet.
- Opens up the possibility for awesome alternative ways to render the
tree items, including things like multiple-row view for the item tree,
which has been requested for a long while especially by users switching
from other referencing software
98 lines
2.8 KiB
JavaScript
98 lines
2.8 KiB
JavaScript
"use strict";
|
|
|
|
describe("Duplicate Items", function () {
|
|
var win, zp, cv;
|
|
|
|
before(function* () {
|
|
yield resetDB({
|
|
thisArg: this,
|
|
skipBundledFiles: true
|
|
});
|
|
|
|
Zotero.Prefs.clear('duplicateLibraries');
|
|
win = yield loadZoteroPane();
|
|
zp = win.ZoteroPane;
|
|
cv = zp.collectionsView;
|
|
});
|
|
beforeEach(function* () {
|
|
return selectLibrary(win);
|
|
})
|
|
after(function () {
|
|
win.close();
|
|
});
|
|
|
|
describe("Merging", function () {
|
|
it("should merge two items in duplicates view", function* () {
|
|
var item1 = yield createDataObject('item', { setTitle: true });
|
|
var item2 = item1.clone();
|
|
yield item2.saveTx();
|
|
var uri2 = Zotero.URI.getItemURI(item2);
|
|
|
|
var userLibraryID = Zotero.Libraries.userLibraryID;
|
|
|
|
var selected = yield cv.selectByID('D' + userLibraryID);
|
|
assert.ok(selected);
|
|
yield waitForItemsLoad(win);
|
|
|
|
// Select the first item, which should select both
|
|
var iv = zp.itemsView;
|
|
var row = iv.getRowIndexByID(item1.id);
|
|
assert.isNumber(row);
|
|
var promise = iv.waitForSelect();
|
|
clickOnItemsRow(win, iv, row);
|
|
assert.equal(iv.selection.count, 2);
|
|
yield promise;
|
|
|
|
// Click merge button
|
|
var button = win.document.getElementById('zotero-duplicates-merge-button');
|
|
button.click();
|
|
|
|
yield waitForNotifierEvent('refresh', 'trash');
|
|
|
|
// Items should be gone
|
|
assert.isFalse(iv.getRowIndexByID(item1.id));
|
|
assert.isFalse(iv.getRowIndexByID(item2.id));
|
|
assert.isTrue(item2.deleted);
|
|
var rels = item1.getRelations();
|
|
var pred = Zotero.Relations.replacedItemPredicate;
|
|
assert.property(rels, pred);
|
|
assert.equal(rels[pred], uri2);
|
|
});
|
|
|
|
it("should combine collections from all items", function* () {
|
|
var collection1 = yield createDataObject('collection');
|
|
var collection2 = yield createDataObject('collection');
|
|
|
|
var item1 = yield createDataObject('item', { setTitle: true, collections: [collection1.id] });
|
|
var item2 = item1.clone();
|
|
item2.setCollections([collection2.id]);
|
|
yield item2.saveTx();
|
|
|
|
var userLibraryID = Zotero.Libraries.userLibraryID;
|
|
|
|
var selected = yield cv.selectByID('D' + userLibraryID);
|
|
assert.ok(selected);
|
|
yield waitForItemsLoad(win);
|
|
|
|
// Select the first item, which should select both
|
|
var iv = zp.itemsView;
|
|
var row = iv.getRowIndexByID(item1.id);
|
|
var promise = iv.waitForSelect();
|
|
clickOnItemsRow(win, iv, row);
|
|
yield promise;
|
|
|
|
// Click merge button
|
|
var button = win.document.getElementById('zotero-duplicates-merge-button');
|
|
button.click();
|
|
|
|
yield waitForNotifierEvent('refresh', 'trash');
|
|
|
|
// Items should be gone
|
|
assert.isFalse(iv.getRowIndexByID(item1.id));
|
|
assert.isFalse(iv.getRowIndexByID(item2.id));
|
|
assert.isTrue(item2.deleted);
|
|
assert.isTrue(collection1.hasItem(item1.id));
|
|
assert.isTrue(collection2.hasItem(item1.id));
|
|
});
|
|
});
|
|
});
|