diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.ts index 1587fbf628..c523b23966 100644 --- a/src/types/reducers.d.ts +++ b/src/types/reducers.d.ts @@ -450,7 +450,9 @@ export type FilterDatasetOpt = { /* DUPLICATES OF FILTER TYPES ABOVE, REMOVE ONCE TYPES ABOVE ARE FIXED */ -export type TypedRangeFilter = FilterBase & +type FilterBaseOmitRedudant = Omit, 'type' | 'domain'>; + +export type TypedRangeFilter = FilterBaseOmitRedudant & RangeFieldDomain & { type: 'range'; fieldType: 'real' | 'integer'; @@ -459,21 +461,21 @@ export type TypedRangeFilter = FilterBase & typeOptions: ['range']; }; -export type TypedSelectFilter = FilterBase & +export type TypedSelectFilter = FilterBaseOmitRedudant & SelectFieldDomain & { type: 'select'; fieldType: 'boolean'; value: boolean; }; -export type TypedMultiSelectFilter = FilterBase & +export type TypedMultiSelectFilter = FilterBaseOmitRedudant & MultiSelectFieldDomain & { type: 'multiSelect'; fieldType: 'string' | 'date'; value: string[]; }; -export type TypedTimeRangeFilter = FilterBase & +export type TypedTimeRangeFilter = FilterBaseOmitRedudant & TimeRangeFieldDomain & { type: 'timeRange'; fieldType: 'timestamp'; @@ -486,7 +488,7 @@ export type TypedTimeRangeFilter = FilterBase & animationWindow: string; }; -export type TypedPolygonFilter = FilterBase & { +export type TypedPolygonFilter = FilterBaseOmitRedudant & { layerId: string[]; type: 'polygon'; fixedDomain: true;