FFWEB-2195 disable search-immediate on home page

Author: Aleksander Laurowski

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 ---
 name: build
 
-on: [push]
+on: [pull_request]
 
 jobs:
   build:

composer.json

@@ -24,7 +24,8 @@
   "autoload": {
     "psr-4": {
       "Omikron\\FactFinder\\Shopware6\\": "src/"
-    }
+    },
+    "files": ["src/Internal/utils.php"]
   },
   "scripts": {
     "test": [

spec/Subscriber/CategoryViewSpec.php

@@ -38,6 +38,7 @@ public function let(
         $salesChannelContext->getSalesChannel()->willReturn($salesChannelEntity);
         $salesChannelEntity->getNavigationCategoryId()->willReturn($navigationId);
         $request->get('navigationId', $navigationId)->willReturn($navigationId);
+        $request->get('_route')->willReturn('');
         $cmsPageRoute->load('1', $request, $salesChannelContext)->willReturn($categoryRouteResponse);
         $categoryRouteResponse->getCategory()->willReturn($categoryEntity);
         $categoryEntity->getBreadcrumb()->willReturn(

src/Internal/utils.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Omikron\FactFinder\Shopware6\Internal\Utils;
+
+use Closure;
+
+function safeGetByName(?array $collection): Closure
+{
+    return fn (string $name) => is_array($collection) && isset($collection[$name]) && $collection[$name];
+}

src/OmikronFactFinder.php

@@ -113,11 +113,10 @@ public function uninstall(UninstallContext $uninstallContext): void
     private function removeModuleData(UninstallContext $uninstallContext): void
     {
         $customFieldSetRepository = $this->container->get('custom_field_set.repository');
+        $customFieldSet           = $this->getCustomFieldSet(self::FACT_FINDER_CUSTOM_FIELD_SET_NAME, $uninstallContext->getContext());
 
-        $setId = $this->customFieldsExist($uninstallContext->getContext());
-
-        if ($setId) {
-            $customFieldSetRepository->delete(array_values($setId->getData()), $uninstallContext->getContext());
+        if ($customFieldSet) {
+            $customFieldSetRepository->delete([['id' => $customFieldSet->getId()]], $uninstallContext->getContext());
         }
     }
 
@@ -168,7 +167,7 @@ private function fixCMSExportIncludeFieldType(Context $context): void
         $field = $this->getCustomField(OmikronFactFinder::CMS_EXPORT_INCLUDE_CUSTOM_FIELD_NAME, $context);
         if ($field instanceof CustomFieldEntity) {
             $customFieldRepository->update(
-                   [
+                [
                     [
                         'id'     => $field->getId(),
                         'type'   => CustomFieldTypes::BOOL,

src/Subscriber/CategoryView.php

@@ -10,6 +10,7 @@
 use Shopware\Core\Content\Category\SalesChannel\AbstractCategoryRoute;
 use Shopware\Storefront\Page\Navigation\NavigationPageLoadedEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use function Omikron\FactFinder\Shopware6\Internal\Utils\safeGetByName;
 
 class CategoryView implements EventSubscriberInterface
 {
@@ -40,15 +41,16 @@ public static function getSubscribedEvents()
 
     public function onPageLoaded(NavigationPageLoadedEvent $event): void
     {
-        $navigationId  = $event->getRequest()->get('navigationId', $event->getSalesChannelContext()->getSalesChannel()->getNavigationCategoryId());
-        $category      = $this->cmsPageRoute->load($navigationId, $event->getRequest(), $event->getSalesChannelContext())->getCategory();
-        $path          = $this->getPath($category);
-        $safeGetByName = fn (?array $collection) => fn (string $name) => is_array($collection) && isset($collection[$name]) && $collection[$name];
+        $navigationId     = $event->getRequest()->get('navigationId', $event->getSalesChannelContext()->getSalesChannel()->getNavigationCategoryId());
+        $category         = $this->cmsPageRoute->load($navigationId, $event->getRequest(), $event->getSalesChannelContext())->getCategory();
+        $path             = $this->getPath($category);
+        $disableImmediate = safeGetByName($category->getCustomFields())(OmikronFactFinder::DISABLE_SEARCH_IMMEDIATE_CUSTOM_FIELD_NAME);
+        $isHome           = $event->getRequest()->get('_route') === 'frontend.home.page';
 
         $event->getPage()->getExtension('factfinder')->assign(
             [
                 'communication' => [
-                    'search-immediate' => $safeGetByName($category->getCustomFields())(OmikronFactFinder::DISABLE_SEARCH_IMMEDIATE_CUSTOM_FIELD_NAME) ? 'false' : 'true',
+                    'search-immediate' => $isHome && $disableImmediate ? 'false' : 'true',
                     'add-params'       => $path ? implode(',', $this->initial + [sprintf('filter=%s', urlencode($this->fieldName . ':' . $path))]) : '',
                 ],
             ]);

src/Upload/UploadService.php

@@ -48,7 +48,7 @@ public function upload($fileHandle): void
     private function config(): array
     {
         return [
-            'type'   => $this->config->getAuthenticationType(),
+            'type'   => $this->config->getProtocol(),
             'config' => array_filter([
                 'host'       => $this->config->getHost(),
                 'port'       => $this->config->getPort(),