willba-component-library 0.2.98 → 0.2.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willba-component-library",
-  "version": "0.2.98",
+  "version": "0.2.100",
   "description": "A custom UI component library",
   "main": "lib/index.js",
   "module": "lib/index.esm.js",

package/src/components/FilterBar/FilterBar.stories.tsx

@@ -77,7 +77,7 @@ export const Main: Story = {
       },
     ],
     outerLoading: false,
-    siteId: undefined,
+    locationIds: undefined,
   },
   render: (args) => (
     <div style={{ background: 'white', padding: '30px', height: '100vh' }}>

package/src/components/FilterBar/FilterBar.tsx

@@ -36,7 +36,7 @@ export default function FilterBar({
   mode,
   tabs,
   outerLoading,
-  siteId,
+  locationIds,
 }: FilterBarTypes) {
   const themePalette = useTheme({ palette })
 
@@ -64,7 +64,7 @@ export default function FilterBar({
     ageCategories,
     onSubmit,
     tabs,
-    siteId,
+    locationIds,
   })
 
   // Scroll in to view

package/src/components/FilterBar/FilterBarTypes.ts

@@ -12,7 +12,7 @@ export type FilterBarTypes = {
   mode?: string
   tabs?: Tab[]
   outerLoading?: boolean
-  siteId?: string
+  locationIds?: string[]
 }
 
 export type AgeCategoryCount = {

package/src/components/FilterBar/hooks/useFilterBar.tsx

@@ -15,7 +15,7 @@ type Props = {
   ageCategories?: AgeCategoryType[]
   onSubmit?: ((val: Filters) => void) | null
   tabs?: Tab[]
-  siteId?: string
+  locationIds?: string[]
 }
 
 export const useFilterBar = ({
@@ -23,7 +23,7 @@ export const useFilterBar = ({
   ageCategories,
   onSubmit,
   tabs,
-  siteId,
+  locationIds,
 }: Props) => {
   const [selectedPath, setSelectedPath] = useState<string>(Pages.EVENTS)
   const [selectedFilter, setSelectedFilter] = useState<string | boolean>(false)
@@ -117,16 +117,19 @@ export const useFilterBar = ({
     if (onSubmit && window.location.href.includes(selectedPath)) {
       onSubmit(newParams)
     } else {
-      const siteIdParam = siteId ? `siteId=${siteId}` : ''
-      const querySearchParam = querySearchParams
-        ? querySearchParams.toString()
-        : ''
+      const params = new URLSearchParams(querySearchParams ?? undefined)
 
-      const params = [siteIdParam, querySearchParam].filter(Boolean).join('&')
+      if (locationIds) {
+        locationIds.forEach((id) => {
+          params.append('locationId', id)
+        })
+      }
+
+      const paramString = params.toString()
       const path = `${redirectUrl}${selectedPath}`
 
       setInnerLoading(true)
-      window.location.href = params ? `${path}?${params}` : path
+      window.location.href = paramString ? `${path}?${paramString}` : path
     }
   }