Merge pull request #10741 from wellcomecollection/isavailable-changes

`IsAvailableOnline` event filter; Find true bucket to get count
wellcomecollection · Mar 18, 2024 · d6ab428 · d6ab428
2 parents 6d6ee51 + 20cef12
commit d6ab428
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/content/webapp/services/wellcome/common/filters.ts b/content/webapp/services/wellcome/common/filters.ts
@@ -630,13 +630,18 @@ const eventsAudienceFilter = ({
 const eventsIsAvailableOnlineFilter = ({
   events,
   props,
-}: EventsFilterProps): BooleanFilter<keyof EventsProps> => ({
-  type: 'boolean',
-  id: 'isAvailableOnline',
-  label: 'Catch-up events only',
-  count: events?.aggregations?.isAvailableOnline?.buckets?.[1]?.count || 0,
-  isSelected: !!props.isAvailableOnline,
-});
+}: EventsFilterProps): BooleanFilter<keyof EventsProps> => {
+  const isAvailableOnlineTrueBucket =
+    events?.aggregations?.isAvailableOnline.buckets.find(b => b.data.value);
+
+  return {
+    type: 'boolean',
+    id: 'isAvailableOnline',
+    label: 'Catch-up events only',
+    count: isAvailableOnlineTrueBucket?.count || 0,
+    isSelected: !!props.isAvailableOnline,
+  };
+};
 
 // TODO re-add when https://github.com/wellcomecollection/content-api/issues/106 is done
 // const eventsInterpretationFilter = ({

diff --git a/content/webapp/services/wellcome/content/types/api.ts b/content/webapp/services/wellcome/content/types/api.ts
@@ -1,5 +1,6 @@
 import { ArticleFormatId } from '@weco/content/data/content-format-ids';
 import {
+  BooleanBucketData,
   WellcomeAggregation,
   WellcomeResultList,
 } from '@weco/content/services/wellcome';
@@ -116,7 +117,7 @@ export type ArticleAggregations = BasicAggregations & {
 export type EventAggregations = BasicAggregations & {
   audience: WellcomeAggregation;
   interpretation: WellcomeAggregation;
-  isAvailableOnline: WellcomeAggregation;
+  isAvailableOnline: WellcomeAggregation<BooleanBucketData>;
 };
 
 // Results

diff --git a/content/webapp/services/wellcome/index.ts b/content/webapp/services/wellcome/index.ts
@@ -55,9 +55,14 @@ export type UnidentifiedBucketData = {
   type: string;
 };
 
+export type BooleanBucketData = UnidentifiedBucketData & {
+  value: boolean;
+};
+
 export type WellcomeAggregation<
   BucketData extends
     | IdentifiedBucketData
+    | BooleanBucketData
     | UnidentifiedBucketData = IdentifiedBucketData,
 > = {
   buckets: {