Merge pull request #5398 from bcgov/test-rook-AS-FOIMOD-2982

FOIMOD-2982-Comments Tab - Type of Comments (Peer Review, Internal, General)-Applicant correspondence fix
bcgov · Sep 5, 2024 · 1c67d46 · 1c67d46
2 parents c2c1bc9 + 706877f
commit 1c67d46
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/forms-flow-web/src/components/FOI/customComponents/Comments/CommentStructure.js b/forms-flow-web/src/components/FOI/customComponents/Comments/CommentStructure.js
@@ -70,7 +70,7 @@ const CommentStructure = ({ i, reply, parentId, totalcommentCount, currentIndex,
 
   const getHtmlfromRawContent = () => {
     let markup = null
-    if (i.commentTypeId !== 2 && i.commentTypeId !== 3) {
+    if (i.commentTypeId != null && i.commentTypeId !== 2 && i.commentTypeId !== 3) {
       const rawContentFromStore = convertFromRaw(JSON.parse(i.text))
       let initialEditorState = EditorState.createWithContent(rawContentFromStore);
 
@@ -267,7 +267,7 @@ const CommentStructure = ({ i, reply, parentId, totalcommentCount, currentIndex,
           <div className="commentsTwo">
 
             <div className="fullName">{fullName} </div> |  <div className="commentdate">{i.date} </div> 
-            {(i.commentTypeId !== 2 && i.commentTypeId !== 3 && (parentId == null || parentId == undefined)) &&
+            {(i.commentTypeId != null && i.commentTypeId !== 2 && i.commentTypeId !== 3 && (parentId == null || parentId == undefined)) &&
               <div>
                 <Chip
                     item
@@ -293,7 +293,7 @@ const CommentStructure = ({ i, reply, parentId, totalcommentCount, currentIndex,
         </div>
         <div className="userActions">
           <div>
-            {(isEmail || ((i.commentTypeId !== 2 && i.commentTypeId !== 3) && actions.userId === i.userId && actions.user)) && (
+            {(isEmail || ((i.commentTypeId != null && i.commentTypeId !== 2 && i.commentTypeId !== 3) && actions.userId === i.userId && actions.user)) && (
                 <>
                     <IconButton
                     aria-label= "actions"