Merge pull request #482 from marmelab/fix_sort

[RFR] Fix sort for ReferenceListField and dashboard
marmelab · Jun 1, 2015 · 9932690 · 9932690
2 parents 8ff3b7c + 14ee188
commit 9932690
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/examples/blog/config.js b/examples/blog/config.js
@@ -64,6 +64,7 @@
         // customize entities and views
 
         post.dashboardView() // customize the dashboard panel for this entity
+            .name('posts')
             .title('Recent posts')
             .order(1) // display the post panel first in the dashboard
             .perPage(5) // limit the panel to the 5 latest posts
@@ -128,9 +129,11 @@
                     .targetEntity(comment)
                     .targetReferenceField('post_id')
                     .targetFields([
-                        nga.field('id'),
+                        nga.field('created_at').label('Posted'),
                         nga.field('body').label('Comment')
-                    ]),
+                    ])
+                    .sortField('created_at')
+                    .sortDir('DESC'),
                 nga.field('', 'template').label('')
                     .template('<span class="pull-right"><ma-filtered-list-button entity-name="comments" filter="{ post_id: entry.values.id }" size="sm"></ma-filtered-list-button></span>')
             ]);

diff --git a/src/javascripts/ng-admin/Crud/fieldView/ReferencedListFieldView.js b/src/javascripts/ng-admin/Crud/fieldView/ReferencedListFieldView.js
@@ -7,7 +7,7 @@ define(function(require) {
                  'fields="::field.targetFields()" ' +
                  'list-actions="::field.listActions()" ' +
                  'entity="::field.targetEntity()" ' +
-                 'sort-field="::field.sortField()" ' +
+                 'sort-field="::field.getSortFieldName()" ' +
                  'sort-dir="::field.sortDir()">' +
             '</ma-datagrid>';
     }
@@ -23,7 +23,7 @@ define(function(require) {
                   'fields="::field.targetFields()" ' +
                   'list-actions="::field.listActions()" ' +
                   'entity="::field.targetEntity()" ' +
-                  'sort-field="::field.sortField()" ' +
+                  'sort-field="::field.getSortFieldName()" ' +
                   'sort-dir="::field.sortDir()">' +
             '</ma-datagrid>';
     }

diff --git a/src/javascripts/ng-admin/Main/component/controller/DashboardController.js b/src/javascripts/ng-admin/Main/component/controller/DashboardController.js
@@ -16,6 +16,11 @@ define(function (require) {
         this.PanelBuilder = PanelBuilder;
 
         this.$scope.edit = this.edit.bind(this);
+
+        var searchParams = this.$location.search();
+        this.sortField = 'sortField' in searchParams ? searchParams.sortField : null;
+        this.sortDir = 'sortDir' in searchParams ? searchParams.sortDir : null;
+
         this.retrievePanels();
 
         $scope.$on('$destroy', this.destroy.bind(this));
@@ -28,7 +33,7 @@ define(function (require) {
         var self = this;
         this.panels = [];
 
-        this.PanelBuilder.getPanelsData().then(function (panels) {
+        this.PanelBuilder.getPanelsData(this.sortField, this.sortDir).then(function (panels) {
             self.panels = panels;
         });
     };

diff --git a/src/javascripts/ng-admin/Main/component/service/PanelBuilder.js b/src/javascripts/ng-admin/Main/component/service/PanelBuilder.js
@@ -20,17 +20,25 @@ function PanelBuilder($q, $location, ReadQueries, Configuration, AdminDescriptio
  *
  * @returns {promise}
  */
-PanelBuilder.prototype.getPanelsData = function () {
+PanelBuilder.prototype.getPanelsData = function (sortField, sortDir) {
     var dashboardViews = this.Configuration.getViewsOfType('DashboardView'),
         dataStore = this.dataStore,
         promises = [],
         dashboardView,
+        dashboardSortField,
+        dashboardSortDir,
         self = this,
         i;
 
     for (i in dashboardViews) {
         dashboardView = dashboardViews[i];
-        promises.push(self.ReadQueries.getAll(dashboardView, 1, {}, dashboardView.getSortFieldName(), dashboardView.sortDir()));
+        dashboardSortField = dashboardView.getSortFieldName();
+        dashboardSortDir = dashboardView.sortDir();
+        if (sortField && sortField.split('.')[0] === dashboardView.name()) {
+            dashboardSortField = sortField;
+            dashboardSortDir = sortDir;
+        }
+        promises.push(self.ReadQueries.getAll(dashboardView, 1, {}, dashboardSortField, dashboardSortDir));
     }
 
     return this.$q.all(promises).then(function (responses) {

diff --git a/src/javascripts/test/e2e/ShowViewSpec.js b/src/javascripts/test/e2e/ShowViewSpec.js
@@ -28,7 +28,7 @@ describe('ShowView', function () {
             $$('.ng-admin-field-comments th').then(function (inputs) {
                 expect(inputs.length).toBe(2);
 
-                expect(inputs[0].getAttribute('class')).toBe('ng-scope ng-admin-column-id');
+                expect(inputs[0].getAttribute('class')).toBe('ng-scope ng-admin-column-created_at');
                 expect(inputs[1].getAttribute('class')).toBe('ng-scope ng-admin-column-body');
             });
         });