feat(tests sort by modified): tests sort by modified (#141)

Zooz · May 25, 2019 · 139ce27 · 139ce27
1 parent 612fec0
commit 139ce27
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/ui/src/features/configurationColumn.js b/ui/src/features/configurationColumn.js
@@ -47,7 +47,13 @@ export const getColumns = ({columnsNames, sortHeader = '', onSort, onReportView,
         }, {
             id: 'updated_at',
             Header: () => (
-                <TableHeader sortable={false}>
+                <TableHeader sortable={true}
+                             up={sortHeader.indexOf('updated_at') > -1 && sortHeader.indexOf('+') > -1}
+                             down={sortHeader.indexOf('updated_at') > -1 && sortHeader.indexOf('-') > -1}
+                             onClick={() => {
+                                 onSort('updated_at')
+                             }}
+                >
                     Modified
                 </TableHeader>
             ),

diff --git a/ui/src/features/get-tests.js b/ui/src/features/get-tests.js
@@ -43,13 +43,16 @@ class getTests extends React.Component {
             testToDelete: undefined,
             createTest: false,
             testForEdit: null,
-            sortedTests: []
+            sortedTests: [],
+            sortHeader:''
         }
     }
 
     componentDidUpdate(prevProps) {
         if (prevProps.tests !== this.props.tests) {
-            this.setState({sortedTests: [...this.props.tests]})
+            this.setState({sortedTests: [...this.props.tests]},()=>{
+                this.onSort('updated_at');
+            })
         }
     }
 
@@ -74,6 +77,25 @@ class getTests extends React.Component {
         });
         this.setState({sortedTests: newSorted})
     };
+
+    onSort = (field) => {
+        const {sortHeader} = this.state;
+        let isAsc = false;
+        if (sortHeader.includes(field)) {
+            isAsc = !sortHeader.includes('+')
+        } else {
+            isAsc = true;
+        }
+        let sortedReport;
+        if (isAsc) {
+            sortedReport = _.chain(this.state.sortedTests).sortBy(field).reverse().value();
+        } else {
+            sortedReport = _.chain(this.state.sortedTests).sortBy(field).value();
+        }
+        this.setState({sortedTests: sortedReport, sortHeader: `${field}${isAsc ? '+' : '-'}`})
+    };
+
+
     submitDelete = () => {
         this.props.deleteTest(this.state.testToDelete.id);
         this.props.getAllTests();
@@ -169,15 +191,17 @@ class getTests extends React.Component {
     }
 
     render() {
-        const {sortedTests} = this.state;
+        const {sortedTests, sortHeader} = this.state;
         const noDataText = this.props.errorOnGetJobs ? errorMsgGetTests : this.loader();
         const columns = getColumns({
             columnsNames,
             onReportView: this.onReportView,
             onRawView: this.onRawView,
             onDelete: this.onDelete,
             onEdit: this.onEdit,
-            onRunTest: this.onRunTest
+            onRunTest: this.onRunTest,
+            onSort: this.onSort,
+            sortHeader: sortHeader
         });
 
         return (