From 7871c94102eccd1d762e51d2a6fffa413ef740dd Mon Sep 17 00:00:00 2001
From: Seyi Adebajo <sadebajo@linkedin.com>
Date: Tue, 29 Nov 2016 15:49:28 -0800
Subject: [PATCH 1/3] DSS-5579: Fixes bug with search input: first search
 operation is successful but subsequent search attempts fail on enter

---
 web/app/views/main.scala.html    |  2 +-
 web/public/javascripts/search.js | 50 ++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/web/app/views/main.scala.html b/web/app/views/main.scala.html
index baf9e44a35..2ef45a52c3 100644
--- a/web/app/views/main.scala.html
+++ b/web/app/views/main.scala.html
@@ -92,7 +92,7 @@
 							</ul>
 						</li>
 					</ul>
-					<form class="navbar-form navbar-left" role="search">
+					<form class="navbar-form navbar-left" role="search" id="nav-keyword-search-form">
 						<div class="row">
 							<div id="searchcategorybtngroup" class="btn-group" role="group">
 							    <button style="height: 30px;margin-right:-4px;"
diff --git a/web/public/javascripts/search.js b/web/public/javascripts/search.js
index 891872a4fb..7f51b04b64 100644
--- a/web/public/javascripts/search.js
+++ b/web/public/javascripts/search.js
@@ -1,10 +1,30 @@
-(function (window, $) {
+(function (global, $) {
+  const searchForm = document.querySelector('#nav-keyword-search-form');
+  const searchInput = searchForm.querySelector('#searchInput');
+
+  // Prevent `enter` key on single input from triggering default form action resulting in page reload
+  searchForm && searchForm.addEventListener('submit', e => e.preventDefault());
+
+  /**
+   * Implements handler for search functionality on Navigation Bar search form.
+   * Updates location hash which will trigger Ember Search route model refresh
+   * *Unfortunately current application model does not abide by Ember recommended approach, hence manual plumbing
+   * *will be refactored in eventual `purge`
+   */
+  const handleSearchInput = function () {
+    if (searchInput) {
+      const {value: keyword} = searchInput;
+      const searchRouteHash = `#/search?keywords=${btoa(keyword)}&category=${global.g_currentCategory}&source=default&page=1`;
+      keyword && (document.location.hash = searchRouteHash);
+    }
+  };
+
   $('#advsearchtabs').find('a:first').tab('show');
   $('#datasetAdvSearchLink').addClass('active');
   String.prototype.replaceAll = function (target, replacement) {
     return this.split(target).join(replacement);
   };
-  window.g_currentCategory = 'Datasets';
+  global.g_currentCategory = 'Datasets';
   function renderAdvSearchDatasetSources(parent, sources) {
     let content = '';
     if ((!parent) || (!sources) || sources.length == 0) {
@@ -67,7 +87,7 @@
         $(objs[index]).parent().removeClass('active');
       });
     }
-    window.g_currentCategory = e.target.text;
+    global.g_currentCategory = e.target.text;
     updateSearchCategories(e.target.text);
     //$(e.target).parent().addClass( 'active' );
     e.preventDefault();
@@ -147,7 +167,7 @@
 
         return false;
       }
-    }).on('autocompleteselect', () => document.querySelector('#searchBtn').click());
+    }).on('autocompleteselect', handleSearchInput);
   });
 
   $.get('/api/v1/advsearch/scopes', function (data) {
@@ -322,24 +342,10 @@
     });
   });
 
-  $('#searchBtn').click(function () {
-    var inputObj = $('#searchInput');
-    if (inputObj) {
-      var keyword = inputObj.val();
-      if (keyword) {
-        window.location = '/#/search?keywords=' + btoa(keyword) +
-            '&category=' + window.g_currentCategory + '&source=default&page=1'
-      }
-    }
-  });
+  document.querySelector('#searchBtn').addEventListener('click', handleSearchInput);
 
   // This is a stop gap implementation to solve the issue with handling the enter key on user search
-  document.querySelector('#searchInput')
-      .addEventListener('keypress', ({keyCode}) => {
-        if (keyCode === 13) {
-          document.querySelector('#searchBtn').click();
-        }
-      });
+  document.querySelector('#searchInput').addEventListener('keypress', e => e.keyCode === 13 && handleSearchInput(e));
 
   function advSearchForDataset() {
     var empty = true;
@@ -426,7 +432,7 @@
     advSearchOpts.fields = {'any': fieldAny, 'all': fieldAll, 'not': fieldNotIn};
     advSearchOpts.comments = comments;
     advSearchOpts.sources = sources;
-    window.location = '/#/advsearch/?query=' + btoa(JSON.stringify(advSearchOpts)) + '&page=1';
+    global.location = '/#/advsearch/?query=' + btoa(JSON.stringify(advSearchOpts)) + '&page=1';
   }
 
   function advSearchForFlow() {
@@ -489,7 +495,7 @@
     advSearchOpts.appcode = {'in': appcodeIn, 'not': appcodeNotIn};
     advSearchOpts.flow = {'in': flowIn, 'not': flowNotIn};
     advSearchOpts.job = {'in': jobIn, 'not': jobNotIn};
-    window.location = '/#/advsearch/?query=' + btoa(JSON.stringify(advSearchOpts)) + '&page=1';
+    global.location = '/#/advsearch/?query=' + btoa(JSON.stringify(advSearchOpts)) + '&page=1';
   }
 
   $('#advSearchBtn').click(function () {

From ae7ccb1538a03346e321325782505d4e2cab0c50 Mon Sep 17 00:00:00 2001
From: Seyi Adebajo <sadebajo@linkedin.com>
Date: Wed, 30 Nov 2016 10:37:46 -0800
Subject: [PATCH 2/3] DSS-5790: Adds help menu for external resources ->
 metadatacoverage

---
 web/app/views/main.scala.html        | 21 +++++++++++++++++++++
 web/public/stylesheets/wherehows.css | 14 ++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/web/app/views/main.scala.html b/web/app/views/main.scala.html
index 2ef45a52c3..fa4fbe394a 100644
--- a/web/app/views/main.scala.html
+++ b/web/app/views/main.scala.html
@@ -177,6 +177,27 @@
 							</ul>
 						</li>
 					</ul>
+
+        <div class="nav nabar-nav navbar-right nav-help-menu dropdown">
+          <button class="nav-help-button dropdown-toggle"
+              type="button" id="nav-help-dropdown"
+              data-toggle="dropdown"
+              aria-haspopup="true"
+              title="WhereHows Help"
+              aria-expanded="true">
+                Help
+                <span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span>
+          </button>
+          <ul class="dropdown-menu" aria-labelledby="nav-help-dropdown">
+            <li>
+              <a href="https://iwww.corp.linkedin.com/wiki/cf/display/ENGS/Metadata+Coverage"
+                 title="Metadata Coverage"
+                 target="_blank">
+                     Metadata Coverage
+              </a>
+            </li>
+          </ul>
+        </div>
 				} else {
 					<form class="navbar-form navbar-right" method="POST"
 						action="@routes.Application.authenticate()?csrfToken=@csrfToken">
diff --git a/web/public/stylesheets/wherehows.css b/web/public/stylesheets/wherehows.css
index b49809cd1b..d07088835b 100644
--- a/web/public/stylesheets/wherehows.css
+++ b/web/public/stylesheets/wherehows.css
@@ -96,6 +96,20 @@ a.dropdown-toggle:hover {
     color: inherit;
 }
 
+.nav-help-button {
+    height: 60px;
+    display: inline-block;
+    margin-bottom: 0;
+    line-height: 1;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    cursor: pointer;
+    user-select: none;
+    border: 1px solid transparent;
+    background: none;
+}
+
 /* Uncomment when ready to replace logo
 .navbar-header:before {
     content: url(/assets/images/icons/logo-white.png);

From 73f914a32a0a2b7fecb646dce67288cf9b308663 Mon Sep 17 00:00:00 2001
From: Seyi Adebajo <sadebajo@linkedin.com>
Date: Wed, 30 Nov 2016 14:31:03 -0800
Subject: [PATCH 3/3] DSS-5477: Updates UI with CR from @sdas-> Adds 'Ask a
 question?' email link to email all owners'

---
 web/app/views/index.scala.html                | 35 +++++++++++--------
 web/app/views/main.scala.html                 |  1 +
 .../javascripts/components/components.js      |  7 +++-
 web/public/stylesheets/wherehows.css          | 10 ++----
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/web/app/views/index.scala.html b/web/app/views/index.scala.html
index 518abe8ed3..7574ecc176 100644
--- a/web/app/views/index.scala.html
+++ b/web/app/views/index.scala.html
@@ -359,21 +359,28 @@
 
 <script type="text/x-handlebars" id="components/dataset-owner-list">
   {{#if owners}}
-    <header>Dataset is owned by</header>
-    <ul>
-      {{#each owners as |owner|}}
-        <li>
-          {{#if owner.email}}
-            <a title="Email {{owner.name}} about {{datasetName}}"
-               href="mailto:{{owner.email}}?subject=RE: Dataset {{datasetName}}">
+    <header>
+      Owners:
+      <ul>
+        {{#each owners as |owner|}}
+          <li>
+            {{#if owner.email}}
+              <a title="Email {{owner.name}} about {{datasetName}}"
+                 href="mailto:{{owner.email}}?subject=RE: Dataset {{datasetName}}">
+                {{owner.name}}
+              </a>
+            {{else}}
               {{owner.name}}
-            </a>
-          {{else}}
-            {{owner.name}}
-          {{/if}}
-        </li>
-      {{/each}}
-    </ul>
+            {{/if}}
+          </li>
+        {{/each}}
+      </ul>
+      {{#if ownersEmailList}}
+        <span>
+          <a title="Email all dataset owners" href="mailto: {{ownersEmailList}}">Ask a question?</a>
+        </span>
+      {{/if}}
+    </header>
   {{else}}
     No known owners for this dataset
   {{/if}}
diff --git a/web/app/views/main.scala.html b/web/app/views/main.scala.html
index fa4fbe394a..f140aa0f71 100644
--- a/web/app/views/main.scala.html
+++ b/web/app/views/main.scala.html
@@ -187,6 +187,7 @@
               aria-expanded="true">
                 Help
                 <span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span>
+                <i class="fa fa-angle-down" aria-hidden="true"></i>
           </button>
           <ul class="dropdown-menu" aria-labelledby="nav-help-dropdown">
             <li>
diff --git a/web/public/javascripts/components/components.js b/web/public/javascripts/components/components.js
index 7d42021050..25c8ac6958 100644
--- a/web/public/javascripts/components/components.js
+++ b/web/public/javascripts/components/components.js
@@ -168,7 +168,12 @@ App.DatasetImpactComponent = Ember.Component.extend({
 
 App.DatasetOwnerListComponent = Ember.Component.extend({
   tagName: 'section',
-  classNames: ['dataset-owner-list']
+  classNames: ['dataset-owner-list'],
+
+  ownersEmailList: Ember.computed('owners', function () {
+    // Reduce owner email to a string containing emails, each separated by comma
+    return this.get('owners').mapBy('email').filter(email => email).join(', ');
+  }),
 });
 
 App.DatasetAuthorComponent = Ember.Component.extend({
diff --git a/web/public/stylesheets/wherehows.css b/web/public/stylesheets/wherehows.css
index d07088835b..987dd0e39c 100644
--- a/web/public/stylesheets/wherehows.css
+++ b/web/public/stylesheets/wherehows.css
@@ -434,22 +434,16 @@ ul.breadcrumbs a {
 
 .dataset-owner-list {
     display: flex;
-    flex-direction: column;
-    max-width: 500px;
     padding: 15px 0;
 }
 
-.dataset-owner-list header {
-    font-size: 16px;
-}
-
 .dataset-owner-list ul {
-    display: flex;
+    display: inline-flex;
     list-style-type: none;
     padding: 0;
 }
 
 .dataset-owner-list li {
-    margin-right: 15px;
+    margin-right: 10px;
     line-height: 2;
 }
\ No newline at end of file