From 5e5c161ca7e27892caef8ad508a9b2abca9d0193 Mon Sep 17 00:00:00 2001
From: Glen Wider <skyhigh4@web.de>
Date: Tue, 27 Apr 2021 16:30:44 +0200
Subject: [PATCH] add showComments prop to CodeReview

---
 src/components/CodeLine.tsx            | 22 ++++++++++++++--------
 src/components/CodeReview.tsx          |  7 +++++--
 src/components/CodeReviewCard.tsx      |  5 ++++-
 src/stories/CodeReviewCard.stories.tsx |  3 +++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/CodeLine.tsx b/src/components/CodeLine.tsx
index 13b4298..8c223ae 100644
--- a/src/components/CodeLine.tsx
+++ b/src/components/CodeLine.tsx
@@ -58,6 +58,7 @@ export interface CodeLineProps {
     commentThread: boolean,
     comments: CustomComment[]
     onReplyCreated: (value: string) => void
+    showComments: boolean
 }
 
 export const CodeLine: React.FC<CodeLineProps> = ({line,
@@ -69,7 +70,8 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
                                                       severeInfo,
                                                       commentThread,
                                                       comments,
-                                                      onReplyCreated
+                                                      onReplyCreated,
+                                                      showComments
                                                       }) => {
 
     // isShown manages visibility of addButton
@@ -82,6 +84,9 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
 
     // returns the right padding value depending on the number of annotations present
     const getPaddingLeft = () => {
+        if(!showComments) {
+            return 4.3
+        }
         if((commentThread && !(mildInfo || severeInfo))
             || (mildInfo && !(commentThread ||severeInfo))
             || (severeInfo && !(commentThread || mildInfo))) {
@@ -134,7 +139,8 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
                   data-testid={"line" + lineNo}
             >
                 <div className="lineLeft">
-                    {isShown && (
+
+                    {(isShown && showComments) && (
                         <>
                             <Button icon={<PlusOutlined style={{paddingLeft: "0.1em"}}/>}
                                     size="small"
@@ -145,7 +151,7 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
                         </>
                     )}
 
-                    {severeInfo && (
+                    {(severeInfo && showComments) && (
                         <ExclamationCircleTwoTone style={{ paddingLeft: "0.15em",paddingRight: "0.15em"}}
                                                   onClick={() => setCollapseState(!collapseState)}
                                                   twoToneColor="#F00E3B"
@@ -153,7 +159,7 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
 
                     )}
 
-                    {mildInfo && (
+                    {(mildInfo && showComments) && (
                         <InfoCircleTwoTone style={{paddingLeft: "0.15em", paddingRight: "0.15em"}}
                                            twoToneColor="#FAC302"
                                            onClick={() => setCollapseState(!collapseState)}
@@ -161,7 +167,7 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
 
                     )}
 
-                    {commentThread && (
+                    {(commentThread && showComments) && (
                         <MessageTwoTone style={{paddingLeft: "0.15em", paddingRight: "0.15em"}}
                                         onClick={() => setCollapseState(!collapseState)}
                         />
@@ -179,7 +185,7 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
                 </LineContent>
             </Line>
 
-            {(commentThread || (commentThread && mildInfo)) &&(
+            {((commentThread || (commentThread && mildInfo)) && showComments) &&(
                 <div data-testid={"commentViewer" + lineNo}>
                     <CommentViewer comments={comments}
                                    toggle={collapseState}
@@ -189,7 +195,7 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
                 </div>
             )}
 
-            {(mildInfo && !commentThread) &&(
+            {((mildInfo && !commentThread) && showComments) &&(
                 <div data-testid={"commentViewer" + lineNo}>
                     <CommentViewer comments={comments}
                                    toggle={collapseState}
@@ -200,7 +206,7 @@ export const CodeLine: React.FC<CodeLineProps> = ({line,
             )}
 
 
-            {isEditorShown && (
+            {(isEditorShown && showComments) && (
                 <CommentEditor onCancel={() => setIsEditorShown(false)}
                                line={lineNo}
                                onSubmit={(value) => {
diff --git a/src/components/CodeReview.tsx b/src/components/CodeReview.tsx
index f33ac40..8f612f1 100644
--- a/src/components/CodeReview.tsx
+++ b/src/components/CodeReview.tsx
@@ -13,6 +13,7 @@ export interface CodeReviewProps {
     onCommentCreated: (comment: CustomComment) => void;
     author: string;
     showResult: boolean;
+    showComments: boolean;
 }
 
 export const CodeReview: React.FC<CodeReviewProps> = ({
@@ -21,7 +22,8 @@ export const CodeReview: React.FC<CodeReviewProps> = ({
                                                           commentContainer,
                                                           onCommentCreated,
                                                           author,
-                                                          showResult
+                                                          showResult,
+                                                          showComments
 }) => {
     const [linesWithComment, setLinesWithComment] = useState<number[]>(new Array<number>());
     const [linesWithMildInfo, setLinesWithMildInfo] = useState<number[]>(new Array<number>())
@@ -112,13 +114,14 @@ export const CodeReview: React.FC<CodeReviewProps> = ({
                                           commentThread={linesWithComment.includes(i)}
                                           comments={getCommentsOfLine(i)}
                                           onReplyCreated={(value) => onCommentCreated(createComment(value, author, i))}
+                                          showComments={showComments}
                                 />
                             </div>
                         ))}
                     </Pre>
                 )}
             </Highlight>
-            {showResult && (
+            {(showResult && showComments) && (
                 <div style={{paddingLeft: "0.5em", paddingRight: "0.5em", paddingTop: "1em"}}>
                     <CommentViewer comments={getResults()}
                                    result={true}
diff --git a/src/components/CodeReviewCard.tsx b/src/components/CodeReviewCard.tsx
index 1b5de15..137d29e 100644
--- a/src/components/CodeReviewCard.tsx
+++ b/src/components/CodeReviewCard.tsx
@@ -20,6 +20,7 @@ export interface CodeReviewCardProps {
     onCommentCreated: (comment: CustomComment) => void;
     author: string;
     showResult: boolean;
+    showComments: boolean;
 }
 
 export const CodeReviewCard: React.FC<CodeReviewCardProps> = ({
@@ -29,7 +30,8 @@ export const CodeReviewCard: React.FC<CodeReviewCardProps> = ({
                                                                   language,
                                                                   commentContainer,
                                                                   onCommentCreated, author,
-                                                                  showResult
+                                                                  showResult,
+                                                                  showComments
 }) => {
     return (
             <Card style={{ width: width }}
@@ -44,6 +46,7 @@ export const CodeReviewCard: React.FC<CodeReviewCardProps> = ({
                             commentContainer={commentContainer}
                             onCommentCreated={onCommentCreated}
                             showResult={showResult}
+                            showComments={showComments}
                 />
             </Card>
         )
diff --git a/src/stories/CodeReviewCard.stories.tsx b/src/stories/CodeReviewCard.stories.tsx
index 2cafc6e..d46ef98 100644
--- a/src/stories/CodeReviewCard.stories.tsx
+++ b/src/stories/CodeReviewCard.stories.tsx
@@ -146,6 +146,7 @@ jsx.args = {
     onCommentCreated: handleCommentCreatedJsx,
     width: 500,
     title: "testReview.jsx",
+    showComments: true
 
 }
 
@@ -159,6 +160,7 @@ css.args = {
     onCommentCreated: handleCommentCreatedCss,
     width: 600,
     title: "layout.css",
+    showComments: true
 }
 
 export const cpp = Template.bind({});
@@ -171,4 +173,5 @@ cpp.args = {
     onCommentCreated: handleCommentCreatedCpp,
     width: 500,
     title: "matrix.cpp",
+    showComments: false
 }
\ No newline at end of file