Skip to content

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

feat(www): fetch partner integration listings from marketing-db (#45725)

Alex Hallda44ab3088c6
diff --git a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
index f65a769b7c4..0e9576a7658 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/useAvailableIntegrations.tsx
@@ -1,5 +1,6 @@
import { useQuery } from '@tanstack/react-query'
import { FeatureFlagContext, IS_PLATFORM, useFlag } from 'common'
+import { fullImageUrl } from 'common/marketplace-client'
import { Boxes } from 'lucide-react'
import dynamic from 'next/dynamic'
import Image from 'next/image'
@@ -11,11 +12,6 @@ import { marketplaceIntegrationsQueryOptions } from '@/data/marketplace/integrat
import { useCLIReleaseVersionQuery } from '@/data/misc/cli-release-version-query'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
-const fullImageUrl = (imagePath: string) => {
- const API_URL = process.env.NEXT_PUBLIC_MARKETPLACE_API_URL || ''
- return `${API_URL}${imagePath}`
-}
-
/**
* [Joshen] Returns a combination of
* - Marketplace integrations retrieved remotely (Only if feature flag enabled)
diff --git a/apps/www/.env.local.example b/apps/www/.env.local.example
index 614342fc7fa..8e5de146b7e 100644
--- a/apps/www/.env.local.example
+++ b/apps/www/.env.local.example
@@ -2,6 +2,7 @@
CMS_API_KEY=secret
CMS_PREVIEW_SECRET=secret
HCAPTCHA_SECRET_KEY=0x0000000000000000000000000000000000000000
+INTEGRATIONS_MARKETPLACE_DB=true
MISC_USE_SERVICE_ROLE_KEY=secret
NEXT_PUBLIC_API_URL=http://localhost:8080/platform
NEXT_PUBLIC_DESIGN_SYSTEM_URL=http://localhost:3003
@@ -9,6 +10,8 @@ NEXT_PUBLIC_DOCS_URL=http://localhost:3005
NEXT_PUBLIC_ENVIRONMENT=local
NEXT_PUBLIC_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
NEXT_PUBLIC_IS_PLATFORM=true
+NEXT_PUBLIC_MARKETPLACE_API_URL=https://fgxbxpvumhvzrhqngsyu.supabase.co
+NEXT_PUBLIC_MARKETPLACE_PUBLISHABLE_KEY=sb_publishable_VuF5ZvGqj6ODhZgN1J_vMw_YbiEs1R6
NEXT_PUBLIC_MISC_USE_ANON_KEY=sb_publishable_t45SVhgymMJOuamUXzJzPQ_sY-tSoUr
NEXT_PUBLIC_MISC_USE_URL=https://obuldanrptloktxcffvn.supabase.co
NEXT_PUBLIC_POSTHOG_HOST=https://ph.supabase.green
diff --git a/apps/www/components/Partners/TileGrid.tsx b/apps/www/components/Partners/TileGrid.tsx
index 5bf14a244dd..6f18eff16b1 100644
--- a/apps/www/components/Partners/TileGrid.tsx
+++ b/apps/www/components/Partners/TileGrid.tsx
@@ -1,6 +1,7 @@
+import type { Category, Partner } from '~/types/partners'
+import type { Listing } from 'common/marketplace-client'
import Image from 'next/image'
import Link from 'next/link'
-import type { Partner } from '~/types/partners'
export default function TileGrid({
partners,
@@ -9,12 +10,20 @@ export default function TileGrid({
partners: Partner[]
hideCategories?: boolean
}) {
- const partnersByCategory: { [category: string]: Partner[] } = {}
- partners.forEach(
- (p) => (partnersByCategory[p.category] = [...(partnersByCategory[p.category] ?? []), p])
+ const partnersByCategory: { [slug: string]: { category: Category; partners: Partner[] } } = {}
+ partners.forEach((p) =>
+ // TODO: This will result in duplicate listings if a partner appears in multiple categories. Consider choosing just one.
+ p.categories.forEach((category) => {
+ if (!partnersByCategory[category.slug]) {
+ partnersByCategory[category.slug] = { category, partners: [] }
+ }
+ partnersByCategory[category.slug].partners.push(p)
+ })
)
- const featuredPartners = partners.filter((p) => p.featured)
+ const featuredPartners = partners
+ .filter((p) => p.featured)
+ .toSorted((a, b) => a.title.localeCompare(b.title))
return (
<>
@@ -65,49 +74,56 @@ export default function TileGrid({
</div>
</div>
) : null}
- {Object.keys(partnersByCategory).map((category) => (
- <div key={category} id={category.toLowerCase()} className="space-y-8">
- {!hideCategories && <h2 className="h2">{category}</h2>}
- <div className="grid grid-cols-1 gap-5 lg:max-w-none lg:grid-cols-2 xl:grid-cols-3">
- {partnersByCategory[category].map((p) => (
- <Link key={p.slug} href={`/partners/integrations/${p.slug}`}>
- <div
- className="
+ {Object.keys(partnersByCategory)
+ .toSorted()
+ .map((slug) => {
+ const partners = partnersByCategory[slug].partners.toSorted((a, b) =>
+ a.title.localeCompare(b.title)
+ )
+ return (
+ <div key={slug} id={slug} className="space-y-8">
+ {!hideCategories && <h2 className="h2">{partnersByCategory[slug].category.name}</h2>}
+ <div className="grid grid-cols-1 gap-5 lg:max-w-none lg:grid-cols-2 xl:grid-cols-3">
+ {partners.map((p) => (
+ <Link key={p.slug} href={`/partners/integrations/${p.slug}`}>
+ <div
+ className="
bg-surface-100
hover:bg-surface-200
group flex h-full w-full flex-col rounded-xl border px-6
py-6 shadow-sm
transition-all
hover:shadow-lg"
- >
- <div className="flex w-full space-x-6">
- <div className="relative h-[40px] min-w-[40px] w-[40px] rounded-full overflow-hidden scale-100 transition-all group-hover:scale-110">
- <Image
- layout="fill"
- objectFit="cover"
- className="bg-surface-100"
- src={p.logo}
- alt={p.title}
- />
+ >
+ <div className="flex w-full space-x-6">
+ <div className="relative h-[40px] min-w-[40px] w-[40px] rounded-full overflow-hidden scale-100 transition-all group-hover:scale-110">
+ <Image
+ layout="fill"
+ objectFit="cover"
+ className="bg-surface-100"
+ src={p.logo}
+ alt={p.title}
+ />
+ </div>
+ <div>
+ <h3 className="text-light group-hover:text-foreground mb-2 text-xl transition-colors">
+ {p.title}
+ </h3>
+ <p
+ className="text-foreground-lighter text-sm line-clamp-4 min-h-[80px]"
+ title={p.description}
+ >
+ {p.description}
+ </p>
+ </div>
+ </div>
</div>
- <div>
- <h3 className="text-light group-hover:text-foreground mb-2 text-xl transition-colors">
- {p.title}
- </h3>
- <p
- className="text-foreground-lighter text-sm line-clamp-4 min-h-[80px]"
- title={p.description}
- >
- {p.description}
- </p>
- </div>
- </div>
- </div>
- </Link>
- ))}
- </div>
- </div>
- ))}
+ </Link>
+ ))}
+ </div>
+ </div>
+ )
+ })}
</>
)
}
diff --git a/apps/www/lib/marketplaceDb.ts b/apps/www/lib/marketplaceDb.ts
new file mode 100644
index 00000000000..e93eb27b1b1
--- /dev/null
+++ b/apps/www/lib/marketplaceDb.ts
@@ -0,0 +1,172 @@
+import { toPartner as miscDbToPartner, Partner } from '~/types/partners'
+import { createMarketplaceClient, fullImageUrl, type Listing } from 'common/marketplace-client'
+
+import supabase from './supabaseMisc'
+
+// Switch between new Marketplace DB and legacy Supabase Misc DB by updating the environment var
+// in the Vercel deployment and redeploying, as that will take effect more quickly than flipping a
+// feature flag in ConfigCat and waiting for the revalidate timeout.
+const isUseMarketplaceDb = process.env.INTEGRATIONS_MARKETPLACE_DB?.toLowerCase() === 'true'
+
+const marketplaceClient = createMarketplaceClient()
+
+function toPartner(listing: Listing): Partner {
+ const {
+ categories,
+ featured,
+ slug,
+ title,
+ partner_name,
+ description,
+ content,
+ website_url,
+ documentation_url,
+ marketplace_url,
+ listing_logo,
+ images,
+ youtube_id,
+ } = listing
+ return {
+ categories,
+ featured,
+ // The view definition only returns tech partners
+ type: 'technology',
+ slug,
+ title,
+ partnerName: partner_name,
+ description,
+ content,
+ websiteUrl: website_url,
+ docsUrl: documentation_url,
+ installUrl: marketplace_url,
+ logo: fullImageUrl(listing_logo),
+ images: images?.map(fullImageUrl) ?? [],
+ youtubeId: youtube_id,
+ }
+}
+
+async function getMarketplaceListings(): Promise<Partner[]> {
+ const { data } = await marketplaceClient
+ .from('listings')
+ .select('*')
+ .is('publish_marketplace', true)
+
+ return data?.map(toPartner) ?? []
+}
+
+/**
+ * Lists all partner marketplace entries for the public website, from the configured database.
+ */
+export async function listPartners(): Promise<Partner[]> {
+ if (isUseMarketplaceDb) {
+ return getMarketplaceListings()
+ } else {
+ const { data } = await supabase
+ .from('partners')
+ .select('*')
+ .eq('approved', true)
+ .eq('type', 'technology')
+ .order('category')
+ .order('title')
+
+ return data?.map(miscDbToPartner) ?? []
+ }
+}
+
+async function getMarketplaceListingSlugs(): Promise<string[]> {
+ const { data } = await marketplaceClient
+ .from('listings')
+ .select('slug')
+ .is('publish_marketplace', true)
+
+ return data?.map((row) => row.slug) ?? []
+}
+
+/**
+ * Lists all available partner marketplace listing slugs, from the configured database.
+ */
+export async function listPartnerSlugs(): Promise<string[]> {
+ if (isUseMarketplaceDb) {
+ return getMarketplaceListingSlugs()
+ } else {
+ const { data } = await supabase
+ .from('partners')
+ .select('slug')
+ .eq('approved', true)
+ .eq('type', 'technology')
+
+ return data?.map((row) => row.slug) ?? []
+ }
+}
+
+async function searchMarketplaceListings(search: string): Promise<Partner[] | null> {
+ let query = marketplaceClient.from('listings').select('*').is('publish_marketplace', true)
+
+ if (search.trim()) {
+ query = query.textSearch('tsv', `${search.trim()}`, {
+ type: 'websearch',
+ config: 'english',
+ })
+ }
+
+ const { data } = await query
+
+ return data?.map(toPartner) ?? null
+}
+
+/**
+ * Searches for partner marketplace listings, from the configured database.
+ */
+export async function searchPartners(search: string): Promise<Partner[] | null> {
+ if (isUseMarketplaceDb) {
+ return searchMarketplaceListings(search)
+ } else {
+ let query = supabase
+ .from('partners')
+ .select('*')
+ .eq('approved', true)
+ .order('category')
+ .order('title')
+
+ if (search.trim()) {
+ query = query.textSearch('tsv', `${search.trim()}`, {
+ type: 'websearch',
+ config: 'english',
+ })
+ }
+
+ const { data: partners } = await query
+
+ return partners?.map(miscDbToPartner) ?? null
+ }
+}
+
+async function getMarketplaceListing(slug: string): Promise<Partner | null> {
+ const { data } = await marketplaceClient
+ .from('listings')
+ .select('*')
+ .eq('slug', slug)
+ .is('publish_marketplace', true)
+ .single()
+
+ return data ? toPartner(data) : null
+}
+
+/**
+ * Get a single partner by slug, from the configured database.
+ */
+export async function getPartner(slug: string): Promise<Partner | null> {
+ if (isUseMarketplaceDb) {
+ return getMarketplaceListing(slug)
+ } else {
+ let { data } = await supabase
+ .from('partners')
+ .select('*')
+ .eq('type', 'technology')
+ .eq('approved', true)
+ .eq('slug', slug)
+ .single()
+
+ return data ? miscDbToPartner(data) : null
+ }
+}
diff --git a/apps/www/lib/remotePatterns.js b/apps/www/lib/remotePatterns.js
index ce504c21b7f..d8eaa931cd8 100644
--- a/apps/www/lib/remotePatterns.js
+++ b/apps/www/lib/remotePatterns.js
@@ -114,4 +114,18 @@ module.exports = [
port: '',
pathname: '/functions/v1/generate-og',
},
+ // Marketplace DB staging
+ {
+ protocol: 'https',
+ hostname: 'fgxbxpvumhvzrhqngsyu.supabase.co',
+ port: '',
+ pathname: '**',
+ },
+ // Marketplace DB prod
+ {
+ protocol: 'https',
+ hostname: 'otqhrpbxhxkrhrnjqbba.supabase.co',
+ port: '',
+ pathname: '**',
+ },
]
diff --git a/apps/www/pages/partners/integrations/[slug].tsx b/apps/www/pages/partners/integrations/[slug].tsx
index 3880e5140c8..71555760d6f 100644
--- a/apps/www/pages/partners/integrations/[slug].tsx
+++ b/apps/www/pages/partners/integrations/[slug].tsx
@@ -16,8 +16,8 @@ import 'swiper/css'
import ImageModal from '~/components/ImageModal'
import DefaultLayout from '~/components/Layouts/Default'
import SectionContainer from '~/components/Layouts/SectionContainer'
-import supabase from '~/lib/supabaseMisc'
-import type { Partner } from '~/types/partners'
+import { getPartner, listPartnerSlugs } from '~/lib/marketplaceDb'
+import { type Partner } from '~/types/partners'
import { useBreakpoint } from 'common'
import codeHikeTheme from 'config/code-hike.theme.json' with { type: 'json' }
import { Swiper, SwiperSlide } from 'swiper/react'
@@ -47,13 +47,12 @@ function mdxComponents(callback: Dispatch<SetStateAction<string | null>>) {
return components
}
-function Partner({
- partner,
- overview,
-}: {
+type PartnerData = {
partner: Partner
overview: MDXRemoteSerializeResult<Record<string, unknown>, Record<string, unknown>>
-}) {
+}
+
+function Partner({ partner, overview }: PartnerData) {
const [focusedImage, setFocusedImage] = useState<string | null>(null)
const isNarrow = useBreakpoint('lg')
@@ -200,13 +199,13 @@ function Partner({
{!isNarrow && <PartnerDetails partner={partner} />}
</div>
- {partner.call_to_action_link && (
+ {partner.installUrl && (
<div className="bg-background hover:border-default-control border-default rounded-2xl border p-10 drop-shadow-xs max-w-5xl mx-auto mt-12">
<div className="flex flex-row justify-between">
<h1 className="text-2xl font-medium self-center">
Get started with {partner.title} and Supabase.
</h1>
- <a href={partner.call_to_action_link} target="_blank" rel="noreferrer">
+ <a href={partner.installUrl} target="_blank" rel="noreferrer">
<Button size="medium" type="secondary">
Add integration
</Button>
@@ -222,8 +221,8 @@ function Partner({
}
const PartnerDetails = ({ partner }: { partner: Partner }) => {
- const videoThumbnail = partner.video
- ? `https://img.youtube.com/vi/${partner.video}/0.jpg`
+ const videoThumbnail = partner.youtubeId
+ ? `https://img.youtube.com/vi/${partner.youtubeId}/0.jpg`
: undefined
return (
@@ -233,9 +232,9 @@ const PartnerDetails = ({ partner }: { partner: Partner }) => {
Details
</h2>
- {partner.video && (
+ {partner.youtubeId && (
<ExpandableVideo
- videoId={partner.video}
+ videoId={partner.youtubeId}
// imgUrl={videoThumbnail}
imgOverlayText="Watch an introductory video"
triggerContainerClassName="w-full"
@@ -246,37 +245,39 @@ const PartnerDetails = ({ partner }: { partner: Partner }) => {
{partner.type === 'technology' && (
<div className="flex items-center justify-between py-2">
<span className="text-foreground-lighter">Developer</span>
- <span className="text-foreground">{partner.developer}</span>
+ <span className="text-foreground">{partner.partnerName}</span>
</div>
)}
- <div className="flex items-center justify-between py-2">
- <span className="text-lighter">Category</span>
- <Link
- href={`/partners/integrations#${partner.category.toLowerCase()}`}
- className="text-brand-link hover:underline transition-colors"
- >
- {partner.category}
- </Link>
- </div>
+ {partner.categories.map((category) => (
+ <div key={category.slug} className="flex items-center justify-between py-2">
+ <span className="text-lighter">Category</span>
+ <Link
+ href={`/partners/integrations#${category.slug}`}
+ className="text-brand-link hover:underline transition-colors"
+ >
+ {category.name}
+ </Link>
+ </div>
+ ))}
<div className="flex items-center justify-between py-2">
<span className="text-foreground-lighter">Website</span>
<a
- href={partner.website}
+ href={partner.websiteUrl}
target="_blank"
rel="noreferrer"
className="text-brand-link hover:underline transition-colors"
>
- {new URL(partner.website).host}
+ {new URL(partner.websiteUrl).host}
</a>
</div>
- {partner.type === 'technology' && partner.docs && (
+ {partner.type === 'technology' && partner.docsUrl && (
<div className="flex items-center justify-between py-2">
<span className="text-foreground-lighter">Documentation</span>
<a
- href={partner.docs}
+ href={partner.docsUrl}
target="_blank"
rel="noreferrer"
className="text-brand-link hover:underline transition-colors"
@@ -299,17 +300,13 @@ const PartnerDetails = ({ partner }: { partner: Partner }) => {
// This function gets called at build time
export const getStaticPaths: GetStaticPaths = async () => {
- const { data: slugs } = await supabase
- .from('partners')
- .select('slug')
- .eq('approved', true)
- .eq('type', 'technology')
+ const slugs = await listPartnerSlugs()
const paths: {
params: { slug: string }
locale?: string | undefined
}[] =
- slugs?.map(({ slug }) => ({
+ slugs?.map((slug) => ({
params: {
slug,
},
@@ -322,15 +319,10 @@ export const getStaticPaths: GetStaticPaths = async () => {
}
// This also gets called at build time
-export const getStaticProps: GetStaticProps = async ({ params }) => {
- let { data: partner } = await supabase
- .from('partners')
- .select('*')
- .eq('approved', true)
- .eq('slug', params!.slug as string)
- .single()
-
- if (!partner || partner.type === 'expert') {
+export const getStaticProps: GetStaticProps<PartnerData> = async ({ params }) => {
+ const partner = await getPartner(params!.slug as string)
+
+ if (!partner) {
return {
notFound: true,
}
@@ -346,7 +338,7 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
// Parse markdown
const overview = await serialize({
- source: partner.overview,
+ source: partner.content,
options: {
mdxOptions: {
remarkPlugins: [remarkGfm, [remarkCodeHike, codeHikeOptions]],
diff --git a/apps/www/pages/partners/integrations/index.tsx b/apps/www/pages/partners/integrations/index.tsx
index feb22b2b0c2..5c954554a51 100644
--- a/apps/www/pages/partners/integrations/index.tsx
+++ b/apps/www/pages/partners/integrations/index.tsx
@@ -2,8 +2,8 @@ import DefaultLayout from '~/components/Layouts/Default'
import SectionContainer from '~/components/Layouts/SectionContainer'
import BecomeAPartner from '~/components/Partners/BecomeAPartner'
import PartnerLinkBox from '~/components/Partners/PartnerLinkBox'
-import supabase from '~/lib/supabaseMisc'
-import type { Partner } from '~/types/partners'
+import { listPartners, searchPartners } from '~/lib/marketplaceDb'
+import { type Category, type Partner } from '~/types/partners'
import { Loader, Search } from 'lucide-react'
import { NextSeo } from 'next-seo'
import { useRouter } from 'next/router'
@@ -13,18 +13,10 @@ import { useDebounce } from 'use-debounce'
import TileGrid from '../../../components/Partners/TileGrid'
-export async function getStaticProps() {
- const { data: partners } = await supabase
- .from('partners')
- .select('*')
- .eq('approved', true)
- .eq('type', 'technology')
- .order('category')
- .order('title')
-
+export async function getStaticProps(): Promise<{ props: Props; revalidate: number }> {
return {
props: {
- partners,
+ partners: await listPartners(),
},
// TODO: consider using Next.js' On-demand Revalidation with Supabase Database Webhooks instead
revalidate: 1800, // 30 minutes
@@ -39,7 +31,17 @@ function IntegrationPartnersPage(props: Props) {
const initialPartners = props.partners ?? []
const [partners, setPartners] = useState(initialPartners)
- const allCategories = Array.from(new Set(initialPartners?.map((p) => p.category)))
+ const categoryMap: { [slug: string]: Category } = {}
+ initialPartners.forEach((p) =>
+ p.categories.forEach((c) => {
+ if (!(c.slug in categoryMap)) {
+ categoryMap[c.slug] = c
+ }
+ })
+ )
+ const allCategories = Object.keys(categoryMap)
+ .toSorted()
+ .map((slug) => categoryMap[slug])
const router = useRouter()
@@ -51,26 +53,9 @@ function IntegrationPartnersPage(props: Props) {
const [isSearching, setIsSearching] = useState(false)
useEffect(() => {
- const searchPartners = async () => {
+ const doSearch = async () => {
setIsSearching(true)
-
- let query = supabase
- .from('partners')
- .select('*')
- .eq('approved', true)
- .order('category')
- .order('title')
-
- if (search.trim()) {
- query = query.textSearch('tsv', `${search.trim()}`, {
- type: 'websearch',
- config: 'english',
- })
- }
-
- const { data: partners } = await query
-
- return partners
+ return await searchPartners(search)
}
if (search.trim() === '') {
@@ -79,7 +64,7 @@ function IntegrationPartnersPage(props: Props) {
return
}
- searchPartners().then((partners) => {
+ doSearch().then((partners) => {
if (partners) {
setPartners(partners)
}
@@ -141,11 +126,11 @@ function IntegrationPartnersPage(props: Props) {
<div className="space-y-1">
{allCategories.map((category) => (
<button
- key={category}
- onClick={() => router.push(`#${category.toLowerCase()}`)}
- className="text-foreground-light block text-base"
+ key={category.slug}
+ onClick={() => router.push(`#${category.slug}`)}
+ className="text-foreground-light block text-base cursor-pointer"
>
- {category}
+ {category.name}
</button>
))}
</div>
diff --git a/apps/www/turbo.jsonc b/apps/www/turbo.jsonc
index a187d9e15a4..71c0137e974 100644
--- a/apps/www/turbo.jsonc
+++ b/apps/www/turbo.jsonc
@@ -29,6 +29,9 @@
"VERCEL",
"VERCEL_ENV",
"VERCEL_GIT_COMMIT_SHA",
+ "INTEGRATIONS_MARKETPLACE_DB",
+ "NEXT_PUBLIC_MARKETPLACE_API_URL",
+ "NEXT_PUBLIC_MARKETPLACE_PUBLISHABLE_KEY",
// These envs are used in the packages
"NEXT_PUBLIC_STORAGE_KEY",
"NEXT_PUBLIC_AUTH_DEBUG_KEY",
diff --git a/apps/www/types/partners.ts b/apps/www/types/partners.ts
index 4dba09c82e2..bdcef594446 100644
--- a/apps/www/types/partners.ts
+++ b/apps/www/types/partners.ts
@@ -1,3 +1,60 @@
import { Database } from '../lib/database.types'
-export type Partner = Database['public']['Tables']['partners']['Row']
+type DbPartner = Database['public']['Tables']['partners']['Row']
+
+export type Category = {
+ name: string
+ slug: string
+}
+
+export type Partner = {
+ categories: Category[]
+ featured: boolean
+ type: 'technology' | 'expert'
+ slug: string
+ title: string
+ partnerName: string
+ description: string
+ content: string
+ websiteUrl: string
+ docsUrl: string | null
+ installUrl: string | null
+ logo: string
+ images: string[]
+ youtubeId: string | null
+}
+
+export function toPartner(dbPartner: DbPartner): Partner {
+ const {
+ featured,
+ slug,
+ type,
+ title,
+ developer,
+ description,
+ overview,
+ website,
+ docs,
+ logo,
+ category,
+ images,
+ call_to_action_link,
+ video,
+ } = dbPartner
+ return {
+ categories: [{ name: category, slug: category.toLowerCase() }],
+ featured: featured ?? false,
+ type,
+ slug,
+ title,
+ partnerName: developer,
+ description,
+ content: overview,
+ websiteUrl: website,
+ docsUrl: docs,
+ installUrl: call_to_action_link,
+ logo: logo,
+ images: images ?? [],
+ youtubeId: video,
+ }
+}
diff --git a/packages/common/marketplace-client.ts b/packages/common/marketplace-client.ts
index aa3679a10c9..a690f030424 100644
--- a/packages/common/marketplace-client.ts
+++ b/packages/common/marketplace-client.ts
@@ -1,6 +1,43 @@
import { createClient } from '@supabase/supabase-js'
+import { MergeDeep } from 'type-fest'
-import type { Database } from './marketplace.types'
+import type { Database as DatabaseGenerated } from './marketplace.types'
+
+export type Category = {
+ id: string
+ name: string
+ slug: string
+ description: string
+}
+
+export type Database = MergeDeep<
+ DatabaseGenerated,
+ {
+ public: {
+ Views: {
+ listings: {
+ Row: {
+ // add a type for the JSON structure
+ categories: Category[]
+ // These all come from non-nullable columns but all view columns are inferred as nullable.
+ // See https://github.com/orgs/supabase/discussions/14151
+ featured: boolean
+ partner_name: string
+ slug: string
+ title: string
+ description: string
+ content: string
+ website_url: string
+ documentation_url: string
+ listing_logo: string
+ }
+ }
+ }
+ }
+ }
+>
+
+export type Listing = Database['public']['Views']['listings']['Row']
export const createMarketplaceClient = () => {
const API_URL = process.env.NEXT_PUBLIC_MARKETPLACE_API_URL || ''
@@ -19,3 +56,8 @@ export const createMarketplaceClient = () => {
},
})
}
+
+export const fullImageUrl = (imagePath: string) => {
+ const API_URL = process.env.NEXT_PUBLIC_MARKETPLACE_API_URL || ''
+ return `${API_URL}${imagePath}`
+}
diff --git a/packages/common/marketplace.types.ts b/packages/common/marketplace.types.ts
index 1ef26f44434..6354bd0852a 100644
--- a/packages/common/marketplace.types.ts
+++ b/packages/common/marketplace.types.ts
@@ -46,7 +46,6 @@ export type Database = {
partner_name: string | null
partner_slug: string | null
publish_dashboard: boolean | null
- publish_location: 'marketplace' | 'dashboard' | 'both' | null
publish_marketplace: boolean | null
secret_key_prefix: string | null
slug: string | null
@@ -102,6 +101,14 @@ export type Database = {
}
Returns: Json
}
+ get_redirect_url_by_slug: {
+ Args: {
+ p_listing_slug: string
+ p_organization_slug: string
+ p_project_id: string
+ }
+ Returns: Json
+ }
}
Enums: {
[_ in never]: never
diff --git a/packages/common/package.json b/packages/common/package.json
index c5385c58e32..31c89797a99 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -33,6 +33,7 @@
"@vitest/coverage-v8": "catalog:",
"@vitest/ui": "catalog:",
"tsconfig": "workspace:*",
+ "type-fest": "5.6.0",
"typescript": "catalog:",
"vitest": "catalog:"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf6f2537640..0c16d11f856 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2127,6 +2127,9 @@ importers:
tsconfig:
specifier: workspace:*
version: link:../tsconfig
+ type-fest:
+ specifier: 5.6.0
+ version: 5.6.0
typescript:
specifier: 'catalog:'
version: 6.0.2
@@ -16698,8 +16701,8 @@ packages:
resolution: {integrity: sha512-G6zXWS1dLj6eagy6sVhOMQiLtJdxQBHIA9Z6HFUNLOlr6MFOgzV8wvmidtPONfPtEUv0uZsy77XJNzTAfwPDaA==}
engines: {node: '>=16'}
- resolution: {integrity: sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw==}
+ resolution: {integrity: sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA==}
engines: {node: '>=20'}
@@ -27194,7 +27197,7 @@ snapshots:
dependencies:
- type-fest: 5.4.4
+ type-fest: 5.6.0
@@ -33939,7 +33942,7 @@ snapshots:
dependencies:
non-error: 0.1.0
- type-fest: 5.4.4
+ type-fest: 5.6.0
@@ -34985,7 +34988,7 @@ snapshots:
dependencies:
tagged-tag: 1.0.0