- {' '}
Sort the number by ascending or descending order. The lower the number (other than zero)
the higher the badge ranking.
- {' '}
Note that 0 is treated as the largest number (thus the lowest ranking). When no number
- is specified for the ranking field, the default value is 0.{' '}
+ is specified for the ranking field, the default value is 0.
All badges of the same number in ranking sort alphabetically by their names.
@@ -37,4 +34,4 @@ function BadgeTableHeader({ darkMode }) {
);
}
-export default BadgeTableHeader;
+export default BadgeTableHeader;
\ No newline at end of file
diff --git a/src/components/CommunityPortal/Activities/ActivityDetailPage.css b/src/components/CommunityPortal/Activities/ActivityDetailPage.css
new file mode 100644
index 0000000000..c5be452a57
--- /dev/null
+++ b/src/components/CommunityPortal/Activities/ActivityDetailPage.css
@@ -0,0 +1,44 @@
+.ToolDetailPage {
+ font-size: clamp(0.9em, 2.5vw, 1em);
+ margin-top: 1em;
+ margin-bottom: 3em;
+}
+
+.ToolDetailPage__header h1 {
+ font-size: clamp(2em, 2.5vw, 3em);
+}
+
+.ToolDetailPage__span {
+ background-color: #e6f5f2;
+ border: 1px solid #e5e5e6;
+ border-radius: 5px;
+ padding: 0.5em;
+ margin-left: 1em;
+}
+
+.ToolDetailPage__image {
+ border: 1px solid #e5e5e6;
+ border-radius: 5px;
+ width: 150px;
+ height: auto;
+}
+
+.ToolDetailPage__detail_item {
+ line-height: 2.5;
+}
+
+button.descriptionItem_button {
+ padding: 0em;
+ margin-bottom: 1em;
+}
+
+button.descriptionItem_button:hover {
+ background-color: transparent;
+}
+
+.ToolDetailPage__dashed_line {
+ border-top: 1px dashed #000;
+ width: 50%;
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/src/components/CommunityPortal/Activities/ActivityDetailPage.jsx b/src/components/CommunityPortal/Activities/ActivityDetailPage.jsx
new file mode 100644
index 0000000000..bd18f23c8e
--- /dev/null
+++ b/src/components/CommunityPortal/Activities/ActivityDetailPage.jsx
@@ -0,0 +1,183 @@
+import { useState, useEffect } from 'react';
+import { useHistory, useParams } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import { fetchToolById } from 'actions/bmdashboard/toolActions';
+import { Container, Button } from 'reactstrap';
+import { v4 as uuidv4 } from 'uuid';
+import ToolModal from './ActivityModal';
+import './ActivityDetailPage.css';
+
+function DetailItem({ label, value }) {
+ return (
+
{canGetReports || canGetWeeklySummaries || canGetWeeklyVolunteerSummary ? (
diff --git a/src/components/NotFound/NotFoundPage.css b/src/components/NotFound/NotFoundPage.css
new file mode 100644
index 0000000000..d569e2c3d8
--- /dev/null
+++ b/src/components/NotFound/NotFoundPage.css
@@ -0,0 +1,70 @@
+* {
+ padding: 0;
+ margin: 0;
+ box-sizing: border-box;
+}
+
+.not-found-container {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ text-align: center;
+ color: #333;
+ background-color: #fff;
+}
+
+.not-found-image {
+ max-width: 100%;
+ height: auto;
+ /* margin-bottom:-20px; */
+}
+
+.not-found-text {
+ padding: 0 20px;
+}
+
+.not-found-text h1 {
+ font-size: 2em;
+ margin-bottom: 10px;
+}
+
+.not-found-text p {
+ font-size: 1.1em;
+ margin-bottom: 10px;
+}
+
+.back-home-link {
+ color: #3293f9;
+ cursor: pointer;
+ text-decoration: underline;
+ transition: background-color 0.3s;
+}
+
+.back-home-link:hover {
+ background-color: transparent;
+}
+
+.dark-mode {
+ color: #f1f1f1;
+
+ .not-found-image {
+ height: 38%;
+ width: auto;
+ }
+}
+
+.bg-black {
+ background-color: #121212;
+}
+
+@media (max-width: 768px) {
+ .not-found-text h1 {
+ font-size: 1.5em;
+ }
+
+ .not-found-text p {
+ font-size: 1em;
+ }
+}
\ No newline at end of file
diff --git a/src/components/NotFound/NotFoundPage.jsx b/src/components/NotFound/NotFoundPage.jsx
new file mode 100644
index 0000000000..adec119937
--- /dev/null
+++ b/src/components/NotFound/NotFoundPage.jsx
@@ -0,0 +1,34 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable prettier/prettier */
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import './NotFoundPage.css';
+import NotFoundImage from '../../assets/images/404Image1.png';
+import NotFoundDarkImage from '../../assets/images/404ImageDarkMode1.png';
+
+function NotFoundPage() {
+ const darkMode = useSelector(state => state.theme.darkMode);
+
+ return (
+
+
+
+
PAGE NOT FOUND
+
The rabbits have been nibbling the cables again...
+
+ Maybe this will help{' '}
+
+
+
+ );
+}
+
+export default NotFoundPage;
diff --git a/src/components/PermissionsManagement/PermissionChangeLogTable.jsx b/src/components/PermissionsManagement/PermissionChangeLogTable.jsx
index 043f199d19..0612064469 100644
--- a/src/components/PermissionsManagement/PermissionChangeLogTable.jsx
+++ b/src/components/PermissionsManagement/PermissionChangeLogTable.jsx
@@ -22,6 +22,13 @@ function PermissionChangeLogTable({ changeLogs, darkMode }) {
}
};
+ const formatName = name => {
+ if (name.startsWith('INDIVIDUAL:')) {
+ return name.replace('INDIVIDUAL:', '').trim();
+ }
+ return name;
+ };
+
const renderPageNumbers = () => {
const pageNumbers = [];
const maxPageNumbersToShow = 5;
@@ -95,7 +102,7 @@ function PermissionChangeLogTable({ changeLogs, darkMode }) {
Log Date and Time (PST)
-
Role Name
+
Name
Permissions
Permissions Added
@@ -111,8 +118,13 @@ function PermissionChangeLogTable({ changeLogs, darkMode }) {
{`${formatDate(
log.logDateTime,
)} ${formattedAmPmTime(log.logDateTime)}`}
-
- {log.roleName}
+
+ {formatName(log.name)}
{renderPermissions(log.permissions, log._id)}
diff --git a/src/components/PermissionsManagement/PermissionsConst.js b/src/components/PermissionsManagement/PermissionsConst.js
index 48c88d54b0..38fd5e194b 100644
--- a/src/components/PermissionsManagement/PermissionsConst.js
+++ b/src/components/PermissionsManagement/PermissionsConst.js
@@ -97,6 +97,12 @@ export const permissionLabels = [
description:
'Gives the user permission to change the status of any user on the user profile page or User Management Page. "User Profile" -> "Green round button"',
},
+ {
+ label: 'Toggle Invisibility Permission Self and Others',
+ key: 'toggleInvisibility',
+ description:
+ 'Gives the user permission to change the invisibility toggle for themselves and others',
+ },
{
label: 'Assign Blue Squares',
key: 'addInfringements',
@@ -317,6 +323,18 @@ export const permissionLabels = [
description:
'Gives the user permission to toggle the Tangible check when editing their own time entry.',
},
+ {
+ label: 'Timelog Management (Own)',
+ description: 'Category for all permissions related to timelog management',
+ subperms: [
+ {
+ label: 'Delete Time Entry (Own)',
+ key: 'deleteTimeEntryOwn',
+ description:
+ 'Gives the user permission to Delete time entry from others users "Dashboard" -> "Leaderboard" -> "Dot By the side of user\'s name" -> "Current Time Log" -> "Trash button on bottom right"',
+ },
+ ],
+ },
{
label: 'Timelog Management (Others)',
description: 'Category for all permissions related to timelog management',
@@ -329,7 +347,7 @@ export const permissionLabels = [
},
{
label: 'Delete Time Entry (Others)',
- key: 'deleteTimeEntry',
+ key: 'deleteTimeEntryOthers',
description:
'Gives the user permission to Delete time entry from others users "Dashboard" -> "Leaderboard" -> "Dot By the side of user\'s name" -> "Current Time Log" -> "Trash button on bottom right"',
},
diff --git a/src/components/PermissionsManagement/PermissionsManagement.jsx b/src/components/PermissionsManagement/PermissionsManagement.jsx
index 849d12aa26..cdc2dc3e8c 100644
--- a/src/components/PermissionsManagement/PermissionsManagement.jsx
+++ b/src/components/PermissionsManagement/PermissionsManagement.jsx
@@ -60,7 +60,6 @@ function PermissionsManagement({ roles, auth, getUserRole, userProfile, darkMode
getInfoCollections();
getUserRole(auth?.user.userid);
-
const getChangeLogs = async () => {
try {
const response = await axios.get(ENDPOINTS.PERMISSION_CHANGE_LOGS(auth?.user.userid));
@@ -243,7 +242,7 @@ function PermissionsManagement({ roles, auth, getUserRole, userProfile, darkMode
{loading && Loading...
}
{changeLogs?.length > 0 && (
-
{dateWarning ? DUE_DATE_MUST_GREATER_THAN_START_DATE : ''}
@@ -718,7 +727,7 @@ function EditTaskModal(props) {
{canUpdateTask || canSuggestTask ? (
{taskName !== '' && startedDate !== '' && dueDate !== '' ? (
-
+
Update
) : null}
diff --git a/src/components/Projects/WBS/WBSDetail/wbs.css b/src/components/Projects/WBS/WBSDetail/wbs.css
index 04d3b5e4b1..175944b660 100644
--- a/src/components/Projects/WBS/WBSDetail/wbs.css
+++ b/src/components/Projects/WBS/WBSDetail/wbs.css
@@ -3,12 +3,6 @@
width: calc(100% - 40px);
}
-/*
-.container {
- overflow: auto;
-}
-*/
-
.level-space-1 {
margin-left: 0px;
}
@@ -265,7 +259,7 @@
}
.tasks-detail-task-name { /* task column height and width changes*/
- width: 35%;
+ width: 35%;
height: auto;
}
.tasks-detail-actions { /* action column width reduced */
@@ -275,4 +269,5 @@
.button-group button {
margin-bottom: 10px;
}
-}
\ No newline at end of file
+}
+
diff --git a/src/components/Reports/TeamReport/TeamReport.css b/src/components/Reports/TeamReport/TeamReport.css
index 61e2c8045a..40bbc4fdc3 100644
--- a/src/components/Reports/TeamReport/TeamReport.css
+++ b/src/components/Reports/TeamReport/TeamReport.css
@@ -5,8 +5,9 @@
}
.team-report-main-info-wrapper {
- margin-top: 24px;
- height: 60px;
+ margin-top: 10px;
+ height:fit-content;
+ width: 100%;
}
.team-report-main-info-id {
@@ -88,4 +89,10 @@
align-items: flex-start;
justify-content: center;
gap: 0.5rem;
+}
+
+.team-report-last-updated {
+ font-size: 1rem;
+ margin-top: 0;
+ margin-left: -80px;
}
\ No newline at end of file
diff --git a/src/components/Reports/TeamReport/TeamReport.jsx b/src/components/Reports/TeamReport/TeamReport.jsx
index b57f347c1b..2c5daad252 100644
--- a/src/components/Reports/TeamReport/TeamReport.jsx
+++ b/src/components/Reports/TeamReport/TeamReport.jsx
@@ -28,11 +28,11 @@ import { ReportPage } from '../sharedComponents/ReportPage';
import UserLoginPrivileges from './components/UserLoginPrivileges';
import { useRef } from 'react';
-const parser = (val) => {
+const parser = val => {
try {
return JSON.parse(val);
} catch (error) {
- console.error("Failed to parse state:", error);
+ console.error('Failed to parse state:', error);
return null;
}
};
@@ -40,8 +40,8 @@ const parser = (val) => {
const persistConfig = {
key: 'root',
storage,
- serialize: (outboundState) => compressToUTF16(JSON.stringify(outboundState)),
- deserialize: (inboundState) => parser(decompressFromUTF16(inboundState))
+ serialize: outboundState => compressToUTF16(JSON.stringify(outboundState)),
+ deserialize: inboundState => parser(decompressFromUTF16(inboundState)),
};
const persistedReducer = persistReducer(persistConfig, rootReducers);
@@ -137,29 +137,32 @@ const [teamDataLoading,setTeamDataLoading] = useState(false);
[],
);
- const handleSelectTeam = useCallback((event, selectedTeam, index) => {
- if (event.target.checked) {
- if (selectedTeams.length < 4) {
- setSelectedTeams([...selectedTeams, { selectedTeam, index }]);
+ const handleSelectTeam = useCallback(
+ (event, selectedTeam, index) => {
+ if (event.target.checked) {
+ if (selectedTeams.length < 4) {
+ setSelectedTeams([...selectedTeams, { selectedTeam, index }]);
+ }
+ } else {
+ setSelectedTeams(prevSelectedTeams =>
+ prevSelectedTeams.filter(team => team.selectedTeam._id !== selectedTeam._id),
+ );
}
- } else {
- setSelectedTeams(prevSelectedTeams =>
- prevSelectedTeams.filter(team => team.selectedTeam._id !== selectedTeam._id),
- );
- }
- }, [selectedTeams]);
+ },
+ [selectedTeams],
+ );
- const debounceSearchByName = debounce((value) => {
+ const debounceSearchByName = debounce(value => {
setSearchParams(prevParams => ({
...prevParams,
teamName: value,
}));
- }, 300);
-
- function handleSearchByName(event) {
- event.persist();
- debounceSearchByName(event.target.value);
- }
+ }, 300);
+
+ function handleSearchByName(event) {
+ event.persist();
+ debounceSearchByName(event.target.value);
+ }
function handleCheckboxChange(event) {
const { id, checked } = event.target;
@@ -188,18 +191,24 @@ const [teamDataLoading,setTeamDataLoading] = useState(false);
}
const memoizedSearchResults = useMemo(() => {
- return allTeams.filter(team => {
- const isMatchedName = team.teamName.toLowerCase().includes(searchParams.teamName.toLowerCase());
- const isMatchedCreatedDate = moment(team.createdDatetime).isSameOrAfter(
- moment(searchParams.createdAt).startOf('day'),
- );
- const isMatchedModifiedDate = moment(team.modifiedDatetime).isSameOrAfter(
- moment(searchParams.modifiedAt).startOf('day'),
- );
- const isActive = team.isActive === searchParams.isActive;
- const isInactive = team.isActive !== searchParams.isInactive;
- return isMatchedName && isMatchedCreatedDate && isMatchedModifiedDate && (isActive || isInactive);
- }).slice(0, 5);
+ return allTeams
+ .filter(team => {
+ const isMatchedName = team.teamName
+ .toLowerCase()
+ .includes(searchParams.teamName.toLowerCase());
+ const isMatchedCreatedDate = moment(team.createdDatetime).isSameOrAfter(
+ moment(searchParams.createdAt).startOf('day'),
+ );
+ const isMatchedModifiedDate = moment(team.modifiedDatetime).isSameOrAfter(
+ moment(searchParams.modifiedAt).startOf('day'),
+ );
+ const isActive = team.isActive === searchParams.isActive;
+ const isInactive = team.isActive !== searchParams.isInactive;
+ return (
+ isMatchedName && isMatchedCreatedDate && isMatchedModifiedDate && (isActive || isInactive)
+ );
+ })
+ .slice(0, 5);
}, [allTeams, searchParams]);
function handleDate(date) {
@@ -275,7 +284,7 @@ const [teamDataLoading,setTeamDataLoading] = useState(false);
fetchTeamMembers(match.params.teamId);
fetchAllUserTeams();
}
-
+
return () => {
isMounted = false; // Set the flag as false when the component unmounts
};
@@ -407,18 +416,13 @@ const [teamDataLoading,setTeamDataLoading] = useState(false);
>
-
-
-
★ Team ID: {team?._id}
+
+
+ ★ Team ID: {team._id}
+
+
+ Last updated: {moment(team.modifiedDatetime).format('MMM-DD-YY')}
- {/*
- This LoginPrivilegesSimulation component will be removed once the backend team link the login privileges.
- It is just to simulate the toggle between the login privileges. The logic is
- inside the userLoginPrivileges.jsx file.
- */}
- {/*
*/}
- Last updated:
- {moment(team?.modifiedDatetime).format('MMM-DD-YY')}
@@ -440,7 +444,10 @@ const [teamDataLoading,setTeamDataLoading] = useState(false);
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-
+
Name
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-
+
Created After
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-
+
Modified After
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
- Active
+
+ Active
+
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-
Inactive
+
+ Inactive
+
handleCheckboxChange(event)}
type="checkbox"
diff --git a/src/components/Reports/TeamReport/components/ReportCharts.css b/src/components/Reports/TeamReport/components/ReportCharts.css
index 5b3438b1c6..5e8a5e4396 100644
--- a/src/components/Reports/TeamReport/components/ReportCharts.css
+++ b/src/components/Reports/TeamReport/components/ReportCharts.css
@@ -64,9 +64,9 @@
.pie-chart-info-key {
font-size: 16px;
- align-items: center;
- width: auto;
- margin: 4px 0;
+ width: 100%;
+ margin: auto;
+ text-align: left;
}
.pie-chart-info-value {
diff --git a/src/components/Reports/sharedComponents/ReportPage/ReportPage.css b/src/components/Reports/sharedComponents/ReportPage/ReportPage.css
index 6458767813..5c348dab28 100644
--- a/src/components/Reports/sharedComponents/ReportPage/ReportPage.css
+++ b/src/components/Reports/sharedComponents/ReportPage/ReportPage.css
@@ -19,13 +19,17 @@
/* padding-bottom: 24px; */
}
-
.report-page-profile {
- padding-right: 24px;
- /* background-color: #f1ebf7; */
border-top-left-radius: 25px;
border-radius: 25px;
- margin-bottom: 24px;
+ margin-bottom: 10px;
+ width: 100%;
+}
+.report-page-profile-dark {
+ border-top-left-radius: 25px;
+ border-radius: 25px;
+ margin-bottom: 10px;
+ width: 100%;
}
@media (max-width: 1300px) {
@@ -69,15 +73,10 @@
.project-header{
font-size: 32px;
- padding: 10px 10px;
+ padding: 5px 5px;
text-align: center;
background-color:white;
border-radius: 20px;
box-shadow: 0 0 12px #eae1f6;
+ width: 100%;
}
-
-@media (max-width: 450px){
- .project-header{
- margin-top: 1rem;
- }
-}
\ No newline at end of file
diff --git a/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css b/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css
index 91dd065cb2..fef69d623e 100644
--- a/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css
+++ b/src/components/Reports/sharedComponents/ReportPage/components/ReportHeader/ReportHeader.css
@@ -1,5 +1,5 @@
.report-header {
- min-height: 35vh;
+ min-height: 25vh;
display: flex;
align-items: center;
justify-content: center;
@@ -17,7 +17,6 @@
display: flex;
align-items: center;
justify-content: center;
-
background: #a780d9;
border: 3px solid #e5daf0;
}
diff --git a/src/components/TeamMemberTasks/TeamMemberTask.jsx b/src/components/TeamMemberTasks/TeamMemberTask.jsx
index 41bf9c00c9..5d770bd0d9 100644
--- a/src/components/TeamMemberTasks/TeamMemberTask.jsx
+++ b/src/components/TeamMemberTasks/TeamMemberTask.jsx
@@ -43,11 +43,12 @@ const TeamMemberTask = React.memo(
showWhoHasTimeOff,
onTimeOff,
goingOnTimeOff,
+ displayUser,
}) => {
const darkMode = useSelector(state => state.theme.darkMode);
const taskCounts = useSelector(state => state.dashboard?.taskCounts ?? {});
- // console.log('Task counts:', taskCounts);
- // console.log('Task IDs:', Object.keys(taskCounts));
+ // console.log('Task counts:', taskCounts);
+ // console.log('Task IDs:', Object.keys(taskCounts));
const ref = useRef(null);
const currentDate = moment.tz('America/Los_Angeles').startOf('day');
const dispatch = useDispatch();
@@ -72,7 +73,7 @@ const TeamMemberTask = React.memo(
const canTruncate = activeTasks.length > NUM_TASKS_SHOW_TRUNCATE;
const [isTruncated, setIsTruncated] = useState(canTruncate);
const [isTimeOffContentOpen, setIsTimeOffContentOpen] = useState(
- showWhoHasTimeOff && (onTimeOff || goingOnTimeOff)
+ showWhoHasTimeOff && (onTimeOff || goingOnTimeOff),
);
const thisWeekHours = user.totaltangibletime_hrs;
@@ -126,50 +127,52 @@ const TeamMemberTask = React.memo(
};
return (
-
-
+
+
- { isTimeOffContentOpen &&
-
-
-
- {onTimeOff
- ? `${user.name} Is Not Available this Week`
- : `${user.name} Is Not Available Next Week`}
-
- {
- const request = onTimeOff
- ? { ...onTimeOff, onVacation: true, name: user.name }
- : { ...goingOnTimeOff, onVacation: false, name: user.name };
- openDetailModal(request);
- }}
- >
- Details ?
-
-
+ {isTimeOffContentOpen && (
+
+
+
+ {onTimeOff
+ ? `${user.name} Is Not Available this Week`
+ : `${user.name} Is Not Available Next Week`}
+
{
- setIsTimeOffContentOpen(false);
+ const request = onTimeOff
+ ? { ...onTimeOff, onVacation: true, name: user.name }
+ : { ...goingOnTimeOff, onVacation: false, name: user.name };
+ openDetailModal(request);
}}
>
-
- }
+
{
+ setIsTimeOffContentOpen(false);
+ }}
+ >
+
+
+ )}
-
+
{/* green if member has met committed hours for the week, red if not */}
-
+
= user.weeklycommittedHours ? 'green' : 'red',
+ user.totaltangibletime_hrs >= user.weeklycommittedHours
+ ? 'green'
+ : 'red',
}}
icon={faCircle}
data-testid="icon"
@@ -189,32 +192,38 @@ const TeamMemberTask = React.memo(
-
+
- {user.role}
-
- )}
+ {user.role !== 'Volunteer' && (
+
+ {user.role}
+
+ )}
{canGetWeeklySummaries &&
-
- {user.weeklycommittedHours ? user.weeklycommittedHours : 0} /
- {thisWeekHours ? thisWeekHours.toFixed(1) : 0} /
- {totalHoursRemaining.toFixed(1)}
+
+
+ {user.weeklycommittedHours ? user.weeklycommittedHours : 0}
+ {' '}
+ /
+ {thisWeekHours ? thisWeekHours.toFixed(1) : 0} {' '}
+ / {totalHoursRemaining.toFixed(1)}
-
+
{user.tasks &&
activeTasks.slice(0, numTasksToShow).map((task, index) => {
return (
-
-
+
+
{`${task.num} ${task.taskName}`}
-
{task.taskNotifications.length > 0 &&
@@ -322,24 +349,37 @@ const TeamMemberTask = React.memo(
{task.hoursLogged != null && task.estimatedHours != null && (
-
+
{isAllowedToSeeDeadlineCount && (
- {taskCounts[task._id] !== undefined ? taskCounts[task._id] : (task.deadlineCount === undefined ? 0 : task.deadlineCount)}
+ {taskCounts[task._id] !== undefined
+ ? taskCounts[task._id]
+ : task.deadlineCount === undefined
+ ? 0
+ : task.deadlineCount}
)}
- {`${parseFloat(task.hoursLogged.toFixed(2))} of ${parseFloat(
- task.estimatedHours.toFixed(2),
- )}`}
+ {`${parseFloat(
+ task.hoursLogged.toFixed(2),
+ )} of ${parseFloat(task.estimatedHours.toFixed(2))}`}
{canSeeFollowUpCheckButton && (
<>
@@ -357,7 +397,10 @@ const TeamMemberTask = React.memo(
task.estimatedHours,
true,
)}
- value={getProgressValue(task.hoursLogged, task.estimatedHours)}
+ value={getProgressValue(
+ task.hoursLogged,
+ task.estimatedHours,
+ )}
className="team-task-progress-bar"
/>
@@ -365,28 +408,35 @@ const TeamMemberTask = React.memo(
)}
);
- })
- }
+ })}
{canTruncate && (
-
- {isTruncated ? `Show All (${activeTasks.length}) Tasks` : 'Truncate Tasks'}
+
+ {isTruncated
+ ? `Show All (${activeTasks.length}) Tasks`
+ : 'Truncate Tasks'}
)}
- { showWhoHasTimeOff && (onTimeOff || goingOnTimeOff) &&
+ {showWhoHasTimeOff && (onTimeOff || goingOnTimeOff) && (
setIsTimeOffContentOpen(true)}
>
- }
+ )}
@@ -398,4 +448,4 @@ const TeamMemberTask = React.memo(
},
);
-export default TeamMemberTask;
\ No newline at end of file
+export default TeamMemberTask;
diff --git a/src/components/TeamMemberTasks/TeamMemberTasks.jsx b/src/components/TeamMemberTasks/TeamMemberTasks.jsx
index 4d659c9e21..9ea6c41028 100644
--- a/src/components/TeamMemberTasks/TeamMemberTasks.jsx
+++ b/src/components/TeamMemberTasks/TeamMemberTasks.jsx
@@ -1,12 +1,6 @@
import { Fragment } from 'react';
import { faClock } from '@fortawesome/free-solid-svg-icons';
import {
- Dropdown,
- DropdownToggle,
- DropdownMenu,
- DropdownItem,
- Button,
- Spinner,
Table,
Row,
Col,
@@ -20,21 +14,19 @@ import { TaskDifferenceModal } from './components/TaskDifferenceModal';
import './style.css';
import TaskCompletedModal from './components/TaskCompletedModal';
import EditableInfoModal from 'components/UserProfile/EditableModal/EditableInfoModal';
-import { boxStyle } from 'styles';
import axios from 'axios';
import moment from 'moment';
import TeamMemberTask from './TeamMemberTask';
import TimeEntry from '../Timelog/TimeEntry';
import { hrsFilterBtnColorMap } from 'constants/colors';
import { toast } from 'react-toastify';
-// import InfiniteScroll from 'react-infinite-scroller';
import { getAllTimeOffRequests } from '../../actions/timeOffRequestAction';
import { fetchAllFollowUps } from '../../actions/followUpActions';
import { MultiSelect } from 'react-multi-select-component';
import { fetchTeamMembersTaskSuccess } from './actions';
-import { Link } from 'react-router-dom';
import { ENDPOINTS } from 'utils/URL';
+import { FaCalendarAlt, FaClock } from 'react-icons/fa'
const TeamMemberTasks = React.memo(props => {
// props from redux store
@@ -524,45 +516,26 @@ const TeamMemberTasks = React.memo(props => {
-
-
-
-
-
-
+
{Object.entries(hrsFilterBtnColorMap).map(([days, color], idx) => (
{
}}
onClick={() => selectPeriod(days)}
>
- {days} {days === '1' ? 'day' : 'days'}
+ {days}
+
))}
{
border: `1px solid ${color}`,
}}
>
- {days} {days === '1' ? 'day' : 'days'}
+ {`${days} ${days === '1' ? 'day' : 'days'}`}
))}
@@ -689,27 +664,16 @@ const TeamMemberTasks = React.memo(props => {
)}
-
-
+
+
- {/* Empty column header for hours completed icon */}
-
-
-
+
+
+
+
+ User Status
+
{
showWhoHasTimeOff={showWhoHasTimeOff}
onTimeOff={userOnTimeOff[user.personId]}
goingOnTimeOff={userGoingOnTimeOff[user.personId]}
+ displayUser={displayUser}
/>
);
} else {
diff --git a/src/components/TeamMemberTasks/__tests__/TeamMemberTasks.test.js b/src/components/TeamMemberTasks/__tests__/TeamMemberTasks.test.js
index b36aab068d..ab7b4e0478 100644
--- a/src/components/TeamMemberTasks/__tests__/TeamMemberTasks.test.js
+++ b/src/components/TeamMemberTasks/__tests__/TeamMemberTasks.test.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
import '@testing-library/jest-dom/extend-expect';
import thunk from 'redux-thunk';
import configureStore from 'redux-mock-store';
@@ -78,7 +78,7 @@ const store = mockStore({
jest.mock('axios');
describe("TeamMemberTasks component",()=>{
-
+
it('renders without crashing',()=>{
axios.get.mockResolvedValue({
status: 200,
@@ -179,7 +179,7 @@ describe("TeamMemberTasks component",()=>{
const {container}=render(
+
{canAssignTeamToUsers && (
-
+
({ state });
export default connect(mapStateToProps, {
getAllUserProfile,
diff --git a/src/components/Teams/__tests__/Teams.test.js b/src/components/Teams/__tests__/Teams.test.js
new file mode 100644
index 0000000000..1524883d52
--- /dev/null
+++ b/src/components/Teams/__tests__/Teams.test.js
@@ -0,0 +1,320 @@
+// Teams.test.js
+import React from 'react';
+import { shallow } from 'enzyme';
+import { Teams } from '../Teams';
+import { toast } from 'react-toastify';
+
+// Mock the actions and other dependencies
+jest.mock('../../../actions/allTeamsAction', () => ({
+ getAllUserTeams: jest.fn(),
+ postNewTeam: jest.fn(),
+ deleteTeam: jest.fn(),
+ updateTeam: jest.fn(),
+ getTeamMembers: jest.fn(),
+ deleteTeamMember: jest.fn(),
+ addTeamMember: jest.fn(),
+ updateTeamMemeberVisibility: jest.fn(),
+}));
+
+jest.mock('../../../actions/userManagement', () => ({
+ getAllUserProfile: jest.fn(),
+}));
+
+jest.mock('react-toastify', () => ({
+ toast: {
+ success: jest.fn(),
+ error: jest.fn(),
+ },
+}));
+
+jest.mock('utils/search', () => ({
+ searchWithAccent: jest.fn((text, searchText) => text.includes(searchText)),
+}));
+
+// Mock subcomponents to prevent rendering them
+jest.mock('../TeamsOverview', () => 'TeamOverview');
+jest.mock('../TeamTableSearchPanel', () => 'TeamTableSearchPanel');
+jest.mock('../TeamMembersPopup', () => 'TeamMembersPopup');
+jest.mock('../CreateNewTeamPopup', () => 'CreateNewTeamPopup');
+jest.mock('../DeleteTeamPopup', () => 'DeleteTeamPopup');
+jest.mock('../TeamStatusPopup', () => 'TeamStatusPopup');
+jest.mock('../Team', () => 'Team');
+jest.mock('../../common/Loading', () => 'Loading');
+
+describe('Teams Component', () => {
+ let wrapper;
+ let props;
+ let instance;
+
+ beforeEach(() => {
+ props = {
+ state: {
+ allTeamsData: {
+ allTeams: [],
+ fetching: false,
+ },
+ theme: {
+ darkMode: false,
+ },
+ teamsTeamMembers: {
+ teamMembers: [],
+ fetching: false,
+ },
+ allUserProfiles: [],
+ },
+ getAllUserTeams: jest.fn(),
+ getAllUserProfile: jest.fn(),
+ postNewTeam: jest.fn(),
+ deleteTeam: jest.fn(),
+ updateTeam: jest.fn(),
+ getTeamMembers: jest.fn(),
+ deleteTeamMember: jest.fn(),
+ addTeamMember: jest.fn(),
+ updateTeamMemeberVisibility: jest.fn(),
+ };
+
+ wrapper = shallow(
setInacModal(!inacModal)}
@@ -639,7 +639,7 @@ function Timer({ authUser, darkMode }) {
{
this.setState({
- userTableItems: this.userTableElements(
- userProfiles,
- rolesPermissions,
- timeOffRequests,
- darkMode,
- editUser,
- ),
- });
- };
+ userTableItems: this.userTableElements(userProfiles, rolesPermissions, timeOffRequests, darkMode, editUser)
+ })
+ }
+
filteredUserList = userProfiles => {
+ const wildCardSearch = this.state.wildCardSearchText.trim().toLowerCase();
+
return userProfiles.filter(user => {
- // Applying the search filters before creating each table data element
- // const search = result => {
- // if (typeof result === 'string') {
- // return result
- // .toLowerCase()
- // .trim()
- // .replace(/\s+/g, '');
- // }
- // const numberToString = String(result)
- // .trim()
- // .replace(/\s+/g, '');
- // const stringToNumber = Number(numberToString);
- // return stringToNumber;
- // };
-
+ const firstNameSearch = this.state.firstNameSearchText || '';
+ const lastNameSearch = this.state.lastNameSearchText || '';
+
+ const firstName = user.firstName.toLowerCase();
+ const lastName = user.lastName.toLowerCase();
+ const email = user.email ? user.email.toLowerCase() : '';
+
+ const trimmedFirstNameSearch = firstNameSearch.trim();
+ const trimmedLastNameSearch = lastNameSearch.trim();
+
+ const isFirstNameExactMatch = firstNameSearch.endsWith(' ') && trimmedFirstNameSearch.length > 0;
+ const isLastNameExactMatch = lastNameSearch.endsWith(' ') && trimmedLastNameSearch.length > 0;
+
+
+ const firstNameMatches = trimmedFirstNameSearch
+ ? (isFirstNameExactMatch
+ ? firstName === trimmedFirstNameSearch.toLowerCase()
+ : firstName.includes(trimmedFirstNameSearch.toLowerCase()))
+ : true;
+
+
+ const lastNameMatches = trimmedLastNameSearch
+ ? (isLastNameExactMatch
+ ? lastName === trimmedLastNameSearch.toLowerCase()
+ : lastName.includes(trimmedLastNameSearch.toLowerCase()))
+ : true;
+
+
+ const wildcardMatches = wildCardSearch
+ ? wildCardSearch.includes(" ")
+ ? (firstName + " " + lastName).startsWith(wildCardSearch.trim()) ||
+ (firstName + " " + lastName) === wildCardSearch.trim() ||
+ email === wildCardSearch.trim()
+ : firstName.startsWith(wildCardSearch) ||
+ lastName.startsWith(wildCardSearch) ||
+ firstName.includes(wildCardSearch) ||
+ lastName.includes(wildCardSearch)||
+ email.includes(wildCardSearch)
+ : true;
+
+ const nameMatches = firstNameMatches && lastNameMatches&& wildcardMatches;
+
return (
- // Check if the user matches the search criteria
-
- // Regular search criteria
- user.firstName.toLowerCase().indexOf(this.state.firstNameSearchText.toLowerCase()) > -1 &&
- user.lastName.toLowerCase().indexOf(this.state.lastNameSearchText.toLowerCase()) > -1 &&
- user.role.toLowerCase().indexOf(this.state.roleSearchText.toLowerCase()) > -1 &&
- user.email.toLowerCase().indexOf(this.state.emailSearchText.toLowerCase()) > -1 &&
+ nameMatches &&
+ user.role.toLowerCase().includes(this.state.roleSearchText.toLowerCase()) &&
+ user.email.toLowerCase().includes(this.state.emailSearchText.toLowerCase()) &&
(this.state.weeklyHrsSearchText === '' ||
user.weeklycommittedHours === Number(this.state.weeklyHrsSearchText)) &&
- // Check the isActive state only if 'all' is not selected
((this.state.allSelected && true) ||
- this.state.isActive === undefined ||
- user.isActive === this.state.isActive) &&
- // Check the isPaused state only if 'all' is not selected
+ (this.state.isActive === undefined || user.isActive === this.state.isActive)) &&
((this.state.allSelected && true) ||
- this.state.isPaused === false ||
- (user.reactivationDate && new Date(user.reactivationDate) > new Date())) &&
- (searchWithAccent(user.firstName, this.state.wildCardSearchText) ||
- searchWithAccent(user.lastName, this.state.wildCardSearchText) ||
- user.role.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) > -1 ||
- user.email.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) > -1 ||
- user.weeklycommittedHours === Number(this.state.wildCardSearchText))
+ (this.state.isPaused === false ||
+ (user.reactivationDate && new Date(user.reactivationDate) > new Date())))
);
});
};
/**
+ *
* reload user list and close user creation popup
*/
userCreated = () => {
@@ -517,7 +540,7 @@ class UserManagement extends React.PureComponent {
*/
onFirstNameSearch = searchText => {
this.setState({
- firstNameSearchText: searchText.trim(),
+ firstNameSearchText: searchText,
selectedPage: 1,
});
};
@@ -527,7 +550,7 @@ class UserManagement extends React.PureComponent {
*/
onLastNameSearch = searchText => {
this.setState({
- lastNameSearchText: searchText.trim(),
+ lastNameSearchText: searchText,
selectedPage: 1,
});
};
@@ -584,12 +607,26 @@ class UserManagement extends React.PureComponent {
/**
* callback for search
*/
+
onWildCardSearch = searchText => {
- this.setState({
- wildCardSearchText: searchText,
- selectedPage: 1,
- });
+ this.setState(
+ {
+ wildCardSearchText: searchText,
+ selectedPage: 1,
+ },
+ () => {
+ const { userProfiles } = this.props.state.allUserProfiles;
+ const { roles: rolesPermissions } = this.props.state.role;
+ const { requests: timeOffRequests } = this.props.state.timeOffRequests;
+ const darkMode = this.props.state.theme.darkMode;
+
+ this.getFilteredData(userProfiles, rolesPermissions, timeOffRequests, darkMode);
+ }
+ );
};
+
+
+
/**
* call back for active/inactive search filter
diff --git a/src/components/UserManagement/__tests__/PauseAndResumeButton.test.js b/src/components/UserManagement/__tests__/PauseAndResumeButton.test.js
index 5a241ef35b..fd57a08a46 100644
--- a/src/components/UserManagement/__tests__/PauseAndResumeButton.test.js
+++ b/src/components/UserManagement/__tests__/PauseAndResumeButton.test.js
@@ -39,9 +39,9 @@ describe('PauseAndResumeButton', () => {
await expect(pausebutton).toHaveTextContent(RESUME);
});
-
- it('should change resume button to pause button after user clicks on resume button', async () => {
- const button = screen.getAllByRole('button', { name: PAUSE })[0];
+
+ /** it('should change resume button to pause button after user clicks on resume button', async() => {
+ const button = screen.getAllByRole('button', { name: PAUSE })[0]
// Click on Pause button
await fireEvent.click(button);
@@ -54,6 +54,6 @@ describe('PauseAndResumeButton', () => {
// Pause button is now changed to Resume. Click on Resume button to change it back to Pause button
await fireEvent.click(button);
await expect(button).toHaveTextContent(PAUSE);
- });
+ });*/
});
});
diff --git a/src/components/UserProfile/BlueSquares/BlueSquare.jsx b/src/components/UserProfile/BlueSquares/BlueSquare.jsx
index 8044a403cb..9b6d7c2b84 100644
--- a/src/components/UserProfile/BlueSquares/BlueSquare.jsx
+++ b/src/components/UserProfile/BlueSquares/BlueSquare.jsx
@@ -3,77 +3,61 @@ import hasPermission from 'utils/permissions';
import { connect } from 'react-redux';
import { formatCreatedDate, formatDate } from 'utils/formatDate';
-const BlueSquare = props => {
- const canAddInfringements = props.hasPermission('addInfringements');
- const canEditInfringements = props.hasPermission('editInfringements');
- const canDeleteInfringements = props.hasPermission('deleteInfringements');
- const isInfringementAuthorizer = canAddInfringements || canEditInfringements || canDeleteInfringements
- const { blueSquares, handleBlueSquare } = props;
+
+const BlueSquare = (props) => {
+ const {
+ blueSquares,
+ handleBlueSquare,
+ hasPermission
+ } = props;
+
+ const canAddInfringements = hasPermission('addInfringements');
+ const canEditInfringements = hasPermission('editInfringements');
+ const canDeleteInfringements = hasPermission('deleteInfringements');
+ const isInfringementAuthorizer = canAddInfringements || canEditInfringements || canDeleteInfringements;
+
+ const handleOnClick = (blueSquare) => {
+ if (!blueSquare._id) {
+ handleBlueSquare(isInfringementAuthorizer, 'message', 'none');
+ } else if (canEditInfringements || canDeleteInfringements) {
+ handleBlueSquare(true, 'modBlueSquare', blueSquare._id);
+ } else {
+ handleBlueSquare(true, 'viewBlueSquare', blueSquare._id);
+ }
+ };
return (
-
0 ? '' : 'NoBlueSquares'}`}>
- {blueSquares?.length > 0
- ? blueSquares
- .sort((a, b) => (a.date > b.date ? 1 : -1))
- .map((blueSquare, index) => (
-
{
- if (!blueSquare._id) {
- handleBlueSquare(isInfringementAuthorizer, 'message', 'none');
- } else if (canEditInfringements || canDeleteInfringements) {
- handleBlueSquare(
- canEditInfringements || canDeleteInfringements,
- 'modBlueSquare',
- blueSquare._id,
- );
- // } else if(canEditInfringements) {
- // handleBlueSquare(
- // canEditInfringements,
- // 'editBlueSquare',
- // blueSquare._id,
- // );
- // } else if (canDeleteInfringements){
- // handleBlueSquare(
- // canDeleteInfringements,
- // 'deleteBlueSquare',
- // blueSquare._id,
- // );
-
- }else{
- handleBlueSquare(
- true,
- 'viewBlueSquare',
- blueSquare._id,
- );
- }
- }}
- >
-
-
{formatDate(blueSquare.date)}
- {blueSquare.description !== undefined && (
-
- {blueSquare.createdDate !== undefined && blueSquare.createdDate !== null
- ? `${formatCreatedDate(blueSquare.createdDate)}: ${
- blueSquare.description
- }`
- : blueSquare.description}
-
- )}
-
+
+ {blueSquares?.length ? (
+ blueSquares
+ .sort((a, b) => (a.date > b.date ? 1 : -1))
+ .map((blueSquare, index) => (
+
handleOnClick(blueSquare)}
+ >
+
+
{formatDate(blueSquare.date)}
+ {blueSquare.description && (
+
+ {blueSquare.createdDate ? `${formatCreatedDate(blueSquare.createdDate)}: ` : ''}
+ {blueSquare.description}
+
+ )}
- ))
- :
No blue squares.
}
+
+ ))
+ ) : (
+
No blue squares.
+ )}
{canAddInfringements && (
{
- handleBlueSquare(true, 'addBlueSquare', '');
- }}
+ onClick={() => handleBlueSquare(true, 'addBlueSquare', '')}
className="blueSquareButton"
color="primary"
data-testid="addBlueSquare"
@@ -86,4 +70,6 @@ const BlueSquare = props => {
);
};
+
+
export default connect(null, { hasPermission })(BlueSquare);
\ No newline at end of file
diff --git a/src/components/UserProfile/QuickSetupModal/AddNewTitleModal.jsx b/src/components/UserProfile/QuickSetupModal/AddNewTitleModal.jsx
index d0f5a08ba5..afa2fe9659 100644
--- a/src/components/UserProfile/QuickSetupModal/AddNewTitleModal.jsx
+++ b/src/components/UserProfile/QuickSetupModal/AddNewTitleModal.jsx
@@ -292,10 +292,16 @@ function AddNewTitleModal({
id="mediafolder"
value={titleData.mediaFolder}
onChange={e => {
- e.persist();
- setTitleData({ ...titleData, mediaFolder: e.target.value });
+ const inputValue = e.target.value;
+ setTitleData({ ...titleData, mediaFolder: inputValue });
}}
+ placeholder="Enter a valid URL"
/>
+ {!/^(https?:\/\/[^\s]+)$/.test(titleData.mediaFolder) && titleData.mediaFolder !== '' && (
+
+ Please enter a valid URL that starts with http:// or https://
+
+ )}
Team Code* :
@@ -349,7 +355,11 @@ function AddNewTitleModal({
- confirmOnClick()}>
+ confirmOnClick()}
+ disabled={!/^(https?:\/\/[^\s]+)$/.test(titleData.mediaFolder) || titleData.mediaFolder === ''}
+ >
Confirm
setIsOpen(false)}>
diff --git a/src/components/UserProfile/QuickSetupModal/QuickSetupModal.jsx b/src/components/UserProfile/QuickSetupModal/QuickSetupModal.jsx
index 6815f0c72a..4820a7fc6e 100644
--- a/src/components/UserProfile/QuickSetupModal/QuickSetupModal.jsx
+++ b/src/components/UserProfile/QuickSetupModal/QuickSetupModal.jsx
@@ -81,7 +81,7 @@ function QuickSetupModal(props) {
onClick={() => setShowAddTitle(true)}
style={darkMode ? boxStyleDark : boxStyle}
disabled={editMode == true}
- title="Click this to add a new QST"
+ title="Click this to add a new Quick Setup Title"
>
Add New QST
diff --git a/src/components/UserProfile/TeamsAndProjects/Switch.css b/src/components/UserProfile/TeamsAndProjects/Switch.css
new file mode 100644
index 0000000000..bddb036cc1
--- /dev/null
+++ b/src/components/UserProfile/TeamsAndProjects/Switch.css
@@ -0,0 +1,51 @@
+.switch-container {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+}
+
+.switch-checkbox {
+ height: 0;
+ width: 0;
+ visibility: hidden;
+}
+
+.switch-title {
+ margin: 0 5px;
+ font-weight: bold;
+}
+
+.switch-label {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ cursor: pointer;
+ height: 25px;
+ width: 40px;
+ background: darkslategrey;
+ border-radius: 100px;
+ position: relative;
+ transition: background-color .2s;
+}
+
+.switch-label .switch-button {
+ content: '';
+ position: absolute;
+ top: 2px;
+ left: 2px;
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ transition: 0.2s;
+ background: #fff;
+ box-shadow: 0 0 2px 0 rgba(10, 10, 10, 0.29);
+}
+
+.switch-checkbox:checked + .switch-label .switch-button {
+ left: calc(100% - 2px);
+ transform: translateX(-100%);
+}
+
+.switch-label:active .switch-button {
+ width: 20px;
+}
\ No newline at end of file
diff --git a/src/components/UserProfile/TeamsAndProjects/Switch.jsx b/src/components/UserProfile/TeamsAndProjects/Switch.jsx
new file mode 100644
index 0000000000..1415f808e6
--- /dev/null
+++ b/src/components/UserProfile/TeamsAndProjects/Switch.jsx
@@ -0,0 +1,25 @@
+import "./Switch.css"
+const Switch = ({ isOn, handleToggle}) => {
+ return (
+
+
invisible
+
+
+
+
visible
+
{
setActiveInactivePopupOpen(false);
- };
+ };
const handleRehireableChange = () => {
const newRehireableStatus = !isRehireable;
@@ -666,16 +666,20 @@ function UserProfile(props) {
setShowConfirmDialog(true);
};
- const handleConfirmChange = () => {
+ const handleConfirmChange = async () => {
setShowConfirmDialog(false);
const updatedUserProfile = {
...userProfile,
isRehireable: pendingRehireableStatus,
};
- updateRehireableStatus(updatedUserProfile, pendingRehireableStatus);
- setIsRehireable(pendingRehireableStatus);
- setUserProfile(updatedUserProfile);
- setOriginalUserProfile(updatedUserProfile);
+ try{
+ await dispatch(updateRehireableStatus(updatedUserProfile, pendingRehireableStatus));
+ setIsRehireable(pendingRehireableStatus);
+ setUserProfile(updatedUserProfile);
+ setOriginalUserProfile(updatedUserProfile);
+ }catch(error){
+ toast.error('Unable change rehireable status');
+ }
};
const handleCancelChange = () => {
@@ -740,12 +744,25 @@ function UserProfile(props) {
};
const onUserVisibilitySwitch = () => {
- setUserProfile({
+ setShowToggleVisibilityModal(true);
+ }
+
+ const handleVisibilityChange = () => {
+ setShowToggleVisibilityModal(false);
+ const visibility = !userProfile.isVisible;
+ const newUserProfile = {
...userProfile,
- isVisible: !userProfile.isVisible ?? true,
- });
+ isVisible: visibility
+ };
+ toggleVisibility(newUserProfile, visibility);
+ setUserProfile(newUserProfile);
+ setOriginalUserProfile(newUserProfile);
};
+ const handleCloseConfirmVisibilityModal = () =>{
+ setShowToggleVisibilityModal(false)
+ }
+
if ((showLoading && !props.isAddNewUser) || userProfile === undefined) {
return (
@@ -773,6 +790,7 @@ function UserProfile(props) {
const canUpdateSummaryRequirements = props.hasPermission('updateSummaryRequirements');
const canManageAdminLinks = props.hasPermission('manageAdminLinks');
const canSeeQSC = props.hasPermission('seeQSC');
+ const canEditVisibility = props.hasPermission('toggleInvisibility');
const targetIsDevAdminUneditable = cantUpdateDevAdminDetails(userProfile.email, authEmail);
const canEditUserProfile = targetIsDevAdminUneditable
@@ -847,6 +865,16 @@ function UserProfile(props) {
role={requestorRole}
/>
)}
+
+ Confirm Visibility Change
+
+ {`Are you sure you want to change the user visibility to ${userProfile.isVisible ? 'Invisible' : 'Visible'}?`}
+
+
+ Confirm {' '}
+ Cancel
+
+
{
+ jest.spyOn(console, 'log').mockImplementation(() => {});
+});
+
+afterAll(() => {
+ console.log.mockRestore();
+});
+
+describe('VolunteeringTimeTab Component', () => {
+ let store;
+ let props;
+ const mockStore = configureStore([thunk]);
+
+ beforeEach(() => {
+ store = mockStore({
+ auth: authMock,
+ userProfile: userProfileMock,
+ role: rolesMock,
+ theme: themeMock,
+ });
+
+ props = {
+ userProfile: userProfileMock,
+ setUserProfile: jest.fn(),
+ role: rolesMock,
+ canEdit: true,
+ canUpdateSummaryRequirements: true,
+ darkMode: false,
+ onStartDate: jest.fn(),
+ onEndDate: jest.fn(),
+ loadUserProfile: jest.fn(),
+ };
+
+ axios.get.mockResolvedValue({
+ data: {
+ hoursByCategory: {
+ education: 10,
+ society: 20,
+ energy: 15,
+ food: 12,
+ housing: 8,
+ },
+ weeklycommittedHours: 40,
+ },
+ });
+ });
+
+ it('renders without crashing', async () => {
+ await act(async () => {
+ renderWithProvider(
{warning && (
-
)}
diff --git a/src/components/Warnings/Warnings.css b/src/components/Warnings/Warnings.css
index 1ec879ae21..2aba8c1e52 100644
--- a/src/components/Warnings/Warnings.css
+++ b/src/components/Warnings/Warnings.css
@@ -41,8 +41,136 @@
}
.warning-modal-footer {
- display: grid !important;
+ /* display: grid !important; */
+ display: flex !important;
justify-content: center !important;
- grid-template-columns: 1fr 1fr !important;
- grid-gap: 1em !important;
+ align-items: center !important;
+ /* justify-content: center !important; */
+ /* grid-template-columns: 1fr 1fr !important; */
+ /* grid-gap: 1em !important; */
+}
+.warning__body--bold {
+ font-weight: bold;
+}
+.warning__body--margin {
+ margin: 0;
+}
+.warning__modal__footer__btn {
+ width: 40%;
+}
+
+.button__container {
+ display: flex;
+ margin-top: 0.1em;
+}
+
+.tracking__btn {
+ margin-right: 0.3em;
+}
+.warnings__descriptions {
+ display: flex;
+ align-items: center;
+ margin-bottom: 0.8em;
+ text-align: left;
+
+ padding: 0.5em 1em;
+ background: rgb(245, 244, 244);
+ border-radius: 5px;
+ box-shadow: rgba(0, 0, 0, 0.8) 0px 0px 0px;
+}
+.warning__descriptions__btn {
+ padding: 0 !important;
+ font-size: 1rem;
+ width: 30px !important;
+ height: 30px !important;
+ margin: 0em 0.2em !important;
+ width: auto;
+ border-radius: 5px;
+ margin: 0;
+}
+.warnings__descriptions__title {
+ text-transform: capitalize;
+ border: none;
+ background: none;
+ width: 300px;
+ margin: 0 0.5em;
+ font-weight: bold;
+ font-size: 1em;
+}
+
+.warnings__descriptions__title:disabled {
+ cursor: not-allowed;
+}
+
+.warnings__descriptions__title:focus {
+ border: 1px solid red;
+}
+.warnings__descriptions__title--gray {
+ opacity: 0.6;
+}
+
+.btn__container {
+ display: flex;
+ justify-content: center;
+}
+
+.add__btn {
+ margin-top: 0.5em;
+ padding: 0.3em 0.5em !important;
+}
+
+.form__btn__add {
+ margin-left: 0.5em;
+}
+
+.warning__form {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding: 0.5em 1em;
+ max-width: 500px;
+ width: 70%;
+ margin-top: 0.5em;
+ box-shadow: lightgray 2px 2px 4px 1px;
+}
+.warning__form__title {
+ font-weight: bold;
+}
+.warning__title {
+ margin: 0.3em 0;
+ text-align: left;
+}
+.warning__permanent {
+ margin: 0.5em 0.5em;
+}
+
+.warning__form__btns {
+ margin-top: 1em;
+}
+.warning__input {
+ border-radius: 3px;
+ border: 1px solid #000;
+}
+.warning__reorder {
+ width: 18px;
+ height: 18px;
+ cursor: grab;
+ margin-right: 1em;
+}
+
+.modal__information {
+ text-align: left;
+ font-size: 1.2rem;
+ font-weight: semi-bold;
+ margin: 0.5em 0;
+}
+
+.alert__container {
+ margin-top: 0.5em;
+ text-align: center;
+}
+
+.modal__warning__deletion {
+ font-weight: bold;
+ font-size: 1.3rem;
}
diff --git a/src/components/Warnings/Warnings.jsx b/src/components/Warnings/Warnings.jsx
index 1509fa2750..c3872f07e1 100644
--- a/src/components/Warnings/Warnings.jsx
+++ b/src/components/Warnings/Warnings.jsx
@@ -6,6 +6,7 @@ import {
postWarningByUserId,
deleteWarningsById,
} from '../../actions/warnings';
+import WarningTrackerModal from './modals/WarningTrackerModal';
import WarningItem from './WarningItem';
import './Warnings.css';
@@ -15,16 +16,15 @@ import './Warnings.css';
// Log Time to Action Items (“i” = ,ltayg = Reminder to please log your time as you go. At a minimum, please log daily any time you work.)
// Intangible Time Log w/o Reason (“i” = ,itlr = The timer should be used for all time logged, so any time logged as intangible must also include in the time log description an explanation for why you didn’t use the timer.
-export default function Warning({ personId, username, userRole }) {
+export default function Warning({ personId, username, userRole, displayUser }) {
const dispatch = useDispatch();
-
const [usersWarnings, setUsersWarnings] = useState([]);
+ const [toggleWarningTrackerModal, setToggleWarningTrackerModal] = useState(false);
const [toggle, setToggle] = useState(false);
const [error, setError] = useState(null);
- const handleToggle = () => {
- setToggle(prev => !prev);
+ const fetchUsersWarningsById = async () => {
dispatch(getWarningsByUserId(personId)).then(res => {
if (res.error) {
setError(res);
@@ -35,6 +35,11 @@ export default function Warning({ personId, username, userRole }) {
});
};
+ const handleToggle = () => {
+ setToggle(prev => !prev);
+ fetchUsersWarningsById();
+ };
+
const handleDeleteWarning = async warningId => {
dispatch(deleteWarningsById(warningId, personId)).then(res => {
if (res.error) {
@@ -45,18 +50,27 @@ export default function Warning({ personId, username, userRole }) {
setUsersWarnings(res);
});
};
+
const handlePostWarningDetails = async ({
id,
colorAssigned: color,
todaysDate: dateAssigned,
warningText,
}) => {
+ const { firstName, lastName, email } = displayUser;
+ const monitorData = {
+ firstName,
+ lastName,
+ email,
+ };
+
const data = {
userId: personId,
iconId: id,
color,
date: dateAssigned,
description: warningText,
+ monitorData,
};
dispatch(postWarningByUserId(data)).then(res => {
@@ -86,9 +100,34 @@ export default function Warning({ personId, username, userRole }) {
return (
(userRole === 'Administrator' || userRole === 'Owner') && (
-
- {toggle ? 'Hide' : 'Tracking'}
-
+
+
+ {toggle ? 'Hide' : 'Tracking'}
+
+
+ {userRole === 'Owner' && (
+ setToggleWarningTrackerModal(prev => !prev)}
+ >
+ +/-
+
+ )}
+
+
+ {toggleWarningTrackerModal && (
+
+ )}
{warnings}
diff --git a/src/components/Warnings/WarningsModal.jsx b/src/components/Warnings/WarningsModal.jsx
deleted file mode 100644
index f246b4f6aa..0000000000
--- a/src/components/Warnings/WarningsModal.jsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable spaced-comment */
-/* eslint-disable no-alert */
-/* eslint-disable no-undef */
-/* eslint-disable react/no-unescaped-entities */
-/* eslint-disable react/destructuring-assignment */
-import { Modal, ModalHeader, ModalBody, ModalFooter, Button, Row } from 'reactstrap';
-
-/**
- * Modal displaying information about how time entry works
- * @param {*} props
- * @param {Boolean} props.visible
- * @param {Func} props.setVisible
- */
-function WarningsModal({
- setToggleModal,
- visible,
- deleteWarning,
- deleteWarningTriggered,
- warning,
- handleIssueWarning,
-}) {
- const { today, id, colorAssigned, warningText, username } = warning;
-
- if (deleteWarning) {
- return (
-
setToggleModal(false)}>
- Delete Warning
-
- Are you sure you want to delete this warning?
-
-
-
- setToggleModal(false)} color="danger">
- Cancel
-
-
- {
- deleteWarningTriggered();
- setToggleModal(false);
- }}
- color="primary"
- >
- Delete Warning
-
-
-
- );
- }
- return (
-
-
setToggleModal(false)}>
- Issue Warning
-
- Are you sure you want to issue a warning to: {username}?
-
- The warning will be because they didn't meet the criteria for the following
- warning: "{warningText}"
-
- The color will be {colorAssigned}
-
-
-
- {
- handleIssueWarning(warning);
- // subtmit wanring here to backend
- setToggleModal(false);
- }}
- >
- Log Warning Only
-
-
- {
- //email will be sent and logged
- alert('EMAIL SENT!!');
- handleIssueWarning({ ...warning, colorAssigned: 'yellow' });
- setToggleModal(false);
- }}
- color="warning"
- >
- Issue Warning
-
-
- {
- alert('BLUE SQUARE ISSUED!!');
- handleIssueWarning({ ...warning, colorAssigned: 'red' });
- setToggleModal(false);
- }}
- color="primary"
- >
- Issue Blue Square
-
- setToggleModal(false)} color="danger">
- Cancel
-
-
-
-
- );
-}
-
-export default WarningsModal;
diff --git a/src/components/Warnings/modals/WarningModal.jsx b/src/components/Warnings/modals/WarningModal.jsx
new file mode 100644
index 0000000000..95261b7cf0
--- /dev/null
+++ b/src/components/Warnings/modals/WarningModal.jsx
@@ -0,0 +1,113 @@
+/* eslint-disable no-alert */
+import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
+
+function WarningModal({
+ setToggleModal,
+ visible,
+ warning,
+ handleIssueWarning,
+ deleteWarningTriggered,
+ deleteWarning,
+ numberOfWarnings,
+}) {
+ const { warningText, username } = warning || {};
+
+ if (deleteWarning) {
+ return (
+
setToggleModal(false)}>
+ Delete Warning
+
+ Are you sure you want to delete this warning?
+
+
+
+ setToggleModal(false)} color="danger">
+ Cancel
+
+
+ {
+ deleteWarningTriggered();
+ setToggleModal(false);
+ }}
+ color="primary"
+ >
+ Delete Warning
+
+
+
+ );
+ }
+
+ return (
+
+
setToggleModal(false)}>
+ Issue Warning
+
+
+ Are you sure you want to issue a {numberOfWarnings >= 3 ? 'blue square' : 'warning'} to:{' '}
+ {username}?
+
+
+ The {numberOfWarnings >= 3 ? 'blue square' : 'warning'} will be because they didn't
+ meet the criteria for the following area:{' '}
+ {warningText}
+
+ {numberOfWarnings >= 3 && (
+ <>
+ Plase Note:
+
+ {username} has received{' '}
+ {numberOfWarnings} warnings, so by default they should get a blue square. If it has
+ been a while since their last warning, you may issue another warning instead.
+
+
+ )}
+
+ Issue a warning and the dot color will be:{' '}
+ Yellow
+
+
+ Issue a blue square and the dot color will be:{' '}
+ Red
+
+
+
+
+ {
+ // email will be sent and logged
+ handleIssueWarning({ ...warning, colorAssigned: 'yellow' });
+ setToggleModal(false);
+ }}
+ color="warning"
+ className="warning__modal__footer__btn"
+ >
+ Issue Warning
+
+
+ {
+ // alert('BLUE SQUARE ISSUED!!');
+ handleIssueWarning({ ...warning, colorAssigned: 'red' });
+ setToggleModal(false);
+ }}
+ color="primary"
+ className="warning__modal__footer__btn"
+ >
+ Issue Blue Square
+
+ setToggleModal(false)}
+ color="danger"
+ className="warning__modal__footer__btn cancel__btn "
+ >
+ Cancel
+
+
+
+
+ );
+}
+
+export default WarningModal;
diff --git a/src/components/Warnings/modals/WarningTrackerModal.jsx b/src/components/Warnings/modals/WarningTrackerModal.jsx
new file mode 100644
index 0000000000..cce30da4f6
--- /dev/null
+++ b/src/components/Warnings/modals/WarningTrackerModal.jsx
@@ -0,0 +1,398 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
+/* eslint-disable no-unused-vars */
+/* eslint-disable spaced-comment */
+/* eslint-disable no-undef */
+/* eslint-disable react/no-unescaped-entities */
+/* eslint-disable react/destructuring-assignment */
+/* eslint-disable no-alert */
+import { Modal, ModalHeader, ModalBody, ModalFooter, Button, Alert } from 'reactstrap';
+import { useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faTimes } from '@fortawesome/free-solid-svg-icons';
+import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
+import Popover from 'react-bootstrap/Popover';
+import {
+ postNewWarning,
+ getWarningDescriptions,
+ updateWarningDescription,
+ deleteWarningDescription,
+ editWarningDescription,
+} from '../../../actions/warnings';
+
+import reorder from '../reorder.svg';
+
+/**
+ *
+ *
+ * Modal displaying information about how time entry works
+ * @param {*} props
+ * @param {Boolean} props.visible
+ * @param {Func} props.setVisible
+ */
+function WarningTrackerModal({
+ toggleWarningTrackerModal,
+ getUsersWarnings,
+ setToggleWarningTrackerModal,
+}) {
+ const [toggeleWarningInput, setToggeleWarningInput] = useState(false);
+ const [newWarning, setNewWarning] = useState('');
+ const [warningDescriptions, setWarningDescriptions] = useState([]);
+ const [toggleDeleteModal, setToggleDeleteModal] = useState(false);
+ const [warningToDelete, setWarningToDelete] = useState(null);
+ const [warningEdited, setWarningEdited] = useState(false);
+ const [editedWarning, setEditedWarning] = useState(null);
+ const [warningWasEdited, setWarningWasEdited] = useState(false);
+ const [isPermanent, setIsPermanent] = useState(false);
+ const [error, setError] = useState(null);
+
+ const dispatch = useDispatch();
+
+ const fetchWarningDescriptions = async () => {
+ dispatch(getWarningDescriptions()).then(res => {
+ if (res.error) {
+ setError(res.error);
+ return;
+ }
+ setWarningDescriptions(res);
+ });
+ };
+ useEffect(() => {
+ fetchWarningDescriptions();
+ }, []);
+
+ useEffect(() => {
+ setTimeout(() => {
+ setWarningWasEdited(false);
+ }, 5000);
+ }, [warningWasEdited]);
+
+ const handleOverlayTrigger = title => {
+ if (title === 'info') {
+ return (
+
+ Information
+
+
+ Pressing the "+" button will allow you to activate the warning tracker.
+
+
+ Pressing the "-" button will allow you to deactivate the warning tracker.
+
+
+ Pressing the "x" button will allow you to delete the warning tracker. This will also
+ delete all assoicated warnings for every user (be careful doing this!).
+
+
+ Pressing the "Add New Warning Tracker" button will allow you to add a new warning to
+ the list.
+
+
+
+ );
+ }
+ return (
+
+ Description
+
+ This will {title} this warning tracker,{' '}
+ {title === 'activate'
+ ? 'showing all saved warning-tracking data of this type'
+ : 'retaining the data but hiding all warning tracking of this type'}
+
+
+ );
+ };
+
+ const handleTriggerDeleteWarningDescription = warning => {
+ setToggleDeleteModal(true);
+ setWarningToDelete(warning);
+ };
+
+ const handleDeactivate = warningId => {
+ dispatch(updateWarningDescription(warningId)).then(res => {
+ if (res.error) {
+ setError(res.error);
+ return;
+ }
+ setWarningDescriptions(prev =>
+ prev.map(warning => {
+ if (warning._id === warningId) {
+ return { ...warning, activeWarning: !warning.activeWarning };
+ }
+ return warning;
+ }),
+ );
+ getUsersWarnings();
+ });
+ };
+ const handleDeleteWarningDescription = warningId => {
+ dispatch(deleteWarningDescription(warningId)).then(res => {
+ if (res.error) {
+ setError(res.error);
+ return;
+ }
+ setWarningDescriptions(prev => prev.filter(warning => warning._id !== warningId));
+ getUsersWarnings();
+ });
+ };
+
+ const handleEditWarningDescription = (e, warningId) => {
+ setWarningEdited(true);
+
+ const updatedWarningDescriptions = warningDescriptions.map(warning => {
+ if (warning._id === warningId) {
+ const updatedWarning = { ...warning, warningTitle: e.target.value };
+ setEditedWarning(updatedWarning);
+ return updatedWarning;
+ }
+ return { ...warning, disabled: true };
+ });
+ setWarningDescriptions(updatedWarningDescriptions);
+ };
+
+ const handleCancelEdit = () => {
+ fetchWarningDescriptions();
+ setWarningEdited(false);
+ setWarningWasEdited(false);
+ };
+
+ const handleSaveEditedWarning = () => {
+ dispatch(editWarningDescription(editedWarning)).then(res => {
+ if (res.error) {
+ setError(res.error);
+ setWarningEdited(false);
+ setEditedWarning(null);
+ fetchWarningDescriptions();
+ return;
+ }
+ setWarningEdited(false);
+ setEditedWarning(null);
+ setError(null);
+ getUsersWarnings();
+ fetchWarningDescriptions();
+ setWarningWasEdited(true);
+ });
+ };
+
+ // eslint-disable-next-line no-shadow
+ const handleAddNewWarning = (e, newWarning) => {
+ e.preventDefault();
+
+ if (newWarning === '') return;
+ const trimmedWarning = newWarning.trim();
+ dispatch(postNewWarning({ newWarning: trimmedWarning, activeWarning: true, isPermanent })).then(
+ res => {
+ setNewWarning('');
+ if (res?.error) {
+ setError(res.error);
+ return;
+ }
+ if (res?.message) {
+ setError(res.message);
+ return;
+ }
+ setWarningDescriptions(res.newWarnings);
+ getUsersWarnings();
+ setError(null);
+ },
+ );
+ };
+
+ if (toggleDeleteModal) {
+ const { warningTitle, _id } = warningToDelete;
+
+ return (
+
setToggleDeleteModal(false)}>
+
+ Whooooo Tiger!!
+ Are you sure you want to delete this warning?
+ Deleteing this warning will delete all associated data tied to it from all users.
+ Warning Title: {warningTitle}
+
+
+
+ setToggleDeleteModal(false)} color="danger">
+ No, I changed my mind!
+
+
+ {
+ handleDeleteWarningDescription(warningToDelete._id);
+ setToggleDeleteModal(false);
+ setError('Deletion was successful');
+ }}
+ color="primary"
+ >
+ Yes I am sure!
+
+
+
+ );
+ }
+
+ return (
+
setToggleWarningTrackerModal(false)}>
+
+ Current Warning Descriptions
+
+
+
+ {error && (
+
+ {error}
+
+ )}
+ {warningWasEdited && (
+
+ Warning was succesfully edited!
+
+ )}
+
+ {warningDescriptions.map((warning, index) => (
+
+
+ {warning.activeWarning ? (
+
+ handleDeactivate(warning._id)}
+ >
+
+
+ ) : (
+
+ handleDeactivate(warning._id)}
+ >
+
+
+ )}
+
+
handleTriggerDeleteWarningDescription(warning)}
+ >
+
+
+
handleEditWarningDescription(e, warning._id)}
+ value={warning.warningTitle}
+ disabled={warning?.disabled || warning.isPermanent}
+ placeholder="warning title"
+ className={`warnings__descriptions__title ${
+ warning.activeWarning ? '' : 'warnings__descriptions__title--gray'
+ }`}
+ />
+
+
+ Save
+
+
+ Cancel
+
+
+ )}
+
+
+ {!toggeleWarningInput && (
+
setToggeleWarningInput(true)}
+ >
+ Add New Warning Tracker
+
+ )}
+
+ {toggeleWarningInput && (
+
+ )}
+
+
+
+ setToggleWarningTrackerModal(false)}>
+ Close
+
+
+
+ );
+}
+
+export default WarningTrackerModal;
diff --git a/src/components/Warnings/reorder.svg b/src/components/Warnings/reorder.svg
new file mode 100644
index 0000000000..c971238c7a
--- /dev/null
+++ b/src/components/Warnings/reorder.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/WeeklySummariesReport/PasswordInputModal.jsx b/src/components/WeeklySummariesReport/PasswordInputModal.jsx
index 8f287452a4..a49f013b9f 100644
--- a/src/components/WeeklySummariesReport/PasswordInputModal.jsx
+++ b/src/components/WeeklySummariesReport/PasswordInputModal.jsx
@@ -109,6 +109,7 @@ export default function PasswordInputModal({
id="passwordField"
value={passwordField}
onChange={onChangeFunc}
+ data-testid="password-input"
/>
{showPassword ? (
({
+ toast: {
+ success: jest.fn(),
+ },
+}));
+
+const mockStore = configureStore([]);
+const mockOnClose = jest.fn();
+const mockCheckForValidPwd = jest.fn();
+const mockSetSummaryRecepientsPopup = jest.fn();
+const mockSetAuthpassword = jest.fn();
+
+describe('PasswordInputModal', () => {
+ let store;
+
+ beforeEach(() => {
+ store = mockStore({
+ theme: { darkMode: false },
+ });
+ });
+
+ const renderComponent = () =>
+ render(
+
+ ,
+ );
+
+ test('renders the modal with input field and buttons', () => {
+ renderComponent();
+
+ expect(screen.getByText(/Password to Authorise User/i)).toBeInTheDocument();
+ expect(screen.getByTestId('password-input')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: /Authorize/i })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: /Cancel/i })).toBeInTheDocument();
+ });
+
+ test('toggles password visibility when eye icon is clicked', () => {
+ renderComponent();
+
+ const passwordInput = screen.getByTestId('password-input');
+ const eyeIcon = screen.getByRole('img', { hidden: true });
+
+ expect(passwordInput).toHaveAttribute('type', 'password');
+
+ fireEvent.click(eyeIcon);
+ expect(passwordInput).toHaveAttribute('type', 'text');
+
+ fireEvent.click(eyeIcon);
+ expect(passwordInput).toHaveAttribute('type', 'password');
+ });
+
+ test('calls onClose when Cancel button is clicked', () => {
+ renderComponent();
+
+ fireEvent.click(screen.getByRole('button', { name: /Cancel/i }));
+ expect(mockOnClose).toHaveBeenCalledTimes(1);
+ });
+
+ test('calls success flow when the password is correct', async () => {
+ axios.post.mockResolvedValueOnce({
+ status: 200,
+ data: { message: 'Success', password: 'correctPassword' },
+ });
+
+ renderComponent();
+
+ const passwordInput = screen.getByTestId('password-input');
+ const authorizeButton = screen.getByRole('button', { name: /Authorize/i });
+
+ userEvent.type(passwordInput, 'correctPassword');
+ fireEvent.click(authorizeButton);
+
+ await waitFor(() => {
+ expect(mockCheckForValidPwd).toHaveBeenCalledWith(true);
+ expect(mockSetAuthpassword).toHaveBeenCalledWith('correctPassword');
+ expect(mockSetSummaryRecepientsPopup).toHaveBeenCalledWith(true);
+ expect(mockOnClose).toHaveBeenCalled();
+ expect(toast.success).toHaveBeenCalledWith(
+ 'Authorization successful! Please wait to see Recipients table!',
+ );
+ });
+ });
+});
diff --git a/src/components/common/CPDashboard/CPProtectedRoute/CPProtectedRoute.jsx b/src/components/common/CPDashboard/CPProtectedRoute/CPProtectedRoute.jsx
new file mode 100644
index 0000000000..27e7a6ab7c
--- /dev/null
+++ b/src/components/common/CPDashboard/CPProtectedRoute/CPProtectedRoute.jsx
@@ -0,0 +1,48 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import { Redirect, Route } from 'react-router-dom';
+import { connect } from 'react-redux';
+import { Suspense } from 'react';
+
+// eslint-disable-next-line react/function-component-definition
+const CPProtectedRoute = ({ component: Component, render, auth, fallback, ...rest }) => {
+ return (
+ {
+ if (!auth.isAuthenticated) {
+ return
+
+ }
+ >
+ {' '}
+
{' '}
+
+ ) : Component ? (
+
+ ) : (
+ render(props)
+ );
+ }}
+ />
+ );
+};
+
+const mapStateToProps = state => ({
+ auth: state.auth,
+ // Note: roles props won't be used until permissions added to BM Dashboard
+ roles: state.role.roles,
+});
+
+export default connect(mapStateToProps)(CPProtectedRoute);
diff --git a/src/components/common/CPDashboard/CPProtectedRoute/index.js b/src/components/common/CPDashboard/CPProtectedRoute/index.js
new file mode 100644
index 0000000000..0f6e73a12f
--- /dev/null
+++ b/src/components/common/CPDashboard/CPProtectedRoute/index.js
@@ -0,0 +1,3 @@
+import CPProtectedRoute from './CPProtectedRoute';
+
+export default CPProtectedRoute;
diff --git a/src/constants/warning.js b/src/constants/warning.js
index 2c3d56ba51..5607596f4d 100644
--- a/src/constants/warning.js
+++ b/src/constants/warning.js
@@ -1,12 +1,39 @@
export const GET_WARNINGS_BY_USER_ID = 'GET_WARNINGS_BY_USER_ID';
export const POST_WARNINGS_BY_USER_ID = 'POST_WARNINGS_BY_USER_ID';
export const DELETE_WARNINGS_BY_USER_ID = 'DELETE_WARNINGS_BY_USER_ID';
+export const CURRENT_WARNINGS = 'CURRENT_WARNINGS';
+export const POST_NEW_WARNING = 'POST_NEW_WARNING';
+export const UPDATE_WARNING_DESCRIPTION = 'UPDATE_WARNING_DESCRIPTION';
+export const EDIT_WARNING_DESCRIPTION = 'EDIT_WARNING_DESCRIPTION';
export const getWarningByUserId = data => ({
type: GET_WARNINGS_BY_USER_ID,
payload: data,
});
+export const getCurrentWarnings = data => ({
+ type: CURRENT_WARNINGS,
+ payload: data,
+});
+export const postNewWarning = data => ({
+ type: POST_NEW_WARNING,
+ payload: data,
+});
+
+export const deleteWarningDescription = data => ({
+ type: DELETE_WARNINGS_BY_USER_ID,
+ payload: data,
+});
+
+export const updateWarningDescription = data => ({
+ type: UPDATE_WARNING_DESCRIPTION,
+ payload: data,
+});
+export const editWarningDescription = data => ({
+ type: EDIT_WARNING_DESCRIPTION,
+ payload: data,
+});
+
export const postWarningsByUserId = data => ({
type: POST_WARNINGS_BY_USER_ID,
payload: data,
diff --git a/src/languages/en/ui.js b/src/languages/en/ui.js
index 087bd1de12..14162e5fd0 100644
--- a/src/languages/en/ui.js
+++ b/src/languages/en/ui.js
@@ -6,6 +6,7 @@ export const ACTIVE = 'Active';
export const INACTIVE = 'InActive';
export const ACTIVE_PROJECTS = 'Active Projects';
export const BM_DASHBOARD = 'BM Dashboard';
+export const CP_DASHBOARD = 'CP Dashboard';
export const BM_PROJECT = 'Project';
export const ADD_MATERIAL = 'Add Material';
export const LOG_MATERIAL = 'Log Material';
diff --git a/src/reducers/__tests__/totalOrgSummaryReducer.test.js b/src/reducers/__tests__/totalOrgSummaryReducer.test.js
new file mode 100644
index 0000000000..9721739a04
--- /dev/null
+++ b/src/reducers/__tests__/totalOrgSummaryReducer.test.js
@@ -0,0 +1,79 @@
+import { totalOrgSummaryReducer } from '../totalOrgSummaryReducer';
+import * as actions from '../../constants/totalOrgSummary';
+
+describe('totalOrgSummaryReducer', () => {
+ const initialState = {
+ volunteerstats: [],
+ volunteerOverview: [],
+ loading: false,
+ error: null,
+ fetchingError: null,
+ };
+
+ it('should return the initial state when no action is provided', () => {
+ const newState = totalOrgSummaryReducer(undefined, {});
+ expect(newState).toEqual(initialState);
+ });
+
+ it('should handle FETCH_TOTAL_ORG_SUMMARY_BEGIN', () => {
+ const action = { type: actions.FETCH_TOTAL_ORG_SUMMARY_BEGIN };
+ const newState = totalOrgSummaryReducer(initialState, action);
+ expect(newState).toEqual({
+ ...initialState,
+ loading: true,
+ error: null,
+ });
+ });
+
+ it('should handle FETCH_TOTAL_ORG_SUMMARY_SUCCESS', () => {
+ const action = {
+ type: actions.FETCH_TOTAL_ORG_SUMMARY_SUCCESS,
+ payload: { volunteerstats: [{ id: 1, name: 'John Doe' }] },
+ };
+ const newState = totalOrgSummaryReducer(initialState, action);
+ expect(newState).toEqual({
+ ...initialState,
+ loading: false,
+ volunteerstats: [{ id: 1, name: 'John Doe' }],
+ });
+ });
+
+ it('should handle FETCH_TOTAL_ORG_SUMMARY_ERROR', () => {
+ const action = {
+ type: actions.FETCH_TOTAL_ORG_SUMMARY_ERROR,
+ payload: { error: 'Unable to fetch data' },
+ };
+ const newState = totalOrgSummaryReducer(initialState, action);
+ expect(newState).toEqual({
+ ...initialState,
+ loading: false,
+ error: 'Unable to fetch data',
+ });
+ });
+
+ it('should handle FETCH_TOTAL_ORG_SUMMARY_DATA_SUCCESS', () => {
+ const action = {
+ type: actions.FETCH_TOTAL_ORG_SUMMARY_DATA_SUCCESS,
+ payload: { volunteerOverview: [{ id: 2, name: 'Jane Doe' }] },
+ };
+ const newState = totalOrgSummaryReducer(initialState, action);
+ expect(newState).toEqual({
+ ...initialState,
+ loading: false,
+ volunteerOverview: [{ id: 2, name: 'Jane Doe' }],
+ });
+ });
+
+ it('should handle FETCH_TOTAL_ORG_SUMMARY_DATA_ERROR', () => {
+ const action = {
+ type: actions.FETCH_TOTAL_ORG_SUMMARY_DATA_ERROR,
+ payload: { fetchingError: 'Unable to fetch overview data' },
+ };
+ const newState = totalOrgSummaryReducer(initialState, action);
+ expect(newState).toEqual({
+ ...initialState,
+ loading: false,
+ fetchingError: 'Unable to fetch overview data',
+ });
+ });
+});
diff --git a/src/reducers/__tests__/weeklyDashboardDataReducer.test.js b/src/reducers/__tests__/weeklyDashboardDataReducer.test.js
new file mode 100644
index 0000000000..11ed1acdf5
--- /dev/null
+++ b/src/reducers/__tests__/weeklyDashboardDataReducer.test.js
@@ -0,0 +1,27 @@
+import { weeklyDashboardDataReducer } from '../weeklyDashboardDataReducer';
+
+describe('weeklyDashboardDataReducer', () => {
+ it('should return the initial state when no action is provided', () => {
+ const initialState = null;
+ const action = {};
+ const newState = weeklyDashboardDataReducer(undefined, action);
+ expect(newState).toBe(initialState);
+ });
+
+ it('should handle GET_WEEKLY_DASHBOARD_DATA and update the state', () => {
+ const initialState = null;
+ const action = {
+ type: 'GET_WEEKLY_DASHBOARD_DATA',
+ payload: { dashboard: 'test data' },
+ };
+ const newState = weeklyDashboardDataReducer(initialState, action);
+ expect(newState).toEqual({ dashboard: 'test data' });
+ });
+
+ it('should not update the state for unknown action types', () => {
+ const initialState = { dashboard: 'existing data' };
+ const action = { type: 'UNKNOWN_ACTION' };
+ const newState = weeklyDashboardDataReducer(initialState, action);
+ expect(newState).toEqual(initialState);
+ });
+});
diff --git a/src/reducers/__tests__/weeklySummariesReportReducer.test.js b/src/reducers/__tests__/weeklySummariesReportReducer.test.js
new file mode 100644
index 0000000000..0e87a93194
--- /dev/null
+++ b/src/reducers/__tests__/weeklySummariesReportReducer.test.js
@@ -0,0 +1,87 @@
+import {
+ FETCH_SUMMARIES_REPORT_BEGIN,
+ FETCH_SUMMARIES_REPORT_SUCCESS,
+ FETCH_SUMMARIES_REPORT_ERROR,
+ UPDATE_SUMMARY_REPORT,
+} from '../../constants/weeklySummariesReport';
+import { weeklySummariesReportReducer } from '../weeklySummariesReportReducer';
+
+describe('weeklySummariesReportReducer', () => {
+ const initialState = {
+ summaries: [],
+ loading: false,
+ error: null,
+ };
+
+ it('should return the initial state when no valid action is provided', () => {
+ expect(weeklySummariesReportReducer(undefined, {})).toEqual(initialState);
+ });
+
+ it('should handle FETCH_SUMMARIES_REPORT_BEGIN', () => {
+ const action = { type: FETCH_SUMMARIES_REPORT_BEGIN };
+ const expectedState = {
+ ...initialState,
+ loading: true,
+ error: null,
+ };
+ expect(weeklySummariesReportReducer(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle FETCH_SUMMARIES_REPORT_SUCCESS', () => {
+ const mockSummaries = [
+ { _id: '1', data: 'summary1' },
+ { _id: '2', data: 'summary2' },
+ ];
+ const action = {
+ type: FETCH_SUMMARIES_REPORT_SUCCESS,
+ payload: { weeklySummariesData: mockSummaries },
+ };
+ const expectedState = {
+ ...initialState,
+ loading: false,
+ summaries: mockSummaries,
+ };
+ expect(weeklySummariesReportReducer(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle FETCH_SUMMARIES_REPORT_ERROR', () => {
+ const mockError = 'Failed to fetch summaries.';
+ const action = {
+ type: FETCH_SUMMARIES_REPORT_ERROR,
+ payload: { error: mockError },
+ };
+ const expectedState = {
+ ...initialState,
+ loading: false,
+ error: mockError,
+ };
+ expect(weeklySummariesReportReducer(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle UPDATE_SUMMARY_REPORT', () => {
+ const initialStateWithSummaries = {
+ summaries: [
+ { _id: '1', data: 'summary1' },
+ { _id: '2', data: 'summary2' },
+ ],
+ loading: false,
+ error: null,
+ };
+
+ const updatedField = { data: 'updatedSummary2' };
+ const action = {
+ type: UPDATE_SUMMARY_REPORT,
+ payload: { _id: '2', updatedField },
+ };
+
+ const expectedState = {
+ ...initialStateWithSummaries,
+ summaries: [
+ { _id: '1', data: 'summary1' },
+ { _id: '2', data: 'updatedSummary2' },
+ ],
+ };
+
+ expect(weeklySummariesReportReducer(initialStateWithSummaries, action)).toEqual(expectedState);
+ });
+});
diff --git a/src/reducers/warningsReducer.js b/src/reducers/warningsReducer.js
index 10a5c9c11e..f5ab5a828b 100644
--- a/src/reducers/warningsReducer.js
+++ b/src/reducers/warningsReducer.js
@@ -2,6 +2,9 @@ import {
GET_WARNINGS_BY_USER_ID,
POST_WARNINGS_BY_USER_ID,
DELETE_WARNINGS_BY_USER_ID,
+ CURRENT_WARNINGS,
+ POST_NEW_WARNING,
+ EDIT_WARNING_DESCRIPTION,
} from '../constants/warning';
export const warningsByUserIdReducer = (state = [], action) => {
@@ -14,6 +17,12 @@ export const warningsByUserIdReducer = (state = [], action) => {
...state,
...action.payload,
};
+ case EDIT_WARNING_DESCRIPTION:
+ return action.payload;
+ case CURRENT_WARNINGS:
+ return action.payload;
+ case POST_NEW_WARNING:
+ return action.payload;
case DELETE_WARNINGS_BY_USER_ID:
return action.payload;
diff --git a/src/routes.js b/src/routes.js
index 0823aed610..d22fdd3443 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -27,7 +27,8 @@ import ForgotPassword from './components/Login/ForgotPassword';
import Inventory from './components/Inventory';
import EmailSubscribeForm from './components/EmailSubscribeForm';
import UnsubscribeForm from './components/EmailSubscribeForm/Unsubscribe';
-import { EmailSender } from './components/common/EmailSender/EmailSender';
+import NotFoundPage from './components/NotFound/NotFoundPage';
+import { EmailSender } from './components/common/EmailSender/EmailSender';
import Collaboration from './components/Collaboration';
// BM Dashboard
@@ -41,6 +42,19 @@ import ToolDetailPage from './components/BMDashboard/Tools/ToolDetailPage';
import CheckTypes from './components/BMDashboard/shared/CheckTypes';
import Toolslist from './components/BMDashboard/Tools/ToolsList';
import AddTool from './components/BMDashboard/Tools/AddTool';
+
+
+// Community Portal
+import CPProtectedRoute from './components/common/CPDashboard/CPProtectedRoute';
+import CPLogin from './components/CommunityPortal/Login';
+import CPDashboard from './components/CommunityPortal';
+import ActivityList from './components/CommunityPortal/Activities/ActivityList';
+// import AddActivities from './components/CommunityPortal/Activities/AddActivities';
+// import ActvityDetailPage from './components/CommunityPortal/Activities/ActivityDetailPage';
+
+
+
+
// eslint-disable-next-line import/order, import/no-unresolved
import LogTools from './components/BMDashboard/LogTools/LogTools';
@@ -103,6 +117,8 @@ export default (
{/* Comment out the Header component and its import during phase 2 development. */}
{/* Uncomment BMHeader and its import during phase 2 development. */}
+
+
{/*
*/}
@@ -111,9 +127,9 @@ export default (
{
- const {userId} = props.match.params;
- return
+ {
+ const { userId } = props.match.params;
+ return