Fix #11406 Pending changes prompt shows up after save as (#11407) (#11411)

Author: allyoucanmap

web/client/plugins/ResourcesCatalog/SaveAs.jsx

@@ -16,7 +16,7 @@ import Persistence from '../../api/persistence';
 import { setSelectedResource } from './actions/resources';
 import { mapSaveError, mapSaved, mapInfoLoaded, configureMap } from '../../actions/config';
 import { userSelector } from '../../selectors/security';
-import { push } from 'connected-react-router';
+import { replace } from 'connected-react-router';
 import { parseResourceProperties, parseClonedResourcePayload } from '../../utils/GeostoreUtils';
 import { getResourceInfo } from '../../utils/ResourcesUtils';
 import { storySaved, geostoryLoaded, setResource as setGeoStoryResource, setCurrentStory, saveGeoStoryError } from '../../actions/geostory';
@@ -40,7 +40,7 @@ function SaveAs({
     onSuccess,
     onError,
     user,
-    onPush,
+    onReplace,
     onNotification,
     component,
     menuItem
@@ -79,7 +79,7 @@ function SaveAs({
                     setName('');
                     const { viewerPath } = getResourceInfo(resource);
                     if (viewerPath) {
-                        onPush(viewerPath);
+                        onReplace(viewerPath);
                     }
                 })
                 .catch((error) => {
@@ -159,7 +159,7 @@ const saveAsConnect = connect(
     }),
     {
         onNotification: show,
-        onPush: push,
+        onReplace: replace,
         onSelect: setSelectedResource,
         onSuccess: (resourceType, resource, data) => {
             return (dispatch) => {

web/client/plugins/ResourcesCatalog/containers/PendingStatePrompt.jsx

@@ -45,24 +45,6 @@ function PendingStatePrompt({
         };
     }, []);
 
-    // disable the back button when there are pending changes
-    useEffect(() => {
-        let popState;
-        if (pendingStateProp) {
-            popState = () => {
-                window.history.go(1);
-            };
-            window.history.pushState(null, null, window.location.href);
-            window.addEventListener('popstate', popState);
-        }
-        return () => {
-            if (popState) {
-                window.removeEventListener('popstate', popState);
-                popState = undefined;
-            }
-        };
-    }, [pendingStateProp]);
-
     function handleCancel() {
         setShowModal(false);
     }