Merge branch...

Merge branch '341-in-the-overlays-panel-change-general-overlays-to-shared-overlays' into 'development'

Resolve "In the "overlays" panel, change "General Overlays:" to "Shared overlays:""

See merge request !367

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
 

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

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,

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;
   });