From 5a0812221fd34f359de7ba651c986ceed19c7b92 Mon Sep 17 00:00:00 2001
From: Miki <mehranb@amazon.com>
Date: Fri, 3 Dec 2021 12:55:57 -0800
Subject: [PATCH] Enhance breadcrumbs and URLs in search results

Signed-off-by: Miki <mehranb@amazon.com>
---
 _layouts/default.html    |  6 +++++-
 _sass/custom/custom.scss |  4 +++-
 assets/js/search.js      | 18 ++++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/_layouts/default.html b/_layouts/default.html
index 2e4ae661..4ae7477a 100755
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -108,9 +108,13 @@ layout: table_wrappers
         {% if site.search_enabled != false or site.use_custom_search == true %}
         <div class="search">
           <div class="search-input-wrap">
+            {% assign docs_version = site.data.versions.current %}
+            {% if site.baseurl == '/docs/latest' %}
+              {% assign docs_version = "latest" %}
+            {% endif %}
             <input type="text" id="search-input" class="search-input"
                    tabindex="0" placeholder="Search..." aria-label="Search {{ site.title }}"
-                   data-docs-version="{{ site.data.versions.current }}" autocomplete="off">
+                   data-docs-version="{{ docs_version }}" autocomplete="off">
             <div class="search-spinner"><i></i></div>
             <label for="search-input" class="search-label"><svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#svg-search"></use></svg></label>
           </div>
diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index 961668b0..bc4ae921 100755
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -1,3 +1,5 @@
+$content-width: 740px !default;
+
 @import "../../assets/fonts/open-sans/webfont.css";
 @import "../../assets/fonts/open-sans-condensed/webfont.css";
 @import "../../assets/fonts/noto-serif/webfont.css";
@@ -921,7 +923,7 @@ main {
   @include clearfix;
 }
 
-@media screen and (max-width: 799px) {
+@media screen and (max-width: 46.24rem) {
   [role="banner"] .nav-menu-on .small-nav {
 
     li {
diff --git a/assets/js/search.js b/assets/js/search.js
index b6a811ff..9d059f3a 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -74,8 +74,17 @@
         debounceTimer = setTimeout(doSearch, 300);
     };
 
-    function abortPreviousCalls() {
+    const abortPreviousCalls = () => {
         while (abortControllers.length) abortControllers.pop()?.abort?.();
+    };
+
+    const getBreadcrumbs = result => {
+        const crumbs = [...result.ancestors];
+
+        if (result.type === 'DOCS') crumbs.unshift(`OpenSearch ${result.versionLabel || result.version}`);
+        else if (result.type) crumbs.unshift(result.type);
+
+        return sanitizeText(crumbs.join(' › '));
     }
 
     const doSearch = async () => {
@@ -116,11 +125,8 @@
                 ? `
                 <div class="custom-search-result">
                     <a href="${sanitizeAttribute(result.url)}">
-                        <cite>
-                            ${result.type === 'DOCS' ? `OpenSearch ${sanitizeText(result.version)} › ` : ''}
-                            ${sanitizeText(result.ancestors?.join?.(' › '))}
-                        </cite>
-                        ${sanitizeText(result.title)}
+                        <cite>${getBreadcrumbs(result)}</cite>
+                        ${sanitizeText(result.title || 'Unnamed Document')}
                     </a>
                     <span>${sanitizeText(result.content?.replace?.(/\n/g, '&hellip; '))}</span>
                 </div>