Merge branch 'b22.0.0' into latest

This commit is contained in:
Sean Landsman
2019-11-11 15:02:22 +00:00
18 changed files with 41 additions and 33 deletions

View File

@@ -35,9 +35,9 @@ module.exports = {
},
resolve: {
alias: {
"@ag-community/grid-core/modules": path.resolve('./node_modules/@ag-community/grid-core/dist/es2015/modules'),
"@ag-community/grid-core": path.resolve('./node_modules/@ag-community/grid-core'),
"ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
// "@ag-grid-community/core/modules": path.resolve('./node_modules/@ag-grid-community/core/dist/es2015/modules'),
"@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'),
// "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
react: path.resolve('./node_modules/react')
},
extensions: ['.js', '.jsx']

View File

@@ -31,7 +31,7 @@ module.exports = {
},
resolve: {
alias: {
"@ag-community/grid-core": path.resolve('./node_modules/@ag-community/grid-core'),
"@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'),
"ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
react: path.resolve('./node_modules/react')
},

View File

@@ -31,7 +31,7 @@ module.exports = {
},
resolve: {
alias: {
"@ag-community/grid-core": path.resolve('./node_modules/@ag-community/grid-core'),
"@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'),
"ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
react: path.resolve('./node_modules/react')
},

View File

@@ -1,6 +1,6 @@
{
"name": "ag-grid-react-example",
"version": "21.0.0",
"version": "22.0.0",
"description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js",
"scripts": {
@@ -38,6 +38,7 @@
},
"homepage": "http://www.ag-grid.com/",
"devDependencies": {
"@ag-grid-community/core": "~22.0.0",
"@babel/core": "7.4.4",
"@babel/plugin-proposal-class-properties": "7.4.4",
"@babel/plugin-proposal-function-bind": "7.2.0",
@@ -61,10 +62,8 @@
"webpack-dev-server": "3.4.1"
},
"dependencies": {
"@ag-community/grid-core": "^21.0.0",
"@ag-community/grid-all-modules": "^21.0.0",
"@ag-enterprise/grid-all-modules": "^21.0.0",
"@ag-community/grid-react": "~21.2.0",
"@ag-grid-enterprise/all-modules": "~22.0.0",
"@ag-grid-community/react": "~22.0.0",
"bootstrap": "4.3.1",
"d3": "4.9.1",
"lodash": "4.17.11",

View File

@@ -4,14 +4,14 @@ import React from "react";
import {render} from "react-dom";
import {BrowserRouter} from "react-router-dom";
import "@ag-community/grid-core/dist/styles/ag-grid.css";
import "@ag-community/grid-core/dist/styles/ag-theme-balham.css";
import "@ag-grid-enterprise/all-modules/dist/styles/ag-grid.css";
import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-balham.css";
import "../node_modules/bootstrap/dist/css/bootstrap.css";
import App from "./App";
// only required when using enterprise features
// import {LicenseManager} from "ag-grid-enterprise/main";
// import {LicenseManager} from "@ag-grid-enterprise/all-modules";
// LicenseManager.setLicenseKey("<your license key>");
document.addEventListener('DOMContentLoaded', () => {

View File

@@ -1,5 +1,5 @@
import React, {Component} from "react";
import {AgGridColumn, AgGridReact} from "@ag-community/grid-react";
import {AgGridColumn, AgGridReact} from "@ag-grid-community/react";
import RowDataFactory from "./RowDataFactory";
import DateComponent from "./DateComponent.jsx";
import SkillsCellRenderer from './SkillsCellRenderer.jsx';
@@ -14,10 +14,10 @@ import SortableHeaderComponent from './SortableHeaderComponent.jsx';
import "./RichGridDeclarativeExample.css";
// for community features
// import {AllCommunityModules} from "@ag-community/grid-all-modules";
// import {AllCommunityModules} from "@ag-grid-community/all-modules";
// for enterprise features
import {AllModules} from "@ag-enterprise/grid-all-modules";
import {AllModules} from "@ag-grid-enterprise/all-modules";
export default class RichGridDeclarativeExample extends Component {
constructor(props) {

View File

@@ -1,6 +1,6 @@
import React, {Component} from "react";
import {connect} from "react-redux";
import {AgGridReact} from "@ag-community/grid-react";
import {AgGridReact} from "@ag-grid-community/react";
import PriceRenderer from "./PriceRenderer";

View File

@@ -1,7 +1,5 @@
import React, {Component} from "react";
import {connect} from "react-redux";
// take this line out if you do not want to use ag-Grid-Enterprise
// import "ag-grid-enterprise";
import {setCurrency, updateRowData} from "./gridDataActions";

View File

@@ -1,8 +1,6 @@
import React, {Component} from "react";
import {Provider} from "react-redux";
import {createStore} from "redux";
// take this line out if you do not want to use ag-Grid-Enterprise
// import "ag-grid-enterprise";
import HeaderComponent from "./HeaderComponent";
import GridComponent from "./GridComponent";

View File

@@ -1,6 +1,6 @@
import React, {useContext} from "react";
import {Context} from "./store";
import {AgGridReact} from "@ag-community/grid-react";
import {AgGridReact} from "@ag-grid-community/react";
/*
* This component serves to display the row data (provided by redux)

View File

@@ -4,8 +4,8 @@ import ReactDOM from 'react-dom';
import React from 'react';
import LargeGrid from './largeGrid.jsx';
import '@ag-community/grid-core/dist/styles/ag-grid.css';
import '@ag-community/grid-core/dist/styles/ag-theme-fresh.css';
import '@ag-grid-community/core/dist/styles/ag-grid.css';
import '@ag-grid-community/core/dist/styles/ag-theme-fresh.css';
// waiting for dom to load before booting react. we could alternatively
// put the index.js reference at the end fo the index.html, but i prefer this way.

View File

@@ -1,12 +1,12 @@
import React, {Component} from 'react';
import SimpleCellRenderer from './simpleCellRenderer.jsx';
import {AgGridReact} from '@ag-community/grid-react';
import {AgGridReact} from '@ag-grid-community/react';
// for community features
import {AllCommunityModules} from "@ag-community/grid-all-modules";
import {AllModules} from "@ag-grid-enterprise/all-modules";
// for enterprise features
// import {AllModules} from "@ag-enterprise/grid-all-modules";
// import {AllModules} from "@ag-grid-enterprise/all-modules";
export default class MyApp extends Component {
@@ -64,7 +64,7 @@ export default class MyApp extends Component {
render() {
return (
<div style={{height: '100%'}} className="ag-theme-fresh">
<AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData} modules={AllCommunityModules}/>
<AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData} modules={AllModules}/>
</div>
);
}

View File

@@ -1,7 +1,9 @@
import React, {Component} from "react";
import {connect} from "react-redux";
import {AgGridReact} from "@ag-community/grid-react";
import {AgGridReact} from "@ag-grid-community/react";
import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules";
class FxQuoteMatrix extends Component {
constructor(props) {
@@ -71,6 +73,8 @@ class FxQuoteMatrix extends Component {
// callbacks
getRowNodeId={this.getRowNodeId}
modules={[ClientSideRowModelModule]}
// events
onGridReady={this.onGridReady}>
</AgGridReact>

View File

@@ -1,6 +1,7 @@
import React, {Component} from "react";
import {AgGridReact} from "@ag-community/grid-react";
import {AgGridReact} from "@ag-grid-community/react";
import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules";
import map from "lodash/map";
import difference from "lodash/difference";
@@ -160,6 +161,8 @@ export default class extends Component {
}}
rowSelection="single"
modules={[ClientSideRowModelModule]}
// callbacks
getRowNodeId={this.getRowNodeId}

View File

@@ -1,7 +1,8 @@
import React, {Component} from "react";
import {connect} from "react-redux";
import {AgGridReact} from "@ag-community/grid-react";
import {AgGridReact} from "@ag-grid-community/react";
import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules";
class TopMoversGrid extends Component {
constructor(props) {
@@ -75,6 +76,8 @@ class TopMoversGrid extends Component {
deltaRowDataMode
getRowNodeId={this.getRowNodeId}
modules={[ClientSideRowModelModule]}
// events
onGridReady={this.onGridReady}>
</AgGridReact>

View File

@@ -8,6 +8,9 @@ import {Provider} from "react-redux";
import StoreService from './services/StoreService';
import TraderDashboard from "./components/TraderDashboard.jsx";
import "@ag-grid-enterprise/all-modules/dist/styles/ag-grid.css";
import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-fresh.css";
let store = StoreService.STORE;
document.addEventListener('DOMContentLoaded', () => {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import {AgGridReact} from '@ag-community/grid-react';
import {AgGridReact} from '@ag-grid-community/react';
export const App: React.FunctionComponent = () => <AgGridReact invalidProperty columnDefs={[]} rowData={[]}/>;

View File

@@ -1,4 +1,4 @@
import React from 'react';
import {AgGridReact} from '@ag-community/grid-react';
import {AgGridReact} from '@ag-grid-community/react';
export const App: React.FunctionComponent = () => <AgGridReact columnDefs={[]} rowData={[]}/>;