[SQL Lab] Fixed TableElement sorting functionality and tests (#7069) (#…

…7070)
apache · Mar 20, 2019 · 30f88ca · 30f88ca
1 parent 209e7a9
commit 30f88ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/superset/assets/spec/javascripts/sqllab/TableElement_spec.jsx b/superset/assets/spec/javascripts/sqllab/TableElement_spec.jsx
@@ -57,7 +57,7 @@ describe('TableElement', () => {
  expect(wrapper.find(ColumnElement).first().props().column.name).toBe('id');
  wrapper.find('.sort-cols').simulate('click');
  expect(wrapper.state().sortColumns).toBe(true);
- expect(wrapper.find(ColumnElement).first().props().column.name).toBe('last_login');
+ expect(wrapper.find(ColumnElement).first().props().column.name).toBe('active');
  });
  it('calls the collapseTable action', () => {
  const wrapper = mount(<TableElement {...mockedProps} />);

diff --git a/superset/assets/src/SqlLab/components/TableElement.jsx b/superset/assets/src/SqlLab/components/TableElement.jsx
@@ -204,7 +204,16 @@ class TableElement extends React.PureComponent {
  if (table.columns) {
  cols = table.columns.slice();
  if (this.state.sortColumns) {
- cols.sort((a, b) => a.name.toUpperCase() > b.name.toUpperCase());
+ cols.sort((a, b) => {
+ const colA = a.name.toUpperCase();
+ const colB = b.name.toUpperCase();
+ if (colA < colB) {
+ return -1;
+ } else if (colA > colB) {
+ return 1;
+ }
+ return 0;
+ });
  }
  }
  const metadata = (