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

fix: [code-1317]: suppress error message (#967)

Browse Source
This commit is contained in:
Calvin Lee 2024-01-17 00:46:59 +00:00 committed by Harness
parent b567c5f471
commit 7f54bd2f50
1 changed files with 4 additions and 0 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

@ -57,6 +57,7 @@ import {
Violation Violation
} from 'utils/Utils' } from 'utils/Utils'
import { UserPreference, useUserPreference } from 'hooks/useUserPreference' import { UserPreference, useUserPreference } from 'hooks/useUserPreference'
import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata'
import ReviewSplitButton from 'components/Changes/ReviewSplitButton/ReviewSplitButton' import ReviewSplitButton from 'components/Changes/ReviewSplitButton/ReviewSplitButton'
import RuleViolationAlertModal from 'components/RuleViolationAlertModal/RuleViolationAlertModal' import RuleViolationAlertModal from 'components/RuleViolationAlertModal/RuleViolationAlertModal'
import css from './PullRequestActionsBox.module.scss' import css from './PullRequestActionsBox.module.scss'
@ -78,6 +79,7 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
const { currentUser } = useAppContext() const { currentUser } = useAppContext()
const { hooks, standalone } = useAppContext() const { hooks, standalone } = useAppContext()
const space = useGetSpaceParam() const space = useGetSpaceParam()
const { pullRequestSection } = useGetRepositoryMetadata()
const { mutate: mergePR, loading } = useMutate({ const { mutate: mergePR, loading } = useMutate({
verb: 'POST', verb: 'POST',
path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/merge` path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/merge`
@ -140,6 +142,8 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
err.status === 423 // resource locked (merge / dry-run already ongoing) err.status === 423 // resource locked (merge / dry-run already ongoing)
) { ) {
return return
} else if (pullRequestSection !== 'conversation') {
return
} else { } else {
showError(getErrorMessage(err)) showError(getErrorMessage(err))
} }