USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: [code-2141]: fix icon color and merge option (#2291) 

* fix: [code-2141]: fix icon color and merge option
pull/3545/head
Calvin Lee 2024-07-26 05:25:58 +00:00 committed by Harness
parent 81fcd524c8
commit eeb4c50af1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
View File

@ -209,9 +209,9 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
if (allowedStrats) {
const matchingMethods = mergeOptions.filter(option => allowedStrats.includes(option.method))
if (matchingMethods.length > 0) {
if (mergeOption && !matchingMethods.includes(mergeOption)) {
if (!matchingMethods.includes(mergeOption)) {
setMergeOption(matchingMethods[0])
} else {
} else if (mergeOption) {
setMergeOption(mergeOption)
}
}

1
web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChangesSection.tsx
View File

@ -227,6 +227,7 @@ const ChangesSection = (props: ChangesSectionProps) => {
title = getString('requestChanges')
statusMessage = getString('pr.requestedChanges', { user: changeReqReviewer })
statusIcon = 'warning-icon'
isNotRequired = true
} else if (approvedEvaluations?.length && approvedEvaluations?.length > 0) {
title = getString('changesSection.changesApproved')
statusMessage = stringSubstitute(getString('changesSection.changesAppByRev')) as string