Skip to content

Commit 8950a36

Browse files
mkimberlinmkimberlin
committed
Upgrade MUI and related libraries
1 parent 86cda2b commit 8950a36

File tree

84 files changed

+2290
-3165
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

+2290
-3165
lines changed

‎web-ui/package.json‎

Lines changed: 9 additions & 9 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",
@@ -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>

‎web-ui/src/components/admin/permissions/__snapshots__/DesktopTable.test.jsx.snap‎

Lines changed: 101 additions & 160 deletions
Large diffs are not rendered by default.

‎web-ui/src/components/admin/permissions/__snapshots__/MobileTable.test.jsx.snap‎

Lines changed: 56 additions & 76 deletions
Large diffs are not rendered by default.

‎web-ui/src/components/admin/roles/__snapshots__/Roles.test.jsx.snap‎

Lines changed: 85 additions & 102 deletions
Large diffs are not rendered by default.

‎web-ui/src/components/admin/users/__snapshots__/Users.test.jsx.snap‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
exports[`renders correctly 1`] = `
44
<div>
55
<div
6-
class="css-tzn2yc"
6+
class="css-1dju459"
77
>
88
<div
99
class="user-page"
1010
>
1111
<div
12-
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-3 css-zow5z4-MuiGrid-root"
12+
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-3 css-1qw2a80-MuiGrid-root"
1313
>
1414
<div
1515
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 Users-search css-1idn90j-MuiGrid-root"
1616
>
1717
<div
18-
class="MuiFormControl-root MuiTextField-root Users-searchInput css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
18+
class="MuiFormControl-root MuiTextField-root Users-searchInput css-1xp5r68-MuiFormControl-root-MuiTextField-root"
1919
>
2020
<label
21-
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-14s5rfu-MuiFormLabel-root-MuiInputLabel-root"
21+
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-19qnlrw-MuiFormLabel-root-MuiInputLabel-root"
2222
data-shrink="false"
2323
for=":r0:"
2424
id=":r0:-label"
2525
>
2626
Select employees...
2727
</label>
2828
<div
29-
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-formControl css-9ddj71-MuiInputBase-root-MuiOutlinedInput-root"
29+
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-formControl css-quhxjy-MuiInputBase-root-MuiOutlinedInput-root"
3030
>
3131
<input
3232
aria-invalid="false"
33-
class="MuiInputBase-input MuiOutlinedInput-input css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input"
33+
class="MuiInputBase-input MuiOutlinedInput-input css-16wblaj-MuiInputBase-input-MuiOutlinedInput-input"
3434
id=":r0:"
3535
placeholder="Member Name"
3636
type="text"
3737
value=""
3838
/>
3939
<fieldset
4040
aria-hidden="true"
41-
class="MuiOutlinedInput-notchedOutline css-1d3z3hw-MuiOutlinedInput-notchedOutline"
41+
class="MuiOutlinedInput-notchedOutline css-1ll44ll-MuiOutlinedInput-notchedOutline"
4242
>
4343
<legend
44-
class="css-yjsfm1"
44+
class="css-81qg8w"
4545
>
4646
<span>
4747
Select employees...
@@ -71,49 +71,50 @@ exports[`renders correctly 1`] = `
7171
class="MuiBox-root css-1nzqmto"
7272
>
7373
<div
74-
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root member-card css-bhp9pd-MuiPaper-root-MuiCard-root"
74+
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root member-card css-1j74uew-MuiPaper-root-MuiCard-root"
75+
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);"
7576
>
7677
<a
7778
href="/profile/9876"
7879
style="text-decoration: none;"
7980
>
8081
<div
81-
class="MuiCardHeader-root AdminMemberCard-header css-185gdzj-MuiCardHeader-root"
82+
class="MuiCardHeader-root AdminMemberCard-header css-149tc0y-MuiCardHeader-root"
8283
>
8384
<div
84-
class="MuiCardHeader-avatar css-1ssile9-MuiCardHeader-avatar"
85+
class="MuiCardHeader-avatar css-1r9wl67-MuiCardHeader-avatar"
8586
>
8687
<div
87-
class="MuiAvatar-root MuiAvatar-circular large css-1wlk0hk-MuiAvatar-root"
88+
class="MuiAvatar-root MuiAvatar-circular large css-fmeqll-MuiAvatar-root"
8889
>
8990
<img
90-
class="MuiAvatar-img css-1pqm26d-MuiAvatar-img"
91+
class="MuiAvatar-img css-1su80sj-MuiAvatar-img"
9192
src="http://localhost:8080/services/member-profiles/member-photos/undefined"
9293
/>
9394
</div>
9495
</div>
9596
<div
96-
class="MuiCardHeader-content css-1qbkelo-MuiCardHeader-content"
97+
class="MuiCardHeader-content css-1jkp9bu-MuiCardHeader-content"
9798
>
9899
<h2
99-
class="MuiTypography-root MuiTypography-h5 css-ag7rrr-MuiTypography-root"
100+
class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
100101
>
101102
Current User
102103
</h2>
103104
<h3
104-
class="MuiTypography-root MuiTypography-body1 css-1pnmrwp-MuiTypography-root"
105+
class="MuiTypography-root MuiTypography-body1 css-1ro85z9-MuiTypography-root"
105106
/>
106107
</div>
107108
</div>
108109
</a>
109110
<div
110-
class="MuiCardContent-root css-46bh2p-MuiCardContent-root"
111+
class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
111112
>
112113
<div
113-
class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed info-container css-1ss2ei0-MuiContainer-root"
114+
class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed info-container css-1dgpa8w-MuiContainer-root"
114115
>
115116
<p
116-
class="MuiTypography-root MuiTypography-body2 css-r40f8v-MuiTypography-root"
117+
class="MuiTypography-root MuiTypography-body2 css-1a1whku-MuiTypography-root"
117118
>
118119
<a
119120
href="mailto:undefined"

‎web-ui/src/components/agenda/__snapshots__/Agenda.test.jsx.snap‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
exports[`Agenda > renders correctly 1`] = `
44
<div>
55
<div
6-
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root agenda-items css-bhp9pd-MuiPaper-root-MuiCard-root"
6+
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root agenda-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="AdjustIcon"
1819
focusable="false"
1920
viewBox="0 0 24 24"
@@ -24,17 +25,17 @@ exports[`Agenda > 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
Agenda Items
3334
</h2>
3435
</div>
3536
</div>
3637
<div
37-
class="MuiCardContent-root agenda-items-container css-46bh2p-MuiCardContent-root"
38+
class="MuiCardContent-root agenda-items-container css-1lt5qva-MuiCardContent-root"
3839
>
3940
<div
4041
data-rbd-droppable-context-id="0"
@@ -50,13 +51,13 @@ exports[`Agenda > 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[`Agenda > 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>

‎web-ui/src/components/avatar/__snapshots__/Avatar.test.jsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
exports[`AvatarComponent > renders correctly 1`] = `
44
<div>
55
<div
6-
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault avatar css-17o22dy-MuiAvatar-root"
6+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault avatar css-18k2bs-MuiAvatar-root"
77
>
88
<svg
99
aria-hidden="true"
10-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium MuiAvatar-fallback css-10mi8st-MuiSvgIcon-root-MuiAvatar-fallback"
10+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium MuiAvatar-fallback css-1mo2pzk-MuiSvgIcon-root-MuiAvatar-fallback"
1111
data-testid="PersonIcon"
1212
focusable="false"
1313
viewBox="0 0 24 24"

0 commit comments

Comments
 (0)