Skip to content

Commit 027510c

Browse files
committed
Merge remote-tracking branch 'origin/main' into eslint/fix-unused-import-rule
# Conflicts: # src/pages/common/paper-form.tsx
2 parents 95e8ff4 + f4f47d8 commit 027510c

File tree

10 files changed

+57
-51
lines changed

10 files changed

+57
-51
lines changed

package-lock.json

Lines changed: 40 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"@emotion/react": "^11.14.0",
1818
"@emotion/styled": "^11.14.1",
19-
"@gridsuite/commons-ui": "0.139.0",
19+
"@gridsuite/commons-ui": "0.142.0",
2020
"@hookform/resolvers": "^4.1.3",
2121
"@mui/icons-material": "^5.18.0",
2222
"@mui/lab": "5.0.0-alpha.175",
@@ -30,8 +30,8 @@
3030
"date-fns": "^4.1.0",
3131
"notistack": "^3.0.2",
3232
"oidc-client": "^1.11.5",
33-
"react": "^18.3.1",
34-
"react-dom": "^18.3.1",
33+
"react": "^19.2.0",
34+
"react-dom": "^19.2.0",
3535
"react-hook-form": "^7.62.0",
3636
"react-hook-form-mui": "^7.6.2",
3737
"react-intl": "^7.1.11",
@@ -71,8 +71,8 @@
7171
"@types/license-checker": "^25.0.6",
7272
"@types/node": "^22.18.1",
7373
"@types/prop-types": "^15.7.15",
74-
"@types/react": "^18.3.24",
75-
"@types/react-dom": "^18.3.7",
74+
"@types/react": "^19.2.2",
75+
"@types/react-dom": "^19.2.1",
7676
"@types/react-redux": "^7.1.34",
7777
"@types/react-window": "^1.8.8",
7878
"@vitejs/plugin-react": "^5.0.4",

src/pages/common/paper-form.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import { Paper, PaperProps } from '@mui/material';
1212
* <Paper> is defined in <Dialog> without generics, which default to `PaperProps => PaperProps<'div'>`,
1313
* so we must trick typescript check with a cast
1414
*/
15-
const PaperForm: FunctionComponent<PaperProps<'form'> & { untypedProps?: PaperProps }> = (props, _context) => {
15+
const PaperForm: FunctionComponent<PaperProps<'form'> & { untypedProps: PaperProps }> = (props: {
16+
[x: string]: any;
17+
untypedProps: PaperProps;
18+
}) => {
1619
const { untypedProps, ...formProps } = props;
1720
const othersProps = untypedProps as PaperProps<'form'>; //trust me ts
1821
return <Paper component="form" {...formProps} {...(othersProps ?? {})} />;

src/pages/common/use-csv-export.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export function useCsvExport<TData>({
1818
intl,
1919
language,
2020
}: {
21-
gridRef: RefObject<GridTableRef<TData>>;
21+
gridRef: RefObject<GridTableRef<TData> | null>;
2222
columns: ColDef[];
2323
tableNameId: string;
2424
intl: IntlShape;
@@ -32,7 +32,7 @@ export function useCsvExport<TData>({
3232
disabled={false}
3333
skipColumnHeaders={false}
3434
language={language}
35-
exportDataAsCsv={(params) => gridRef?.current?.aggrid?.api?.exportDataAsCsv(params)}
35+
getData={(params) => gridRef?.current?.aggrid?.api?.exportDataAsCsv(params)}
3636
/>
3737
),
3838
[gridRef, columns, intl, language, tableNameId]

src/pages/groups/add-group-dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { GridTableRef } from '../../components/Grid';
2525
import PaperForm from '../common/paper-form';
2626

2727
export interface AddGroupDialogProps {
28-
gridRef: RefObject<GridTableRef<GroupInfos>>;
28+
gridRef: RefObject<GridTableRef<GroupInfos> | null>;
2929
open: boolean;
3030
setOpen: (open: boolean) => void;
3131
}

src/pages/groups/groups-table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { useSelector } from 'react-redux';
2121
import { AppState } from '../../redux/reducer';
2222

2323
export interface GroupsTableProps {
24-
gridRef: RefObject<GridTableRef<GroupInfos>>;
24+
gridRef: RefObject<GridTableRef<GroupInfos> | null>;
2525
onRowClicked: (event: RowClickedEvent<GroupInfos>) => void;
2626
setOpenAddGroupDialog: (open: boolean) => void;
2727
}

src/pages/profiles/add-profile-dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { GridTableRef } from '../../components/Grid';
2525
import PaperForm from '../common/paper-form';
2626

2727
export interface AddProfileDialogProps {
28-
gridRef: RefObject<GridTableRef<UserProfile>>;
28+
gridRef: RefObject<GridTableRef<UserProfile> | null>;
2929
open: boolean;
3030
setOpen: (open: boolean) => void;
3131
}

src/pages/profiles/profiles-table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import ValidityCellRenderer from './validity-cell-renderer';
1818
import { useTableSelection } from '../../utils/hooks';
1919

2020
export interface ProfilesTableProps {
21-
gridRef: RefObject<GridTableRef<UserProfile>>;
21+
gridRef: RefObject<GridTableRef<UserProfile> | null>;
2222
onRowClicked: (event: RowClickedEvent<UserProfile>) => void;
2323
setOpenAddProfileDialog: (open: boolean) => void;
2424
}

src/pages/users/add-user-dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { GridTableRef } from '../../components/Grid';
2525
import PaperForm from '../common/paper-form';
2626

2727
export interface AddUserDialogProps {
28-
gridRef: RefObject<GridTableRef<UserInfos>>;
28+
gridRef: RefObject<GridTableRef<UserInfos> | null>;
2929
open: boolean;
3030
setOpen: (open: boolean) => void;
3131
}

src/pages/users/users-table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { AppState } from '../../redux/reducer';
2121
import { useCsvExport } from '../common/use-csv-export';
2222

2323
export interface UsersTableProps {
24-
gridRef: RefObject<GridTableRef<UserInfos>>;
24+
gridRef: RefObject<GridTableRef<UserInfos> | null>;
2525
onRowClicked: (event: RowClickedEvent<UserInfos>) => void;
2626
setOpenAddUserDialog: (open: boolean) => void;
2727
}

0 commit comments

Comments
 (0)