Fix empty nodeParams on browser back navigation (SAP#2692)

kazydek · May 6, 2022 · e6d6f62 · e6d6f62
1 parent 5ac37a6
commit e6d6f62
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core/src/services/routing.js b/core/src/services/routing.js
@@ -128,7 +128,8 @@ class RoutingClass {
       const intentPath = RoutingHelpers.getIntentPath(hash);
       return intentPath ? intentPath : '/';
     }
-    const path = (window.history.state && window.history.state.path) || window.location.pathname;
+    const params = window.location.search ? window.location.search : '';
+    const path = (window.history.state && window.history.state.path) || window.location.pathname + params;
     return path
       .split('/')
       .slice(1)

diff --git a/core/test/services/routing.spec.js b/core/test/services/routing.spec.js
@@ -837,6 +837,16 @@ describe('Routing', function() {
       assert.equal(Routing.getModifiedPathname(), mockPathName);
     });
 
+    it('without state and with query params', () => {
+      const mockPathName = 'projects?~test=param';
+      sinon.stub(window.history, 'state').returns(null);
+      sinon.stub(window, 'location').value({
+        pathname: '/projects',
+        search: '?~test=param'
+      });
+      assert.equal(Routing.getModifiedPathname(), mockPathName);
+    });
+
     it('with state path', () => {
       sinon.stub(window.history, 'state').value({
         path: '/this/is/some/'