From a3a1d74b88e027026b3187c7ca5725f778157998 Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Thu, 3 Jan 2019 12:36:17 +0000 Subject: [PATCH] Framework sweep pre-release testing --- package.json | 26 ++++++++-------- .../DateComponent.jsx | 6 ++-- .../components/FxQuoteMatrix.jsx | 30 ++++++++++--------- .../components/TopMoversGrid.jsx | 2 +- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 6345b17..2d1122d 100644 --- a/package.json +++ b/package.json @@ -37,14 +37,14 @@ }, "homepage": "http://www.ag-grid.com/", "devDependencies": { - "@babel/core": "7.1.2", + "@babel/core": "7.2.2", "babel-loader": "8.0.4", - "@babel/preset-env": "7.1.0", + "@babel/preset-env": "7.2.3", "@babel/preset-react": "7.0.0", - "@babel/plugin-proposal-class-properties": "7.1.0", - "@babel/plugin-proposal-function-bind": "7.0.0", - "css-loader": "1.0.0", - "file-loader": "2.0.0", + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-function-bind": "7.2.0", + "css-loader": "2.1.0", + "file-loader": "3.0.1", "gulp": "3.9.1", "merge2": "^1.2.3", "mkdirp": "0.5.1", @@ -52,9 +52,9 @@ "prop-types": "15.6.2", "rimraf": "~2.6.2", "style-loader": "~0.23.0", - "webpack": "^4.16.1", - "webpack-cli": "^3.0.8", - "webpack-dev-server": "^3.1.4" + "webpack": "4.28.3", + "webpack-cli": "3.2.0", + "webpack-dev-server": "3.1.14" }, "dependencies": { "ag-grid-community": "^19.1.0", @@ -63,10 +63,10 @@ "bootstrap": "4.1.3", "d3": "4.9.1", "lodash": "^4.17.11", - "react": "^16.6.0", - "react-dom": "^16.6.0", - "react-redux": "^6.0.0", + "react": "16.7.0", + "react-dom": "16.7.0", + "react-redux": "6.0.0", "react-router-dom": "4.3.1", - "redux": "^4.0.1" + "redux": "4.0.1" } } \ No newline at end of file diff --git a/src-examples/richGridDeclarativeExample/DateComponent.jsx b/src-examples/richGridDeclarativeExample/DateComponent.jsx index ba5145e..ec8137b 100644 --- a/src-examples/richGridDeclarativeExample/DateComponent.jsx +++ b/src-examples/richGridDeclarativeExample/DateComponent.jsx @@ -51,11 +51,11 @@ export default class DateComponent extends React.Component { return (
x - / - / -
); diff --git a/src-trader-dashboard/components/FxQuoteMatrix.jsx b/src-trader-dashboard/components/FxQuoteMatrix.jsx index eaa0f83..f25bb13 100644 --- a/src-trader-dashboard/components/FxQuoteMatrix.jsx +++ b/src-trader-dashboard/components/FxQuoteMatrix.jsx @@ -32,26 +32,28 @@ class FxQuoteMatrix extends Component { } componentWillReceiveProps(nextProps) { - const newRowData = nextProps.rowData; + if (this.gridApi) { + const newRowData = nextProps.rowData; - const updatedRows = []; + const updatedRows = []; - for (let i = 0; i < newRowData.length; i++) { - let newRow = newRowData[i]; - let currentRowNode = this.gridApi.getRowNode(newRow.symbol); + for (let i = 0; i < newRowData.length; i++) { + let newRow = newRowData[i]; + let currentRowNode = this.gridApi.getRowNode(newRow.symbol); - const {data} = currentRowNode; - for (const def of this.state.columnDefs) { - if (data[def.field] !== newRow[def.field]) { - updatedRows.push(newRow); - break; + const {data} = currentRowNode; + for (const def of this.state.columnDefs) { + if (data[def.field] !== newRow[def.field]) { + updatedRows.push(newRow); + break; + } } } + + + this.gridApi.updateRowData({update: updatedRows}); } - - this.gridApi.updateRowData({update: updatedRows}); - } render() { @@ -78,7 +80,7 @@ class FxQuoteMatrix extends Component { export default connect( (state) => { return { - rowData: state.fxData + rowData: state ? state.fxData : null } } )(FxQuoteMatrix); \ No newline at end of file diff --git a/src-trader-dashboard/components/TopMoversGrid.jsx b/src-trader-dashboard/components/TopMoversGrid.jsx index 868475e..d1ecc94 100644 --- a/src-trader-dashboard/components/TopMoversGrid.jsx +++ b/src-trader-dashboard/components/TopMoversGrid.jsx @@ -84,7 +84,7 @@ class TopMoversGrid extends Component { export default connect( (state) => { return { - rowData: state.fxTopMovers + rowData: state ? state.fxTopMovers : null } } )(TopMoversGrid); \ No newline at end of file