clients/web: adapt products list queries for the new is_archived filter

polarsource · Jul 9, 2024 · 3857a50 · 3857a50
1 parent 5962148
commit 3857a50
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,11 +14,15 @@ const getHighlightedSubscriptions = async (
   limit: number = 100,
 ): Promise<Product[]> => {
   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
@@ -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,