diff --git a/project-fortis-interfaces/package-lock.json b/project-fortis-interfaces/package-lock.json index 5c73c74c..b9122e01 100644 --- a/project-fortis-interfaces/package-lock.json +++ b/project-fortis-interfaces/package-lock.json @@ -7164,16 +7164,16 @@ } }, "react-data-grid": { - "version": "2.0.60", - "resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-2.0.60.tgz", - "integrity": "sha1-ShVJ1NrQMmd0OfJdvPEDarlmAy8=" + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-3.0.11.tgz", + "integrity": "sha1-BjKdFUiineQ7MU3FEBb5cso0dQo=" }, "react-data-grid-addons": { - "version": "2.0.60", - "resolved": "https://registry.npmjs.org/react-data-grid-addons/-/react-data-grid-addons-2.0.60.tgz", - "integrity": "sha1-N8zCR18QPYc1uFTX8/gZakj5lzw=", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/react-data-grid-addons/-/react-data-grid-addons-3.0.11.tgz", + "integrity": "sha1-nTjDGqH0dfk3NSRikjlebR+n6zg=", "requires": { - "react-data-grid": "2.0.60" + "react-data-grid": "3.0.11" } }, "react-dev-utils": { diff --git a/project-fortis-interfaces/package.json b/project-fortis-interfaces/package.json index e012a125..7699167b 100644 --- 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 index bf33fb33..cd459f0c 100644 --- 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 index e090babe..0a1985df 100644 --- 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 index 2559a5f7..81a7a5e1 100644 --- 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 index c92030b2..82491211 100644 --- 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;