Skip to content

Commit 78419c7

Browse files
soedirgodelgado3d
andauthored
chore: clean up removed field handling (supabase#36954)
Co-authored-by: divit <[email protected]>
1 parent b9a0908 commit 78419c7

File tree

2 files changed

+1
-62
lines changed

2 files changed

+1
-62
lines changed

apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureInfo.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
import { ProjectUpgradeAlert } from '../General/Infrastructure/ProjectUpgradeAlert'
2828
import InstanceConfiguration from './InfrastructureConfiguration/InstanceConfiguration'
2929
import {
30-
DatabaseExtensionsWarning,
3130
ObjectsToBeDroppedWarning,
3231
ReadReplicasWarning,
3332
UnsupportedExtensionsWarning,
@@ -58,9 +57,6 @@ const InfrastructureInfo = () => {
5857
isSuccess: isSuccessServiceVersions,
5958
} = useProjectServiceVersionsQuery({ projectRef: ref })
6059

61-
const { data: projectUpgradeEligibilityData } = useProjectUpgradeEligibilityQuery({
62-
projectRef: ref,
63-
})
6460
const { data: databases } = useReadReplicasQuery({ projectRef: ref })
6561
const { current_app_version, current_app_version_release_channel, latest_app_version } =
6662
data || {}
@@ -79,8 +75,6 @@ const InfrastructureInfo = () => {
7975
const isInactive = project?.status === 'INACTIVE'
8076
const hasReadReplicas = (databases ?? []).length > 1
8177

82-
// @ts-ignore [Bobbie] to be removed after 2025-06-30 prod deploy
83-
const hasExtensionDependentObjects = (data?.extension_dependent_objects ?? []).length > 0
8478
const hasObjectsToBeDropped = (data?.objects_to_be_dropped ?? []).length > 0
8579
const hasUnsupportedExtensions = (data?.unsupported_extensions || []).length > 0
8680
const hasObjectsInternalSchema = (data?.user_defined_objects_in_internal_schemas || []).length > 0
@@ -202,16 +196,7 @@ const InfrastructureInfo = () => {
202196
) : null}
203197

204198
{!data.eligible ? (
205-
hasExtensionDependentObjects ? (
206-
<DatabaseExtensionsWarning
207-
// @ts-ignore
208-
extensions={data.extension_dependent_objects ?? []}
209-
potentialBreakingChanges={
210-
// @ts-ignore
211-
projectUpgradeEligibilityData?.potential_breaking_changes
212-
}
213-
/>
214-
) : hasObjectsToBeDropped ? (
199+
hasObjectsToBeDropped ? (
215200
<ObjectsToBeDroppedWarning
216201
objectsToBeDropped={data.objects_to_be_dropped}
217202
/>

apps/studio/components/interfaces/Settings/Infrastructure/UpgradeWarnings.tsx

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,52 +14,6 @@ export const ReadReplicasWarning = ({ latestPgVersion }: { latestPgVersion: stri
1414
)
1515
}
1616

17-
export const DatabaseExtensionsWarning = ({
18-
extensions,
19-
potentialBreakingChanges,
20-
}: {
21-
extensions: string[]
22-
potentialBreakingChanges?: string[]
23-
}) => {
24-
return (
25-
<Alert_Shadcn_
26-
variant="warning"
27-
title="A new version of Postgres is available for your project"
28-
>
29-
<AlertTitle_Shadcn_>A new version of Postgres is available</AlertTitle_Shadcn_>
30-
<AlertDescription_Shadcn_ className="flex flex-col gap-3">
31-
<div>
32-
<p className="mb-1">You'll need to remove the following extensions before upgrading:</p>
33-
34-
<ul className="pl-4">
35-
{extensions.map((obj) => (
36-
<li className="list-disc" key={obj}>
37-
{obj}
38-
</li>
39-
))}
40-
</ul>
41-
</div>
42-
<p>
43-
{potentialBreakingChanges?.includes('pg17_upgrade_unsupported_extensions')
44-
? 'These extensions are not supported in newer versions of Supabase Postgres. If you are not using them, it is safe to remove them.'
45-
: 'Check the docs for which ones might need to be removed.'}
46-
</p>
47-
<div>
48-
<Button size="tiny" type="default" asChild>
49-
<a
50-
target="_blank"
51-
rel="noreferrer"
52-
href="https://supabase.com/docs/guides/platform/upgrading#extensions"
53-
>
54-
View docs
55-
</a>
56-
</Button>
57-
</div>
58-
</AlertDescription_Shadcn_>
59-
</Alert_Shadcn_>
60-
)
61-
}
62-
6317
export const ObjectsToBeDroppedWarning = ({
6418
objectsToBeDropped,
6519
}: {

0 commit comments

Comments
 (0)