artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 15:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(batches): display failure alert depending on github app kind (#63633)

Browse Source 
The Github failure alert shows up for non-commit signing failures, it
should only show up when the kind is `COMMIT_SIGNING`

## Test plan

<!-- REQUIRED; info at
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles
-->

Manual testing.

## Changelog

<!-- OPTIONAL; info at
https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c
-->
This commit is contained in:
Bolaji Olajide 2024-07-04 10:15:26 +01:00 committed by GitHub
parent 11ec30b85a
commit 069db89d9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/web/src/enterprise/batches/settings/CommitSigningIntegrations.tsx
View File

@ -16,11 +16,12 @@ import {
SummaryContainer,
} from '../../../components/FilteredConnection/ui'
import { GitHubAppFailureAlert } from '../../../components/gitHubApps/GitHubAppFailureAlert'
import type {
BatchChangesCodeHostFields,
GlobalBatchChangesCodeHostsResult,
Scalars,
UserBatchChangesCodeHostsResult,
import {
type BatchChangesCodeHostFields,
GitHubAppKind,
type GlobalBatchChangesCodeHostsResult,
type Scalars,
type UserBatchChangesCodeHostsResult,
} from '../../../graphql-operations'
import { useGlobalBatchChangesCodeHostConnection, useUserBatchChangesCodeHostConnection } from './backend'
@ -54,9 +55,12 @@ export const CommitSigningIntegrations: React.FunctionComponent<
const { loading, hasNextPage, fetchMore, connection, error, refetchAll } = connectionResult
const location = useLocation()
const success = new URLSearchParams(location.search).get('success') === 'true'
const appName = new URLSearchParams(location.search).get('app_name')
const setupError = new URLSearchParams(location.search).get('error')
const searchParams = new URLSearchParams(location.search)
const kind = searchParams.get('kind')
const success = searchParams.get('success') === 'true'
const appName = searchParams.get('app_name')
const setupError = searchParams.get('error')
const shouldShowError = !success && setupError && !readOnly && kind === GitHubAppKind.COMMIT_SIGNING
return (
<Container>
<H3>
@ -85,7 +89,7 @@ export const CommitSigningIntegrations: React.FunctionComponent<
GitHub App {appName?.length ? `"${appName}" ` : ''}successfully connected.
</DismissibleAlert>
)}
{!success && setupError && !readOnly && <GitHubAppFailureAlert error={setupError} />}
{shouldShowError && <GitHubAppFailureAlert error={setupError} />}
<ConnectionList as="ul" className="list-group" aria-label="commit signing integrations">
{connection?.nodes?.map(node =>
node.supportsCommitSigning ? (