From 95d1361c89a4178085513d3d20643002f004c32d Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Tue, 11 Mar 2025 14:36:48 -0500 Subject: [PATCH 01/21] Upgrade shadow and micronaut plugins, as well as micronaut version --- server/build.gradle | 4 ++-- server/gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index b98fc730da..ee2c944e35 100755 --- a/server/build.gradle +++ b/server/build.gradle @@ -2,8 +2,8 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform plugins { id 'maven-publish' - id("com.gradleup.shadow") version "8.3.2" - id("io.micronaut.application") version "4.4.3" + id("com.gradleup.shadow") version "8.3.6" + id("io.micronaut.application") version "4.5.0" id "jacoco" } diff --git a/server/gradle.properties b/server/gradle.properties index 96a4e8b1d0..87a21df3dd 100644 --- a/server/gradle.properties +++ b/server/gradle.properties @@ -1,2 +1,2 @@ -micronautVersion=4.6.3 +micronautVersion=4.7.6 seleniumVersion=4.24.0 From 958ea5750611f8a28dd27035d473beea2ee08ab3 Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Tue, 11 Mar 2025 15:48:40 -0500 Subject: [PATCH 02/21] Attempt to address upgrade issue created with login --- server/build.gradle | 2 +- server/src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index ee2c944e35..70faa86dc1 100755 --- a/server/build.gradle +++ b/server/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation("io.micronaut.cache:micronaut-cache-caffeine") implementation("io.micronaut.data:micronaut-data-jdbc") implementation("io.micronaut.flyway:micronaut-flyway") - implementation("io.micronaut.security:micronaut-security") + implementation("io.micronaut.security:micronaut-security:4.12.0") implementation("io.micronaut.security:micronaut-security-jwt") implementation("io.micronaut.security:micronaut-security-oauth2") implementation("io.micronaut.sql:micronaut-jdbc-hikari") diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 23ea93a927..f6ba1a2099 100755 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -37,7 +37,7 @@ micronaut: security: enabled: true - authentication: cookie + authentication: idtoken token: jwt: enabled: true From 8c47a55938082fbf0cc9e362c89d1d19da0cfa18 Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Tue, 11 Mar 2025 16:05:18 -0500 Subject: [PATCH 03/21] Reverted forced version bump of micronaut-security --- server/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle b/server/build.gradle index 70faa86dc1..ee2c944e35 100755 --- a/server/build.gradle +++ b/server/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation("io.micronaut.cache:micronaut-cache-caffeine") implementation("io.micronaut.data:micronaut-data-jdbc") implementation("io.micronaut.flyway:micronaut-flyway") - implementation("io.micronaut.security:micronaut-security:4.12.0") + implementation("io.micronaut.security:micronaut-security") implementation("io.micronaut.security:micronaut-security-jwt") implementation("io.micronaut.security:micronaut-security-oauth2") implementation("io.micronaut.sql:micronaut-jdbc-hikari") From 86cda2b8159d5b3706562c679a83172cacf03507 Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Tue, 11 Mar 2025 16:28:08 -0500 Subject: [PATCH 04/21] Removed unused packaged (markdown-bjiulder) --- web-ui/package.json | 1 - web-ui/src/pages/MeritReportPage.jsx | 2 -- 2 files changed, 3 deletions(-) diff --git a/web-ui/package.json b/web-ui/package.json index 9478e75642..e7dc0e42e4 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -31,7 +31,6 @@ "js-cookie": "^3.0.5", "js-file-download": "^0.4.12", "lodash": "^4.17.21", - "markdown-builder": "^0.9.0", "mjml": "^5.0.0-alpha.4", "mjml-browser": "^5.0.0-alpha.4", "qs": "^6.13.0", diff --git a/web-ui/src/pages/MeritReportPage.jsx b/web-ui/src/pages/MeritReportPage.jsx index 38165504c2..51a47e51c6 100644 --- a/web-ui/src/pages/MeritReportPage.jsx +++ b/web-ui/src/pages/MeritReportPage.jsx @@ -17,8 +17,6 @@ import './MeritReportPage.css'; import MemberSelector from '../components/member_selector/MemberSelector'; import { useQueryParameters } from '../helpers/query-parameters'; -import markdown from 'markdown-builder'; - const MeritReportPage = () => { const { state, dispatch } = useContext(AppContext); From 8950a3668f5ac2f1aa08fd1d65ba195b52da4369 Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Wed, 12 Mar 2025 09:23:16 -0500 Subject: [PATCH 05/21] Upgrade MUI and related libraries --- web-ui/package.json | 18 +- .../ActionItemsPanel.test.jsx.snap | 22 +- .../__snapshots__/DesktopTable.test.jsx.snap | 261 +++---- .../__snapshots__/MobileTable.test.jsx.snap | 132 ++-- .../roles/__snapshots__/Roles.test.jsx.snap | 187 +++-- .../users/__snapshots__/Users.test.jsx.snap | 39 +- .../agenda/__snapshots__/Agenda.test.jsx.snap | 22 +- .../avatar/__snapshots__/Avatar.test.jsx.snap | 4 +- .../__snapshots__/Anniversaries.test.jsx.snap | 55 +- .../__snapshots__/Birthdays.test.jsx.snap | 4 +- .../CheckinHistory.test.jsx.snap | 29 +- .../CheckinProfile.test.jsx.snap | 4 +- .../__snapshots__/CheckinDocs.test.jsx.snap | 24 +- .../__snapshots__/ProgressBar.test.jsx.snap | 24 +- .../DiscreteSlider.test.tsx.snap | 2 +- .../EditSkillsCard.test.jsx.snap | 61 +- .../FeedbackRecipientCard.test.jsx.snap | 25 +- .../FeedbackRecipientSelector.test.jsx.snap | 23 +- .../FeedbackRequestCard.test.jsx.snap | 26 +- .../FeedbackRequestSubcard.test.jsx.snap | 32 +- .../FeedbackRequestConfirmation.test.jsx.snap | 13 +- .../FeedbackSubmissionTips.test.jsx.snap | 23 +- .../FeedbackSubmitConfirmation.test.jsx.snap | 6 +- .../FeedbackSubmitQuestion.test.jsx.snap | 83 +-- .../FeedbackTemplateSelector.test.jsx.snap | 23 +- .../__snapshots__/GuideLink.test.jsx.snap | 14 +- .../__snapshots__/GuidesPanel.test.jsx.snap | 39 +- .../__snapshots__/GuildResults.test.jsx.snap | 86 +-- .../GuildSummaryCard.test.jsx.snap | 65 +- .../PublicKudosCard.test.jsx.snap | 54 +- .../__snapshots__/KudosCard.test.jsx.snap | 177 +++-- .../__snapshots__/MemberModal.test.jsx.snap | 23 +- .../MemberSummaryCard.test.jsx.snap | 23 +- .../MemberSelector.test.jsx.snap | 69 +- .../MemberSelectorDialog.test.jsx.snap | 210 +++--- .../menu/__snapshots__/Menu.test.jsx.snap | 531 ++++++-------- .../notes/__snapshots__/Note.test.jsx.snap | 23 +- .../OpportunityCard.test.jsx.snap | 19 +- .../__snapshots__/Personnel.test.jsx.snap | 23 +- .../__snapshots__/PrivateNote.test.jsx.snap | 25 +- .../__snapshots__/Profile.test.jsx.snap | 14 +- .../pulse/__snapshots__/Pulse.test.jsx.snap | 59 +- .../ReviewPeriodStepper.test.jsx.snap | 66 +- .../SelectSkillsDialog.test.jsx.snap | 93 ++- .../__snapshots__/SentimentIcon.test.jsx.snap | 7 +- .../SkillCategoryCard.test.jsx.snap | 31 +- .../__snapshots__/SplitButton.test.jsx.snap | 14 +- .../TeamMemberSelect.test.jsx.snap | 24 +- .../__snapshots__/TeamResults.test.jsx.snap | 90 +-- .../TeamSummaryCard.test.jsx.snap | 79 +-- .../__snapshots__/TeamsActions.test.jsx.snap | 11 +- .../__snapshots__/TemplateCard.test.jsx.snap | 12 +- .../ViewFeedbackResponses.test.jsx.snap | 53 +- .../FeedbackResponseCard.test.tsx.snap | 63 +- .../VolunteerTables.test.jsx.snap | 37 +- .../AnniversaryReportPage.test.jsx.snap | 43 +- .../BirthdayReportPage.test.jsx.snap | 60 +- .../CertificationReportPage.test.jsx.snap | 29 +- .../__snapshots__/CheckinsPage.test.jsx.snap | 141 ++-- .../CheckinsReportPage.test.jsx.snap | 34 +- .../EditSkillsPage.test.jsx.snap | 22 +- .../__snapshots__/EmailPage.test.jsx.snap | 101 ++- .../ErrorBoundaryPage.test.jsx.snap | 5 +- .../FeedbackRequestPage.test.jsx.snap | 87 ++- .../FeedbackSubmitPage.test.jsx.snap | 31 +- .../__snapshots__/GuildsPage.test.jsx.snap | 29 +- .../__snapshots__/HomePage.test.jsx.snap | 4 +- .../MemberProfilePage.test.jsx.snap | 33 +- .../MeritReportPage.test.jsx.snap | 74 +- .../__snapshots__/PeoplePage.test.jsx.snap | 25 +- .../PermissionsPage.test.jsx.snap | 18 +- .../__snapshots__/ProfilePage.test.jsx.snap | 256 ++++--- .../__snapshots__/PulsePage.test.jsx.snap | 131 ++-- .../PulseReportPage.test.jsx.snap | 67 +- .../ReceivedRequestsPage.test.jsx.snap | 90 ++- .../__snapshots__/ReviewsPage.test.jsx.snap | 30 +- .../SelfReviewsPage.test.jsx.snap | 8 +- .../__snapshots__/SettingsPage.test.jsx.snap | 30 +- .../SkillCategoriesPage.test.jsx.snap | 67 +- .../SkillCategoryEditPage.test.jsx.snap | 48 +- .../SkillReportPage.test.jsx.snap | 25 +- .../TeamSkillReportPage.test.jsx.snap | 45 +- .../ViewFeedbackPage.test.jsx.snap | 78 +- web-ui/yarn.lock | 668 +++++------------- 84 files changed, 2290 insertions(+), 3165 deletions(-) diff --git a/web-ui/package.json b/web-ui/package.json index e7dc0e42e4..d4f3f8155d 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -13,12 +13,12 @@ "@fortawesome/free-regular-svg-icons": "^6.0.0", "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@mui/icons-material": "^5.15.14", - "@mui/lab": "^5.0.0-alpha.169", - "@mui/material": "^5.15.14", - "@mui/styled-engine-sc": "^6.0.0-alpha.18", - "@mui/styles": "^5.15.14", - "@mui/x-date-pickers": "^7.3.1", + "@mui/icons-material": "^6.4.7", + "@mui/lab": "^6.0.0-beta.30", + "@mui/material": "^6.4.7", + "@mui/styled-engine-sc": "^6.4.6", + "@mui/styles": "^6.4.7", + "@mui/x-date-pickers": "^7.27.3", "@tinymce/tinymce-react": "^5.0.0", "axios": "^1.8.2", "canvas-confetti": "^1.6.0", @@ -36,9 +36,9 @@ "qs": "^6.13.0", "query-string": "^7.0.1", "raf": "^3.4.1", - "react": "^18.2.0", + "react": "^18.3.1", "react-beautiful-dnd": "^13.1.0", - "react-dom": "^18.2.0", + "react-dom": "^18.3.1", "react-error-boundary": "^3.1.3", "react-jss": "^10.4.0", "react-modal": "^3.14.3", @@ -95,7 +95,7 @@ "msw": "^2.6.4", "prettier": "3.2.5", "prop-types": "^15.8.1", - "react-test-renderer": "^18.2.0", + "react-test-renderer": "^18.3.1", "typescript": "^5.4.5", "typescript-eslint": "^7.7.1", "vite": "^5.4.12", diff --git a/web-ui/src/components/action_item/__snapshots__/ActionItemsPanel.test.jsx.snap b/web-ui/src/components/action_item/__snapshots__/ActionItemsPanel.test.jsx.snap index 640ad85d48..daa2893d93 100644 --- a/web-ui/src/components/action_item/__snapshots__/ActionItemsPanel.test.jsx.snap +++ b/web-ui/src/components/action_item/__snapshots__/ActionItemsPanel.test.jsx.snap @@ -3,17 +3,18 @@ exports[`ActionItemsPanel > renders correctly 1`] = `

Action Items

renders correctly 1`] = ` />
diff --git a/web-ui/src/components/admin/permissions/__snapshots__/DesktopTable.test.jsx.snap b/web-ui/src/components/admin/permissions/__snapshots__/DesktopTable.test.jsx.snap index b661154118..3c38af6c1d 100644 --- a/web-ui/src/components/admin/permissions/__snapshots__/DesktopTable.test.jsx.snap +++ b/web-ui/src/components/admin/permissions/__snapshots__/DesktopTable.test.jsx.snap @@ -3,48 +3,49 @@ exports[`DesktopTable > renders correctly 1`] = `
diff --git a/web-ui/src/components/admin/permissions/__snapshots__/MobileTable.test.jsx.snap b/web-ui/src/components/admin/permissions/__snapshots__/MobileTable.test.jsx.snap index 4cff4eb31d..ba2cc86b33 100644 --- a/web-ui/src/components/admin/permissions/__snapshots__/MobileTable.test.jsx.snap +++ b/web-ui/src/components/admin/permissions/__snapshots__/MobileTable.test.jsx.snap @@ -3,31 +3,32 @@ exports[`MobileTable > renders correctly 1`] = `
Permissions Admin PDL Team Lead @@ -53,33 +54,33 @@ exports[`DesktopTable > renders correctly 1`] = `
View Action Items - - - -
Edit Action Items - - - -
Create Action Items - - - -
Add Team Members - - - -
Delete Team Members - - - -
diff --git a/web-ui/src/components/admin/roles/__snapshots__/Roles.test.jsx.snap b/web-ui/src/components/admin/roles/__snapshots__/Roles.test.jsx.snap index 55c6dd895d..642f15cac1 100644 --- a/web-ui/src/components/admin/roles/__snapshots__/Roles.test.jsx.snap +++ b/web-ui/src/components/admin/roles/__snapshots__/Roles.test.jsx.snap @@ -26,24 +26,23 @@ exports[`renders correctly 1`] = ` class="roles-top-search-fields" >

Showing 3/3 roles

renders correctly 1`] = ` aria-invalid="false" autocapitalize="none" autocomplete="off" - class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-19qh8xo-MuiInputBase-input-MuiOutlinedInput-input" + class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-13meb6w-MuiInputBase-input-MuiOutlinedInput-input" id="permissions-autocomplete" role="combobox" spellcheck="false" @@ -51,18 +52,18 @@ exports[`MobileTable > renders correctly 1`] = ` value="" />
Permissions @@ -162,33 +157,33 @@ exports[`MobileTable > renders correctly 1`] = `
View Action Items -
Edit Action Items -
Create Action Items -
Add Team Members -
Delete Team Members -