feat: add promotion statuses to the homepage

commercelayer · Mar 11, 2024 · 2977d48 · 2977d48
1 parent db7b8c4
commit 2977d48
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/packages/app/src/data/filters.ts b/packages/app/src/data/filters.ts
@@ -136,3 +136,10 @@ export const filtersInstructions: FiltersInstructions = [
     }
   }
 ]
+
+export const predicateWhitelist = [
+  'starts_at_lteq',
+  'expires_at_gteq',
+  'disabled_at_null',
+  'starts_at_gt'
+]
diff --git a/packages/app/src/pages/FiltersPage.tsx b/packages/app/src/pages/FiltersPage.tsx
@@ -1,13 +1,14 @@
 import type { PageProps } from '#components/Routes'
-import { filtersInstructions } from '#data/filters'
+import { filtersInstructions, predicateWhitelist } from '#data/filters'
 import { appRoutes } from '#data/routes'
 import { PageLayout, useResourceFilters } from '@commercelayer/app-elements'
 import { useLocation } from 'wouter'
 
 function Page(props: PageProps<typeof appRoutes.filters>): JSX.Element {
   const [, setLocation] = useLocation()
   const { FiltersForm, adapters } = useResourceFilters({
-    instructions: filtersInstructions
+    instructions: filtersInstructions,
+    predicateWhitelist
   })
 
   return (

diff --git a/packages/app/src/pages/HomePage.tsx b/packages/app/src/pages/HomePage.tsx
@@ -1,10 +1,12 @@
-import { filtersInstructions } from '#data/filters'
+import { filtersInstructions, predicateWhitelist } from '#data/filters'
+import { presets } from '#data/lists'
 import { appRoutes } from '#data/routes'
 import {
   HomePageLayout,
   Icon,
   List,
   ListItem,
+  RadialProgress,
   Spacer,
   StatusIcon,
   Text,
@@ -19,8 +21,9 @@ function HomePage(): JSX.Element {
   const search = useSearch()
   const [, setLocation] = useLocation()
 
-  const { SearchWithNav } = useResourceFilters({
-    instructions: filtersInstructions
+  const { SearchWithNav, adapters } = useResourceFilters({
+    instructions: filtersInstructions,
+    predicateWhitelist
   })
 
   return (
@@ -51,7 +54,7 @@ function HomePage(): JSX.Element {
             ) : undefined
           }
         >
-          {/* <Link
+          <Link
             href={appRoutes.promotionList.makePath(
               {},
               adapters.adaptFormValuesToUrlQuery({
@@ -102,7 +105,7 @@ function HomePage(): JSX.Element {
               <Text weight='semibold'>{presets.disabled.viewTitle} </Text>
               <StatusIcon name='caretRight' />
             </ListItem>
-          </Link> */}
+          </Link>
 
           <Link asChild href={appRoutes.promotionList.makePath({})}>
             <ListItem

diff --git a/packages/app/src/pages/PromotionListPage.tsx b/packages/app/src/pages/PromotionListPage.tsx
@@ -1,7 +1,7 @@
 import { ListEmptyState } from '#components/ListEmptyState'
 import { ListItemPromotion } from '#components/ListItemPromotion'
 import type { PageProps } from '#components/Routes'
-import { filtersInstructions } from '#data/filters'
+import { filtersInstructions, predicateWhitelist } from '#data/filters'
 import { appRoutes } from '#data/routes'
 import {
   PageLayout,
@@ -22,7 +22,8 @@ function Page(props: PageProps<typeof appRoutes.promotionList>): JSX.Element {
 
   const { SearchWithNav, FilteredList, viewTitle, hasActiveFilter } =
     useResourceFilters({
-      instructions: filtersInstructions
+      instructions: filtersInstructions,
+      predicateWhitelist
     })
 
   const hideFiltersNav = !(viewTitle == null)