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

Fmd 471 display table name only #518

Merged
merged 9 commits into from
Jul 3, 2024
Merged

Fmd 471 display table name only #518

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b5c00a
return parent container for datasets in search
LavMatt Jul 3, 2024
9137f09
parse parent container metadata for dataset in search query
LavMatt Jul 3, 2024
ff5f34c
display table name only with database as separately in search results
LavMatt Jul 3, 2024
b4c606e
correct typo
LavMatt Jul 3, 2024
e522348
update client search tests
LavMatt Jul 3, 2024
8afe0b0
remove redundant logic from template
LavMatt Jul 3, 2024
0deccdf
expand SearchResult to include parent entity
LavMatt Jul 3, 2024
d68cf3a
return parent as EnityRef in search result
LavMatt Jul 3, 2024
a0d1527
align tests with suggested changes
LavMatt Jul 3, 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
7 changes: 7 additions & 0 deletions lib/datahub-client/data_platform_catalogue/client/graphql/search.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ query Search(
platform {
name
}
container {
urn
properties {
name
qualifiedName
}
}
subTypes {
typeNames
}
Expand Down
15 changes: 14 additions & 1 deletion lib/datahub-client/data_platform_catalogue/client/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,25 @@ def _parse_result(
terms = parse_glossary_terms(entity)
last_modified = parse_last_modified(entity)
name, display_name, qualified_name = parse_names(entity, properties)

container = entity.get("container")
domain = parse_domain(entity)

metadata = {
"owner": owner.display_name,
"owner_email": owner.email,
"parent_container_display_name": (
container.get("properties").get("name")
if container is not None
else None
),
"parent_container_fqn": (
container.get("properties").get("qualifiedName")
if container is not None
else None
),
"parent_container_urn": (
container.get("urn") if container is not None else None
),
"total_parents": entity.get("relationships", {}).get("total", 0),
"domain_name": domain.display_name,
"domain_id": domain.urn,
Expand Down
35 changes: 35 additions & 0 deletions lib/datahub-client/tests/client/datahub/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ def test_one_search_result(mock_graph, searcher):
"type": "DATASET",
"urn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,calm-pagoda-323403.jaffle_shop.customers,PROD)", # noqa E501
"platform": {"name": "bigquery"},
"container": {
"urn": "urn:li:container:abc",
"properties": {
"name": "abc",
"qualifiedName": None,
},
},
"ownership": None,
"name": "calm-pagoda-323403.jaffle_shop.customers",
"properties": {
Expand Down Expand Up @@ -123,6 +130,9 @@ def test_one_search_result(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": "abc",
"parent_container_fqn": None,
"parent_container_urn": "urn:li:container:abc",
"total_parents": 0,
"domain_name": "HMPPS",
"domain_id": "urn:li:domain:3dc18e48-c062-4407-84a9-73e23f768023",
Expand Down Expand Up @@ -161,6 +171,7 @@ def test_dataset_result(mock_graph, searcher):
"type": "DATASET",
"urn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,calm-pagoda-323403.jaffle_shop.customers,PROD)", # noqa E501
"platform": {"name": "bigquery"},
"container": None,
"ownership": None,
"name": "calm-pagoda-323403.jaffle_shop.customers",
"properties": {
Expand Down Expand Up @@ -209,6 +220,9 @@ def test_dataset_result(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "HMPPS",
"domain_id": "urn:li:domain:3dc18e48-c062-4407-84a9-73e23f768023",
Expand Down Expand Up @@ -300,6 +314,9 @@ def test_full_page(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "",
"domain_id": "",
Expand Down Expand Up @@ -331,6 +348,9 @@ def test_full_page(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "",
"domain_id": "",
Expand Down Expand Up @@ -360,6 +380,9 @@ def test_full_page(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "",
"domain_id": "",
Expand Down Expand Up @@ -439,6 +462,9 @@ def test_query_match(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "",
"domain_id": "",
Expand Down Expand Up @@ -514,6 +540,9 @@ def test_result_with_owner(mock_graph, searcher):
metadata={
"owner": "Shannon Lovett",
"owner_email": "shannon@longtail.com",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "",
"domain_id": "",
Expand Down Expand Up @@ -884,6 +913,9 @@ def test_search_for_charts(mock_graph, searcher):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"domain_name": "",
"domain_id": "",
Expand Down Expand Up @@ -1056,6 +1088,9 @@ def test_tag_to_display(tags, result):
metadata={
"owner": "",
"owner_email": "",
"parent_container_display_name": None,
"parent_container_fqn": None,
"parent_container_urn": None,
"total_parents": 0,
"parents": [],
"domain_name": "",
Expand Down
32 changes: 23 additions & 9 deletions templates/partial/search_result.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
<div class="govuk-grid-column-full">
<h3 class="govuk-heading-m govuk-!-margin-bottom-2">
{% with result_type=result.result_type.name|lower %}
<a href="{% url 'home:details' result_type=result_type urn=result.urn %}" class="govuk-link">{{result.fully_qualified_name}}</a>
{% if result.display_name %}
<a href="{% url 'home:details' result_type=result_type urn=result.urn %}" class="govuk-link">{{result.display_name}}</a>
{% else %}
<a href="{% url 'home:details' result_type=result_type urn=result.urn %}" class="govuk-link">{{result.fully_qualified_name}}</a>
{% endif %}
{% endwith %}
{% if result.result_type.name == "TABLE" %}
<strong class="govuk-tag govuk-!-margin-left-2">
Expand All @@ -34,19 +38,29 @@ <h3 class="govuk-heading-m govuk-!-margin-bottom-2">
<span>TBC</span>
</li>
<li>
<span class="govuk-!-font-weight-bold">Domain name:</span>
<span class="govuk-!-font-weight-bold">Domain:</span>
<span>{{result.metadata.domain_name}}</span>
</li>
<li>
{% if result.result_type.name == "TABLE" %}
<li>
<span class="govuk-!-font-weight-bold">Database:</span>
{% if result.metadata.parent_container_display_name %}
<span>{{result.metadata.parent_container_display_name}}</span>
{% else %}
<span>{{result.metadata.parent_container_fqn}}</span>
{% endif %}
</li>
{% endif %}
<li>
<span class="govuk-!-font-weight-bold">Tags:</span>
<span>
{% if result.tags_to_display %}
{% for tag in result.tags_to_display %}
<a aria-label="link to search results for all entities tagged {{ tag }}" href="{% url 'home:search' %}{% query_string clear_label=None clear_filter=None new=None tags=tag %}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %}
{% endif %}
{% if result.tags_to_display %}
{% for tag in result.tags_to_display %}
<a aria-label="link to search results for all entities tagged {{ tag }}" href="{% url 'home:search' %}{% query_string clear_label=None clear_filter=None new=None tags=tag %}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %}
{% endif %}
</span>
</li>
</li>
{% if result.matches %}
<li>
<span class="govuk-!-font-weight-bold">Matched fields:</span>
Expand Down
Loading