github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-11 14:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: [code:1502] handle pr activity open->draft (#1083)

Browse Source
This commit is contained in:
Ritik Kapoor 2024-03-02 12:37:05 +00:00 committed by Harness
parent db029afa4d
commit c4127c986c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/i18n/strings.en.yaml
View File

@ -286,7 +286,7 @@ pr:
prBranchPushInfo: '{user} pushed a new commit {commit}' prBranchPushInfo: '{user} pushed a new commit {commit}'
prBranchDeleteInfo: '{user} deleted the source branch with latest commit {commit}' prBranchDeleteInfo: '{user} deleted the source branch with latest commit {commit}'
prStateChanged: '{user} changed pull request state from {old} to {new}.' prStateChanged: '{user} changed pull request state from {old} to {new}.'
prStateChangedDraft: '{user} opened pull request for review.' prStateChangedDraft: '{user} {changedToDraft|true:marked pull request as draft.,opened pull request for review.}'
titleChanged: '{user} changed title from {old} to {new}.' titleChanged: '{user} changed title from {old} to {new}.'
titleChangedTable: | titleChangedTable: |
### Other title changes in history ### Other title changes in history

6
web/src/pages/PullRequest/Conversation/SystemComment.tsx
View File

@ -209,15 +209,17 @@ export const SystemComment: React.FC<SystemCommentProps> = ({ pullReqMetadata, c
case CommentType.STATE_CHANGE: { case CommentType.STATE_CHANGE: {
const openFromDraft = const openFromDraft =
(payload?.payload as Unknown)?.old_draft === true && (payload?.payload as Unknown)?.new_draft === false (payload?.payload as Unknown)?.old_draft === true && (payload?.payload as Unknown)?.new_draft === false
const changedToDraft =
(payload?.payload as Unknown)?.old_draft === false && (payload?.payload as Unknown)?.new_draft === true
return ( return (
<Container> <Container>
<Layout.Horizontal spacing="small" style={{ alignItems: 'center' }} className={css.mergedBox}> <Layout.Horizontal spacing="small" style={{ alignItems: 'center' }} className={css.mergedBox}>
<Avatar name={payload?.author?.display_name} size="small" hoverCard={false} /> <Avatar name={payload?.author?.display_name} size="small" hoverCard={false} />
<Text> <Text>
<StringSubstitute <StringSubstitute
str={getString(openFromDraft ? 'pr.prStateChangedDraft' : 'pr.prStateChanged')} str={getString(openFromDraft || changedToDraft ? 'pr.prStateChangedDraft' : 'pr.prStateChanged')}
vars={{ vars={{
changedToDraft,
user: <strong>{payload?.author?.display_name}</strong>, user: <strong>{payload?.author?.display_name}</strong>,
old: <strong>{(payload?.payload as Unknown)?.old}</strong>, old: <strong>{(payload?.payload as Unknown)?.old}</strong>,
new: <strong>{(payload?.payload as Unknown)?.new}</strong> new: <strong>{(payload?.payload as Unknown)?.new}</strong>