Skip to content

Commit 2387c4d

Browse files
committed
Merge branch 'develop' into feature-2645/feedback-request-add-ability-to-request-feedback-from-external-source
2 parents a957972 + 6d22527 commit 2387c4d

File tree

7 files changed

+1000
-989
lines changed

7 files changed

+1000
-989
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 {

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/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/reviews/TeamReviews.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,9 @@ const TeamReviews = ({ onBack, periodId }) => {
647647
if (!period.closeDate) return 'No close date was specified.';
648648
if (!period.periodStartDate) return 'No period-start-date was specified.';
649649
if (!period.periodEndDate) return 'No period-end-date was specified.';
650-
if (teamMembers.length === 0) return 'No members were added.';
651-
const haveReviewers = teamMembers.every(
652-
member => getReviewers(member).length > 0
650+
if (assignments.length === 0) return 'No members were added.';
651+
const haveReviewers = assignments.every(
652+
assignment => assignment.reviewerId != null
653653
);
654654
if (!haveReviewers) return 'One or more members have no reviewer.';
655655
return null; // no validation errors

web-ui/yarn.lock

Lines changed: 990 additions & 979 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)