From e5d9a2d55c6d40a21576e8c4973f02afe1d6b344 Mon Sep 17 00:00:00 2001
From: Bebe Peng <bpeng@pivotal.io>
Date: Fri, 7 Nov 2014 16:33:39 -0500
Subject: [PATCH] feat(table-sortable): default sort by first column ascending

[#80914122]

Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
---
 src/pivotal-ui/javascripts/table-sortable.jsx |  6 +++--
 test/spec/javascripts/table_sortable_spec.js  | 24 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/pivotal-ui/javascripts/table-sortable.jsx b/src/pivotal-ui/javascripts/table-sortable.jsx
index e1a6b8db8..17fbf8fa4 100644
--- a/src/pivotal-ui/javascripts/table-sortable.jsx
+++ b/src/pivotal-ui/javascripts/table-sortable.jsx
@@ -46,13 +46,15 @@ var TableRow = React.createClass({
 
 var TableSortable = module.exports = React.createClass({
   getInitialState: function getInitialState() {
+    var initialSortColumn = this.props.columns[0].name;
+
     return {
       sort: {
-        column: 'name',
+        column: initialSortColumn,
         order: 'asc'
       },
 
-      data: _.sortBy(this.props.data, 'name')
+      data: _.sortBy(this.props.data, initialSortColumn)
     };
   },
 
diff --git a/test/spec/javascripts/table_sortable_spec.js b/test/spec/javascripts/table_sortable_spec.js
index 1cf66148f..76807d2fe 100644
--- a/test/spec/javascripts/table_sortable_spec.js
+++ b/test/spec/javascripts/table_sortable_spec.js
@@ -12,8 +12,8 @@ describe('TableSortable', function() {
 
     this.columns = [
       {
-        name: 'name',
-        title: 'Name'
+        name: 'title',
+        title: 'Title'
       },
       {
         name: 'instances',
@@ -23,14 +23,14 @@ describe('TableSortable', function() {
     this.data = [
       {
         instances: '1',
-        name: 'foo'
+        title: 'foo'
       },
       {
         instances: '3',
-        name: 'sup'
+        title: 'sup'
       },
       {
-        name: 'yee',
+        title: 'yee',
         instances: '2'
       }
     ];
@@ -48,8 +48,8 @@ describe('TableSortable', function() {
     React.unmountComponentAtNode(this.node);
   });
 
-  it('sorts table rows by asc-name by default', function() {
-    expect($('th:contains("Name")')).toHaveClass('sorted-asc');
+  it('sorts table rows by the first column in ascending order by default', function() {
+    expect($('th:contains("Title")')).toHaveClass('sorted-asc');
     expect($('td').eq(0)).toContainText('foo');
     expect($('td').eq(1)).toContainText('1');
     expect($('td').eq(2)).toContainText('sup');
@@ -60,11 +60,11 @@ describe('TableSortable', function() {
 
   describe('clicking on the already asc-sorted column', function() {
     beforeEach(function() {
-      TestUtils.Simulate.click($("th:contains('Name')").get(0));
+      TestUtils.Simulate.click($("th:contains('Title')").get(0));
     });
 
     it('reverses the sort order', function() {
-      expect($('th:contains("Name")')).toHaveClass('sorted-desc');
+      expect($('th:contains("Title")')).toHaveClass('sorted-desc');
       expect($('td').eq(0)).toContainText('yee');
       expect($('td').eq(1)).toContainText('2');
       expect($('td').eq(2)).toContainText('sup');
@@ -75,11 +75,11 @@ describe('TableSortable', function() {
 
     describe('clicking on the already desc-sorted column', function() {
       beforeEach(function() {
-        TestUtils.Simulate.click($("th:contains('Name')").get(0));
+        TestUtils.Simulate.click($("th:contains('Title')").get(0));
       });
 
       it('reverses the sort order', function() {
-        expect($('th:contains("Name")')).toHaveClass('sorted-asc');
+        expect($('th:contains("Title")')).toHaveClass('sorted-asc');
         expect($('td').eq(0)).toContainText('foo');
         expect($('td').eq(1)).toContainText('1');
         expect($('td').eq(2)).toContainText('sup');
@@ -97,7 +97,7 @@ describe('TableSortable', function() {
 
     it('sorts table rows by asc-instances', function() {
       expect($('th:contains("Instances")')).toHaveClass('sorted-asc');
-      expect($('th:contains("Name")')).not.toHaveClass('sorted-asc');
+      expect($('th:contains("Title")')).not.toHaveClass('sorted-asc');
       expect($('td').eq(0)).toContainText('foo');
       expect($('td').eq(1)).toContainText('1');
       expect($('td').eq(2)).toContainText('yee');