Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 78df0e2cc5c1118184a64fb8ea122844cca1d402 https://github.com/galaxyproject/galaxy/commit/78df0e2cc5c1118184a64fb8ea122... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M test/api/test_dataset_collections.py M test/base/populators.py

Log Message: ----------- Refactor populators for easier nested collection creation.

Commit: d0e9a80c58d08eadafb966ce9736dd595ec2dc82 https://github.com/galaxyproject/galaxy/commit/d0e9a80c58d08eadafb966ce9736d... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M test/galaxy_selenium/components.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/galaxy_selenium/smart_components.py M test/selenium_tests/test_history_multi_view.py M test/selenium_tests/test_history_panel_collections.py

Log Message: ----------- More GUI tests for collections.

Commit: 1c3d49b07a3b790cc4b7d418415d223c05956584 https://github.com/galaxyproject/galaxy/commit/1c3d49b07a3b790cc4b7d418415d2... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-model.js

Log Message: ----------- Refactor client collections - collapse List and Paired models.

They don't have different functionality - they shouldn't be different.

Commit: adef3a6a59fcc5395350519f146e010c9409a04c https://github.com/galaxyproject/galaxy/commit/adef3a6a59fcc5395350519f146e0... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-model.js

Log Message: ----------- Refactor client collections - rename List -> Flat at lowest level models.

It represents both lists and paireds now.

Commit: e70a7748565897832e20119735f5bcd38e56a15c https://github.com/galaxyproject/galaxy/commit/e70a7748565897832e20119735f5b... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-model.js

Log Message: ----------- Refactor client collections - collapse nested paireds model into nested lists.

Commit: ba111325437473995dfd6dc5b82378d6ca8f32cd https://github.com/galaxyproject/galaxy/commit/ba111325437473995dfd6dc5b8237... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-model.js

Log Message: ----------- Refactor client collections - rename listoflists model to nested model.

Commit: a5513a4868ca5229348189d1b0ff4a4801ef0863 https://github.com/galaxyproject/galaxy/commit/a5513a4868ca5229348189d1b0ff4... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-contents.js

Log Message: ----------- Refactor client collections - eliminate class distinction between history bound nested collections.

Commit: 0c1e6e46b20222912f35380d7f45aeeb0aa75778 https://github.com/galaxyproject/galaxy/commit/0c1e6e46b20222912f35380d7f45a... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js

Log Message: ----------- Refactor client collections - eliminate class distinction between flat view edit collections.

Commit: 1535a0f01803c19d8db7f4035832ae1109bcbefe https://github.com/galaxyproject/galaxy/commit/1535a0f01803c19d8db7f4035832a... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js

Log Message: ----------- Refactor client collections - renamed list collection edit to flat.

Since it represents boths lists and paireds now.

Commit: 957ff9d0269b55a16095d3f94679d8e464df9dfc https://github.com/galaxyproject/galaxy/commit/957ff9d0269b55a16095d3f94679d... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li.js

Log Message: ----------- Refactor client collections - eliminate class distinction between flat view collections.

Commit: dd13193fc40ade2203503a926c4dd479936a91e0 https://github.com/galaxyproject/galaxy/commit/dd13193fc40ade2203503a926c4dd... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li.js

Log Message: ----------- Refactor client collections - renamed list collection to flat.

Commit: b9bd5287d08f1a7a4b252af21a20e8115f216dec https://github.com/galaxyproject/galaxy/commit/b9bd5287d08f1a7a4b252af21a20e... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li.js

Log Message: ----------- Refactor client collections - eliminate ListOfPairsCollectionView.

Just use ListOfListsCollectionView.

Commit: 897ff7e54ef6935a190de4974c7004d089477db3 https://github.com/galaxyproject/galaxy/commit/897ff7e54ef6935a190de4974c700... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js

Log Message: ----------- Refactor client collections - eliminate class distinction between nested view edit collections.

Commit: fdfa725a8b70d2182acfb3c971f34fd12bdded98 https://github.com/galaxyproject/galaxy/commit/fdfa725a8b70d2182acfb3c971f34... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js

Log Message: ----------- Refactor client collections - rename nested collection views.

Both edit and RO variants - to reflect new generality.

Commit: 5a7eea6a810c15ca7175e7de86b136b355063007 https://github.com/galaxyproject/galaxy/commit/5a7eea6a810c15ca7175e7de86b13... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js

Log Message: ----------- Refactor client collections - rename NestedPairCollectionViewEdit

... to NestedCollectionElementViewEdit since it isn't just used for paired collection contents and hasn't been for some time.

Commit: bcf0fb11e98a58224a33fabf1024b99f30262b89 https://github.com/galaxyproject/galaxy/commit/bcf0fb11e98a58224a33fabf1024b... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js

Log Message: ----------- Refactor client collections - eliminate incorrect comments.

Commit: 1afd6e136f73db6116c6126412a80c80d35d1ea0 https://github.com/galaxyproject/galaxy/commit/1afd6e136f73db6116c6126412a80... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-model.js

Log Message: ----------- Refactor client collections - eliminate Flat vs Nested dataset collection.

Just dispatch on collection type to determine collection contents.

Commit: 200cf96c2dda2ca5a353e78fcf54a3f1a024fcdc https://github.com/galaxyproject/galaxy/commit/200cf96c2dda2ca5a353e78fcf54a... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js

Log Message: ----------- Refactor client collections - eliminate FlatCollectionView & FlatCollectionViewEdit.

These just did the same thing as CollectionView and CollectionViewEdit.

Commit: 4db301a9ab36852bd066d82bfe91f182343ec5fb https://github.com/galaxyproject/galaxy/commit/4db301a9ab36852bd066d82bfe91f... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js

Log Message: ----------- Refactor client collections - eliminate NestedCollectionView and NestedCollectionViewEdit.

They are just CollectionViews now.

Commit: a3cc810e93018744607fc6120d43f71ebaa52d0e https://github.com/galaxyproject/galaxy/commit/a3cc810e93018744607fc6120d43f... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js

Log Message: ----------- Refactor client collections - eliminated another class without a distinction.

Commit: ef81006c451e6e59bf23d8c9cc1c7714fae97505 https://github.com/galaxyproject/galaxy/commit/ef81006c451e6e59bf23d8c9cc1c7... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-contents.js

Log Message: ----------- Refactor client collections - eliminate all history bound collection distinctions.

Commit: eb735357e7b7f37b9601ef21f9c71a910c019a11 https://github.com/galaxyproject/galaxy/commit/eb735357e7b7f37b9601ef21f9c71... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-view-edit.js

Log Message: ----------- Refactor client collections - eliminate unneeded subclass of CollectionView.

Commit: 4defaa2188993450e0aa044e7316121d664c89b7 https://github.com/galaxyproject/galaxy/commit/4defaa2188993450e0aa044e73161... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/history/hdca-model.js

Log Message: ----------- Reformat client.

Commit: c6bc1538be4d06aa3c7df84066ffc3e33548ab22 https://github.com/galaxyproject/galaxy/commit/c6bc1538be4d06aa3c7df84066ffc... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M test/selenium_tests/test_history_panel_collections.py

Log Message: ----------- Mark one of the new history collection tests as @flakey.

Reason noted in PR.

Commit: 307d33ada15f1afe49d784df14d9fbcaf7178db1 https://github.com/galaxyproject/galaxy/commit/307d33ada15f1afe49d784df14d9f... Author: John Chilton jmchilton@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view-edit.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-contents.js

Log Message: ----------- Repack.

Commit: 0c97e1158ea51128c9a0277aeccebb2a397a2f16 https://github.com/galaxyproject/galaxy/commit/0c97e1158ea51128c9a0277aecceb... Author: Martin Cech marten@bx.psu.edu Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-contents.js M static/scripts/bundled/analysis.bundled.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view-edit.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-contents.js M test/api/test_dataset_collections.py M test/base/populators.py M test/galaxy_selenium/components.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/galaxy_selenium/smart_components.py M test/selenium_tests/test_history_multi_view.py M test/selenium_tests/test_history_panel_collections.py

Log Message: ----------- Merge pull request #5038 from jmchilton/unwind_collection_client

Render arbitrarily nested lists in the UI

Compare: https://github.com/galaxyproject/galaxy/compare/5e17e44db533...0c97e1158ea5