chore: fix some cyclic dependencies that prevented a lib build

geonetwork · Nov 12, 2023 · bd6dfbb · bd6dfbb
1 parent 186d70b
commit bd6dfbb
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/libs/feature/map/src/lib/utils/map-utils.service.ts b/libs/feature/map/src/lib/utils/map-utils.service.ts
@@ -23,7 +23,7 @@ import {
 import WMTSCapabilities from 'ol/format/WMTSCapabilities'
 import { from, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
-import { MapContextLayerModel } from '../..'
+import { MapContextLayerModel } from '../map-context/map-context.model'
 import { MapUtilsWMSService } from './map-utils-wms.service'
 import Collection from 'ol/Collection'
 import MapBrowserEvent from 'ol/MapBrowserEvent'

diff --git a/libs/feature/record/src/index.ts b/libs/feature/record/src/index.ts
@@ -1,4 +1,5 @@
 export * from './lib/feature-record.module'
+export * from './lib/gn-ui-version.token'
 export * from './lib/state'
 export * from './lib/data-view-permalink/data-view-permalink.component'
 export * from './lib/data-view/data-view.component'

diff --git a/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.spec.ts b/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.spec.ts
@@ -9,7 +9,7 @@ import { BehaviorSubject, firstValueFrom } from 'rxjs'
 import { MdViewFacade } from '../state'
 import { Component, Input } from '@angular/core'
 import { TranslateModule } from '@ngx-translate/core'
-import { GN_UI_VERSION } from '../feature-record.module'
+import { GN_UI_VERSION } from '../gn-ui-version.token'
 
 const chartConfig1 = {
   aggregation: 'sum',

diff --git a/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.ts b/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.ts
@@ -8,7 +8,7 @@ import {
 import { Configuration } from '@geonetwork-ui/data-access/gn4'
 import { combineLatest, map } from 'rxjs'
 import { MdViewFacade } from '../state'
-import { GN_UI_VERSION } from '../feature-record.module'
+import { GN_UI_VERSION } from '../gn-ui-version.token'
 
 export const WEB_COMPONENT_EMBEDDER_URL = new InjectionToken<string>(
   'webComponentEmbedderUrl'

diff --git a/.../feature/record/src/lib/data-view-web-component/data-view-web-component.component.spec.ts b/.../feature/record/src/lib/data-view-web-component/data-view-web-component.component.spec.ts
@@ -5,7 +5,7 @@ import { Configuration } from '@geonetwork-ui/data-access/gn4'
 import { MdViewFacade } from '../state'
 import { TranslateModule } from '@ngx-translate/core'
 import { Component, Input } from '@angular/core'
-import { GN_UI_VERSION } from '../feature-record.module'
+import { GN_UI_VERSION } from '../gn-ui-version.token'
 
 const chartConfig1 = {
   aggregation: 'sum',

diff --git a/libs/feature/record/src/lib/data-view-web-component/data-view-web-component.component.ts b/libs/feature/record/src/lib/data-view-web-component/data-view-web-component.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'
 import { Configuration } from '@geonetwork-ui/data-access/gn4'
 import { MdViewFacade } from '../state'
 import { combineLatest, map } from 'rxjs'
-import { GN_UI_VERSION } from '../feature-record.module'
+import { GN_UI_VERSION } from '../gn-ui-version.token'
 
 @Component({
   selector: 'gn-ui-data-view-web-component',

diff --git a/libs/feature/record/src/lib/feature-record.module.ts b/libs/feature/record/src/lib/feature-record.module.ts
@@ -24,7 +24,6 @@ import { DataViewPermalinkComponent } from './data-view-permalink/data-view-perm
 import { DataViewWebComponentComponent } from './data-view-web-component/data-view-web-component.component'
 import { DataViewShareComponent } from './data-view-share/data-view-share.component'
 
-export const GN_UI_VERSION = new InjectionToken<string>('gnUiVersion')
 @NgModule({
   declarations: [
     MapViewComponent,

diff --git a/libs/feature/record/src/lib/gn-ui-version.token.ts b/libs/feature/record/src/lib/gn-ui-version.token.ts
@@ -0,0 +1,3 @@
+import { InjectionToken } from '@angular/core'
+
+export const GN_UI_VERSION = new InjectionToken<string>('gnUiVersion')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { InjectionToken } from '@angular/core'

		export const GN_UI_VERSION = new InjectionToken<string>('gnUiVersion')