Enhance close open right panel handler (#2059)

Author: dsuren1

geonode_mapstore_client/client/js/epics/__tests__/gnresource-test.js

@@ -14,7 +14,8 @@ import {
     gnViewerSetNewResourceThumbnail,
     closeInfoPanelOnMapClick,
     closeDatasetCatalogPanel,
-    gnZoomToFitBounds
+    gnZoomToFitBounds,
+    closeResourceDetailsOnMapInfoOpen
 } from '@js/epics/gnresource';
 import {
     setResourceThumbnail,
@@ -27,6 +28,7 @@ import {
     SHOW_NOTIFICATION
 } from '@mapstore/framework/actions/notifications';
 import { newMapInfoRequest } from '@mapstore/framework/actions/mapInfo';
+import { SET_SHOW_DETAILS } from '@mapstore/framework/plugins/ResourcesCatalog/actions/resources';
 
 let mockAxios;
 
@@ -208,6 +210,43 @@ describe('gnresource epics', () => {
             testState
         );
 
+    });
+    it('close resource details panels on map info panel open', (done) => {
+        const NUM_ACTIONS = 1;
+        const testState = {
+            context: {
+                currentContext: {
+                    plugins: {
+                        desktop: [
+                            {name: "Identify"}
+                        ]
+                    }
+                }
+            },
+            mapInfo: {
+                requests: ["something"]
+            },
+            resources: {
+                showDetails: true
+            }
+        };
+
+        testEpic(closeResourceDetailsOnMapInfoOpen,
+            NUM_ACTIONS,
+            newMapInfoRequest(),
+            (actions) => {
+                try {
+                    expect(actions.length).toBe(1);
+                    expect(actions[0].type).toBe(SET_SHOW_DETAILS);
+                    expect(actions[0].show).toBe(false);
+                } catch (e) {
+                    done(e);
+                }
+                done();
+            },
+            testState
+        );
+
     });
 
     it('should zoom to extent with the fitBounds control', (done) => {

geonode_mapstore_client/client/js/epics/gnresource.js

@@ -42,7 +42,9 @@ import {
     showSettings
 } from '@mapstore/framework/actions/layers';
 import {
-    setSelectedResource
+    setSelectedResource,
+    setShowDetails,
+    SET_SHOW_DETAILS
 } from '@mapstore/framework/plugins/ResourcesCatalog/actions/resources';
 import {
     setNewResource,
@@ -120,6 +122,7 @@ import { ProcessTypes } from '@js/utils/ResourceServiceUtils';
 import { catalogClose } from '@mapstore/framework/actions/catalog';
 import { VisualizationModes } from '@mapstore/framework/utils/MapTypeUtils';
 import { forceUpdateMapLayout } from '@mapstore/framework/actions/maplayout';
+import { getShowDetails } from '@mapstore/framework/plugins/ResourcesCatalog/selectors/resources';
 import { searchSelector } from '@mapstore/framework/selectors/router';
 
 const FIT_BOUNDS_CONTROL = 'fitBounds';
@@ -577,8 +580,8 @@ const oneOfTheOther = (control) => {
 /**
  * Close open panels on new panel open
  */
-export const closeOpenPanels = (action$, store) => action$.ofType(SET_CONTROL_PROPERTY)
-    .filter((action) => !!action.value)
+export const closeOpenPanels = (action$, store) => action$.ofType(SET_CONTROL_PROPERTY, SET_SHOW_DETAILS)
+    .filter((action) => !!action.value || action.show)
     .switchMap((action) => {
         const state = store.getState();
         const getActions = () => {
@@ -595,8 +598,12 @@ export const closeOpenPanels = (action$, store) => action$.ofType(SET_CONTROL_PR
             if (isDatasetCatalogPanelOpen && isVisualStyleEditorOpen) {
                 setActions.push(setControlProperty('datasetsCatalog', 'enabled', false));
             }
+            const isResourceDetailsOpen = !action.show && getShowDetails(state);
+            if (isResourceDetailsOpen) {
+                setActions.push(setShowDetails(false));
+            }
             const control = oneOfTheOther(action.control);
-            if (control?.control) {
+            if (control?.control || action.show) {
                 if (state.controls?.rightOverlay?.enabled === 'Share') {
                     setActions.push(setControlProperty('rightOverlay', 'enabled', false));
                 } else if (!!state.controls?.[`${control.alternate}`]?.enabled) {
@@ -618,6 +625,10 @@ export const closeDatasetCatalogPanel = (action$, store) => action$.ofType(NEW_M
         return Observable.of(setControlProperty('datasetsCatalog', 'enabled', false));
     });
 
+export const closeResourceDetailsOnMapInfoOpen = (action$, store) => action$.ofType(NEW_MAPINFO_REQUEST)
+    .filter(() => isMapInfoOpen(store.getState()) && getShowDetails(store.getState()))
+    .mapTo(setShowDetails(false));
+
 export const gnManageLinkedResource = (action$, store) =>
     action$.ofType(MANAGE_LINKED_RESOURCE)
         .switchMap((action) => {
@@ -741,6 +752,7 @@ export default {
     closeInfoPanelOnMapClick,
     closeOpenPanels,
     closeDatasetCatalogPanel,
+    closeResourceDetailsOnMapInfoOpen,
     gnManageLinkedResource,
     gnZoomToFitBounds,
     gnSelectResourceEpic