*/}
-{/* */}
-{/* info-icon */}
-{/* */}
-{/* */}
-{/* Tip of the day: */}
-{/* {tip} */}
-{/* */}
-{/*
*/}
-{/* )} */}
{!isReviewing && (
+
{
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/components/volunteer/__snapshots__/VolunteerTables.test.jsx.snap b/web-ui/src/components/volunteer/__snapshots__/VolunteerTables.test.jsx.snap
new file mode 100644
index 0000000000..91bfa13eb8
--- /dev/null
+++ b/web-ui/src/components/volunteer/__snapshots__/VolunteerTables.test.jsx.snap
@@ -0,0 +1,168 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders correctly 1`] = `
+
+
+
+
+ );
+});
+
+it('renders an error if user does not have appropriate permission', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/CheckinsReportPage.test.jsx b/web-ui/src/pages/CheckinsReportPage.test.jsx
new file mode 100644
index 0000000000..4299d33188
--- /dev/null
+++ b/web-ui/src/pages/CheckinsReportPage.test.jsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import CheckinsReportPage from './CheckinsReportPage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+const userStateWithPermission = {
+ state: {
+ userProfile: {
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ permissions: [{ permission: 'CAN_VIEW_CHECKINS_REPORT' }],
+ },
+ terminatedMembers: [],
+ }
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+ );
+});
+
+it('renders an error if user does not have appropriate permission', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/EmailPage.test.jsx b/web-ui/src/pages/EmailPage.test.jsx
new file mode 100644
index 0000000000..7ee3c50bf2
--- /dev/null
+++ b/web-ui/src/pages/EmailPage.test.jsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import EmailPage from './EmailPage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+window.scrollTo = vi.fn();
+
+const userStateWithPermission = {
+ state: {
+ userProfile: {
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ permissions: [{ permission: 'CAN_SEND_EMAIL' }],
+ },
+ terminatedMembers: [],
+ }
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+ );
+});
+
+it('renders an error if user does not have appropriate permission', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/FeedbackSubmitPage.jsx b/web-ui/src/pages/FeedbackSubmitPage.jsx
index a0edf36de4..4475dcb3fc 100644
--- a/web-ui/src/pages/FeedbackSubmitPage.jsx
+++ b/web-ui/src/pages/FeedbackSubmitPage.jsx
@@ -169,7 +169,7 @@ const FeedbackSubmitPage = () => {
}, [currentUserId, feedbackRequest, selfReviewRequest, state]);
return (
-
+
{requestCanceled ? (
This feedback request has been canceled.
diff --git a/web-ui/src/pages/FeedbackSubmitPage.test.jsx b/web-ui/src/pages/FeedbackSubmitPage.test.jsx
new file mode 100644
index 0000000000..40fe4ac292
--- /dev/null
+++ b/web-ui/src/pages/FeedbackSubmitPage.test.jsx
@@ -0,0 +1,88 @@
+import React from 'react';
+import FeedbackSubmitPage from './FeedbackSubmitPage';
+import { AppContextProvider } from '../context/AppContext';
+import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
+import { MemoryRouter } from 'react-router-dom';
+
+window.snackDispatch = vi.fn();
+
+const userProfile = {
+ id: 'member-id',
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ workEmail: 'hedbergm@objectcomputing.com',
+ title: 'Strategic Placement Specialist',
+ location: 'Roseville, Minnesota',
+ memberProfile: {
+ id: 'member-id',
+ bioText: 'Died too young.',
+ },
+};
+
+const userStateWithPermission = {
+ state: {
+ csrf: 'csrf',
+ userProfile: userProfile,
+ teams: [],
+ memberProfiles: [
+ {
+ id: 'some-id',
+ name: 'James Johnson',
+ },
+ userProfile,
+ ],
+ },
+ dispatch: vi.fn(),
+};
+
+const server = setupServer(
+ http.get('http://localhost:8080/services/feedback/requests/request-id', ({ request }) => {
+ return HttpResponse.json(
+ {
+ 'id': 'request-id',
+ 'status': 'SUBMITTED',
+ 'requesteeId': userStateWithPermission.state.memberProfiles[0].id,
+ 'recipientId': userStateWithPermission.state.memberProfiles[1].id,
+ },
+ );
+ }),
+ http.get('http://localhost:8080/services/feedback/requests/canceled-request-id', ({ request }) => {
+ return HttpResponse.json(
+ {
+ 'id': 'canceled-request-id',
+ 'status': 'CANCELED',
+ 'requesteeId': userStateWithPermission.state.memberProfiles[0].id,
+ 'recipientId': userStateWithPermission.state.memberProfiles[1].id,
+ },
+ );
+ }),
+);
+
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+
+it('renders correctly - submitted', async () => {
+ await waitForSnapshot(
+ 'request-id',
+
+
+
+
+ );
+});
+
+it('renders correctly - canceled', async () => {
+ await waitForSnapshot(
+ 'canceled-request-id',
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/ManageKudosPage.jsx b/web-ui/src/pages/ManageKudosPage.jsx
index e495efb5f9..8b9473a08f 100644
--- a/web-ui/src/pages/ManageKudosPage.jsx
+++ b/web-ui/src/pages/ManageKudosPage.jsx
@@ -63,6 +63,20 @@ const ManageKudosPage = () => {
const [approvedKudosLoading, setApprovedKudosLoading] = useState(true);
const [kudosTab, setKudosTab] = useState("PENDING");
const [timeRange, setTimeRange] = useState(DateRange.TWO_WEEKS);
+ const [pendingSort, setPendingSort] = useState(SortOption.OLDEST);
+
+ const sortPendingKudos = (pending) => {
+ return pending.sort((a, b) => {
+ const l = pendingSort === SortOption.NEWEST ? a : b;
+ const r = pendingSort === SortOption.NEWEST ? b : a;
+ for(let i = 0; i < l.dateCreated.length; i++) {
+ if (l.dateCreated[i] != r.dateCreated[i]) {
+ return r.dateCreated[i] - l.dateCreated[i];
+ }
+ }
+ return 0;
+ });
+ };
const loadPendingKudos = useCallback(async () => {
setPendingKudosLoading(true);
@@ -85,17 +99,21 @@ const ManageKudosPage = () => {
useEffect(() => {
loadPendingKudos().then(data => {
if (data) {
- setPendingKudos(data);
+ setPendingKudos(sortPendingKudos(data));
}
});
}, [csrf, dispatch, loadPendingKudos]);
+ useEffect(() => {
+ setPendingKudos(sortPendingKudos([...pendingKudos]));
+ }, [pendingSort]);
+
const handleTabChange = useCallback((event, newTab) => {
switch (newTab) {
case "PENDING":
loadPendingKudos().then(data => {
if (data) {
- setPendingKudos(data);
+ setPendingKudos(sortPendingKudos(data));
}
});
break;
@@ -113,6 +131,33 @@ const ManageKudosPage = () => {
setKudosTab(newTab);
}, [loadPendingKudos, loadApprovedKudos]);
+ const filterApprovedKudos = (kudos) => {
+ if (!kudos.dateApproved) {
+ return false;
+ }
+
+ const now = new Date();
+ const approved = new Date(kudos.dateApproved[0],
+ kudos.dateApproved[1] - 1,
+ kudos.dateApproved[2]).getTime();
+ switch(timeRange) {
+ case DateRange.ONE_WEEK:
+ return approved >= (new Date(now.getFullYear(), now.getMonth(),
+ now.getDate() - 7).getTime());
+ case DateRange.TWO_WEEKS:
+ return approved >= (new Date(now.getFullYear(), now.getMonth(),
+ now.getDate() - 14).getTime());
+ case DateRange.ONE_MONTH:
+ return approved >= (new Date(now.getFullYear(), now.getMonth() - 1,
+ now.getDate()).getTime());
+ case DateRange.ONE_YEAR:
+ return approved >= (new Date(now.getFullYear() - 1, now.getMonth(),
+ now.getDate()).getTime());
+ case DateRange.ALL_TIME:
+ return true;
+ }
+ };
+
return selectHasAdministerKudosPermission(state) ? (
@@ -141,6 +186,8 @@ const ManageKudosPage = () => {
select
label="Sort by"
variant="outlined"
+ value={pendingSort}
+ onChange={(event) => setPendingSort(event.target.value)}
>
@@ -176,7 +223,7 @@ const ManageKudosPage = () => {
? Array.from({length: 5}).map((_, index) => option.label || ""}
value={reviewPeriodId}
onChange={onReviewPeriodChange}
renderInput={params => (
diff --git a/web-ui/src/pages/MeritReportPage.test.jsx b/web-ui/src/pages/MeritReportPage.test.jsx
new file mode 100644
index 0000000000..0012ead967
--- /dev/null
+++ b/web-ui/src/pages/MeritReportPage.test.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import MeritReportPage from './MeritReportPage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+const userStateWithPermission = {
+ state: {
+ userProfile: {
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ permissions: [{ permission: 'CAN_CREATE_MERIT_REPORT' }],
+ }
+ }
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+ );
+});
+
+it('renders an error if user does not have appropriate permission', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/ProfilePage.test.jsx b/web-ui/src/pages/ProfilePage.test.jsx
new file mode 100644
index 0000000000..a5ef9e2caf
--- /dev/null
+++ b/web-ui/src/pages/ProfilePage.test.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import ProfilePage from './ProfilePage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+const userProfile = {
+ id: 'member-id',
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ workEmail: 'hedbergm@objectcomputing.com',
+ title: 'Strategic Placement Specialist',
+ location: 'Roseville, Minnesota',
+ memberProfile: {
+ id: 'member-id',
+ bioText: 'Died too young.',
+ },
+};
+
+const userStateWithPermission = {
+ state: {
+ memberProfiles: [ userProfile ],
+ userProfile: userProfile,
+ }
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/ReceivedRequestsPage.test.jsx b/web-ui/src/pages/ReceivedRequestsPage.test.jsx
new file mode 100644
index 0000000000..e8aae91492
--- /dev/null
+++ b/web-ui/src/pages/ReceivedRequestsPage.test.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import ReceivedRequestsPage from './ReceivedRequestsPage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+
+const initialState = {
+ state: {
+ userProfile: {
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ },
+ },
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/ReviewsPage.test.jsx b/web-ui/src/pages/ReviewsPage.test.jsx
new file mode 100644
index 0000000000..be95217b18
--- /dev/null
+++ b/web-ui/src/pages/ReviewsPage.test.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import ReviewsPage from './ReviewsPage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+window.snackDispatch = vi.fn();
+
+const initialState = {
+ state: {
+ userProfile: {
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ },
+ // Review Period 2 should be listed before Review Period 1 because it's OPEN
+ reviewPeriods: [
+ {
+ id: 'a44fc66a-86b0-4f15-8459-e7d4b4ecc330',
+ name: 'Review Period 1',
+ reviewStatus: 'CLOSED',
+ },
+ {
+ id: 'a44fc66a-86b0-4f15-8459-e7d4b4ecc331',
+ name: 'Review Period 2',
+ reviewStatus: 'OPEN',
+ },
+ ],
+ },
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+ );
+});
diff --git a/web-ui/src/pages/__snapshots__/CertificationReportPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/CertificationReportPage.test.jsx.snap
new file mode 100644
index 0000000000..3aa7fb840a
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/CertificationReportPage.test.jsx.snap
@@ -0,0 +1,145 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders an error if user does not have appropriate permission 1`] = `
+
+
+`;
diff --git a/web-ui/src/pages/CertificationReportPage.test.jsx b/web-ui/src/pages/CertificationReportPage.test.jsx
new file mode 100644
index 0000000000..1e821f18a8
--- /dev/null
+++ b/web-ui/src/pages/CertificationReportPage.test.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import CertificationReportPage from './CertificationReportPage';
+import { AppContextProvider } from '../context/AppContext';
+import { BrowserRouter } from 'react-router-dom';
+
+const userStateWithPermission = {
+ state: {
+ userProfile: {
+ name: 'Mitch Hedberg',
+ role: ['MEMBER'],
+ permissions: [{ permission: 'CAN_MANAGE_EARNED_CERTIFICATIONS' }],
+ }
+ }
+};
+
+it('renders correctly', () => {
+ snapshot(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + Member + 🔼 + | ++ Organization + | ++ Start Date + | ++ End Date + | ++ Actions + | +
|---|
+ The administrator may edit organizations to ensure accuracy. +
+
- {approvedKudos.map(k =>
+ {approvedKudos.filter(filterApprovedKudos).map(k =>
)}
diff --git a/web-ui/src/pages/MeritReportPage.jsx b/web-ui/src/pages/MeritReportPage.jsx
index 6a4225b279..dde1ff7dd3 100644
--- a/web-ui/src/pages/MeritReportPage.jsx
+++ b/web-ui/src/pages/MeritReportPage.jsx
@@ -81,7 +81,8 @@ const MeritReportPage = () => {
if (data) {
let periods = data.reduce((result, item) => {
if (item.closeDate) {
- result.push({label: formatReviewDate(item.closeDate),
+ result.push({label: item.name + ' - ' +
+ formatReviewDate(item.closeDate),
id: item.id});
}
return result;
@@ -552,6 +553,7 @@ const MeritReportPage = () => {
+
+`;
+
+exports[`renders correctly 1`] = `
++ You do not have permission to view this page. +
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/CheckinsReportPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/CheckinsReportPage.test.jsx.snap
new file mode 100644
index 0000000000..9553f57e44
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/CheckinsReportPage.test.jsx.snap
@@ -0,0 +1,218 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders an error if user does not have appropriate permission 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Earned Certifications +
+
+
+
+
+
+
+
+
+ | + Member + 🔼 + | ++ Name + | ++ Description + | ++ Earned On + | ++ Expiration + | ++ Validation Image + | ++ Badge + | ++ Actions + | +
|---|
+
+`;
+
+exports[`renders correctly 1`] = `
++ You do not have permission to view this page. +
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/EmailPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/EmailPage.test.jsx.snap
new file mode 100644
index 0000000000..94d95652a9
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/EmailPage.test.jsx.snap
@@ -0,0 +1,305 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders an error if user does not have appropriate permission 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+ + Select PDLs +
++ ( + 0 + ) +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Q4 2024
+
+
+
+ -
+
- + Start of Quarter + +
- + Tue Oct 01 2024 + +
- + End of Quarter + +
- + Tue Dec 31 2024 + +
+
+
+
+
+
+
+
+ + No PDLs selected +
++ Please select some PDLs using the Member Selector. +
+
+
+`;
+
+exports[`renders correctly 1`] = `
++ You do not have permission to view this page. +
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/FeedbackSubmitPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/FeedbackSubmitPage.test.jsx.snap
new file mode 100644
index 0000000000..bc9357ff5f
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/FeedbackSubmitPage.test.jsx.snap
@@ -0,0 +1,143 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders correctly - canceled 1`] = `
+
+
+
+
+
+
+
+
+
+ Choose Email Format
+
+
+
+
+
+
+
+
+
+
+
+
+ Compose Email
+
+
+
+
+
+
+
+
+
+
+
+
+ Select Recipients
+
+
+
+
+
+
+
+
+
+
+
+ Choose Email Format
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`renders correctly - submitted 1`] = `
+
+
++ This feedback request has been canceled. +
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/MeritReportPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/MeritReportPage.test.jsx.snap
new file mode 100644
index 0000000000..470a70b25a
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/MeritReportPage.test.jsx.snap
@@ -0,0 +1,277 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders an error if user does not have appropriate permission 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`renders correctly 1`] = `
++ You do not have permission to view this page. +
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/ProfilePage.test.jsx.snap b/web-ui/src/pages/__snapshots__/ProfilePage.test.jsx.snap
new file mode 100644
index 0000000000..257c38b7cf
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/ProfilePage.test.jsx.snap
@@ -0,0 +1,746 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders correctly 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Selected Members +
++ ( + 0 + ) +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/ReceivedRequestsPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/ReceivedRequestsPage.test.jsx.snap
new file mode 100644
index 0000000000..97e4df06f6
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/ReceivedRequestsPage.test.jsx.snap
@@ -0,0 +1,288 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders correctly 1`] = `
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ + Mitch Hedberg +
++ Strategic Placement Specialist +
+
+
+ hedbergm@objectcomputing.com
+
+
+ Location:
+ Roseville, Minnesota
+
+ Supervisor:
+
+ Current PDL:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Bio +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Guilds & Communities +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Teams +
+
+
+
+
+ + No teams found +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + Organization + | ++ Start Date + | ++ End Date + | ++ Actions + | +
|---|
+ The administrator may edit organizations to ensure accuracy. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Earned Certifications +
+
+
+
+
+
+
+
+
+ | + Name + | ++ Description + | ++ Earned On + | ++ Expiration + | ++ Validation Image + | ++ Badge + | ++ Actions + | +
|---|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Skills +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/web-ui/src/pages/__snapshots__/ReviewsPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/ReviewsPage.test.jsx.snap
new file mode 100644
index 0000000000..042cf8bedf
--- /dev/null
+++ b/web-ui/src/pages/__snapshots__/ReviewsPage.test.jsx.snap
@@ -0,0 +1,107 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`renders correctly 1`] = `
+
+
+
+
+
+
+
+ + Received Feedback Requests +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Send date (most recent)
+
+
+
+
+
+
+ + Received Requests +
+ ++
+
+
+
+
+
+
+
+
+ + Submitted Requests +
+ ++
+
+
+
+
+
+
+
+
+ + Canceled Requests +
+ ++
+
+
+
+
+
+
+
+
+`;
+
+
+
+
+
+
+
+ + Review Periods +
+-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Review Period 2 - Open
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Review Period 1 - Closed
+
+
+