Merge pull request #2909 from objectcomputing/feature-2908/fix-profile-editing

Fixed a few obsolete profile references

Author: mkimberlin

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;

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() {

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',
     }
   }
 };