FFWEB-3197: Fix double request issue on category pages

Fix double request issue on category pages
FACT-Finder-Web-Components · Oct 17, 2024 · 09da57a · 09da57a
1 parent 6f49296
commit 09da57a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/...administration/src/module/sw-cms/elements/paging/config/sw-cms-el-config-paging.html.twig b/...administration/src/module/sw-cms/elements/paging/config/sw-cms-el-config-paging.html.twig
@@ -1,10 +1,10 @@
 {% block sw_cms_element_paging_config %}
   <div>
-    <sw-text-field
+    <sw-switch-field
       label="Show Only"
       placeholder="Show Only"
       v-model:value="element.config.showOnly.value">
-    </sw-text-field>
+    </sw-switch-field>
     <sw-switch-field label="Subscribe" v-model:value="element.config.subscribe.value"></sw-switch-field>
   </div>
 {% endblock %}
diff --git a/src/Resources/app/administration/src/module/sw-cms/elements/paging/index.js b/src/Resources/app/administration/src/module/sw-cms/elements/paging/index.js
@@ -14,7 +14,7 @@ Shopware.Service('cmsService').registerCmsElement({
             source: 'static',
         },
         showOnly: {
-            value: 'true',
+            value: false,
             source: 'static',
         },
     },

diff --git a/src/Resources/public/administration/js/omikron-fact-finder.js b/src/Resources/public/administration/js/omikron-fact-finder.js
diff --git a/src/Resources/views/storefront/base.html.twig b/src/Resources/views/storefront/base.html.twig
@@ -43,7 +43,6 @@
             return false;
           }
         });
-      //
 
         {% if page.extensions.factfinder.searchImmediate and not page.extensions.factfinder.ssr %}
           const searchParams = factfinder.utils.env.searchParamsFromUrl();

diff --git a/src/Subscriber/CategoryPageSubscriber.php b/src/Subscriber/CategoryPageSubscriber.php
@@ -44,7 +44,6 @@ public function onPageLoaded(NavigationPageLoadedEvent $event): void
         $disableImmediate = safeGetByName($category->getCustomFields(), OmikronFactFinder::DISABLE_SEARCH_IMMEDIATE_CUSTOM_FIELD_NAME);
         $isHome           = $route === 'frontend.home.page';
         $isCategory       = !$isHome && !$disableImmediate;
-        $searchImmediate  = $this->config->isSsrActive() === false && $isCategory;
 
         $baseAddParams = array_filter(explode(',', (string) safeGetByName($event->getPage()->getExtension('factfinder')->get('communication'), 'add-params')));
         /**
@@ -77,7 +76,7 @@ public function onPageLoaded(NavigationPageLoadedEvent $event): void
                 'communication'           => $communication,
                 'trackingSettings'        => $this->extensionConfig->getTrackingSettings(),
                 'redirectMapping'         => (string) $this->extensionConfig->getRedirectMapping(),
-                'searchImmediate'         => $searchImmediate ? 'true' : 'false',
+                'searchImmediate'         => false,
                 'categoryPathFieldName'   => "{$this->fieldName}ROOT",
                 'communicationAttributes' => !empty($communicationConfig) ? $this->getCommunicationAttributes($communicationConfig) : $communication,
             ]

diff --git a/src/Subscriber/ConfigurationSubscriber.php b/src/Subscriber/ConfigurationSubscriber.php
@@ -78,7 +78,7 @@ public function onPageLoaded(ShopwareSalesChannelEvent $event): void
                 'communication'           => $communicationConfig,
                 'trackingSettings'        => $this->extensionConfig->getTrackingSettings(),
                 'redirectMapping'         => (string) $this->extensionConfig->getRedirectMapping(),
-                'searchImmediate'         => $this->isSearchImmediate($event) ? 'true' : 'false',
+                'searchImmediate'         => $this->isSearchImmediate($event),
                 'userId'                  => $customer ? $customer->getId() : null,
                 'ssr'                     => $this->config->isSsrActive(),
                 'communicationAttributes' => $this->getCommunicationAttributes($communicationConfig),
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,6 @@ @@
                 return false;
               }
             });
-          //
             {% if page.extensions.factfinder.searchImmediate and not page.extensions.factfinder.ssr %}
               const searchParams = factfinder.utils.env.searchParamsFromUrl();
@@ Expand Down @@