The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Joshen/fe 2670 dashboard to pull partner integrations into project (#43545)
Joshen Lim9949b7501166
diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/FilesViewer.tsx b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/FilesViewer.tsxnew file mode 100644index 00000000000..6ece9fab583--- /dev/null+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/FilesViewer.tsx@@ -0,0 +1,28 @@+import { useState } from 'react'+import { cn } from 'ui'++export const FilesViewer = ({ files }: { files: string[] }) => {+ const [selected, setSelected] = useState(files[0])++ return (+ <div className="flex flex-col gap-y-4">+ <img alt={selected} src={selected} className="rounded-md border" />+ {files.length > 1 && (+ <div className="grid grid-cols-10 gap-x-2">+ {files.map((x) => (+ <button key={x} onClick={() => setSelected(x)}>+ <img+ alt={x}+ src={x}+ className={cn(+ 'col-span-1 bg-surface-100 rounded-md object-cover aspect-square border transition',+ selected === x ? 'border-stronger' : 'border-secondary'+ )}+ />+ </button>+ ))}+ </div>+ )}+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/index.tsx b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/index.tsxnew file mode 100644index 00000000000..5b4b88a430c--- /dev/null+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/index.tsx@@ -0,0 +1,97 @@+import { useParams } from 'common'+import { Markdown } from 'components/interfaces/Markdown'+import { cn } from 'ui'++import { useAvailableIntegrations } from '../../Landing/useAvailableIntegrations'+import { FilesViewer } from './FilesViewer'+import { InlineLinkClassName } from '@/components/ui/InlineLink'++const getSiteUrlLabel = (url: string | undefined | null) => {+ if (!url) return undefined++ try {+ return new URL(url).origin+ } catch (error) {+ return undefined+ }+}++const isGithubHost = (url: string | undefined | null) => {+ if (!url) return false+ try {+ const hostname = new URL(url).hostname.toLowerCase()+ return hostname === 'github.com' || hostname.endsWith('.github.com')+ } catch (error) {+ return false+ }+}++/**+ * [Joshen] This will serve as the overview tab for remotely fetched integrations+ */+export const IntegrationOverviewTabV2 = () => {+ const { id } = useParams()++ const { data: allIntegrations } = useAvailableIntegrations()+ const integration = allIntegrations.find((i) => i.id === id)++ if (!integration) {+ return <div>Unsupported integration type</div>+ }++ const { type, content, docsUrl, siteUrl, files = [] } = integration++ const docsUrlLabel = docsUrl?.includes('supabase.com/docs')+ ? 'Supabase Docs'+ : isGithubHost(docsUrl)+ ? 'GitHub Docs'+ : 'Documentation'+ const siteUrlLabel = getSiteUrlLabel(siteUrl)++ return (+ <div className="grid grid-cols-3 gap-x-8 px-10 py-8">+ <div className="col-span-2 flex flex-col gap-y-8">+ {files.length > 0 && <FilesViewer files={files} />}+ <Markdown className="flex flex-col gap-y-4 text-foreground-light">{content}</Markdown>+ </div>++ <div className="text-sm col-span-1 flex flex-col gap-y-8">+ <div className="flex flex-col gap-y-4">+ <p>Details</p>++ <div className="flex flex-col gap-y-1">+ <p className="font-mono uppercase text-foreground-light">Type</p>+ <p className="capitalize">{type === 'oauth' ? 'OAuth' : type}</p>+ </div>++ <div className="flex flex-col gap-y-1">+ <p className="font-mono uppercase text-foreground-light">Built by</p>+ <p className={cn(!integration.author.name && 'text-foreground-lighter')}>+ {integration.author.name || 'Unknown Author'}+ </p>+ </div>++ {docsUrl && (+ <div className="flex flex-col gap-y-1">+ <p className="font-mono uppercase text-foreground-light">Docs</p>+ <a target="_blank" rel="noreferrer" href={docsUrl} className={InlineLinkClassName}>+ {docsUrlLabel}+ </a>+ </div>+ )}++ {siteUrl && (+ <div className="flex flex-col gap-y-1">+ <p className="font-mono uppercase text-foreground-light">Website</p>+ <a target="_blank" rel="noreferrer" href={siteUrl} className={InlineLinkClassName}>+ {siteUrlLabel}+ </a>+ </div>+ )}+ </div>++ {/* Subsequent sections here */}+ </div>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsxindex 02b94d5b95d..0cd1b5748e7 100644--- a/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx+++ b/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx@@ -1,13 +1,14 @@-import { Search } from 'lucide-react'-import { parseAsString, useQueryState } from 'nuqs'-import AlertError from 'components/ui/AlertError'import { NoSearchResults } from 'components/ui/NoSearchResults'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import { Search } from 'lucide-react'+import { parseAsString, useQueryState } from 'nuqs'import { buttonVariants, cn, Tabs_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { Input } from 'ui-patterns/DataInputs/Input'+import { IntegrationCard, IntegrationLoadingCard } from './IntegrationCard'+import { useAvailableIntegrations } from './useAvailableIntegrations'import { useInstalledIntegrations } from './useInstalledIntegrations'type IntegrationCategory = 'all' | 'wrapper' | 'postgres_extensions' | 'custom'@@ -29,14 +30,8 @@ export const AvailableIntegrations = () => {parseAsString.withDefault('').withOptions({ clearOnDefault: true }))- const {- availableIntegrations: allIntegrations,- installedIntegrations,- error,- isError,- isLoading,- isSuccess,- } = useInstalledIntegrations()+ const { data: allIntegrations = [] } = useAvailableIntegrations()+ const { installedIntegrations, error, isError, isLoading, isSuccess } = useInstalledIntegrations()const installedIds = installedIntegrations.map((i) => i.id)diff --git a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsxindex 56df1d9e3eb..57fc0b77400 100644--- a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx+++ b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx@@ -18,7 +18,7 @@ export type Navigation = {children?: Navigation[]}-const Loading = () => (+export const Loading = () => (<div className="p-10"><GenericSkeletonLoader /></div>@@ -28,9 +28,13 @@ export type IntegrationDefinition = {id: stringname: stringstatus?: 'alpha' | 'beta'+ categories?: string[]icon: (props?: { className?: string; style?: Record<string, any> }) => ReactNode- description: string- docsUrl: string+ description: string | null+ content?: string | null+ files?: string[]+ docsUrl: string | null+ siteUrl?: string | nullauthor: {name: stringwebsiteUrl: string@@ -44,7 +48,10 @@ export type IntegrationDefinition = {pageId: string | undefined,childId: string | undefined) => ComponentType<{}> | null-} & ({ type: 'wrapper'; meta: WrapperMeta } | { type: 'postgres_extension' } | { type: 'custom' })+} & (+ | { type: 'wrapper'; meta: WrapperMeta }+ | { type: 'postgres_extension' | 'custom' | 'oauth' | 'template' }+)const authorSupabase = {name: 'Supabase',diff --git a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsxnew file mode 100644index 00000000000..ad6e2aa1079--- /dev/null+++ b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx@@ -0,0 +1,136 @@+import { useQuery } from '@tanstack/react-query'+import { FeatureFlagContext, IS_PLATFORM, useFlag } from 'common'+import { Boxes } from 'lucide-react'+import dynamic from 'next/dynamic'+import { useContext, useMemo } from 'react'+import { cn } from 'ui'++import { INTEGRATIONS, Loading, type IntegrationDefinition } from './Integrations.constants'+import { marketplaceIntegrationsQueryOptions } from '@/data/marketplace/integrations-query'+import { useCLIReleaseVersionQuery } from '@/data/misc/cli-release-version-query'+import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'++/**+ * [Joshen] Returns a combination of+ * - Marketplace integrations retrieved remotely (Only if feature flag enabled)+ * - Existing integrations that are defined within studio+ */+export const useAvailableIntegrations = () => {+ const { hasLoaded } = useContext(FeatureFlagContext)+ const isMarketplaceEnabled = useFlag('marketplaceIntegrations')+ const { integrationsWrappers } = useIsFeatureEnabled(['integrations:wrappers'])++ const { data: cliData } = useCLIReleaseVersionQuery()+ const isCLI = !!cliData?.current++ const { data, error } = useQuery({+ ...marketplaceIntegrationsQueryOptions(),+ enabled: isMarketplaceEnabled,+ })+ const isPending = IS_PLATFORM && (!hasLoaded || (isMarketplaceEnabled && !data && !error))+ const isSuccess = !IS_PLATFORM || (hasLoaded && (!isMarketplaceEnabled || (!!data && !error)))+ const isError = IS_PLATFORM && isMarketplaceEnabled && !!error++ // [Joshen] Format marketplace integrations into existing ones for now+ // Likely that we might need to change, but can look into separately+ const marketplaceIntegrations: IntegrationDefinition[] = (data ?? [])?.map((integration) => {+ const {+ id,+ type,+ categories,+ title: name,+ summary: description,+ documentation_url: docsUrl,+ url: siteUrl,+ content,+ files,+ } = integration++ const status = undefined+ const author = { name: '', websiteUrl: '' }++ return {+ id: id.toString(),+ name,+ status,+ type,+ categories: categories.map((x) => x.slug),+ content,+ files,+ description,+ docsUrl,+ siteUrl,+ author,+ requiredExtensions: [],+ icon: ({ className, ...props } = {}) => (+ <Boxes className={cn('inset-0 p-2 text-black w-full h-full', className)} {...props} />+ ),+ navigation: [+ {+ route: 'overview',+ label: 'Overview',+ },+ ],+ navigate: (id: string, pageId: string = 'overview', childId: string | undefined) => {+ switch (pageId) {+ case 'overview':+ return dynamic(+ () =>+ import(+ 'components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/index'+ ).then((mod) => mod.IntegrationOverviewTabV2),+ {+ loading: Loading,+ }+ )+ case 'secrets':+ return dynamic(+ () =>+ import('../Vault/Secrets/SecretsManagement').then((mod) => mod.SecretsManagement),+ {+ loading: Loading,+ }+ )+ }+ return null+ },+ }+ })++ // [Joshen] Existing integrations that are defined within studio+ // Available integrations are all integrations that can be installed. If an integration can't be installed (needed+ // extensions are not available on this DB image), the UI will provide a tooltip explaining why.+ const allIntegrations = useMemo(() => {+ return INTEGRATIONS.filter((integration) => {+ if (+ !integrationsWrappers &&+ (integration.type === 'wrapper' || integration.id.endsWith('_wrapper'))+ ) {+ return false+ }++ if (integration.id === 'stripe_sync_engine' && isCLI) {+ return false+ }++ if (integration.id === 'data_api' && !IS_PLATFORM) {+ return false+ }++ return true+ })+ }, [integrationsWrappers, isCLI])++ const availableIntegrations = useMemo(+ () => allIntegrations.sort((a, b) => a.name.localeCompare(b.name)),+ [allIntegrations]+ )++ return {+ data: [...marketplaceIntegrations, ...availableIntegrations],+ error,+ isPending,+ isSuccess,+ isError,+ }+}diff --git a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsxindex b9d362895f7..584797e49e5 100644--- a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx+++ b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx@@ -98,13 +98,6 @@ export const useInstalledIntegrations = () => {.sort((a, b) => a.name.localeCompare(b.name))}, [allIntegrations, wrappers, extensions, schemas, isHooksEnabled])- // available integrations are all integrations that can be installed. If an integration can't be installed (needed- // extensions are not available on this DB image), the UI will provide a tooltip explaining why.- const availableIntegrations = useMemo(- () => allIntegrations.sort((a, b) => a.name.localeCompare(b.name)),- [allIntegrations]- )-const error = fdwError || extensionsError || schemasErrorconst isLoading = isSchemasLoading || isFDWLoading || isExtensionsLoadingconst isError = isErrorFDWs || isErrorExtensions || isErrorSchemas@@ -113,7 +106,6 @@ export const useInstalledIntegrations = () => {return {// show all integrations at once instead of showing partial resultsinstalledIntegrations: isLoading ? EMPTY_ARR : installedIntegrations,- availableIntegrations: isLoading ? EMPTY_ARR : availableIntegrations,error,isError,isLoading,diff --git a/apps/studio/components/layouts/Integrations/layout.tsx b/apps/studio/components/layouts/Integrations/layout.tsxdeleted file mode 100644index 06110b1ce80..00000000000--- a/apps/studio/components/layouts/Integrations/layout.tsx+++ /dev/null@@ -1,148 +0,0 @@-import { useRouter } from 'next/router'-import { PropsWithChildren } from 'react'--import { useInstalledIntegrations } from 'components/interfaces/Integrations/Landing/useInstalledIntegrations'-import { ProjectLayout } from 'components/layouts/ProjectLayout'-import AlertError from 'components/ui/AlertError'-import { ProductMenu } from 'components/ui/ProductMenu'-import { ProductMenuGroup } from 'components/ui/ProductMenu/ProductMenu.types'-import { ProductMenuItem } from 'components/ui/ProductMenu/ProductMenuItem'-import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { withAuth } from 'hooks/misc/withAuth'-import { Menu, Separator } from 'ui'-import { GenericSkeletonLoader } from 'ui-patterns'--/**- * Layout component for the Integrations section- * Provides sidebar navigation for integrations- */-const IntegrationsLayout = ({ children }: PropsWithChildren) => {- const router = useRouter()- const { data: project } = useSelectedProjectQuery()- const { integrationsWrappers: showWrappers } = useIsFeatureEnabled(['integrations:wrappers'])-- const segments = router.asPath.split('/')- // construct the page url to be used to determine the active state for the sidebar- const page = `${segments[3]}${segments[4] ? `/${segments[4]}` : ''}`-- // Check for category query parameter to determine active menu item- const urlParams = new URLSearchParams(router.asPath.split('?')[1] || '')- const categoryParam = urlParams.get('category')-- const {- installedIntegrations: integrations,- error,- isLoading,- isSuccess,- isError,- } = useInstalledIntegrations()-- const installedIntegrationItems = integrations.map((integration) => ({- name: integration.name,- label: integration.status,- key: `integrations/${integration.id}`,- url: `/project/${project?.ref}/integrations/${integration.id}/overview`,- icon: (- <div className="relative w-6 h-6 bg-white border rounded flex items-center justify-center">- {integration.icon({ className: 'p-1' })}- </div>- ),- items: [],- }))-- return (- <ProjectLayout- title={'Integrations'}- product="Integrations"- isBlocking={false}- productMenu={- <>- <ProductMenu- page={- page === 'integrations'- ? categoryParam- ? `integrations-${categoryParam}`- : 'integrations'- : page- }- menu={generateIntegrationsMenu({ projectRef: project?.ref, flags: { showWrappers } })}- />- <Separator />- <div className="px-4 py-6 md:px-6">- <Menu.Group- title={- <div className="flex flex-col space-y-2 uppercase font-mono">- <span>Installed</span>- </div>- }- />- {isLoading && <GenericSkeletonLoader />}- {isError && (- <AlertError- showIcon={false}- error={error}- subject="Failed to retrieve installed integrations"- />- )}- {isSuccess && (- <div>- {installedIntegrationItems.map((item) => (- <ProductMenuItem key={item.key} isActive={page === item.key} item={item} />- ))}- </div>- )}- </div>- </>- }- >- {children}- </ProjectLayout>- )-}--// Wrap component with authentication HOC before exporting-export default withAuth(IntegrationsLayout)--const generateIntegrationsMenu = ({- projectRef,- flags,-}: {- projectRef?: string- flags?: { showWrappers: boolean }-}): ProductMenuGroup[] => {- const { showWrappers } = flags ?? {}-- return [- {- title: 'Explore',- items: [- {- name: 'All',- key: 'integrations',- url: `/project/${projectRef}/integrations`,- pages: ['integrations'],- items: [],- },- ...(showWrappers- ? [- {- name: 'Wrappers',- key: 'integrations-wrapper',- url: `/project/${projectRef}/integrations?category=wrapper`,- pages: ['integrations?category=wrapper'],- items: [],- },- ]- : []),- {- name: 'Postgres Modules',- key: 'integrations-postgres_extension',- url: `/project/${projectRef}/integrations?category=postgres_extension`,- pages: ['integrations?category=postgres_extension'],- items: [],- },- ],- },- ].filter(Boolean)-}diff --git a/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx b/apps/studio/components/layouts/ProjectIntegrationsLayout.tsxnew file mode 100644index 00000000000..58bab529809--- /dev/null+++ b/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx@@ -0,0 +1,155 @@+import { useQuery } from '@tanstack/react-query'+import { IS_PLATFORM, useFeatureFlags, useFlag, useParams } from 'common'+import { useInstalledIntegrations } from 'components/interfaces/Integrations/Landing/useInstalledIntegrations'+import { ProjectLayout } from 'components/layouts/ProjectLayout'+import AlertError from 'components/ui/AlertError'+import { ProductMenuItem } from 'components/ui/ProductMenu/ProductMenuItem'+import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import { withAuth } from 'hooks/misc/withAuth'+import { useRouter } from 'next/router'+import { PropsWithChildren } from 'react'+import { Menu, Separator } from 'ui'+import { GenericSkeletonLoader } from 'ui-patterns'++import { marketplaceCategoriesQueryOptions } from '@/data/marketplace/integration-categories-query'++/**+ * Layout component for the Integrations section+ * Provides sidebar navigation for integrations+ */+export const ProjectIntegrationsLayout = withAuth(({ children }: PropsWithChildren) => {+ const router = useRouter()+ const segments = router.asPath.split('/')+ // construct the page url to be used to determine the active state for the sidebar+ const page = `${segments[3]}${segments[4] ? `/${segments[4]}` : ''}`++ return (+ <ProjectLayout+ title={'Integrations'}+ product="Integrations"+ isBlocking={false}+ productMenu={+ <>+ <IntegrationCategoriesMenu page={page} />+ <Separator />+ <InstalledIntegrationsMenu page={page} />+ </>+ }+ >+ {children}+ </ProjectLayout>+ )+})++const IntegrationCategoriesMenu = ({ page }: { page: string }) => {+ const router = useRouter()+ const { ref } = useParams()+ const { hasLoaded: flagsLoaded } = useFeatureFlags()+ const isMarketplaceEnabled = useFlag('marketplaceIntegrations')++ const urlParams = new URLSearchParams(router.asPath.split('?')[1] || '')+ const categoryParam = urlParams.get('category')+ const pageKey = categoryParam || page++ const { integrationsWrappers: showWrappers } = useIsFeatureEnabled(['integrations:wrappers'])+ const { data: categories = [], isPending: isPendingCategories } = useQuery(+ marketplaceCategoriesQueryOptions({ enabled: isMarketplaceEnabled })+ )++ const isLoading = IS_PLATFORM+ ? !flagsLoaded || (isMarketplaceEnabled && isPendingCategories)+ : false++ const allCategories = [+ {+ name: 'All',+ key: 'integrations',+ url: `/project/${ref}/integrations`,+ pages: ['integrations'],+ items: [],+ },+ ...(showWrappers+ ? [+ {+ name: 'Wrappers',+ key: 'wrapper',+ url: `/project/${ref}/integrations?category=wrapper`,+ items: [],+ },+ ]+ : []),+ {+ name: 'Postgres Modules',+ key: 'postgres_extension',+ url: `/project/${ref}/integrations?category=postgres_extension`,+ items: [],+ },+ ...categories.map((category) => ({+ name: category.title,+ key: category.slug,+ url: `/project/${ref}/integrations?category=${category.slug}`,+ items: [],+ })),+ ]++ return (+ <div className="px-4 py-6 md:px-6">+ <Menu.Group title={<span className="uppercase font-mono">Explore</span>} />+ {isLoading ? (+ <GenericSkeletonLoader />+ ) : (+ <div>+ {allCategories.map((item) => (+ <ProductMenuItem key={item.key} isActive={pageKey === item.key} item={item} />+ ))}+ </div>+ )}+ </div>+ )+}++const InstalledIntegrationsMenu = ({ page }: { page: string }) => {+ const { ref } = useParams()++ const {+ installedIntegrations: integrations,+ error,+ isLoading,+ isSuccess,+ isError,+ } = useInstalledIntegrations()++ const installedIntegrationItems = integrations.map((integration) => ({+ name: integration.name,+ label: integration.status,+ key: `integrations/${integration.id}`,+ url: `/project/${ref}/integrations/${integration.id}/overview`,+ icon: (+ <div className="relative w-6 h-6 bg-white border rounded flex items-center justify-center">+ {integration.icon({ className: 'p-1' })}+ </div>+ ),+ items: [],+ }))++ return (+ <div className="px-4 py-6 md:px-6">+ <Menu.Group title={<span className="uppercase font-mono">Installed</span>} />+ {isLoading && <GenericSkeletonLoader />}+ {isError && (+ <AlertError+ showIcon={false}+ error={error}+ subject="Failed to retrieve installed integrations"+ />+ )}+ {isSuccess && (+ <div>+ {installedIntegrationItems.map((item) => (+ <ProductMenuItem key={item.key} isActive={page === item.key} item={item} />+ ))}+ </div>+ )}+ </div>+ )+}diff --git a/apps/studio/data/marketplace/integration-categories-query.ts b/apps/studio/data/marketplace/integration-categories-query.tsnew file mode 100644index 00000000000..ed41d145e12--- /dev/null+++ b/apps/studio/data/marketplace/integration-categories-query.ts@@ -0,0 +1,23 @@+import { queryOptions } from '@tanstack/react-query'+import { handleError } from 'data/fetchers'++import { marketplaceIntegrationsKeys } from './keys'+import { createMarketplaceClient } from './marketplace-client'++async function getMarketplaceCategories() {+ const client = createMarketplaceClient()+ const { data, error } = await client.from('categories').select('*')++ if (error) handleError(error)+ return data ?? []+}++export const marketplaceCategoriesQueryOptions = ({+ enabled = true,+}: { enabled?: boolean } = {}) => {+ return queryOptions({+ queryKey: marketplaceIntegrationsKeys.categories(),+ queryFn: () => getMarketplaceCategories(),+ enabled,+ })+}diff --git a/apps/studio/data/marketplace/integrations-query.ts b/apps/studio/data/marketplace/integrations-query.tsnew file mode 100644index 00000000000..7aedbd00e35--- /dev/null+++ b/apps/studio/data/marketplace/integrations-query.ts@@ -0,0 +1,25 @@+import { queryOptions } from '@tanstack/react-query'+import { handleError } from 'data/fetchers'++import { marketplaceIntegrationsKeys } from './keys'+import { createMarketplaceClient } from './marketplace-client'++async function getMarketplaceIntegrations() {+ const client = createMarketplaceClient()+ const { data, error } = await client+ .from('items')+ .select('*, categories:category_items(...categories(slug, title))')++ if (error) handleError(error)+ return data ?? []+}++export const marketplaceIntegrationsQueryOptions = ({+ enabled = true,+}: { enabled?: boolean } = {}) => {+ return queryOptions({+ queryKey: marketplaceIntegrationsKeys.list(),+ queryFn: () => getMarketplaceIntegrations(),+ enabled,+ })+}diff --git a/apps/studio/data/marketplace/keys.ts b/apps/studio/data/marketplace/keys.tsnew file mode 100644index 00000000000..1d4bada39b3--- /dev/null+++ b/apps/studio/data/marketplace/keys.ts@@ -0,0 +1,4 @@+export const marketplaceIntegrationsKeys = {+ list: () => ['marketplace', 'integrations'] as const,+ categories: () => ['marketplace', 'categories'] as const,+}diff --git a/apps/studio/data/marketplace/marketplace-client.ts b/apps/studio/data/marketplace/marketplace-client.tsnew file mode 100644index 00000000000..aa3679a10c9--- /dev/null+++ b/apps/studio/data/marketplace/marketplace-client.ts@@ -0,0 +1,21 @@+import { createClient } from '@supabase/supabase-js'++import type { Database } from './marketplace.types'++export const createMarketplaceClient = () => {+ const API_URL = process.env.NEXT_PUBLIC_MARKETPLACE_API_URL || ''+ const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_MARKETPLACE_PUBLISHABLE_KEY || ''++ return createClient<Database>(API_URL, PUBLISHABLE_KEY, {+ auth: {+ persistSession: false,+ autoRefreshToken: false,+ detectSessionInUrl: false,+ storage: {+ getItem: (_key: string) => null,+ setItem: (_key: string, _value: string) => {},+ removeItem: (_key: string) => {},+ },+ },+ })+}diff --git a/apps/studio/data/marketplace/marketplace.types.ts b/apps/studio/data/marketplace/marketplace.types.tsnew file mode 100644index 00000000000..06d17342560--- /dev/null+++ b/apps/studio/data/marketplace/marketplace.types.ts@@ -0,0 +1,453 @@+export type Json = string | number | boolean | null | { [key: string]: Json | undefined } | Json[]++export type Database = {+ // Allows to automatically instantiate createClient with right options+ // instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)+ __InternalSupabase: {+ PostgrestVersion: '14.4'+ }+ graphql_public: {+ Tables: {+ [_ in never]: never+ }+ Views: {+ [_ in never]: never+ }+ Functions: {+ graphql: {+ Args: {+ extensions?: Json+ operationName?: string+ query?: string+ variables?: Json+ }+ Returns: Json+ }+ }+ Enums: {+ [_ in never]: never+ }+ CompositeTypes: {+ [_ in never]: never+ }+ }+ public: {+ Tables: {+ categories: {+ Row: {+ created_at: string+ description: string | null+ id: number+ slug: string+ title: string+ updated_at: string+ }+ Insert: {+ created_at?: string+ description?: string | null+ id?: never+ slug: string+ title: string+ updated_at?: string+ }+ Update: {+ created_at?: string+ description?: string | null+ id?: never+ slug?: string+ title?: string+ updated_at?: string+ }+ Relationships: []+ }+ category_items: {+ Row: {+ category_id: number+ created_at: string+ item_id: number+ }+ Insert: {+ category_id: number+ created_at?: string+ item_id: number+ }+ Update: {+ category_id?: number+ created_at?: string+ item_id?: number+ }+ Relationships: [+ {+ foreignKeyName: 'category_items_category_id_fkey'+ columns: ['category_id']+ isOneToOne: false+ referencedRelation: 'categories'+ referencedColumns: ['id']+ },+ {+ foreignKeyName: 'category_items_item_id_fkey'+ columns: ['item_id']+ isOneToOne: false+ referencedRelation: 'items'+ referencedColumns: ['id']+ },+ ]+ }+ item_reviews: {+ Row: {+ created_at: string+ featured: boolean+ item_id: number+ published_at: string | null+ review_notes: string | null+ reviewed_at: string | null+ reviewed_by: string | null+ status: Database['public']['Enums']['marketplace_review_status']+ updated_at: string+ }+ Insert: {+ created_at?: string+ featured?: boolean+ item_id: number+ published_at?: string | null+ review_notes?: string | null+ reviewed_at?: string | null+ reviewed_by?: string | null+ status?: Database['public']['Enums']['marketplace_review_status']+ updated_at?: string+ }+ Update: {+ created_at?: string+ featured?: boolean+ item_id?: number+ published_at?: string | null+ review_notes?: string | null+ reviewed_at?: string | null+ reviewed_by?: string | null+ status?: Database['public']['Enums']['marketplace_review_status']+ updated_at?: string+ }+ Relationships: [+ {+ foreignKeyName: 'item_reviews_item_id_fkey'+ columns: ['item_id']+ isOneToOne: true+ referencedRelation: 'items'+ referencedColumns: ['id']+ },+ ]+ }+ items: {+ Row: {+ content: string | null+ created_at: string+ documentation_url: string | null+ files: string[]+ id: number+ partner_id: number+ published: boolean+ registry_item_url: string | null+ slug: string+ submitted_by: string | null+ summary: string | null+ title: string+ type: Database['public']['Enums']['marketplace_item_type']+ updated_at: string+ url: string | null+ }+ Insert: {+ content?: string | null+ created_at?: string+ documentation_url?: string | null+ files?: string[]+ id?: never+ partner_id: number+ published?: boolean+ registry_item_url?: string | null+ slug: string+ submitted_by?: string | null+ summary?: string | null+ title: string+ type: Database['public']['Enums']['marketplace_item_type']+ updated_at?: string+ url?: string | null+ }+ Update: {+ content?: string | null+ created_at?: string+ documentation_url?: string | null+ files?: string[]+ id?: never+ partner_id?: number+ published?: boolean+ registry_item_url?: string | null+ slug?: string+ submitted_by?: string | null+ summary?: string | null+ title?: string+ type?: Database['public']['Enums']['marketplace_item_type']+ updated_at?: string+ url?: string | null+ }+ Relationships: [+ {+ foreignKeyName: 'items_partner_id_fkey'+ columns: ['partner_id']+ isOneToOne: false+ referencedRelation: 'partners'+ referencedColumns: ['id']+ },+ ]+ }+ partner_members: {+ Row: {+ created_at: string+ partner_id: number+ role: string+ user_id: string+ }+ Insert: {+ created_at?: string+ partner_id: number+ role?: string+ user_id: string+ }+ Update: {+ created_at?: string+ partner_id?: number+ role?: string+ user_id?: string+ }+ Relationships: [+ {+ foreignKeyName: 'partner_members_partner_id_fkey'+ columns: ['partner_id']+ isOneToOne: false+ referencedRelation: 'partners'+ referencedColumns: ['id']+ },+ ]+ }+ partners: {+ Row: {+ created_at: string+ created_by: string | null+ description: string | null+ id: number+ logo_url: string | null+ role: Database['public']['Enums']['marketplace_partner_role']+ slug: string+ title: string+ updated_at: string+ website: string | null+ }+ Insert: {+ created_at?: string+ created_by?: string | null+ description?: string | null+ id?: never+ logo_url?: string | null+ role?: Database['public']['Enums']['marketplace_partner_role']+ slug: string+ title: string+ updated_at?: string+ website?: string | null+ }+ Update: {+ created_at?: string+ created_by?: string | null+ description?: string | null+ id?: never+ logo_url?: string | null+ role?: Database['public']['Enums']['marketplace_partner_role']+ slug?: string+ title?: string+ updated_at?: string+ website?: string | null+ }+ Relationships: []+ }+ }+ Views: {+ [_ in never]: never+ }+ Functions: {+ add_partner_member: {+ Args: {+ target_email: string+ target_partner_id: number+ target_role?: string+ }+ Returns: {+ created_at: string+ partner_id: number+ role: string+ user_id: string+ }+ SetofOptions: {+ from: '*'+ to: 'partner_members'+ isOneToOne: true+ isSetofReturn: false+ }+ }+ before_user_created_hook: { Args: { event: Json }; Returns: Json }+ is_admin_member: { Args: never; Returns: boolean }+ is_partner_admin: {+ Args: { target_partner_id: number }+ Returns: boolean+ }+ is_partner_member: {+ Args: { target_partner_id: number }+ Returns: boolean+ }+ is_review_manager_member: { Args: never; Returns: boolean }+ is_reviewer_member: { Args: never; Returns: boolean }+ item_latest_review_is_approved: {+ Args: { target_item_id: number }+ Returns: boolean+ }+ storage_object_item_id: { Args: { object_name: string }; Returns: number }+ storage_object_partner_id: {+ Args: { object_name: string }+ Returns: number+ }+ }+ Enums: {+ marketplace_item_type: 'oauth' | 'template'+ marketplace_partner_role: 'partner' | 'reviewer' | 'admin'+ marketplace_review_status: 'draft' | 'pending_review' | 'approved' | 'rejected'+ }+ CompositeTypes: {+ [_ in never]: never+ }+ }+}++type DatabaseWithoutInternals = Omit<Database, '__InternalSupabase'>++type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, 'public'>]++export type Tables<+ DefaultSchemaTableNameOrOptions extends+ | keyof (DefaultSchema['Tables'] & DefaultSchema['Views'])+ | { schema: keyof DatabaseWithoutInternals },+ TableName extends DefaultSchemaTableNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+ }+ ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Tables'] &+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Views'])+ : never = never,+> = DefaultSchemaTableNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+}+ ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Tables'] &+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Views'])[TableName] extends {+ Row: infer R+ }+ ? R+ : never+ : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema['Tables'] & DefaultSchema['Views'])+ ? (DefaultSchema['Tables'] & DefaultSchema['Views'])[DefaultSchemaTableNameOrOptions] extends {+ Row: infer R+ }+ ? R+ : never+ : never++export type TablesInsert<+ DefaultSchemaTableNameOrOptions extends+ | keyof DefaultSchema['Tables']+ | { schema: keyof DatabaseWithoutInternals },+ TableName extends DefaultSchemaTableNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+ }+ ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Tables']+ : never = never,+> = DefaultSchemaTableNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+}+ ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Tables'][TableName] extends {+ Insert: infer I+ }+ ? I+ : never+ : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema['Tables']+ ? DefaultSchema['Tables'][DefaultSchemaTableNameOrOptions] extends {+ Insert: infer I+ }+ ? I+ : never+ : never++export type TablesUpdate<+ DefaultSchemaTableNameOrOptions extends+ | keyof DefaultSchema['Tables']+ | { schema: keyof DatabaseWithoutInternals },+ TableName extends DefaultSchemaTableNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+ }+ ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Tables']+ : never = never,+> = DefaultSchemaTableNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+}+ ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions['schema']]['Tables'][TableName] extends {+ Update: infer U+ }+ ? U+ : never+ : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema['Tables']+ ? DefaultSchema['Tables'][DefaultSchemaTableNameOrOptions] extends {+ Update: infer U+ }+ ? U+ : never+ : never++export type Enums<+ DefaultSchemaEnumNameOrOptions extends+ | keyof DefaultSchema['Enums']+ | { schema: keyof DatabaseWithoutInternals },+ EnumName extends DefaultSchemaEnumNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+ }+ ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions['schema']]['Enums']+ : never = never,+> = DefaultSchemaEnumNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+}+ ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions['schema']]['Enums'][EnumName]+ : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema['Enums']+ ? DefaultSchema['Enums'][DefaultSchemaEnumNameOrOptions]+ : never++export type CompositeTypes<+ PublicCompositeTypeNameOrOptions extends+ | keyof DefaultSchema['CompositeTypes']+ | { schema: keyof DatabaseWithoutInternals },+ CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+ }+ ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes']+ : never = never,+> = PublicCompositeTypeNameOrOptions extends {+ schema: keyof DatabaseWithoutInternals+}+ ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'][CompositeTypeName]+ : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema['CompositeTypes']+ ? DefaultSchema['CompositeTypes'][PublicCompositeTypeNameOrOptions]+ : never++export const Constants = {+ graphql_public: {+ Enums: {},+ },+ public: {+ Enums: {+ marketplace_item_type: ['oauth', 'template'],+ marketplace_partner_role: ['partner', 'reviewer', 'admin'],+ marketplace_review_status: ['draft', 'pending_review', 'approved', 'rejected'],+ },+ },+} as constdiff --git a/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/[childId]/index.tsx b/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/[childId]/index.tsxindex 4388c94e708..d2892ad1926 100644--- a/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/[childId]/index.tsx+++ b/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/[childId]/index.tsx@@ -2,7 +2,6 @@ import { useParams } from 'common'import { INTEGRATIONS } from 'components/interfaces/Integrations/Landing/Integrations.constants'import { useInstalledIntegrations } from 'components/interfaces/Integrations/Landing/useInstalledIntegrations'import { DefaultLayout } from 'components/layouts/DefaultLayout'-import IntegrationsLayout from 'components/layouts/Integrations/layout'import { useRouter } from 'next/router'import { useEffect, useMemo } from 'react'import type { NextPageWithLayout } from 'types'@@ -18,15 +17,19 @@ import {import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import { useAvailableIntegrations } from '@/components/interfaces/Integrations/Landing/useAvailableIntegrations'+import { ProjectIntegrationsLayout } from '@/components/layouts/ProjectIntegrationsLayout'+const IntegrationPage: NextPageWithLayout = () => {const router = useRouter()const { ref, id, pageId, childId } = useParams()+ const { data: allIntegrations } = useAvailableIntegrations()const { installedIntegrations: installedIntegrations, isLoading: isIntegrationsLoading } =useInstalledIntegrations()// everything is wrapped in useMemo to avoid UI resets when installing additional extensions like pg_net- const integration = useMemo(() => INTEGRATIONS.find((i) => i.id === id), [id])+ const integration = useMemo(() => allIntegrations.find((i) => i.id === id), [allIntegrations, id])const installation = useMemo(() => installedIntegrations.find((inst) => inst.id === id),@@ -96,7 +99,7 @@ const IntegrationPage: NextPageWithLayout = () => {IntegrationPage.getLayout = (page) => (<DefaultLayout>- <IntegrationsLayout>{page}</IntegrationsLayout>+ <ProjectIntegrationsLayout>{page}</ProjectIntegrationsLayout></DefaultLayout>)diff --git a/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/index.tsx b/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/index.tsxindex 030eb5cf126..be24d7081de 100644--- a/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/index.tsx+++ b/apps/studio/pages/project/[ref]/integrations/[id]/[pageId]/index.tsx@@ -2,7 +2,6 @@ import { useParams } from 'common'import { INTEGRATIONS } from 'components/interfaces/Integrations/Landing/Integrations.constants'import { useInstalledIntegrations } from 'components/interfaces/Integrations/Landing/useInstalledIntegrations'import { DefaultLayout } from 'components/layouts/DefaultLayout'-import IntegrationsLayout from 'components/layouts/Integrations/layout'import { UnknownInterface } from 'components/ui/UnknownInterface'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { IS_PLATFORM } from 'lib/constants'@@ -16,6 +15,7 @@ import {BreadcrumbList_Shadcn_ as BreadcrumbList,BreadcrumbPage_Shadcn_ as BreadcrumbPage,BreadcrumbSeparator_Shadcn_ as BreadcrumbSeparator,+ Button,NavMenu,NavMenuItem,} from 'ui'@@ -33,7 +33,10 @@ import {PageSection,PageSectionContent,} from 'ui-patterns'-import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import ShimmeringLoader, { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'++import { useAvailableIntegrations } from '@/components/interfaces/Integrations/Landing/useAvailableIntegrations'+import { ProjectIntegrationsLayout } from '@/components/layouts/ProjectIntegrationsLayout'type NavigationItem = { label: string; href: string; active?: boolean }@@ -42,11 +45,15 @@ const IntegrationPage: NextPageWithLayout = () => {const { ref, id, pageId, childId } = useParams()const { integrationsWrappers } = useIsFeatureEnabled(['integrations:wrappers'])- const { installedIntegrations: installedIntegrations, isLoading: isIntegrationsLoading } =- useInstalledIntegrations()+ const { data: allIntegrations, isPending: isAvailableIntegrationsLoading } =+ useAvailableIntegrations()+ const {+ installedIntegrations: installedIntegrations,+ isLoading: isInstalledIntegrationsLoading,+ } = useInstalledIntegrations()// everything is wrapped in useMemo to avoid UI resets when installing additional extensions like pg_net- const integration = useMemo(() => INTEGRATIONS.find((i) => i.id === id), [id])+ const integration = useMemo(() => allIntegrations.find((i) => i.id === id), [allIntegrations, id])const installation = useMemo(() => installedIntegrations.find((inst) => inst.id === id),@@ -83,13 +90,13 @@ const IntegrationPage: NextPageWithLayout = () => {if (router &&router?.isReady &&- !isIntegrationsLoading &&+ !isInstalledIntegrationsLoading &&!installation &&pageId !== 'overview') {router.replace(`/project/${ref}/integrations/${id}/overview`)}- }, [installation, isIntegrationsLoading, pageId, router, ref, id])+ }, [installation, isInstalledIntegrationsLoading, pageId, router, ref, id])// Determine page title, icon, and subtitle based on stateconst pageTitle = integration?.name || 'Integration not found'@@ -99,14 +106,14 @@ const IntegrationPage: NextPageWithLayout = () => {// Get integration icon and subtitleconst pageIcon = integration ? (- <div className="shrink-0 w-10 h-10 relative bg-white border rounded-md flex items-center justify-center">+ <div className="shrink-0 w-14 h-14 relative bg-white border rounded-md flex items-center justify-center">{integration.icon()}</div>) : null// Determine content based on stateconst content = useMemo(() => {- if (!router?.isReady || isIntegrationsLoading) {+ if (!router?.isReady || isInstalledIntegrationsLoading || isAvailableIntegrationsLoading) {return (<PageContainer size="full"><PageSection>@@ -118,18 +125,27 @@ const IntegrationPage: NextPageWithLayout = () => {)} else if (!Component || !id || !integration) {return (- <PageSection>- <PageSectionContent>- <Admonition type="warning" title="This integration is not currently available">- Please try again later or contact support if the problem persists.- </Admonition>- </PageSectionContent>- </PageSection>+ <PageContainer size="full">+ <PageSection>+ <PageSectionContent>+ <Admonition type="warning" title="This integration is not currently available">+ Please try again later or contact support if the problem persists.+ </Admonition>+ </PageSectionContent>+ </PageSection>+ </PageContainer>)} else {return <Component />}- }, [router?.isReady, isIntegrationsLoading, id, integration, Component])+ }, [+ router?.isReady,+ isInstalledIntegrationsLoading,+ isAvailableIntegrationsLoading,+ id,+ integration,+ Component,+ ])if (!router?.isReady) {return null@@ -159,13 +175,36 @@ const IntegrationPage: NextPageWithLayout = () => {</BreadcrumbItem></BreadcrumbList></PageHeaderBreadcrumb>- <PageHeaderMeta>- {pageIcon && <PageHeaderIcon>{pageIcon}</PageHeaderIcon>}- <PageHeaderSummary>- <PageHeaderTitle>{pageTitle}</PageHeaderTitle>- <PageHeaderDescription>{pageSubTitle}</PageHeaderDescription>- </PageHeaderSummary>- </PageHeaderMeta>++ {isAvailableIntegrationsLoading ? (+ <PageHeaderMeta>+ <PageHeaderSummary>+ <PageHeaderTitle>+ <ShimmeringLoader className="w-64 py-4" />+ </PageHeaderTitle>+ <PageHeaderDescription>+ <ShimmeringLoader />+ </PageHeaderDescription>+ </PageHeaderSummary>+ </PageHeaderMeta>+ ) : (+ <PageHeaderMeta>+ {pageIcon && <PageHeaderIcon>{pageIcon}</PageHeaderIcon>}+ <PageHeaderSummary className="truncate gap-y-0.5">+ <PageHeaderTitle>{pageTitle}</PageHeaderTitle>+ <PageHeaderDescription className="truncate">{pageSubTitle}</PageHeaderDescription>+ </PageHeaderSummary>++ {integration?.type === 'oauth' && (+ <Button asChild type="primary" className="shrink-0">+ <a target="_blank" rel="noreferrer" href={integration.siteUrl ?? '/'}>+ Install integration+ </a>+ </Button>+ )}+ </PageHeaderMeta>+ )}+{navigationItems.length > 0 && (<PageHeaderNavigationTabs><NavMenu>@@ -186,7 +225,7 @@ const IntegrationPage: NextPageWithLayout = () => {IntegrationPage.getLayout = (page) => (<DefaultLayout>- <IntegrationsLayout>{page}</IntegrationsLayout>+ <ProjectIntegrationsLayout>{page}</ProjectIntegrationsLayout></DefaultLayout>)diff --git a/apps/studio/pages/project/[ref]/integrations/[id]/index.tsx b/apps/studio/pages/project/[ref]/integrations/[id]/index.tsxindex b310792e5b4..dbde514bf08 100644--- a/apps/studio/pages/project/[ref]/integrations/[id]/index.tsx+++ b/apps/studio/pages/project/[ref]/integrations/[id]/index.tsx@@ -1,14 +1,14 @@-import { useRouter } from 'next/router'-import { useEffect } from 'react'-import { useParams } from 'common'import { DefaultLayout } from 'components/layouts/DefaultLayout'-import IntegrationsLayout from 'components/layouts/Integrations/layout'+import { useRouter } from 'next/router'+import { useEffect } from 'react'import type { NextPageWithLayout } from 'types'import { PageContainer } from 'ui-patterns/PageContainer'import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import { ProjectIntegrationsLayout } from '@/components/layouts/ProjectIntegrationsLayout'+const IntegrationPage: NextPageWithLayout = () => {const router = useRouter()const { ref, id } = useParams()@@ -33,7 +33,7 @@ const IntegrationPage: NextPageWithLayout = () => {IntegrationPage.getLayout = (page) => (<DefaultLayout>- <IntegrationsLayout>{page}</IntegrationsLayout>+ <ProjectIntegrationsLayout>{page}</ProjectIntegrationsLayout></DefaultLayout>)diff --git a/apps/studio/pages/project/[ref]/integrations/index.tsx b/apps/studio/pages/project/[ref]/integrations/index.tsxindex 79e163acc97..6dfe42bcefa 100644--- a/apps/studio/pages/project/[ref]/integrations/index.tsx+++ b/apps/studio/pages/project/[ref]/integrations/index.tsx@@ -4,7 +4,6 @@ import {} from 'components/interfaces/Integrations/Landing/IntegrationCard'import { useInstalledIntegrations } from 'components/interfaces/Integrations/Landing/useInstalledIntegrations'import { DefaultLayout } from 'components/layouts/DefaultLayout'-import IntegrationsLayout from 'components/layouts/Integrations/layout'import { AlertError } from 'components/ui/AlertError'import { DocsButton } from 'components/ui/DocsButton'import { NoSearchResults } from 'components/ui/NoSearchResults'@@ -25,6 +24,9 @@ import {} from 'ui-patterns/PageHeader'import { PageSection, PageSectionContent, PageSectionMeta } from 'ui-patterns/PageSection'+import { useAvailableIntegrations } from '@/components/interfaces/Integrations/Landing/useAvailableIntegrations'+import { ProjectIntegrationsLayout } from '@/components/layouts/ProjectIntegrationsLayout'+const FEATURED_INTEGRATIONS = ['cron', 'queues', 'stripe_sync_engine']// Featured integration images@@ -45,10 +47,22 @@ const IntegrationsPage: NextPageWithLayout = () => {parseAsString.withDefault('').withOptions({ clearOnDefault: true }))- const { availableIntegrations, installedIntegrations, error, isError, isLoading, isSuccess } =- useInstalledIntegrations()-+ const {+ data: availableIntegrations,+ error,+ isPending: isLoadingAvailableIntegrations,+ isError,+ isSuccess: isSuccessAvailableIntegrations,+ } = useAvailableIntegrations()++ const {+ installedIntegrations,+ isLoading: isLoadingInstalledIntegrations,+ isSuccess: isSuccessInstalledIntegrations,+ } = useInstalledIntegrations()const installedIds = installedIntegrations.map((i) => i.id)+ const isLoading = isLoadingAvailableIntegrations || isLoadingInstalledIntegrations+ const isSuccess = isSuccessAvailableIntegrations && isSuccessInstalledIntegrations// Dynamic page content based on selected categoryconst pageContent = useMemo(() => {@@ -77,10 +91,12 @@ const IntegrationsPage: NextPageWithLayout = () => {}, [selectedCategory])const filteredAndSortedIntegrations = useMemo(() => {- let filtered = availableIntegrations+ let filtered = availableIntegrations ?? []if (selectedCategory !== 'all') {- filtered = filtered.filter((i) => i.type === selectedCategory)+ filtered = filtered.filter(+ (i) => i.type === selectedCategory || i.categories?.includes(selectedCategory)+ )}if (search.length > 0) {@@ -116,47 +132,6 @@ const IntegrationsPage: NextPageWithLayout = () => {}}, [filteredAndSortedIntegrations, selectedCategory, search])- // Helper component to render featured integrations grid- const FeaturedIntegrationsGrid = ({- integrations,- }: {- integrations: typeof filteredAndSortedIntegrations- }) => (- <div- className="grid grid-cols-2 @4xl:grid-cols-3 gap-4 mb-4 items-stretch pb-6 mb-6 border-b"- style={{ gridAutoRows: 'minmax(110px, auto)' }}- >- {integrations.map((integration) => (- <IntegrationCard- key={integration.id}- {...integration}- isInstalled={installedIds.includes(integration.id)}- featured={true}- image={FEATURED_INTEGRATION_IMAGES[integration.id]}- />- ))}- </div>- )-- // Helper component to render all integrations grid- const AllIntegrationsGrid = ({- integrations,- }: {- integrations: typeof filteredAndSortedIntegrations- }) => (- <div className="grid @xl:grid-cols-3 @6xl:grid-cols-4 gap-4">- {integrations.map((integration) => (- <IntegrationCard- key={integration.id}- {...integration}- isInstalled={installedIds.includes(integration.id)}- featured={false}- image={FEATURED_INTEGRATION_IMAGES[integration.id]}- />- ))}- </div>- )-return (<><PageHeader size="large">@@ -214,19 +189,52 @@ const IntegrationsPage: NextPageWithLayout = () => {<>{/* Featured Integrations */}{groupedIntegrations.featured.length > 0 && (- <FeaturedIntegrationsGrid integrations={groupedIntegrations.featured} />+ <div+ className="grid grid-cols-2 @4xl:grid-cols-3 gap-4 mb-4 items-stretch pb-6 mb-6 border-b"+ style={{ gridAutoRows: 'minmax(110px, auto)' }}+ >+ {groupedIntegrations.featured.map((integration) => (+ <IntegrationCard+ key={integration.id}+ {...integration}+ isInstalled={installedIds.includes(integration.id)}+ featured={true}+ image={FEATURED_INTEGRATION_IMAGES[integration.id]}+ />+ ))}+ </div>)}{/* All Integrations */}{groupedIntegrations.allIntegrations.length > 0 && (- <AllIntegrationsGrid integrations={groupedIntegrations.allIntegrations} />+ <div className="grid @xl:grid-cols-3 @6xl:grid-cols-4 gap-4">+ {groupedIntegrations.allIntegrations.map((integration) => (+ <IntegrationCard+ key={integration.id}+ {...integration}+ isInstalled={installedIds.includes(integration.id)}+ featured={false}+ image={FEATURED_INTEGRATION_IMAGES[integration.id]}+ />+ ))}+ </div>)}</>)}{/* Single List View (Category filtered or searching) */}{!groupedIntegrations && filteredAndSortedIntegrations.length > 0 && (- <AllIntegrationsGrid integrations={filteredAndSortedIntegrations} />+ <div className="grid @xl:grid-cols-3 @6xl:grid-cols-4 gap-4">+ {filteredAndSortedIntegrations.map((integration) => (+ <IntegrationCard+ key={integration.id}+ {...integration}+ isInstalled={installedIds.includes(integration.id)}+ featured={false}+ image={FEATURED_INTEGRATION_IMAGES[integration.id]}+ />+ ))}+ </div>)}</>)}@@ -239,7 +247,7 @@ const IntegrationsPage: NextPageWithLayout = () => {IntegrationsPage.getLayout = (page) => (<DefaultLayout>- <IntegrationsLayout>{page}</IntegrationsLayout>+ <ProjectIntegrationsLayout>{page}</ProjectIntegrationsLayout></DefaultLayout>)