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

migrate aggrid into v33 #667

Merged
merged 5 commits into from
Jan 22, 2025
Merged

migrate aggrid into v33 #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93e51fb
migrate aggrid into v33
achour94 Jan 12, 2025
4aab7db
Merge branch 'main' into upgrade-aggrid-to-v33
achour94 Jan 14, 2025
22f82dc
Fix grad and checkboxes definition
achour94 Jan 14, 2025
d942ac4
Merge branch 'main' into upgrade-aggrid-to-v33
achour94 Jan 15, 2025
51c39fe
Merge branch 'main' into upgrade-aggrid-to-v33
achour94 Jan 22, 2025
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
37 changes: 23 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@mui/material": "^5.15.14",
"@mui/system": "^5.15.15",
"@mui/x-tree-view": "^6.17.0",
"ag-grid-community": "^31.0.0",
"ag-grid-react": "^31.2.0",
"ag-grid-community": "^33.0.3",
"ag-grid-react": "^33.0.3",
"notistack": "^3.0.1",
"papaparse": "^5.4.1",
"react": "^18.2.0",
Expand Down Expand Up @@ -101,8 +101,8 @@
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
"@vitejs/plugin-react": "^4.2.1",
"ag-grid-community": "^31.0.0",
"ag-grid-react": "^31.2.0",
"ag-grid-community": "^33.0.3",
"ag-grid-react": "^33.0.3",
"babel-eslint": "^10.1.0",
"babel-preset-airbnb": "^5.0.0",
"babel-preset-vite": "^1.1.3",
Expand Down
3 changes: 1 addition & 2 deletions src/components/customAGGrid/customAggrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const onColumnResized = (params: ColumnResizedEvent) => {
if (column && colDefinedMinWidth && finished) {
const newWidth = column?.getActualWidth();
if (newWidth < colDefinedMinWidth) {
column?.setActualWidth(colDefinedMinWidth, params.source);
params.api.setColumnWidths([{ key: column, newWidth: colDefinedMinWidth }], finished, params.source);
}
}
};
Expand Down Expand Up @@ -66,7 +66,6 @@ export const CustomAGGrid = React.forwardRef<AgGridReact, CustomAGGridProps>((pr
<AgGridReact
ref={ref}
getLocaleText={getLocaleText}
suppressPropertyNamesCheck
onColumnResized={onColumnResized}
enableCellTextSelection
{...agGridReactProps}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still use the old styling system.

Suggested change
{...agGridReactProps}
theme="legacy"
{...agGridReactProps}

Expand Down
14 changes: 8 additions & 6 deletions src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import { v4 as uuid4 } from 'uuid';
import { UUID } from 'crypto';
import { FieldConstants } from '../../../utils/constants/fieldConstants';
import yup from '../../../utils/yupConfig';
import {
CustomAgGridTable,
ROW_DRAGGING_SELECTION_COLUMN_DEF,
} from '../../inputs/reactHookForm/agGridTable/CustomAgGridTable';
import { CustomAgGridTable } from '../../inputs/reactHookForm/agGridTable/CustomAgGridTable';
import { SelectInput } from '../../inputs/reactHookForm/selectInputs/SelectInput';
import { Generator, Load } from '../../../utils/types/equipmentTypes';
import { NumericEditor } from '../../inputs/reactHookForm/agGridTable/cellEditors/numericEditor';
Expand Down Expand Up @@ -129,11 +126,11 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi

const columnDefs = useMemo(() => {
const newColumnDefs: any[] = [
...ROW_DRAGGING_SELECTION_COLUMN_DEF,
{
headerName: intl.formatMessage({
id: FieldConstants.EQUIPMENT_ID,
}),
rowDrag: true,
field: FieldConstants.EQUIPMENT_ID,
editable: true,
singleClickEdit: true,
Expand Down Expand Up @@ -246,7 +243,12 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi
makeDefaultRowData={makeDefaultRowData}
pagination
paginationPageSize={100}
suppressRowClickSelection
rowSelection={{
mode: 'multiRow',
enableClickSelection: false,
checkboxes: true,
headerCheckbox: true,
}}
alwaysShowVerticalScroll
stopEditingWhenCellsLoseFocus
csvProps={{
Expand Down
21 changes: 5 additions & 16 deletions src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,10 @@ import 'ag-grid-community/styles/ag-grid.css';
import 'ag-grid-community/styles/ag-theme-alpine.css';
import { Box, useTheme } from '@mui/material';
import { useIntl } from 'react-intl';
import { CellEditingStoppedEvent, ColumnState, SortChangedEvent } from 'ag-grid-community';
import { CellEditingStoppedEvent, ColumnState, RowSelectionOptions, SortChangedEvent } from 'ag-grid-community';
import { BottomRightButtons } from './BottomRightButtons';
import { FieldConstants } from '../../../../utils/constants/fieldConstants';

export const ROW_DRAGGING_SELECTION_COLUMN_DEF = [
{
rowDrag: true,
headerCheckboxSelection: true,
checkboxSelection: true,
maxWidth: 50,
},
];

const style = (customProps: any) => ({
grid: (theme: any) => ({
width: 'auto',
Expand Down Expand Up @@ -92,7 +83,7 @@ export interface CustomAgGridTableProps {
defaultColDef: unknown;
pagination: boolean;
paginationPageSize: number;
suppressRowClickSelection: boolean;
rowSelection?: RowSelectionOptions | 'single' | 'multiple';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would prefer

Suggested change
rowSelection?: RowSelectionOptions | 'single' | 'multiple';
rowSelection?: AgGridReactProps['rowSelection'];

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dunno if the provideGlobalGridOptions({ theme: 'legacy' }); in fronts also affect the ones in this library 🤔

alwaysShowVerticalScroll: boolean;
stopEditingWhenCellsLoseFocus: boolean;
}
Expand All @@ -106,11 +97,11 @@ export function CustomAgGridTable({
defaultColDef,
pagination,
paginationPageSize,
suppressRowClickSelection,
rowSelection,
alwaysShowVerticalScroll,
stopEditingWhenCellsLoseFocus,
...props
}: CustomAgGridTableProps) {
}: Readonly<CustomAgGridTableProps>) {
// FIXME: right type => Theme --> not defined there ( gridStudy and gridExplore definition not the same )
const theme: any = useTheme();
const [gridApi, setGridApi] = useState<any>(null);
Expand Down Expand Up @@ -243,11 +234,10 @@ export function CustomAgGridTable({
onGridReady={onGridReady}
getLocaleText={getLocaleText}
cacheOverflowSize={10}
rowSelection="multiple"
rowSelection={rowSelection || 'multiple'}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rowSelection={rowSelection || 'multiple'}
rowSelection={rowSelection ?? 'multiple'}

rowDragEntireRow
rowDragManaged
onRowDragEnd={(e) => move(getIndex(e.node.data), e.overIndex)}
suppressBrowserResizeObserver
columnDefs={columnDefs}
detailRowAutoHeight
onSelectionChanged={() => {
Expand All @@ -259,7 +249,6 @@ export function CustomAgGridTable({
getRowId={(row) => row.data[FieldConstants.AG_GRID_ROW_UUID]}
pagination={pagination}
paginationPageSize={paginationPageSize}
suppressRowClickSelection={suppressRowClickSelection}
alwaysShowVerticalScroll={alwaysShowVerticalScroll}
stopEditingWhenCellsLoseFocus={stopEditingWhenCellsLoseFocus}
{...props}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still use the old styling system.

Suggested change
{...props}
theme="legacy"
{...props}

Expand Down
Loading