-
Notifications
You must be signed in to change notification settings - Fork 21
feat(PM-2177) Added reply button and ability to add comments #1327
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
...ents/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| import { FC, useCallback, useState } from 'react' | ||
| import { mutate } from 'swr' | ||
| import classNames from 'classnames' | ||
| import moment from 'moment' | ||
|
|
||
| import { useReviewsContext } from '~/apps/review/src/pages/reviews/ReviewsContext' | ||
| import { createFeedbackComment } from '~/apps/review/src/lib/services' | ||
| import { AiFeedbackItem, ReviewsContextModel } from '~/apps/review/src/lib/models' | ||
| import { EnvironmentConfig } from '~/config' | ||
|
|
||
| import { AiFeedbackActions } from '../AiFeedbackActions/AiFeedbackActions' | ||
| import { AiFeedbackReply } from '../AiFeedbackReply/AiFeedbackReply' | ||
| import { MarkdownReview } from '../../../../MarkdownReview' | ||
|
|
||
| import { AiFeedbackComment as AiFeedbackCommentType, AiFeedbackComments } from './AiFeedbackComments' | ||
| import styles from './AiFeedbackComments.module.scss' | ||
|
|
||
| interface AiFeedbackCommentProps { | ||
| comment: AiFeedbackCommentType | ||
| feedback: AiFeedbackItem | ||
| isRoot: boolean | ||
| } | ||
|
|
||
| export const AiFeedbackComment: FC<AiFeedbackCommentProps> = props => { | ||
| const { workflowId, workflowRun }: ReviewsContextModel = useReviewsContext() | ||
| const [showReply, setShowReply] = useState(false) | ||
|
|
||
| const onShowReply = useCallback(() => { | ||
| setShowReply(!showReply) | ||
| }, []) | ||
|
|
||
| const onSubmitReply = useCallback(async (content: string, comment: AiFeedbackCommentType) => { | ||
| await createFeedbackComment(workflowId as string, workflowRun?.id as string, props.feedback?.id, { | ||
hentrymartin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| content, | ||
| parentId: comment.id, | ||
| }) | ||
| await mutate(`${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items`) | ||
hentrymartin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| setShowReply(false) | ||
| }, [workflowId, workflowRun?.id, props.feedback?.id]) | ||
| return ( | ||
| <div | ||
| key={props.comment.id} | ||
| className={classNames(styles.comment, { | ||
| [styles.noMarginTop]: !props.isRoot, | ||
| })} | ||
| > | ||
| <div className={styles.info}> | ||
| <span className={styles.reply}>Reply</span> | ||
| <span className={styles.text}> by </span> | ||
| <span | ||
| style={{ | ||
| color: props.comment.createdUser.ratingColor || '#0A0A0A', | ||
hentrymartin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }} | ||
| className={styles.name} | ||
| > | ||
| {props.comment.createdUser.handle} | ||
| </span> | ||
| <span className={styles.text}> on </span> | ||
| <span className={styles.date}> | ||
| { moment(props.comment.createdAt) | ||
| .local() | ||
| .format('MMM DD, hh:mm A')} | ||
| </span> | ||
| </div> | ||
| <MarkdownReview value={props.comment.content} /> | ||
| <AiFeedbackActions | ||
| feedback={props.feedback} | ||
| comment={props.comment} | ||
| actionType='comment' | ||
| onPressReply={onShowReply} | ||
| /> | ||
| { | ||
| showReply && ( | ||
| <AiFeedbackReply | ||
| onSubmitReply={function submitReply(content: string) { | ||
| return onSubmitReply(content, props.comment) | ||
| }} | ||
| onCloseReply={function closeReply() { | ||
| setShowReply(false) | ||
| }} | ||
| /> | ||
| ) | ||
| } | ||
| <AiFeedbackComments comments={props.comment.comments} feedback={props.feedback} isRoot={false} /> | ||
| </div> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...s/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackReply/AiFeedbackReply.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| @import '@libs/ui/styles/includes'; | ||
hentrymartin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| .replyWrapper { | ||
| background-color: #E0E4E8; | ||
| padding: 16px; | ||
| margin-top: 16px; | ||
| .title { | ||
| font-family: "Nunito Sans", sans-serif; | ||
| font-weight: 700; | ||
| color: #0A0A0A; | ||
| margin-bottom: 16px; | ||
| } | ||
| .blockBtns { | ||
| margin-top: 24px; | ||
| .cancelButton { | ||
| margin-left: 16px; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.