Merge remote-tracking branch 'origin/AC-14360' into spartans_pr_27102025

Author: glo60612

app/code/Magento/Sales/Plugin/SearchCriteria/FulltextFilterPlugin.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Plugin\SearchCriteria;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Data\Collection;
+use Magento\Sales\Model\ResourceModel\Order\Grid\Collection as OrderGridCollection;
+use Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter as UiFulltextFilter;
+
+class FulltextFilterPlugin
+{
+
+    /**
+     * Use LIKE instead of MATCH AGAINST in sales order grid to bypass MySQL stopword limitations
+     *
+     * @param UiFulltextFilter $subject
+     * @param \Closure $proceed
+     * @param Collection $collection
+     * @param Filter $filter
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundApply(
+        UiFulltextFilter $subject,
+        \Closure $proceed,
+        Collection $collection,
+        Filter $filter
+    ): void {
+        if ($collection instanceof OrderGridCollection) {
+            $raw = trim((string) $filter->getValue());
+            if ($raw === '') {
+                return;
+            }
+
+            $normalized = preg_replace('/^\{+|\}+$/', '', $raw);
+            $normalized = ltrim($normalized);
+            $normalized = ltrim($normalized, '#');
+
+            // Exact increment_id search when normalized is all digits
+            if ($normalized !== '' && ctype_digit($normalized)) {
+                $collection->addFieldToFilter('increment_id', ['eq' => $normalized]);
+                return;
+            }
+
+            // LIKE across key columns (for names, emails, non-digit terms)
+            $valueForLike = trim($raw, '{}');
+            $valueForLike = ltrim($valueForLike);
+            $valueForLike = ltrim($valueForLike, '#');
+
+            $like = '%' . str_replace(['%', '_'], ['\\%', '\\_'], $valueForLike) . '%';
+
+            $fields = ['increment_id', 'billing_name', 'shipping_name', 'customer_email'];
+            $conditions = array_fill(0, count($fields), ['like' => $like]);
+
+            $collection->addFieldToFilter($fields, $conditions);
+            return;
+        }
+        $proceed($collection, $filter);
+    }
+}

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

@@ -89,4 +89,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter">
+        <plugin name="ordergrid_fulltext_fallback"
+                type="Magento\Sales\Plugin\SearchCriteria\FulltextFilterPlugin"
+                sortOrder="10"/>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Sales/Plugin/SearchCriteria/FulltextFilterPluginTest.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Plugin\SearchCriteria;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter as UiFulltextFilter;
+use Magento\Sales\Model\ResourceModel\Order\Grid\Collection as OrderGridCollection;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class FulltextFilterPluginTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testApplyOnOrderGridUsesLikeConditionsAndNoMatchAgainst(): void
+    {
+        /** @var UiFulltextFilter $fulltextFilter */
+        $fulltextFilter = $this->objectManager->get(UiFulltextFilter::class);
+
+        /** @var OrderGridCollection $collection */
+        $collection = $this->objectManager->create(OrderGridCollection::class);
+
+        /** @var Filter $filter */
+        $filter = $this->objectManager->create(Filter::class);
+        $filter->setValue('Will');
+
+        $fulltextFilter->apply($collection, $filter);
+
+        $sql = $collection->getSelectSql(true);
+
+        $this->assertStringContainsString("`main_table`.`increment_id` LIKE '%Will%'", $sql);
+        $this->assertStringContainsString("`main_table`.`billing_name` LIKE '%Will%'", $sql);
+        $this->assertStringContainsString("`main_table`.`shipping_name` LIKE '%Will%'", $sql);
+        $this->assertStringContainsString("`main_table`.`customer_email` LIKE '%Will%'", $sql);
+
+        $this->assertStringNotContainsString('MATCH(', $sql);
+        $this->assertStringNotContainsString('AGAINST(', $sql);
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testApplyOnOrderGridWithEmptyValueDoesNothing(): void
+    {
+        /** @var UiFulltextFilter $fulltextFilter */
+        $fulltextFilter = $this->objectManager->get(UiFulltextFilter::class);
+
+        /** @var OrderGridCollection $collection */
+        $collection = $this->objectManager->create(OrderGridCollection::class);
+        $initialSql = $collection->getSelectSql(true);
+
+        /** @var Filter $filter */
+        $filter = $this->objectManager->create(Filter::class);
+        $filter->setValue('   '); // empty after trim
+
+        $fulltextFilter->apply($collection, $filter);
+
+        $sql = $collection->getSelectSql(true);
+
+        // No LIKE or MATCH added
+        $this->assertSame($initialSql, $sql);
+        $this->assertStringNotContainsString('LIKE', $sql);
+        $this->assertStringNotContainsString('MATCH(', $sql);
+        $this->assertStringNotContainsString('AGAINST(', $sql);
+    }
+}