Merge remote-tracking branch 'magento-l3/ACP2E-1854' into ACP2E-1854

Author: aplapana

app/code/Magento/Catalog/Test/Mftf/Test/SavingCustomAttributeValuesUsingUITest.xml

@@ -55,6 +55,7 @@
             <actionGroup ref="AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup" stepKey="setDropdownUseInLayeredNavigationNoResults">
                 <argument name="useInLayeredNavigationValue" value="Filterable (with results)"/>
             </actionGroup>
+            <selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="selectIsSearchAble"/>
             <selectOption selector="{{AttributePropertiesSection.useInSearchResultsLayeredNavigation}}" userInput="Yes" stepKey="selectUseInLayeredNavigationOption"/>
             <click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
 

app/code/Magento/LayeredNavigation/Plugin/Save/AdjustAttributeSearchable.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Plugin\Save;
+
+use Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation;
+
+class AdjustAttributeSearchable
+{
+    /**
+     * Change attribute value if the filterable option is not enabled
+     *
+     * @param Presentation $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterConvertPresentationDataToInputType(Presentation $subject, array $result): array
+    {
+        if (isset($result['is_filterable_in_search']) &&
+            $result['is_filterable_in_search'] == '1' &&
+            $result['is_searchable'] == '0'
+        ) {
+            $result['is_filterable_in_search'] = '0';
+        }
+
+        return $result;
+    }
+}

app/code/Magento/LayeredNavigation/Test/Unit/Plugin/Save/AdjustAttributeSearchableTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Test\Unit\Plugin\Save;
+
+use Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation;
+use Magento\LayeredNavigation\Plugin\Save\AdjustAttributeSearchable;
+use PHPUnit\Framework\TestCase;
+
+class AdjustAttributeSearchableTest extends TestCase
+{
+    /**
+     * @return void
+     */
+    public function testAfterConvertPresentationDataToInputType(): void
+    {
+        $presentation = $this->createMock(Presentation::class);
+        $result = [
+            'is_filterable_in_search' => '1',
+            'is_searchable' => '0'
+        ];
+        $interceptor = new AdjustAttributeSearchable();
+        $this->assertSame(
+            ['is_filterable_in_search' => '0', 'is_searchable' => '0'],
+            $interceptor->afterConvertPresentationDataToInputType($presentation, $result)
+        );
+    }
+}

app/code/Magento/LayeredNavigation/etc/adminhtml/di.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation">
+        <plugin name="adjust_searchable_attribute_values" type="Magento\LayeredNavigation\Plugin\Save\AdjustAttributeSearchable" sortOrder="1" disabled="false" />
+    </type>
+</config>
+