Skip to content

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

chore: integration UI refinement (#45507)

Raminder Singh5a41d0155e5f
diff --git a/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx
index 4bde37f6017..c5463073d32 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx
@@ -97,9 +97,9 @@ export const AvailableIntegrations = () => {
<div className="p-4 md:p-10 md:py-8 flex flex-col gap-y-5">
<div className="grid xl:grid-cols-3 2xl:grid-cols-4 gap-x-4 gap-y-3">
{isLoading &&
- new Array(3)
- .fill(0)
- .map((_, idx) => <IntegrationLoadingCard key={`integration-loading-${idx}`} />)}
+ Array.from({ length: 3 }).map((_, idx) => (
+ <IntegrationLoadingCard key={`integration-loading-${idx}`} />
+ ))}
{isError && (
<AlertError
className="xl:col-span-3 2xl:col-span-4"
diff --git a/apps/studio/components/interfaces/Integrations/Landing/IntegrationCard.tsx b/apps/studio/components/interfaces/Integrations/Landing/IntegrationCard.tsx
index 83d067591c1..ae6e7e58271 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/IntegrationCard.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/IntegrationCard.tsx
@@ -6,7 +6,6 @@ import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import { IntegrationDefinition } from './Integrations.constants'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
-import { BASE_PATH } from '@/lib/constants'
type IntegrationCardProps = IntegrationDefinition & {
isInstalled?: boolean
@@ -58,7 +57,7 @@ export const IntegrationCard = ({
{image ? (
<Image
fill
- src={`${BASE_PATH}/${image}`}
+ src={image}
alt={`${name} integration`}
className="w-full h-full object-cover invert dark:invert-0"
objectFit="cover"
diff --git a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
index e7457ad3818..cf56fec2524 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
@@ -59,6 +59,7 @@ export type IntegrationDefinition = {
name: string
status?: 'alpha' | 'beta'
categories?: string[]
+ featured?: boolean
icon: (props?: { className?: string; style?: Record<string, string | number> }) => ReactNode
description: string | null
content?: string | null
diff --git a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
index 0e9576a7658..bfb48fcc6b7 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
@@ -42,6 +42,7 @@ export const useAvailableIntegrations = () => {
id: listingId,
slug,
categories,
+ featured,
title,
description,
documentation_url: docsUrl,
@@ -63,6 +64,7 @@ export const useAvailableIntegrations = () => {
id: slug ?? '',
name: title ?? '',
status,
+ featured: !!featured,
type: 'oauth' as const, // Currently marketplace only supports oauth apps
categories: Array.isArray(categories)
? (categories as Array<{ slug: string }>).map((x) => x.slug)
diff --git a/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx b/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx
index 1dc72aa687d..56d56a3e5a5 100644
--- a/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx
+++ b/apps/studio/components/layouts/ProjectIntegrationsLayout.tsx
@@ -10,6 +10,7 @@ import { ProjectLayout } from '@/components/layouts/ProjectLayout'
import AlertError from '@/components/ui/AlertError'
import { ProductMenu } from '@/components/ui/ProductMenu'
import { marketplaceCategoriesQueryOptions } from '@/data/marketplace/integration-categories-query'
+import { marketplaceIntegrationsQueryOptions } from '@/data/marketplace/integrations-query'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { withAuth } from '@/hooks/misc/withAuth'
@@ -55,9 +56,23 @@ const IntegrationCategoriesMenu = ({ page }: { page: string }) => {
const { data: categories = [], isPending: isPendingCategories } = useQuery(
marketplaceCategoriesQueryOptions({ enabled: isMarketplaceEnabled })
)
+ const { data: listings = [], isPending: isPendingListings } = useQuery(
+ marketplaceIntegrationsQueryOptions({ enabled: isMarketplaceEnabled })
+ )
+
+ const populatedCategoryIds = new Set(
+ listings.flatMap((listing) =>
+ Array.isArray(listing.categories)
+ ? (listing.categories as Array<{ id: string }>).map((c) => c.id)
+ : []
+ )
+ )
+ const nonEmptyCategories = categories.filter(
+ (category) => category.id && populatedCategoryIds.has(category.id)
+ )
const isLoading = IS_PLATFORM
- ? !flagsLoaded || (isMarketplaceEnabled && isPendingCategories)
+ ? !flagsLoaded || (isMarketplaceEnabled && (isPendingCategories || isPendingListings))
: false
const allCategories = [
@@ -84,7 +99,7 @@ const IntegrationCategoriesMenu = ({ page }: { page: string }) => {
url: `/project/${ref}/integrations?category=postgres_extension`,
items: [],
},
- ...categories.map((category) => ({
+ ...nonEmptyCategories.map((category) => ({
name: category.name ?? '',
key: category.slug ?? '',
url: `/project/${ref}/integrations?category=${category.slug}`,
diff --git a/apps/studio/pages/project/[ref]/integrations/index.tsx b/apps/studio/pages/project/[ref]/integrations/index.tsx
index 9a441eb26ea..d8345c8a619 100644
--- a/apps/studio/pages/project/[ref]/integrations/index.tsx
+++ b/apps/studio/pages/project/[ref]/integrations/index.tsx
@@ -1,6 +1,11 @@
+import { useQuery } from '@tanstack/react-query'
+import { IS_PLATFORM, useFeatureFlags, useFlag } from 'common'
+import { Database } from 'common/marketplace.types'
import { Search } from 'lucide-react'
+import { useRouter } from 'next/router'
import { parseAsString, useQueryState } from 'nuqs'
-import { useMemo } from 'react'
+import { useMemo, type ReactNode } from 'react'
+import { ShimmeringLoader } from 'ui-patterns'
import { Input } from 'ui-patterns/DataInputs/Input'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
@@ -17,6 +22,7 @@ import {
IntegrationCard,
IntegrationLoadingCard,
} from '@/components/interfaces/Integrations/Landing/IntegrationCard'
+import { IntegrationDefinition } from '@/components/interfaces/Integrations/Landing/Integrations.constants'
import { useAvailableIntegrations } from '@/components/interfaces/Integrations/Landing/useAvailableIntegrations'
import { useInstalledIntegrations } from '@/components/interfaces/Integrations/Landing/useInstalledIntegrations'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
@@ -24,72 +30,131 @@ import { ProjectIntegrationsLayout } from '@/components/layouts/ProjectIntegrati
import { AlertError } from '@/components/ui/AlertError'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoSearchResults } from '@/components/ui/NoSearchResults'
-import { DOCS_URL } from '@/lib/constants'
+import { marketplaceCategoriesQueryOptions } from '@/data/marketplace/integration-categories-query'
+import { BASE_PATH, DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
const FEATURED_INTEGRATIONS = ['cron', 'queues', 'stripe_sync_engine']
// Featured integration images
const FEATURED_INTEGRATION_IMAGES: Record<string, string> = {
- cron: 'img/integrations/covers/cron-cover.webp',
- queues: 'img/integrations/covers/queues-cover.png',
- stripe_wrapper: 'img/integrations/covers/stripe-cover.png',
- stripe_sync_engine: 'img/integrations/covers/stripe-cover.png',
+ cron: `${BASE_PATH}/img/integrations/covers/cron-cover.webp`,
+ queues: `${BASE_PATH}/img/integrations/covers/queues-cover.png`,
+ stripe_wrapper: `${BASE_PATH}/img/integrations/covers/stripe-cover.png`,
+ stripe_sync_engine: `${BASE_PATH}/img/integrations/covers/stripe-cover.png`,
}
-const IntegrationsPage: NextPageWithLayout = () => {
+function getIntegrationImage(integration: IntegrationDefinition) {
+ let featured_image = FEATURED_INTEGRATION_IMAGES[integration.id]
+ if (featured_image) {
+ return featured_image
+ }
+
+ if (integration.files?.length) {
+ const heroImage = integration?.files?.[0]
+ return heroImage
+ }
+}
+
+type PageContent = {
+ title: string
+ subtitle: string
+ secondaryActions?: ReactNode
+}
+
+const DEFAULT_PAGE_CONTENT: PageContent = {
+ title: 'Extend your database',
+ subtitle:
+ 'Extensions and wrappers that add functionality to your database and connect to external services.',
+}
+
+const CATEGORY_PAGE_CONTENT = {
+ wrapper: {
+ title: 'Wrappers',
+ subtitle:
+ 'Connect to external data sources and services by querying APIs, databases, and files as if they were Postgres tables.',
+ secondaryActions: (
+ <DocsButton href={`${DOCS_URL}/guides/database/extensions/wrappers/overview`} />
+ ),
+ },
+ postgres_extension: {
+ title: 'Postgres Modules',
+ subtitle: 'Extend your database with powerful Postgres extensions.',
+ },
+} satisfies Record<string, PageContent>
+
+// Converts a category string to title
+// Example: some_catory -> Some Category
+function formatCategoryTitle(category: string) {
+ return category
+ .split(/[-_]/)
+ .filter(Boolean)
+ .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+ .join(' ')
+}
+
+const PageHeaderContentSkeleton = () => (
+ <div className="flex flex-col gap-y-2">
+ <ShimmeringLoader className="h-8 w-48" />
+ <ShimmeringLoader className="h-4 w-full max-w-xl" />
+ </div>
+)
+
+// Returns selected category to filter by
+function useFilterCategory() {
+ const router = useRouter()
const [selectedCategory] = useQueryState(
'category',
parseAsString.withDefault('all').withOptions({ clearOnDefault: true })
)
- const [search, setSearch] = useQueryState(
- 'search',
- parseAsString.withDefault('').withOptions({ clearOnDefault: true })
- )
+ const categoryFromUrl = useMemo(() => {
+ const queryString = router.asPath.split('?')[1]
+ if (!queryString) return null
- const {
- data: availableIntegrations,
- error,
- isPending: isLoadingAvailableIntegrations,
- isError,
- isSuccess: isSuccessAvailableIntegrations,
- } = useAvailableIntegrations()
+ return new URLSearchParams(queryString).get('category')
+ }, [router.asPath])
+ const resolvedSelectedCategory = router.isReady
+ ? (categoryFromUrl ?? selectedCategory)
+ : undefined
+ const filterCategory = resolvedSelectedCategory ?? 'all'
+ return filterCategory
+}
- 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 category
+function usePageContent(
+ integrationFilterCategory: string,
+ categories: Database['public']['Views']['categories']['Row'][]
+) {
+ const pageContent = useMemo<PageContent>(() => {
+ if (integrationFilterCategory === 'all') {
+ return DEFAULT_PAGE_CONTENT
+ }
- // Dynamic page content based on selected category
- const pageContent = useMemo(() => {
- switch (selectedCategory) {
- case 'wrapper':
- return {
- title: 'Wrappers',
- subtitle:
- 'Connect to external data sources and services by querying APIs, databases, and files as if they were Postgres tables.',
- secondaryActions: (
- <DocsButton href={`${DOCS_URL}/guides/database/extensions/wrappers/overview`} />
- ),
- }
- case 'postgres_extension':
- return {
- title: 'Postgres Modules',
- subtitle: 'Extend your database with powerful Postgres extensions.',
- }
- default:
- return {
- title: 'Extend your database',
- subtitle:
- 'Extensions and wrappers that add functionality to your database and connect to external services.',
- }
+ if (integrationFilterCategory in CATEGORY_PAGE_CONTENT) {
+ return CATEGORY_PAGE_CONTENT[integrationFilterCategory as keyof typeof CATEGORY_PAGE_CONTENT]
}
- }, [selectedCategory])
+ const selectedMarketplaceCategory = categories.find(
+ (category) => category.slug === integrationFilterCategory
+ )
+
+ return {
+ title: selectedMarketplaceCategory?.name ?? formatCategoryTitle(integrationFilterCategory),
+ subtitle: selectedMarketplaceCategory?.description ?? DEFAULT_PAGE_CONTENT.subtitle,
+ }
+ }, [categories, integrationFilterCategory])
+ return pageContent
+}
+
+// Filters all available integrations first by category,
+// then by the search term and sorts them first by
+// installation status and then alphabetically
+function useFilteredAndSortedIntegrations(
+ availableIntegrations: IntegrationDefinition[],
+ selectedCategory: string,
+ search: string,
+ installedIds: string[]
+) {
const filteredAndSortedIntegrations = useMemo(() => {
let filtered = availableIntegrations ?? []
@@ -115,30 +180,95 @@ const IntegrationsPage: NextPageWithLayout = () => {
})
}, [availableIntegrations, selectedCategory, search, installedIds])
+ return filteredAndSortedIntegrations
+}
+
+// Returns featured integrations
+function useFeaturedIntegratios(
+ filteredAndSortedIntegrations: IntegrationDefinition[],
+ selectedCategory: string,
+ search: string
+) {
const groupedIntegrations = useMemo(() => {
if (selectedCategory !== 'all' || search.length > 0) {
return null
}
- const featured = filteredAndSortedIntegrations.filter((i) =>
- FEATURED_INTEGRATIONS.includes(i.id)
+ const featured = filteredAndSortedIntegrations.filter(
+ (integration) => FEATURED_INTEGRATIONS.includes(integration.id) || integration.featured
)
- const allIntegrations = filteredAndSortedIntegrations // Include all integrations, including featured
-
- return {
- featured,
- allIntegrations,
- }
+ return featured
}, [filteredAndSortedIntegrations, selectedCategory, search])
+ return groupedIntegrations
+}
+
+const IntegrationsPage: NextPageWithLayout = () => {
+ const { hasLoaded: flagsLoaded } = useFeatureFlags()
+ const isMarketplaceEnabled = useFlag('marketplaceIntegrations')
+ const [search, setSearch] = useQueryState(
+ 'search',
+ parseAsString.withDefault('').withOptions({ clearOnDefault: true })
+ )
+
+ 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
+
+ const selectedCategory = useFilterCategory()
+
+ const { data: categories = [], isPending: isPendingCategories } = useQuery(
+ marketplaceCategoriesQueryOptions({ enabled: isMarketplaceEnabled })
+ )
+
+ const isLoadingSelectedCategory =
+ selectedCategory !== 'all' &&
+ !(selectedCategory in CATEGORY_PAGE_CONTENT) &&
+ (IS_PLATFORM ? !flagsLoaded || (isMarketplaceEnabled && isPendingCategories) : false)
+
+ const pageContent = usePageContent(selectedCategory, categories)
+
+ const filteredAndSortedIntegrations = useFilteredAndSortedIntegrations(
+ availableIntegrations,
+ selectedCategory,
+ search,
+ installedIds
+ )
+
+ const featuredIntegrations = useFeaturedIntegratios(
+ filteredAndSortedIntegrations,
+ selectedCategory,
+ search
+ )
+
return (
<>
<PageHeader size="large">
<PageHeaderMeta>
<PageHeaderSummary>
- <PageHeaderTitle>{pageContent.title}</PageHeaderTitle>
- <PageHeaderDescription>{pageContent.subtitle}</PageHeaderDescription>
+ {isLoadingSelectedCategory ? (
+ <PageHeaderContentSkeleton />
+ ) : (
+ <>
+ <PageHeaderTitle>{pageContent.title}</PageHeaderTitle>
+ <PageHeaderDescription>{pageContent.subtitle}</PageHeaderDescription>
+ </>
+ )}
</PageHeaderSummary>
{pageContent.secondaryActions && (
<PageHeaderAside>{pageContent.secondaryActions}</PageHeaderAside>
@@ -165,7 +295,7 @@ const IntegrationsPage: NextPageWithLayout = () => {
className="grid xl:grid-cols-3 2xl:grid-cols-4 gap-x-4 gap-y-3"
style={{ gridAutoRows: 'minmax(110px, auto)' }}
>
- {new Array(8).fill(0).map((_, idx) => (
+ {Array.from({ length: 8 }).map((_, idx) => (
<IntegrationLoadingCard key={`integration-loading-${idx}`} />
))}
</div>
@@ -184,46 +314,26 @@ const IntegrationsPage: NextPageWithLayout = () => {
<NoSearchResults searchString={search} onResetFilter={() => setSearch('')} />
)}
- {/* Grouped View (All integrations, no search) */}
- {groupedIntegrations && (
- <>
- {/* Featured Integrations */}
- {groupedIntegrations.featured.length > 0 && (
- <div
- className="grid grid-cols-2 @4xl:grid-cols-3 gap-4 mb-4 items-stretch pb-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 && (
- <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>
- )}
- </>
+ {/* Featured Integrations */}
+ {featuredIntegrations && featuredIntegrations.length > 0 && (
+ <div
+ className="grid grid-cols-2 @4xl:grid-cols-3 gap-4 mb-4 items-stretch pb-6 border-b"
+ style={{ gridAutoRows: 'minmax(110px, auto)' }}
+ >
+ {featuredIntegrations.map((integration) => (
+ <IntegrationCard
+ key={integration.id}
+ {...integration}
+ isInstalled={installedIds.includes(integration.id)}
+ featured={true}
+ image={getIntegrationImage(integration)}
+ />
+ ))}
+ </div>
)}
- {/* Single List View (Category filtered or searching) */}
- {!groupedIntegrations && filteredAndSortedIntegrations.length > 0 && (
+ {/* All Filtered and Sorted Integrations */}
+ {filteredAndSortedIntegrations.length > 0 && (
<div className="grid @xl:grid-cols-3 @6xl:grid-cols-4 gap-4">
{filteredAndSortedIntegrations.map((integration) => (
<IntegrationCard