MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages

Author: slopukhov

app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml

@@ -7,12 +7,12 @@
 ?>
 <?php if ($block->getSearchTermsLog()->isPageCacheable()): ?>
     <script type="text/x-magento-init">
-    <?= /* @escapeNotVerified */ json_encode([
-            '*' => [
-                  'Magento_CatalogSearch/js/search_terms_log' => [
-                          'url' => $block->getUrl('catalogsearch/searchTermsLog/save')
-                ]
-            ]
-    ]); ?>
+    {
+        "*": {
+            "Magento_CatalogSearch/js/search-terms-log": {
+                "url": "<?= /* @escapeNotVerified */ $block->getUrl('catalogsearch/searchTermsLog/save') ?>"
+            }
+        }
+    }
 </script>
 <?php endif; ?>

app/code/Magento/CatalogSearch/view/frontend/web/js/search-terms-log.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * Return url parameters.
+     * @returns {Object}
+     */
+    function urlParameters() {
+        var params = {}, queries, temp, i, l,
+            queryString = window.location.search;
+
+        queryString = queryString.substring(1);
+        queries = queryString.split("&");
+        for ( i = 0, l = queries.length; i < l; i++ ) {
+            temp = queries[i].split('=');
+            params[temp[0]] = temp[1];
+        }
+
+        return params;
+    }
+
+    return function (data) {
+        var url = data.url;
+
+        $.ajax({
+            method: 'GET',
+            url: url,
+            data: {
+                'q': urlParameters()['q']
+            },
+            cache: false
+        });
+    };
+});

app/code/Magento/CatalogSearch/view/frontend/web/js/search_terms_log.js

@@ -104,7 +104,7 @@ public function testPopularSearch()
 
         $responseBody = $this->getResponse()->getBody();
         $this->assertContains('Search results for: 'popular_query_text'', $responseBody);
-        $this->assertContains('\/catalogsearch\/searchTermsLog\/save\/', $responseBody);
+        $this->assertContains('/catalogsearch/searchTermsLog/save/', $responseBody);
 
         $query->loadByQueryText('popular_query_text');
         $this->assertEquals(100, $query->getPopularity());
@@ -128,7 +128,7 @@ public function testPopularSearchWithAdditionalRequestParameters()
 
         $responseBody = $this->getResponse()->getBody();
         $this->assertContains('Search results for: 'popular_query_text'', $responseBody);
-        $this->assertNotContains('\/catalogsearch\/searchTermsLog\/save\/', $responseBody);
+        $this->assertNotContains('/catalogsearch/searchTermsLog/save/', $responseBody);
 
         $query->loadByQueryText('popular_query_text');
         $this->assertEquals(101, $query->getPopularity());
@@ -152,7 +152,7 @@ public function testNotPopularSearch()
 
         $responseBody = $this->getResponse()->getBody();
         $this->assertContains('Search results for: 'query_text'', $responseBody);
-        $this->assertNotContains('\/catalogsearch\/searchTermsLog\/save\/', $responseBody);
+        $this->assertNotContains('/catalogsearch/searchTermsLog/save/', $responseBody);
 
         $query->loadByQueryText('query_text');
         $this->assertEquals(2, $query->getPopularity());