Skip to content

Commit 6dc99da

Browse files
authored
Merge pull request #2917 from objectcomputing/feature-2916/upgrade-mui
Upgrade MUI
2 parents 86cda2b + 5e81d95 commit 6dc99da

File tree

84 files changed

+2320
-3249
lines changed

Some content is hidden

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

84 files changed

+2320
-3249
lines changed

web-ui/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"@fortawesome/free-regular-svg-icons": "^6.0.0",
1414
"@fortawesome/free-solid-svg-icons": "^6.0.0",
1515
"@fortawesome/react-fontawesome": "^0.1.17",
16-
"@mui/icons-material": "^5.15.14",
17-
"@mui/lab": "^5.0.0-alpha.169",
18-
"@mui/material": "^5.15.14",
19-
"@mui/styled-engine-sc": "^6.0.0-alpha.18",
20-
"@mui/styles": "^5.15.14",
21-
"@mui/x-date-pickers": "^7.3.1",
16+
"@mui/icons-material": "^6.4.7",
17+
"@mui/lab": "^6.0.0-beta.30",
18+
"@mui/material": "^6.4.7",
19+
"@mui/styled-engine-sc": "^6.4.6",
20+
"@mui/styles": "^6.4.7",
21+
"@mui/x-date-pickers": "^7.27.3",
2222
"@tinymce/tinymce-react": "^5.0.0",
2323
"axios": "^1.8.2",
2424
"canvas-confetti": "^1.6.0",
@@ -36,9 +36,9 @@
3636
"qs": "^6.13.0",
3737
"query-string": "^7.0.1",
3838
"raf": "^3.4.1",
39-
"react": "^18.2.0",
39+
"react": "^18.3.1",
4040
"react-beautiful-dnd": "^13.1.0",
41-
"react-dom": "^18.2.0",
41+
"react-dom": "^18.3.1",
4242
"react-error-boundary": "^3.1.3",
4343
"react-jss": "^10.4.0",
4444
"react-modal": "^3.14.3",
@@ -77,10 +77,10 @@
7777
},
7878
"devDependencies": {
7979
"@ladle/react": "^4.1.2",
80-
"@testing-library/jest-dom": "^6.4.5",
81-
"@testing-library/react": "^14.2.2",
82-
"@testing-library/react-hooks": "^8.0.1",
83-
"@testing-library/user-event": "^14.5.2",
80+
"@testing-library/jest-dom": "^6.6.3",
81+
"@testing-library/react": "^16.2.0",
82+
"@testing-library/user-event": "^14.6.1",
83+
"@testing-library/dom": "^10.4.0",
8484
"@types/react-router-dom": "^5.3.0",
8585
"@vitejs/plugin-react-swc": "^3.6.0",
8686
"@vitest/coverage-v8": "^1.4.0",
@@ -95,7 +95,7 @@
9595
"msw": "^2.6.4",
9696
"prettier": "3.2.5",
9797
"prop-types": "^15.8.1",
98-
"react-test-renderer": "^18.2.0",
98+
"react-test-renderer": "^18.3.1",
9999
"typescript": "^5.4.5",
100100
"typescript-eslint": "^7.7.1",
101101
"vite": "^5.4.12",

web-ui/src/components/action_item/__snapshots__/ActionItemsPanel.test.jsx.snap

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
exports[`ActionItemsPanel > renders correctly 1`] = `
44
<div>
55
<div
6-
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root action-items css-bhp9pd-MuiPaper-root-MuiCard-root"
6+
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root action-items css-1j74uew-MuiPaper-root-MuiCard-root"
7+
style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
78
>
89
<div
9-
class="MuiCardHeader-root css-185gdzj-MuiCardHeader-root"
10+
class="MuiCardHeader-root css-149tc0y-MuiCardHeader-root"
1011
>
1112
<div
12-
class="MuiCardHeader-avatar css-1ssile9-MuiCardHeader-avatar"
13+
class="MuiCardHeader-avatar css-1r9wl67-MuiCardHeader-avatar"
1314
>
1415
<svg
1516
aria-hidden="true"
16-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
17+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1umw9bq-MuiSvgIcon-root"
1718
data-testid="ArrowForwardIcon"
1819
focusable="false"
1920
viewBox="0 0 24 24"
@@ -24,17 +25,17 @@ exports[`ActionItemsPanel > renders correctly 1`] = `
2425
</svg>
2526
</div>
2627
<div
27-
class="MuiCardHeader-content css-1qbkelo-MuiCardHeader-content"
28+
class="MuiCardHeader-content css-1jkp9bu-MuiCardHeader-content"
2829
>
2930
<h2
30-
class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title css-1qvr50w-MuiTypography-root"
31+
class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title css-16xl4zq-MuiTypography-root"
3132
>
3233
Action Items
3334
</h2>
3435
</div>
3536
</div>
3637
<div
37-
class="MuiCardContent-root action-items-container css-46bh2p-MuiCardContent-root"
38+
class="MuiCardContent-root action-items-container css-1lt5qva-MuiCardContent-root"
3839
>
3940
<div
4041
data-rbd-droppable-context-id="0"
@@ -50,13 +51,13 @@ exports[`ActionItemsPanel > renders correctly 1`] = `
5051
/>
5152
<button
5253
aria-label="create"
53-
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeLarge edit-icon css-mf1cb5-MuiButtonBase-root-MuiIconButton-root"
54+
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeLarge edit-icon css-154kngp-MuiButtonBase-root-MuiIconButton-root"
5455
tabindex="0"
5556
type="button"
5657
>
5758
<svg
5859
aria-hidden="true"
59-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
60+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1umw9bq-MuiSvgIcon-root"
6061
data-testid="DoneIcon"
6162
focusable="false"
6263
viewBox="0 0 24 24"
@@ -65,9 +66,6 @@ exports[`ActionItemsPanel > renders correctly 1`] = `
6566
d="M9 16.2 4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4z"
6667
/>
6768
</svg>
68-
<span
69-
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
70-
/>
7169
</button>
7270
</div>
7371
</div>

0 commit comments

Comments
 (0)