Differential D1120

Improve experience when an optional parameter is not defined on results, groups, and testcases
ClosedPublic
Actions

Authored by mprahl on Feb 8 2017, 8:50 PM.

Details

Reviewers
tflink
jskladan
Commits
rRSFE3913b37793d3: Improve experience when an optional parameter is not defined on results, groups…
Summary
  • Use resultsdb_api that supports v2 in Docker
  • Only show a result's ref_url when it is defined
  • Display a result's note only when it is defined when in the details view
  • Only show the result's groups if it is associated with at least one group
  • Only show a groups's ref_url when it is defined
  • Only display a link to a group's associated results when it is associated with at least one result
  • Only show a testcase's ref_url when it is defined
  • Remove inconsistencies of either showing a dash or a blank space in a column for a result's property that is not defined
Test Plan

Create a testcase with no URL, create a group with no results associated with it, and create a result with just
an outcome and a testcase. From there you will notice the changes.

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.
mprahl retitled this revision from to Improve experience when an optional parameter is not defined on results, groups, and testcases.Feb 8 2017, 8:50 PM
mprahl updated this object.
mprahl edited the test plan for this revision. (Show Details)
mprahl added reviewers: tflink, jskladan.
mprahl added a subscriber: ralph.
jskladan accepted this revision.Feb 9 2017, 2:18 AM

Like it, thanks!

This revision is now accepted and ready to land.Feb 9 2017, 2:18 AM
Closed by commit rRSFE3913b37793d3: Improve experience when an optional parameter is not defined on results, groups… (authored by Matt Prahl <mprahl@redhat.com>, committed by Josef Skladanka <jskladan@redhat.com>). · Explain WhyFeb 9 2017, 1:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2866

View Options

Dockerfile

1FROM fedoraqa/flask-base:24 1​FROM fedoraqa/flask-base:24
2 2​
3ADD ./docker_data/tflink-taskotron-fedora.repo /etc/yum.repos.d/ 3​RUN dnf install -y python-resultsdb_api && dnf clean all
4RUN dnf install -y resultsdb_api && dnf clean all ​
5COPY . /usr/src/resultsdb_frontend 4​COPY . /usr/src/resultsdb_frontend
6COPY ./docker_data/settings.py /usr/src/resultsdb_frontend/conf/ 5​COPY ./docker_data/settings.py /usr/src/resultsdb_frontend/conf/
7WORKDIR /usr/src/resultsdb_frontend 6​WORKDIR /usr/src/resultsdb_frontend
8EXPOSE 5002 7​EXPOSE 5002
9ENV DEV true 8​ENV DEV true
10RUN pip install -r requirements.txt 9​RUN pip install -r requirements.txt
11 10​
12CMD ["python", "runapp.py"] 11​CMD ["python", "runapp.py"]
View Options

docker_data/tflink-taskotron-fedora.repo

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

resultsdb_frontend/templates/groups.html

Show All 15 Lines15 <td>
16 {% if group.description %} 16​ {% if group.description %}
17 {{ group.description }} 17​ {{ group.description }}
18 <a href="#{{group.uuid}}" class="btn btn-xs btn-info" style="float: right" data-toggle="collapse">Show UUID</a> 18​ <a href="#{{group.uuid}}" class="btn btn-xs btn-info" style="float: right" data-toggle="collapse">Show UUID</a>
19 <div id="{{group.uuid}}" class="collapse">{{group.uuid}}</div> 19​ <div id="{{group.uuid}}" class="collapse">{{group.uuid}}</div>
20 {% else %} 20​ {% else %}
21 {{ group.uuid }} 21​ {{ group.uuid }}
22 {% endif %} 22​ {% endif %}
23 </td> 23​ </td>
24 <td><a href="{{ url_for('main.results', groups = group.uuid) }}">{{ group.results_count }} results</a></td> 24​ <td>
25 <td><a href="{{ group.ref_url }}">Link &rarr;</a></td> 25​ {% if group.results_count > 0 %}
26​ <a href="{{ url_for('main.results', groups = group.uuid) }}">{{ group.results_count }} results</a>
27​ {% else %}
28​ 0 results
29​ {% endif %}
30​ </td>
31​ <td>
32​ {% if group.ref_url %}
33​ <a href="{{ group.ref_url }}">Link &rarr;</a></td>
34​ {% endif %}
26 </tr> 35​ </tr>
27 {% endfor %} 36​ {% endfor %}
28 </tbody> 37​ </tbody>
29</table> 38​</table>
30 39​
31 40​
32<ul class="pager"> 41​<ul class="pager">
33 {% if groups.prev %} 42​ {% if groups.prev %}
Show All 9 Lines
View Options

resultsdb_frontend/templates/result_detail.html

Show All 13 Lines12<div class="row">
14 <div class="col-md-9"><a href="{{ url_for('main.testcase', testcase_name=result.testcase.href.split('/')[-1]) }}">{{ result.testcase.name }}</a></div> 14​ <div class="col-md-9"><a href="{{ url_for('main.testcase', testcase_name=result.testcase.href.split('/')[-1]) }}">{{ result.testcase.name }}</a></div>
15</div> 15​</div>
16<div class="row"> 16​<div class="row">
17 <div class="col-md-2"><strong>Outcome</strong></div> 17​ <div class="col-md-2"><strong>Outcome</strong></div>
18 <div class="col-md-9">{{ result.outcome }}</div> 18​ <div class="col-md-9">{{ result.outcome }}</div>
19</div> 19​</div>
20<div class="row"> 20​<div class="row">
21 <div class="col-md-2"><strong>Note</strong></div> 21​ <div class="col-md-2"><strong>Note</strong></div>
22 <div class="col-md-9">{{ result.note }}</div> 22​ <div class="col-md-9">{{ result.note if result.note else '' }}</div>
23</div> 23​</div>
24<div class="row"> 24​<div class="row">
25 <div class="col-md-2"><strong>Groups</strong></div> 25​ <div class="col-md-2"><strong>Groups</strong></div>
26 <div class="col-md-9"> 26​ <div class="col-md-9">
27​ {% if result.groups[0] %}
27 <a href="{{ url_for('main.groups', uuid=result.groups[1])}}">In {{result.groups[0]}} group{%if result.groups[0] != 1%}s{%endif%}</a> 28​ <a href="{{ url_for('main.groups', uuid=result.groups[1])}}">In {{result.groups[0]}} group{%if result.groups[0] != 1%}s{%endif%}</a>
29​ {% endif %}
28 </div> 30​ </div>
29</div> 31​</div>
30<div class="row"> 32​<div class="row">
31 <div class="col-md-2"><strong>Logs</strong></div> 33​ <div class="col-md-2"><strong>Logs</strong></div>
32 <div class="col-md-9"><a href="{{ result.ref_url }}">Link &rarr;</a></div> 34​ <div class="col-md-9">
35​ {% if result.ref_url %}
36​ <a href="{{ result.ref_url }}">Link &rarr;</a>
37​ {% endif %}
38​ </div>
33</div> 39​</div>
34<div class="row"> 40​<div class="row">
35 <div class="col-md-12">&nbsp;</div> 41​ <div class="col-md-12">&nbsp;</div>
36</div> 42​</div>
37 43​
38{% for key in result.data %} 44​{% for key in result.data %}
39<div class="row"> 45​<div class="row">
40 <div class="col-md-2"><strong>{{key}}</strong></div> 46​ <div class="col-md-2"><strong>{{key}}</strong></div>
41 <div class="col-md-9">{{', '.join(result.data[key])}}</div> 47​ <div class="col-md-9">{{', '.join(result.data[key])}}</div>
42</div> 48​</div>
43{% endfor %} 49​{% endfor %}
44 50​
45 51​
46{% endblock %} 52​{% endblock %}
View Options

resultsdb_frontend/templates/results.html

Show All 17 Lines4<table class="table table-striped table-bordered">
18 {% for result in results.data %} 18​ {% for result in results.data %}
19 <tr> 19​ <tr>
20 <td>{{ result.submit_time | replace("T", " ")}}</td> 20​ <td>{{ result.submit_time | replace("T", " ")}}</td>
21 <td><a href="{{ url_for('main.testcase', testcase_name=result.testcase.href.split('/')[-1]) }}">{{ result.testcase.name }}</a></td> 21​ <td><a href="{{ url_for('main.testcase', testcase_name=result.testcase.href.split('/')[-1]) }}">{{ result.testcase.name }}</a></td>
22 <td>{{ result.outcome }}</td> 22​ <td>{{ result.outcome }}</td>
23 <td> 23​ <td>
24 {% if result.data.item %} 24​ {% if result.data.item %}
25 {{ ",".join(result.data.item) }} 25​ {{ ",".join(result.data.item) }}
26 {% else %} ​
27 - ​
28 {% endif %} 26​ {% endif %}
29 </td> 27​ </td>
30 <td> 28​ <td>
31 {% if result.note %} 29​ {% if result.note %}
32 {{ result.note }} 30​ {{ result.note }}
33 {% else %} ​
34 &nbsp; ​
35 {% endif %} 31​ {% endif %}
36 </td> 32​ </td>
37 <td><a href="{{ url_for('main.result', result_id=result.id) }}">Details</a></td> 33​ <td><a href="{{ url_for('main.result', result_id=result.id) }}">Details</a></td>
38 <td> 34​ <td>
35​ {% if result.groups[0] %}
39 <a href="{{ url_for('main.groups', uuid=result.groups[1])}}">In {{result.groups[0]}} group{%if result.groups[0] != 1%}s{%endif%} &rarr;</a> 36​ <a href="{{ url_for('main.groups', uuid=result.groups[1])}}">In {{result.groups[0]}} group{%if result.groups[0] != 1%}s{%endif%} &rarr;</a>
37​ {% endif %}
38​ </td>
39​ <td>
40​ {% if result.ref_url %}
41​ <a href="{{ result.ref_url }}">Link &rarr;</a>
42​ {% endif %}
40 </td> 43​ </td>
41 <td><a href="{{ result.ref_url }}">Link &rarr;</a></td> ​
42 </tr> 44​ </tr>
43 {% endfor %} 45​ {% endfor %}
44 </tbody> 46​ </tbody>
45</table> 47​</table>
46 48​
47<ul class="pager"> 49​<ul class="pager">
48 {% if results.prev %} 50​ {% if results.prev %}
49 <li class="previous"><a href="{{ url_for('main.results') }}?{{ results.prev.split('?')[-1] }}">&larr; Newer Results</a></li> 51​ <li class="previous"><a href="{{ url_for('main.results') }}?{{ results.prev.split('?')[-1] }}">&larr; Newer Results</a></li>
Show All 9 Lines
View Options

resultsdb_frontend/templates/testcases.html

1{% extends "layout.html" %} 1​{% extends "layout.html" %}
2 2​
3{% block body %} 3​{% block body %}
4<table class="table table-striped table-bordered"> 4​<table class="table table-striped table-bordered">
5 <thead> 5​ <thead>
6 <tr> 6​ <tr>
7 <th>Name</th> 7​ <th>Name</th>
8 <th>Results</th> 8​ <th>Results</th>
9 <th>Info</th> 9​ <th>Info</th>
10 </tr> 10​ </tr>
11 </thead> 11​ </thead>
12 <tbody> 12​ <tbody>
13 {% for testcase in testcases.data %} 13​ {% for testcase in testcases.data %}
14 <tr> 14​ <tr>
15 <td>{{ testcase.name }}</td> 15​ <td>{{ testcase.name }}</td>
16 <td><a href="{{ url_for('main.results', testcases = testcase.name) }}">Results</a></td> 16​ <td><a href="{{ url_for('main.results', testcases = testcase.name) }}">Results</a></td>
17 <td><a href="{{ testcase.ref_url }}">Link &rarr;</a></td> 17​ <td>
18​ {% if testcase.ref_url %}
19​ <a href="{{ testcase.ref_url }}">Link &rarr;</a>
20​ {% endif %}
21​ </td>
18 </tr> 22​ </tr>
19 {% endfor %} 23​ {% endfor %}
20 </tbody> 24​ </tbody>
21</table> 25​</table>
22 26​
23 27​
24<ul class="pager"> 28​<ul class="pager">
25 {% if testcases.prev %} 29​ {% if testcases.prev %}
Show All 9 Lines