From 3857a50e556446cf31a95cf042901ef51feb072f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Voron?= Date: Tue, 9 Jul 2024 17:08:20 +0200 Subject: [PATCH] clients/web: adapt products list queries for the new is_archived filter --- .../web/src/app/[organization]/(sidebar)/donate/page.tsx | 1 + .../apps/web/src/app/[organization]/(sidebar)/page.tsx | 1 + .../[organization]/(sidebar)/posts/[postSlug]/page.tsx | 6 +++++- .../src/app/[organization]/(sidebar)/products/page.tsx | 2 +- .../app/[organization]/(sidebar)/subscriptions/page.tsx | 1 + clients/apps/web/src/app/[organization]/[repo]/page.tsx | 1 + .../apps/web/src/app/[organization]/subscribe/page.tsx | 1 + clients/apps/web/src/app/embed/tiers.svg/route.tsx | 8 ++++++-- clients/apps/web/src/hooks/queries/products.ts | 2 ++ 9 files changed, 19 insertions(+), 4 deletions(-) diff --git a/clients/apps/web/src/app/[organization]/(sidebar)/donate/page.tsx b/clients/apps/web/src/app/[organization]/(sidebar)/donate/page.tsx index f0df1371d4..c7014b58eb 100644 --- a/clients/apps/web/src/app/[organization]/(sidebar)/donate/page.tsx +++ b/clients/apps/web/src/app/[organization]/(sidebar)/donate/page.tsx @@ -116,6 +116,7 @@ export default async function Page({ api.products.list( { organizationId: organization.id, + isArchived: false, isRecurring: true, }, { diff --git a/clients/apps/web/src/app/[organization]/(sidebar)/page.tsx b/clients/apps/web/src/app/[organization]/(sidebar)/page.tsx index d5abd43d9d..b7aadbcce8 100644 --- a/clients/apps/web/src/app/[organization]/(sidebar)/page.tsx +++ b/clients/apps/web/src/app/[organization]/(sidebar)/page.tsx @@ -177,6 +177,7 @@ export default async function Page({ api.products.list( { organizationId: organization.id, + isArchived: false, isRecurring: true, }, { diff --git a/clients/apps/web/src/app/[organization]/(sidebar)/posts/[postSlug]/page.tsx b/clients/apps/web/src/app/[organization]/(sidebar)/posts/[postSlug]/page.tsx index cf220cc4fe..534b7f8632 100644 --- a/clients/apps/web/src/app/[organization]/(sidebar)/posts/[postSlug]/page.tsx +++ b/clients/apps/web/src/app/[organization]/(sidebar)/posts/[postSlug]/page.tsx @@ -152,7 +152,11 @@ export default async function Page({ try { products = await api.products.list( - { organizationId: article.organization_id, isRecurring: true }, + { + organizationId: article.organization_id, + isArchived: false, + isRecurring: true, + }, cacheConfig, ) } catch (e) { diff --git a/clients/apps/web/src/app/[organization]/(sidebar)/products/page.tsx b/clients/apps/web/src/app/[organization]/(sidebar)/products/page.tsx index de203a2cf9..7852c03553 100644 --- a/clients/apps/web/src/app/[organization]/(sidebar)/products/page.tsx +++ b/clients/apps/web/src/app/[organization]/(sidebar)/products/page.tsx @@ -109,7 +109,7 @@ export default async function Page({ } const products = await api.products.list( - { organizationId: organization.id, isRecurring: false }, + { organizationId: organization.id, isArchived: false, isRecurring: false }, { ...cacheConfig, next: { diff --git a/clients/apps/web/src/app/[organization]/(sidebar)/subscriptions/page.tsx b/clients/apps/web/src/app/[organization]/(sidebar)/subscriptions/page.tsx index c63d330ae6..fc76b34438 100644 --- a/clients/apps/web/src/app/[organization]/(sidebar)/subscriptions/page.tsx +++ b/clients/apps/web/src/app/[organization]/(sidebar)/subscriptions/page.tsx @@ -101,6 +101,7 @@ export default async function Page({ products = await api.products.list( { organizationId: organization.id, + isArchived: false, isRecurring: true, limit: 100, }, diff --git a/clients/apps/web/src/app/[organization]/[repo]/page.tsx b/clients/apps/web/src/app/[organization]/[repo]/page.tsx index de2ebad47e..8a96a7439d 100644 --- a/clients/apps/web/src/app/[organization]/[repo]/page.tsx +++ b/clients/apps/web/src/app/[organization]/[repo]/page.tsx @@ -161,6 +161,7 @@ export default async function Page({ api.products.list( { organizationId: repository.organization.id, + isArchived: false, isRecurring: true, }, cacheConfig, diff --git a/clients/apps/web/src/app/[organization]/subscribe/page.tsx b/clients/apps/web/src/app/[organization]/subscribe/page.tsx index 0515dafc0d..7a8793a9bd 100644 --- a/clients/apps/web/src/app/[organization]/subscribe/page.tsx +++ b/clients/apps/web/src/app/[organization]/subscribe/page.tsx @@ -106,6 +106,7 @@ export default async function Page({ products = await api.products.list( { organizationId: organization.id, + isArchived: false, isRecurring: true, }, cacheConfig, diff --git a/clients/apps/web/src/app/embed/tiers.svg/route.tsx b/clients/apps/web/src/app/embed/tiers.svg/route.tsx index 23fc40c90f..ea61294cfe 100644 --- a/clients/apps/web/src/app/embed/tiers.svg/route.tsx +++ b/clients/apps/web/src/app/embed/tiers.svg/route.tsx @@ -14,11 +14,15 @@ const getHighlightedSubscriptions = async ( limit: number = 100, ): Promise => { const { id: orgId } = await fetch( - `${getServerURL()}/v1/organizations/lookup?organization_name=${org}&platform=github`, + getServerURL( + `/v1/organizations/lookup?organization_name=${org}&platform=github`, + ), { method: 'GET' }, ).then((res) => res.json()) - let url = `${getServerURL()}/v1/products?organization_id=${orgId}&is_recurring=true&limit=${limit}` + let url = getServerURL( + `/v1/products/?organization_id=${orgId}&is_recurring=true&is_archived=false&limit=${limit}`, + ) const response = await fetch(url, { method: 'GET', diff --git a/clients/apps/web/src/hooks/queries/products.ts b/clients/apps/web/src/hooks/queries/products.ts index a7665bddbf..f0b230b704 100644 --- a/clients/apps/web/src/hooks/queries/products.ts +++ b/clients/apps/web/src/hooks/queries/products.ts @@ -20,6 +20,7 @@ export const useProducts = ( api.products.list({ organizationId: organizationId ?? '', limit, + isArchived: false, ...(parameters || {}), }), retry: defaultRetry, @@ -37,6 +38,7 @@ export const useBenefitProducts = ( api.products.list({ organizationId: organizationId ?? '', benefitId: benefitId ?? '', + isArchived: false, limit, }), retry: defaultRetry,