AG-2490 Regression Testing - Header component example isn't working

AG-2417 Issue with React 6: withRef is removed. To access the wrapped instance, use a ref on the connected component
AG-2439 Add support for react-redux v6

h/t @hrgui - thanks!

config/webpack.config.examples.js

@@ -20,7 +20,11 @@ module.exports = {
                 include: SRC_DIR,
                 loader: 'babel-loader',
                 query: {
-                    presets: ['react', 'es2015', 'stage-0']
+                    presets: ['@babel/preset-react', '@babel/preset-env'],
+                    plugins: [
+                        require('@babel/plugin-proposal-function-bind'),
+                        require('@babel/plugin-proposal-class-properties')
+                    ]
                 }
             },
             {
@@ -42,5 +46,6 @@ module.exports = {
     },
     devServer: {
         port: 8080,
+        historyApiFallback: true
     }
 };

config/webpack.config.large.js

@@ -20,7 +20,11 @@ module.exports = {
                 include: SRC_DIR,
                 loader: 'babel-loader',
                 query: {
-                    presets: ['react', 'es2015', 'stage-0']
+                    presets: ['@babel/preset-react', '@babel/preset-env'],
+                    plugins: [
+                        require('@babel/plugin-proposal-function-bind'),
+                        require('@babel/plugin-proposal-class-properties')
+                    ]
                 }
             }
         ]

config/webpack.config.trader.js

@@ -20,7 +20,11 @@ module.exports = {
                 include: SRC_DIR,
                 loader: 'babel-loader',
                 query: {
-                    presets: ['react', 'es2015', 'stage-0']
+                    presets: ['@babel/preset-react', '@babel/preset-env'],
+                    plugins: [
+                        require('@babel/plugin-proposal-function-bind'),
+                        require('@babel/plugin-proposal-class-properties')
+                    ]
                 }
             }
         ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-grid-react-example",
-  "version": "19.0.0",
+  "version": "20.0.0",
   "description": "Example Reach applicaiton using ag-Grid.",
   "main": "dist/ag-grid-react-example.js",
   "scripts": {
@@ -37,36 +37,36 @@
   },
   "homepage": "http://www.ag-grid.com/",
   "devDependencies": {
-    "babel-core": "6.26.3",
-    "babel-loader": "7.1.5",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-react": "6.24.1",
-    "babel-preset-stage-0": "6.24.1",
-    "babel-preset-stage-1": "6.24.1",
-    "css-loader": "1.0.0",
-    "file-loader": "1.1.11",
+    "@babel/core": "7.2.2",
+    "babel-loader": "8.0.4",
+    "@babel/preset-env": "7.2.3",
+    "@babel/preset-react": "7.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.0.x",
+    "merge2": "^1.2.3",
     "mkdirp": "0.5.1",
     "ncp": "2.0.0",
     "prop-types": "15.6.2",
-    "rimraf": "2.5.x",
-    "style-loader": "0.21.0",
-    "webpack": "^4.16.1",
-    "webpack-cli": "^3.0.8",
-    "webpack-dev-server": "^3.1.4"
+    "rimraf": "~2.6.2",
+    "style-loader": "~0.23.0",
+    "webpack": "4.28.3",
+    "webpack-cli": "3.2.0",
+    "webpack-dev-server": "3.1.14"
   },
   "dependencies": {
-    "ag-grid-community": "^19.0.0",
-    "ag-grid-enterprise": "^19.0.0",
-    "ag-grid-react": "^19.0.0",
-    "bootstrap": "3.3.7",
+    "ag-grid-community": "^20.0.0",
+    "ag-grid-enterprise": "^20.0.0",
+    "ag-grid-react": "^20.0.0",
+    "bootstrap": "4.1.3",
     "d3": "4.9.1",
-    "lodash": "4.17.4",
-    "react": "16.4.1",
-    "react-dom": "16.4.1",
-    "react-redux": "5.0.7",
+    "lodash": "^4.17.11",
+    "react": "16.7.0",
+    "react-dom": "16.7.0",
+    "react-redux": "6.0.0",
     "react-router-dom": "4.3.1",
-    "redux": "4.0.0"
+    "redux": "4.0.1"
   }
-}
+}

src-examples/App.jsx

@@ -8,7 +8,7 @@ import SimpleReduxDynamicExample from "./simpleReduxDynamicComponentExample/Simp
 
 const SideBar = () => (
     <div style={{float: "left", width: 335, marginRight: 25}}>
-        <ul className="nav nav-pills nav-stacked">
+        <ul className="nav nav-pills">
             <NavItem to='/rich-grid-declarative'>Rich Grid with Declarative Markup</NavItem>
             <NavItem to='/simple-redux-dynamic'>Simple Redux Dynamic Component Example</NavItem>
         </ul>

src-examples/NavItem.jsx

@@ -6,8 +6,8 @@ import {Link, Route} from 'react-router-dom'
 export default function NavItem({children, to, exact}) {
     return (
         <Route path={to} exact={exact} children={({match}) => (
-            <li className={match ? 'active' : null}>
-                <Link to={to}>{children}</Link>
+            <li className="nav-item">
+                <Link className={match ? 'nav-link active' : 'nav-link'} to={to}>{children}</Link>
             </li>
         )}/>
     )

src-examples/index.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script type="text/javascript" src="../dist/react-examples.js" charset="utf-8"></script>
     <!-- Example uses font awesome icons -->
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" rel="stylesheet">
 
     <style>
         html, body {
@@ -16,6 +16,10 @@
             line-height: 1
         }
 
+        h1 {
+            font-size: 1.5rem;
+        }
+
         div.card-body > a {
             margin-top: 5px
         }

src-examples/richGridDeclarativeExample/DateComponent.jsx

@@ -51,11 +51,11 @@ export default class DateComponent extends React.Component {
         return (
             <div style={filterStyle}>
                 <span style={resetStyle} onClick={this.resetDate.bind(this)}>x</span>
-                <input onInput={this.onDateChanged.bind(this)} ref="dd" placeholder="dd" style={ddStyle}
+                <input onChange={this.onDateChanged.bind(this)} ref="dd" placeholder="dd" style={ddStyle}
                        value={this.state.textBoxes.dd} maxLength="2"/>/
-                <input onInput={this.onDateChanged.bind(this)} ref="mm" placeholder="mm" style={mmStyle}
+                <input onChange={this.onDateChanged.bind(this)} ref="mm" placeholder="mm" style={mmStyle}
                        value={this.state.textBoxes.mm} maxLength="2"/>/
-                <input onInput={this.onDateChanged.bind(this)} ref="yyyy" placeholder="yyyy" style={yyyyStyle}
+                <input onChange={this.onDateChanged.bind(this)} ref="yyyy" placeholder="yyyy" style={yyyyStyle}
                        value={this.state.textBoxes.yyyy} maxLength="4"/>
             </div>
         );

src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx

@@ -25,12 +25,12 @@ export default class RichGridDeclarativeExample extends Component {
             sideBar: false,
             rowData: new RowDataFactory().createRowData(),
             icons: {
-                columnRemoveFromGroup: '<i class="fa fa-remove"/>',
+                columnRemoveFromGroup: '<i class="fa fa-times"/>',
                 filter: '<i class="fa fa-filter"/>',
-                sortAscending: '<i class="fa fa-long-arrow-down"/>',
-                sortDescending: '<i class="fa fa-long-arrow-up"/>',
-                groupExpanded: '<i class="fa fa-minus-square-o"/>',
-                groupContracted: '<i class="fa fa-plus-square-o"/>'
+                sortAscending: '<i class="fa fa-long-arrow-alt-down"/>',
+                sortDescending: '<i class="fa fa-long-arrow-alt-up"/>',
+                groupExpanded: '<i class="far fa-minus-square"/>',
+                groupContracted: '<i class="far fa-plus-square"/>'
             }
         };
     }
@@ -157,7 +157,7 @@ export default class RichGridDeclarativeExample extends Component {
                             <button onClick={this.invokeSkillsFilterMethod}
                                     className="btn btn-primary">Invoke Skills Filter Method
                             </button>
-                            <button onClick={this.dobFilter} className="btn btn-primary">DOB equals to 01/01/2000ß
+                            <button onClick={this.dobFilter} className="btn btn-primary">DOB equals to 01/01/2000
                             </button>
                         </div>
                     </div>
@@ -179,12 +179,9 @@ export default class RichGridDeclarativeExample extends Component {
                             rowData={this.state.rowData}
 
                             // no binding, just providing hard coded strings for the properties
-                            // boolean properties will default to true if provided (ie enableColResize => enableColResize="true")
+                            // boolean properties will default to true if provided (ie suppressRowClickSelection => suppressRowClickSelection="true")
                             suppressRowClickSelection
                             rowSelection="multiple"
-                            enableColResize
-                            enableSorting
-                            enableFilter
                             floatingFilter
                             groupHeaders
 
@@ -193,6 +190,9 @@ export default class RichGridDeclarativeExample extends Component {
 
                             // setting default column properties
                             defaultColDef={{
+                                resizable: true,
+                                sortable: true,
+                                filter: true,
                                 headerComponentFramework: SortableHeaderComponent,
                                 headerComponentParams: {
                                     menuIcon: 'fa-bars'
@@ -200,7 +200,7 @@ export default class RichGridDeclarativeExample extends Component {
                             }}
                         >
                             <AgGridColumn headerName="#" width={30}
-                                          checkboxSelection suppressSorting suppressMenu suppressFilter pinned>
+                                          checkboxSelection sortable={false} suppressMenu filter={false} pinned>
                             </AgGridColumn>
                             <AgGridColumn headerName="Employee" headerGroupComponentFramework={HeaderGroupComponent}>
                                 <AgGridColumn field="name" width={150}
@@ -218,10 +218,10 @@ export default class RichGridDeclarativeExample extends Component {
                                               cellRenderer={RichGridDeclarativeExample.dateCellRenderer}/>
                             </AgGridColumn>
                             <AgGridColumn headerName="IT Skills">
-                                <AgGridColumn field="skills" width={120} enableRowGroup enablePivot suppressSorting
+                                <AgGridColumn field="skills" width={120} enableRowGroup enablePivot sortable={false}
                                               cellRendererFramework={SkillsCellRenderer}
                                               filterFramework={SkillsFilter}/>
-                                <AgGridColumn field="proficiency" width={135} enableValue
+                                <AgGridColumn field="proficiency" width={160} enableValue
                                               cellRendererFramework={ProficiencyCellRenderer}
                                               filterFramework={ProficiencyFilter}/>
                             </AgGridColumn>
@@ -232,7 +232,7 @@ export default class RichGridDeclarativeExample extends Component {
                             </AgGridColumn>
                         </AgGridReact>
                     </div>
-                    <div>
+                    <div style={{marginTop: 10}}>
                         <div className="row">
                             <div className="col-sm-12"><h1>Rich Grid with Declarative Markup Example</h1></div>
                         </div>

src-examples/richGridDeclarativeExample/SortableHeaderComponent.jsx

@@ -30,10 +30,10 @@ export default class SortableHeaderComponent extends React.Component {
 
             sortElements.push(<div key={`up${this.props.displayName}`} className={downArrowClass}
                                    onClick={this.onSortRequested.bind(this, 'desc')}><i
-                className="fa fa-long-arrow-down"/></div>);
+                className="fa fa-long-arrow-alt-down"/></div>);
             sortElements.push(<div key={`down${this.props.displayName}`} className={upArrowClass}
                                    onClick={this.onSortRequested.bind(this, 'asc')}><i
-                className="fa fa-long-arrow-up"/></div>);
+                className="fa fa-long-arrow-alt-up"/></div>);
             sortElements.push(<div key={`minus${this.props.displayName}`} className={removeArrowClass}
                                    onClick={this.onSortRequested.bind(this, '')}><i
                 className="fa fa-times"/></div>)

src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx

@@ -1,8 +1,7 @@
 import React, {Component} from "react";
-import * as PropTypes from "prop-types";
+import {connect} from "react-redux";
 
 import {AgGridReact} from "ag-grid-react";
-import {connect} from "react-redux";
 
 import PriceRenderer from "./PriceRenderer";
 
@@ -47,7 +46,6 @@ class GridComponent extends Component {
                     rowData={this.props.rowData}
 
                     reactNext={true}
-                    reduxStore={this.context.store} // must be supplied when using redux with reactNext
 
                     // events
                     onGridReady={this.onGridReady}>
@@ -57,10 +55,6 @@ class GridComponent extends Component {
     }
 }
 
-GridComponent.contextTypes = {
-    store: PropTypes.object                         // must be supplied when using redux with reactNext
-};
-
 // pull off row data changes
 export default connect(
     (state) => {

src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx

@@ -1,6 +1,8 @@
 import React, {Component} from "react";
 import {connect} from "react-redux";
 
+import FontContext from './fontContext'
+
 class PriceRenderer extends Component {
     constructor(props) {
         super(props);
@@ -18,7 +20,10 @@ class PriceRenderer extends Component {
 
     render() {
         return (
-            <span>{this.props.currencySymbol}{this.state.convertedValue}</span>
+            <FontContext.Consumer>
+                {fontWeight => <span
+                    style={{fontWeight}}> {this.props.currencySymbol}{this.state.convertedValue}</span>}
+            </FontContext.Consumer>
         );
     }
 
@@ -36,5 +41,5 @@ export default connect(
     },
     null,
     null,
-    { withRef: true } // must be supplied for react/redux when using GridOptions.reactNext
+    {forwardRef: true} // must be supplied for react/redux when using GridOptions.reactNext
 )(PriceRenderer);

src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx

@@ -9,6 +9,8 @@ import GridComponent from "./GridComponent";
 
 import gridData from "./gridDataReducer";
 
+import FontContext from './fontContext'
+
 let store = createStore(gridData);
 
 /*
@@ -26,7 +28,9 @@ export default class SimpleReduxExample extends Component {
                 <div>
                     <h1>Simple Redux Example using Connected React Components</h1>
                     <HeaderComponent/>
-                    <GridComponent/>
+                    <FontContext.Provider value="bold">
+                        <GridComponent/>
+                    </FontContext.Provider>
                 </div>
             </Provider>
         )

src-examples/simpleReduxDynamicComponentExample/fontContext.js

@@ -0,0 +1,3 @@
+import React from "react";
+
+export default React.createContext('normal');

src-trader-dashboard/components/FxQuoteMatrix.jsx

@@ -3,9 +3,6 @@ import {connect} from "react-redux";
 
 import {AgGridReact} from "ag-grid-react";
 
-import assign from "lodash/assign";
-import uniq from "lodash/uniq";
-
 class FxQuoteMatrix extends Component {
     constructor(props) {
         super(props);
@@ -35,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() {
@@ -64,8 +63,10 @@ class FxQuoteMatrix extends Component {
                 <AgGridReact
                     // properties
                     columnDefs={this.state.columnDefs}
-                    enableSorting="false"
-                    enableFilter="false"
+                    defaultColDef={{
+                        sortable: false,
+                        filter: false
+                    }}
 
                     // callbacks
                     getRowNodeId={this.getRowNodeId}
@@ -81,7 +82,7 @@ class FxQuoteMatrix extends Component {
 export default connect(
     (state) => {
         return {
-            rowData: state.fxData
+            rowData: state ? state.fxData : null
         }
     }
 )(FxQuoteMatrix);

src-trader-dashboard/components/PriceChangesGrid.jsx

@@ -155,7 +155,9 @@ export default class extends Component {
                 <AgGridReact
                     // properties
                     columnDefs={this.state.columnDefs}
-                    enableSorting="true"
+                    defaultColDef={{
+                        sortable: true
+                    }}
                     rowSelection="single"
 
                     // callbacks

src-trader-dashboard/components/TopMoversGrid.jsx

@@ -67,8 +67,10 @@ class TopMoversGrid extends Component {
                     // properties
                     columnDefs={this.state.columnDefs}
                     rowData={this.props.rowData}
-                    enableSorting
-                    enableFilter="false"
+                    defaultColDef={{
+                        sortable: true,
+                        filter: false
+                    }}
                     animateRows
                     deltaRowDataMode
                     getRowNodeId={this.getRowNodeId}
@@ -84,7 +86,7 @@ class TopMoversGrid extends Component {
 export default connect(
     (state) => {
         return {
-            rowData: state.fxTopMovers
+            rowData: state ? state.fxTopMovers : null
         }
     }
 )(TopMoversGrid);