Skip to content

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

Remove dynamic imports for database settings (#43277)

Joshen Limb50e0d4bd83d
diff --git a/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx b/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx
index 79b5c1b1cbb..9c74ca8ca7c 100644
--- a/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx
@@ -1,32 +1,29 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { Globe } from 'lucide-react'
-import { useState } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import AlertError from 'components/ui/AlertError'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { DocsButton } from 'components/ui/DocsButton'
-import { FormHeader } from 'components/ui/Forms/FormHeader'
-import { FormPanel } from 'components/ui/Forms/FormPanel'
import { useBannedIPsDeleteMutation } from 'data/banned-ips/banned-ips-delete-mutations'
import { useBannedIPsQuery } from 'data/banned-ips/banned-ips-query'
import { useUserIPAddressQuery } from 'data/misc/user-ip-address-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { DOCS_URL } from 'lib/constants'
+import { Globe } from 'lucide-react'
+import { useState } from 'react'
+import { toast } from 'sonner'
import { Badge, Card, CardContent, Skeleton } from 'ui'
-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import {
PageSection,
+ PageSectionContent,
+ PageSectionDescription,
PageSectionMeta,
PageSectionSummary,
PageSectionTitle,
- PageSectionContent,
- PageSectionDescription,
} from 'ui-patterns'
+import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
-const BannedIPs = () => {
+export const BannedIPs = () => {
const { ref } = useParams()
const { data: project } = useSelectedProjectQuery()
@@ -100,11 +97,7 @@ const BannedIPs = () => {
</CardContent>
</Card>
) : ipListError ? (
- <AlertError
- className="border-0 rounded-none"
- error={ipListError}
- subject="Failed to retrieve banned IP addresses"
- />
+ <AlertError error={ipListError} subject="Failed to retrieve banned IP addresses" />
) : ipList.banned_ipv4_addresses.length > 0 ? (
<Card>
{ipList.banned_ipv4_addresses.map((ip) => (
@@ -160,5 +153,3 @@ const BannedIPs = () => {
</>
)
}
-
-export default BannedIPs
diff --git a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
index b7236b99aea..31253f28b1b 100644
--- a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
@@ -1,13 +1,9 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { ExternalLink, Info } from 'lucide-react'
-import Link from 'next/link'
-import { SetStateAction } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import { Markdown } from 'components/interfaces/Markdown'
import DiskSizeConfigurationModal from 'components/interfaces/Settings/Database/DiskSizeConfigurationModal'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { DocsButton } from 'components/ui/DocsButton'
import Panel from 'components/ui/Panel'
import { useProjectDiskResizeMutation } from 'data/config/project-disk-resize-mutation'
import { useDatabaseSizeQuery } from 'data/database/database-size-query'
@@ -18,21 +14,24 @@ import { useIsAwsNimbusCloudProvider, useSelectedProjectQuery } from 'hooks/misc
import { useUrlState } from 'hooks/ui/useUrlState'
import { DOCS_URL } from 'lib/constants'
import { formatBytes } from 'lib/helpers'
-import { AlertDescription_Shadcn_, AlertTitle_Shadcn_, Alert_Shadcn_, Button, InfoIcon } from 'ui'
-import { DocsButton } from 'components/ui/DocsButton'
+import { ExternalLink, Info } from 'lucide-react'
+import Link from 'next/link'
+import { SetStateAction } from 'react'
+import { toast } from 'sonner'
+import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, InfoIcon } from 'ui'
import {
PageSection,
+ PageSectionContent,
PageSectionMeta,
PageSectionSummary,
PageSectionTitle,
- PageSectionContent,
} from 'ui-patterns'
export interface DiskSizeConfigurationProps {
disabled?: boolean
}
-const DiskSizeConfiguration = ({ disabled = false }: DiskSizeConfigurationProps) => {
+export const DiskSizeConfiguration = ({ disabled = false }: DiskSizeConfigurationProps) => {
const { ref: projectRef } = useParams()
const { data: project } = useSelectedProjectQuery()
const { data: organization } = useSelectedOrganizationQuery()
@@ -215,5 +214,3 @@ Read more about [disk management](${DOCS_URL}/guides/platform/database-size#disk
</>
)
}
-
-export default DiskSizeConfiguration
diff --git a/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx
index 7caf8352e6d..cfd3b7c673e 100644
--- a/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx
@@ -1,9 +1,4 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { template } from 'lodash'
-import { Download, Loader2 } from 'lucide-react'
-import { useEffect, useMemo, useState } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import { SupportLink } from 'components/interfaces/Support/SupportLink'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
@@ -16,6 +11,10 @@ import { useCustomContent } from 'hooks/custom-content/useCustomContent'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { DOCS_URL } from 'lib/constants'
+import { template } from 'lodash'
+import { Download, Loader2 } from 'lucide-react'
+import { useEffect, useMemo, useState } from 'react'
+import { toast } from 'sonner'
import {
Alert,
AlertDialog,
@@ -44,7 +43,7 @@ import {
} from 'ui-patterns'
import { FormLayout } from 'ui-patterns/form/Layout/FormLayout'
-const SSLConfiguration = () => {
+export const SSLConfiguration = () => {
const { ref } = useParams()
const { data: project } = useSelectedProjectQuery()
const [isEnforced, setIsEnforced] = useState(false)
@@ -231,5 +230,3 @@ const SSLConfiguration = () => {
</PageSection>
)
}
-
-export default SSLConfiguration
diff --git a/apps/studio/pages/project/[ref]/database/settings.tsx b/apps/studio/pages/project/[ref]/database/settings.tsx
index 8e0226bdba7..45260e8a107 100644
--- a/apps/studio/pages/project/[ref]/database/settings.tsx
+++ b/apps/studio/pages/project/[ref]/database/settings.tsx
@@ -1,13 +1,14 @@
-import dynamic from 'next/dynamic'
-import { IS_PLATFORM } from 'lib/constants'
import { ConnectionPooling } from 'components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling'
import { DatabaseReadOnlyAlert } from 'components/interfaces/Settings/Database/DatabaseReadOnlyAlert'
import ResetDbPassword from 'components/interfaces/Settings/Database/DatabaseSettings/ResetDbPassword'
import { PoolingModesModal } from 'components/interfaces/Settings/Database/PoolingModesModal'
+import { SettingsDatabaseEmptyStateLocal } from 'components/interfaces/Settings/Database/SettingsDatabaseEmptyStateLocal'
import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'
import DefaultLayout from 'components/layouts/DefaultLayout'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
import { useIsAwsCloudProvider, useIsAwsK8sCloudProvider } from 'hooks/misc/useSelectedProject'
+import { IS_PLATFORM } from 'lib/constants'
+import type { NextPageWithLayout } from 'types'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -17,26 +18,12 @@ import {
PageHeaderTitle,
} from 'ui-patterns/PageHeader'
import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
-import type { NextPageWithLayout } from 'types'
-import { SettingsDatabaseEmptyStateLocal } from 'components/interfaces/Settings/Database/SettingsDatabaseEmptyStateLocal'
-const SSLConfiguration = dynamic(
- () => import('components/interfaces/Settings/Database/SSLConfiguration')
-)
-const DiskSizeConfiguration = dynamic(
- () => import('components/interfaces/Settings/Database/DiskSizeConfiguration')
-)
-const NetworkRestrictions = dynamic(() =>
- import('components/interfaces/Settings/Database/NetworkRestrictions/NetworkRestrictions').then(
- (mod) => mod.NetworkRestrictions
- )
-)
-const BannedIPs = dynamic(() => import('components/interfaces/Settings/Database/BannedIPs'))
-const DiskManagementPanelForm = dynamic(() =>
- import('components/interfaces/DiskManagement/DiskManagementPanelForm').then(
- (mod) => mod.DiskManagementPanelForm
- )
-)
+import { DiskManagementPanelForm } from '@/components/interfaces/DiskManagement/DiskManagementPanelForm'
+import { BannedIPs } from '@/components/interfaces/Settings/Database/BannedIPs'
+import { DiskSizeConfiguration } from '@/components/interfaces/Settings/Database/DiskSizeConfiguration'
+import { NetworkRestrictions } from '@/components/interfaces/Settings/Database/NetworkRestrictions/NetworkRestrictions'
+import { SSLConfiguration } from '@/components/interfaces/Settings/Database/SSLConfiguration'
const ProjectSettings: NextPageWithLayout = () => {
const isAws = useIsAwsCloudProvider()