Merge branch 'main' into fmd-911-report-issues-with-metadata

Author: mitchdawson1982

home/service/details.py

@@ -146,6 +146,7 @@ def _get_context(self):
         return {
             "entity": self.chart_metadata,
             "entity_type": _("Chart"),
+            "platform_name": _(self.chart_metadata.platform.display_name),
             "parent_entity": self.parent_entity,
             "parent_type": ResultType.DASHBOARD.name.lower(),
             "h1_value": self.chart_metadata.name,
@@ -168,6 +169,7 @@ def _get_context(self):
             "entity": self.dashboard_metadata,
             "entity_type": "Dashboard",
             "h1_value": self.dashboard_metadata.name,
+            "platform_name": _(self.dashboard_metadata.platform.display_name),
             "charts": sorted(
                 self.children,
                 key=lambda d: d.entity_ref.display_name,

locale/en/LC_MESSAGES/django.po

@@ -595,8 +595,6 @@ msgstr "first name"
 msgid "last name"
 msgstr "last name"
 
-#~ msgid "Search metadata catalogue"
-#~ msgstr "Search for data"
-
-#~ msgid "Chart details"
-#~ msgstr "Chart details"
+# Workaround for Justice Data platform not having a readable display name
+msgid "justice-data"
+msgstr "Justice Data"

package-lock.json

@@ -5,7 +5,7 @@
     "babel-jest": "^29.7.0",
     "govuk-frontend": "^5.7.1",
     "jest-environment-jsdom": "^29.7.0",
-    "sass": "^1.79.5"
+    "sass": "^1.80.2"
   },
   "scripts": {
     "dependencies": "bash scripts/import-static.sh",

package.json

@@ -33,7 +33,7 @@ selenium = "~=4.25.0"
 flake8 = ">=6.1.0"
 pytest-django = "^4.9.0"
 pytest-cov = "^5.0.0"
-faker = "^30.3.0"
+faker = "^30.6.0"
 isort = "^5.13.2"
 
 [build-system]

poetry.lock

@@ -8,9 +8,7 @@ <h2 class="govuk-heading-s govuk-!-margin-top-3">
                 {% translate "Access this data" %}
             </h2>
             <div class="govuk-body">
-                <a href="{{entity.external_url}}" class="govuk-link" rel="noreferrer noopener" target="_blank">
-                    {% blocktranslate with display_name=entity.display_name %}{{ display_name }} on Justice Data (opens in new tab){% endblocktranslate %}
-                </a>
+                <a href="{{entity.external_url}}" class="govuk-link" rel="noreferrer noopener" target="_blank">{% blocktranslate with display_name=entity.display_name platform_name=platform_name %}"{{ display_name }}" on {{platform_name}}{% endblocktranslate %}</a> {% translate '(opens in new tab)' %}
             </div>
         </div>
     </div>

pyproject.toml

@@ -40,12 +40,10 @@ <h2 class="govuk-heading-m">{% translate "Dashboard content" %}</h2>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <h2 class="govuk-heading-s govuk-!-margin-top-3">
-        URL
+        {% translate "Access this data" %}
       </h2>
       <div class="govuk-body">
-        <a href="{{entity.external_url}}" class="govuk-link" rel="noreferrer noopener" target="_blank">
-          {% translate "Justice Data (opens in new tab)" %}
-        </a>
+        <a href="{{entity.external_url}}" class="govuk-link" rel="noreferrer noopener" target="_blank">{{ platform_name }}</a> {% translate "(opens in new tab)" %}
       </div>
     </div>
   </div>

templates/details_chart.html

@@ -206,14 +206,15 @@ def test_get_context(self, mock_catalogue):
                     )
                 ],
             ),
-            platform=EntityRef(urn="", display_name=""),
+            platform=EntityRef(urn="", display_name="justice-data"),
         )
         mock_catalogue.get_chart_details.return_value = chart_metadata
 
         context = ChartDetailsService("urn").context
         expected = {
             "entity": chart_metadata,
             "entity_type": "Chart",
+            "platform_name": "Justice Data",
             "parent_entity": None,
             "parent_type": "dashboard",
             "h1_value": "test",