From 224e25863c266b880540a78a98be720be0202169 Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Mon, 29 Aug 2022 23:49:23 +0000
Subject: [PATCH 1/7] add filters

---
 _static/kendrasearchtools.js | 37 ++++++++++++++++++++++++++++--------
 _templates/searchbox.html    | 14 ++++++++++++++
 2 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 _templates/searchbox.html

diff --git a/_static/kendrasearchtools.js b/_static/kendrasearchtools.js
index f2d47ef889..6ab9b076a9 100644
--- a/_static/kendrasearchtools.js
+++ b/_static/kendrasearchtools.js
@@ -533,11 +533,20 @@ var KendraSearch = {
   _pulse_status : -1,
 
   init : function() {
+      var filters = {};
       var params = $.getQueryParameters();
+      console.log(params);
       if (params.q) {
           var query = params.q[0];
           $('input[name="q"]')[0].value = query;
-          this.performSearch(query);
+
+          Object.keys(params).forEach(function(key) {
+            if(key.startsWith("filter")){
+              filters[key] = true;
+              $('input[name="' + key + '"]')[0].checked = true;
+            }
+          });
+          this.performSearch(query, filters=filters);
       }
   },
 
@@ -577,16 +586,18 @@ var KendraSearch = {
   /**
    * execute search (requires search index to be loaded)
    */
-   query : function(query, pageNumber, pageSize=10) {
-    var url = " https://9cs56celvj.execute-api.us-west-2.amazonaws.com/prod"
+   query : function(query, pageNumber, pageSize=10, filters={}) {
+    var url = "https://8e38o66cpd.execute-api.us-west-2.amazonaws.com/prod"
 
     $('#search-progress').empty();
 
     query = KendraSearch.sanitize(query);
 
+    console.log(query, pageNumber, pageSize, filters, window.location.host);
+
     fetch(url, {
       method: 'post',
-      body: JSON.stringify({ "queryText": query , "pageNumber": pageNumber, "pageSize": pageSize, "host": window.location.host}),
+      body: JSON.stringify({ "queryText": query , "pageNumber": pageNumber, "pageSize": pageSize, "filters": filters, "host": window.location.host}),
     }).then(response => response.json())
     .then(function(data) {
       var docs = data["ResultItems"];
@@ -638,6 +649,7 @@ var KendraSearch = {
       }else{
         KendraSearch.stopPulse();
         KendraSearch.title.text(_('Search Results'));
+
         var no_pages = Math.min(Math.floor(parseFloat(data["TotalNumberOfResults"])/parseFloat(pageSize))+1, 100.00/parseFloat(pageSize));
         var maxPaginationButtons = Math.min(6, no_pages);
         var startPaginationButtons = Math.max(1, pageNumber-Math.ceil(maxPaginationButtons/2));
@@ -651,12 +663,11 @@ var KendraSearch = {
           }
         } 
         KendraSearch.out.append(paginationItem);
-
         $('.paginationnolink').each(function ( index, element ) {
           $(element).on('click', function() {
             KendraSearch.output.empty();
             paginationItem.remove();
-            KendraSearch.query(query, parseInt($(element).attr('id').split("-")[1]));
+            KendraSearch.query(query, parseInt($(element).attr('id').split("-")[1]), pageSize, filters);
           });
         });
       }     
@@ -670,20 +681,30 @@ var KendraSearch = {
   /**
    * perform a search for something (or wait until index is loaded)
    */
-   performSearch : function(query) {
+   performSearch : function(query, filters) {
     // create the required interface elements
     this.out = $('#search-results');
     this.title = $('<h2>' + _('Searching...') + '</h2>').appendTo(this.out);
     this.dots = $('<span></span>').appendTo(this.title);
     this.status = $('<p class="search-summary">&nbsp;</p>').appendTo(this.out);
+    // this.searchFilter = $('<div class="search-filter"></div>').appendTo(this.out)
     this.output = $('<ul class="search"/>').appendTo(this.out);
     this.out.css("margin", "auto");
 
     $('#search-progress').text(_('Preparing search...'));
     this.startPulse();
 
-    this.query(query, 1)
+    this.query(query, 1, pageSize=10, filters=filters)
   },
+
+  submitFilterForm: function(that){
+    console.log(that);
+    console.log(that.filterSDKGuide.checked);
+    this.filters["exampleFilter"] = that.filterExample.checked;
+    this.filters["awsDevGuideFilter"] = that.filterAWSDevGuide.checked;
+    this.filters["sdkGuideFilter"] = that.filterSDKGuide.checked;
+    
+  }
   
 };
 
diff --git a/_templates/searchbox.html b/_templates/searchbox.html
new file mode 100644
index 0000000000..cdddbd7efc
--- /dev/null
+++ b/_templates/searchbox.html
@@ -0,0 +1,14 @@
+<div role="search">
+    <form id ="rtd-search-form" class="wy-form" action="{{ base_url }}/search.html" method="get">
+        <input type="text" name="q" placeholder="{% trans %}Search docs{% endtrans %}" title="{% trans %}Type search term here{% endtrans %}" />
+        <br />
+        <br />
+        <div style="text-align: left;">
+            <div style="font-size: 0.85rem;">Filters: </div>
+            <div style="display: inline-block;"><label style="color: white;" for="filterExample"><input type="checkbox" id="filterExample" name="filterExample">Example</label></div>
+            <div style="display: inline-block;"><label style="color: white;" for="filterAWSDevGuide"><input type="checkbox" id="filterAWSDevGuide" name="filterAWSDevGuide">AWS Dev Guide</label></div>
+            <div style="display: inline-block;"><label style="color: white;" for="filterSDKGuide"><input type="checkbox" id="filterSDKGuide" name="filterSDKGuide">SDK Guide</label></div>
+        </div>
+        
+    </form>
+  </div>
\ No newline at end of file

From d524ce0ef9d2f210b83085ce7421514b8485e7ea Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Tue, 30 Aug 2022 00:47:29 +0000
Subject: [PATCH 2/7] correct search url

---
 _templates/searchbox.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_templates/searchbox.html b/_templates/searchbox.html
index cdddbd7efc..340b9d00c9 100644
--- a/_templates/searchbox.html
+++ b/_templates/searchbox.html
@@ -1,5 +1,5 @@
 <div role="search">
-    <form id ="rtd-search-form" class="wy-form" action="{{ base_url }}/search.html" method="get">
+    <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
         <input type="text" name="q" placeholder="{% trans %}Search docs{% endtrans %}" title="{% trans %}Type search term here{% endtrans %}" />
         <br />
         <br />

From a501dacf168465882dcafa531b948d1d0ef26f82 Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Tue, 30 Aug 2022 18:12:55 +0000
Subject: [PATCH 3/7] change search textbox

---
 _templates/searchbox.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_templates/searchbox.html b/_templates/searchbox.html
index 340b9d00c9..6f2f805b08 100644
--- a/_templates/searchbox.html
+++ b/_templates/searchbox.html
@@ -1,6 +1,6 @@
 <div role="search">
     <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-        <input type="text" name="q" placeholder="{% trans %}Search docs{% endtrans %}" title="{% trans %}Type search term here{% endtrans %}" />
+        <input type="text" name="q" placeholder="{% trans %}ex. what is an estimator, estimator.fit{% endtrans %}" title="{% trans %}Type search term here{% endtrans %}" />
         <br />
         <br />
         <div style="text-align: left;">
@@ -11,4 +11,4 @@
         </div>
         
     </form>
-  </div>
\ No newline at end of file
+</div>
\ No newline at end of file

From d310522efb081cae40b7b37d9de87d5456863815 Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Tue, 30 Aug 2022 20:29:44 +0000
Subject: [PATCH 4/7] change search box text

---
 _templates/searchbox.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_templates/searchbox.html b/_templates/searchbox.html
index 6f2f805b08..58b210ea01 100644
--- a/_templates/searchbox.html
+++ b/_templates/searchbox.html
@@ -1,6 +1,6 @@
 <div role="search">
     <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-        <input type="text" name="q" placeholder="{% trans %}ex. what is an estimator, estimator.fit{% endtrans %}" title="{% trans %}Type search term here{% endtrans %}" />
+        <input type="text" name="q" placeholder="{% trans %}ex. train object detection model, pd.concat{% endtrans %}" title="{% trans %}Type search term here{% endtrans %}" />
         <br />
         <br />
         <div style="text-align: left;">

From d0a50cfc866072fab05d21dec79d2e28456a9513 Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Wed, 31 Aug 2022 16:45:51 +0000
Subject: [PATCH 5/7] remove AWS in AWS Dev Guide

---
 _static/kendrasearchtools.js | 5 +++--
 _templates/searchbox.html    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/_static/kendrasearchtools.js b/_static/kendrasearchtools.js
index 6ab9b076a9..8bb411b431 100644
--- a/_static/kendrasearchtools.js
+++ b/_static/kendrasearchtools.js
@@ -587,7 +587,8 @@ var KendraSearch = {
    * execute search (requires search index to be loaded)
    */
    query : function(query, pageNumber, pageSize=10, filters={}) {
-    var url = "https://8e38o66cpd.execute-api.us-west-2.amazonaws.com/prod"
+    var url = "https://9cs56celvj.execute-api.us-west-2.amazonaws.com/prod"
+    console.log("url: " + url);
 
     $('#search-progress').empty();
 
@@ -613,7 +614,7 @@ var KendraSearch = {
           if(doc_url.includes("sagemaker-examples.readthedocs.io")){
             type_badge_html = '<span class="example-badge">Example</span>'
           }else if(doc_url.includes("docs.aws.amazon.com")){
-            type_badge_html = '<span class="aws-doc-badge">AWS Dev Guide</span>'
+            type_badge_html = '<span class="aws-doc-badge">Dev Guide</span>'
           }else if(doc_url.includes("sagemaker.readthedocs.io") || doc_url.includes("sagemaker-debugger.readthedocs.io")){
             type_badge_html = '<span class="sdk-doc-badge">SDK Guide</span>'
           }
diff --git a/_templates/searchbox.html b/_templates/searchbox.html
index 58b210ea01..a7c5aeb1d8 100644
--- a/_templates/searchbox.html
+++ b/_templates/searchbox.html
@@ -6,7 +6,7 @@
         <div style="text-align: left;">
             <div style="font-size: 0.85rem;">Filters: </div>
             <div style="display: inline-block;"><label style="color: white;" for="filterExample"><input type="checkbox" id="filterExample" name="filterExample">Example</label></div>
-            <div style="display: inline-block;"><label style="color: white;" for="filterAWSDevGuide"><input type="checkbox" id="filterAWSDevGuide" name="filterAWSDevGuide">AWS Dev Guide</label></div>
+            <div style="display: inline-block;"><label style="color: white;" for="filterAWSDevGuide"><input type="checkbox" id="filterAWSDevGuide" name="filterAWSDevGuide">Dev Guide</label></div>
             <div style="display: inline-block;"><label style="color: white;" for="filterSDKGuide"><input type="checkbox" id="filterSDKGuide" name="filterSDKGuide">SDK Guide</label></div>
         </div>
         

From 35c845d29390420277f03014feba4d246bf6d4f9 Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Wed, 31 Aug 2022 19:39:10 +0000
Subject: [PATCH 6/7] cleanup

---
 _static/kendrasearchtools.js | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/_static/kendrasearchtools.js b/_static/kendrasearchtools.js
index 8bb411b431..1cc31bdc3c 100644
--- a/_static/kendrasearchtools.js
+++ b/_static/kendrasearchtools.js
@@ -535,7 +535,6 @@ var KendraSearch = {
   init : function() {
       var filters = {};
       var params = $.getQueryParameters();
-      console.log(params);
       if (params.q) {
           var query = params.q[0];
           $('input[name="q"]')[0].value = query;
@@ -588,14 +587,11 @@ var KendraSearch = {
    */
    query : function(query, pageNumber, pageSize=10, filters={}) {
     var url = "https://9cs56celvj.execute-api.us-west-2.amazonaws.com/prod"
-    console.log("url: " + url);
 
     $('#search-progress').empty();
 
     query = KendraSearch.sanitize(query);
 
-    console.log(query, pageNumber, pageSize, filters, window.location.host);
-
     fetch(url, {
       method: 'post',
       body: JSON.stringify({ "queryText": query , "pageNumber": pageNumber, "pageSize": pageSize, "filters": filters, "host": window.location.host}),
@@ -650,7 +646,6 @@ var KendraSearch = {
       }else{
         KendraSearch.stopPulse();
         KendraSearch.title.text(_('Search Results'));
-
         var no_pages = Math.min(Math.floor(parseFloat(data["TotalNumberOfResults"])/parseFloat(pageSize))+1, 100.00/parseFloat(pageSize));
         var maxPaginationButtons = Math.min(6, no_pages);
         var startPaginationButtons = Math.max(1, pageNumber-Math.ceil(maxPaginationButtons/2));
@@ -664,6 +659,7 @@ var KendraSearch = {
           }
         } 
         KendraSearch.out.append(paginationItem);
+
         $('.paginationnolink').each(function ( index, element ) {
           $(element).on('click', function() {
             KendraSearch.output.empty();
@@ -697,15 +693,6 @@ var KendraSearch = {
 
     this.query(query, 1, pageSize=10, filters=filters)
   },
-
-  submitFilterForm: function(that){
-    console.log(that);
-    console.log(that.filterSDKGuide.checked);
-    this.filters["exampleFilter"] = that.filterExample.checked;
-    this.filters["awsDevGuideFilter"] = that.filterAWSDevGuide.checked;
-    this.filters["sdkGuideFilter"] = that.filterSDKGuide.checked;
-    
-  }
   
 };
 

From 4b162a3f465b0e495561554d5cc3d9f6410a23ff Mon Sep 17 00:00:00 2001
From: Amelia Tee Qiao Ying <atqy@amazon.com>
Date: Wed, 31 Aug 2022 20:12:29 +0000
Subject: [PATCH 7/7] more cleanup

---
 _static/kendrasearchtools.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_static/kendrasearchtools.js b/_static/kendrasearchtools.js
index 1cc31bdc3c..4920607010 100644
--- a/_static/kendrasearchtools.js
+++ b/_static/kendrasearchtools.js
@@ -684,7 +684,6 @@ var KendraSearch = {
     this.title = $('<h2>' + _('Searching...') + '</h2>').appendTo(this.out);
     this.dots = $('<span></span>').appendTo(this.title);
     this.status = $('<p class="search-summary">&nbsp;</p>').appendTo(this.out);
-    // this.searchFilter = $('<div class="search-filter"></div>').appendTo(this.out)
     this.output = $('<ul class="search"/>').appendTo(this.out);
     this.out.css("margin", "auto");