New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Order items in list via drag an drop #399

Open

inukshuk wants to merge 31 commits into main from feature/order_items

Member

inukshuk commented Sep 17, 2019 •

edited by earlyriser

Adjust item iterable drop target to show sort indicators above/below
Enable only in lists when the position column is active
Handle drop to re-order cached copy (if needed)
Handle drop and dispatch command
Implement command
Actually sort by 'position' (not just 'added')
Migration to populate position in list_items (currently unused) based on order by added
Manage position on insert into list (and remove?)

inukshuk commented

View reviewed changes

src/components/item/iterable.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/components/item/grid.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/components/item/iterable.js Show resolved Hide resolved

earlyriser force-pushed the feature/order_items branch from 3b674c8 to c960ffe Compare

September 20, 2019 16:44

inukshuk commented

View reviewed changes

src/components/item/grid.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/components/item/table.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/browser/tropy.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/components/item/iterator.js

@@ @@ -324,6 +369,42 @@ class ItemIterator extends Iterator { @@
                 }
               }
+              const DropTargetSpec = {
+                drop({ list, onItemImport }, monitor) {

Member Author

inukshuk Sep 24, 2019

Careful! Both drop and canDrop have changed since you copied them -- please use the latest version here or we're losing support for dropping URLs.

Contributor

earlyriser Sep 24, 2019

Here I copied what was on project view: returning true as default.

Member Author

inukshuk Sep 25, 2019

Please take a look at the original drop and canDrop which this PR removes (it changed after you copied it here when you rebased the branch): we need those here, otherwise this PR will revert the import URL functionality.

Contributor

earlyriser Oct 4, 2019

done
I brought the changes from ProjectView done on 019f4e2 to the drop & canDrop methods

Member Author

inukshuk Nov 18, 2019

There were more changes than just this one commit. You need to compare the branches: what this PR removes from project view needs to be identical to what is now in the item iterator

Member Author

inukshuk Nov 18, 2019

You're removing this code:

You're adding this code:

inukshuk commented

View reviewed changes

src/components/item/iterator.js

+                return {
+                  dt: connect.dropTarget(),
+                  isOverFile: isOver && type === NativeTypes.FILE,

Member Author

inukshuk Sep 24, 2019

isOverFile should also be true for dragging URLs

Contributor

earlyriser Sep 24, 2019

done

inukshuk commented

View reviewed changes

src/components/item/iterator.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/components/item/iterator.js Outdated Show resolved Hide resolved

inukshuk commented

View reviewed changes

src/components/item/iterator.js Outdated Show resolved Hide resolved

inukshuk force-pushed the feature/order_items branch 2 times, most recently from 1ce7e38 to 9d13346 Compare

November 20, 2019 09:47

flachware and others added 16 commits

November 20, 2019 14:12


          Add sort-indicator styles for item-table and item-grid.

40ed36f


          Switch containment on tiles and item-table items temporarily.

d18db80


          Adds sorting UI to item iterable

0859e46


          Removes drop hint from item iterable when sorting UI is visible

8b09096


          Adds dragging class to item grid component when an item is being dr…

edb9d06

…agged


          Restrict less restrictive containment to dragging state.

fff1dc4


          Adds boolean isItemSortable

f700ff1


          Moves isITemSortable to the iterator and removes the query condition

85f42e3


          Fixes location of noop require

606994a


          Fixes naming convention

04f68ab


          Use less restrictive containment for all tiles whenever a parent elem…

acb4810

…ent has the 'dragging' class.


          Use 'over-file' class for file drop targets in item-table and item-grid.

a4d5395


          Expect the 'over' class to be set on 'table-body'.

f48e1a5


          Moves grid's isDragging logic with iterator's logic, so table can als…

d5c4dca

…o benefit from it.


          Makes ItemIterator a DropTarget

04a5dfa


          Makes item table/grid drop targets and they receive the over & over-f…

9bbb981

…ile classes from ItemIterator

earlyriser and others added 15 commits

November 20, 2019 14:12


          Adds item.order action and stub command

20c997d


          Attaches item.order action to the drop function in the iterable

6bd26fe


          Removes DropTarget behavior from ProjectView

ec217da


          Deletes unused requirements on ProjectView

c5cbdd2


          Refactors & clean code

5c5c717


          Prevent collision of sort-indicator and drop-target styles.

a7f961d


          Makes "over" class to appear just when an item is being dragged and n…

0e0e819

…ot a file


          Set vertical class on table-body.

fb11048


          Fix sort-indicator in over state.

5ee4ce0


          Fixes the bug that blocked the drag from Photo panel to the grid/table

fe39f48


          Adds dragging class to photo-grid and photo-list when a photo is be…

57b18d0

…ing dragged


          Brings changes made on ProjectView on a different branch ( 019f4e2 ) …

eaa5e4f

…to ItemIterator


          Deletes Item & Photo iterators isDragging init

89c3cfa


          Adding lost changes

3304a80


          Brings back hover and importing file on drop

2ba5659

earlyriser force-pushed the feature/order_items branch from 9d13346 to 2ba5659 Compare

November 20, 2019 19:13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment