Skip to content

improvement(search): simplify GitHub App setup dialog #7714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icecrasher321 merged 1 commit into from
Sep 10, 2026
+79 −77
Merged

improvement(search): simplify GitHub App setup dialog #7714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 79 additions & 77 deletions apps/sim/app/workspace/[workspaceId]/search/components/github-installation-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,88 +112,90 @@ export function GitHubInstallationModal({
<ChipModalBody>
<ChipModalField
type='custom'
title='GitHub App'
hint='The app indexes selected repositories. Each person connects their own GitHub account to search only content they can access.'
title={data?.needsUserConnection ? 'GitHub account' : 'Installation'}
hint={
data?.available && !data.needsUserConnection && choices.length === 0
? 'Install the app, then refresh.'
: undefined
}
>
{installations.isError ? (
<SettingsQueryErrorState
error={installations.error}
fallback='Could not load GitHub installations'
isRetrying={installations.isFetching}
onRetry={() => void installations.refetch()}
variant='inline'
/>
) : !data ? (
<SettingsEmptyState variant='inline'>Loading GitHub setup…</SettingsEmptyState>
) : !data.available ? (
<SettingsEmptyState variant='inline'>
GitHub App indexing is unavailable in this deployment.
</SettingsEmptyState>
) : data.needsUserConnection ? (
<div className='flex flex-col gap-3'>
<p className='text-[var(--text-body)] text-small'>
{waitingForAccount
? 'Finish connecting your account in the other tab, then refresh.'
: 'Connect your GitHub account to verify the installations you can manage.'}
</p>
<div className='flex flex-wrap gap-2'>
<Chip variant='primary' disabled={pending} onClick={connectGitHubAccount}>
{waitingForAccount ? 'Open account connection' : 'Connect your GitHub account'}
</Chip>
<Chip
disabled={pending || installations.isFetching}
onClick={() => void installations.refetch()}
>
Refresh
</Chip>
{(aria) =>
installations.isError ? (
<SettingsQueryErrorState
error={installations.error}
fallback='Could not load GitHub installations'
isRetrying={installations.isFetching}
onRetry={() => void installations.refetch()}
variant='inline'
/>
) : !data ? (
<SettingsEmptyState variant='inline'>Loading GitHub setup…</SettingsEmptyState>
) : !data.available ? (
<SettingsEmptyState variant='inline'>
GitHub App indexing is unavailable in this deployment.
</SettingsEmptyState>
) : data.needsUserConnection ? (
<div className='flex flex-col gap-3'>
<p className='text-[var(--text-body)] text-small'>
{waitingForAccount
? 'Finish connecting your account in the other tab, then refresh.'
: 'Connect your GitHub account to verify the installations you can manage.'}
</p>
<div className='flex flex-wrap gap-2'>
<Chip variant='primary' disabled={pending} onClick={connectGitHubAccount}>
{waitingForAccount ? 'Open account connection' : 'Connect your GitHub account'}
</Chip>
<Chip
disabled={pending || installations.isFetching}
onClick={() => void installations.refetch()}
>
Refresh
</Chip>
</div>
</div>
</div>
) : (
<div className='flex flex-col gap-3'>
<p className='text-[var(--text-body)] text-small'>
Install the app on your account or organization and choose its repositories, then
refresh.
</p>
<div className='flex flex-wrap gap-2'>
{data.installUrl && (
<ChipLink href={data.installUrl} target='_blank' rel='noopener noreferrer'>
Install GitHub App
</ChipLink>
) : (
<div className='flex flex-col gap-3'>
{choices.length > 0 ? (
<ChipCombobox
{...aria}
aria-label='Installation'
options={choices.map((item) => ({
value: item.installationId,
label: item.accountLogin,
}))}
value={selected?.installationId}
onChange={setInstallationId}
placeholder='Select an installation'
disabled={pending || installations.isFetching}
/>
) : (
<SettingsEmptyState variant='inline'>
No eligible installations found.
</SettingsEmptyState>
)}
<Chip
disabled={pending || installations.isFetching}
onClick={() => void installations.refetch()}
>
Refresh
</Chip>
<div className='flex flex-wrap gap-2'>
{data.installUrl && (
<ChipLink
{...aria}
href={data.installUrl}
target='_blank'
rel='noopener noreferrer'
>
Install GitHub App
</ChipLink>
)}
<Chip
{...aria}
disabled={pending || installations.isFetching}
onClick={() => void installations.refetch()}
>
Refresh
</Chip>
</div>
</div>
</div>
)}
)
}
</ChipModalField>
{data?.available && !data.needsUserConnection && (
<ChipModalField
type='custom'
title='Installation'
hint='Only installations on your account or organizations you administer appear here.'
>
{choices.length > 0 ? (
<ChipCombobox
options={choices.map((item) => ({
value: item.installationId,
label: item.accountLogin,
}))}
value={selected?.installationId}
onChange={setInstallationId}
placeholder='Select an installation'
disabled={pending || installations.isFetching}
/>
) : (
<SettingsEmptyState variant='inline'>
No eligible installations found.
</SettingsEmptyState>
)}
</ChipModalField>
)}
<ChipModalError>
{connectionError ??
ensureAccounts.error?.message ??
Expand Down
Loading