From abb199509e06355f79bed00ab28b5215b658679a Mon Sep 17 00:00:00 2001
From: Niqui O'Neill <doneill@ncsu.edu>
Date: Mon, 14 Dec 2020 17:41:04 -0800
Subject: [PATCH] update iscomment check

---
 src/editor/widgets/comment/CommentWidget.jsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/editor/widgets/comment/CommentWidget.jsx b/src/editor/widgets/comment/CommentWidget.jsx
index 5103bc8..100221c 100644
--- a/src/editor/widgets/comment/CommentWidget.jsx
+++ b/src/editor/widgets/comment/CommentWidget.jsx
@@ -9,14 +9,21 @@ const purposeValues = purposes.map(p => p.value);
  * Comments are TextualBodies where the purpose field is either 
  * blank or 'commenting' or 'replying'
  */
-const isComment = body => 
+const isComment = (body, purposenabled) =>
   body.type === 'TextualBody' && (
-    !body.hasOwnProperty('purpose') || purposeValues.indexOf(body.purpose) > -1
+    !body.hasOwnProperty('purpose') || purposeCheck(body.purpose, purposenabled)
   );
-  
 /**
  * The draft reply is a comment body with a 'draft' flag
  */
+const purposeCheck = (purpose, purposenabled) => {
+  if (purposenabled){
+    return purposeValues.indexOf(purpose) > -1
+  } else {
+    return purpose == 'commenting' || purpose == 'replying'
+  }
+}
+
 const getDraftReply = (existingDraft, isReply) => {
   let draft = existingDraft ? existingDraft : {
     type: 'TextualBody', value: '', draft: true
@@ -31,7 +38,7 @@ const getDraftReply = (existingDraft, isReply) => {
 const CommentWidget = props => {
   // All comments (draft + non-draft)
   const all = props.annotation ? 
-    props.annotation.bodies.filter(isComment) : [];
+    props.annotation.bodies.filter(body => isComment(body, props.purpose)) : [];
   // Last draft comment without a creator field goes into the reply field
   const draftReply = getDraftReply(all.slice().reverse().find(b => b.draft && !b.creator), all.length > 1); 
   // All except draft reply