-
@@ -98,15 +94,11 @@ exports[`has no billable hours 1`] = `
1850
- PTO Hours:
-
0
- Billable Utilization:
-
(none)
- - Overtime Worked:
-
-
+ - Overtime Worked:
(none)
diff --git a/web-ui/src/components/dialogs/OrganizationDialog.jsx b/web-ui/src/components/dialogs/OrganizationDialog.jsx
index b227144f28..f5e2403641 100644
--- a/web-ui/src/components/dialogs/OrganizationDialog.jsx
+++ b/web-ui/src/components/dialogs/OrganizationDialog.jsx
@@ -1,5 +1,12 @@
import React from 'react';
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, TextField } from '@mui/material';
+import {
+ Dialog,
+ DialogTitle,
+ DialogContent,
+ DialogActions,
+ Button,
+ TextField
+} from '@mui/material';
import PropTypes from 'prop-types';
const OrganizationDialog = ({
@@ -19,7 +26,9 @@ const OrganizationDialog = ({
fullWidth
margin="dense"
value={organization.name}
- onChange={e => setOrganization({ ...organization, name: e.target.value })}
+ onChange={e =>
+ setOrganization({ ...organization, name: e.target.value })
+ }
required
/>
+ Issued on: {earnedCert.earnedDate}
+ Expires on: {earnedCert.expirationDate} + + } + > + {earnedCert.validationUrl ? ( + +
- Issued on: {earnedCert.earnedDate}
+ Issued on: {earnedCert.earnedDate} +
Expires on: {earnedCert.expirationDate} } - > - {earnedCert.validationUrl ? ( - -
- Issued on: {earnedCert.earnedDate}
- Expires on: {earnedCert.expirationDate} - - } - /> -
- Issued on: {earnedCert.earnedDate}
- Expires on: {earnedCert.expirationDate} - - } - /> - )} - - ); - } - })} -
+ Issued on: {earnedCert.earnedDate} +
+ Expires on: {earnedCert.expirationDate} + + } + /> + )} + + ); + } + })} + + ); - }; EarnedCertificationBadges.propTypes = propTypes; diff --git a/web-ui/src/components/feedback_recipient_card/FeedbackRecipientCard.jsx b/web-ui/src/components/feedback_recipient_card/FeedbackRecipientCard.jsx index a9d82acc25..37d5fa11f8 100644 --- a/web-ui/src/components/feedback_recipient_card/FeedbackRecipientCard.jsx +++ b/web-ui/src/components/feedback_recipient_card/FeedbackRecipientCard.jsx @@ -3,7 +3,14 @@ import { styled } from '@mui/material/styles'; import { AppContext } from '../../context/AppContext'; import { selectProfileMap } from '../../context/selectors'; import { getAvatarURL } from '../../api/api.js'; -import { Box, Card, CardHeader, CardContent, Container, Typography } from '@mui/material'; +import { + Box, + Card, + CardHeader, + CardContent, + Container, + Typography +} from '@mui/material'; import Avatar from '@mui/material/Avatar'; import PriorityHighIcon from '@mui/icons-material/PriorityHigh'; import { green } from '@mui/material/colors'; diff --git a/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx b/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx index 30a69dbdd7..30b409d72f 100644 --- a/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx +++ b/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx @@ -4,7 +4,7 @@ import { BrowserRouter } from 'react-router-dom'; import { AppContextProvider } from '../../../context/AppContext'; import FeedbackRequestSubcard from './FeedbackRequestSubcard'; -const defaultTheme = {} +const defaultTheme = {}; it('renders correctly', () => { snapshot( diff --git a/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.jsx b/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.jsx index 8d01337fc8..1ce337f9bc 100644 --- a/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.jsx +++ b/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.jsx @@ -5,7 +5,7 @@ import CheckCircleIcon from '@mui/icons-material/CheckCircle'; import { selectProfile, selectHasCreateFeedbackPermission, - noPermission, + noPermission } from '../../context/selectors'; import { AppContext } from '../../context/AppContext'; import { Link, useLocation } from 'react-router-dom'; diff --git a/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.test.jsx b/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.test.jsx index cf598a2827..d1d4da49ac 100644 --- a/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.test.jsx +++ b/web-ui/src/components/feedback_request_confirmation/FeedbackRequestConfirmation.test.jsx @@ -8,7 +8,7 @@ const userStateWithPermission = { userProfile: { name: 'sherlock holmes', role: ['MEMBER'], - permissions: [{ permission: 'CAN_CREATE_FEEDBACK_REQUEST' }], + permissions: [{ permission: 'CAN_CREATE_FEEDBACK_REQUEST' }] } } }; @@ -18,7 +18,7 @@ const userStateWithoutPermission = { userProfile: { name: 'john watson', role: ['MEMBER'], - permissions: [{ permission: 'CAN_VIEW_SKILLS_REPORT' }], + permissions: [{ permission: 'CAN_VIEW_SKILLS_REPORT' }] } } }; diff --git a/web-ui/src/components/feedback_submission_tips/FeedbackSubmissionTips.jsx b/web-ui/src/components/feedback_submission_tips/FeedbackSubmissionTips.jsx index 7ea53d6edd..a3c2b8d067 100644 --- a/web-ui/src/components/feedback_submission_tips/FeedbackSubmissionTips.jsx +++ b/web-ui/src/components/feedback_submission_tips/FeedbackSubmissionTips.jsx @@ -86,7 +86,8 @@ const FeedbackSubmissionTips = props => {
diff --git a/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.jsx b/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.jsx
index 1d707f1371..8534094b6b 100644
--- a/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.jsx
+++ b/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.jsx
@@ -7,7 +7,7 @@ import {
selectCurrentUser,
selectProfile,
selectHasCreateFeedbackPermission,
- noPermission,
+ noPermission
} from '../../context/selectors';
import { AppContext } from '../../context/AppContext';
import { useLocation } from 'react-router-dom';
diff --git a/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.test.jsx b/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.test.jsx
index 83e35af751..39b9fb77e1 100644
--- a/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.test.jsx
+++ b/web-ui/src/components/feedback_submit_confirmation/FeedbackSubmitConfirmation.test.jsx
@@ -8,7 +8,7 @@ const userStateWithPermission = {
userProfile: {
name: 'john watson',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_CREATE_FEEDBACK_REQUEST' }],
+ permissions: [{ permission: 'CAN_CREATE_FEEDBACK_REQUEST' }]
}
}
};
diff --git a/web-ui/src/components/feedback_submit_form/FeedbackSubmitForm.jsx b/web-ui/src/components/feedback_submit_form/FeedbackSubmitForm.jsx
index 9ae46e2cc2..50e26e8b60 100644
--- a/web-ui/src/components/feedback_submit_form/FeedbackSubmitForm.jsx
+++ b/web-ui/src/components/feedback_submit_form/FeedbackSubmitForm.jsx
@@ -188,7 +188,11 @@ const FeedbackSubmitForm = ({
-
+
{isReviewing ? 'Reviewing' : 'Submitting'} Feedback on{' '}
{requesteeName}
diff --git a/web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx b/web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx
index 5a58e48c95..f3fc6b0bde 100644
--- a/web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx
+++ b/web-ui/src/components/feedback_template_selector/FeedbackTemplateSelector.jsx
@@ -97,7 +97,7 @@ const FeedbackTemplateSelector = ({ query, changeQuery }) => {
active: true,
isAdHoc: true,
isPublic: false,
- isReview: false,
+ isReview: false
};
const newTemplateQuestion = {
diff --git a/web-ui/src/components/guides/GuideLink.test.jsx b/web-ui/src/components/guides/GuideLink.test.jsx
index 12093b4d7e..8e247e70b8 100644
--- a/web-ui/src/components/guides/GuideLink.test.jsx
+++ b/web-ui/src/components/guides/GuideLink.test.jsx
@@ -13,7 +13,12 @@ it('renders correctly', () => {
it('renders descriptions', () => {
snapshot(
-
);
-});
\ No newline at end of file
+});
diff --git a/web-ui/src/components/guides/GuidesPanel.jsx b/web-ui/src/components/guides/GuidesPanel.jsx
index 1951f55716..c196b687b8 100644
--- a/web-ui/src/components/guides/GuidesPanel.jsx
+++ b/web-ui/src/components/guides/GuidesPanel.jsx
@@ -3,7 +3,11 @@ import PdfIcon from '@mui/icons-material/PictureAsPdf';
import { Card, CardHeader, List } from '@mui/material';
import { AppContext } from '../../context/AppContext.jsx';
-import {selectCsrfToken, selectCurrentUserRoles, selectRoles} from '../../context/selectors.js';
+import {
+ selectCsrfToken,
+ selectCurrentUserRoles,
+ selectRoles
+} from '../../context/selectors.js';
import { getDocumentsForRoleId } from '../../api/document.js';
import GuideLink from './GuideLink';
@@ -48,13 +52,14 @@ const GuidesPanel = () => {
useEffect(() => {
const getDocuments = async () => {
const docs = [];
- if(userRoles) {
+ if (userRoles) {
for (const roleName of userRoles) {
- const memberRoleId = allRoles.find(role => role.role === roleName)?.id;
+ const memberRoleId = allRoles.find(
+ role => role.role === roleName
+ )?.id;
const res = await getDocumentsForRoleId(memberRoleId, csrf);
- const responseBody = res.payload?.data && !res.error
- ? res.payload.data
- : undefined;
+ const responseBody =
+ res.payload?.data && !res.error ? res.payload.data : undefined;
if (responseBody?.length > 0) {
docs.push(...responseBody);
}
@@ -69,15 +74,21 @@ const GuidesPanel = () => {
}, [allRoles, userRoles, csrf, setDocuments, getDocumentsForRoleId]);
return (
-
-
- );;
+
+
+ );
};
export default GuidesPanel;
diff --git a/web-ui/src/components/guides/GuidesPanel.test.jsx b/web-ui/src/components/guides/GuidesPanel.test.jsx
index 5c4760b87d..35a3c243af 100644
--- a/web-ui/src/components/guides/GuidesPanel.test.jsx
+++ b/web-ui/src/components/guides/GuidesPanel.test.jsx
@@ -2,8 +2,8 @@ import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import GuidesPanel from './GuidesPanel';
import { AppContextProvider } from '../../context/AppContext.jsx';
-import {setupServer} from "msw/node";
-import {http, HttpResponse} from "msw";
+import { setupServer } from 'msw/node';
+import { http, HttpResponse } from 'msw';
const initialState = {
state: {
@@ -47,12 +47,12 @@ const pdlMockuments = [
];
const server = setupServer(
- http.get('http://localhost:8080/services/document/1', () => {
- return HttpResponse.json(mockuments);
- }),
- http.get('http://localhost:8080/services/document/2', () => {
- return HttpResponse.json(pdlMockuments);
- })
+ http.get('http://localhost:8080/services/document/1', () => {
+ return HttpResponse.json(mockuments);
+ }),
+ http.get('http://localhost:8080/services/document/2', () => {
+ return HttpResponse.json(pdlMockuments);
+ })
);
beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
@@ -60,7 +60,8 @@ afterEach(() => server.resetHandlers());
afterAll(() => server.close());
it('renders correctly', async () => {
- await waitForSnapshot('mockument-3',
+ await waitForSnapshot(
+ 'mockument-3',
{
- const { checked } = event.target;
- setGuild({ ...editedGuild, active: checked });
- }}
- /> Active
- )}
+ {guild.id && (
+ <>
+ {
+ const { checked } = event.target;
+ setGuild({ ...editedGuild, active: checked });
+ }}
+ />{' '}
+ Active
+
+ )}
-
- {documents.map(doc => (
-
-
+ {documents.map(doc => (
+
Kudos
- {selectHasCreateKudosPermission(state) && } - onClick={() => setKudosDialogOpen(true)} - > - Give Kudos - } + {selectHasCreateKudosPermission(state) && ( + } + onClick={() => setKudosDialogOpen(true)} + > + Give Kudos + + )}
- {kudos.map(k => (
) : (
diff --git a/web-ui/src/components/kudos_card/KudosCard.jsx b/web-ui/src/components/kudos_card/KudosCard.jsx
index b94fe452cc..ece4b332a1 100644
--- a/web-ui/src/components/kudos_card/KudosCard.jsx
+++ b/web-ui/src/components/kudos_card/KudosCard.jsx
@@ -1,5 +1,5 @@
-import React, { useCallback, useContext, useState } from "react";
-import PropTypes from "prop-types";
+import React, { useCallback, useContext, useState } from 'react';
+import PropTypes from 'prop-types';
import {
Paper,
Collapse,
@@ -18,24 +18,24 @@ import {
TextField,
FormGroup,
FormControlLabel,
- Checkbox,
-} from "@mui/material";
+ Checkbox
+} from '@mui/material';
import {
selectCsrfToken,
- selectActiveOrInactiveProfile,
-} from "../../context/selectors";
+ selectActiveOrInactiveProfile
+} from '../../context/selectors';
import MemberSelector from '../member_selector/MemberSelector';
-import { AppContext } from "../../context/AppContext";
-import { getAvatarURL } from "../../api/api";
-import DateFnsUtils from "@date-io/date-fns";
-import CheckIcon from "@mui/icons-material/Check";
-import CloseIcon from "@mui/icons-material/Close";
-import EditIcon from "@mui/icons-material/Edit";
-import TeamIcon from "@mui/icons-material/Groups";
+import { AppContext } from '../../context/AppContext';
+import { getAvatarURL } from '../../api/api';
+import DateFnsUtils from '@date-io/date-fns';
+import CheckIcon from '@mui/icons-material/Check';
+import CloseIcon from '@mui/icons-material/Close';
+import EditIcon from '@mui/icons-material/Edit';
+import TeamIcon from '@mui/icons-material/Groups';
-import "./KudosCard.css";
-import { approveKudos, deleteKudos, updateKudos } from "../../api/kudos";
-import { UPDATE_TOAST } from "../../context/actions";
+import './KudosCard.css';
+import { approveKudos, deleteKudos, updateKudos } from '../../api/kudos';
+import { UPDATE_TOAST } from '../../context/actions';
const dateUtils = new DateFnsUtils();
@@ -47,11 +47,11 @@ const propTypes = {
recipientTeam: PropTypes.object,
dateCreated: PropTypes.array.isRequired,
dateApproved: PropTypes.array,
- recipientMembers: PropTypes.array,
+ recipientMembers: PropTypes.array
}).isRequired,
includeActions: PropTypes.bool,
includeEdit: PropTypes.bool,
- onKudosAction: PropTypes.func,
+ onKudosAction: PropTypes.func
};
const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
@@ -64,7 +64,9 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
const [kudosPublic, setKudosPublic] = useState(kudos.publiclyVisible);
const [kudosMessage, setKudosMessage] = useState(kudos.message);
const [memberSelectorOpen, setMemberSelectorOpen] = useState(false);
- const [kudosRecipientMembers, setKudosRecipientMembers] = useState(kudos.recipientMembers);
+ const [kudosRecipientMembers, setKudosRecipientMembers] = useState(
+ kudos.recipientMembers
+ );
const sender = selectActiveOrInactiveProfile(state, kudos.senderId);
@@ -92,7 +94,7 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
return (
- {kudos.recipientMembers.map((member) => (
+ {kudos.recipientMembers.map(member => (
{
}, [kudos]);
const approveKudosCallback = useCallback(
- async (event) => {
+ async event => {
event.stopPropagation();
const res = await approveKudos(kudos, csrf);
if (res?.payload?.data && !res.error) {
dispatch({
type: UPDATE_TOAST,
payload: {
- severity: "success",
- toast: "Kudos approved",
- },
+ severity: 'success',
+ toast: 'Kudos approved'
+ }
});
onKudosAction && onKudosAction();
} else {
dispatch({
type: UPDATE_TOAST,
payload: {
- severity: "error",
- toast: "Failed to approve kudos",
- },
+ severity: 'error',
+ toast: 'Failed to approve kudos'
+ }
});
}
},
@@ -138,18 +140,18 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
dispatch({
type: UPDATE_TOAST,
payload: {
- severity: "success",
- toast: "Kudos deleted",
- },
+ severity: 'success',
+ toast: 'Kudos deleted'
+ }
});
onKudosAction && onKudosAction();
} else {
dispatch({
type: UPDATE_TOAST,
payload: {
- severity: "error",
- toast: "Failed to delete kudos",
- },
+ severity: 'error',
+ toast: 'Failed to delete kudos'
+ }
});
}
}, [kudos, csrf, dispatch, onKudosAction]);
@@ -163,7 +165,7 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
id: kudos.id,
message: kudosMessage,
publiclyVisible: kudosPublic,
- recipientMembers: kudosRecipientMembers,
+ recipientMembers: kudosRecipientMembers
};
// Update on the server.
@@ -172,25 +174,33 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
dispatch({
type: UPDATE_TOAST,
payload: {
- severity: "error",
- toast: "Failed to update kudos",
- },
+ severity: 'error',
+ toast: 'Failed to update kudos'
+ }
});
} else {
dispatch({
type: UPDATE_TOAST,
payload: {
- severity: "success",
- toast: "Kudos Updated",
- },
+ severity: 'success',
+ toast: 'Kudos Updated'
+ }
});
onKudosAction && onKudosAction();
}
- }, [kudos, kudosMessage, kudosPublic, kudosRecipientMembers, csrf, dispatch, onKudosAction]);
+ }, [
+ kudos,
+ kudosMessage,
+ kudosPublic,
+ kudosRecipientMembers,
+ csrf,
+ dispatch,
+ onKudosAction
+ ]);
const getStatusComponent = useCallback(() => {
const dateApproved = kudos.dateApproved
- ? new Date(kudos.dateApproved.join("/"))
+ ? new Date(kudos.dateApproved.join('/'))
: null;
const info = [];
@@ -211,12 +221,12 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
} else if (dateApproved) {
info.push(
- Received{" "}
- {dateApproved ? dateUtils.format(dateApproved, "MM/dd/yyyy") : ""}
+ Received{' '}
+ {dateApproved ? dateUtils.format(dateApproved, 'MM/dd/yyyy') : ''}
);
} else {
- const dateCreated = new Date(kudos.dateCreated.join("/"));
+ const dateCreated = new Date(kudos.dateCreated.join('/'));
if (kudos.publiclyVisible) {
info.push(
@@ -226,7 +236,7 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
}
info.push(
- Created {dateUtils.format(dateCreated, "MM/dd/yyyy")}
+ Created {dateUtils.format(dateCreated, 'MM/dd/yyyy')}
);
}
@@ -236,7 +246,7 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
);
}
- return <>
- {info.length > 0 && Delete Kudos
- Are you sure you want to complete this action? The kudos
- will be deleted.
+ Are you sure you want to complete this action? The kudos will be
+ deleted.
@@ -306,7 +316,7 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
-
- {info}
-
}
- {actions.length > 0 &&
- {actions}
-
}
- ;
+ return (
+ <>
+ {info.length > 0 && {info}
}
+ {actions.length > 0 && (
+ {actions}
+ )}
+
+ );
}, [kudos, includeActions, includeEdit, approveKudosCallback]);
const reloadKudosValues = () => {
@@ -281,7 +291,7 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
};
const dateApproved = kudos.dateApproved
- ? new Date(kudos.dateApproved.join("/"))
+ ? new Date(kudos.dateApproved.join('/'))
: null;
return (
@@ -290,14 +300,14 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
-
+ data-testid="tiny-mce-checkin-private-notes"
+ style="display: none;"
+ />
+
diff --git a/web-ui/src/components/pulse/Pulse.jsx b/web-ui/src/components/pulse/Pulse.jsx
index 9fc22ad32f..919ce66663 100644
--- a/web-ui/src/components/pulse/Pulse.jsx
+++ b/web-ui/src/components/pulse/Pulse.jsx
@@ -48,7 +48,11 @@ const Pulse = ({
-
-
-
-
-
-
{icons.map((sentiment, index) => (
diff --git a/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx b/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx
index 596138c0bc..14037ef1da 100644
--- a/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx
+++ b/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx
@@ -5,7 +5,7 @@ import {
Typography,
Box,
Card,
- CardContent,
+ CardContent
} from '@mui/material';
import { Link } from 'react-router-dom';
import { getAvatarURL } from '../../../api/api.js';
@@ -21,7 +21,7 @@ import './TeamMemberMap.css';
const SortOption = {
BY_MEMBER: 0,
- BY_PDL: 1,
+ BY_PDL: 1
};
const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
@@ -34,31 +34,31 @@ const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
return map;
}, {});
- const linkStyle={ textDecoration: 'none' };
- const checkinPath = (member, checkin) => `/checkins/${member.id}/${checkin.id}`;
+ const linkStyle = { textDecoration: 'none' };
+ const checkinPath = (member, checkin) =>
+ `/checkins/${member.id}/${checkin.id}`;
const sortByName = (left, right) => {
if (left && right) {
return `${left.lastName} ${left.firstName}`.localeCompare(
- `${right.lastName} ${right.firstName}`);
+ `${right.lastName} ${right.firstName}`
+ );
} else {
return left ? -1 : 1;
}
};
const sortByPDLName = (a, b) =>
- sortByName(memberMap[a.reportDatePDLId], memberMap[b.reportDatePDLId]);
+ sortByName(memberMap[a.reportDatePDLId], memberMap[b.reportDatePDLId]);
// We're going to cache the checkins into the member data structures so that
// we only have to do this once per member.
const { startOfQuarter, endOfQuarter } = getQuarterBeginEnd(reportDate);
members.map(member => {
- member.checkins = selectCheckinsForMember(
- state,
- member.id,
- ).filter(checkin => closed || !checkin.completed)
- .filter(checkin => planned || isPastCheckin(checkin))
- .filter(checkin => (getCheckinDate(checkin) <= endOfQuarter));
+ member.checkins = selectCheckinsForMember(state, member.id)
+ .filter(checkin => closed || !checkin.completed)
+ .filter(checkin => planned || isPastCheckin(checkin))
+ .filter(checkin => getCheckinDate(checkin) <= endOfQuarter);
// If there are checkins, we're going to sort them with the latest
// first. Since the member's PDL could have changed since the last
@@ -85,14 +85,22 @@ const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
rows so that each header lines up exactly with the columns. */}
- { setSortBy(SortOption.BY_MEMBER); }}
- style={{ cursor: 'pointer' }}>
+ {
+ setSortBy(SortOption.BY_MEMBER);
+ }}
+ style={{ cursor: 'pointer' }}
+ >
Member
- {
- members.map(member => {
- const pdl = memberMap[member.reportDatePDLId];
- return (
-
-
-
+
+ );
+ })}
);
};
diff --git a/web-ui/src/components/reports-section/checkin-report/checkin-utils.js b/web-ui/src/components/reports-section/checkin-report/checkin-utils.js
index ded0d2e9fa..8ba2cc2fa2 100644
--- a/web-ui/src/components/reports-section/checkin-report/checkin-utils.js
+++ b/web-ui/src/components/reports-section/checkin-report/checkin-utils.js
@@ -38,7 +38,7 @@ export const getCheckinDateForPeriod = (checkins, reportDate) => {
const { startOfQuarter, endOfQuarter } = getQuarterBeginEnd(reportDate);
const scheduled = checkins.filter(checkin => {
const checkinDate = getCheckinDate(checkin);
- return (checkinDate >= startOfQuarter && checkinDate <= endOfQuarter);
+ return checkinDate >= startOfQuarter && checkinDate <= endOfQuarter;
});
return getLastCheckinDate(scheduled);
};
@@ -49,14 +49,12 @@ export const getCheckinDateForPeriod = (checkins, reportDate) => {
* @param {Date} reportDate - The date of the report.
* @returns {SchedulingStatus} The status of the check-ins.
*/
-export const statusForPeriodByMemberScheduling = (
- checkin,
- reportDate
-) => {
+export const statusForPeriodByMemberScheduling = (checkin, reportDate) => {
if (!checkin) return 'Not Scheduled';
const { startOfQuarter, endOfQuarter } = getQuarterBeginEnd(reportDate);
const checkinDate = getCheckinDate(checkin);
- const scheduled = checkinDate >= startOfQuarter && checkinDate <= endOfQuarter;
+ const scheduled =
+ checkinDate >= startOfQuarter && checkinDate <= endOfQuarter;
if (!scheduled) return 'Not Scheduled';
if (checkin.completed) return 'Completed';
return 'Scheduled';
@@ -67,5 +65,5 @@ export const statusForPeriodByMemberScheduling = (
* @param {Checkin} checkin - A check-in.
* @returns {bool} Status of boolean check.
*/
-export const isPastCheckin = (checkin) => Date.now() >= getCheckinDate(checkin).getTime();
-
+export const isPastCheckin = checkin =>
+ Date.now() >= getCheckinDate(checkin).getTime();
diff --git a/web-ui/src/components/reports-section/checkin-report/checkin-utils.test.js b/web-ui/src/components/reports-section/checkin-report/checkin-utils.test.js
index fa6cc95179..032c925e4d 100644
--- a/web-ui/src/components/reports-section/checkin-report/checkin-utils.test.js
+++ b/web-ui/src/components/reports-section/checkin-report/checkin-utils.test.js
@@ -173,8 +173,7 @@ describe('statusForPeriodByMemberScheduling', () => {
});
test('returns "Scheduled" when the check-in is within the reporting period are not completed', () => {
- const checkin =
- { checkInDate: [2024, 4, 10, 10, 0], completed: false }; // April 1, 2024 (within reporting period, not completed)
+ const checkin = { checkInDate: [2024, 4, 10, 10, 0], completed: false }; // April 1, 2024 (within reporting period, not completed)
const result = statusForPeriodByMemberScheduling(checkin, mockReportDate);
expect(result).toBe('Scheduled');
});
diff --git a/web-ui/src/components/reviews/TeamMemberReview.jsx b/web-ui/src/components/reviews/TeamMemberReview.jsx
index d87bc5515e..5b1dce4f36 100644
--- a/web-ui/src/components/reviews/TeamMemberReview.jsx
+++ b/web-ui/src/components/reviews/TeamMemberReview.jsx
@@ -1,24 +1,15 @@
import React, { useContext, useState, useCallback } from 'react';
import { styled, useTheme } from '@mui/material/styles';
-import SwipeableViews from 'react-swipeable-views';
import PropTypes from 'prop-types';
import { AppContext } from '../../context/AppContext';
-import { selectCsrfToken, selectCurrentUser, selectProfile } from '../../context/selectors';
+import {
+ selectCsrfToken,
+ selectCurrentUser,
+ selectProfile
+} from '../../context/selectors';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
-import {
- AppBar,
- Box,
- Button,
- Card,
- CardActions,
- CardContent,
- CardHeader,
- Modal,
- Tab,
- Tabs,
- Typography
-} from '@mui/material';
+import { AppBar, Box, Tab, Tabs, Typography } from '@mui/material';
import FeedbackSubmitForm from '../feedback_submit_form/FeedbackSubmitForm';
const propTypes = {
@@ -103,10 +94,6 @@ const TeamMemberReview = ({
setValue(newValue);
};
- const handleChangeIndex = index => {
- setValue(index);
- };
-
let selfReviewIcon =
-
- {selfReview?.id ? (
- Not Available )}
-
- {reviews &&
- reviews.filter(r => !!r).map((review, index) => {
+
+ {selfReview?.id ? (
+ Not Available
+ )}
+
+ {reviews &&
+ reviews
+ .filter(r => !!r)
+ .map((review, index) => {
const reviewer = selectProfile(state, review.recipientId);
const requestee = selectProfile(state, review.requesteeId);
const requesteeName = requestee?.name;
- const readOnly = (reviewer?.id !== currentUser?.id ||
- review.status?.toUpperCase() === 'SUBMITTED');
+ const readOnly =
+ reviewer?.id !== currentUser?.id ||
+ review.status?.toUpperCase() === 'SUBMITTED';
return (
-
+
);
})}
-
);
diff --git a/web-ui/src/components/reviews/TeamReviews.jsx b/web-ui/src/components/reviews/TeamReviews.jsx
index 87a30b468a..ca1b8ad00c 100644
--- a/web-ui/src/components/reviews/TeamReviews.jsx
+++ b/web-ui/src/components/reviews/TeamReviews.jsx
@@ -9,12 +9,7 @@ import React, {
} from 'react';
import { useLocation, Link } from 'react-router-dom';
-import {
- AddCircle,
- Archive,
- Search,
- Unarchive
-} from '@mui/icons-material';
+import { AddCircle, Archive, Search, Unarchive } from '@mui/icons-material';
import {
Alert,
Button,
@@ -37,7 +32,7 @@ import {
getReviewAssignments,
createReviewAssignments,
updateReviewAssignment,
- removeReviewAssignment,
+ removeReviewAssignment
} from '../../api/reviewassignments.js';
import {
findReviewRequestsByPeriod,
@@ -69,7 +64,7 @@ import {
selectHasCreateReviewAssignmentsPermission,
selectHasDeleteReviewAssignmentsPermission,
selectHasUpdateReviewAssignmentsPermission,
- selectCanAdministerFeedbackRequests,
+ selectCanAdministerFeedbackRequests
} from '../../context/selectors';
import MemberSelector from '../member_selector/MemberSelector';
@@ -77,8 +72,7 @@ import MemberSelectorDialog from '../member_selector/member_selector_dialog/Memb
import DatePickerField from '../date-picker-field/DatePickerField.jsx';
import '../date-picker-field/DatePickerField.css';
import './TeamReviews.css';
-import ReviewPeriodStepper from "./periods/ReviewPeriodStepper.jsx";
-
+import ReviewPeriodStepper from './periods/ReviewPeriodStepper.jsx';
const propTypes = {
onBack: PropTypes.func,
@@ -150,8 +144,14 @@ const TeamReviews = ({ onBack, periodId }) => {
const [toClose, setToClose] = useState(null);
const [unapproved, setUnapproved] = useState([]);
const [validationMessage, setValidationMessage] = useState(null);
- const [confirmRevieweesWithNoSupervisorOpen, setConfirmRevieweesWithNoSupervisorOpen] = useState(false);
- const [confirmRevieweesWithNoSupervisorQuestion, setConfirmRevieweesWithNoSupervisorQuestionText] = useState('');
+ const [
+ confirmRevieweesWithNoSupervisorOpen,
+ setConfirmRevieweesWithNoSupervisorOpen
+ ] = useState(false);
+ const [
+ confirmRevieweesWithNoSupervisorQuestion,
+ setConfirmRevieweesWithNoSupervisorQuestionText
+ ] = useState('');
const loadedReviews = useRef(false);
const loadingReviews = useRef(false);
@@ -179,13 +179,12 @@ const TeamReviews = ({ onBack, periodId }) => {
}
setOpenMode(period?.reviewStatus === ReviewStatus.OPEN);
- setCanUpdate(!openMode &&
- selectHasUpdateReviewPeriodPermission(state));
- setCanApprove(approvalState &&
- selectHasUpdateReviewAssignmentsPermission(state));
-
+ setCanUpdate(!openMode && selectHasUpdateReviewPeriodPermission(state));
+ setCanApprove(
+ approvalState && selectHasUpdateReviewAssignmentsPermission(state)
+ );
- setHasShowAll((isManager || selectHasUpdateReviewPeriodPermission(state)));
+ setHasShowAll(isManager || selectHasUpdateReviewPeriodPermission(state));
}, [state]);
useEffect(() => {
@@ -220,16 +219,17 @@ const TeamReviews = ({ onBack, periodId }) => {
: selectTeamMembersBySupervisorId(state, myId);
// And others that the current user may be assigned to review.
- assignments.filter(a => a.reviewerId == currentUser.id)
- .forEach(a => {
- if (!source.some(s => s.id == a.revieweeId)) {
- // Add this user to the list of members to show by default.
- const member = currentMembers.find(m => m.id == a.revieweeId);
- if (member) {
- source.push(member);
+ assignments
+ .filter(a => a.reviewerId == currentUser.id)
+ .forEach(a => {
+ if (!source.some(s => s.id == a.revieweeId)) {
+ // Add this user to the list of members to show by default.
+ const member = currentMembers.find(m => m.id == a.revieweeId);
+ if (member) {
+ source.push(member);
+ }
}
- }
- });
+ });
}
// Always filter the members down to existing selected assignments.
@@ -245,8 +245,9 @@ const TeamReviews = ({ onBack, periodId }) => {
if (res.error) return;
// Match up the review assignments with the team members.
- const existing = res.payload.data
- .filter(a => teamMembers.find(m => m.id == a.revieweeId));
+ const existing = res.payload.data.filter(a =>
+ teamMembers.find(m => m.id == a.revieweeId)
+ );
// Create a set of team members that do not yet have review assignments,
// each with a default reviewer.
@@ -270,7 +271,7 @@ const TeamReviews = ({ onBack, periodId }) => {
let assignments = res.error ? [] : res.payload.data;
// Remove review assignments for members no longer selected.
- for(let assignment of assignments) {
+ for (let assignment of assignments) {
if (!teamMembers.find(m => m.id == assignment.revieweeId)) {
// Delete review assignments if we do not have the matching member.
await removeReviewAssignment(assignment.id, csrf);
@@ -286,11 +287,9 @@ const TeamReviews = ({ onBack, periodId }) => {
setTeamMembers(teamMembers);
};
- const addAssignmentForMemberWithNone = async (members) => {
+ const addAssignmentForMemberWithNone = async members => {
members.forEach(member => {
- const exists = assignments.some(
- a => a.revieweeId === member.id
- );
+ const exists = assignments.some(a => a.revieweeId === member.id);
if (!!!exists && member.supervisorid) {
const reviewers = [{ id: member.supervisorid }];
updateReviewers(member, reviewers);
@@ -299,7 +298,7 @@ const TeamReviews = ({ onBack, periodId }) => {
updateReviewers(member, reviewers);
}
});
- }
+ };
const getReviewStatus = useCallback(
review => {
@@ -564,17 +563,18 @@ const TeamReviews = ({ onBack, periodId }) => {
const getReviewRequests = async () => {
const res = await findReviewRequestsByPeriod(period, csrf);
- const data = res?.payload?.status === 200 && !res.error ?
- res.payload.data : null;
+ const data =
+ res?.payload?.status === 200 && !res.error ? res.payload.data : null;
if (data?.length) {
- data.filter(review => review?.status?.toUpperCase() !== 'CANCELED')
- .forEach(request => {
- if (!newReviews[request.recipientId]) {
- newReviews[request.recipientId] = [];
- }
- newReviews[request.recipientId].push(request);
- });
+ data
+ .filter(review => review?.status?.toUpperCase() !== 'CANCELED')
+ .forEach(request => {
+ if (!newReviews[request.recipientId]) {
+ newReviews[request.recipientId] = [];
+ }
+ newReviews[request.recipientId].push(request);
+ });
}
};
@@ -636,15 +636,19 @@ const TeamReviews = ({ onBack, periodId }) => {
} else {
// This reviewer does not have an assignment id. Therefore, we just
// need to remove the reviewer from the assignment list.
- setAssignments(assignments.filter(a =>
- !(a.revieweeId === revieweeId && a.reviewerId === reviewerId)));
+ setAssignments(
+ assignments.filter(
+ a => !(a.revieweeId === revieweeId && a.reviewerId === reviewerId)
+ )
+ );
}
};
const validateReviewPeriod = period => {
if (!period) return 'No review period was created.';
if (!period.launchDate) return 'No launch date was specified.';
- if (!period.selfReviewCloseDate) return 'No self-review date was specified.';
+ if (!period.selfReviewCloseDate)
+ return 'No self-review date was specified.';
if (!period.closeDate) return 'No close date was specified.';
if (!period.periodStartDate) return 'No period-start-date was specified.';
if (!period.periodEndDate) return 'No period-end-date was specified.';
@@ -680,13 +684,17 @@ const TeamReviews = ({ onBack, periodId }) => {
setValidationMessage(msg);
if (msg) return;
- const uniqueNamesWithNoSupervisor = [...new Set(
+ const uniqueNamesWithNoSupervisor = [
+ ...new Set(
visibleTeamMembers()
- .filter(member => member.supervisorid === null) // Filter by null supervisorid
- .map(member => member.name) // Map to the name property
- )].join(', ');
+ .filter(member => member.supervisorid === null) // Filter by null supervisorid
+ .map(member => member.name) // Map to the name property
+ )
+ ].join(', ');
if (uniqueNamesWithNoSupervisor.trim().length > 0) {
- setConfirmRevieweesWithNoSupervisorQuestionText(uniqueNamesWithNoSupervisor);
+ setConfirmRevieweesWithNoSupervisorQuestionText(
+ uniqueNamesWithNoSupervisor
+ );
setConfirmRevieweesWithNoSupervisorOpen(true);
} else {
return requestApprovalPost();
@@ -709,7 +717,7 @@ const TeamReviews = ({ onBack, periodId }) => {
// Remove all assignments for this member.
newAssignments = newAssignments.filter(a => a.revieweeId !== memberId);
- for(let assignment of assignments) {
+ for (let assignment of assignments) {
if (!newAssignments.find(a => a.id == assignment.id)) {
await removeReviewAssignment(assignment.id, csrf);
}
@@ -749,15 +757,16 @@ const TeamReviews = ({ onBack, periodId }) => {
const getReviewRequest = (member, reviewer) => {
if (reviews && reviews[reviewer.id]) {
- return reviews[reviewer.id].find((r) => r.requesteeId === member.id);
+ return reviews[reviewer.id].find(r => r.requesteeId === member.id);
}
return null;
};
- const getSelfReviewRequest = (member) => {
+ const getSelfReviewRequest = member => {
if (reviews && reviews[member.id]) {
- return reviews[member.id].find((r) => r.recipientId === member.id &&
- r.requesteeId === member.id);
+ return reviews[member.id].find(
+ r => r.recipientId === member.id && r.requesteeId === member.id
+ );
}
return null;
};
@@ -766,11 +775,12 @@ const TeamReviews = ({ onBack, periodId }) => {
let url;
if (openMode && (request || selfReviewRequest)) {
const recipientProfile = selectProfile(state, request?.recipientId);
- const manages = recipientProfile?.id === currentUser?.id ||
- recipientProfile?.supervisorid === currentUser?.id;
+ const manages =
+ recipientProfile?.id === currentUser?.id ||
+ recipientProfile?.supervisorid === currentUser?.id;
const selfSubmitted = selfReviewRequest?.status == 'submitted';
if (manages) {
- url = "/feedback/submit?tabs=true";
+ url = '/feedback/submit?tabs=true';
if (request) {
url += `&request=${request.id}`;
}
@@ -784,36 +794,42 @@ const TeamReviews = ({ onBack, periodId }) => {
const renderReviewer = (member, reviewer) => {
const hasReviewer = !!reviewer.name;
- const backgroundColor = reviewer.approved ?
- 'var(--checkins-palette-action-green)' :
- (hasReviewer ?
- 'var(--checkins-palette-action-yellow)' :
- 'var(--checkins-palette-action-red)');
+ const backgroundColor = reviewer.approved
+ ? 'var(--checkins-palette-action-green)'
+ : hasReviewer
+ ? 'var(--checkins-palette-action-yellow)'
+ : 'var(--checkins-palette-action-red)';
const request = getReviewRequest(member, reviewer);
const selfReviewRequest = getSelfReviewRequest(member);
const variant = 'outlined';
- const reviewerName = reviewer.name ?? "No Reviewer";
+ const reviewerName = reviewer.name ?? 'No Reviewer';
const statusLabel = `${reviewerName}: ${getReviewStatus(request)}`;
const url = getReviewerURL(request, selfReviewRequest);
- return (url ?
-
- deleteReviewer(member, reviewer) : null}
- style={{backgroundColor: backgroundColor}}
- />);
+ return url ? (
+
+ deleteReviewer(member, reviewer)
+ : null
+ }
+ style={{ backgroundColor: backgroundColor }}
+ />
+ );
};
const REVIEWER_LIMIT = 2;
@@ -823,7 +839,7 @@ const TeamReviews = ({ onBack, periodId }) => {
// to ensure that the current user is still visible so that the chip
// link can be created (if in the open mode) in renderReviewer().
let reviewers = getReviewers(member).sort((l, r) =>
- (l.id === currentUser?.id ? -1 : (r.id === currentUser?.id ? 1 : 0))
+ l.id === currentUser?.id ? -1 : r.id === currentUser?.id ? 1 : 0
);
const count = reviewers.length;
const excess = count - REVIEWER_LIMIT;
@@ -846,11 +862,12 @@ const TeamReviews = ({ onBack, periodId }) => {
return (
{period?.name ?? ''} Team Reviews
-
{/* This forces the PDL header over. */}
- { setSortBy(SortOption.BY_PDL); }}
- style={{ cursor: 'pointer' }}>
+ {
+ setSortBy(SortOption.BY_PDL);
+ }}
+ style={{ cursor: 'pointer' }}
+ >
PDL
@@ -104,109 +112,123 @@ const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
-
- {member.name}
-
- {member.title}
-
-
- {pdl
- ?
- No PDL Assigned
+ {members.map(member => {
+ const pdl = memberMap[member.reportDatePDLId];
+ return (
+
+
+
-
- );
- })
- }
+ ) === 'Done'
+ ? 'secondary'
+ : 'primary'
+ }
+ />
+
+
- {pdl.name}
-
- {pdl.title}
-
-
-
- :
+
+ {member.name}
+
+ {member.title}
+
+
+ {pdl ? (
+
+ No PDL Assigned
+
+ )}
+
+
+ {member.checkin == null ? (
+
+ No activity yet{' '}
+
+ 🚫
+
+
+ ) : (
+
- No activity yet{' '}
-
- 🚫
-
-
- ) : (
-
-
- {getCheckinDate(member.checkin)
- .toLocaleDateString(navigator.language, {
+ {getCheckinDate(member.checkin).toLocaleDateString(
+ navigator.language,
+ {
year: 'numeric',
month: '2-digit',
day: 'numeric'
- })}{' '}
- {getCheckinDate(member.checkin)
- .getTime() > new Date().getTime() ? (
-
- 📆
-
- ) : (
-
- ✅
-
- )}
-
-
- )}
- {member.checkin == null && member.checkins.length > 0 &&
- Last Activity: {
-
- {getCheckinDate(member.checkins[0]).toString()
- .split(' ').slice(0, 5).join(' ')}
- }
-
- }
-
-
-
+ new Date().getTime() ? (
+
+ 📆
+
+ ) : (
+
+ ✅
+
+ )}
+
+
+ )}
+ {member.checkin == null && member.checkins.length > 0 && (
+
+ Last Activity:{' '}
+ {
+
+ {getCheckinDate(member.checkins[0])
+ .toString()
+ .split(' ')
+ .slice(0, 5)
+ .join(' ')}
+
+ }
+
+ )}
+
+
+
-
+ {pdl.name}
+
+ {pdl.title}
- }
-
-
- {member.checkin == null ? (
+
+
+ ) : (
+
@@ -988,16 +1002,16 @@ const TeamReviews = ({ onBack, periodId }) => {
disabled={!canUpdate}
/>
handlePeriodStartDateChange(val, period)}
- label="Period Start Date"
- disabled={!canUpdate}
+ date={period.periodStartDate}
+ setDate={val => handlePeriodStartDateChange(val, period)}
+ label="Period Start Date"
+ disabled={!canUpdate}
/>
handlePeriodEndDateChange(val, period)}
- label="Period End Date"
- disabled={!canUpdate}
+ date={period.periodEndDate}
+ setDate={val => handlePeriodEndDateChange(val, period)}
+ label="Period End Date"
+ disabled={!canUpdate}
/>
{modifierButton()}
@@ -1010,49 +1024,52 @@ const TeamReviews = ({ onBack, periodId }) => {
)}
{(approvalState || hasShowAll) && (
-
- {/* Wrapper div for TextField and Switch */}
- editReviewers(member)}
- >
-
- )}
+ selectHasCreateReviewAssignmentsPermission(state) &&
+ selectHasDeleteReviewAssignmentsPermission(state) && (
+ editReviewers(member)}
+ >
+
+ )}
{canApprove &&
- selectHasUpdateReviewAssignmentsPermission(state) && (
-
- )}
+ selectHasUpdateReviewAssignmentsPermission(state) && (
+
+ )}
))}
@@ -1143,11 +1160,11 @@ const TeamReviews = ({ onBack, periodId }) => {
title="Approve and Launch"
/>
- setNameQuery(event.target.value)}
- InputProps={{
- endAdornment: (
-
-
- )
- }}
- style={{ flexGrow: 1, maxWidth: '400px' }}
- />
- {/* Add the Switch right next to the TextField */}
- {period && hasShowAll && (
- setShowAll(b => !b)}
- />
- }
- label="Show All"
- sx={{ marginLeft: '0.5rem' }}
+
)}
{canUpdate && (
@@ -1083,22 +1100,22 @@ const TeamReviews = ({ onBack, periodId }) => {
{renderReviewers(member)}
{!openMode &&
- selectHasCreateReviewAssignmentsPermission(state) &&
- selectHasDeleteReviewAssignmentsPermission(state) && (
-
+ {/* Wrapper div for TextField and Switch */}
+
+ {/* Button aligned to the right */}
+ {canApprove && (
+
+ setNameQuery(event.target.value)}
+ InputProps={{
+ endAdornment: (
+
+
+ )
+ }}
+ style={{ flexGrow: 1, maxWidth: '400px' }}
+ />
+ {/* Add the Switch right next to the TextField */}
+ {period && hasShowAll && (
+ setShowAll(b => !b)}
/>
- )}
-
- {/* Button aligned to the right */}
- {canApprove && (
-
-
-
-
+ }
+ label="Show All"
+ sx={{ marginLeft: '0.5rem' }}
+ />
)}
+
+
+
+ )}
+
{description &&
);
};
diff --git a/web-ui/src/components/settings/types/string.jsx b/web-ui/src/components/settings/types/string.jsx
index a860e009b4..a18255d49c 100644
--- a/web-ui/src/components/settings/types/string.jsx
+++ b/web-ui/src/components/settings/types/string.jsx
@@ -38,26 +38,24 @@ const SettingsString = ({
{description && {description}
} - {values && values.length > 0 ? - : - } + {values && values.length > 0 ? ( + + ) : ( + + )}{description}
} - {values && values.length > 0 ? - : - } + {values && values.length > 0 ? ( + + ) : ( + + )}
-
-
+
- {organization.name}
{organization.description}
-
+
website
@@ -263,10 +273,7 @@ const Organizations = ({ onlyMe = false }) => {
{profileMap[relationship.memberId]?.name ?? ''}
)}
- {organizationMap[relationship.organizationId]?.name ?? 'N/A'}
+
+ {organizationMap[relationship.organizationId]?.name ?? 'N/A'}
+
{relationship.startDate}
{relationship.endDate}
{(relationship.memberId == currentUser.id ||
- selectHasVolunteeringRelationshipsPermission(state)) &&
- <>
-
- {
- setSelectedRelationship(relationship);
- setRelationshipDialogOpen(true);
- }}
- >
-
-
-
- confirmDelete(relationship)}
- >
-
-
- }
+ selectHasVolunteeringRelationshipsPermission(state)) && (
+ <>
+
+ {
+ setSelectedRelationship(relationship);
+ setRelationshipDialogOpen(true);
+ }}
+ >
+
+
+
+ confirmDelete(relationship)}
+ >
+
+
+
+ )}
))}
- {(onlyMe || selectHasVolunteeringRelationshipsPermission(state)) &&
-
- }
+ {(onlyMe || selectHasVolunteeringRelationshipsPermission(state)) && (
+
+
+ )}
{/* Message below the table */}
-
+
-
-
{!team.active && (
-
Inactive
diff --git a/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.css b/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.css
index 96bb179aff..cefc95f1bb 100644
--- a/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.css
+++ b/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.css
@@ -58,4 +58,4 @@
height: 200px;
margin-bottom: 2em;
}
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.jsx b/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.jsx
index 3bfb95cad0..72362e0414 100644
--- a/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.jsx
+++ b/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.jsx
@@ -1,6 +1,15 @@
import React, { useContext, useEffect, useState } from 'react';
import { styled } from '@mui/material/styles';
-import { Autocomplete, Avatar, Button, Checkbox, Chip, TextField, Typography, Box } from '@mui/material';
+import {
+ Autocomplete,
+ Avatar,
+ Button,
+ Checkbox,
+ Chip,
+ TextField,
+ Typography,
+ Box
+} from '@mui/material';
import FeedbackResponseCard from './feedback_response_card/FeedbackResponseCard';
import { getQuestionsAndAnswers } from '../../api/feedbackanswer';
import { getFeedbackRequestById } from '../../api/feedback';
@@ -11,7 +20,7 @@ import {
selectCsrfToken,
selectProfile,
selectCanViewFeedbackAnswerPermission,
- noPermission,
+ noPermission
} from '../../context/selectors';
import { UPDATE_TOAST } from '../../context/actions';
import InputAdornment from '@mui/material/InputAdornment';
@@ -72,7 +81,8 @@ const ViewFeedbackResponses = () => {
const [searchText, setSearchText] = useState('');
const [responderOptions, setResponderOptions] = useState([]);
const [selectedResponders, setSelectedResponders] = useState([]);
- const [filteredQuestionsAndAnswers, setFilteredQuestionsAndAnswers] = useState([]);
+ const [filteredQuestionsAndAnswers, setFilteredQuestionsAndAnswers] =
+ useState([]);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
@@ -93,13 +103,14 @@ const ViewFeedbackResponses = () => {
...question,
answers: question.answers.map(answer => ({
...answer,
- answer: isEmptyOrWhitespace(answer.answer) ? ' ⚠️ No response submitted' : String(answer.answer),
+ answer: isEmptyOrWhitespace(answer.answer)
+ ? ' ⚠️ No response submitted'
+ : String(answer.answer)
}))
}));
sanitizedResponses.sort((a, b) => a.questionNumber - b.questionNumber);
setQuestionsAndAnswers(sanitizedResponses);
-
} else {
window.snackDispatch({
type: UPDATE_TOAST,
@@ -163,7 +174,9 @@ const ViewFeedbackResponses = () => {
);
if (filteredAnswers.length === 0) {
- filteredAnswers = [{ answer: 'No input due to recipient filter', responder: null }];
+ filteredAnswers = [
+ { answer: 'No input due to recipient filter', responder: null }
+ ];
}
if (searchText.trim()) {
@@ -190,14 +203,11 @@ const ViewFeedbackResponses = () => {
setSelectedResponders(responderOptions);
};
-
- const isEmptyOrWhitespace = (text) => {
+ const isEmptyOrWhitespace = text => {
return typeof text !== 'string' || !text.trim();
};
-
return selectCanViewFeedbackAnswerPermission(state) ? (
-
{
{/* If the question has no answers or inputType is "NONE" */}
- {!hasResponses || question.inputType === 'NONE' ? null : (
- question.answers.map(answer => (
-
);
})}
@@ -332,4 +346,4 @@ const ViewFeedbackResponses = () => {
);
};
-export default ViewFeedbackResponses;
\ No newline at end of file
+export default ViewFeedbackResponses;
diff --git a/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.test.jsx b/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.test.jsx
index d88e50898d..d7cf0eb139 100644
--- a/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.test.jsx
+++ b/web-ui/src/components/view_feedback_responses/ViewFeedbackResponses.test.jsx
@@ -8,7 +8,7 @@ const userStateWithPermission = {
userProfile: {
name: 'john watson',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_VIEW_FEEDBACK_ANSWER' }],
+ permissions: [{ permission: 'CAN_VIEW_FEEDBACK_ANSWER' }]
}
}
};
diff --git a/web-ui/src/components/view_feedback_responses/feedback_response_card/FeedbackResponseCard.jsx b/web-ui/src/components/view_feedback_responses/feedback_response_card/FeedbackResponseCard.jsx
index f144df3a0a..6f677b5d52 100644
--- a/web-ui/src/components/view_feedback_responses/feedback_response_card/FeedbackResponseCard.jsx
+++ b/web-ui/src/components/view_feedback_responses/feedback_response_card/FeedbackResponseCard.jsx
@@ -27,7 +27,11 @@ const FeedbackResponseCard = props => {
}
// Return fallback if the answer is null, undefined, or empty
- if (props.answer === null || props.answer === undefined || !props.answer.trim()) {
+ if (
+ props.answer === null ||
+ props.answer === undefined ||
+ !props.answer.trim()
+ ) {
return '⚠️ No response submitted';
}
@@ -58,4 +62,4 @@ const FeedbackResponseCard = props => {
FeedbackResponseCard.propTypes = propTypes;
-export default FeedbackResponseCard;
\ No newline at end of file
+export default FeedbackResponseCard;
diff --git a/web-ui/src/components/volunteer/Organizations.jsx b/web-ui/src/components/volunteer/Organizations.jsx
index b1057f5b37..3d7b56e187 100644
--- a/web-ui/src/components/volunteer/Organizations.jsx
+++ b/web-ui/src/components/volunteer/Organizations.jsx
@@ -29,7 +29,11 @@ const Organizations = ({ onlyMe = false }) => {
const [organizationDialogOpen, setOrganizationDialogOpen] = useState(false);
const [organizations, setOrganizations] = useState([]);
const [selectedOrganization, setSelectedOrganization] = useState(null);
- const [newOrganization, setNewOrganization] = useState({ name: '', description: '', website: '' }); // Add new state for new organization
+ const [newOrganization, setNewOrganization] = useState({
+ name: '',
+ description: '',
+ website: ''
+ }); // Add new state for new organization
const [sortAscending, setSortAscending] = useState(true);
const [sortColumn, setSortColumn] = useState('Name');
@@ -108,7 +112,8 @@ const Organizations = ({ onlyMe = false }) => {
// Handle form submission for adding or editing an organization
const saveOrganization = useCallback(async () => {
- const { id, name, description, website } = selectedOrganization || newOrganization; // Use selected or new organization
+ const { id, name, description, website } =
+ selectedOrganization || newOrganization; // Use selected or new organization
const url = id ? `${organizationBaseUrl}/${id}` : organizationBaseUrl;
const res = await resolve({
@@ -143,7 +148,12 @@ const Organizations = ({ onlyMe = false }) => {
-
- Skills
-
+
-
+
-
+
+
+
+ Skills
+
+
+ -
- {mySkills &&
- mySkills.map(memberSkill => {
- return (
-
-
+ {mySkills &&
+ mySkills.map(memberSkill => {
+ return (
+
diff --git a/web-ui/src/components/team-results/EditTeamModal.jsx b/web-ui/src/components/team-results/EditTeamModal.jsx
index c3599c2b63..2c1cde6daa 100644
--- a/web-ui/src/components/team-results/EditTeamModal.jsx
+++ b/web-ui/src/components/team-results/EditTeamModal.jsx
@@ -13,7 +13,13 @@ import Checkbox from '@mui/material/Checkbox';
import Autocomplete from '@mui/material/Autocomplete';
import './EditTeamModal.css';
-const EditTeamModal = ({ team = {active: true}, open, onSave, onClose, headerText }) => {
+const EditTeamModal = ({
+ team = { active: true },
+ open,
+ onSave,
+ onClose,
+ headerText
+}) => {
const { state } = useContext(AppContext);
const currentMembers = selectCurrentMembers(state);
const currentUser = selectCurrentUser(state);
@@ -158,7 +164,7 @@ const EditTeamModal = ({ team = {active: true}, open, onSave, onClose, headerTex
const close = () => {
onClose();
- setTeam({active: true});
+ setTeam({ active: true });
};
return (
@@ -175,13 +181,14 @@ const EditTeamModal = ({ team = {active: true}, open, onSave, onClose, headerTex
onChange={e => setTeam({ ...editedTeam, name: e.target.value })}
/>
setTeam({ ...editedTeam, active: e.target.checked })}
- /> Active
+ id="team-active-input"
+ label="Active"
+ variant="outlined"
+ className="halfWidth"
+ checked={editedTeam.active}
+ onChange={e => setTeam({ ...editedTeam, active: e.target.checked })}
+ />{' '}
+ Active
{
const { checked } = event.target;
setActiveTeams(checked);
}}
- />
+ />
}
label="Active Teams Only"
/>
@@ -99,20 +99,19 @@ const TeamResults = () => {
? Array.from({ length: 20 }).map((_, index) => (
);
diff --git a/web-ui/src/components/team-results/TeamSummaryCard.jsx b/web-ui/src/components/team-results/TeamSummaryCard.jsx
index 9072b2c036..7d93caaf96 100644
--- a/web-ui/src/components/team-results/TeamSummaryCard.jsx
+++ b/web-ui/src/components/team-results/TeamSummaryCard.jsx
@@ -1,15 +1,22 @@
-import React, {useContext, useState} from 'react';
-import {styled} from '@mui/material/styles';
-import {AppContext} from '../../context/AppContext';
-import {UPDATE_TEAMS} from '../../context/actions';
+import React, { useContext, useState } from 'react';
+import { styled } from '@mui/material/styles';
+import { AppContext } from '../../context/AppContext';
+import { UPDATE_TEAMS } from '../../context/actions';
import EditTeamModal from './EditTeamModal';
import KudosDialog from '../kudos_dialog/KudosDialog';
-import {Link} from 'react-router-dom';
-import {Card, CardActions, CardContent, CardHeader, Tooltip, Typography,} from '@mui/material';
+import { Link } from 'react-router-dom';
+import {
+ Card,
+ CardActions,
+ CardContent,
+ CardHeader,
+ Tooltip,
+ Typography
+} from '@mui/material';
import PropTypes from 'prop-types';
-import {updateTeam} from '../../api/team.js';
+import { updateTeam } from '../../api/team.js';
import SplitButton from '../split-button/SplitButton';
-import {selectCurrentUser, selectIsAdmin} from "../../context/selectors.js";
+import { selectCurrentUser, selectIsAdmin } from '../../context/selectors.js';
const PREFIX = 'TeamSummaryCard';
const classes = {
@@ -24,7 +31,7 @@ const StyledCard = styled(Card)({
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between',
- position: 'relative',
+ position: 'relative'
},
[`& .${classes.header}`]: {
width: '100%'
@@ -37,8 +44,8 @@ const StyledCard = styled(Card)({
});
const inactiveStyle = {
- 'color': 'var(--action-disabled)',
- 'font-size': '0.75em',
+ color: 'var(--action-disabled)',
+ 'font-size': '0.75em'
};
const propTypes = {
@@ -112,9 +119,8 @@ const TeamSummaryCard = ({ team, index, onTeamSelect, selectedTeamId }) => {
/>
{organizationsTable()}
{/* Dialog for adding/editing an organization */}
-
);
- }, [events, organizationMap, profileMap, relationshipMap, sortAscending, sortColumn]);
+ }, [
+ events,
+ organizationMap,
+ profileMap,
+ relationshipMap,
+ sortAscending,
+ sortColumn
+ ]);
const getDate = dateString => {
if (!dateString) return null;
@@ -413,19 +479,19 @@ const VolunteerEvents = ({ forceUpdate = () => {}, onlyMe = false }) => {
const saveEvent = useCallback(async () => {
const { id, relationshipId, eventDate, hours, notes } = selectedEvent;
-
+
// Check if relationshipId is valid
if (!relationshipId) {
console.error('No relationship selected for the event.');
return;
}
-
+
// Check that all required fields are filled in
if (!eventDate || hours <= 0) {
- console.error("Missing required fields: date or hours.");
+ console.error('Missing required fields: date or hours.');
return;
}
-
+
try {
// Ensure the relationship exists
const relationshipCheck = await resolve({
@@ -437,12 +503,12 @@ const VolunteerEvents = ({ forceUpdate = () => {}, onlyMe = false }) => {
'Content-Type': 'application/json;charset=UTF-8'
}
});
-
+
if (relationshipCheck.error || !relationshipCheck.payload) {
console.error(`Relationship ${relationshipId} doesn't exist.`);
return;
}
-
+
// Proceed with saving the event
const res = await resolve({
method: id ? 'PUT' : 'POST',
@@ -454,12 +520,12 @@ const VolunteerEvents = ({ forceUpdate = () => {}, onlyMe = false }) => {
},
data: { relationshipId, eventDate, hours, notes }
});
-
+
if (res.error) {
console.error('Error saving event:', res.error);
return;
}
-
+
// Update event list and close dialog
const newEvent = res.payload.data;
if (id) {
@@ -468,7 +534,7 @@ const VolunteerEvents = ({ forceUpdate = () => {}, onlyMe = false }) => {
} else {
events.push(newEvent);
}
-
+
sortEvents(events);
setEvents(events);
setSelectedEvent(null);
diff --git a/web-ui/src/components/volunteer/VolunteerRelationships.jsx b/web-ui/src/components/volunteer/VolunteerRelationships.jsx
index 29e6ea7b60..99af8d8ea6 100644
--- a/web-ui/src/components/volunteer/VolunteerRelationships.jsx
+++ b/web-ui/src/components/volunteer/VolunteerRelationships.jsx
@@ -24,7 +24,7 @@ import {
selectCurrentUser,
selectProfileMap,
selectHasVolunteeringRelationshipsPermission,
- selectHasVolunteeringOrganizationsPermission,
+ selectHasVolunteeringOrganizationsPermission
} from '../../context/selectors';
import { formatDate } from '../../helpers/datetime';
import { showError } from '../../helpers/toast';
@@ -39,7 +39,11 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
const [organizations, setOrganizations] = useState([]);
const [relationshipDialogOpen, setRelationshipDialogOpen] = useState(false);
const [organizationDialogOpen, setOrganizationDialogOpen] = useState(false);
- const [newOrganization, setNewOrganization] = useState({ name: '', description: '', website: '' });
+ const [newOrganization, setNewOrganization] = useState({
+ name: '',
+ description: '',
+ website: ''
+ });
const [relationshipMap, setRelationshipMap] = useState({});
const [relationships, setRelationships] = useState([]);
const [selectedRelationship, setSelectedRelationship] = useState(null);
@@ -50,7 +54,9 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
const csrf = selectCsrfToken(state);
const currentUser = selectCurrentUser(state);
const profileMap = selectProfileMap(state);
- const profiles = Object.values(profileMap).filter(profile => profile && profile.name);
+ const profiles = Object.values(profileMap).filter(
+ profile => profile && profile.name
+ );
profiles.sort((a, b) => a.name.localeCompare(b.name));
const sortableTableColumns = ['Organization', 'Start Date', 'End Date'];
@@ -70,7 +76,9 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
if (res.error) return;
const organizations = res.payload.data || [];
- organizations.sort((org1, org2) => (org1.name || '').localeCompare(org2.name || ''));
+ organizations.sort((org1, org2) =>
+ (org1.name || '').localeCompare(org2.name || '')
+ );
setOrganizations(organizations);
setOrganizationMap(
organizations.reduce((acc, org) => ({ ...acc, [org.id]: org }), {})
@@ -91,7 +99,7 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
}
});
if (res.error) return;
-
+
const relationships = res.payload.data || [];
relationships.sort((rel1, rel2) => {
const member1 = profileMap[rel1.memberId];
@@ -99,7 +107,9 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
return (member1?.name || '').localeCompare(member2?.name || '');
});
setRelationships(relationships);
- setRelationshipMap(relationships.reduce((acc, rel) => ({ ...acc, [rel.id]: rel }), {}));
+ setRelationshipMap(
+ relationships.reduce((acc, rel) => ({ ...acc, [rel.id]: rel }), {})
+ );
}, [currentUser.id, onlyMe, profileMap, csrf]);
useEffect(() => {
@@ -138,52 +148,58 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
setConfirmDeleteOpen(true);
}, []);
- const deleteRelationship = useCallback(async relationship => {
- if (!relationship) return;
- const res = await resolve({
- method: 'PUT',
- url: relationshipBaseUrl + '/' + relationship.id,
- headers: {
- 'X-CSRF-Header': csrf,
- Accept: 'application/json',
- 'Content-Type': 'application/json;charset=UTF-8'
- },
- data: { ...relationship, active: false }
- });
- if (res.error) return;
+ const deleteRelationship = useCallback(
+ async relationship => {
+ if (!relationship) return;
+ const res = await resolve({
+ method: 'PUT',
+ url: relationshipBaseUrl + '/' + relationship.id,
+ headers: {
+ 'X-CSRF-Header': csrf,
+ Accept: 'application/json',
+ 'Content-Type': 'application/json;charset=UTF-8'
+ },
+ data: { ...relationship, active: false }
+ });
+ if (res.error) return;
- // Refresh the relationships list after deletion
- await refreshRelationships();
- setConfirmDeleteOpen(false);
- }, [csrf, refreshRelationships]);
+ // Refresh the relationships list after deletion
+ await refreshRelationships();
+ setConfirmDeleteOpen(false);
+ },
+ [csrf, refreshRelationships]
+ );
const saveRelationship = useCallback(async () => {
const { id, organizationId, startDate, endDate } = selectedRelationship;
-
+
// Restrict adding duplicate active relationships only for new ones, exclude current relationship being edited
const existingRelationship = relationships.find(
- (rel) => rel.organizationId === organizationId && !rel.endDate && rel.id !== id
+ rel =>
+ rel.organizationId === organizationId && !rel.endDate && rel.id !== id
);
if (existingRelationship) {
- showError("Cannot add duplicate active relationships.");
+ showError('Cannot add duplicate active relationships.');
return;
}
-
+
// Ensure start date is before or equal to the current date
if (new Date(startDate) > new Date()) {
- showError("Start date cannot be in the future.");
+ showError('Start date cannot be in the future.');
return;
}
// Ensure end date is after the start date
if (endDate && new Date(endDate) <= new Date(startDate)) {
- showError("End date must be after the start date.");
+ showError('End date must be after the start date.');
return;
}
-
- const formattedStartDate = startDate ? formatDate(new Date(startDate)) : null;
+
+ const formattedStartDate = startDate
+ ? formatDate(new Date(startDate))
+ : null;
const formattedEndDate = endDate ? formatDate(new Date(endDate)) : null;
-
+
const data = {
...selectedRelationship,
startDate: formattedStartDate,
@@ -200,13 +216,13 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
headers: {
'X-CSRF-Header': csrf,
Accept: 'application/json',
- 'Content-Type': 'application/json;charset=UTF-8',
+ 'Content-Type': 'application/json;charset=UTF-8'
},
- data: data,
+ data: data
});
-
+
if (res.error) return;
-
+
await refreshRelationships();
setSelectedRelationship(null);
setRelationshipDialogOpen(false);
@@ -318,49 +334,55 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
{!onlyMe && (
The administrator may edit organizations to ensure accuracy.
++ The administrator may edit organizations to ensure accuracy. +
{/* Dialog for creating/editing a relationship */}
- {
- loading ?
+ {loading ? (
Array.from({ length: 10 }).map((_, index) => (
- {
results={searchAnniversaryResults}
/>
- }
+ )}
) : (
diff --git a/web-ui/src/pages/AnniversaryReportPage.test.jsx b/web-ui/src/pages/AnniversaryReportPage.test.jsx
index 15a2448af7..f4f747edbf 100644
--- a/web-ui/src/pages/AnniversaryReportPage.test.jsx
+++ b/web-ui/src/pages/AnniversaryReportPage.test.jsx
@@ -7,7 +7,7 @@ const userStateWithPermission = {
userProfile: {
name: 'john watson',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_VIEW_ANNIVERSARY_REPORT' }],
+ permissions: [{ permission: 'CAN_VIEW_ANNIVERSARY_REPORT' }]
}
}
};
diff --git a/web-ui/src/pages/BirthdayReportPage.jsx b/web-ui/src/pages/BirthdayReportPage.jsx
index af16520155..85088d757e 100644
--- a/web-ui/src/pages/BirthdayReportPage.jsx
+++ b/web-ui/src/pages/BirthdayReportPage.jsx
@@ -16,7 +16,7 @@ import SkeletonLoader from '../components/skeleton_loader/SkeletonLoader';
import {
selectCsrfToken,
selectHasBirthdayReportPermission,
- noPermission,
+ noPermission
} from '../context/selectors';
import { useQueryParameters } from '../helpers/query-parameters';
@@ -62,16 +62,18 @@ const BirthdayReportPage = () => {
const handleSearch = async monthsToSearch => {
setLoading(true);
try {
- const birthdayResults = await getBirthdays(noBirthday ? null :
- monthsToSearch, csrf);
+ const birthdayResults = await getBirthdays(
+ noBirthday ? null : monthsToSearch,
+ csrf
+ );
setSearchBirthdayResults(sortBirthdays(birthdayResults));
setHasSearched(true);
- } catch(e) {
+ } catch (e) {
window.snackDispatch({
type: UPDATE_TOAST,
payload: {
severity: 'error',
- toast: e,
+ toast: e
}
});
}
@@ -139,11 +141,11 @@ const BirthdayReportPage = () => {
- {
- loading ?
+ {loading ? (
Array.from({ length: 10 }).map((_, index) => (
- {
results={searchBirthdayResults}
/>
- }
+ )}
) : (
diff --git a/web-ui/src/pages/BirthdayReportPage.test.jsx b/web-ui/src/pages/BirthdayReportPage.test.jsx
index f70cfbdc06..ab0588d5c6 100644
--- a/web-ui/src/pages/BirthdayReportPage.test.jsx
+++ b/web-ui/src/pages/BirthdayReportPage.test.jsx
@@ -8,7 +8,7 @@ const userStateWithPermission = {
userProfile: {
name: 'john watson',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_VIEW_BIRTHDAY_REPORT' }],
+ permissions: [{ permission: 'CAN_VIEW_BIRTHDAY_REPORT' }]
}
}
};
diff --git a/web-ui/src/pages/CertificationReportPage.jsx b/web-ui/src/pages/CertificationReportPage.jsx
index 0053672997..96120ff33c 100644
--- a/web-ui/src/pages/CertificationReportPage.jsx
+++ b/web-ui/src/pages/CertificationReportPage.jsx
@@ -3,7 +3,7 @@ import { Button } from '@mui/material';
import {
selectHasEarnedCertificationsPermission,
- noPermission,
+ noPermission
} from '../context/selectors';
import { AppContext } from '../context/AppContext';
import Certifications from '../components/certifications/Certifications';
diff --git a/web-ui/src/pages/CertificationReportPage.test.jsx b/web-ui/src/pages/CertificationReportPage.test.jsx
index 1e821f18a8..e73da88871 100644
--- a/web-ui/src/pages/CertificationReportPage.test.jsx
+++ b/web-ui/src/pages/CertificationReportPage.test.jsx
@@ -8,7 +8,7 @@ const userStateWithPermission = {
userProfile: {
name: 'Mitch Hedberg',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_MANAGE_EARNED_CERTIFICATIONS' }],
+ permissions: [{ permission: 'CAN_MANAGE_EARNED_CERTIFICATIONS' }]
}
}
};
diff --git a/web-ui/src/pages/CheckinsPage.jsx b/web-ui/src/pages/CheckinsPage.jsx
index d9de8d11f6..b6169f9983 100644
--- a/web-ui/src/pages/CheckinsPage.jsx
+++ b/web-ui/src/pages/CheckinsPage.jsx
@@ -16,7 +16,7 @@ import {
selectCanCreateCheckinsPermission,
selectCanUpdateCheckinsPermission,
selectCanViewPrivateNotesPermission,
- selectCanUpdateAllCheckinsPermission,
+ selectCanUpdateAllCheckinsPermission
} from '../context/selectors';
import { getCheckins, createNewCheckin } from '../context/thunks';
import { UPDATE_CHECKIN, UPDATE_TOAST } from '../context/actions';
@@ -160,16 +160,16 @@ const CheckinsPage = () => {
className="create-checkin-tooltip-wrapper"
>
{(updateAll || isPdl || currentUserId === memberId) &&
- selectCanCreateCheckinsPermission(state) && (
- }
- onClick={handleCreate}
- >
- Create Check-In
-
- )}
+ selectCanCreateCheckinsPermission(state) && (
+ }
+ onClick={handleCreate}
+ >
+ Create Check-In
+
+ )}
diff --git a/web-ui/src/pages/CheckinsPage.test.jsx b/web-ui/src/pages/CheckinsPage.test.jsx
index 16d05fac4a..17ec5c50b8 100644
--- a/web-ui/src/pages/CheckinsPage.test.jsx
+++ b/web-ui/src/pages/CheckinsPage.test.jsx
@@ -4,9 +4,9 @@ import { AppContextProvider } from '../context/AppContext';
import { Router } from 'react-router-dom';
import { LocalizationProvider } from '@mui/x-date-pickers';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
-import {setupServer} from "msw/node";
-import {http, HttpResponse} from "msw";
-import {createMemoryHistory} from "history";
+import { setupServer } from 'msw/node';
+import { http, HttpResponse } from 'msw';
+import { createMemoryHistory } from 'history';
const mockMemberId = 'bf9975f8-a5b2-4551-b729-afd56b49e2cc';
const mockCheckinId = '3a1906df-d45c-4ff5-a6f8-7dacba97ff1a';
@@ -43,7 +43,7 @@ const initialState = {
id: mockMemberId,
name: 'holmes',
imageUrl:
- 'https://upload.wikimedia.org/wikipedia/commons/7/74/SNL_MrBill_Doll.jpg'
+ 'https://upload.wikimedia.org/wikipedia/commons/7/74/SNL_MrBill_Doll.jpg'
}
],
roles: [
@@ -70,10 +70,20 @@ const mockuments = [
}
];
+const notes = [
+ {
+ id: 'note-1',
+ description: 'Some kind of note...'
+ }
+];
+
const server = setupServer(
- http.get('http://localhost:8080/services/document/1', () => {
- return HttpResponse.json(mockuments);
- })
+ http.get('http://localhost:8080/services/document/1', () => {
+ return HttpResponse.json(mockuments);
+ }),
+ http.get(`http://localhost:8080/services/checkin-notes?checkinid=${mockCheckinId}`, () => {
+ return HttpResponse.json(notes);
+ }),
);
beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
@@ -81,7 +91,7 @@ afterEach(() => server.resetHandlers());
afterAll(() => server.close());
const history = createMemoryHistory(
- `/checkins/${mockMemberId}/${mockCheckinId}`
+ `/checkins/${mockMemberId}/${mockCheckinId}`
);
vi.mock('react-router-dom', async () => ({
@@ -98,7 +108,8 @@ global.requestAnimationFrame = function (callback) {
};
it('renders correctly', async () => {
- await waitForSnapshot('mockument-2',
+ await waitForSnapshot(
+ 'tiny-mce-checkin-notes',
- {members
- ?
) : (
diff --git a/web-ui/src/pages/CheckinsReportPage.test.jsx b/web-ui/src/pages/CheckinsReportPage.test.jsx
index 4299d33188..e2593a4ca7 100644
--- a/web-ui/src/pages/CheckinsReportPage.test.jsx
+++ b/web-ui/src/pages/CheckinsReportPage.test.jsx
@@ -8,9 +8,9 @@ const userStateWithPermission = {
userProfile: {
name: 'Mitch Hedberg',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_VIEW_CHECKINS_REPORT' }],
+ permissions: [{ permission: 'CAN_VIEW_CHECKINS_REPORT' }]
},
- terminatedMembers: [],
+ terminatedMembers: []
}
};
diff --git a/web-ui/src/pages/CloseWindow.jsx b/web-ui/src/pages/CloseWindow.jsx
index 2c9e6b741f..65ab1275c5 100644
--- a/web-ui/src/pages/CloseWindow.jsx
+++ b/web-ui/src/pages/CloseWindow.jsx
@@ -1,5 +1,5 @@
window.close();
export default function CloseWindow() {
- return (<>);
+ return <>;
}
diff --git a/web-ui/src/pages/EditSkillsPage.jsx b/web-ui/src/pages/EditSkillsPage.jsx
index 86a53199d1..33988d6a77 100644
--- a/web-ui/src/pages/EditSkillsPage.jsx
+++ b/web-ui/src/pages/EditSkillsPage.jsx
@@ -6,7 +6,7 @@ import {
selectOrderedSkills,
selectPendingSkills,
selectCanEditSkills,
- noPermission,
+ noPermission
} from '../context/selectors';
import EditSkillsCard from '../components/edit_skills/EditSkillsCard';
import EditSkillsModal from '../components/edit_skills/EditSkillsModal';
diff --git a/web-ui/src/pages/EditSkillsPage.test.jsx b/web-ui/src/pages/EditSkillsPage.test.jsx
index 7c97ba5a1c..f82e3e97a6 100644
--- a/web-ui/src/pages/EditSkillsPage.test.jsx
+++ b/web-ui/src/pages/EditSkillsPage.test.jsx
@@ -8,7 +8,7 @@ const userStateWithPermission = {
userProfile: {
name: 'john watson',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_EDIT_SKILLS' }],
+ permissions: [{ permission: 'CAN_EDIT_SKILLS' }]
}
}
};
diff --git a/web-ui/src/pages/EmailPage.jsx b/web-ui/src/pages/EmailPage.jsx
index 2642a8ca7c..597b8df8af 100644
--- a/web-ui/src/pages/EmailPage.jsx
+++ b/web-ui/src/pages/EmailPage.jsx
@@ -35,7 +35,7 @@ import MemberSelector from '../components/member_selector/MemberSelector.jsx';
import {
selectCsrfToken,
selectHasSendEmailPermission,
- noPermission,
+ noPermission
} from '../context/selectors';
const Root = styled('div')({
@@ -188,12 +188,12 @@ const ComposeEmailStep = ({
try {
const result = mjml2html(mjmlContent);
onEmailContentsChange(result.html);
- } catch(e) {
+ } catch (e) {
window.snackDispatch({
type: UPDATE_TOAST,
payload: {
severity: 'error',
- toast: e.message,
+ toast: e.message
}
});
}
diff --git a/web-ui/src/pages/EmailPage.test.jsx b/web-ui/src/pages/EmailPage.test.jsx
index 7ee3c50bf2..24867fffbd 100644
--- a/web-ui/src/pages/EmailPage.test.jsx
+++ b/web-ui/src/pages/EmailPage.test.jsx
@@ -10,9 +10,9 @@ const userStateWithPermission = {
userProfile: {
name: 'Mitch Hedberg',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_SEND_EMAIL' }],
+ permissions: [{ permission: 'CAN_SEND_EMAIL' }]
},
- terminatedMembers: [],
+ terminatedMembers: []
}
};
diff --git a/web-ui/src/pages/ErrorBoundaryPage.jsx b/web-ui/src/pages/ErrorBoundaryPage.jsx
index deae70e772..a8fa5f8731 100644
--- a/web-ui/src/pages/ErrorBoundaryPage.jsx
+++ b/web-ui/src/pages/ErrorBoundaryPage.jsx
@@ -45,7 +45,7 @@ const ErrorFallback = ({ error }) => {
type: UPDATE_TOAST,
payload: {
severity: 'error',
- toast: res.error.message,
+ toast: res.error.message
}
});
} else if (res?.payload?.data) {
@@ -54,7 +54,7 @@ const ErrorFallback = ({ error }) => {
type: UPDATE_TOAST,
payload: {
severity: 'success',
- toast: `New issue ${title} created! Gratzie 😀`,
+ toast: `New issue ${title} created! Gratzie 😀`
}
});
}
diff --git a/web-ui/src/pages/FeedbackRequestPage.jsx b/web-ui/src/pages/FeedbackRequestPage.jsx
index 88486a98a6..e09e1c9184 100644
--- a/web-ui/src/pages/FeedbackRequestPage.jsx
+++ b/web-ui/src/pages/FeedbackRequestPage.jsx
@@ -25,10 +25,13 @@ import {
selectCurrentUser,
selectCurrentMemberIds,
selectHasCreateFeedbackPermission,
- noPermission,
+ noPermission
} from '../context/selectors';
import DateFnsUtils from '@date-io/date-fns';
-import { getFeedbackTemplate, softDeleteAdHocTemplates } from '../api/feedbacktemplate';
+import {
+ getFeedbackTemplate,
+ softDeleteAdHocTemplates
+} from '../api/feedbacktemplate';
import './FeedbackRequestPage.css';
diff --git a/web-ui/src/pages/FeedbackRequestPage.test.jsx b/web-ui/src/pages/FeedbackRequestPage.test.jsx
index da1f4ee9be..29cd811215 100644
--- a/web-ui/src/pages/FeedbackRequestPage.test.jsx
+++ b/web-ui/src/pages/FeedbackRequestPage.test.jsx
@@ -8,7 +8,7 @@ const userStateWithPermission = {
userProfile: {
name: 'john watson',
role: ['MEMBER'],
- permissions: [{ permission: 'CAN_CREATE_FEEDBACK_REQUEST' }],
+ permissions: [{ permission: 'CAN_CREATE_FEEDBACK_REQUEST' }]
}
}
};
diff --git a/web-ui/src/pages/FeedbackSubmitPage.jsx b/web-ui/src/pages/FeedbackSubmitPage.jsx
index 4475dcb3fc..8840ccd9e9 100644
--- a/web-ui/src/pages/FeedbackSubmitPage.jsx
+++ b/web-ui/src/pages/FeedbackSubmitPage.jsx
@@ -113,11 +113,7 @@ const FeedbackSubmitPage = () => {
});
}
- if (
- csrf &&
- currentUserId &&
- selfRequestQuery
- ) {
+ if (csrf && currentUserId && selfRequestQuery) {
getFeedbackRequest(selfRequestQuery, csrf).then(request => {
if (request) {
setSelfReviewRequest(request);
@@ -145,8 +141,11 @@ const FeedbackSubmitPage = () => {
// If we know the current user and it's not the recipient or someone in the person having feedback given's
// management heirarchy, then we should issue an error and send them home...
- if (currentUserId && feedbackRequest?.recipientId != currentUserId &&
- !selectIsSubordinateOfCurrentUser(feedbackRequest?.requesteeId)) {
+ if (
+ currentUserId &&
+ feedbackRequest?.recipientId != currentUserId &&
+ !selectIsSubordinateOfCurrentUser(feedbackRequest?.requesteeId)
+ ) {
// The current user is not the recipients's manager, we need to leave.
history.push('/');
window.snackDispatch({
@@ -171,7 +170,7 @@ const FeedbackSubmitPage = () => {
return (
- { myBirthday ? (
+ {myBirthday ? (
- { anniversaries.length > 0 && (
+ {anniversaries.length > 0 && (
) }
- { birthdays.length > 0 && (
+
+ )}
+ {birthdays.length > 0 && (
) }
+
+ )}
)}
- {checkForImpersonation() &&
- }
+ {checkForImpersonation() && (
+
+
+
+ )}