FFWEB-3253: Remove multiple redirect to search result page

Don't redirect to search result page if search in executed already on result page
FACT-Finder-Web-Components · Dec 10, 2024 · ceeadab · ceeadab
1 parent ceed552
commit ceeadab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## Unreleased
+### Fix
+- Don't redirect to search result page if search is executed already on result page
+
 ## [v6.0.1] - 2024.11.21
 ### Improve
 - Add the ability to set a name for the CategoryPath field (category page)

diff --git a/src/Resources/views/storefront/base.html.twig b/src/Resources/views/storefront/base.html.twig
@@ -36,12 +36,14 @@
             return;
           }
 
-          if (searchOptions?.requestOptions?.origin?.tagName === `FF-SEARCHBOX`) {
-            window.location.href =  `/factfinder/result?query=${searchParams.query}`;
-
-            // Cancel the pipeline to avoid sending a search request to FactFinder before the redirect is complete.
-            return false;
-          }
+          {% if app.request.pathInfo !== "/factfinder/result" %}
+            if (searchOptions?.requestOptions?.origin?.tagName === `FF-SEARCHBOX`) {
+              window.location.href =  `/factfinder/result?query=${searchParams.query}`;
+
+              // Cancel the pipeline to avoid sending a search request to FactFinder before the redirect is complete.
+              return false;
+            }
+          {% endif %}
         });
 
         {% if page.extensions.factfinder.searchImmediate and not page.extensions.factfinder.ssr %}