diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index 1ef71f6c6df..f91512e52c2 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -10,6 +10,7 @@ import { } from '~/utils/constants'; import { cantUpdateDevAdminDetails } from '~/utils/permissions'; import '../../App.module.css'; +import FeedbackModal from '../FeedbackModal/FeedbackModal'; import Leaderboard from '../LeaderBoard'; import SummaryBar from '../SummaryBar/SummaryBar'; import Timelog from '../Timelog/Timelog'; @@ -87,7 +88,7 @@ export function Dashboard(props) { return ( - {/* */} + `${user.firstName} ${user.lastName}`; -const isValidMemberName = (member, allUsers) => +const isInvalidMemberName = (member, allUsers) => member.name.trim() !== '' && !allUsers.some(u => getFullName(u).toLowerCase() === member.name.trim().toLowerCase()); @@ -55,14 +55,11 @@ function FeedbackModal() { const checkHelpRequest = async () => { try { const response = await axios.get(ENDPOINTS.QUESTIONNAIRE_CHECK_MODAL(userProfile._id)); - if (response.data.showModal) { - setIsOpen(true); - } else { - setIsOpen(false); - } + setIsOpen(Boolean(response.data?.showModal)); } catch (error) { // eslint-disable-next-line no-console console.error('Error checking help request:', error); + toast.error('Unable to check for pending feedback. Please refresh and try again.'); setIsOpen(false); } }; @@ -101,18 +98,13 @@ function FeedbackModal() { // Validate that all filled member names are valid users from the list const allUsers = [...activeUsers, ...inactiveUsers]; - const invalidActive = ratedMembers.find(m => isValidMemberName(m, allUsers)); - const invalidInactive = inactiveRatedMembers.find(m => isValidMemberName(m, allUsers)); + const invalidActive = ratedMembers.some(m => isInvalidMemberName(m, allUsers)); + const invalidInactive = inactiveRatedMembers.some(m => isInvalidMemberName(m, allUsers)); if (invalidActive || invalidInactive) { toast.warn('Please select valid members from the dropdown only.'); return; } - console.log('allUsers:', allUsers); - console.log('ratedMembers:', ratedMembers); - console.log('invalidActive:', invalidActive); - console.log('invalidInactive:', invalidInactive); - setIsSubmitting(true); try { diff --git a/src/utils/URL.js b/src/utils/URL.js index 7ba42ec5e0c..1e286cf973f 100644 --- a/src/utils/URL.js +++ b/src/utils/URL.js @@ -86,6 +86,7 @@ export const ENDPOINTS = { `${APIEndpoint}/dashboard/leaderboard/trophyIcon/${userId}/${trophyFollowedUp}`, // Questionnaire endpoints + QUESTIONNAIRE_CHECK_MODAL: userId => `${APIEndpoint}/dashboard/questionaire/checkModal/${userId}`, QUESTIONNAIRE_FEEDBACK_REQUEST: () => `${APIEndpoint}/dashboard/questionaire/feedbackrequest`, QUESTIONNAIRE_CLOSE_PERMANENTLY: () => `${APIEndpoint}/dashboard/questionaire/checkUserFoundHelpSomewhere`,