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

Render arbitrarily nested lists in the UI #5038

Merged
merged 25 commits into from Nov 30, 2017
Merged

Render arbitrarily nested lists in the UI #5038

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
78df0e2
Refactor populators for easier nested collection creation.
jmchilton Nov 16, 2017
d0e9a80
More GUI tests for collections.
jmchilton Nov 16, 2017
1c3d49b
Refactor client collections - collapse List and Paired models.
jmchilton Nov 16, 2017
adef3a6
Refactor client collections - rename List -> Flat at lowest level mod…
jmchilton Nov 16, 2017
e70a774
Refactor client collections - collapse nested paireds model into nest…
jmchilton Nov 16, 2017
ba11132
Refactor client collections - rename listoflists model to nested model.
jmchilton Nov 16, 2017
a5513a4
Refactor client collections - eliminate class distinction between his…
jmchilton Nov 16, 2017
0c1e6e4
Refactor client collections - eliminate class distinction between fla…
jmchilton Nov 16, 2017
1535a0f
Refactor client collections - renamed list collection edit to flat.
jmchilton Nov 16, 2017
957ff9d
Refactor client collections - eliminate class distinction between fla…
jmchilton Nov 16, 2017
dd13193
Refactor client collections - renamed list collection to flat.
jmchilton Nov 16, 2017
b9bd528
Refactor client collections - eliminate ListOfPairsCollectionView.
jmchilton Nov 16, 2017
897ff7e
Refactor client collections - eliminate class distinction between nes…
jmchilton Nov 16, 2017
fdfa725
Refactor client collections - rename nested collection views.
jmchilton Nov 16, 2017
5a7eea6
Refactor client collections - rename NestedPairCollectionViewEdit
jmchilton Nov 16, 2017
bcf0fb1
Refactor client collections - eliminate incorrect comments.
jmchilton Nov 16, 2017
1afd6e1
Refactor client collections - eliminate Flat vs Nested dataset collec…
jmchilton Nov 16, 2017
200cf96
Refactor client collections - eliminate FlatCollectionView & FlatColl…
jmchilton Nov 16, 2017
4db301a
Refactor client collections - eliminate NestedCollectionView and Nest…
jmchilton Nov 16, 2017
a3cc810
Refactor client collections - eliminated another class without a dist…
jmchilton Nov 20, 2017
ef81006
Refactor client collections - eliminate all history bound collection …
jmchilton Nov 20, 2017
eb73535
Refactor client collections - eliminate unneeded subclass of Collecti…
jmchilton Nov 29, 2017
4defaa2
Reformat client.
jmchilton Nov 24, 2017
c6bc153
Mark one of the new history collection tests as @flakey.
jmchilton Nov 24, 2017
307d33a
Repack.
jmchilton Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/galaxy/scripts/mvc/collection/collection-model.js
View file
Open in desktop
Expand Up @@ -398,18 +398,18 @@ var NestedListDCDCECollection = NestedDCDCECollection.extend({

//==============================================================================
/** @class Backbone Model for a DatasetCollection (list) that contains other lists. */
var ListOfListsDatasetCollection = DatasetCollection.extend({
var NestedDatasetCollection = DatasetCollection.extend({
Copy link
Member

Choose a reason for hiding this comment

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

This makes so much sense.

/** list:paired is the only collection that itself contains collections */
collectionClass: NestedListDCDCECollection,

/** String representation. */
toString: function() {
return ["ListOfListsDatasetCollection(", this.get("name"), ")"].join("");
return ["NestedDatasetCollection(", this.get("name"), ")"].join("");
}
});

//==============================================================================
export default {
FlatDatasetCollection: FlatDatasetCollection,
ListOfListsDatasetCollection: ListOfListsDatasetCollection
NestedDatasetCollection: NestedDatasetCollection
};
16 changes: 8 additions & 8 deletions client/galaxy/scripts/mvc/history/hdca-model.js
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ TODO:
var hcontentMixin = HISTORY_CONTENT.HistoryContentMixin;

var FlatDC = DC_MODEL.FlatDatasetCollection;
var ListOfListsDC = DC_MODEL.ListOfListsDatasetCollection;
var NestedDC = DC_MODEL.NestedDatasetCollection;

//==============================================================================
/** Override to post to contents route w/o id. */
Expand Down Expand Up @@ -75,33 +75,33 @@ var HistoryPairDatasetCollection = FlatDC.extend(hcontentMixin).extend(

//==============================================================================
/** @class Backbone model for List of Pairs Dataset Collection within a History. */
var HistoryListPairedDatasetCollection = ListOfListsDC.extend(hcontentMixin).extend({
defaults: _.extend(_.clone(ListOfListsDC.prototype.defaults), {
var HistoryListPairedDatasetCollection = NestedDC.extend(hcontentMixin).extend({
defaults: _.extend(_.clone(NestedDC.prototype.defaults), {
history_content_type: "dataset_collection",
collection_type: "list:paired",
model_class: "HistoryDatasetCollectionAssociation"
}),

/** Override to post to contents route w/o id. */
save: buildHDCASave(ListOfListsDC.prototype.save),
save: buildHDCASave(NestedDC.prototype.save),

/** String representation. */
toString: function() {
return `History${ListOfListsDC.prototype.toString.call(this)}`;
return `History${NestedDC.prototype.toString.call(this)}`;
}
});

//==============================================================================
/** @class Backbone model for List of Lists Dataset Collection within a History. */
var HistoryListOfListsDatasetCollection = ListOfListsDC.extend(hcontentMixin).extend({
defaults: _.extend(_.clone(ListOfListsDC.prototype.defaults), {
var HistoryListOfListsDatasetCollection = NestedDC.extend(hcontentMixin).extend({
defaults: _.extend(_.clone(NestedDC.prototype.defaults), {
history_content_type: "dataset_collection",
collection_type: "list:list",
model_class: "HistoryDatasetCollectionAssociation"
}),

/** Override to post to contents route w/o id. */
save: buildHDCASave(ListOfListsDC.prototype.save),
save: buildHDCASave(NestedDC.prototype.save),

/** String representation. */
toString: function() {
Expand Down