Skip to content

Commit 7e69ea2

Browse files
mcserepmcserep
authored
Merge pull request Ericsson#810 from mcserep/webgui-new-upgrade
Update new web GUI dependencies
2 parents ed87cc9 + 1e2679f commit 7e69ea2

File tree

13 files changed

+3589
-1827
lines changed

13 files changed

+3589
-1827
lines changed

‎webgui-new/package-lock.json‎

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

‎webgui-new/package.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,48 @@
1111
},
1212
"devDependencies": {
1313
"@creditkarma/thrift-typescript": "^3.7.6",
14-
"@types/dagre": "^0.7.48",
15-
"@types/express": "^4.17.17",
16-
"@types/react": "^18.2.48",
17-
"@types/react-dom": "^18.0.10",
18-
"@types/thrift": "^0.10.12",
19-
"@typescript-eslint/eslint-plugin": "^5.59.2",
20-
"@typescript-eslint/parser": "^5.59.2",
21-
"dotenv": "^16.0.3",
22-
"eslint": "^8.31.0",
23-
"eslint-config-next": "^13.1.1",
24-
"eslint-plugin-react": "^7.32.2",
25-
"eslint-plugin-react-hooks": "^4.6.0",
26-
"express": "^4.21.1",
27-
"http-proxy-middleware": "^3.0.0-beta.1",
28-
"ts-node": "^10.9.1",
29-
"typescript": "^5.3.3"
14+
"@types/dagre": "^0.7.53",
15+
"@types/express": "^4.17.23",
16+
"@types/react": "^18.3.24",
17+
"@types/react-dom": "^18.3.7",
18+
"@types/thrift": "^0.10.17",
19+
"@typescript-eslint/eslint-plugin": "^5.62.0",
20+
"@typescript-eslint/parser": "^5.62.0",
21+
"dotenv": "^16.6.1",
22+
"eslint": "^8.57.1",
23+
"eslint-config-next": "^13.5.11",
24+
"eslint-plugin-react": "^7.37.5",
25+
"eslint-plugin-react-hooks": "^4.6.2",
26+
"express": "^4.21.2",
27+
"http-proxy-middleware": "^3.0.5",
28+
"ts-node": "^10.9.2",
29+
"typescript": "^5.9.2"
3030
},
3131
"dependencies": {
32-
"@codemirror/lang-cpp": "^6.0.2",
33-
"@codemirror/lang-python": "^6.1.6",
34-
"@emotion/react": "^11.10.5",
35-
"@emotion/styled": "^11.10.5",
36-
"@mui/icons-material": "^5.11.0",
37-
"@mui/lab": "5.0.0-alpha.116",
38-
"@mui/material": "^5.15.6",
39-
"@uiw/codemirror-theme-github": "^4.19.8",
40-
"@uiw/react-codemirror": "^4.19.6",
32+
"@codemirror/lang-cpp": "^6.0.3",
33+
"@codemirror/lang-python": "^6.2.1",
34+
"@emotion/react": "^11.14.0",
35+
"@emotion/styled": "^11.14.1",
36+
"@mui/icons-material": "^5.18.0",
37+
"@mui/material": "^5.18.0",
38+
"@mui/x-tree-view": "^6.17.0",
39+
"@uiw/codemirror-theme-github": "^4.25.2",
40+
"@uiw/react-codemirror": "^4.25.2",
4141
"dagre": "^0.8.5",
42-
"devicons-react": "^1.2.5",
43-
"i18next": "^23.2.8",
44-
"next": "^14.2.32",
45-
"react": "^18.2.0",
46-
"react-diff-viewer-continued": "^3.2.6",
47-
"react-dom": "^18.2.0",
42+
"devicons-react": "^1.5.0",
43+
"i18next": "^23.16.8",
44+
"next": "^14.2.33",
45+
"react": "^18.3.1",
46+
"react-diff-viewer-continued": "^3.4.0",
47+
"react-dom": "^18.3.1",
4848
"react-ga4": "^2.1.0",
49-
"react-i18next": "^13.0.1",
50-
"react-icons": "^4.8.0",
51-
"react-toastify": "^9.1.2",
52-
"react-zoom-pan-pinch": "^3.0.5",
53-
"reactflow": "^11.10.3",
54-
"recharts": "^2.5.0",
55-
"sass": "^1.57.1",
49+
"react-i18next": "^13.5.0",
50+
"react-icons": "^4.12.0",
51+
"react-toastify": "^9.1.3",
52+
"react-zoom-pan-pinch": "^3.7.0",
53+
"reactflow": "^11.11.4",
54+
"recharts": "^2.15.4",
55+
"sass": "^1.93.2",
5656
"sharp": "^0.32.6",
5757
"thrift": "0.16.0"
5858
},

‎webgui-new/src/components/file-manager/file-manager.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,13 @@ export const FileManager = (): JSX.Element => {
224224
};
225225

226226
const handleTreeNodeSelect = () => {
227-
return (_e: SyntheticEvent<Element, Event>, nodeId: string) => {
227+
return (_e: SyntheticEvent<Element, Event>, nodeIds: string | string[]) => {
228228
if (!expandedFileTreeNodes) return;
229229

230+
// Handle both single string and array of strings
231+
const nodeId = Array.isArray(nodeIds) ? nodeIds[0] : nodeIds;
232+
if (!nodeId) return;
233+
230234
const index = expandedFileTreeNodes.indexOf(nodeId);
231235
const copyExpanded = [...expandedFileTreeNodes];
232236
if (index === -1) {

‎webgui-new/src/components/file-manager/styled-components.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TreeView, TreeItem, treeItemClasses } from '@mui/lab';
1+
import { TreeView, TreeItem, treeItemClasses } from '@mui/x-tree-view';
22
import { FormControlLabel, alpha, styled } from '@mui/material';
33

44
export const StyledDiv = styled('div')({});

‎webgui-new/src/components/file-name/styled-components.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TreeView, TreeItem, treeItemClasses } from '@mui/lab';
1+
import { TreeView, TreeItem, treeItemClasses } from '@mui/x-tree-view';
22
import { Menu, TableRow, alpha, styled } from '@mui/material';
33

44
export const StyledDiv = styled('div')({});

‎webgui-new/src/components/git-diff/git-diff.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,11 @@ export const GitDiff = (): JSX.Element => {
158158
defaultCollapseIcon={<TextSnippet />}
159159
defaultExpandIcon={<TextSnippet />}
160160
expanded={expandedFiles}
161-
onNodeSelect={(_e: SyntheticEvent<Element, Event>, nodeId: string) => {
161+
onNodeSelect={(_e: SyntheticEvent<Element, Event>, nodeIds: string | string[]) => {
162+
// Handle both single string and array of strings
163+
const nodeId = Array.isArray(nodeIds) ? nodeIds[0] : nodeIds;
164+
if (!nodeId) return;
165+
162166
const index = expandedFiles.indexOf(nodeId) as number;
163167
const copyExpanded = [...expandedFiles];
164168
if (index === -1) {

‎webgui-new/src/components/git-diff/styled-components.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TreeView, TreeItem, treeItemClasses } from '@mui/lab';
1+
import { TreeView, TreeItem, treeItemClasses } from '@mui/x-tree-view';
22
import { alpha, styled } from '@mui/material';
33

44
export const StyledSpan = styled('span')({});

‎webgui-new/src/components/info-tree/info-tree.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ export const InfoTree = (): JSX.Element => {
126126
defaultCollapseIcon={<ExpandMore />}
127127
sx={{ width: 'max-content', marginTop: '5px' }}
128128
expanded={expandedTreeNodes}
129-
onNodeSelect={(_e: SyntheticEvent<Element, Event>, nodeId: string) => {
129+
onNodeSelect={(_e: SyntheticEvent<Element, Event>, nodeIds: string | string[]) => {
130+
// Handle both single string and array of strings
131+
const nodeId = Array.isArray(nodeIds) ? nodeIds[0] : nodeIds;
132+
if (!nodeId) return;
133+
130134
const index = expandedTreeNodes.indexOf(nodeId) as number;
131135
const copyExpanded = [...expandedTreeNodes];
132136
if (index === -1) {

‎webgui-new/src/components/info-tree/styled-components.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TreeView, TreeItem, treeItemClasses } from '@mui/lab';
1+
import { TreeView, TreeItem, treeItemClasses } from '@mui/x-tree-view';
22
import { alpha, styled } from '@mui/material';
33

44
export const StyledDiv = styled('div')({});

‎webgui-new/src/components/revision-control/revision-control.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ export const RevisionControl = (): JSX.Element => {
255255
defaultCollapseIcon={<ExpandMore />}
256256
sx={{ width: 'max-content' }}
257257
expanded={expandedTreeNodes}
258-
onNodeSelect={(_e: SyntheticEvent<Element, Event>, nodeId: string) => {
258+
onNodeSelect={(_e: SyntheticEvent<Element, Event>, nodeIds: string | string[]) => {
259+
// Handle both single string and array of strings
260+
const nodeId = Array.isArray(nodeIds) ? nodeIds[0] : nodeIds;
261+
if (!nodeId) return;
262+
259263
const index = expandedTreeNodes.indexOf(nodeId) as number;
260264
const copyExpanded = [...expandedTreeNodes];
261265
if (index === -1) {

0 commit comments

Comments
 (0)