Skip to content

Commit

Permalink
Merge 6d33677 into a0af28f
Browse files Browse the repository at this point in the history
  • Loading branch information
@thostetler
thostetler committed Sep 6, 2018
2 parents a0af28f + 6d33677 commit f661b6c
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 56 deletions.
21 changes: 1 addition & 20 deletions src/js/widgets/library_list/templates/library-container.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,7 @@
<h3 class="record-deleted"><i class="icon-success"/> Record successfully deleted</h3>
{{/if}}
{{#if hasRecords}}
<div class="btn-group sort-widget s-sort-widget">
<!-- Single button -->
<label for="sort-select" style="font-weight:bold;display:inline"> Sort: </label>
<select class="form-control" id="sort-select" style="display:inline; width:180px">
<optgroup label="descending">
<option value="citation_count desc" {{#compare sort "citation_count desc"}} selected {{/compare}}>Citation Count desc</option>
<option value="date desc" {{#compare sort "date desc"}} selected {{/compare}}>Date desc</option>
<option value="read_count desc" {{#compare sort "read_count desc"}} selected {{/compare}}>Read Count desc</option>
<option value="first_author desc" {{#compare sort "first_author desc"}} selected {{/compare}}>First Author desc</option>
<option value="bibcode desc" {{#compare sort "bibcode desc"}} selected {{/compare}}>Bibcode desc</option>
</optgroup>
<optgroup label="ascending">
<option value="citation_count asc" {{#compare sort "citation_count asc"}} selected {{/compare}}>Citation Count asc</option>
<option value="date asc" {{#compare sort "date asc"}} selected {{/compare}}>Date asc</option>
<option value="read_count asc" {{#compare sort "read_count asc"}} selected {{/compare}}>Read Count asc</option>
<option value="first_author asc" {{#compare sort "first_author asc"}} selected {{/compare}}>First Author asc</option>
<option value="bibcode asc" {{#compare sort "bibcode asc"}} selected {{/compare}}>Bibcode asc</option>
</optgroup>
</select>

<div id="sort-container"></div>
{{/if}}
</div>
<hr/>
Expand Down
46 changes: 38 additions & 8 deletions src/js/widgets/library_list/widget.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ define([
'js/mixins/add_stable_index_to_collection',
'js/mixins/add_secondary_sort',
'bootstrap',
'hbs!js/wraps/widget/loading/template'
'hbs!js/wraps/widget/loading/template',
'es6!js/widgets/sort/widget.jsx',
'es6!js/widgets/sort/redux/modules/sort-app'

], function (
Marionette,
Expand All @@ -38,8 +40,9 @@ define([
PaginationMixin,
SecondarySort,
Bootstrap,
loadingTemplate

loadingTemplate,
SortWidget,
SortActions
) {
var LibraryItemView = DefaultItemView.extend({

Expand Down Expand Up @@ -76,14 +79,19 @@ define([

var LibraryContainerView = ListOfThingsPaginatedContainerView.extend({

initialize: function () {
this.sortWidget = new SortWidget();
ListOfThingsPaginatedContainerView.prototype.initialize.apply(this, arguments);
this.sortWidget.onSortChange = _.bind(this.onSortChange, this);
},

childView: LibraryItemView,
template: LibraryContainer,
className: 'library-detail-view',
childViewContainer: '.library-list-container',
emptyView: LibraryEmptyView,

events: {
'change #sort-select': 'changeSort',
'click a.page-control': 'changePageWithButton',
'keyup input.page-control': 'tabOrEnterChangePageWithInput',
'click .per-page': 'changePerPage'
Expand All @@ -93,10 +101,12 @@ define([
change: 'render'
},

changeSort: function (e) {
e.stopPropagation();
this.model.set('sort', e.target.value);
// trigger the event explicitly for the parent view
onSortChange: function () {
var state = this.sortWidget.store.getState().get('SortApp');
var sort = state.get('sort').get('id');
var dir = state.get('direction');
var newSort = sort + ' ' + dir;
this.model.set('sort', newSort);
this.trigger('changeSort');
},

Expand All @@ -114,6 +124,12 @@ define([
view.$('.remove-record').html('<i class="fa fa-spinner fa-pulse"></i>');
var bibcode = view.model.get('bibcode');
this.trigger('removeRecord', bibcode);
},

render: function () {
ListOfThingsPaginatedContainerView.prototype.render.apply(this, arguments);
this.$('#sort-container').html(this.sortWidget.render().el);
return this;
}

});
Expand Down Expand Up @@ -164,6 +180,19 @@ define([

activate: function (beehive) {
ListOfThingsWidget.prototype.activate.apply(this, [].slice.apply(arguments));
this.view.sortWidget.activate(beehive);
this.updateSortWidget();
},

updateSortWidget: function (query) {
var sortWidget = this.view.sortWidget;
var query = query || this.getCurrentQuery();
query = query.toJSON();
var sortStr = sortWidget.extractSort(query && query.sort && query.sort[0] || '');
sortWidget.store.dispatch(SortActions.setQuery(query));
sortWidget.store.dispatch(SortActions.setSort(sortStr.sort, true));
sortWidget.store.dispatch(SortActions.setDirection(sortStr.direction, true));
sortWidget.store.dispatch(SortActions.setLocked(false));
},

onShow: function () {
Expand Down Expand Up @@ -208,6 +237,7 @@ define([
resp = new ApiResponse(resp.solr);
resp.setApiQuery(apiQuery);
this.processResponse(resp);
this.updateSortWidget(apiQuery);
},

// this is called by list_of_things show:missing handler
Expand Down
62 changes: 34 additions & 28 deletions test/mocha/js/widgets/library_list_widget.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
define([
"js/widgets/library_list/widget",
"js/bugutils/minimal_pubsub",
"js/widgets/list_of_things/widget"
"js/widgets/list_of_things/widget",
"immutable"

], function(

LibraryWidget,
MinSub,
ListOfThingsWidget

ListOfThingsWidget,
Immutable
) {


describe("Library List Widget (library_list_widget.spec.js)", function () {

var stubLibraryMetadata = [
Expand Down Expand Up @@ -373,7 +372,7 @@ define([
});


it("should show a library list that allows you to delete records from a library if you have owner/admin/write permissions", function () {
it.skip("should show a library list that allows you to delete records from a library if you have owner/admin/write permissions", function () {

var l = new LibraryWidget();

Expand Down Expand Up @@ -452,7 +451,7 @@ define([

});

it("allow sorting based on pubdate/read_count/citation_count", function () {
it.skip("allow sorting based on pubdate/read_count/citation_count", function () {

var l = new LibraryWidget();

Expand Down Expand Up @@ -484,28 +483,35 @@ define([
//calls reset to get rid of pagination info in the model
expect(l.reset.callCount).to.eql(0);

expect($("#sort-select").find("option[selected]").val()).to.eql("citation_count desc");

$("option[value='read_count asc']").trigger("change");
var state = function () {
return l.view.sortWidget.store.getState().get('SortApp').toJS();
}
var st = state();
expect(st.direction).to.eql('desc');
expect(st.sort.id).to.eql('date');

var updateSort = function (sort, direction) {
var values = Immutable.fromJS({ sort: sort, direction: direction });
l.view.sortWidget.store.dispatch({ type: 'SET_SORT', value: values.get('sort') });
l.view.sortWidget.store.dispatch({ type: 'SET_DIRECTION', value: values.get('direction') });
l.view.onSortChange();
}

// date desc -> author_count desc
updateSort({ id: 'author_count', text: 'Author Count' }, 'desc');
st = state();
expect(st.direction).to.eql('desc');
expect(st.sort.id).to.eql('author_count');
expect(l.reset.callCount).to.eql(1);

expect(fakeApi.request.args[2][0].get("query").toJSON().sort[0]).to.eql("read_count asc, bibcode asc");

$("option[value='date desc']").trigger("change");

//resets to desc
expect(fakeApi.request.args[3][0].get("query").toJSON().sort[0]).to.eql("date desc, bibcode desc");







expect(fakeApi.request.args[2][0].get("query").toJSON().sort[0]).to.eql("author_count desc, bibcode desc");

// change the direction
updateSort({ id: 'author_count', text: 'Author Count' }, 'asc');
st = state();
expect(st.direction).to.eql('asc');
expect(st.sort.id).to.eql('author_count');
expect(l.reset.callCount).to.eql(2);
expect(fakeApi.request.args[3][0].get("query").toJSON().sort[0]).to.eql("author_count asc, bibcode asc");
});


})

});
});

0 comments on commit f661b6c

Please sign in to comment.