refactor(fields): clarify curently used types for date range

todo: methods should only accept DateRange or string, not both
geonetwork · Oct 29, 2024 · ad65635 · ad65635
1 parent 6cb464b
commit ad65635
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/libs/feature/router/src/lib/default/constants.ts b/libs/feature/router/src/lib/default/constants.ts
@@ -9,8 +9,4 @@ export enum ROUTE_PARAMS {
   PUBLISHER = 'publisher', // FIXME: this shouldn't be here as it is a search field
   PAGE = '_page',
 }
-export type TimestampRange = { start?: number; end?: number }
-export type SearchRouteParams = Record<
-  string,
-  string | string[] | number | TimestampRange
->
+export type SearchRouteParams = Record<string, string | string[] | number>
diff --git a/libs/feature/search/src/lib/utils/service/fields.service.ts b/libs/feature/search/src/lib/utils/service/fields.service.ts
@@ -11,7 +11,6 @@ import {
   OrganizationSearchField,
   OwnerSearchField,
   SimpleSearchField,
-  TimestampRange,
   TranslatedSearchField,
   UserSearchField,
 } from './fields'
@@ -107,7 +106,7 @@ export class FieldsService {
 
   private getFiltersForValues(
     fieldName: string,
-    values: FieldValue[] | DateRange
+    values: FieldValue[] | DateRange | string
   ) {
     return this.fields[fieldName].getFiltersForValues(values)
   }
@@ -120,7 +119,7 @@ export class FieldsService {
   }
 
   buildFiltersFromFieldValues(
-    fieldValues: FieldValues | DateRange
+    fieldValues: FieldValues | DateRange | string
   ): Observable<FieldFilters> {
     const fieldNames = Object.keys(fieldValues).filter((fieldName) =>
       this.supportedFields.includes(fieldName)
@@ -134,7 +133,7 @@ export class FieldsService {
           : [fieldValues[fieldName]] //TODO: handle stringified ranges which are not an object properly
       return this.getFiltersForValues(
         fieldName,
-        values as FieldValue[] | DateRange
+        values as FieldValue[] | DateRange | string
       )
     })
     return forkJoin(filtersByField$).pipe(
@@ -144,9 +143,7 @@ export class FieldsService {
     )
   }
 
-  readFieldValuesFromFilters(
-    filters: FieldFilters
-  ): Observable<FieldValues | TimestampRange> {
+  readFieldValuesFromFilters(filters: FieldFilters): Observable<FieldValues> {
     const fieldValues$ = this.supportedFields.map((fieldName) =>
       this.getValuesForFilters(fieldName, filters).pipe(
         map((values) => ({ [fieldName]: values }))

diff --git a/libs/feature/search/src/lib/utils/service/fields.ts b/libs/feature/search/src/lib/utils/service/fields.ts
@@ -32,7 +32,7 @@ export interface FieldAvailableValue {
 export abstract class AbstractSearchField {
   abstract getAvailableValues(): Observable<FieldAvailableValue[] | DateRange[]>
   abstract getFiltersForValues(
-    values: FieldValue[] | DateRange
+    values: FieldValue[] | DateRange | string
   ): Observable<FieldFilters>
   abstract getValuesForFilter(
     filters: FieldFilters
@@ -83,7 +83,9 @@ export class SimpleSearchField implements AbstractSearchField {
       })
     )
   }
-  getFiltersForValues(values: FieldValue[] /*| DateRange*/): Observable<any> {
+  getFiltersForValues(
+    values: FieldValue[] | DateRange | string
+  ): Observable<any> {
     // FieldValue[]
     if (Array.isArray(values) && this.getType() === 'values') {
       return of({