fix(date-range): define and export type once

geonetwork · Nov 6, 2024 · 873cbff · 873cbff
1 parent 0986c70
commit 873cbff
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/libs/feature/router/src/lib/default/constants.ts b/libs/feature/router/src/lib/default/constants.ts
@@ -1,8 +1,5 @@
-import {
-  DateRange,
-  FieldsService,
-  FieldValue,
-} from '@geonetwork-ui/feature/search'
+import { DateRange } from '@geonetwork-ui/api/repository'
+// import { FieldsService, FieldValue } from '@geonetwork-ui/feature/search'
 
 export const ROUTER_STATE_KEY = 'router'
 

diff --git a/libs/feature/router/src/lib/default/state/query-params.utils.ts b/libs/feature/router/src/lib/default/state/query-params.utils.ts
@@ -1,6 +1,5 @@
-import { isDateRange } from '@geonetwork-ui/api/repository'
+import { DateRange, isDateRange } from '@geonetwork-ui/api/repository'
 import { ROUTE_PARAMS, SearchRouteParams } from '../constants'
-import { DateRange } from '@geonetwork-ui/feature/search'
 
 export function flattenQueryParams(
   params: SearchRouteParams

diff --git a/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts b/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts
@@ -11,11 +11,11 @@ import { SearchFacade } from '../state/search.facade'
 import { SearchService } from '../utils/service/search.service'
 import { FieldsService } from '../utils/service/fields.service'
 import {
-  DateRange,
   FieldAvailableValue,
   FieldType,
   FieldValue,
 } from '../utils/service/fields'
+import { DateRange } from '@geonetwork-ui/api/repository'
 
 @Component({
   selector: 'gn-ui-filter-dropdown',

diff --git a/libs/feature/search/src/lib/utils/service/fields.service.ts b/libs/feature/search/src/lib/utils/service/fields.service.ts
@@ -1,7 +1,6 @@
 import { Injectable, Injector } from '@angular/core'
 import {
   AbstractSearchField,
-  DateRange,
   DateRangeSearchField,
   FieldValue,
   FullTextSearchField,
@@ -18,6 +17,7 @@ import { forkJoin, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { FieldFilters } from '@geonetwork-ui/common/domain/model/search'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { DateRange } from '@geonetwork-ui/api/repository'
 
 // key is the field name
 export type FieldValues = Record<string, FieldValue[] | FieldValue | DateRange>

diff --git a/libs/feature/search/src/lib/utils/service/fields.ts b/libs/feature/search/src/lib/utils/service/fields.ts
@@ -14,13 +14,13 @@ import {
   TermBucket,
 } from '@geonetwork-ui/common/domain/model/search'
 import {
+  DateRange,
   ElasticsearchService,
   isDateRange,
   METADATA_LANGUAGE,
 } from '@geonetwork-ui/api/repository'
 import { LangService } from '@geonetwork-ui/util/i18n'
 
-export type DateRange = { start?: Date; end?: Date }
 export type FieldType = 'values' | 'dateRange'
 
 export type FieldValue = string | number