Skip to content

Jaden - Fix: HGN Feedback Modal not showing due to missing render and endpoint (DONE Jaden) #5549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jaden300 wants to merge 6 commits into
base: development
Choose a base branch
from
Open

Jaden - Fix: HGN Feedback Modal not showing due to missing render and endpoint (DONE Jaden) #5549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6bee6fe
fix: render HGN feedback modal and connect check-modal endpoint
Jaden300 Sep 15, 2026
c0fa9f0
fix: avoid masking real check-modal errors as a silent don't-show state
Jaden300 Oct 10, 2026
1485b96
fix: disable mise python attestation check breaking Netlify deploy pr…
Jaden300 Oct 10, 2026
6e5f37c
fix: use .some() instead of .find() for boolean membership checks
Jaden300 Oct 10, 2026
ebf53d9
fix: remove redundant netlify.toml, keep devAdmin fix out of this PR
Jaden300 Oct 16, 2026
4656f4b
Merge remote-tracking branch 'origin/development' into jw_fix_hgn_fee…
Jaden300 Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/Dashboard/Dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -87,7 +88,7 @@ export function Dashboard(props) {

return (
<Container fluid className={darkMode ? 'bg-oxford-blue' : ''}>
{/* <FeedbackModal /> */}
<FeedbackModal />
<SummaryBar
displayUserId={displayUserId}
toggleSubmitForm={toggle}
Expand Down
18 changes: 5 additions & 13 deletions src/components/FeedbackModal/FeedbackModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import StarRating from './StarRating';

const getFullName = user => `${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());

Expand Down Expand Up @@ -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);
}
};
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions src/utils/URL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down
Loading