fix: bugs in events/session table (#3443)

Author: shreyanshdwivedi

app/controllers/events/view/sessions/list.js

@@ -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'
@@ -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
@@ -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',

app/routes/events/view/sessions/list.js

@@ -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 = [
@@ -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  : [
@@ -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
     };
   }

app/templates/components/ui-table/cell/events/view/sessions/cell-rating.hbs

@@ -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}}

app/templates/events/view/sessions/list.hbs

@@ -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"