Utilize "selectedRows" from onSelect, onSelectAll callback using ant

design Table API
distributed-system-analysis · Sep 26, 2019 · bc187fa · bc187fa
1 parent 35041ff
commit bc187fa
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 41 deletions.
diff --git a/web-server/v0.4/src/pages/ComparisonSelect/index.js b/web-server/v0.4/src/pages/ComparisonSelect/index.js
@@ -24,11 +24,11 @@ import Table from '@/components/Table';
 class ComparisonSelect extends React.Component {
   constructor(props) {
     super(props);
-    const { iterations, selectedIterationKeys } = props;
+    const { iterations } = props;
 
     this.state = {
       resultIterations: iterations,
-      selectedRowKeys: selectedIterationKeys,
+      selectedRows: [],
     };
   }
 
@@ -48,7 +48,6 @@ class ComparisonSelect extends React.Component {
 
     if (nextProps.iterations !== iterations) {
       this.setState({ resultIterations: nextProps.iterations });
-      this.setState({ selectedRowKeys: nextProps.selectedIterationKeys });
     }
   }
 
@@ -61,16 +60,10 @@ class ComparisonSelect extends React.Component {
   };
 
   onCompareIterations = () => {
-    const { selectedRowKeys, resultIterations } = this.state;
-
-    if (selectedRowKeys.flat(1).length > 0) {
-      const selectedRowData = [];
-      selectedRowKeys.forEach(rowKey => {
-        selectedRowKeys[rowKey].forEach(row => {
-          selectedRowData.push(resultIterations[rowKey].iterations[selectedRowKeys[rowKey][row]]);
-        });
-      });
-      this.compareIterations(selectedRowData);
+    const { selectedRows, resultIterations } = this.state;
+
+    if (selectedRows.length > 0) {
+      this.compareIterations(selectedRows);
     } else {
       let selectedIterations = [];
       resultIterations.forEach(result => {
@@ -80,15 +73,8 @@ class ComparisonSelect extends React.Component {
     }
   };
 
-  onSelectChange = record => {
-    const { selectedRowKeys } = this.state;
-
-    if (selectedRowKeys[record.table].includes(record.key)) {
-      selectedRowKeys[record.table].splice(selectedRowKeys[record.table].indexOf(record.key), 1);
-    } else {
-      selectedRowKeys[record.table].push(record.key);
-    }
-    this.setState({ selectedRowKeys });
+  onSelectChange = selectedRows => {
+    this.setState({ selectedRows });
   };
 
   onFilterTable = (selectedParams, selectedPorts) => {
@@ -114,7 +100,7 @@ class ComparisonSelect extends React.Component {
   };
 
   render() {
-    const { resultIterations, selectedRowKeys } = this.state;
+    const { resultIterations } = this.state;
     const { iterationParams, iterationPorts, selectedControllers, loading } = this.props;
     return (
       <PageHeaderLayout
@@ -134,10 +120,10 @@ class ComparisonSelect extends React.Component {
               filters={iterationParams}
               ports={iterationPorts}
             />
-            {resultIterations.map((iteration, index) => {
+            {resultIterations.map(iteration => {
               const rowSelection = {
-                selectedRowKeys: selectedRowKeys[index],
-                onSelect: record => this.onSelectChange(record),
+                onSelect: (record, selected, selectedRows) => this.onSelectChange(selectedRows),
+                onSelectAll: (selected, selectedRows) => this.onSelectAll(selectedRows),
               };
               return (
                 <div key={iteration.resultName} style={{ marginTop: 32 }}>
@@ -152,6 +138,7 @@ class ComparisonSelect extends React.Component {
                     rowSelection={rowSelection}
                     columns={iteration.columns}
                     dataSource={iteration.iterations}
+                    hideDefaultSelections
                     bordered
                   />
                 </div>

diff --git a/web-server/v0.4/src/pages/Results/index.js b/web-server/v0.4/src/pages/Results/index.js
@@ -21,7 +21,7 @@ class Results extends Component {
 
     this.state = {
       results: props.results,
-      selectedRowKeys: [],
+      selectedRows: [],
     };
   }
 
@@ -46,14 +46,10 @@ class Results extends Component {
     }
   }
 
-  onSelectChange = selectedRowKeys => {
-    const { dispatch, results } = this.props;
-    const selectedRows = [];
-    selectedRowKeys.forEach(key => {
-      const selectedKey = results.find(result => result.key === key);
-      selectedRows.push(selectedKey);
-    });
-    this.setState({ selectedRowKeys });
+  onSelectChange = selectedRows => {
+    const { dispatch } = this.props;
+
+    this.setState({ selectedRows });
 
     dispatch({
       type: 'global/updateSelectedResults',
@@ -122,11 +118,11 @@ class Results extends Component {
   };
 
   render() {
-    const { results, selectedRowKeys } = this.state;
+    const { results, selectedRows } = this.state;
     const { selectedControllers, loading } = this.props;
     const rowSelection = {
-      selectedRowKeys,
-      onChange: this.onSelectChange,
+      // eslint-disable-next-line no-shadow
+      onSelect: (record, selected, selectedRows) => this.onSelectChange(selectedRows),
     };
 
     const columns = [
@@ -164,7 +160,7 @@ class Results extends Component {
               onSearch={this.onSearch}
             />
             <RowSelection
-              selectedItems={selectedRowKeys}
+              selectedItems={selectedRows}
               compareActionName="Compare Results"
               onCompare={this.compareResults}
             />

diff --git a/web-server/v0.4/src/utils/parse.js b/web-server/v0.4/src/utils/parse.js
@@ -25,14 +25,14 @@ export const parseIterationData = results => {
     };
     selectedIterationKeys.push([]);
 
-    result.iterationData.forEach((iteration, index) => {
+    result.iterationData.forEach(iteration => {
       let iterationMetadata = {
         iteration_name: iteration.iteration_name,
         iteration_number: iteration.iteration_number,
         result_name: result.resultName,
         controller_name: result.controllerName,
         table: result.tableId,
-        key: index,
+        key: iteration.iteration_number,
       };
       const iterationConfig = iteration.iteration_data.parameters.benchmark
         ? Object.entries(iteration.iteration_data.parameters.benchmark[0])