Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Update ag-grid dependency to 31 #1616

Merged
merged 1 commit into from
Mar 25, 2024
Merged

[Backport 2.x] Update ag-grid dependency to 31 #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"cypress:parallel": "cypress-parallel -s cypress:run -t 2 -d .cypress/integration"
},
"dependencies": {
"@ag-grid-community/styles": "^31.2.0",
"@algolia/autocomplete-core": "^1.4.1",
"@algolia/autocomplete-theme-classic": "^1.2.1",
"@nteract/outputs": "^3.0.11",
"@nteract/presentational-components": "^3.4.3",
"@reduxjs/toolkit": "^1.6.1",
"ag-grid-community": "^27.3.0",
"ag-grid-react": "^27.3.0",
"ag-grid-react": "^31.2.0",
"ajv": "^8.11.0",
"antlr4": "4.8.0",
"antlr4ts": "^0.5.0-alpha.4",
Expand Down
9 changes: 4 additions & 5 deletions public/components/visualizations/charts/data_table/data_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

// ag-data-grid
import { AgGridReact } from 'ag-grid-react';
import 'ag-grid-community/dist/styles/ag-grid.css';
import 'ag-grid-community/dist/styles/ag-theme-alpine.css';
import '@ag-grid-community/styles/ag-grid.css';
import '@ag-grid-community/styles/ag-theme-alpine.css';

// grid elements
import { CustomOverlay, RowConfigType, GridHeader } from './data_table_header';
Expand All @@ -18,7 +18,6 @@
// constants
import { COLUMN_DEFAULT_MIN_WIDTH, HEADER_HEIGHT } from '../../../../../common/constants/explorer';
import { IVisualizationContainerProps, IField } from '../../../../../common/types/explorer';
import 'ag-grid-community/dist/styles/ag-theme-alpine-dark.css';

// styles
import './data_table.scss';
Expand All @@ -27,7 +26,7 @@
return params.data[params.column.colId];
};

export const DataTable = ({ visualizations, layout, config }: any) => {

Check failure on line 29 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

'layout' is defined but never used. Allowed unused args must match /^_/u

Check failure on line 29 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

'config' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
const {
data: {
explorer: {
Expand Down Expand Up @@ -91,8 +90,8 @@
);

// ag-grid-react bindings
const gridRef = useRef<any | undefined>();

Check warning on line 93 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
const gridRefFullScreen = useRef<any | undefined>();

Check warning on line 94 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
const [pageSize, setPageSize] = useState<number>(10);
const [columnVisibility, setColumnVisibility] = useState<string[]>([]);
const [isFullScreen, setIsFullScreen] = useState<boolean>(false);
Expand Down Expand Up @@ -122,20 +121,20 @@
if (!chartStyles.columnWidth) {
gridRef?.current?.api?.sizeColumnsToFit();
} else {
columns.forEach((col: any) =>

Check warning on line 124 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
gridRef?.current?.columnApi?.setColumnWidth(col.field, Number(columnWidth))
);
}
}, [columnWidth, columns]);

Check warning on line 128 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

React Hook useEffect has a missing dependency: 'chartStyles.columnWidth'. Either include it or remove the dependency array

const onPageSizeChanged = useCallback(
(val: number) => {
setPageSize(val);
gridRef.current.api.paginationSetPageSize(val);
gridRef.current.api.setGridOption('paginationPageSize', val);

Check warning on line 133 in public/components/visualizations/charts/data_table/data_table.tsx

View check run for this annotation

Codecov / codecov/patch

public/components/visualizations/charts/data_table/data_table.tsx#L133 

Added line #L133 was not covered by tests
setActivePage(0);
gridRef.current.api.paginationGoToPage(0);
if (isFullScreen) {
gridRefFullScreen.current.api.paginationSetPageSize(val);
gridRefFullScreen.current.api.setGridOption('paginationPageSize', val);

Check warning on line 137 in public/components/visualizations/charts/data_table/data_table.tsx

View check run for this annotation

Codecov / codecov/patch

public/components/visualizations/charts/data_table/data_table.tsx#L137 

Added line #L137 was not covered by tests
gridRefFullScreen.current.api.paginationGoToPage(0);
}
},
Expand Down Expand Up @@ -164,7 +163,7 @@
gridRef?.current?.columnApi?.setColumnsVisible([field], false);
}
setColumnVisibility([...columnVisibility]);
}, []);

Check warning on line 166 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

React Hook useCallback has a missing dependency: 'columnVisibility'. Either include it or remove the dependency array. You can also do a functional update 'setColumnVisibility(c => ...)' if you only need 'columnVisibility' in the 'setColumnVisibility' call

const goToPage = ({ selected }: { selected: number }) => {
setActivePage(selected);
Expand All @@ -178,7 +177,7 @@
setIsFullScreen(val);
};

const hideGridFullScreenHandler = (e: any) => {

Check warning on line 180 in public/components/visualizations/charts/data_table/data_table.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
if (e.key === 'Escape') {
setIsFullScreen(false);
}
Expand Down
22 changes: 14 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# yarn lockfile v1


"@ag-grid-community/styles@^31.2.0":
version "31.2.0"
resolved "https://registry.yarnpkg.com/@ag-grid-community/styles/-/styles-31.2.0.tgz#7605338f2e0f3a3c2e7952f0e96360600033316c"
integrity sha512-fU6wDpK0//dJLp5pwojuTUQPi4nVZ4iTBF1yaQw+6NXeGi0ma7rz7IOS6Idw0XXE3ELKGTuO7QUJmxxdL7kykw==

"@algolia/autocomplete-core@^1.4.1":
version "1.11.0"
resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.11.0.tgz#9db68f2aa38fe3149507d214082a1926b6b91fac"
Expand Down Expand Up @@ -359,16 +364,17 @@ acorn@^7.1.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==

ag-grid-community@^27.3.0:
version "27.3.0"
resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-27.3.0.tgz#b1e94a58026aaf2f0cd7920e35833325b5e762c7"
integrity sha512-R5oZMXEHXnOLrmhn91J8lR0bv6IAnRcU6maO+wKLMJxffRWaAYFAuw1jt7bdmcKCv8c65F6LEBx4ykSOALa9vA==
ag-grid-community@31.2.0:
version "31.2.0"
resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-31.2.0.tgz#376f07a3a7dd5c87d8cb6f660e4e338ec70663d1"
integrity sha512-Ija6X171Iq3mFZASZlriQIIdEFqA71rZIsjQD6KHy5lMmxnoseZTX2neThBav1gvr6SA6n5B2PD6eUHdZnrUfw==

ag-grid-react@^27.3.0:
version "27.3.0"
resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-27.3.0.tgz#fe06647653f8b0b349b8e613aab8ea2e07915562"
integrity sha512-2bs9YfJ/shvBZQLLjny4NFvht+ic6VtpTPO0r3bHHOhlL3Fjx2rGvS6AHSwfvu+kJacHCta30PjaEbX8T3UDyw==
ag-grid-react@^31.2.0:
version "31.2.0"
resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-31.2.0.tgz#c3e90edd4ccac3fbb113b657ad6192bc2d85e314"
integrity sha512-ObFdPmF3EC7/xWZX8NjrZjURePyFa72MWjb1ZgUqDP7Wq09OSXXyKBN1qXmfUIT3h4o5+os6tCQEqoo7Op+3ZA==
dependencies:
ag-grid-community "31.2.0"
prop-types "^15.8.1"

aggregate-error@^3.0.0:
Expand Down
Loading