From a2627b49052c0cfba7261c15505d4aa98e01c706 Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Mon, 10 Mar 2025 11:01:59 -0500 Subject: [PATCH 1/2] Fixed a few obsolete profile references --- web-ui/src/context/reducer.js | 2 +- web-ui/src/pages/MemberProfilePage.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web-ui/src/context/reducer.js b/web-ui/src/context/reducer.js index 99ee4d4ff..a70c9bbce 100644 --- a/web-ui/src/context/reducer.js +++ b/web-ui/src/context/reducer.js @@ -172,7 +172,7 @@ export const reducer = (state, action) => { break; case UPDATE_MEMBER_PROFILES: action.payload.forEach(convertMemberDates); - const currentProfileId = state?.userProfile?.memberProfile?.id; + const currentProfileId = state?.userProfile?.id; const currentProfile = action.payload.find((current) => { if(currentProfileId && current.id === currentProfileId) { return current; diff --git a/web-ui/src/pages/MemberProfilePage.jsx b/web-ui/src/pages/MemberProfilePage.jsx index f5753fb23..c64401e03 100644 --- a/web-ui/src/pages/MemberProfilePage.jsx +++ b/web-ui/src/pages/MemberProfilePage.jsx @@ -82,7 +82,7 @@ const MemberProfilePage = () => { const [selectedMemberSkills, setSelectedMemberSkills] = useState([]); const [teams, setTeams] = useState([]); const [guilds, setGuilds] = useState([]); - const isCurrentUser = userProfile?.memberProfile?.id === memberId; + const isCurrentUser = userProfile?.id === memberId; useEffect(() => { async function getTeamsAndGuilds() { From 4e81af8c1e92b6594c3f9cac289b22e2fba87f44 Mon Sep 17 00:00:00 2001 From: Michael Kimberlin Date: Mon, 10 Mar 2025 11:31:07 -0500 Subject: [PATCH 2/2] Fixed UI test for member profile page --- web-ui/src/pages/MemberProfilePage.test.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web-ui/src/pages/MemberProfilePage.test.jsx b/web-ui/src/pages/MemberProfilePage.test.jsx index 5fea6e21a..9c26bd9d0 100644 --- a/web-ui/src/pages/MemberProfilePage.test.jsx +++ b/web-ui/src/pages/MemberProfilePage.test.jsx @@ -11,10 +11,7 @@ const initialState = { { name: 'mr. test', firstName: 'mr', lastName: 'test', id: '1234' } ], userProfile: { - memberProfile: { - id: '1234', - name: 'mr. test' - } + id: '1234', } } };