Skip to content

fix: avoid showing GitHub app install modal while repos are loading #141

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
Che-Zhu merged 1 commit into from
Mar 9, 2026
Merged

fix: avoid showing GitHub app install modal while repos are loading #141

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
32 changes: 18 additions & 14 deletions app/(dashboard)/projects/_components/import-github-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ import {
import { createProject } from '@/lib/actions/project'
import { env } from '@/lib/env'

type Step = 'check-github-app' | 'select-repo'
type Step = 'loading' | 'check-github-app' | 'select-repo'

interface ImportGitHubDialogProps {
open: boolean
onOpenChange: (open: boolean) => void
}

export function ImportGitHubDialog({ open, onOpenChange }: ImportGitHubDialogProps) {
const [step, setStep] = useState<Step>('check-github-app')
const [isLoading, setIsLoading] = useState(false)
const [step, setStep] = useState<Step>('loading')
const [isLoading, setIsLoading] = useState(true)
const [searchQuery, setSearchQuery] = useState('')

// Step 1 state
Expand All @@ -38,7 +38,7 @@ export function ImportGitHubDialog({ open, onOpenChange }: ImportGitHubDialogPro
const [isCreating, setIsCreating] = useState(false)

const resetState = useCallback(() => {
setStep('check-github-app')
setStep('loading')
setIsLoading(true)
setSearchQuery('')
setHasInstallation(false)
Expand All @@ -48,6 +48,7 @@ export function ImportGitHubDialog({ open, onOpenChange }: ImportGitHubDialogPro
}, [])

const checkIdentity = useCallback(async () => {
setStep('loading')
setIsLoading(true)
try {
// Directly check for GitHub App installation
Expand All @@ -58,6 +59,8 @@ export function ImportGitHubDialog({ open, onOpenChange }: ImportGitHubDialogPro
if (repoResult.success) {
setRepos(repoResult.data)
setStep('select-repo')
} else {
setStep('check-github-app')
}
} else {
setHasInstallation(false)
Expand Down Expand Up @@ -155,18 +158,17 @@ export function ImportGitHubDialog({ open, onOpenChange }: ImportGitHubDialogPro
)

const renderStepContent = () => {
if (isLoading && step === 'check-github-app' && !hasInstallation) {
return (
<div className="flex items-center justify-center py-12">
<div className="flex items-center gap-2 text-muted-foreground">
<MdRefresh className="w-4 h-4 animate-spin" />
<span>Checking GitHub App installation...</span>
switch (step) {
case 'loading':
return (
<div className="flex items-center justify-center py-12">
<div className="flex items-center gap-2 text-muted-foreground">
<MdRefresh className="w-4 h-4 animate-spin" />
<span>Loading your GitHub repositories...</span>
</div>
</div>
</div>
)
}
)

switch (step) {
case 'check-github-app':
if (hasInstallation) {
return null
Expand Down Expand Up @@ -270,6 +272,8 @@ export function ImportGitHubDialog({ open, onOpenChange }: ImportGitHubDialogPro

const getStepTitle = () => {
switch (step) {
case 'loading':
return 'Import from GitHub'
case 'check-github-app':
return 'Install GitHub App'
case 'select-repo':
Expand Down