diff --git a/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts b/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts index 036a668b22bf45829ccc22e4767a40ff0c184697..c0f486b95bf1c15209090f56863fffdbeb120b73 100644 --- a/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts +++ b/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.test.ts @@ -3,6 +3,7 @@ import { overlaysFixture } from '@/models/fixtures/overlaysFixture'; import { OVERLAYS_INITIAL_STATE_MOCK } from '@/redux/overlays/overlays.mock'; import { RootState, store } from '@/redux/store'; import { OVERLAY_BIO_ENTITY_INITIAL_STATE_MOCK } from '@/redux/overlayBioEntity/overlayBioEntity.mock'; +import { DataOverlay } from '@/services/pluginsManager/map/overlays/types/DataOverlay'; import { getVisibleDataOverlays } from './getVisibleDataOverlays'; const ACTIVE_OVERLAYS_IDS = overlaysFixture.map(overlay => overlay.idObject); @@ -34,7 +35,9 @@ describe('getVisibleDataOverlays', () => { }) as RootState, ); - expect(getVisibleDataOverlays()).toEqual(overlaysFixture); + expect(getVisibleDataOverlays()).toEqual( + overlaysFixture.map(overlay => new DataOverlay(overlay)), + ); }); it('should return empty array if no active overlays', () => { diff --git a/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.ts b/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.ts index 5f570436c6f6906391d37e51a78ac5f3038c0309..14a69d51ac535c543ed55d85b2d06b7e7b41a7fc 100644 --- a/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.ts +++ b/src/services/pluginsManager/map/overlays/getVisibleDataOverlays.ts @@ -3,12 +3,11 @@ import { overlayBioEntityDataSelector, } from '@/redux/overlayBioEntity/overlayBioEntity.selector'; import { store } from '@/redux/store'; -import { MapOverlay } from '@/types/models'; import { DataOverlay } from '@/services/pluginsManager/map/overlays/types/DataOverlay'; import { modelsDataSelector } from '@/redux/models/models.selectors'; import { DataOverlayEntry } from '@/services/pluginsManager/map/overlays/types/DataOverlayEntry'; -export const getVisibleDataOverlays = (): MapOverlay[] => { +export const getVisibleDataOverlays = (): DataOverlay[] => { const activeOverlays = activeOverlaysSelector(store.getState()); const overlayData = overlayBioEntityDataSelector(store.getState()); @@ -43,5 +42,5 @@ export const getVisibleDataOverlays = (): MapOverlay[] => { } }); - return activeOverlays; + return dataOverlays; };