From b03cd363378e6920f8cc9e8a008591595e1cbf34 Mon Sep 17 00:00:00 2001 From: basseche Date: Mon, 10 Feb 2025 14:49:43 +0100 Subject: [PATCH 1/2] Explicit naming filter : Selection column width is reduced Signed-off-by: basseche --- .../filter/explicitNaming/ExplicitNamingFilterForm.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx b/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx index 47b65175..02864737 100644 --- a/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx +++ b/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx @@ -133,6 +133,7 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi field: FieldConstants.EQUIPMENT_ID, editable: true, singleClickEdit: true, + flex: 1, valueParser: (params: ValueParserParams) => params.newValue?.trim() ?? null, }, ]; From 9b97a2ad4fd2bb953995ee2e46df42636a3d6dea Mon Sep 17 00:00:00 2001 From: basseche Date: Wed, 12 Feb 2025 16:02:34 +0100 Subject: [PATCH 2/2] Change size of repartition key column --- .../explicitNaming/ExplicitNamingFilterForm.tsx | 2 +- .../reactHookForm/agGridTable/CustomAgGridTable.tsx | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx b/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx index 02864737..c76c2b2a 100644 --- a/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx +++ b/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx @@ -144,7 +144,7 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi editable: true, singleClickEdit: true, cellEditor: NumericEditor, - maxWidth: 200, + flex: 1, }); } return newColumnDefs; diff --git a/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx b/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx index 306c7c23..42bbabfd 100644 --- a/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx +++ b/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx @@ -7,7 +7,7 @@ import { useCallback, useEffect, useState } from 'react'; import { useFieldArray, useFormContext } from 'react-hook-form'; -import { AgGridReact, AgGridReactProps } from 'ag-grid-react'; +import { AgGridReactProps } from 'ag-grid-react'; import 'ag-grid-community/styles/ag-grid.css'; import 'ag-grid-community/styles/ag-theme-alpine.css'; import { Box, useTheme } from '@mui/material'; @@ -15,6 +15,7 @@ import { useIntl } from 'react-intl'; import { CellEditingStoppedEvent, ColumnState, SortChangedEvent } from 'ag-grid-community'; import { BottomRightButtons } from './BottomRightButtons'; import { FieldConstants } from '../../../../utils/constants/fieldConstants'; +import { CustomAGGrid } from '../../../customAGGrid'; const style = (customProps: any) => ({ grid: (theme: any) => ({ @@ -181,12 +182,6 @@ export function CustomAgGridTable({ setNewRowAdded(true); }; - useEffect(() => { - if (gridApi) { - gridApi.api.sizeColumnsToFit(); - } - }, [columnDefs, gridApi]); - const intl = useIntl(); const getLocaleText = useCallback( (params: any) => { @@ -229,7 +224,7 @@ export function CustomAgGridTable({ return ( <> -