Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve captions on details pages #243

Merged
merged 6 commits into from
Apr 9, 2024
Merged

Improve captions on details pages #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09b2ee3
Expand table caption
MatMoore Apr 9, 2024
151532c
Replace schema details with table details
MatMoore Apr 9, 2024
f764775
Fix heading structure on details pages
MatMoore Apr 9, 2024
a05d15a
replace schema with table schema
MatMoore Apr 9, 2024
09b1316
Render a message when tables are missing for any reason
MatMoore Apr 9, 2024
067fb0e
Update selenium
MatMoore Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions templates/details_data_product.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<span class="govuk-caption-m">Data product</span>
<h2 class="govuk-heading-l">{{result.name}}</h2>
<h1 class="govuk-heading-l">{{result.name}}</h1>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down Expand Up @@ -70,6 +70,7 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">

<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
{% if tables %}
<table class="govuk-table">
<caption class="govuk-table__caption govuk-table__caption--m">Data product content</caption>
<thead class="govuk-table__head">
Expand All @@ -91,12 +92,16 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">
{{ table.description|markdown:3 }}
{% endif %}
</td>
<td class="govuk-table__cell"> <a href="{% url 'home:details' result_type=table_type id=table.urn %}" class="govuk-link">Schema details</a></td>
<td class="govuk-table__cell"> <a href="{% url 'home:details' result_type=table_type id=table.urn %}" class="govuk-link">Table details</a></td>
</tr>
{% endwith %}
{% endfor %}
</tbody>
</table>
{% else %}
<h2 class="govuk-heading-m">Data product content</h2>
<p class="govuk-body">This data product is missing table information.</p>
{% endif %}
</div>
</div>
</div>
Expand Down
9 changes: 7 additions & 2 deletions templates/details_database.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<span class="govuk-caption-m">Database</span>
<h2 class="govuk-heading-l">{{result.name}}</h2>
<h1 class="govuk-heading-l">{{result.name}}</h1>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down Expand Up @@ -70,6 +70,7 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">

<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
{% if tables %}
<table class="govuk-table">
<caption class="govuk-table__caption govuk-table__caption--m">Database content</caption>
<thead class="govuk-table__head">
Expand All @@ -91,12 +92,16 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">
{{ table.description|markdown:3 }}
{% endif %}
</td>
<td class="govuk-table__cell"> <a href="{% url 'home:details' result_type=table_type id=table.urn %}" class="govuk-link">Schema details</a></td>
<td class="govuk-table__cell"> <a href="{% url 'home:details' result_type=table_type id=table.urn %}" class="govuk-link">Table details</a></td>
</tr>
{% endwith %}
{% endfor %}
</tbody>
</table>
{% else %}
<h2 class="govuk-heading-m">Database content</h2>
<p class="govuk-body">This database is missing table information.</p>
{% endif %}
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions templates/details_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<span class="govuk-caption-m">Table</span>
<h2 class="govuk-heading-l">{{table.name}}</h2>
<h1 class="govuk-heading-l">{{table.name}}</h1>
</div>
</div>
<div class="govuk-grid-row">
Expand Down Expand Up @@ -76,7 +76,7 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">
<div class="govuk-grid-column-full">
{% if table.column_details %}
<table class="govuk-table">
<caption class="govuk-table__caption govuk-table__caption--m">Schema</caption>
<caption class="govuk-table__caption govuk-table__caption--m">Table schema</caption>
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header">Column name</th>
Expand All @@ -97,7 +97,7 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">
</tbody>
</table>
{% else %}
<h2 class="govuk-heading-m">Schema</h2>
<h2 class="govuk-heading-m">Table schema</h2>
<p class="govuk-body">The schema for this table is not available.</p>
{% endif %}

Expand Down
3 changes: 3 additions & 0 deletions tests/selenium/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ def __init__(self, selenium):


class DataProductDetailsPage(Page):
def primary_heading(self):
return self.selenium.find_element(By.TAG_NAME, "h1")

def secondary_heading(self):
return self.selenium.find_element(By.TAG_NAME, "h2")

Expand Down
4 changes: 2 additions & 2 deletions tests/selenium/test_search_scenarios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ def click_on_the_first_result(self):
def verify_i_am_on_the_details_page(self, item_name):
assert item_name in self.selenium.title

secondary_heading_text = self.details_data_product_page.secondary_heading().text
heading_text = self.details_data_product_page.primary_heading().text

assert secondary_heading_text == item_name
assert heading_text == item_name

def enter_a_query_and_submit(self, query):
search_bar = self.search_page.search_bar()
Expand Down
Loading