SUCCESS - Merge pull request #60 from 5-Bits-in-a-Byte/rolesRefactor

Roles refactor merge with main
5-Bits-in-a-Byte · Jul 20, 2021 · cc923b9 · cc923b9
2 parents 65b1b0b + 4d2ed94
commit cc923b9
Show file tree

Hide file tree

Showing 24 changed files with 797 additions and 341 deletions.
diff --git a/client/src/components/comments/Comment.js b/client/src/components/comments/Comment.js
@@ -171,7 +171,7 @@ const Comment = ({ comment, isDraft, callback }) => {
   const generateDropdownOptions = () => {
     if (userRole) {
       let deleteOption =
-        userRole.delete.postComment &&
+        userRole.delete.comment &&
         (comment.postedBy._id == user._id ||
           comment.postedBy._id == user.anonymousId)
           ? {
@@ -180,7 +180,7 @@ const Comment = ({ comment, isDraft, callback }) => {
             }
           : null;
       let editOption =
-        userRole.edit.postComment &&
+        userRole.edit.comment &&
         (comment.postedBy._id == user._id ||
           comment.postedBy._id == user.anonymousId)
           ? { onClick: handleEdit, label: "Edit Comment" }
@@ -277,21 +277,25 @@ const Comment = ({ comment, isDraft, callback }) => {
               </>
             ) : (
               <>
-                <Reaction
-                  reactions={comment.reactions}
-                  type="comment"
-                  id={comment._id}
-                  postid={postid}
-                />
-
-                <ReplyBtn
-                  style={{ marginRight: 10, marginLeft: 20 }}
-                  onClick={() => {
-                    toggleReply(true);
-                  }}
-                >
-                  Reply
-                </ReplyBtn>
+                {userRole.participation.reactions && (
+                  <Reaction
+                    reactions={comment.reactions}
+                    type="comment"
+                    id={comment._id}
+                    postid={postid}
+                  />
+                )}
+
+                {userRole.publish.reply && (
+                  <ReplyBtn
+                    style={{ marginRight: 10, marginLeft: 20 }}
+                    onClick={() => {
+                      toggleReply(true);
+                    }}
+                  >
+                    Reply
+                  </ReplyBtn>
+                )}
               </>
             )}
           </MetaIconWrapper>

diff --git a/client/src/components/comments/CommentReply.js b/client/src/components/comments/CommentReply.js
@@ -232,12 +232,14 @@ const CommentReply = ({
             </>
           ) : (
             <>
-              <Reaction
-                reactions={reply.reactions}
-                type="reply"
-                id={reply._id}
-                postid={postid}
-              />
+              {userRole.participation.reactions && (
+                <Reaction
+                  reactions={reply.reactions}
+                  type="reply"
+                  id={reply._id}
+                  postid={postid}
+                />
+              )}
             </>
           )}
         </MetaIconWrapper>

diff --git a/client/src/components/comments/CommentView.js b/client/src/components/comments/CommentView.js
@@ -58,7 +58,7 @@ const CommentView = ({ classroomName }) => {
 
   // const setUserRole = useContext(UserRoleDispatchContext);
   const userRole = useContext(UserRoleContext);
-  // console.log("Comment View Role Object: ", userRole);
+  console.log("Comment View Role Object: ", userRole);
 
   const handleVote = (voteAnswer) => {
     var pa = pollAns;
@@ -233,13 +233,13 @@ const CommentView = ({ classroomName }) => {
                 >
                   <Button secondary>Back to all Posts</Button>
                 </Link>
-                {postExists && (
+                {postExists && userRole.publish.comment && (
                   <Button onClick={draftNewComment} secondary>
-                    Reply to Post
+                    Comment on Post
                   </Button>
                 )}
               </OptionsContainer>
-              {postid === "newQorA" && <Draft />}
+              {postid === "newQorA" && <Draft userRole={userRole} />}
               {/* {postid === "newPoll" && <DraftPoll />} */}
               {postid === "newPoll" && <PollConfig />}
               {postExists &&