Skip to content

fix: pagination, searching, sorting in events/session table #3443

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

Merged
merged 1 commit into from
Aug 19, 2019
Merged

fix: pagination, searching, sorting in events/session table #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions app/controllers/events/view/sessions/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
return [
{
name : 'State',
valuePath : 'status',
valuePath : 'state',
isSortable : true,
headerComponent : 'tables/headers/sort',
cellComponent : 'ui-table/cell/events/view/sessions/cell-session-state'
Expand All @@ -38,7 +38,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
{
name : 'Rating',
valuePath : 'id',
extraValuePaths : ['rating', 'feedbacks'],
extraValuePaths : ['feedbacks'],
cellComponent : 'ui-table/cell/events/view/sessions/cell-rating',
options : {
ratedSessions: this.ratedSessions
Expand All @@ -49,16 +49,12 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
}
},
{
name : 'Avg Rating',
valuePath : 'averageRating',
isSortable : true,
headerComponent : 'tables/headers/sort'
name : 'Avg Rating',
valuePath : 'averageRating'
},
{
name : 'No. of ratings',
valuePath : 'feedbacks.length',
isSortable : true,
headerComponent : 'tables/headers/sort'
name : 'No. of ratings',
valuePath : 'feedbacks.length'
},
{
name : 'Track',
Expand Down
24 changes: 12 additions & 12 deletions app/routes/events/view/sessions/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {

async model(params) {
this.set('params', params);
const searchField = 'name';
const searchField = 'title';
let filterOptions = [];
if (params.session_status === 'pending') {
filterOptions = [
Expand Down Expand Up @@ -58,16 +58,6 @@ export default class extends Route.extend(EmberTableRouteMixin) {
}

let store = this.modelFor('events.view');
filterOptions = this.applySearchFilters(filterOptions, params, searchField);
let queryString = {
include : 'speakers,feedbacks',
filter : filterOptions,
'page[size]' : params.per_page || 10,
'page[number]' : params.page || 1
};
queryString = this.applySortFilters(queryString, params);
let data = (await store.query('sessions', queryString)).toArray();

let queryObject = {
include : 'session',
filter : [
Expand All @@ -87,8 +77,18 @@ export default class extends Route.extend(EmberTableRouteMixin) {
]
};
let feedbacks = await this.authManager.currentUser.query('feedbacks', queryObject);

filterOptions = this.applySearchFilters(filterOptions, params, searchField);
let queryString = {
include : 'speakers,feedbacks',
filter : filterOptions,
'page[size]' : params.per_page || 10,
'page[number]' : params.page || 1
};
queryString = this.applySortFilters(queryString, params);

return {
data,
sessions: await this.asArray(store.query('sessions', queryString)),
feedbacks
};
}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/ui-table/cell/events/view/sessions/cell-rating.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
{{else}}
{{ui-rating
initialRating=0
rating=extraRecords.rating
rating=rating
maxRating=5
onRate=(pipe-action (action (mut extraRecords.rating)) (action props.actions.addRating extraRecords.rating record))
onRate=(pipe-action (action (mut rating)) (action props.actions.addRating rating record))
clearable=true}}
{{/if}}
4 changes: 2 additions & 2 deletions app/templates/events/view/sessions/list.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="sixteen wide column">
{{tables/default columns=columns
rows=model.data
rows=model.sessions.data
feedbacks=model.feedbacks
currentPage=page
pageSize=per_page
searchQuery=search
sortBy=sort_by
sortDir=sort_dir
metaData=model.meta
metaData=model.sessions.meta
filterOptions=filterOptions
widthConstraint="eq-container"
resizeMode="fluid"
Expand Down