Skip to content

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

Joshenlim/fe 4679 inconsistency with integrations that arent installed create (#52141)

Joshen Lim2400e9537ab4
diff --git a/apps/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx b/apps/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx
index 5efad7ab821..aba1a16293e 100644
--- a/apps/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx
@@ -8,13 +8,19 @@ import { useEffect, useRef, useState } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { toast } from 'sonner'
import { Button, Form, SidePanel } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
import { FormSchema, WebhookFormValues } from './EditHookPanel.constants'
import { FormContents } from './FormContents'
+import { useIsMarketplaceEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { RequiredExtensionsSection } from '@/components/interfaces/Integrations/Integration/RequiredExtensionsSection'
+import { useInstallRequiredExtensions } from '@/components/interfaces/Integrations/Integration/useInstallRequiredExtensions'
import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'
import { useDatabaseTriggerCreateMutation } from '@/data/database-triggers/database-trigger-create-mutation'
import { useDatabaseTriggerUpdateMutation } from '@/data/database-triggers/database-trigger-update-transaction-mutation'
import { useDatabaseHooksQuery } from '@/data/database-triggers/database-triggers-query'
+import { useHooksEnableMutation } from '@/data/database/hooks-enable-mutation'
+import { useSchemasQuery } from '@/data/database/schemas-query'
import { tableEditorQueryOptions } from '@/data/table-editor/table-editor-query'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
@@ -68,8 +74,29 @@ const parseParameters = (selectedHook?: PGTrigger): HTTPArgument[] => {
export const EditHookPanel = () => {
const { ref } = useParams()
const { data: project } = useSelectedProjectQuery()
+ const isMarketplaceEnabled = useIsMarketplaceEnabled()
+
const [isLoadingTable, setIsLoadingTable] = useState(false)
+ const {
+ requiredExtensionsToInstall,
+ needsExtensions,
+ isExtensionDataLoading: isExtensionsLoading,
+ installRequiredExtensions,
+ } = useInstallRequiredExtensions()
+
+ const { data: schemas, isSuccess: isSchemasLoaded } = useSchemasQuery({
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ })
+ const { mutateAsync: enableHooks } = useHooksEnableMutation({ onError: () => {} })
+
+ const needsWebhooksEnabled =
+ isMarketplaceEnabled &&
+ isSchemasLoaded &&
+ !schemas.some((schema) => schema.name === 'supabase_functions')
+ const isExtensionDataLoading = isExtensionsLoading || (isMarketplaceEnabled && !isSchemasLoaded)
+
const { data: hooks = [], isSuccess } = useDatabaseHooksQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
@@ -185,8 +212,34 @@ export const EditHookPanel = () => {
return console.error('Project ref is required')
}
+ if (isExtensionDataLoading) return
+
try {
setIsLoadingTable(true)
+
+ if (needsExtensions || needsWebhooksEnabled) {
+ const toastId = toast.loading('Setting up database webhooks…')
+ try {
+ if (needsExtensions) {
+ const extensionNames = (requiredExtensionsToInstall ?? [])
+ .map((ext) => ext.name)
+ .join(', ')
+ toast.loading(`Installing extensions ${extensionNames}…`, { id: toastId })
+ await installRequiredExtensions()
+ }
+ if (needsWebhooksEnabled) {
+ toast.loading('Enabling database webhooks…', { id: toastId })
+ await enableHooks({ ref: project.ref })
+ }
+ toast.dismiss(toastId)
+ } catch (error) {
+ toast.error(`Failed to set up database webhooks: ${(error as Error).message}`, {
+ id: toastId,
+ })
+ return
+ }
+ }
+
const selectedTable = await queryClient.fetchQuery(
tableEditorQueryOptions({
id: Number(values.table_id),
@@ -291,7 +344,7 @@ export const EditHookPanel = () => {
</span>
)
}
- className="hooks-sidepanel mr-0 transform transition-all duration-300 ease-in-out"
+ className="mr-0 transform transition-all duration-300 ease-in-out"
onConfirm={() => {}}
onCancel={confirmOnClose}
customFooter={
@@ -304,7 +357,7 @@ export const EditHookPanel = () => {
variant="primary"
type="submit"
form={FORM_ID}
- disabled={isSubmitting}
+ disabled={isSubmitting || isExtensionDataLoading}
loading={isSubmitting}
>
{selectedHook === undefined ? 'Create webhook' : 'Update webhook'}
@@ -314,6 +367,18 @@ export const EditHookPanel = () => {
>
<Form {...form}>
<form id={FORM_ID} onSubmit={form.handleSubmit(onSubmit)}>
+ {isMarketplaceEnabled && (
+ <div className="flex flex-col gap-y-4 border-b px-5 py-5">
+ {(needsExtensions || needsWebhooksEnabled) && (
+ <Admonition
+ type="warning"
+ title="Database webhooks will be set up"
+ description="Proceeding will also install the required extensions and enable database webhooks on your project."
+ />
+ )}
+ <RequiredExtensionsSection hideSeparator />
+ </div>
+ )}
<FormContents form={form} selectedHook={selectedHook} />
</form>
</Form>
diff --git a/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx b/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
index 09a3f148538..72ed335480f 100644
--- a/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
@@ -1,6 +1,6 @@
import { useParams } from 'common'
import { includes } from 'lodash'
-import { Edit3Icon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
+import { EditIcon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import Image from 'next/legacy/image'
import { parseAsString, useQueryState } from 'nuqs'
import {
@@ -113,24 +113,22 @@ export const HookList = ({ schema, filterString }: HookListProps) => {
<TooltipContent side="bottom">More options</TooltipContent>
</Tooltip>
- <DropdownMenuContent side="left">
- <>
- <DropdownMenuItem
- className="space-x-2"
- onClick={() => setSelectedHookIdToEdit(x.id.toString())}
- >
- <Edit3Icon size="14" />
- <p>Edit hook</p>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- className="space-x-2"
- onClick={() => setSelectedHookIdToDelete(x.id.toString())}
- >
- <TrashIcon stroke="red" size="14" />
- <p>Delete hook</p>
- </DropdownMenuItem>
- </>
+ <DropdownMenuContent side="bottom" align="end" className="w-32">
+ <DropdownMenuItem
+ className="gap-x-2"
+ onClick={() => setSelectedHookIdToEdit(x.id.toString())}
+ >
+ <EditIcon size={14} />
+ <p>Edit hook</p>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="gap-x-2"
+ onClick={() => setSelectedHookIdToDelete(x.id.toString())}
+ >
+ <TrashIcon size={14} />
+ <p>Delete hook</p>
+ </DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : (
diff --git a/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx b/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
index c79d478b746..24ee6d4bac9 100644
--- a/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
@@ -93,7 +93,7 @@ export const HooksList = () => {
},
}}
>
- Create a new hook
+ Create webhook
</ButtonTooltip>
</div>
</div>
diff --git a/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx b/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
index f03eed8ba90..0fc8d0ed5aa 100644
--- a/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
@@ -43,7 +43,6 @@ const ChooseFunctionForm = ({ visible, onChange, setVisible }: ChooseFunctionFor
header="Pick a function"
visible={visible}
onCancel={() => setVisible(!visible)}
- className="hooks-sidepanel"
>
<div className="py-6">
{hasPublicSchemaFunctions ? (
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
index f68106080ea..da448272ee8 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
@@ -5,7 +5,11 @@ import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
import { MouseEvent, useEffect, useMemo, useRef, useState } from 'react'
import { toast } from 'sonner'
import { LoadingLine } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
+import { PageSection } from 'ui-patterns/PageSection'
+import { ConstrainedIntegrationTabScaffold } from '../ConstrainedIntegrationTabScaffold'
+import { useIntegrationDetail } from '../Landing/useIntegrationDetail'
import { formatCronJobColumns } from './CronJobs.utils'
import { CronJobRunDetailsOverflowNotice } from './CronJobsTab.CleanupNotice'
import { CronJobsTabDataGrid } from './CronJobsTab.DataGrid'
@@ -30,6 +34,8 @@ export const CronjobsTab = () => {
const { data: project } = useSelectedProjectQuery()
const track = useTrack()
+ const { isInstalled } = useIntegrationDetail()
+
const [searchQuery, setSearchQuery] = useQueryState('search', parseAsString.withDefault(''))
const [search, setSearch] = useState(searchQuery)
@@ -47,6 +53,7 @@ export const CronjobsTab = () => {
projectRef: project?.ref,
connectionString: project?.connectionString,
searchQuery,
+ enabled: isInstalled,
})
const [createCronJobSheetShown, setCreateCronJobSheetShown] = useQueryState(
@@ -124,6 +131,18 @@ export const CronjobsTab = () => {
}
}, [cronJobForEditing, cronJobIdForEditing, grid.isSuccess, setCronJobForEditing])
+ if (!isInstalled) {
+ return (
+ <div className="mx-auto w-full max-w-6xl px-6 xl:px-10">
+ <ConstrainedIntegrationTabScaffold>
+ <PageSection className="py-0">
+ <Admonition type="default" description="Cron is not installed." />
+ </PageSection>
+ </ConstrainedIntegrationTabScaffold>
+ </div>
+ )
+ }
+
return (
<>
<div className="h-full w-full space-y-4">
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts
index 1d2c2cda039..c2a42ac1bc3 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts
@@ -19,6 +19,7 @@ import type { ResponseError } from '@/types'
type UseCronJobsDataParams = ConnectionVars & {
searchQuery: string | null
+ enabled?: boolean
}
// =============================================================================
@@ -59,6 +60,7 @@ export function useCronJobsData({
projectRef,
connectionString,
searchQuery,
+ enabled = true,
}: UseCronJobsDataParams): UseCronJobsDataResult {
const isProjectReady = !!projectRef
@@ -75,6 +77,7 @@ export function useCronJobsData({
} = useCronJobsInfiniteQuery(
{ projectRef, connectionString, searchTerm: searchQuery ?? undefined },
{
+ enabled,
placeholderData: Boolean(searchQuery) ? keepPreviousData : undefined,
staleTime: Infinity,
}
@@ -96,7 +99,7 @@ export function useCronJobsData({
{
placeholderData: Boolean(searchQuery) ? keepPreviousData : undefined,
staleTime: Infinity,
- enabled: useMinimalQuery,
+ enabled: enabled && useMinimalQuery,
}
)
@@ -114,7 +117,10 @@ export function useCronJobsData({
data: estimatedCount,
isPending: isLoadingEstimatedCount,
isError: isEstimatedCountError,
- } = useCronJobsCountEstimateQuery({ projectRef, connectionString }, { enabled: isProjectReady })
+ } = useCronJobsCountEstimateQuery(
+ { projectRef, connectionString },
+ { enabled: enabled && isProjectReady }
+ )
const hasLargeCronJobsTable =
typeof estimatedCount === 'number' && estimatedCount > CRON_JOBS_THRESHOLD
@@ -125,7 +131,7 @@ export function useCronJobsData({
const { data: exactCount, isPending: isLoadingExactCount } = useCronJobsCountQuery(
{ projectRef, connectionString },
- { enabled: isCountQueryEnabled }
+ { enabled: enabled && isCountQueryEnabled }
)
return {
diff --git a/apps/studio/components/interfaces/Integrations/Integration/useInstallRequiredExtensions.ts b/apps/studio/components/interfaces/Integrations/Integration/useInstallRequiredExtensions.ts
new file mode 100644
index 00000000000..53897fce602
--- /dev/null
+++ b/apps/studio/components/interfaces/Integrations/Integration/useInstallRequiredExtensions.ts
@@ -0,0 +1,63 @@
+import { useMemo } from 'react'
+
+import { useIsMarketplaceEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { getExtensionDefaultSchema } from '@/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/IntegrationOverviewTabV2.utils'
+import { useIntegrationDetail } from '@/components/interfaces/Integrations/Landing/useIntegrationDetail'
+import { getRequiredExtensionsToInstall } from '@/components/interfaces/Integrations/Wrappers/Wrappers.utils'
+import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/database-extension-enable-mutation'
+import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+
+/**
+ * Tracks which of the current integration's required extensions are not yet installed, and
+ * exposes a function to install them. Only active when the marketplace flag is on.
+ */
+export const useInstallRequiredExtensions = () => {
+ const isMarketplaceEnabled = useIsMarketplaceEnabled()
+ const { integration } = useIntegrationDetail()
+ const { data: project } = useSelectedProjectQuery()
+
+ const { data: extensions } = useDatabaseExtensionsQuery({
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ })
+
+ // null while the query is in flight — distinct from [] which means "all installed"
+ const requiredExtensionsToInstall = useMemo(
+ () => getRequiredExtensionsToInstall(extensions, integration?.requiredExtensions ?? []),
+ [extensions, integration?.requiredExtensions]
+ )
+
+ const needsExtensions = isMarketplaceEnabled && (requiredExtensionsToInstall?.length ?? 0) > 0
+ const isExtensionDataLoading = isMarketplaceEnabled && requiredExtensionsToInstall === null
+
+ const { mutateAsync: enableExtension } = useDatabaseExtensionEnableMutation({ onError: () => {} })
+
+ const installRequiredExtensions = async () => {
+ if (!project) return
+ const { ref: projectRef, connectionString } = project
+ const results = await Promise.allSettled(
+ (requiredExtensionsToInstall ?? []).map((ext) => {
+ const schema = getExtensionDefaultSchema(ext) ?? 'extensions'
+ return enableExtension({
+ projectRef,
+ connectionString,
+ schema,
+ name: ext.name,
+ version: ext.default_version,
+ cascade: true,
+ createSchema: false,
+ })
+ })
+ )
+ const failure = results.find((r) => r.status === 'rejected')
+ if (failure) throw new Error((failure as PromiseRejectedResult).reason.message)
+ }
+
+ return {
+ requiredExtensionsToInstall,
+ needsExtensions,
+ isExtensionDataLoading,
+ installRequiredExtensions,
+ }
+}
diff --git a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
index 21f2526a1f6..c3971e2df4e 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
@@ -80,7 +80,9 @@ export const useInstalledIntegrations = () => {
connectionString: project?.connectionString,
})
- const isHooksEnabled = schemas.some((schema) => schema.name === 'supabase_functions')
+ const isHooksEnabled =
+ !!extensions.find((ext) => ext.name === 'pg_net')?.installed_version &&
+ schemas.some((schema) => schema.name === 'supabase_functions')
const installedIntegrations = useMemo(() => {
return allIntegrations
diff --git a/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx b/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx
index 9d33b17ae3c..be01c2329f5 100644
--- a/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx
+++ b/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx
@@ -7,8 +7,10 @@ import { Button, Form, FormControl, FormField, FormItem, Switch } from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import { PageSection } from 'ui-patterns/PageSection'
import { z } from 'zod'
+import { useIntegrationDetail } from '../Landing/useIntegrationDetail'
import { ConstrainedIntegrationTabScaffold } from '@/components/interfaces/Integrations/ConstrainedIntegrationTabScaffold'
import { DocsButton } from '@/components/ui/DocsButton'
import { FormHeader } from '@/components/ui/Forms/FormHeader'
@@ -29,12 +31,16 @@ import { useTablesQuery } from '@/data/tables/tables-query'
import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL, IS_PLATFORM } from '@/lib/constants'
+import { getErrorMessage } from '@/lib/get-error-message'
export const QueuesSettings = () => {
const { data: project } = useSelectedProjectQuery()
const { can: canUpdatePostgrestConfig } = useAsyncCheckPermissionsV2(
FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_WRITE
)
+
+ const { isInstalled } = useIntegrationDetail()
+
const [isToggling, setIsToggling] = useState(false)
const [rlsConfirmModalOpen, setRlsConfirmModalOpen] = useState(false)
const [isUpdatingRls, setIsUpdatingRls] = useState(false)
@@ -48,44 +54,59 @@ export const QueuesSettings = () => {
const { formState } = form
const enable = useWatch({ control: form.control, name: 'enable' })
- const { data: queueTables } = useTablesQuery({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- schema: 'pgmq',
- })
+ const { data: queueTables } = useTablesQuery(
+ {
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ schema: 'pgmq',
+ },
+ { enabled: isInstalled }
+ )
const tablesWithoutRLS =
queueTables?.filter((x) => x.name.startsWith('q_') && !x.rls_enabled) ?? []
// pgmq lowercases queue names when building q_/a_ relations, but pgmq.meta keeps
// the original casing. Look up each relname in list_queues() so we render the
// user-provided name rather than the lowercased relname slice.
- const { data: queues } = useQueuesQuery({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- })
+ const { data: queues } = useQueuesQuery(
+ {
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ },
+ { enabled: isInstalled }
+ )
const queueDisplayName = (relname: string) => {
const stripped = relname.slice(2)
return queues?.find((q) => q.queue_name.toLowerCase() === stripped)?.queue_name ?? stripped
}
- const { data: config, error: configError } = useProjectPostgrestConfigQuery({
- projectRef: project?.ref,
- })
+ const { data: config, error: configError } = useProjectPostgrestConfigQuery(
+ {
+ projectRef: project?.ref,
+ },
+ { enabled: isInstalled }
+ )
const {
data: isExposed,
isSuccess,
isPending: isLoading,
- } = useQueuesExposePostgrestStatusQuery({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- })
+ } = useQueuesExposePostgrestStatusQuery(
+ {
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ },
+ { enabled: isInstalled }
+ )
const schemas = config?.db_schema.replace(/ /g, '').split(',') ?? []
- const { data: pgmqVersion } = useDatabaseQueuesVersionQuery({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- })
+ const { data: pgmqVersion } = useDatabaseQueuesVersionQuery(
+ {
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ },
+ { enabled: isInstalled }
+ )
const { mutateAsync: updateTable } = useTableUpdateMutation()
@@ -160,9 +181,9 @@ export const QueuesSettings = () => {
`Successfully enabled RLS on ${tablesWithoutRLS.length === 1 ? tablesWithoutRLS[0].name : `${tablesWithoutRLS.length} queue${tablesWithoutRLS.length > 1 ? 's' : ''}`} `
)
setRlsConfirmModalOpen(false)
- } catch (error: any) {
+ } catch (error) {
setIsUpdatingRls(false)
- toast.error(`Failed to enable RLS on queues: ${error.message}`)
+ toast.error(`Failed to enable RLS on queues: ${getErrorMessage(error)}`)
}
}
@@ -190,6 +211,18 @@ export const QueuesSettings = () => {
if (isSuccess) form.reset({ enable: isExposed })
}, [isSuccess])
+ if (!isInstalled) {
+ return (
+ <div className="mx-auto w-full max-w-6xl px-6 xl:px-10">
+ <ConstrainedIntegrationTabScaffold>
+ <PageSection className="py-0">
+ <Admonition type="default" description="Queues is not installed." />
+ </PageSection>
+ </ConstrainedIntegrationTabScaffold>
+ </div>
+ )
+ }
+
return (
<>
<ConstrainedIntegrationTabScaffold className="flex flex-col gap-y-4">
diff --git a/apps/studio/components/interfaces/Integrations/Queues/QueuesTab.tsx b/apps/studio/components/interfaces/Integrations/Queues/QueuesTab.tsx
index e3e39b220b6..8122c9163d4 100644
--- a/apps/studio/components/interfaces/Integrations/Queues/QueuesTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/Queues/QueuesTab.tsx
@@ -5,9 +5,13 @@ import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
import { useMemo, useRef, useState } from 'react'
import DataGrid, { Row } from 'react-data-grid'
import { Button, cn, LoadingLine, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
import { Input } from 'ui-patterns/DataInputs/Input'
+import { PageSection } from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+import { ConstrainedIntegrationTabScaffold } from '../ConstrainedIntegrationTabScaffold'
+import { useIntegrationDetail } from '../Landing/useIntegrationDetail'
import { CreateQueueSheet } from './CreateQueueSheet'
import { formatQueueColumns, prepareQueuesForDataGrid } from './Queues.utils'
import { AlertError } from '@/components/ui/AlertError'
@@ -22,6 +26,8 @@ export const QueuesTab = () => {
const { ref } = useParams()
const { data: project } = useSelectedProjectQuery()
+ const { isInstalled } = useIntegrationDetail()
+
const [searchQuery, setSearchQuery] = useQueryState('search', parseAsString.withDefault(''))
const [search, setSearch] = useState(searchQuery)
@@ -57,10 +63,13 @@ export const QueuesTab = () => {
isError,
isRefetching,
refetch,
- } = useQueuesQuery({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- })
+ } = useQueuesQuery(
+ {
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ },
+ { enabled: isInstalled }
+ )
// Filter queues based on search query
const filteredQueues = useMemo(() => {
@@ -77,6 +86,18 @@ export const QueuesTab = () => {
// Get columns configuration
const columns = useMemo(() => formatQueueColumns(), [])
+ if (!isInstalled) {
+ return (
+ <div className="mx-auto w-full max-w-6xl px-6 xl:px-10">
+ <ConstrainedIntegrationTabScaffold>
+ <PageSection className="py-0">
+ <Admonition type="default" description="Queues is not installed." />
+ </PageSection>
+ </ConstrainedIntegrationTabScaffold>
+ </div>
+ )
+ }
+
return (
<>
<div className="h-full w-full space-y-4">
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx
index 75d26e58a82..c3b23beb72e 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx
@@ -1,6 +1,6 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { useQueryClient } from '@tanstack/react-query'
-import { useEffect, useMemo } from 'react'
+import { useEffect } from 'react'
import { SubmitHandler, useFieldArray, useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
import {
@@ -27,20 +27,17 @@ import { InputField } from './InputField'
import { WrapperMeta } from './Wrappers.types'
import {
FormattedWrapperTable,
- getRequiredExtensionsToInstall,
getWrapperCreationFormSchema,
hasForeignSchemaSupport,
} from './Wrappers.utils'
import { useIsMarketplaceEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
-import { getExtensionDefaultSchema } from '@/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/IntegrationOverviewTabV2.utils'
import { RequiredExtensionsSection } from '@/components/interfaces/Integrations/Integration/RequiredExtensionsSection'
-import { useIntegrationDetail } from '@/components/interfaces/Integrations/Landing/useIntegrationDetail'
+import { useInstallRequiredExtensions } from '@/components/interfaces/Integrations/Integration/useInstallRequiredExtensions'
import {
FormSection,
FormSectionContent,
FormSectionLabel,
} from '@/components/ui/Forms/FormSection'
-import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/database-extension-enable-mutation'
import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
import { useSchemaCreateMutation } from '@/data/database/schema-create-mutation'
import { invalidateSchemasQuery, useSchemasQuery } from '@/data/database/schemas-query'
@@ -66,26 +63,23 @@ export const CreateWrapperSheet = ({
}: CreateWrapperSheetProps) => {
const queryClient = useQueryClient()
const isMarketplaceEnabled = useIsMarketplaceEnabled()
- const { integration } = useIntegrationDetail()
const { data: project } = useSelectedProjectQuery()
const track = useTrack()
+ const {
+ requiredExtensionsToInstall,
+ needsExtensions,
+ isExtensionDataLoading,
+ installRequiredExtensions,
+ } = useInstallRequiredExtensions()
const { data: extensions } = useDatabaseExtensionsQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
})
- // null while the query is in flight — distinct from [] which means "all installed"
- const requiredExtensionsToInstall = useMemo(
- () => getRequiredExtensionsToInstall(extensions, integration?.requiredExtensions ?? []),
- [extensions, integration?.requiredExtensions]
- )
-
const wrappersExtension = extensions?.find((ext) => ext.name === 'wrappers')
const hasRequiredVersionForeignSchema = hasForeignSchemaSupport(wrappersExtension)
- const needsExtensions = isMarketplaceEnabled && (requiredExtensionsToInstall?.length ?? 0) > 0
- const isExtensionDataLoading = isMarketplaceEnabled && requiredExtensionsToInstall === null
const { data: schemas } = useSchemasQuery({
projectRef: project?.ref!,
@@ -123,31 +117,9 @@ export const CreateWrapperSheet = ({
name: 'tables',
})
- const { mutateAsync: enableExtension } = useDatabaseExtensionEnableMutation({ onError: () => {} })
const { mutateAsync: createSchema } = useSchemaCreateMutation({ onError: () => {} })
const { mutateAsync: createFDW } = useFDWCreateMutation({ onError: () => {} })
- const installRequiredExtensions = async () => {
- if (!project) return
- const { ref: projectRef, connectionString } = project
- const results = await Promise.allSettled(
- (requiredExtensionsToInstall ?? []).map((ext) => {
- const schema = getExtensionDefaultSchema(ext) ?? 'extensions'
- return enableExtension({
- projectRef,
- connectionString,
- schema,
- name: ext.name,
- version: ext.default_version,
- cascade: true,
- createSchema: false,
- })
- })
- )
- const failure = results.find((r) => r.status === 'rejected')
- if (failure) throw new Error((failure as PromiseRejectedResult).reason.message)
- }
-
const onSubmit: SubmitHandler<FormSchema> = async (values) => {
const { mode, tables = [], ...wrapperValues } = values
if (mode === 'tables' && tables.length === 0) {
diff --git a/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/StripeSyncSettingsPage.tsx b/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/StripeSyncSettingsPage.tsx
index 52206f6a6a3..e28ea159386 100644
--- a/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/StripeSyncSettingsPage.tsx
+++ b/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/StripeSyncSettingsPage.tsx
@@ -33,7 +33,7 @@ export const StripeSyncSettingsPage = () => {
if (!installed || uninstalling) {
return (
<ConstrainedIntegrationTabScaffold>
- <PageSection>
+ <PageSection className="py-0">
<Admonition type="default" description="Stripe Sync Engine is not installed." />
</PageSection>
</ConstrainedIntegrationTabScaffold>
diff --git a/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts b/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts
index a72ec56fde2..01b899f7fe8 100644
--- a/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts
+++ b/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts
@@ -21,6 +21,7 @@ export async function getDatabaseQueuesExposePostgrestStatus({
projectRef,
connectionString,
sql,
+ queryKey: ['queues-postgrest-expose'],
})
return result[0].exists as boolean
}
diff --git a/apps/studio/data/database-queues/database-queues-query.ts b/apps/studio/data/database-queues/database-queues-query.ts
index 12698070796..4b54041602d 100644
--- a/apps/studio/data/database-queues/database-queues-query.ts
+++ b/apps/studio/data/database-queues/database-queues-query.ts
@@ -26,6 +26,7 @@ export async function getDatabaseQueues({ projectRef, connectionString }: Databa
projectRef,
connectionString,
sql: queueSqlQuery,
+ queryKey: ['list-queues'],
})
return result
}
diff --git a/e2e/studio/features/database-webhooks.spec.ts b/e2e/studio/features/database-webhooks.spec.ts
index b6bd2e523fe..50d7ff78e19 100644
--- a/e2e/studio/features/database-webhooks.spec.ts
+++ b/e2e/studio/features/database-webhooks.spec.ts
@@ -27,7 +27,7 @@ const navigateToWebhooksList = async (page: Page, ref: string) => {
}
const createWebhookViaUI = async (page: Page, hookName: string, tableName: string) => {
- await page.getByRole('button', { name: 'Create a new hook' }).click()
+ await page.getByRole('button', { name: 'Create webhook', exact: true }).click()
await expect(page.getByText('Create a new database webhook')).toBeVisible({ timeout: 10000 })
await page.locator('input[name="name"]').fill(hookName)
@@ -41,7 +41,7 @@ const createWebhookViaUI = async (page: Page, hookName: string, tableName: strin
.getByPlaceholder('http://api.com/path/resource')
.fill('http://localhost:3000/test-webhook')
- await page.getByRole('button', { name: 'Create webhook' }).click()
+ await page.locator('button[form="edit-hook-panel-form"]').click()
await expect(page.getByText(`Successfully created new webhook "${hookName}"`)).toBeVisible({
timeout: 10000,
})
@@ -92,7 +92,7 @@ test.describe('Database Webhooks', () => {
await navigateToWebhooksList(page, ref)
await expect(page.getByPlaceholder('Search for a webhook')).toBeVisible()
- await expect(page.getByRole('button', { name: 'Create a new hook' })).toBeVisible()
+ await expect(page.getByRole('button', { name: 'Create webhook', exact: true })).toBeVisible()
})
test('can create a new webhook with correct toast message', async ({ page, ref }) => {
@@ -103,7 +103,7 @@ test.describe('Database Webhooks', () => {
await ensureWebhooksEnabled(page, ref)
await navigateToWebhooksList(page, ref)
- await page.getByRole('button', { name: 'Create a new hook' }).click()
+ await page.getByRole('button', { name: 'Create webhook', exact: true }).click()
await expect(page.getByText('Create a new database webhook')).toBeVisible({ timeout: 10000 })
await page.locator('input[name="name"]').fill(hook)
@@ -114,7 +114,7 @@ test.describe('Database Webhooks', () => {
.getByPlaceholder('http://api.com/path/resource')
.fill('http://localhost:3000/test-webhook')
- await page.getByRole('button', { name: 'Create webhook' }).click()
+ await page.locator('button[form="edit-hook-panel-form"]').click()
await expect(page.getByText(`Successfully created new webhook "${hook}"`)).toBeVisible({
timeout: 10000,