From 30e89c3ab4d81003c9aa599be7bca2dbc89d0999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Fiala?= <jfiala@redhat.com>
Date: Tue, 26 Nov 2019 07:51:10 +0100
Subject: [PATCH] search: fix pagination

* Fixes start index field name mismatch
* Deduplicates the `hcsearch` fuction

Signed-off-by: Jiri Fiala <jfiala@redhat.com>
---
 _javascripts/hc-search.js |  2 +-
 search-commercial.html    | 55 +--------------------------------------
 2 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/_javascripts/hc-search.js b/_javascripts/hc-search.js
index 8df30c832b..1f1fe8f4ba 100644
--- a/_javascripts/hc-search.js
+++ b/_javascripts/hc-search.js
@@ -54,7 +54,7 @@ function hcsearch(searchParams) {
   var searchprovider = "https://search.help.openshift.com/json";
   var searchReq = { "q" : searchParams.q + searchParams.urlFilter,
                     "fields.label" : searchParams.label,
-                    "si" : searchParams.si }  // q = query, l = label
+                    "start" : searchParams.si }
 
   hcMoreBtn.hide();
   hcSearchIndicator.show();
diff --git a/search-commercial.html b/search-commercial.html
index 63bfd3c655..46174c6a83 100644
--- a/search-commercial.html
+++ b/search-commercial.html
@@ -180,6 +180,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     </div>
 </footer>
 
+<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/hc-search.js" type="text/javascript"></script>
 <script type="text/javascript">
   // custom help.openshift.com search
   function parseParamsFromUrl() {
@@ -193,60 +194,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
           return params;
   }  // function parseParamsFromUrl()
 
-  function hcsearch(searchParams) {
-    // elements used repeatedly
-    var hcMoreBtn = $("#hc-search-more-btn");
-    var hcSearchIndicator = $("#hc-search-progress-indicator");
-    var hcSearchResult = $("#hc-search-results");
-
-    // the "searchprovider" is to return a JSON response in the expected format
-    var searchprovider = "https://search.help.openshift.com/json";
-    var searchReq = { "q" : searchParams.q + searchParams.urlFilter,
-                      "fields.label" : searchParams.label,
-                      "si" : searchParams.si }  // q = query, l = label
-
-    hcMoreBtn.hide();
-    hcSearchIndicator.show();
-    $.get(searchprovider, searchReq).done(function (hcsearchresults) {
-      // GET success
-      if (hcsearchresults == "") {
-        // success, but no response (response code mismatch)
-        $("#hc-search-result").append("<p><strong>An error occured while retrieving search results. Please try again later.</strong></p>");
-        hcSearchIndicator.hide();
-      }
-      if (hcsearchresults.response.result) {
-        // if there are any results
-        $(hcsearchresults.response.result).each(function () {
-          var row = '<div class="search-result-item"><a href="' + this.url +
-            '" target="_blank">' + this.title + '</a>';
-          row += '<p class="excerpt">' + this.content_description.replace(/\<br\>/g, ' ') + '</p></div>';
-          hcSearchResult.append(row);
-        });
-        if (hcsearchresults.response.page_number < hcsearchresults.response.page_count) {
-          // if there are more results beyond the retrieved ones
-          // index of the first item on the next page (first item = 0, first page = 1)
-          searchParams.si = hcsearchresults.response.page_number * hcsearchresults.response.page_size;
-          // replace any existing click handler with one to fetch the next set of results
-          hcMoreBtn.off('click');
-          hcMoreBtn.click(function() {
-            hcsearch(searchParams);
-          });
-          hcMoreBtn.show();
-        } else {
-          // no more results beyond the retrieved ones
-          hcSearchResult.append("<p><strong>No more results.</strong></p>");
-        }
-      } else {
-        if (searchParams.si > 0) {
-            // no results reurned, but some already displayed
-            hcSearchResult.append("<p><strong>No more results.</strong></p>");
-        } else {
-          // no results on initial search
-          hcSearchResult.append("<p><strong>No results found. Try rewording your search.</strong></p>");
-        }
-        return params;
-  }
-
   var urlParams = parseParamsFromUrl();
   var queryParamName = 'query';
   var searchLabel = 'docs';