Fix react-data-grid JS errors by updating to v3

CatalystCode · Feb 28, 2018 · fb28b94 · fb28b94
1 parent 254d920
commit fb28b94
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/project-fortis-interfaces/package-lock.json b/project-fortis-interfaces/package-lock.json
diff --git a/project-fortis-interfaces/package.json b/project-fortis-interfaces/package.json
@@ -69,8 +69,8 @@
     "react-bootstrap": "^0.31.3",
     "react-browser-detection": "^1.0.4",
     "react-copy-to-clipboard": "^5.0.1",
-    "react-data-grid": "^2.0.60",
-    "react-data-grid-addons": "^2.0.60",
+    "react-data-grid": "^3.0.11",
+    "react-data-grid-addons": "^3.0.11",
     "react-dom": "^15.6.2",
     "react-grid-layout": "^0.13.9",
     "react-highlight-words": "^0.6.0",

diff --git a/project-fortis-interfaces/src/components/Admin/BlacklistEditor.js b/project-fortis-interfaces/src/components/Admin/BlacklistEditor.js
@@ -1,7 +1,7 @@
 import { DataGrid } from './DataGrid';
 import React from 'react';
 import { getColumns } from './shared';
-const { Editors, Formatters } = require('react-data-grid-addons');
+import { Editors, Formatters } from 'react-data-grid-addons';
 const { DropDownEditor } = Editors;
 const { DropDownFormatter } = Formatters;
 

diff --git a/project-fortis-interfaces/src/components/Admin/DataGrid.js b/project-fortis-interfaces/src/components/Admin/DataGrid.js
@@ -8,8 +8,9 @@ import Fluxxor from 'fluxxor';
 import moment from 'moment';
 // eslint-disable-next-line
 import { guid, doNothing } from '../../utils/Utils.js';
+import { Toolbar, Data } from 'react-data-grid-addons';
+const { Selectors } = Data;
 
-const { Toolbar, Data: { Selectors } } = require('react-data-grid-addons');
 const STATE_ACTIONS = {
   SAVED: "saved",
   SAVING: "saving",

diff --git a/project-fortis-interfaces/src/components/Admin/TrustedSources.js b/project-fortis-interfaces/src/components/Admin/TrustedSources.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { DataGrid } from './DataGrid';
 import { getColumns } from './shared';
-const { Editors, Formatters } = require('react-data-grid-addons');
+import { Editors, Formatters } from 'react-data-grid-addons';
 const { DropDownEditor } = Editors;
 const { DropDownFormatter } = Formatters;
 

diff --git a/project-fortis-interfaces/src/components/Admin/UserRoles.js b/project-fortis-interfaces/src/components/Admin/UserRoles.js
@@ -4,7 +4,7 @@ import groupBy from 'lodash/groupBy';
 import differenceBy from 'lodash/differenceBy';
 import { DataGrid } from './DataGrid';
 import { getColumns } from './shared';
-const { Editors, Formatters } = require('react-data-grid-addons');
+import { Editors, Formatters } from 'react-data-grid-addons';
 const { DropDownEditor } = Editors;
 const { DropDownFormatter } = Formatters;