Skip to content

Commit 904d362

Browse files
authored
Merge pull request #2767 from objectcomputing/bugfix-2748/missing-tests
Bugfix 2748/missing tests
2 parents d897f49 + 84142a6 commit 904d362

26 files changed

+2841
-42
lines changed

server/src/main/resources/db/dev/R__Load_testing_data.sql

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,19 +1699,29 @@ VALUES
16991699
('d27b679c-3aa8-4c4d-b08e-4eda63cea23f', '105f2968-a182-45a3-892c-eeff76383fe0', '06c03df3-85fe-4fc3-979e-9f1f6ba74a03', '5', '2022-08-01');
17001700

17011701
INSERT INTO kudos
1702-
(id, message, senderid, teamid, datecreated, dateapproved)
1702+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17031703
VALUES
1704-
('39dfd281-d0af-4016-848b-8156dfef2b92', PGP_SYM_ENCRYPT('Kudos to Revolver Ocelot!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2022-10-01', '2022-10-02');
1704+
('39dfd281-d0af-4016-848b-8156dfef2b93', PGP_SYM_ENCRYPT('Kudos to Revolver Ocelot!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2023-12-01', '2023-12-02', true);
1705+
1706+
INSERT INTO kudos_recipient
1707+
(id, kudosid, memberid)
1708+
VALUES
1709+
('ebc023e1-b577-4b02-a2fb-fc9472a8474b', '39dfd281-d0af-4016-848b-8156dfef2b93', '105f2968-a182-45a3-892c-eeff76383fe0');
1710+
1711+
INSERT INTO kudos
1712+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
1713+
VALUES
1714+
('39dfd281-d0af-4016-848b-8156dfef2b92', PGP_SYM_ENCRYPT('Kudos to Revolver Ocelot!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2022-10-01', null, true);
17051715

17061716
INSERT INTO kudos_recipient
17071717
(id, kudosid, memberid)
17081718
VALUES
17091719
('ebc023e1-b577-4b02-a2fb-fc9472a8474a', '39dfd281-d0af-4016-848b-8156dfef2b92', '105f2968-a182-45a3-892c-eeff76383fe0');
17101720

17111721
INSERT INTO kudos
1712-
(id, message, senderid, teamid, datecreated, dateapproved)
1722+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17131723
VALUES
1714-
('fbcde196-7703-4f80-ac5e-5ac60b28555e', PGP_SYM_ENCRYPT('Kudos to Huey and Awesome!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2022-10-01', null);
1724+
('fbcde196-7703-4f80-ac5e-5ac60b28555e', PGP_SYM_ENCRYPT('Kudos to Huey and Awesome!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-10-21', '2024-10-21', true);
17151725

17161726
INSERT INTO kudos_recipient
17171727
(id, kudosid, memberid)
@@ -1724,9 +1734,9 @@ VALUES
17241734
('bf37c244-f478-42b2-9077-dd4cb052bbb1', 'fbcde196-7703-4f80-ac5e-5ac60b28555e', '67dc3a3b-5bfa-4759-997a-fb6bac98dcf3');
17251735

17261736
INSERT INTO kudos
1727-
(id, message, senderid, teamid, datecreated, dateapproved)
1737+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17281738
VALUES
1729-
('df2766f0-efab-4925-859e-d993e2e38eaa', PGP_SYM_ENCRYPT('Kudos to the Checkins Experts team!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', 'a8733740-cf4c-4c16-a8cf-4f928c409acc', '2022-09-28', '2022-09-29');
1739+
('df2766f0-efab-4925-859e-d993e2e38eaa', PGP_SYM_ENCRYPT('Kudos to the Checkins Experts team!', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', 'a8733740-cf4c-4c16-a8cf-4f928c409acc', '2024-09-28', '2024-09-29', true);
17301740

17311741
INSERT INTO kudos_recipient
17321742
(id, kudosid, memberid)
@@ -1744,19 +1754,19 @@ VALUES
17441754
('0ca86d55-cffb-4b84-883c-c4c2e41eff73', 'df2766f0-efab-4925-859e-d993e2e38eaa', '67dc3a3b-5bfa-4759-997a-fb6bac98dcf3');
17451755

17461756
INSERT INTO kudos
1747-
(id, message, senderid, teamid, datecreated, dateapproved)
1757+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17481758
VALUES
1749-
('17e19f16-d731-4242-a74a-43493a556f08', PGP_SYM_ENCRYPT('Kudos to Michael Kimberlin!', '${aeskey}'), 'a90be358-aa3d-49c8-945a-879a93646e45', null, '2022-08-15', '2022-08-25');
1759+
('17e19f16-d731-4242-a74a-43493a556f08', PGP_SYM_ENCRYPT('Kudos to Mischievous Kangaroo!', '${aeskey}'), 'a90be358-aa3d-49c8-945a-879a93646e45', null, '2024-11-01', null, true);
17501760

17511761
INSERT INTO kudos_recipient
17521762
(id, kudosid, memberid)
17531763
VALUES
17541764
('038485ee-8cac-416b-9da6-d838ee345d0e', '17e19f16-d731-4242-a74a-43493a556f08', 'e4b2fe52-1915-4544-83c5-21b8f871f6db');
17551765

17561766
INSERT INTO kudos
1757-
(id, message, senderid, teamid, datecreated, dateapproved)
1767+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17581768
VALUES
1759-
('6612b8a0-1d45-4155-b0fb-e0b2d9eaafcb', PGP_SYM_ENCRYPT('Wanted to give some kudos to Mischievous Kangaroo and Revolver Ocelot for their recent help on the project. Thank you very much!', '${aeskey}'), '1b4f99da-ef70-4a76-9b37-8bb783b749ad', null, '2022-10-05', null);
1769+
('6612b8a0-1d45-4155-b0fb-e0b2d9eaafcb', PGP_SYM_ENCRYPT('Wanted to give some kudos to Mischievous Kangaroo and Revolver Ocelot for their recent help on the project. Thank you very much!', '${aeskey}'), '1b4f99da-ef70-4a76-9b37-8bb783b749ad', null, '2024-10-29', '2024-10-29', true);
17601770

17611771
INSERT INTO kudos_recipient
17621772
(id, kudosid, memberid)
@@ -1769,9 +1779,9 @@ VALUES
17691779
('01f639d5-b7b3-47a2-b165-d7a20d01fec2', '6612b8a0-1d45-4155-b0fb-e0b2d9eaafcb', '105f2968-a182-45a3-892c-eeff76383fe0');
17701780

17711781
INSERT INTO kudos
1772-
(id, message, senderid, teamid, datecreated, dateapproved)
1782+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17731783
VALUES
1774-
('9cdce399-4c02-41ed-a63f-35beb6ecb622', PGP_SYM_ENCRYPT('A huge thank you to the Javascript Gurus team for offering their advice on the tech stack for the new project. Kudos to you all!', '${aeskey}'), '8d75c07e-6adc-437a-8659-7dd953ce6600', 'e8f052a8-40b5-4fb4-9bab-8b16ed36adc7', '2022-10-10', '2022-10-11');
1784+
('9cdce399-4c02-41ed-a63f-35beb6ecb622', PGP_SYM_ENCRYPT('A huge thank you to the Javascript Gurus team for offering their advice on the tech stack for the new project. Kudos to you all!', '${aeskey}'), '8d75c07e-6adc-437a-8659-7dd953ce6600', 'e8f052a8-40b5-4fb4-9bab-8b16ed36adc7', '2022-10-10', '2022-10-11', true);
17751785

17761786
INSERT INTO kudos_recipient
17771787
(id, kudosid, memberid)
@@ -1789,19 +1799,19 @@ VALUES
17891799
('f792056b-22ce-4e3d-a442-0fdc3cb35e7b', '9cdce399-4c02-41ed-a63f-35beb6ecb622', '105f2968-a182-45a3-892c-eeff76383fe0');
17901800

17911801
INSERT INTO kudos
1792-
(id, message, senderid, teamid, datecreated, dateapproved)
1802+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
17931803
VALUES
1794-
('39dfd284-d0bf-4017-848c-8156dfef2b93', PGP_SYM_ENCRYPT('Kudos are tasty.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-09-04', '2022-09-04');
1804+
('39dfd284-d0bf-4017-848c-8156dfef2b93', PGP_SYM_ENCRYPT('Kudos are tasty.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-11-10', '2024-11-10', true);
17951805

17961806
INSERT INTO kudos_recipient
17971807
(id, kudosid, memberid)
17981808
VALUES
17991809
('ebc023e2-b578-4b03-a2fc-fc9472a8474b', '39dfd284-d0bf-4017-848c-8156dfef2b93', 'c7406157-a38f-4d48-aaed-04018d846727');
18001810

18011811
INSERT INTO kudos
1802-
(id, message, senderid, teamid, datecreated, dateapproved)
1812+
(id, message, senderid, teamid, datecreated, dateapproved, publiclyvisible)
18031813
VALUES
1804-
('39dfd284-d0bf-4017-848c-8156dfef2b94', PGP_SYM_ENCRYPT('Kudos are covered in chocolate.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-09-04', '2022-09-04');
1814+
('39dfd284-d0bf-4017-848c-8156dfef2b94', PGP_SYM_ENCRYPT('Kudos are covered in chocolate.', '${aeskey}'), 'e4b2fe52-1915-4544-83c5-21b8f871f6db', null, '2024-09-04', '2022-09-04', true);
18051815

18061816
INSERT INTO kudos_recipient
18071817
(id, kudosid, memberid)

web-ui/src/components/certifications/EarnedCertificationsTable.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const EarnedCertificationsTable = ({
9494
});
9595
if (res.error) return;
9696

97-
const certs = res.payload.data;
97+
const certs = res.payload.data ?? [];
9898
setCertifications(certs.sort((c1, c2) => c1.name.localeCompare(c2.name)));
9999

100100
const certMap = certs.reduce((map, cert) => {
@@ -114,7 +114,7 @@ const EarnedCertificationsTable = ({
114114
});
115115
if (res.error) return;
116116

117-
let earned = res.payload.data;
117+
let earned = res.payload.data ?? [];
118118
if (onlyMe) {
119119
earned = earned.filter(cert => cert.memberId === currentUser.id);
120120
}
@@ -512,7 +512,7 @@ const EarnedCertificationsTable = ({
512512
});
513513
if (res.error) return;
514514

515-
const newEarned = res.payload.data;
515+
const newEarned = res.payload.data ?? [];
516516
setEarnedCertifications(earned => {
517517
if (id) {
518518
const index = earned.findIndex(c => c.id === id);

web-ui/src/components/feedback_submit_form/FeedbackSubmitForm.jsx

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ const FeedbackSubmitForm = ({
175175
type: UPDATE_TOAST,
176176
payload: {
177177
severity: 'error',
178-
toast: res.error
178+
toast: res?.error ?? 'Unknown Error'
179179
}
180180
});
181181
}
@@ -188,21 +188,10 @@ const FeedbackSubmitForm = ({
188188
<SkeletonLoader type="feedback_requests" />
189189
) : (
190190
<Root className="submit-form">
191-
<Typography className={classes.announcement} variant="h3">
191+
<Typography component={'span'} className={classes.announcement} variant="h3">
192192
{isReviewing ? 'Reviewing' : 'Submitting'} Feedback on{' '}
193193
<b>{requesteeName}</b>
194194
</Typography>
195-
{/* {!isReviewing && ( */}
196-
{/* <div className="wrapper"> */}
197-
{/* <InfoIcon style={{ color: blue[900], fontSize: '2vh' }}> */}
198-
{/* info-icon */}
199-
{/* </InfoIcon> */}
200-
{/* <Typography className={classes.tip}> */}
201-
{/* <b>Tip of the day: </b> */}
202-
{/* {tip} */}
203-
{/* </Typography> */}
204-
{/* </div> */}
205-
{/* )} */}
206195
{!isReviewing && (
207196
<Alert className={classes.warning} severity="warning">
208197
<AlertTitle>Notice!</AlertTitle>

web-ui/src/components/reviews/TeamMemberReview.jsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ const TeamMemberReview = ({
131131
: 'Self-Review'
132132
}
133133
{...a11yProps(0)}
134+
key={0}
134135
/>
135136
{reviews &&
136137
reviews.filter(r => !!r).map((review, index) => {
@@ -148,7 +149,10 @@ const TeamMemberReview = ({
148149
}
149150

150151
return (
151-
<Tab icon={icon} label={label} {...a11yProps(index + 1)} />
152+
<Tab key={index + 1}
153+
icon={icon}
154+
label={label}
155+
{...a11yProps(index + 1)} />
152156
);
153157
})}
154158
</Tabs>
@@ -158,7 +162,7 @@ const TeamMemberReview = ({
158162
index={value}
159163
onChangeIndex={handleChangeIndex}
160164
>
161-
<TabPanel value={value} index={0} dir={theme.direction}>
165+
<TabPanel key={0} value={value} index={0} dir={theme.direction}>
162166
{selfReview?.id ? (
163167
<FeedbackSubmitForm
164168
requesteeName={
@@ -179,7 +183,10 @@ const TeamMemberReview = ({
179183
review.status?.toUpperCase() === 'SUBMITTED');
180184

181185
return (
182-
<TabPanel value={value} index={index + 1} dir={theme.direction}>
186+
<TabPanel key={index + 1}
187+
value={value}
188+
index={index + 1}
189+
dir={theme.direction}>
183190
<FeedbackSubmitForm
184191
requesteeName={requesteeName}
185192
requestId={review.id}

web-ui/src/components/reviews/periods/ReviewPeriods.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,8 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => {
399399
: aName.localeCompare(b.name));
400400
})
401401
.map((period) => (
402-
<div>
402+
<div key={`review-period-card-${period.id}`}>
403403
<ReviewPeriodCard
404-
key={`review-period-card-${period.id}`}
405404
mode={mode}
406405
onSelect={onPeriodClick}
407406
periodId={period.id}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from 'react';
2+
import VolunteerTables from './VolunteerTables';
3+
import { AppContextProvider } from '../../context/AppContext';
4+
import { BrowserRouter } from 'react-router-dom';
5+
6+
7+
const initialState = {
8+
state: {
9+
userProfile: {
10+
name: 'Mitch Hedberg',
11+
role: ['MEMBER'],
12+
},
13+
},
14+
};
15+
16+
it('renders correctly', () => {
17+
snapshot(
18+
<AppContextProvider value={initialState}>
19+
<BrowserRouter>
20+
<VolunteerTables />
21+
</BrowserRouter>
22+
</AppContextProvider>
23+
);
24+
});

0 commit comments

Comments
 (0)