diff --git a/web/src/framework/strings/stringTypes.ts b/web/src/framework/strings/stringTypes.ts index 0c8271b0f..349bdec69 100644 --- a/web/src/framework/strings/stringTypes.ts +++ b/web/src/framework/strings/stringTypes.ts @@ -903,6 +903,7 @@ export interface StringsMap { 'prReview.codeowners': string 'prReview.defaultReviewers': string 'prReview.filterByReviews': string + 'prReview.labelsAssigned': string 'prReview.removed': string 'prReview.requested': string 'prReview.selfAssigned': string diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml index a8d7091ad..97cc60e3f 100644 --- a/web/src/i18n/strings.en.yaml +++ b/web/src/i18n/strings.en.yaml @@ -390,6 +390,7 @@ prReview: filterByReviews: Filter by Reviews codeowners: '{author} requested review from {codeowners} as {count|1:code owner,code owners}' defaultReviewers: '{author} requested review from {reviewers} as {count|1:default reviewer,default reviewers}' + labelsAssigned: '{count|0:label,labels}' webhookListingContent: 'create,delete,deployment ...' general: 'General' webhooks: 'Webhooks' diff --git a/web/src/pages/PullRequest/Conversation/SystemComment.tsx b/web/src/pages/PullRequest/Conversation/SystemComment.tsx index af66f8905..5c07b7d90 100644 --- a/web/src/pages/PullRequest/Conversation/SystemComment.tsx +++ b/web/src/pages/PullRequest/Conversation/SystemComment.tsx @@ -31,7 +31,7 @@ import { CommitActions } from 'components/CommitActions/CommitActions' import { PipeSeparator } from 'components/PipeSeparator/PipeSeparator' import { TimePopoverWithLocal } from 'utils/timePopoverLocal/TimePopoverWithLocal' import { Label } from 'components/Label/Label' -import { CommentType } from '../PullRequestUtils' +import { ActivityLabel, CommentType } from '../PullRequestUtils' import css from './Conversation.module.scss' interface SystemCommentProps extends Pick { @@ -76,6 +76,51 @@ const formatListWithAndFragment = (names: string[]): React.ReactNode => { } } +const RenderScopedLabel = ({ labelObj }: { labelObj: ActivityLabel }) => { + return ( +