From 9c6f1993cf5832af71dcd4f786efec3c51ff316f Mon Sep 17 00:00:00 2001 From: siva venkata naga pavan putti <73236071+pavanputti@users.noreply.github.com> Date: Sat, 3 Jan 2026 19:01:03 -0500 Subject: [PATCH 01/12] Phase 1: Analysis & Planning - Initial branch setup for feedback search fix --- src/components/App.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/App.jsx b/src/components/App.jsx index 8cb7e9dfdc..5c605b7650 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -14,6 +14,8 @@ import { initMessagingSocket } from '../utils/messagingSocket'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import ThemeManager from './common/ThemeManager'; +// TODO: Fix undefined search parameters in Feedback page - Phase 1: Analysis & Planning + const queryClient = new QueryClient({ defaultOptions: { queries: { From d5d7339ab454113d7830c6425155de8e3f43a356 Mon Sep 17 00:00:00 2001 From: siva venkata naga pavan putti <73236071+pavanputti@users.noreply.github.com> Date: Sun, 4 Jan 2026 01:54:49 -0500 Subject: [PATCH 02/12] Add dark mode support and improve search functionality for feedback --- .../activityId/ActivityComments.jsx | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/CommunityPortal/Activities/activityId/ActivityComments.jsx b/src/components/CommunityPortal/Activities/activityId/ActivityComments.jsx index 3a14a647ac..a0e897506d 100644 --- a/src/components/CommunityPortal/Activities/activityId/ActivityComments.jsx +++ b/src/components/CommunityPortal/Activities/activityId/ActivityComments.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect } from 'react'; +import { useSelector } from 'react-redux'; import styles from './ActivityComments.module.css'; // Utility function to calculate relative time @@ -244,6 +245,8 @@ const mockFeedbacks = [ ]; function ActivityComments() { + const darkMode = useSelector(state => state.theme?.darkMode || false); + // Utility function to restore Date objects from localStorage const restoreDates = items => { return items.map(item => ({ @@ -632,11 +635,16 @@ function ActivityComments() { ); }; + /** + * Filter and sort feedbacks based on search, filter, and sort criteria + */ const filteredFeedbacks = feedbacks .filter(feedback => { - const matchesSearch = - feedback.text.toLowerCase().includes(feedbackSearch.toLowerCase()) || - feedback.name.toLowerCase().includes(feedbackSearch.toLowerCase()); + // Search Parameters: reviewer name, feedback text + const searchTerm = feedbackSearch.trim().toLowerCase(); + const reviewerName = (feedback.name || '').toLowerCase(); + const feedbackText = (feedback.text || '').toLowerCase(); + const matchesSearch = reviewerName.includes(searchTerm) || feedbackText.includes(searchTerm); const matchesFilter = feedbackFilter === 'All' || feedback.rating.toString() === feedbackFilter; return matchesSearch && matchesFilter; @@ -1117,16 +1125,18 @@ function ActivityComments() { > setFeedbackSearch(e.target.value)} style={{ flex: 1, minWidth: '200px', padding: '8px 12px', - border: '1px solid #ddd', + border: darkMode ? '1px solid #4a5a77' : '1px solid #ddd', borderRadius: '6px', fontSize: '0.9rem', + backgroundColor: darkMode ? '#3a506b' : '#fff', + color: darkMode ? '#ffffff' : '#222', }} />