Differential D1106

Fix the search in ResultsDB
ClosedPublic
Actions

Authored by jskladan on Feb 1 2017, 1:16 PM.

Details

Reviewers
kparal
Group Reviewers
resultsdb
Maniphest Tasks
T889: search completion doesn't work
T893: resultsdb_frontend: populate the search box with current search values
T890: resultsdb_frontend: search is completely broken in production
Commits
rRSFEce95bf85df35: Fix the search in ResultsDB
Summary

Fixes few hiccups in the search implementation.
First of all, the source for typeahead.js is changed to CDN that
serves the data over https, instead of http (which was causing problems
on prod).
Also, the testcase_tokenizer endpoint works if there are multiple pages
of testcases.
Search form is populated with the data from the URL, if present.

Test Plan

Tested locally

Diff Detail

Repository
rRSFE resultsdb_frontend
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
jskladan retitled this revision from to Fix the search in ResultsDB.Feb 1 2017, 1:16 PM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added a reviewer: resultsdb.
kparal accepted this revision.Feb 1 2017, 3:50 PM
kparal added a reviewer: kparal.
This revision is now accepted and ready to land.Feb 1 2017, 3:50 PM
Closed by commit rRSFEce95bf85df35: Fix the search in ResultsDB (authored by Josef Skladanka <jskladan@redhat.com>). · Explain WhyFeb 2 2017, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2820

View Options

resultsdb_frontend/controllers/main.py

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)
42 42​
43@main.route('/testcase_tokenizer') 43​@main.route('/testcase_tokenizer')
44def testcase_tokenizer(): 44​def testcase_tokenizer():
45 global CACHE 45​ global CACHE
46 46​
47 cached = CACHE.get("tokenized_testcases") 47​ cached = CACHE.get("tokenized_testcases")
48 if cached is not None: 48​ if cached is not None:
49 return cached 49​ return cached
50 50​ page = 0
51 tc_names = [tc['name'] for tc in RDB_API.get_testcases()['data']] 51​ tc_names = []
52​ while True:
53​ names = [tc['name'] for tc in RDB_API.get_testcases(page=page, limit=100)['data']]
54​ page += 1
55​ tc_names.extend(names)
56​ if not names:
57​ break
52 data = sorted(tc_names, key=lambda x: (x.count('.'), x)) 58​ data = sorted(tc_names, key=lambda x: (x.count('.'), x))
53 59​
54 response = Response(response=json.dumps(data), status=200, mimetype="application/json") 60​ response = Response(response=json.dumps(data), status=200, mimetype="application/json")
55 CACHE.set("tokenized_testcases", response, CACHE_TIMEOUT) 61​ CACHE.set("tokenized_testcases", response, CACHE_TIMEOUT)
56 return response 62​ return response
57 63​
58@main.route('/groups') 64​@main.route('/groups')
59def groups(): 65​def groups():
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines
View Options

resultsdb_frontend/static/js/search.js

1$('document').ready(function() { 1​$('document').ready(function() {
2 // set up the typeahead 2​ // set up the typeahead
3​ endpoint_url = $('#testcaseEndpointURL').text()
3 var testcases = new Bloodhound({ 4​ var testcases = new Bloodhound({
4 datumTokenizer: Bloodhound.tokenizers.nonword, 5​ datumTokenizer: Bloodhound.tokenizers.nonword,
5 queryTokenizer: Bloodhound.tokenizers.nonword, 6​ queryTokenizer: Bloodhound.tokenizers.nonword,
6 prefetch: { 7​ prefetch: {
7 url: '/testcase_tokenizer', 8​ url: endpoint_url,
8 cache: false, 9​ cache: false,
9 } 10​ }
10 }); 11​ });
11 12​
12 $('#testcase').typeahead({ 13​ $('#testcase').typeahead({
13 hint: true, 14​ hint: true,
14 highlight: true, 15​ highlight: true,
15 minLength: 0 16​ minLength: 0
Show All 14 Lines
30 } 31​ }
31 }); 32​ });
32 33​
33 // Focus the item field when search is shown 34​ // Focus the item field when search is shown
34 $('#collapseSearch').on('shown.bs.collapse', function () { 35​ $('#collapseSearch').on('shown.bs.collapse', function () {
35 $("#item").focus(); 36​ $("#item").focus();
36 }) 37​ })
37 38​
39​ // fill the form based on previous search
40​ var qs = (function(a) {
41​ if (a == "") return {};
42​ var b = {};
43​ for (var i = 0; i < a.length; ++i)
44​ {
45​ var p=a[i].split('=', 2);
46​ if (p.length == 1)
47​ b[p[0]] = "";
48​ else
49​ b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
50​ }
51​ return b;
52​ })(window.location.search.substr(1).split('&'));
53​ console.log(qs);
54​ if(qs['item']){
55​ $("#item").val(qs['item']);
56​ }
57​ if(qs['item:like']){
58​ $("#item").val(qs['item:like']);
59​ }
60​ if(qs.testcases){
61​ $("#testcase").val(qs.testcases);
62​ }
63​ if(qs.outcome){
64​ qs.outcome.split(',').forEach(function(item){
65​ console.log(item);
66​ $('#outcome option[value="'+item+'"]').attr('selected','selected');
67​ });
68​ }
69​
38 // Replace the submit button behaviour 70​ // Replace the submit button behaviour
39 $("#searchform").submit(function(e){ 71​ $("#searchform").submit(function(e){
40 e.preventDefault(); 72​ e.preventDefault();
41 73​
42 var url = $("#url").val() + "?"; 74​ var url = $("#url").val() + "?";
43 var item = $.trim($("#item").val()); 75​ var item = $.trim($("#item").val());
44 var testcase = $.trim($("#testcase").val()); 76​ var testcase = $.trim($("#testcase").val());
45 var outcome = $("#outcome").val(); 77​ var outcome = $("#outcome").val();
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines
View Options

resultsdb_frontend/templates/layout.html

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Line(s)47 <form id="searchform" role="form" name="searchform" action="">
51 </div> 51​ </div>
52 52​
53 <div class="form-group" id="scrollable-dropdown-menu"> 53​ <div class="form-group" id="scrollable-dropdown-menu">
54 <input class="form-control" id="testcase" placeholder="Testcase" value=""> 54​ <input class="form-control" id="testcase" placeholder="Testcase" value="">
55 </div> 55​ </div>
56 56​
57 <div class="form-group"> 57​ <div class="form-group">
58 <select multiple class="form-control" id="outcome" size=4> 58​ <select multiple class="form-control" id="outcome" size=4>
59 <option>PASSED</option> 59​ <option value="PASSED">PASSED</option>
60 <option>FAILED</option> 60​ <option value="FAILED">FAILED</option>
61 <option>INFO</option> 61​ <option value="INFO">INFO</option>
62 <option>NEEDS_INSPECTION</option> 62​ <option value="NEEDS_INSPECTION">NEEDS_INSPECTION</option>
63 </select> 63​ </select>
64 </div> 64​ </div>
65 65​
66 <button type="submit" class="btn btn-default" id="go">Go!</button> 66​ <button type="submit" class="btn btn-default" id="go">Go!</button>
67 </form> 67​ </form>
68 </div> 68​ </div>
69 </div> 69​ </div>
70 70​
Show All 17 Lines83 {% block footer %}
88 </footer> 88​ </footer>
89 {% endblock %} 89​ {% endblock %}
90 90​
91 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> 91​ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
92 <script src="//code.jquery.com/jquery.js"></script> 92​ <script src="//code.jquery.com/jquery.js"></script>
93 <!-- Include all compiled plugins --> 93​ <!-- Include all compiled plugins -->
94 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> 94​ <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
95 <!-- Search logic --> 95​ <!-- Search logic -->
96 <script src="http://twitter.github.com/typeahead.js/releases/0.11.1/typeahead.bundle.js"></script> 96​ <script src="https://cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js"></script>
97 <script src="{{ url_for('static', filename='js/search.js') }}"></script> 97​ <script src="{{ url_for('static', filename='js/search.js') }}"></script>
98​ <div id="testcaseEndpointURL" style="display: none;">{{url_for('main.testcase_tokenizer')}}</div>
98 99​
99 100​
100 {% if config['FEDMENU_URL'] is defined %} 101​ {% if config['FEDMENU_URL'] is defined %}
101 <script src="{{ config['FEDMENU_URL'] }}/js/fedmenu.js"></script> 102​ <script src="{{ config['FEDMENU_URL'] }}/js/fedmenu.js"></script>
102 <script> 103​ <script>
103 fedmenu({ 104​ fedmenu({
104 'url': '{{ config["FEDMENU_DATA_URL"] }}', 105​ 'url': '{{ config["FEDMENU_DATA_URL"] }}',
105 'mimeType': 'application/javascript', 106​ 'mimeType': 'application/javascript',
Show All 10 Lines