Skip to content
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

Libraries to collections #5080

Merged
merged 15 commits into from
Dec 20, 2017
Merged

Libraries to collections #5080

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d42eef9
convert to arrow functions, eliminate self and that
martenson Nov 16, 2017
e8e12a6
remove styles for the removed old library interface
martenson Nov 21, 2017
96565e9
wip on importing from library to history as a collection
martenson Nov 27, 2017
88d9c66
implement support for paired and list:paired collections
martenson Dec 11, 2017
e344de3
finish the list:paired modal invocation
martenson Dec 18, 2017
2f90fd8
re enable and enhance the collection validator
martenson Dec 18, 2017
2dfdbb6
refactor modal to bind closing event at different time
martenson Dec 18, 2017
e4d0788
Improvements to library testing.
jmchilton Dec 18, 2017
d0a9d66
hide source items by default in all library-collection creators
martenson Dec 18, 2017
d806cf7
Merge pull request #26 from jmchilton/lib-to-colllection
martenson Dec 19, 2017
fb256b7
fix the modal backdrop listener to respect the config
martenson Dec 19, 2017
498de3e
fix the selenium test that expects the class to be here
martenson Dec 19, 2017
00e31c1
Fix more selenium library tests.
jmchilton Dec 20, 2017
9dda0ed
Merge remote-tracking branch 'jmchilton/dev' into lib-to-colllection
jmchilton Dec 20, 2017
9a14f7c
Rebuild client.
jmchilton Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/galaxy/scripts/galaxy.library.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ var GalaxyLibrary = Backbone.View.extend({
mod_toastr.info("You must select at least one dataset to download");
Galaxy.libraries.library_router.navigate(`folders/${folder_id}`, { trigger: true, replace: true });
} else {
Galaxy.libraries.folderToolbarView.download(folder_id, format);
Galaxy.libraries.folderToolbarView.download(format);
Galaxy.libraries.library_router.navigate(`folders/${folder_id}`, { trigger: false, replace: true });
}
});
Expand Down
6 changes: 3 additions & 3 deletions client/galaxy/scripts/mvc/collection/list-collection-creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ var ListCollectionCreator = Backbone.View.extend(BASE_MVC.LoggableMixin)

/** describe what is wrong with a particular element if anything */
_isElementInvalid: function(element) {
if (element.history_content_type !== "dataset") {
return _l("is not a dataset");
}
// if (element.history_content_type !== "dataset") {
// return _l("is not a dataset");
// }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha! That was simple it seems - very nice!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I improved that so it respects data coming from datalibrary

var validState = element.state === STATES.OK || _.contains(STATES.NOT_READY_STATES, element.state);
if (!validState) {
return _l("has errored, is paused, or is not accessible");
Expand Down
5 changes: 3 additions & 2 deletions client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1796,7 +1796,8 @@ var pairedCollectionCreatorModal = function _pairedCollectionCreatorModal(datase
oncreate: function(creator, response) {
Galaxy.modal.hide();
deferred.resolve(response);
}
},
title: _l("Create a collection of paired datasets")
});

if (!window.Galaxy || !Galaxy.modal) {
Expand All @@ -1805,7 +1806,7 @@ var pairedCollectionCreatorModal = function _pairedCollectionCreatorModal(datase

creator = new PairedCollectionCreator(options);
Galaxy.modal.show({
title: _l("Create a collection of paired datasets"),
title: options.title,
body: creator.$el,
width: "80%",
height: "800px",
Expand Down
Loading