Merge pull request #60 from nuagenetworks/bug/sorting-clustering

[bug]: fix sorting and clustering issue
nuagenetworks · Oct 31, 2018 · eccc2f6 · eccc2f6
2 parents eb93ee2 + 4ed20fa
commit eccc2f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/Graphs/GeoMap/index.js b/Graphs/GeoMap/index.js
@@ -602,7 +602,7 @@ class GeoMap extends AbstractGraph {
                     <MarkerClusterer
                         ignoreHidden={false}
                         averageCenter
-                        gridSize={60}
+                        gridSize={40}
                         onClusteringEnd={ this.handleClustererEnd}
                         onClick={ this.handleClusterClick }
                     >

diff --git a/Graphs/Table/index.js b/Graphs/Table/index.js
@@ -444,7 +444,7 @@ class Table extends AbstractGraph {
                         )
                     }
 
-                    if(columnData) {
+                    if(columnData || columnData === 0) {
                         data[key] = typeof(columnData) === "boolean" ? columnData.toString().toUpperCase() : columnData
                     }
                 }
@@ -483,15 +483,7 @@ class Table extends AbstractGraph {
     }
 
     handleStaticSorting(column, order) {
-        this.filterData = this.filterData.sort(
-            (a, b) => {
-                if (order === 'desc')
-                    return b[column] > a[column] ? 1 : -1
-
-                return a[column] > b[column] ? 1 : -1
-            }
-        );
-
+        this.filterData = _.orderBy(this.filterData, [column], [order]);
         /**
          * Resetting the paging due to sorting
          */

diff --git a/README.md b/README.md
@@ -42,7 +42,11 @@ The use of the graphs module is to provide a module to quickly shows your data i
     "react-tap-event-plugin": "2.0.1",
     "react-tooltip": "^3.2.1",
     "object-path": "^0.11.4",
-    "react-google-maps": "^9.4.5"
+    "react-google-maps": "^9.4.5",
+    "prop-types": "^15.6.2",
+    "react-csv": "1.0.8",
+    "react-copy-to-clipboard": "^4.3.1",
+    "react-modal": "^3.5.1",
 ```
 ## Usage examples
   - Make sure your current project must be a valid git project, if not then run the below command