Disallow empty notes and comments (#2525)

ohcnetwork · Jun 4, 2022 · 9f92a70 · 9f92a70
1 parent 39c9dcc
commit 9f92a70
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/Components/Patient/PatientNotes.tsx b/src/Components/Patient/PatientNotes.tsx
@@ -25,15 +25,15 @@ const PatientNotes = (props: PatientNotesProps) => {
   const { patientId, facilityId } = props;
 
   const dispatch: any = useDispatch();
-  let initialData: any = { notes: [], cPage: 1, count: 1 };
+  const initialData: any = { notes: [], cPage: 1, count: 1 };
   const [state, setState] = useState(initialData);
   const [noteField, setNoteField] = useState("");
   const [isLoading, setIsLoading] = useState(true);
   const [facilityName, setFacilityName] = useState("");
   const [patientName, setPatientName] = useState("");
 
   const fetchData = useCallback(
-    async (page: number = 1, status: statusType = { aborted: false }) => {
+    async (page = 1, status: statusType = { aborted: false }) => {
       setIsLoading(true);
       const res = await dispatch(
         getPatientNotes(props.patientId, pageSize, (page - 1) * pageSize)
@@ -84,7 +84,13 @@ const PatientNotes = (props: PatientNotesProps) => {
     const payload = {
       note: noteField,
     };
-    dispatch(addPatientNote(props.patientId, payload)).then((res: any) => {
+    if (!/\S+/.test(noteField)) {
+      Notification.Error({
+        msg: "Note Should Contain At Least 1 Character",
+      });
+      return;
+    }
+    dispatch(addPatientNote(props.patientId, payload)).then(() => {
       Notification.Success({ msg: "Note added successfully" });
       fetchData();
     });
@@ -123,7 +129,10 @@ const PatientNotes = (props: PatientNotesProps) => {
         <h3 className="text-lg">Added Notes</h3>
         <div className="w-full">
           {state.notes.map((note: any) => (
-            <div className="flex p-4 bg-white rounded-lg text-gray-800 mt-4 flex-col w-full border border-gray-300">
+            <div
+              key={note.id}
+              className="flex p-4 bg-white rounded-lg text-gray-800 mt-4 flex-col w-full border border-gray-300"
+            >
               <div className="flex  w-full ">
                 <p className="text-justify">{note.note}</p>
               </div>

diff --git a/src/Components/Resource/CommentSection.tsx b/src/Components/Resource/CommentSection.tsx
@@ -56,6 +56,12 @@ const CommentSection = (props: CommentSectionProps) => {
     const payload = {
       comment: commentBox,
     };
+    if (!/\S+/.test(commentBox)) {
+      Notification.Error({
+        msg: "Comment Should Contain At Least 1 Character",
+      });
+      return;
+    }
     dispatch(addResourceComments(props.id, payload)).then((_: any) => {
       Notification.Success({ msg: "Comment added successfully" });
       fetchData();

diff --git a/src/Components/Shifting/CommentsSection.tsx b/src/Components/Shifting/CommentsSection.tsx
@@ -40,9 +40,9 @@ const CommentSection = (props: CommentSectionProps) => {
     const payload = {
       comment: commentBox,
     };
-    if (commentBox.length < 1) {
+    if (!/\S+/.test(commentBox)) {
       Notification.Error({
-        msg: "Comment Should Contain At Least 1 Characters",
+        msg: "Comment Should Contain At Least 1 Character",
       });
       return;
     }