Skip to content
This repository has been archived by the owner on Oct 20, 2023. It is now read-only.

CommentBox update in Presentation mode #160

Merged
merged 6 commits into from
Jul 26, 2023
Merged

CommentBox update in Presentation mode #160

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ce0a34
edit/reply/delete comments in presentation mode
sharplessHQ Jul 12, 2023
9fde5d9
Merge remote-tracking branch 'origin' into presentation-comment-edit
sharplessHQ Jul 12, 2023
9798798
allow edit comment only
sharplessHQ Jul 13, 2023
e9bd400
disable editting tag in ppt mode
sharplessHQ Jul 18, 2023
ed4c471
keep staging tags in edit mode
sharplessHQ Jul 20, 2023
50545a5
Merge branch 'develop' into presentation-comment-edit
GoldingAustin Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions applications/client/src/views/Campaign/Explore/components/Comment/CommentBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@ export const CommentBox = observer<CommentBoxProps>(

const isRedTeam = !store.appMeta.blueTeam;
const isPresentationMode = store.router.params.view === CampaignViews.PRESENTATION;
const showEditButtons = !isPresentationMode && isRedTeam;
const allowReply = isFullList && isRedTeam;
const showEditButtons = isRedTeam;
const allowReply = !isPresentationMode && isFullList && isRedTeam;
const allowEdit =
(store.auth.userName === annotation?.user || !annotation?.user) && !isAddingCommandToComment && isRedTeam;
const isGrouped = (state.currentCommandIds?.length || 0) > 1;
Expand Down Expand Up @@ -658,7 +658,7 @@ export const CommentBox = observer<CommentBoxProps>(
/>
)}
{allowReply && <Button cy-test="reply" minimal small onClick={() => reply?.()} text="Reply" />}
{allowEdit && (
{allowEdit && !isPresentationMode && (
<>
<Button
cy-test="delete-comment"
Expand Down