From 6f5c5f01cf90f853d285321e2b20a6b28a2a67eb Mon Sep 17 00:00:00 2001 From: Christian Aranas Date: Tue, 21 Nov 2023 22:43:29 +0800 Subject: [PATCH] Bugfixes on FeedbackAnalytics User comments Filter feedbacks with empty comments Changed format from accordion to list --- .../AdminTools/FeedbackAnalytics/index.js | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src-frontend-react/src/components/AdminTools/FeedbackAnalytics/index.js b/src-frontend-react/src/components/AdminTools/FeedbackAnalytics/index.js index 377ca3a..c8b63e8 100644 --- a/src-frontend-react/src/components/AdminTools/FeedbackAnalytics/index.js +++ b/src-frontend-react/src/components/AdminTools/FeedbackAnalytics/index.js @@ -1,7 +1,6 @@ import moment from 'moment'; import { useEffect, useState } from 'react'; -import { Accordion, Card } from 'react-bootstrap'; -import AccordionItem from 'react-bootstrap/esm/AccordionItem'; +import { Card, ListGroup, ListGroupItem } from 'react-bootstrap'; import { PieChart } from 'react-minimal-pie-chart'; import { toast } from 'react-toastify'; import { socket } from '../../../socket'; @@ -85,21 +84,21 @@ const FeedbackAnalytics = () => {
- - {feedbacks.map((feedback) => { +

{' '}User Comments

+ + {feedbacks.filter((feedback) => feedback.feedbackText.trim().length !== 0).map((feedback) => { const user = feedback.user - return ( - - - {`[${user.type}] ${user.lname}, ${user.fname} ${user.mname} (${moment(feedback.createdAt).format('MMM DD, YYYY hh:mm A')})`} - - {feedback.feedbackText} - - + +

+ {`[${user.type}] ${user.lname}, ${user.fname} ${user.mname} (${moment(feedback.createdAt).format('MMM DD, YYYY hh:mm A')})`} +

+ {feedback.feedbackText} +
) })} -
+ {feedbacks.filter((feedback) => feedback.feedbackText.trim().length !== 0).length === 0 ? "Nothing to show." : ''} +