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

Codehost error/warning banner adjustments (#26254)

Browse Source 
* Add gitlab scopes to the popup

* Update the warning banner
This commit is contained in:
Artem Ruts 2021-10-19 05:17:34 -04:00 committed by GitHub
parent 6b3b29774c
commit 4f48140ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/web/src/user/settings/codeHosts/CodeHostItem.tsx
View File

@ -112,7 +112,7 @@ export const CodeHostItem: React.FunctionComponent<CodeHostItemProps> = ({
)}
<div className="align-self-center">
{service?.warning || service?.lastSyncError ? (
<AlertCircleIcon className="icon-inline mb-0 mr-2 text-danger" />
<AlertCircleIcon className="icon-inline mb-0 mr-2 text-warning" />
) : service?.id ? (
<CheckCircleIcon className="icon-inline mb-0 mr-2 text-success" />
) : (

20
client/web/src/user/settings/codeHosts/UserAddCodeHostsPage.tsx
View File

@ -239,9 +239,23 @@ export const UserAddCodeHostsPage: React.FunctionComponent<UserAddCodeHostsPageP
const handleError = useCallback((error: ErrorLike): void => setStatusOrError(error), [])
const getServiceWarningFragment = (service: serviceProblem): JSX.Element => (
<div className="alert alert-danger my-3" key={service.id}>
<h4 className="align-middle mb-1">Could not connect with {service.displayName}</h4>
<p className="align-middle mb-0">{service.problem}. Try connecting again.</p>
<div className="alert alert-warning my-3" key={service.id}>
<h4 className="align-middle mb-1">Can't connect with {service.displayName}</h4>
<p className="align-middle mb-0">
<span className="align-middle">Please try</span>{' '}
{owner.type === 'org' ? (
<button
type="button"
className="btn btn-link font-weight-normal shadow-none p-0 border-0"
onClick={toggleUpdateModal}
>
updating the code host connection
</button>
) : (
<span className="align-middle">reconnecting the code host connection</span>
)}{' '}
<span className="align-middle">with {service.displayName} to restore access.</span>
</p>
</div>
)

10
client/web/src/user/settings/codeHosts/modalHints.tsx
View File

@ -8,7 +8,7 @@ export const hints: Partial<Record<ExternalServiceKind, React.ReactFragment>> =
[ExternalServiceKind.GITHUB]: (
<small>
<Link
to="https://github.com/settings/tokens/new?description=Sourcergaph&scopes=user:email,repo,read:org"
to="https://github.com/settings/tokens/new?description=Sourcegraph.com&scopes=user:email,repo,read:org"
target="_blank"
rel="noopener noreferrer"
>
@ -29,13 +29,9 @@ export const hints: Partial<Record<ExternalServiceKind, React.ReactFragment>> =
</Link>
<span className="text-muted">
{' '}
{/* eslint-disable-next-line react/forbid-dom-props */}
with <span style={{ color: 'red' }}>which???</span>{' '}
{/* <code className="user-code-hosts-page__code--inline">read_user</code>,{' '}
with <code className="user-code-hosts-page__code--inline">read_user</code>,{' '}
<code className="user-code-hosts-page__code--inline">read_api</code> and{' '}
<code className="user-code-hosts-page__code--inline">read_repository</code>
*/}
scopes.
<code className="user-code-hosts-page__code--inline">read_repository</code> scopes.
</span>
</small>
),