Merge branch 'AC-12480' into AC-12482

jayrangnani-gl · jayrangnani-gl · commit 4afe3147e160 · 2024-08-28T18:02:41.000+05:30
diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv
@@ -39,4 +39,6 @@ name,name
 "Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
 "Please enter a valid price range.","Please enter a valid price range."
 "This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.","This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact."
-"This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
+"This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
+"If not specified, Default Search Engine will be used.","If not specified, Default Search Engine will be used."
+"This search engine option is no longer supported by Adobe. It is recommended to use OpenSearch as a search engine instead.","This search engine option is no longer supported by Adobe. It is recommended to use OpenSearch as a search engine instead."
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="js">
+            <block class="Magento\Backend\Block\Template" name="search_engine_comment_js" template="Magento_CatalogSearch::search_engine_comment.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/templates/search_engine_comment.phtml b/app/code/Magento/CatalogSearch/view/adminhtml/templates/search_engine_comment.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+?>
+<script type="text/x-magento-init">
+{
+    "*": {
+        "Magento_CatalogSearch/js/search-engine-comment": {}
+    }
+}
+</script>
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/web/js/search-engine-comment.js b/app/code/Magento/CatalogSearch/view/adminhtml/web/js/search-engine-comment.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+require([
+    'jquery',
+    'domReady!',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    $(function () {
+        const engineField = $('#catalog_search_engine');
+        const commentContainer = $('#row_catalog_search_engine p');
+
+        const updateCommentText = () => {
+            const engineValue = engineField.val(),
+                defaultText = $.mage.__('If not specified, Default Search Engine will be used.'),
+                unsupportedText = $.mage.__('This search engine option is no longer supported by Adobe. ' +
+                    'It is recommended to use OpenSearch as a search engine instead.'),
+                newCommentText = ['elasticsearch7', 'elasticsearch8'].includes(engineValue) ?
+                    unsupportedText : defaultText;
+
+            if (commentContainer.text() !== newCommentText) {
+                commentContainer.text(newCommentText);
+            }
+        };
+
+        engineField.change(updateCommentText);
+        updateCommentText();
+    });
+});
diff --git a/setup/src/Magento/Setup/Model/SearchConfigOptionsList.php b/setup/src/Magento/Setup/Model/SearchConfigOptionsList.php
@@ -150,7 +150,7 @@ public function getAvailableSearchEngineList(): array
     {
         return [
             'elasticsearch7' => 'Elasticsearch 7.x (deprecated)',
-            'elasticsearch8' => 'Elasticsearch 8.x',
+            'elasticsearch8' => 'Elasticsearch 8.x (deprecated)',
             'opensearch' => 'OpenSearch'
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function getAvailableSearchEngineList(): array`
`150`	`150`	`{`
`151`	`151`	`return [`
`152`	`152`	`'elasticsearch7' => 'Elasticsearch 7.x (deprecated)',`
`153`		`- 'elasticsearch8' => 'Elasticsearch 8.x',`
	`153`	`+ 'elasticsearch8' => 'Elasticsearch 8.x (deprecated)',`
`154`	`154`	`'opensearch' => 'OpenSearch'`
`155`	`155`	`];`
`156`	`156`	`}`