From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Fri, 5 Jul 2019 22:49:10 +0000 (-0400)
Subject: Bug 1557799 - Search By Change History: date range is ignored when field is not specified
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8b90dadd1d3ccf29b2338fb668f3478d0849b63;p=thirdparty%2Fbugzilla.git

Bug 1557799 - Search By Change History: date range is ignored when field is not specified
---

diff --git a/extensions/BMO/web/js/advanced-search.js b/extensions/BMO/web/js/advanced-search.js
index 3e5662453..9fa341ef0 100644
--- a/extensions/BMO/web/js/advanced-search.js
+++ b/extensions/BMO/web/js/advanced-search.js
@@ -11,10 +11,16 @@
  */
 var Bugzilla = Bugzilla || {}; // eslint-disable-line no-var
 
+/**
+ * Reference or define the BMO extension namespace.
+ * @namespace
+ */
+Bugzilla.BMO = Bugzilla.BMO || {};
+
 /**
  * Implement Advanced Search page features.
  */
-Bugzilla.AdvancedSearch = class AdvancedSearch {
+Bugzilla.BMO.AdvancedSearch = class AdvancedSearch {
   /**
    * Initialize a new AdvancedSearch instance.
    */
@@ -44,4 +50,4 @@ Bugzilla.AdvancedSearch = class AdvancedSearch {
   }
 };
 
-window.addEventListener('DOMContentLoaded', () => new Bugzilla.AdvancedSearch(), { once: true });
+window.addEventListener('DOMContentLoaded', () => new Bugzilla.BMO.AdvancedSearch(), { once: true });
diff --git a/js/advanced-search.js b/js/advanced-search.js
index 50e673046..8f3214815 100644
--- a/js/advanced-search.js
+++ b/js/advanced-search.js
@@ -11,6 +11,48 @@
  */
 var Bugzilla = Bugzilla || {}; // eslint-disable-line no-var
 
+Bugzilla.AdvancedSearch = {};
+
+/**
+ * Implement features in the Search By Change History section.
+ */
+Bugzilla.AdvancedSearch.HistoryFilter = class HistoryFilter {
+  /**
+   * Initialize a new HistoryFilter instance.
+   */
+  constructor() {
+    this.$chfield = document.querySelector('#chfield');
+    this.$chfieldfrom = document.querySelector('#chfieldfrom');
+    this.$chfieldfrom_button = document.querySelector('#chfieldfrom + button');
+    this.$chfieldto = document.querySelector('#chfieldto');
+    this.$chfieldto_button = document.querySelector('#chfieldto + button');
+
+    this.$chfieldfrom.addEventListener('input', event => this.on_date_change(event));
+    this.$chfieldto.addEventListener('input', event => this.on_date_change(event));
+
+    // Use on-event handler because `field.js` will update it
+    this.$chfieldfrom_button.onclick = () => showCalendar('chfieldfrom');
+    this.$chfieldto_button.onclick = () => showCalendar('chfieldto');
+
+    createCalendar('chfieldfrom');
+    createCalendar('chfieldto');
+  }
+
+  /**
+   * Called whenever the date field value is updated.
+   * @param {InputEvent} event `input` event fired on date fields.
+   */
+  on_date_change(event) {
+    // Update the calendar when the user enters a date manually
+    if (event.isTrusted) {
+      updateCalendarFromField(event.target);
+    }
+
+    // Mark `<select>` required if the value is not empty
+    this.$chfield.required = !!this.$chfieldfrom.value.trim() || !!this.$chfieldto.value.trim();
+  }
+};
+
 /**
  * Implement Custom Search features.
  */
@@ -659,4 +701,7 @@ Bugzilla.CustomSearch.DropTarget = class CustomSearchDropTarget {
   }
 };
 
-window.addEventListener('DOMContentLoaded', () => new Bugzilla.CustomSearch(), { once: true });
+window.addEventListener('DOMContentLoaded', () => {
+  new Bugzilla.AdvancedSearch.HistoryFilter();
+  new Bugzilla.CustomSearch();
+}, { once: true });
diff --git a/js/field.js b/js/field.js
index a3680cdf7..639484ac1 100644
--- a/js/field.js
+++ b/js/field.js
@@ -197,6 +197,7 @@ function setFieldFromCalendar(type, args, date_field) {
     }
 
     date_field.value = dateStr;
+    date_field.dispatchEvent(new Event('input'));
     hideCalendar(date_field.id);
 }
 
diff --git a/qa/t/test_bug_edit.t b/qa/t/test_bug_edit.t
index da16d8d56..7c972cd2a 100644
--- a/qa/t/test_bug_edit.t
+++ b/qa/t/test_bug_edit.t
@@ -311,7 +311,7 @@ $sel->type_ok("email2", $config->{QA_Selenium_TEST_user_login});
 screenshot_page($sel, '/app/artifacts/line271.png');
 $sel->click_ok("Search");
 check_page_load($sel,
-  q{http://HOSTNAME/buglist.cgi?emailreporter2=1&emailtype2=exact&order=Importance&list_id=__LIST_ID__&emailtype1=exact&emailcc2=1&query_format=advanced&emailassigned_to1=1&emailqa_contact2=1&email2=QA-Selenium-TEST%40mozilla.test&email1=admin%40mozilla.test&emailassigned_to2=1&product=TestProduct}
+  q{http://HOSTNAME/buglist.cgi?emailreporter2=1&order=Importance&emailtype2=exact&list_id=__LIST_ID__&emailtype1=exact&emailcc2=1&emailassigned_to1=1&query_format=advanced&emailqa_contact2=1&email2=QA-Selenium-TEST%40mozilla.test&emailassigned_to2=1&email1=admin%40mozilla.test&product=TestProduct}
 );
 $sel->title_is("Bug List");
 screenshot_page($sel, '/app/artifacts/line275.png');
diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css
index cb2d23c98..cf6574671 100644
--- a/skins/standard/search_form.css
+++ b/skins/standard/search_form.css
@@ -59,8 +59,12 @@
   font-weight: normal;
 }
 
+.bz_search_section .field_help {
+  white-space: nowrap;
+}
+
 #bug_id_container .field_help {
-  font-size: var(--font-size-x-small);
+  display: block;
 }
 
 .search_field_row {
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 0bd57d88f..5b64215bb 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -258,7 +258,7 @@ TUI_hide_default('custom_search_query');
     <div id="bug_id_container">
       <input type="text" name="bug_id" id="bug_id"
            value="[% default.bug_id.0 FILTER html %]" size="20">
-           <div class="field_help">(comma-separated list)</div>
+           <small class="field_help">(comma-separated list)</small>
     </div>
     should be
     <select name="bug_id_type" id="bug_id_type">
@@ -391,25 +391,14 @@ TUI_hide_default('custom_search_query');
   </li>
   <li>
     <label for="chfieldfrom">between:</label>
-    <input name="chfieldfrom" id="chfieldfrom" size="10"
-           value="[% default.chfieldfrom.0 FILTER html %]" onchange="updateCalendarFromField(this)">
-           <button type="button" class="calendar_button"
-                          id="button_calendar_chfieldfrom"
-                          onclick="showCalendar('chfieldfrom')"><span>Calendar</span></button>
-           and
-           <div id="con_calendar_chfieldfrom"></div>
-          <input name="chfieldto" size="10" id="chfieldto"
-                 value="[% default.chfieldto.0 || "Now" FILTER html %]"
-                 onchange="updateCalendarFromField(this)">
-          <button type="button" class="calendar_button"
-                         id="button_calendar_chfieldto"
-                         onclick="showCalendar('chfieldto')"><span>Calendar</span></button>
-          <div id="con_calendar_chfieldto"></div>
-    (YYYY-MM-DD or relative dates)
-    <script [% script_nonce FILTER none %]>
-      createCalendar('chfieldfrom');
-      createCalendar('chfieldto');
-    </script>
+    <input name="chfieldfrom" id="chfieldfrom" size="10" value="[% default.chfieldfrom.0 FILTER html %]">
+    <button type="button" class="calendar_button" id="button_calendar_chfieldfrom"><span>Calendar</span></button>
+    and
+    <div id="con_calendar_chfieldfrom"></div>
+    <input name="chfieldto" size="10" id="chfieldto" value="[% default.chfieldto.0 FILTER html %]" placeholder="Now">
+    <button type="button" class="calendar_button" id="button_calendar_chfieldto"><span>Calendar</span></button>
+    <div id="con_calendar_chfieldto"></div>
+    <small class="field_help">(YYYY-MM-DD or <a href="[% docs_urlbase FILTER html %]using/finding.html#relative-dates">relative dates</a>)</small>
   </li>
 </ul>