Fix geosolutions-it#10201 clearing correctly details and showing only…

… if they are different from NODATA (geosolutions-it#10221) * Fix geosolutions-it#10201 clearing correctly details and showing only if they are different from NODATA * Fix panel close after deleting details
Igi-ID · Apr 19, 2024 · 4ab1550 · 4ab1550
1 parent 6c207db
commit 4ab1550
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/web/client/components/resources/modals/fragments/Details.jsx b/web/client/components/resources/modals/fragments/Details.jsx
@@ -54,6 +54,7 @@ export default ({
                 onDelete={() => {
                     setDetailsBackup(savedDetailsText);
                     onUpdateLinkedResource('details', 'NODATA', 'DETAILS');
+                    onUpdateResource('attributes.detailsSettings', {});
                 }}/>
             <DetailsSheet
                 loading={loading}

diff --git a/web/client/epics/details.js b/web/client/epics/details.js
@@ -17,6 +17,8 @@ import {
     closeDetailsPanel
 } from '../actions/details';
 import { toggleControl, setControlProperty } from '../actions/controls';
+import { SAVE_MAP_RESOURCE } from '../actions/maps';
+import { SAVE_DASHBOARD } from '../actions/dashboard';
 
 import {
     mapIdSelector
@@ -55,7 +57,7 @@ export const fetchDataForDetailsPanel = (action$, store) =>
         });
 
 export const closeDetailsPanelEpic = (action$) =>
-    action$.ofType(CLOSE_DETAILS_PANEL, LOCATION_CHANGE)
+    action$.ofType(CLOSE_DETAILS_PANEL, LOCATION_CHANGE, SAVE_MAP_RESOURCE, SAVE_DASHBOARD)
         .switchMap(() => Rx.Observable.from( [
             setControlProperty("details", "enabled", false)
         ])

diff --git a/web/client/plugins/Details.jsx b/web/client/plugins/Details.jsx
@@ -116,7 +116,7 @@ export default createPlugin('Details', {
             action: openDetailsPanel,
             selector: (state) => {
                 const detailsUri = detailsUriSelector(state);
-                if (detailsUri) {
+                if (detailsUri && detailsUri !== 'NODATA') {
                     return {};
                 }
                 return { style: {display: "none"} };
@@ -149,7 +149,7 @@ export default createPlugin('Details', {
             action: openDetailsPanel,
             selector: (state) => {
                 const detailsUri = detailsUriSelector(state);
-                if (detailsUri) {
+                if (detailsUri && detailsUri !== 'NODATA') {
                     return {
                         bsStyle: state.controls.details && state.controls.details.enabled ? 'primary' : 'tray',
                         active: state.controls.details && state.controls.details.enabled || false