diff --git a/CHANGELOG b/CHANGELOG index 248b10670296aee11f284f8905590f394f1c6cbc..9fe9d1d61bba8a13d36b19d4b32a215813d08f8f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ minerva-front (19.0.0~alpha.0) stable; urgency=medium elements (#187) * Small improvement: styling of annotation links improved (#186) * Small improvement: styling of submap links improved (#184) + * Small improvement: general overlays renamed to "Shared overlays" (#184) -- Piotr Gawron <piotr.gawron@uni.lu> Fri, 18 Oct 2024 13:00:00 +0200 diff --git a/src/components/Map/Drawer/OverlaysDrawer/GeneralOverlays/GeneralOverlays.component.tsx b/src/components/Map/Drawer/OverlaysDrawer/GeneralOverlays/GeneralOverlays.component.tsx index faa6192e3cef1e0f0cd03e7cec93a51fb5497dfa..9831bce57e9e38ae134969b44b12682f96a5de5f 100644 --- a/src/components/Map/Drawer/OverlaysDrawer/GeneralOverlays/GeneralOverlays.component.tsx +++ b/src/components/Map/Drawer/OverlaysDrawer/GeneralOverlays/GeneralOverlays.component.tsx @@ -7,7 +7,7 @@ export const GeneralOverlays = (): JSX.Element => { return ( <div className="border-b border-b-divide p-6"> - <p className="mb-5 text-sm font-semibold">General Overlays:</p> + <p className="mb-5 text-sm font-semibold">Shared Overlays:</p> <ul> {generalPublicOverlays.map(overlay => ( <OverlayListItem diff --git a/src/components/Map/MapViewer/utils/config/overlaysLayer/useOverlayFeatures.test.ts b/src/components/Map/MapViewer/utils/config/overlaysLayer/useOverlayFeatures.test.ts index 74d8d6bf04ca2dafef844575915682af5819ed97..63900ca19513462ef00ad6db6e4a731c705eecad 100644 --- a/src/components/Map/MapViewer/utils/config/overlaysLayer/useOverlayFeatures.test.ts +++ b/src/components/Map/MapViewer/utils/config/overlaysLayer/useOverlayFeatures.test.ts @@ -118,7 +118,7 @@ describe('useOverlayFeatures', () => { expect(features[10].getStyle().getFill().getColor()).toBe('#0000001a'); }); - it('should get coordinates only for active general overlays and user overlays if exist', () => { + it('should get coordinates only for active shared overlays and user overlays if exist', () => { const { Wrapper: OverlayFeaturesWrapper } = getReduxWrapperWithStore({ configuration: { ...CONFIGURATION_INITIAL_STORE_MOCKS, diff --git a/src/redux/overlayBioEntity/overlayBioEntity.utils.ts b/src/redux/overlayBioEntity/overlayBioEntity.utils.ts index 38cd53086119920b85968bf9df99775729817c34..f1686c8e7c3b0cb191f7c6671f89109c54045706 100644 --- a/src/redux/overlayBioEntity/overlayBioEntity.utils.ts +++ b/src/redux/overlayBioEntity/overlayBioEntity.utils.ts @@ -189,7 +189,7 @@ export const getActiveUserOverlaysIdsAndOrder = ( const isActive = activeOverlaysIds.includes(userOverlay.idObject); if (isActive) { /* eslint-disable-next-line no-param-reassign */ - userOverlay.order = maxOrderValue + userOverlay.order; // user overlays appear after general overlays, we need to get max order value of general overlays and add to it user overlay order to be ensured that user overlay will appear after general overlays + userOverlay.order = maxOrderValue + userOverlay.order; // user overlays appear after shared overlays, we need to get max order value of shared overlays and add to it user overlay order to be ensured that user overlay will appear after shared overlays } return isActive; });