Skip to content

Commit 1fb3546

Browse files
ocielliottcocielliottc
committed
Added filtering of approved kudos.
1 parent 1a3c907 commit 1fb3546

File tree

2 files changed

+55
-18
lines changed

2 files changed

+55
-18
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/pages/ManageKudosPage.jsx‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const ManageKudosPage = () => {
113113
case "PENDING":
114114
loadPendingKudos().then(data => {
115115
if (data) {
116-
setPendingKudos(data);
116+
setPendingKudos(sortPendingKudos(data));
117117
}
118118
});
119119
break;
@@ -131,6 +131,33 @@ const ManageKudosPage = () => {
131131
setKudosTab(newTab);
132132
}, [loadPendingKudos, loadApprovedKudos]);
133133

134+
const filterApprovedKudos = (kudos) => {
135+
if (!kudos.dateApproved) {
136+
return false;
137+
}
138+
139+
const now = new Date();
140+
const approved = new Date(kudos.dateApproved[0],
141+
kudos.dateApproved[1] - 1,
142+
kudos.dateApproved[2]).getTime();
143+
switch(timeRange) {
144+
case DateRange.ONE_WEEK:
145+
return approved >= (new Date(now.getFullYear(), now.getMonth(),
146+
now.getDate() - 7).getTime());
147+
case DateRange.TWO_WEEKS:
148+
return approved >= (new Date(now.getFullYear(), now.getMonth(),
149+
now.getDate() - 14).getTime());
150+
case DateRange.ONE_MONTH:
151+
return approved >= (new Date(now.getFullYear(), now.getMonth() - 1,
152+
now.getDate()).getTime());
153+
case DateRange.ONE_YEAR:
154+
return approved >= (new Date(now.getFullYear() - 1, now.getMonth(),
155+
now.getDate()).getTime());
156+
case DateRange.ALL_TIME:
157+
return true;
158+
}
159+
};
160+
134161
return selectHasAdministerKudosPermission(state) ? (
135162
<Root className="manage-kudos-page">
136163
<TabContext value={kudosTab}>
@@ -196,7 +223,7 @@ const ManageKudosPage = () => {
196223
? Array.from({length: 5}).map((_, index) => <SkeletonLoader key={index} type="kudos"/>)
197224
: (
198225
<div>
199-
{approvedKudos.map(k =>
226+
{approvedKudos.filter(filterApprovedKudos).map(k =>
200227
<KudosCard key={k.id} kudos={k}/>
201228
)}
202229
</div>

0 commit comments

Comments
 (0)