Merge remote-tracking branch 'origin/ACP2E-231' into L3_Arrows_PR_20220301

Author: nishant04412

app/code/Magento/Search/ViewModel/AdditionalSearchFormData.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\ViewModel;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * View model for search additional form params
+ */
+class AdditionalSearchFormData implements ArgumentInterface
+{
+    /**
+     * Return search query params
+     *
+     * @return array
+     */
+    public function getFormData(): array
+    {
+        return [];
+    }
+}

app/code/Magento/Search/view/frontend/layout/default.xml

@@ -11,6 +11,7 @@
             <block class="Magento\Framework\View\Element\Template" name="top.search" as="topSearch" template="Magento_Search::form.mini.phtml">
                 <arguments>
                     <argument name="configProvider" xsi:type="object">Magento\Search\ViewModel\ConfigProvider</argument>
+                    <argument name="additionalSearchFormData" xsi:type="object">Magento\Search\ViewModel\AdditionalSearchFormData</argument>
                 </arguments>
             </block>
         </referenceContainer>

app/code/Magento/Search/view/frontend/templates/form.mini.phtml

@@ -10,6 +10,8 @@
 /** @var $escaper \Magento\Framework\Escaper */
 /** @var $configProvider \Magento\Search\ViewModel\ConfigProvider */
 $configProvider = $block->getData('configProvider');
+/** @var $versionManager \Magento\Search\ViewModel\AdditionalSearchFormData */
+$additionalSearchFormData = $block->getData('additionalSearchFormData');
 /** @var $helper \Magento\Search\Helper\Data */
 $helper = $configProvider->getSearchHelperData();
 $allowedSuggestion = $configProvider->isSuggestionsAllowed();
@@ -20,6 +22,12 @@ $quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUr
     <div class="block block-content">
         <form class="form minisearch" id="search_mini_form"
               action="<?= $escaper->escapeUrl($helper->getResultUrl()) ?>" method="get">
+            <?php  if (!empty($queryParams = $additionalSearchFormData->getFormData())): ?>
+                <?php foreach ($queryParams as $param): ?>
+                    <input type="hidden" name="<?= $escaper->escapeHtmlAttr($param['name']) ?>"
+                           value="<?= $escaper->escapeHtmlAttr($param['value']) ?>"/>
+                <?php endforeach; ?>
+            <?php endif; ?>
             <div class="field search">
                 <label class="label" for="search" data-role="minisearch-label">
                     <span><?= $escaper->escapeHtml(__('Search')) ?></span>

dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php

@@ -73,8 +73,18 @@ public function testEscapeSearchText(string $searchValue, string $expectedOutput
         /** @var Result $searchResultBlock */
         $searchResultBlock = $this->layout->createBlock(Result::class);
         /** @var Template $searchBlock */
+        $searchQueryParams = $this->getMockBuilder(\Magento\Search\ViewModel\AdditionalSearchFormData::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFormData'])
+            ->getMock();
+        $searchQueryParams->expects($this->any())
+            ->method('getFormData')
+            ->willReturn([]);
         $searchBlock = $this->layout->createBlock(Template::class);
-        $searchBlock->setData(['configProvider' => $this->configProvider]);
+        $searchBlock->setData([
+            'configProvider' => $this->configProvider,
+            'additionalSearchFormData' => $searchQueryParams,
+        ]);
         $searchBlock->setTemplate('Magento_Search::form.mini.phtml');
         /** @var RequestInterface $request */
         $request = $this->objectManager->get(RequestInterface::class);