diff --git a/src/components/PermissionsManagement/PermissionsConst.js b/src/components/PermissionsManagement/PermissionsConst.js
index 56b8a4d974..4b1f6abd19 100644
--- a/src/components/PermissionsManagement/PermissionsConst.js
+++ b/src/components/PermissionsManagement/PermissionsConst.js
@@ -562,6 +562,17 @@ export const permissionLabels = [
},
],
},
+ {
+ label: 'FAQs',
+ description: 'Category for all permissions related to FAQs',
+ subperms: [
+ {
+ label: 'Manage FAQs',
+ key: 'manageFAQs',
+ description: 'Gives the user permission to add, edit, and delete FAQs.',
+ },
+ ],
+ },
];
export const permissionLabelKeyMappingObj = generatePermissionLabelKeyMapping(permissionLabels, 0);
diff --git a/src/components/Projects/WBS/AddWBS/AddWBS.jsx b/src/components/Projects/WBS/AddWBS/AddWBS.jsx
index f2a6235d0c..cd6453554d 100644
--- a/src/components/Projects/WBS/AddWBS/AddWBS.jsx
+++ b/src/components/Projects/WBS/AddWBS/AddWBS.jsx
@@ -8,22 +8,18 @@ import { connect } from 'react-redux';
import { addNewWBS } from './../../../../actions/wbs';
import hasPermission from 'utils/permissions';
-const AddWBS = props => {
+const AddWBS = (props) => {
const darkMode = props.state.theme.darkMode;
- const [newName, setNewName] = useState('');
- const [showAddButton, setShowAddButton] = useState(false);
+ const [taskTitle, setTaskTitle] = useState('');
const canPostWBS = props.hasPermission('postWbs');
- const changeNewName = value => {
- setNewName(value);
- setShowAddButton(value.length >= 3);
- };
+ const handleSubmit = () => {
+ if (!taskTitle.trim()) return;
- const handleAddWBS = () => {
- if (newName.length >= 3) {
- props.addNewWBS(props.projectId, newName);
- setNewName('');
- setShowAddButton(false);
+ const confirmed = window.confirm(`Add task "${taskTitle}" to the database?`);
+ if (confirmed) {
+ props.addNewWBS(taskTitle, props.projectId);
+ setTaskTitle('');
}
};
@@ -41,14 +37,15 @@ const AddWBS = props => {
className={`form-control ${darkMode ? 'bg-darkmode-liblack border-0 text-light' : ''}`}
aria-label="WBS WBS"
placeholder="WBS Name"
- onChange={e => changeNewName(e.target.value)}
+ value={taskTitle}
+ onChange={(e) => setTaskTitle(e.target.value)}
/>
- {showAddButton ? (
+ {taskTitle.length >= 3 ? (
);
} else if (reviewStatus === 'Submitted') {
- if (
- myRole == 'Owner' ||
- myRole == 'Administrator' ||
- myRole == 'Mentor' ||
- myRole == 'Manager' ||
- canReview
- ) {
+ // First check if it's the user's own task
+ if (user.personId === myUserId) {
return (
{
caret
style={darkMode ? boxStyleDark : boxStyle}
>
- Ready for Review
+ Work Submitted and Awaiting Review
{task.relatedWorkLinks &&
@@ -404,29 +404,16 @@ const ReviewButton = ({ user, task, updateTask }) => {
>
Edit Link
- {
- setSelectedAction('Complete and Remove');
- toggleVerify();
- }}
- className={darkMode ? 'text-light dark-mode-btn' : ''}
- >
- as complete
- and remove task
-
- {
- setSelectedAction('More Work Needed');
- toggleVerify();
- }}
- className={darkMode ? 'text-light dark-mode-btn' : ''}
- >
- More work needed, reset this button
-
);
- } else if (user.personId === myUserId) {
+ } else if (
+ myRole == 'Owner' ||
+ myRole == 'Administrator' ||
+ myRole == 'Mentor' ||
+ myRole == 'Manager' ||
+ canReview
+ ) {
return (
{
caret
style={darkMode ? boxStyleDark : boxStyle}
>
- Work Submitted and Awaiting Review
+ Ready for Review
{task.relatedWorkLinks &&
@@ -454,6 +441,25 @@ const ReviewButton = ({ user, task, updateTask }) => {
>
Edit Link
+ {
+ setSelectedAction('Complete and Remove');
+ toggleVerify();
+ }}
+ className={darkMode ? 'text-light dark-mode-btn' : ''}
+ >
+ as complete
+ and remove task
+
+ {
+ setSelectedAction('More Work Needed');
+ toggleVerify();
+ }}
+ className={darkMode ? 'text-light dark-mode-btn' : ''}
+ >
+ More work needed, reset this button
+
);
@@ -667,6 +673,7 @@ const ReviewButton = ({ user, task, updateTask }) => {
One Community webpage (onecommunityglobal.org)
+ Figma design (figma.com)
diff --git a/src/components/common/ProtectedRoute/ProtectedRoute.jsx b/src/components/common/ProtectedRoute/ProtectedRoute.jsx
index 8b64977ce8..a039448fcf 100644
--- a/src/components/common/ProtectedRoute/ProtectedRoute.jsx
+++ b/src/components/common/ProtectedRoute/ProtectedRoute.jsx
@@ -18,7 +18,7 @@ const ProtectedRoute = ({
const userPermissions = auth.user?.permissions?.frontPermissions || [];
const permissionsAllowed = new Set([...rolePermissions, ...userPermissions]);
let hasPermissionToAccess = routePermissions?.some(perm => permissionsAllowed.has(perm));
-
+
if (Array.isArray(routePermissions)) {
if (rolePermissions?.some(perm => routePermissions.includes(perm))) {
hasPermissionToAccess = true;
diff --git a/src/routes.js b/src/routes.js
index 67220e1a5f..765bd8fa2a 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -17,6 +17,10 @@ import Announcements from 'components/Announcements';
import JobFormBuilder from 'components/Collaboration/JobFormbuilder';
import JobCCDashboard from 'components/JobCCDashboard/JobCCDashboard';
import WeeklyProjectSummary from 'components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary';
+import FaqSearch from 'components/Faq/FaqSearch';
+import FaqManagement from 'components/Faq/FaqManagement';
+import FaqHistory from 'components/Faq/FaqHistory';
+import UnansweredFaqs from 'components/Faq/UnansweredFaqs';
import HeaderRenderer from 'components/Header/HeaderRenderer';
import Page1 from './components/HGNForm/pages/Page1';
import Page2 from './components/HGNForm/pages/Page2';
@@ -51,6 +55,7 @@ import UnsubscribeForm from './components/EmailSubscribeForm/Unsubscribe';
import NotFoundPage from './components/NotFound/NotFoundPage';
import EmailSender from './components/common/EmailSender/EmailSender';
import Collaboration from './components/Collaboration';
+import ApplicantsAgeChart from './components/ApplicantsChart';
// LB Dashboard
import LBProtectedRoute from './components/common/LBDashboard/LBProtectedRoute';
@@ -297,6 +302,8 @@ export default (
routePermissions={RoutePermissions.teams}
/>
+
+
+
+
+
+
+
+
+
+
`${APIEndpoint}/followup/${userId}/${taskId}`,
GET_PROJECT_BY_PERSON: searchName => `${APIEndpoint}/userProfile/projects/${searchName}`,
+ FAQS: `${APIEndpoint}/faqs`,
+ FAQ_BY_ID: faqId => `${APIEndpoint}/faqs/${faqId}`,
+ SEARCH_FAQS: searchQuery => `${APIEndpoint}/faqs/search?q=${searchQuery}`,
+ LOG_UNANSWERED_QUESTION: `${APIEndpoint}/faqs/log-unanswered`,
+ ADD_FAQ: `${APIEndpoint}/faqs`,
+ EDIT_FAQ: faqId => `${APIEndpoint}/faqs/${faqId}`,
+ DELETE_FAQ: faqId => `${APIEndpoint}/faqs/${faqId}`,
+ FAQ_HISTORY: faqId => `${APIEndpoint}/faqs/${faqId}/history`,
+ UNANSWERED_FAQS: `${APIEndpoint}/faqs/unanswered`,
+ DELETE_UNANSWERED_FAQ: faqId => `${APIEndpoint}/faqs/unanswered/${faqId}`,
+
// bm dashboard endpoints
BM_LOGIN: `${APIEndpoint}/bm/login`,
BM_MATERIAL_TYPES: `${APIEndpoint}/bm/invtypes/materials`,
diff --git a/src/utils/routePermissions.js b/src/utils/routePermissions.js
index c59d63c605..d3880cf0bf 100644
--- a/src/utils/routePermissions.js
+++ b/src/utils/routePermissions.js
@@ -34,5 +34,7 @@ const RoutePermissions = {
'suggestTask',
],
announcements: ['sendEmails'],
+ faq: [''],
+ faqManagement: ['manageFAQs'],
};
export default RoutePermissions;