Fixed issues with duplicate current user profile in state, added preferences card to profile page with switch to turn off birthday celebration, and removed deprecated docker compose version

mkimberlin · mkimberlin · commit f0d9b18fdd1b · 2025-03-05T15:03:16.000-06:00
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   postgresql:
     image: postgres:17.2
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/MemberProfileController.java b/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/MemberProfileController.java
@@ -58,7 +58,7 @@ public HttpResponse<MemberProfileResponseDTO> getById(UUID id) {
     public List<MemberProfileResponseDTO> getSupervisorsForId(UUID id) {
         return memberProfileServices.getSupervisorsForId(id)
                 .stream()
-                .map(this::fromEntity)
+                .map(MemberProfileController::fromEntity)
                 .toList();
     }
 
@@ -83,7 +83,7 @@ public List<MemberProfileResponseDTO> findByValue(@Nullable String firstName,
                                                       @QueryValue(value = "terminated", defaultValue = "false") Boolean terminated) {
         return memberProfileServices.findByValues(firstName, lastName, title, pdlId, workEmail, supervisorId, terminated)
                 .stream()
-                .map(this::fromEntity)
+                .map(MemberProfileController::fromEntity)
                 .toList();
     }
 
@@ -128,7 +128,7 @@ protected URI location(UUID id) {
         return URI.create("/member-profiles/" + id);
     }
 
-    private MemberProfileResponseDTO fromEntity(MemberProfile entity) {
+    public static MemberProfileResponseDTO fromEntity(MemberProfile entity) {
         MemberProfileResponseDTO dto = new MemberProfileResponseDTO();
         dto.setId(entity.getId());
         dto.setFirstName(entity.getFirstName());
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserController.java b/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserController.java
@@ -1,6 +1,7 @@
 package com.objectcomputing.checkins.services.memberprofile.currentuser;
 
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
+import com.objectcomputing.checkins.services.memberprofile.MemberProfileController;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileUtils;
 import com.objectcomputing.checkins.services.permissions.Permission;
@@ -86,7 +87,7 @@ private CurrentUserDTO fromEntity(MemberProfile entity, String imageUrl, List<Pe
         dto.setPermissions(permissions);
         dto.setRole(roles);
         dto.setImageUrl(imageUrl);
-        dto.setMemberProfile(entity);
+        dto.setMemberProfile(MemberProfileController.fromEntity(entity));
         return dto;
     }
 }
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserDTO.java b/server/src/main/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserDTO.java
@@ -1,6 +1,7 @@
 package com.objectcomputing.checkins.services.memberprofile.currentuser;
 
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
+import com.objectcomputing.checkins.services.memberprofile.MemberProfileResponseDTO;
 import com.objectcomputing.checkins.services.permissions.Permission;
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;
@@ -45,6 +46,6 @@ public class CurrentUserDTO {
 
     @NotNull
     @Schema(implementation = MemberProfile.class)
-    private MemberProfile memberProfile;
+    private MemberProfileResponseDTO memberProfile;
 
 }
diff --git a/web-ui/src/context/actions.js b/web-ui/src/context/actions.js
@@ -28,6 +28,7 @@ export const UPDATE_TEAMS = '@@check-ins/update_teams';
 export const UPDATE_TERMINATED_MEMBERS =
   '@@check-ins/update_terminated_members';
 export const UPDATE_TOAST = '@@check-ins/update_toast';
+export const UPDATE_CURRENT_USER_PROFILE = '@@check-ins/update_current_user_profile';
 export const UPDATE_USER_BIO = '@@check-ins/update_bio';
 export const UPDATE_FEEEDBACK_SUGGESTIONS =
   '@@check-ins/update_feedback_suggestions';
diff --git a/web-ui/src/context/reducer.js b/web-ui/src/context/reducer.js
@@ -27,7 +27,7 @@ import {
   UPDATE_TEAMS,
   UPDATE_TEAM_MEMBERS,
   UPDATE_TOAST,
-  UPDATE_USER_BIO,
+  UPDATE_CURRENT_USER_PROFILE,
   UPDATE_PEOPLE_LOADING,
   UPDATE_TEAMS_LOADING,
   UPDATE_REVIEW_PERIOD,
@@ -59,13 +59,42 @@ export const initialState = {
   reviewPeriods: []
 };
 
+// Converts member dates *in place*, I don't love this. I'll be back, convertMemberDates...don't get comfortable.
+const convertMemberDates = member => {
+  member.birthDay = Array.isArray(member.birthDay)
+    ? new Date(member.birthDay.join('/'))
+    : member && member.birthDay
+      ? member.birthDay
+      : null;
+  member.startDate = Array.isArray(member.startDate)
+    ? new Date(member.startDate.join('/'))
+    : member && member.startDate
+      ? member.startDate
+      : new Date();
+  member.terminationDate = Array.isArray(member.terminationDate)
+    ? new Date(member.terminationDate.join('/'))
+    : member && member.terminationDate
+      ? member.terminationDate
+      : null;
+};
+
 export const reducer = (state, action) => {
   switch (action.type) {
     case MY_PROFILE_UPDATE:
-      state.userProfile = action.payload;
-      break;
-    case UPDATE_USER_BIO:
-      state.userProfile.memberProfile.bioText = action.payload;
+      convertMemberDates(action.payload.memberProfile);
+      state.userProfile = { ...action.payload };
+      break;
+    case UPDATE_CURRENT_USER_PROFILE:
+      convertMemberDates(action.payload);
+      state.userProfile = { ...state.userProfile, memberProfile: { ...action.payload } };
+      const profileId = action.payload.id;
+      const memberProfiles = state.memberProfiles.reduce((acc, current) => {
+        if(current.id !== profileId) {
+          acc.push({...current});
+        }
+        return acc;
+      }, [{ ...action.payload }])
+      state.memberProfiles = memberProfiles;
       break;
     case ADD_CHECKIN:
       if (state?.checkins?.length > 0) {
@@ -144,43 +173,20 @@ export const reducer = (state, action) => {
       state.loading = { ...state.loading, memberProfiles: action.payload };
       break;
     case UPDATE_MEMBER_PROFILES:
-      action.payload.forEach(member => {
-        member.birthDay = Array.isArray(member.birthDay)
-          ? new Date(member.birthDay.join('/'))
-          : member && member.birthDay
-            ? member.birthDay
-            : null;
-        member.startDate = Array.isArray(member.startDate)
-          ? new Date(member.startDate.join('/'))
-          : member && member.startDate
-            ? member.startDate
-            : new Date();
-        member.terminationDate = Array.isArray(member.terminationDate)
-          ? new Date(member.terminationDate.join('/'))
-          : member && member.terminationDate
-            ? member.terminationDate
-            : null;
+      action.payload.forEach(convertMemberDates);
+      const currentProfileId = state?.userProfile?.memberProfile?.id;
+      const currentProfile = action.payload.find((current) => {
+        if(currentProfileId && current.id === currentProfileId) {
+          return current;
+        }
       });
+      if(currentProfile) {
+        state.userProfile.memberProfile = { ...currentProfile };
+      }
       state.memberProfiles = action.payload;
       break;
     case UPDATE_TERMINATED_MEMBERS:
-      action.payload.forEach(member => {
-        member.birthDay = Array.isArray(member.birthDay)
-          ? new Date(member.birthDay.join('/'))
-          : member && member.birthDay
-            ? member.birthDay
-            : null;
-        member.startDate = Array.isArray(member.startDate)
-          ? new Date(member.startDate.join('/'))
-          : member && member.startDate
-            ? member.startDate
-            : new Date();
-        member.terminationDate = Array.isArray(member.terminationDate)
-          ? new Date(member.terminationDate.join('/'))
-          : member && member.terminationDate
-            ? member.terminationDate
-            : null;
-      });
+      action.payload.forEach(convertMemberDates);
       state.terminatedMembers = action.payload;
       break;
     case UPDATE_TEAM_MEMBERS:
diff --git a/web-ui/src/pages/ProfilePage.jsx b/web-ui/src/pages/ProfilePage.jsx
@@ -5,10 +5,9 @@ import { AppContext } from '../context/AppContext';
 import {
   selectCurrentUser,
   selectMyGuilds,
-  selectUserProfile,
   selectMyTeams
 } from '../context/selectors';
-import { UPDATE_GUILD, UPDATE_USER_BIO } from '../context/actions';
+import { UPDATE_GUILD, UPDATE_CURRENT_USER_PROFILE } from '../context/actions';
 import { addGuildMember, deleteGuildMember } from '../api/guild';
 import { updateMember } from '../api/member';
 import { getEmployeeHours } from '../api/hours';
@@ -18,10 +17,15 @@ import SkillSection from '../components/skills/SkillSection';
 import ProgressBar from '../components/contribution_hours/ProgressBar';
 import VolunteerTables from '../components/volunteer/VolunteerTables';
 
-import { Info } from '@mui/icons-material';
+import { Info, ManageAccounts } from '@mui/icons-material';
 import { Card, CardContent, CardHeader, Chip, TextField, Avatar } from '@mui/material';
 import GroupIcon from '@mui/icons-material/Group';
 import Autocomplete from '@mui/material/Autocomplete';
+import FormLabel from '@mui/material/FormLabel';
+import FormControl from '@mui/material/FormControl';
+import FormGroup from '@mui/material/FormGroup';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Switch from '@mui/material/Switch';
 
 import './ProfilePage.css';
 
@@ -32,13 +36,12 @@ const storeMember = debounce(realStoreMember, 1500);
 const ProfilePage = () => {
   const { state, dispatch } = useContext(AppContext);
   const memberProfile = selectCurrentUser(state);
-  const userProfile = selectUserProfile(state);
 
   const { csrf, guilds } = state;
-  const { id, bioText, pdlId } = memberProfile;
-  const { firstName, lastName, name } = userProfile;
+  const { id, bioText, pdlId, ignoreBirthday, firstName, lastName, name } = memberProfile;
 
   const [bio, setBio] = useState();
+  const [prefs, setPrefs] = useState({ignoreBirthday});
   const [myHours, setMyHours] = useState(null);
 
   const myTeams = selectMyTeams(state);
@@ -62,24 +65,43 @@ const ProfilePage = () => {
       setBio(bioText);
     }
     updateBio();
-  }, [bioText]);
+  }, [setBio, bioText]);
 
-  const updateProfile = newBio => {
+  useEffect(() => {
+    async function updatePrefs() {
+      setPrefs({...prefs, ignoreBirthday})
+    }
+    updatePrefs()
+  }, [setPrefs, ignoreBirthday]);
+
+  const updateProfile = newProfile => {
     dispatch({
-      type: UPDATE_USER_BIO,
-      payload: newBio
+      type: UPDATE_CURRENT_USER_PROFILE,
+      payload: newProfile
     });
   };
 
-  const handleBioChange = e => {
+  const handleIgnoreBirthdayChange = useCallback(async e => {
+    if (!csrf) {
+      return;
+    }
+    const { checked } = e.target;
+    setPrefs({ ...prefs, ignoreBirthday: !checked });
+    const newProfile = { ...memberProfile, ignoreBirthday: !checked };
+    const { payload } = await realStoreMember(newProfile, csrf);
+    updateProfile(payload.data);
+  }, [csrf, prefs, setPrefs, memberProfile, realStoreMember, updateProfile]);
+
+  const handleBioChange = useCallback(async e => {
     if (!csrf) {
       return;
     }
     const { value } = e.target;
     setBio(value);
-    storeMember({ ...memberProfile, bioText: value }, csrf);
-    updateProfile(value);
-  };
+    const newProfile = { ...memberProfile, bioText: value };
+    storeMember(newProfile, csrf);
+    updateProfile(newProfile);
+  }, [csrf, setBio, memberProfile, storeMember, updateProfile]);
 
   const addOrDeleteGuildMember = useCallback(
     async newVal => {
@@ -146,6 +168,28 @@ const ProfilePage = () => {
     <div className="Profile">
       <Profile memberId={id} pdlId={pdlId} />
       <div className="profile-grid">
+        <div className="profile-page-prefs">
+          <Card>
+            <CardHeader
+              avatar={<Avatar sx={{ mr: 1 }}><ManageAccounts /></Avatar>}
+              title="Preferences"
+              titleTypographyProps={{ variant: 'h5', component: 'h2' }}
+            />
+            <CardContent>
+              <FormControl fullWidth component="fieldset" variant="standard">
+                <FormLabel component="legend">Celebrations</FormLabel>
+                <FormGroup>
+                  <FormControlLabel
+                    control={
+                      <Switch checked={!!!prefs.ignoreBirthday} onChange={handleIgnoreBirthdayChange} name="birthday" />
+                    }
+                    label="My Birthday"
+                  />
+                </FormGroup>
+              </FormControl>
+            </CardContent>
+          </Card>
+        </div>
         <div className="profile-page-bio">
           <Card>
             <CardHeader
diff --git a/web-ui/src/pages/__snapshots__/ProfilePage.test.jsx.snap b/web-ui/src/pages/__snapshots__/ProfilePage.test.jsx.snap

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-version: '3'`
`2`	`1`	`services:`
`3`	`2`	`postgresql:`
`4`	`3`	`image: postgres:17.2`