Skip to content

Commit 8af41c7

Browse files
mkimberlinmkimberlin
authored
Merge pull request #2756 from objectcomputing/develop
Update release branch
2 parents c3f4c73 + 6d22527 commit 8af41c7

File tree

19 files changed

+1140
-1017
lines changed

19 files changed

+1140
-1017
lines changed

‎server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id "jacoco"
88
}
99

10-
version "0.8.6"
10+
version "0.8.7"
1111
group "com.objectcomputing.checkins"
1212

1313
repositories {

‎server/src/main/java/com/objectcomputing/checkins/services/memberprofile/birthday/BirthDayServicesImpl.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ public BirthDayServicesImpl(MemberProfileServices memberProfileServices) {
2323
public List<BirthDayResponseDTO> findByValue(String[] months, Integer[] daysOfMonth) {
2424
Set<MemberProfile> memberProfiles = memberProfileServices.findByValues(null, null, null, null, null, null, false);
2525
List<MemberProfile> memberProfileAll = new ArrayList<>(memberProfiles);
26+
if (months == null && daysOfMonth == null) {
27+
// If nothing was passed in, get all members without birthdays.
28+
memberProfileAll = memberProfileAll
29+
.stream()
30+
.filter(member -> member.getBirthDate() == null)
31+
.toList();
32+
}
2633
if (months != null) {
2734
for (String month : months) {
2835
if (month != null) {
@@ -66,7 +73,9 @@ private List<BirthDayResponseDTO> profileToBirthDateResponseDto(List<MemberProfi
6673
BirthDayResponseDTO birthDayResponseDTO = new BirthDayResponseDTO();
6774
birthDayResponseDTO.setUserId(member.getId());
6875
birthDayResponseDTO.setName(member.getFirstName() + "" +member.getLastName());
69-
birthDayResponseDTO.setBirthDay(member.getBirthDate().getMonthValue() + "/" +member.getBirthDate().getDayOfMonth());
76+
if (member.getBirthDate() != null) {
77+
birthDayResponseDTO.setBirthDay(member.getBirthDate().getMonthValue() + "/" +member.getBirthDate().getDayOfMonth());
78+
}
7079
birthDays.add(birthDayResponseDTO);
7180
}
7281
}

‎web-ui/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/*
1+
stable/*

‎web-ui/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web-ui",
3-
"version": "0.8.6",
3+
"version": "0.8.7",
44
"private": true,
55
"type": "module",
66
"dependencies": {
@@ -76,7 +76,7 @@
7676
]
7777
},
7878
"devDependencies": {
79-
"@ladle/react": "^4.0.3",
79+
"@ladle/react": "^4.1.2",
8080
"@testing-library/jest-dom": "^6.4.5",
8181
"@testing-library/react": "^14.2.2",
8282
"@testing-library/react-hooks": "^8.0.1",
@@ -92,7 +92,7 @@
9292
"happy-dom": "^15.10.2",
9393
"jest-fetch-mock": "^3.0.3",
9494
"jsdom": "^24.0.0",
95-
"msw": "^2.2.13",
95+
"msw": "^2.6.4",
9696
"prettier": "3.2.5",
9797
"prop-types": "^15.8.1",
9898
"react-test-renderer": "^18.2.0",

‎web-ui/src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const theme = extendTheme({
6565
components: {
6666
MuiButtonBase: {
6767
defaultProps: {
68-
disableRipple: !!process.env.VITEST_WORKER_ID, // No more ripple...only when testing.
68+
disableRipple: typeof process !== 'undefined' && !!process.env.VITEST_WORKER_ID, // No more ripple...only when testing.
6969
},
7070
},
7171
MuiCssBaseline: {

‎web-ui/src/api/birthdayanniversary.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,28 @@ export const getTodaysCelebrations = async cookie => {
2525

2626
export const getBirthdays = async (months, cookie) => {
2727
const results = [];
28-
for (let month of months) {
28+
if (months) {
29+
for (let month of months) {
30+
const res = await resolve({
31+
url: `${birthdayReportUrl}?month=${month}`,
32+
headers: { 'X-CSRF-Header': cookie, Accept: 'application/json' }
33+
});
34+
if (res.error) {
35+
console.error(res.error);
36+
} else {
37+
results.push(...res.payload.data);
38+
}
39+
}
40+
} else {
2941
const res = await resolve({
30-
url: `${birthdayReportUrl}?month=${month}`,
42+
url: birthdayReportUrl,
3143
headers: { 'X-CSRF-Header': cookie, Accept: 'application/json' }
3244
});
33-
results.push(...res.payload.data);
45+
if (res.error) {
46+
console.error(res.error);
47+
} else {
48+
results.push(...res.payload.data);
49+
}
3450
}
3551
return results;
3652
};

‎web-ui/src/api/notifications.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { resolve } from './api.js';
33
const emailNotificationURL = '/services/email-notifications';
44
const emailURL = '/services/email';
55
const testEmailURL = import.meta.env.VITE_APP_API_URL
6-
? import.meta.env.VITE_APP_URL + '/feedback/submit?request='
6+
? import.meta.env.VITE_APP_API_URL + '/feedback/submit?request='
77
: 'http://localhost:8080/feedback/submit?request=';
88

99
export const sendReminderNotification = async (

‎web-ui/src/components/guild-results/EditGuildModal.spec.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ const testGuild = {
3434
guildMembers: [
3535
{ id: 125, name: 'Guild Member' },
3636
{ id: 126, name: 'Other Member' }
37-
]
37+
],
38+
active: true,
3839
};
3940

4041
const emptyGuild = {
4142
name: 'Test Guild',
42-
description: 'A guild used for testing.'
43+
description: 'A guild used for testing.',
44+
active: true,
4345
};
4446

4547
const currentUserProfile = {

‎web-ui/src/components/kudos_dialog/KudosDialog.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { AppContext } from '../../context/AppContext';
2929
import {
3030
selectCsrfToken,
3131
selectCurrentUser,
32-
selectNormalizedTeams,
32+
selectActiveTeams,
3333
selectOrderedCurrentMemberProfiles,
3434
selectProfile
3535
} from '../../context/selectors';
@@ -65,7 +65,7 @@ const KudosDialog = ({ open, recipient, teamId, onClose }) => {
6565
);
6666

6767
const currentUser = selectCurrentUser(state);
68-
const teams = selectNormalizedTeams(state, '');
68+
const teams = selectActiveTeams(state);
6969
const memberProfiles = selectOrderedCurrentMemberProfiles(state);
7070

7171
const handleSubmit = useCallback(() => {

‎web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ import { AppContext } from '../../../context/AppContext';
3737
import {
3838
selectCsrfToken,
3939
selectCurrentMembers,
40-
selectGuilds,
40+
selectActiveGuilds,
4141
selectMappedUserRoles,
4242
selectRoles,
4343
selectSkills,
4444
selectSubordinates,
4545
selectSupervisors,
4646
selectTeamMembersBySupervisorId,
47-
selectTeams
47+
selectActiveTeams,
4848
} from '../../../context/selectors';
4949
import { UPDATE_TOAST } from '../../../context/actions';
5050
import { getMembersByTeam } from '../../../api/team';
@@ -172,14 +172,14 @@ const MemberSelectorDialog = ({
172172
const getFilterOptions = () => {
173173
switch (filterType) {
174174
case FilterType.TEAM:
175-
const teams = selectTeams(state);
175+
const teams = selectActiveTeams(state);
176176
return {
177177
options: teams,
178178
label: team => team.name,
179179
equals: (team1, team2) => team1.id === team2.id
180180
};
181181
case FilterType.GUILD:
182-
const guilds = selectGuilds(state);
182+
const guilds = selectActiveGuilds(state);
183183
return {
184184
options: guilds,
185185
label: guild => guild.name,

0 commit comments

Comments
 (0)