Skip to content

Commit 1acc755

Browse files
authored
Merge branch 'main' into fix_export_csv_export_button_status
2 parents 5510563 + 193b2b8 commit 1acc755

File tree

177 files changed

+3644
-3706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+3644
-3706
lines changed

package-lock.json

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

package.json

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,48 @@
1010
},
1111
"dependencies": {
1212
"@emotion/react": "^11.14.0",
13-
"@emotion/styled": "^11.14.0",
14-
"@gridsuite/commons-ui": "0.123.0",
13+
"@emotion/styled": "^11.14.1",
14+
"@gridsuite/commons-ui": "0.126.0",
1515
"@hello-pangea/dnd": "^18.0.1",
16-
"@hookform/resolvers": "^4.0.0",
17-
"@mui/icons-material": "^5.16.14",
16+
"@hookform/resolvers": "^4.1.3",
17+
"@mui/icons-material": "^5.18.0",
1818
"@mui/lab": "5.0.0-alpha.175",
19-
"@mui/material": "^5.16.14",
20-
"@mui/x-charts": "^7.25.0",
21-
"@mui/x-tree-view": "^7.28.1",
19+
"@mui/material": "^5.18.0",
20+
"@mui/x-charts": "^7.29.1",
21+
"@mui/x-tree-view": "^7.29.1",
2222
"@powsybl/network-viewer": "1.11.0",
23-
"@reduxjs/toolkit": "^2.5.1",
23+
"@reduxjs/toolkit": "^2.9.0",
2424
"@svgdotjs/svg.js": "^3.2.4",
25-
"@xyflow/react": "^12.4.2",
25+
"@xyflow/react": "^12.8.4",
2626
"ag-grid-community": "^33.1.0",
27-
"ag-grid-react": "^33.1.0",
27+
"ag-grid-react": "^33.3.2",
2828
"clsx": "^2.1.1",
29-
"core-js": "^3.40.0",
29+
"core-js": "^3.45.1",
3030
"eventemitter3": "^5.0.1",
3131
"localized-countries": "^2.0.0",
32-
"mathjs": "^14.2.1",
33-
"mui-nested-menu": "^4.0.0",
32+
"mathjs": "^14.7.0",
33+
"mui-nested-menu": "^4.0.1",
3434
"plotly.js-basic-dist-min": "^2.35.3",
3535
"qs": "^6.14.0",
3636
"react": "^18.3.1",
3737
"react-csv-downloader": "^3.3.0",
3838
"react-dom": "^18.3.1",
39-
"react-grid-layout": "^1.5.1",
40-
"react-hook-form": "^7.54.2",
41-
"react-intl": "^7.1.6",
39+
"react-grid-layout": "^1.5.2",
40+
"react-hook-form": "^7.62.0",
41+
"react-intl": "^7.1.11",
4242
"react-papaparse": "^4.4.0",
4343
"react-plotly.js": "^2.6.0",
4444
"react-redux": "^9.2.0",
4545
"react-resizable": "^3.0.5",
46-
"react-resizable-panels": "^2.1.7",
47-
"react-router": "^7.4.1",
48-
"react-virtualized-auto-sizer": "^1.0.25",
46+
"react-resizable-panels": "^2.1.9",
47+
"react-router": "^7.8.2",
48+
"react-virtualized-auto-sizer": "^1.0.26",
4949
"react-window": "^1.8.11",
5050
"reconnecting-websocket": "^4.4.0",
5151
"redux": "^5.0.1",
5252
"typeface-roboto": "^1.1.13",
53-
"uuid": "^11.0.5",
54-
"yup": "^1.6.1"
53+
"uuid": "^11.1.0",
54+
"yup": "^1.7.0"
5555
},
5656
"overrides": {
5757
"@powsybl/network-viewer": {
@@ -75,11 +75,11 @@
7575
"licenses-check": "license-checker --summary --excludePrivatePackages --production --onlyAllow \"$( jq -r .onlyAllow[] license-checker-config.json | tr '\n' ';')\" --excludePackages \"$( jq -r .excludePackages[] license-checker-config.json | tr '\n' ';')\""
7676
},
7777
"devDependencies": {
78-
"@babel/helper-builder-react-jsx": "^7.25.9",
78+
"@babel/helper-builder-react-jsx": "^7.27.1",
7979
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
80-
"@babel/preset-env": "^7.26.8",
81-
"@babel/preset-react": "^7.26.3",
82-
"@babel/preset-typescript": "^7.26.0",
80+
"@babel/preset-env": "^7.28.3",
81+
"@babel/preset-react": "^7.27.1",
82+
"@babel/preset-typescript": "^7.27.1",
8383
"@types/core-js": "^2.5.8",
8484
"@types/eslint": "^8.56.12",
8585
"@types/eslint-config-prettier": "^6.11.3",
@@ -89,44 +89,44 @@
8989
"@types/license-checker": "^25.0.6",
9090
"@types/localized-countries": "^2.0.3",
9191
"@types/lucene-escape-query": "^1.0.2",
92-
"@types/node": "^22.13.4",
92+
"@types/node": "^22.18.1",
9393
"@types/plotly.js-basic-dist-min": "^2.12.4",
94-
"@types/qs": "^6.9.18",
95-
"@types/react": "^18.3.18",
96-
"@types/react-dom": "^18.3.5",
94+
"@types/qs": "^6.14.0",
95+
"@types/react": "^18.3.24",
96+
"@types/react-dom": "^18.3.7",
9797
"@types/react-grid-layout": "^1.3.5",
9898
"@types/react-plotly.js": "^2.6.3",
9999
"@types/react-resizable": "^3.0.8",
100100
"@types/react-window": "^1.8.8",
101101
"@typescript-eslint/eslint-plugin": "^7.18.0",
102102
"@typescript-eslint/parser": "^7.18.0",
103-
"@vitejs/plugin-react": "^4.3.4",
103+
"@vitejs/plugin-react": "^4.7.0",
104104
"babel-eslint": "^10.1.0",
105105
"babel-preset-vite": "^1.1.3",
106106
"eslint": "^8.57.1",
107-
"eslint-config-prettier": "^10.1.1",
107+
"eslint-config-prettier": "^10.1.8",
108108
"eslint-config-react-app": "^7.0.1",
109109
"eslint-import-resolver-typescript": "3.8.3",
110110
"eslint-plugin-flowtype": "^8.0.3",
111-
"eslint-plugin-import": "^2.31.0",
111+
"eslint-plugin-import": "^2.32.0",
112112
"eslint-plugin-jsx-a11y": "^6.10.2",
113-
"eslint-plugin-prettier": "^5.2.5",
114-
"eslint-plugin-react": "^7.37.4",
113+
"eslint-plugin-prettier": "^5.5.4",
114+
"eslint-plugin-react": "^7.37.5",
115115
"eslint-plugin-react-hooks": "^4.6.2",
116-
"eslint-plugin-react-refresh": "^0.4.19",
116+
"eslint-plugin-react-refresh": "^0.4.20",
117117
"identity-obj-proxy": "^3.0.0",
118118
"jest": "^29.7.0",
119119
"jest-environment-jsdom": "^29.7.0",
120120
"license-checker": "^25.0.1",
121-
"prettier": "^3.5.3",
121+
"prettier": "^3.6.2",
122122
"prettier-plugin-properties": "^0.3.0",
123123
"svgo": "^3.3.2",
124124
"ts-node": "^10.9.2",
125-
"type-fest": "^4.34.1",
126-
"typescript": "~5.5.4",
127-
"vite": "^6.2.2",
125+
"type-fest": "^4.41.0",
126+
"typescript": "~5.6.3",
127+
"vite": "^6.3.6",
128128
"vite-plugin-eslint": "^1.8.1",
129-
"vite-plugin-svgr": "^4.3.0",
129+
"vite-plugin-svgr": "^4.5.0",
130130
"vite-tsconfig-paths": "^5.1.4"
131131
}
132132
}

src/components/breadcrumbs/root-network-select.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { Box, ListItemText, MenuItem, Select, Theme } from '@mui/material';
8+
import { Box, ListItemText, MenuItem, Select } from '@mui/material';
99
import { UUID } from 'crypto';
1010
import { RemoveRedEye, VisibilityOff } from '@mui/icons-material';
1111
import { RootNetworkMetadata } from '../graph/menus/network-modifications/network-modification-menu.type';
1212
import { useSyncNavigationActions } from 'hooks/use-sync-navigation-actions';
13-
import { mergeSx } from '@gridsuite/commons-ui';
13+
import { mergeSx, type MuiStyles } from '@gridsuite/commons-ui';
1414

1515
const styles = {
16-
selectRoot: (theme: Theme) => ({
16+
selectRoot: (theme) => ({
1717
height: theme.spacing(4),
1818
width: theme.spacing(15),
1919
paddingTop: theme.spacing(1),
@@ -22,7 +22,7 @@ const styles = {
2222
selectInput: { display: 'flex', gap: 1, alignItems: 'center' },
2323
selectItem: { gap: 1 },
2424
hiddenItem: { display: 'none' },
25-
};
25+
} as const satisfies MuiStyles;
2626

2727
interface RootNetworkSelectProps {
2828
currentRootNetworkUuid: UUID | null;

src/components/breadcrumbs/study-path-breadcrumbs.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import { MoreHoriz } from '@mui/icons-material';
99
import { Box, Breadcrumbs as MuiBreadcrumbs, Tooltip } from '@mui/material';
10+
import { type MuiStyles } from '@gridsuite/commons-ui';
1011
import { CurrentTreeNode } from '../graph/tree-node.type';
1112
import { useSelector } from 'react-redux';
1213
import { AppState } from '../../redux/reducer';
@@ -21,7 +22,7 @@ const styles = {
2122
alignItems: 'center',
2223
flexWrap: 'nowrap',
2324
},
24-
};
25+
} as const satisfies MuiStyles;
2526

2627
export interface StudyPathBreadcrumbsProps {
2728
studyName: string | undefined;

src/components/custom-aggrid/cell-renderers.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
*/
77

88
import { Box, Checkbox, Tooltip } from '@mui/material';
9-
import { Theme } from '@mui/material/styles';
109
import { ReactNode, useEffect, useRef, useState } from 'react';
11-
1210
import { isBlankOrEmpty } from 'components/utils/validation-functions';
1311
import { ICellRendererParams } from 'ag-grid-community';
1412
import { CustomCellRendererProps } from 'ag-grid-react';
15-
import { mergeSx } from '@gridsuite/commons-ui';
13+
import { mergeSx, type MuiStyles } from '@gridsuite/commons-ui';
1614

1715
const styles = {
18-
tableCell: (theme: Theme) => ({
16+
tableCell: (theme) => ({
1917
fontSize: 'small',
2018
cursor: 'inherit',
2119
display: 'flex',
@@ -35,7 +33,7 @@ const styles = {
3533
numericValue: {
3634
marginLeft: 'inherit',
3735
},
38-
};
36+
} as const satisfies MuiStyles;
3937

4038
export const BooleanCellRenderer = (props: any) => {
4139
const isChecked = props.value;

src/components/custom-aggrid/custom-aggrid-filters/custom-aggrid-boolean-filter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { useIntl } from 'react-intl';
1212
import { SelectChangeEvent } from '@mui/material/Select/SelectInput';
1313
import { useCustomAggridFilter } from './hooks/use-custom-aggrid-filter';
1414
import { isNonEmptyStringOrArray } from '../../../utils/types-utils';
15-
import { mergeSx } from '@gridsuite/commons-ui';
15+
import { mergeSx, type MuiStyles } from '@gridsuite/commons-ui';
1616
import { BooleanFilterValue } from './utils/aggrid-filters-utils';
1717
import { CustomAggridFilterParams, FILTER_DATA_TYPES, FILTER_TEXT_COMPARATORS } from './custom-aggrid-filter.type';
1818

@@ -22,7 +22,7 @@ const styles = {
2222
maxWidth: '40%',
2323
paddingRight: '0px',
2424
},
25-
};
25+
} as const satisfies MuiStyles;
2626

2727
export const CustomAggridBooleanFilter: FunctionComponent<CustomAggridFilterParams> = ({
2828
api,

src/components/custom-aggrid/custom-aggrid-filters/custom-aggrid-comparator-selector.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77
import React from 'react';
8-
import { Select, MenuItem } from '@mui/material';
9-
import { SelectChangeEvent } from '@mui/material/Select/SelectInput';
8+
import { MenuItem, Select, type SelectChangeEvent } from '@mui/material';
109
import { useIntl } from 'react-intl';
10+
import { type MuiStyles } from '@gridsuite/commons-ui';
1111

1212
const styles = {
1313
input: {
1414
minWidth: '250px',
1515
maxWidth: '40%',
1616
},
17-
};
17+
} as const satisfies MuiStyles;
1818

1919
interface CustomAggridComparatorSelectorProps {
2020
value: string;

src/components/custom-aggrid/custom-aggrid-filters/custom-aggrid-duration-filter.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { ChangeEvent, FunctionComponent, useCallback, useEffect, useState } from
88
import { Grid, IconButton, InputAdornment, TextField, Typography } from '@mui/material';
99
import { useIntl } from 'react-intl';
1010
import ClearIcon from '@mui/icons-material/Clear';
11+
import { type MuiStyles } from '@gridsuite/commons-ui';
1112
import { CustomAggridComparatorSelector } from './custom-aggrid-comparator-selector';
1213
import { SelectChangeEvent } from '@mui/material/Select/SelectInput';
1314
import { useCustomAggridFilter } from './hooks/use-custom-aggrid-filter';
@@ -33,7 +34,7 @@ const styles = {
3334
MozAppearance: 'textfield',
3435
},
3536
},
36-
};
37+
} as const satisfies MuiStyles;
3738

3839
const CustomAggridDurationFilter: FunctionComponent<CustomAggridFilterParams> = ({ api, colId, filterParams }) => {
3940
const intl = useIntl();

src/components/custom-aggrid/custom-aggrid-filters/custom-aggrid-filter.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
import React, { ComponentType, MouseEvent, useMemo, useState } from 'react';
88
import { Popover } from '@mui/material';
9+
import { type MuiStyles } from '@gridsuite/commons-ui';
910
import { CustomFilterIcon } from './custom-filter-icon';
1011
import { useCustomAggridFilter } from './hooks/use-custom-aggrid-filter';
1112
import { CustomAggridAutocompleteFilterParams } from './custom-aggrid-autocomplete-filter';
@@ -19,7 +20,7 @@ const styles = {
1920
autoCompleteInput: {
2021
width: '30%',
2122
},
22-
};
23+
} as const satisfies MuiStyles;
2324

2425
interface CustomAggridFilterWrapperParams<F extends CustomAggridFilterParams> {
2526
filterComponent: ComponentType<F>;

src/components/custom-aggrid/custom-aggrid-filters/custom-aggrid-text-filter.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77
import React, { useMemo } from 'react';
8-
import { TextField, Grid, InputAdornment, IconButton } from '@mui/material';
8+
import { Grid, IconButton, InputAdornment, TextField } from '@mui/material';
99
import ClearIcon from '@mui/icons-material/Clear';
1010
import { DisplayRounding } from '../display-rounding';
1111
import { useIntl } from 'react-intl';
12-
import { mergeSx } from '@gridsuite/commons-ui';
12+
import { mergeSx, type MuiStyles } from '@gridsuite/commons-ui';
1313
import { FILTER_DATA_TYPES } from './custom-aggrid-filter.type';
1414

1515
const styles = {
@@ -25,7 +25,7 @@ const styles = {
2525
MozAppearance: 'textfield',
2626
},
2727
},
28-
};
28+
} as const satisfies MuiStyles;
2929

3030
interface CustomAggridTextFilterProps {
3131
value: unknown;

0 commit comments

Comments
 (0)