Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Allow disabling GH integration on project if org is on a free plan (#41868)

Joshen Lim417f92268db5
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
index 29e921e58ec..f7decf8bb10 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
@@ -448,7 +448,7 @@ const GitHubIntegrationConnectionForm = ({
<Button
type="default"
className="justify-start h-[34px] w-full"
- disabled={isLoadingGitHubRepos}
+ disabled={disabled || isLoadingGitHubRepos}
loading={isLoadingGitHubRepos}
icon={
<div className="bg-black shadow rounded p-1 w-6 h-6 flex justify-center items-center">
@@ -704,7 +704,7 @@ const GitHubIntegrationConnectionForm = ({
<Button
type="outline"
onClick={handleRemoveIntegration}
- disabled={disabled || isDeletingConnection}
+ disabled={isDeletingConnection}
loading={isDeletingConnection}
>
Disable integration
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
index 985726ca307..8562d532ffd 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
@@ -14,7 +14,6 @@ import { useGitHubConnectionsQuery } from 'data/integrations/github-connections-
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { BASE_PATH, IS_PLATFORM } from 'lib/constants'
-import { cn } from 'ui'
import { GenericSkeletonLoader } from 'ui-patterns'
import GitHubIntegrationConnectionForm from './GitHubIntegrationConnectionForm'
@@ -71,20 +70,21 @@ export const GitHubSection = () => {
branch, keep your production branch in sync, and automatically create preview
branches for every pull request.
</p>
- {promptProPlanUpgrade ? (
+
+ {promptProPlanUpgrade && (
<div className="mb-6">
<UpgradeToPro
source="github-integration"
featureProposition="use GitHub integrations"
- primaryText="Upgrade to unlock GitHub integration"
+ primaryText={`Upgrade to ${!!existingConnection ? 'manage' : 'unlock'} GitHub integration`}
secondaryText="Connect your GitHub repository to automatically sync preview branches and deploy changes."
/>
</div>
- ) : (
- <div className={cn(promptProPlanUpgrade && 'opacity-25 pointer-events-none')}>
- <GitHubIntegrationConnectionForm connection={existingConnection} />
- </div>
)}
+ <GitHubIntegrationConnectionForm
+ disabled={promptProPlanUpgrade}
+ connection={existingConnection}
+ />
</div>
</div>
)}