Merge pull request #2300 from uktrade/dev

UAT release
uktrade · Jan 14, 2025 · 91b76f7 · 91b76f7
2 parents c38dafa + c1888a6
commit 91b76f7
Show file tree

Hide file tree

Showing 16 changed files with 468 additions and 413 deletions.
diff --git a/Pipfile b/Pipfile
@@ -76,7 +76,7 @@ django-redis = "~=4.12.1"
 django-log-formatter-ecs = "==0.0.5"
 django-ipware = "~=3.0.7"
 django-extra-views = "~=0.14.0"
-django = "~=4.2.15"
+django = "~=4.2.17"
 django-log-formatter-asim = "~=0.0.5"
 dbt-copilot-python = "~=0.2.1"
 cryptography = "~=43.0.1"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/exporter/assets/scss/components/_hub.scss b/exporter/assets/scss/components/_hub.scss
@@ -3,3 +3,7 @@
         max-width: 100%;
     }
 }
+
+#compliance-open-licence-app-tiles {
+    display: none;
+}
diff --git a/exporter/templates/applications/goods-locations/goods-locations.html b/exporter/templates/applications/goods-locations/goods-locations.html
@@ -73,7 +73,7 @@ <h1 class="govuk-heading-l">
 				{% for location in application.goods_locations.data %}
 					{% if application.goods_locations.type == 'sites' %}
 						<tr class="govuk-table__row">
-							<td class="govuk-table__header" scope="row">{{ location.name }}</td>
+							<td class="govuk-table__cell">{{ location.name }}</td>
 							<td class="govuk-table__cell">
 								{{ location|get_address }}
 							</td>

diff --git a/exporter/templates/core/hub.html b/exporter/templates/core/hub.html
@@ -192,7 +192,7 @@ <h2 class="govuk-heading-m govuk-!-margin-top-6 govuk-!-margin-bottom-3">{% lcs
 			</ul>
 		</div>
 
-		<div class="app-tiles" aria-label="Content currently unavailable">
+		<div id="compliance-open-licence-app-tiles" class="app-tiles" aria-label="Content currently unavailable">
 			{# Compliance licence tile #}
 			<div class="app-tile app-tile__disabled">
 				<h2 class="govuk-!-margin-top-0">

diff --git a/exporter/templates/core/registration/confirmation-registration-base.html b/exporter/templates/core/registration/confirmation-registration-base.html
@@ -26,7 +26,7 @@ <h1 class="govuk-heading-xl">
 	{% endblock %}
 
 	<div class="govuk-summary-list__row" id="org-name">
-		<h1 class="govuk-heading-m">Now send your application</h1>
+		<h2 class="govuk-heading-m">Now send your application</h2>
 		<p class="govuk-body">By submitting this notification you are confirming that, to the best of your knowledge, the details you are providing are correct. </p>
 	</div>
 

diff --git a/exporter/templates/core/registration/confirmation-registration-corporation-abroad.html b/exporter/templates/core/registration/confirmation-registration-corporation-abroad.html
@@ -4,9 +4,9 @@
 
         {% include "core/registration/includes/registration-details-corporation.html" %}
 
-        <h1 class="govuk-heading-m">
+        <h2 class="govuk-heading-m">
                 Where is your organisation based?
-        </h1>
+        </h2>
 
         {% include "core/registration/includes/address-details-abroad.html" %}
 

diff --git a/exporter/templates/core/registration/confirmation-registration-corporation-uk.html b/exporter/templates/core/registration/confirmation-registration-corporation-uk.html
@@ -4,9 +4,9 @@
 
         {% include "core/registration/includes/registration-details-corporation.html" %}
 
-        <h1 class="govuk-heading-m">
+        <h2 class="govuk-heading-m">
                 Where is your organisation based?
-        </h1>
+        </h2>
 
         {% include "core/registration/includes/address-details-uk.html" %}
 

diff --git a/exporter/templates/core/registration/confirmation-registration-individual-abroad.html b/exporter/templates/core/registration/confirmation-registration-individual-abroad.html
@@ -4,9 +4,9 @@
 
         {% include "core/registration/includes/registration-details-individual.html" %}
 
-        <h1 class="govuk-heading-m">
+        <h2 class="govuk-heading-m">
                 Where are you based?
-        </h1>
+        </h2>
 
         {% include "core/registration/includes/address-details-abroad.html" %}
 {% endblock %}
diff --git a/exporter/templates/core/registration/confirmation-registration-individual-uk.html b/exporter/templates/core/registration/confirmation-registration-individual-uk.html
@@ -4,9 +4,9 @@
 
     {% include "core/registration/includes/registration-details-individual.html" %}
 
-    <h1 class="govuk-heading-m">
+    <h2 class="govuk-heading-m">
          Where in the United Kingdom are you based?
-    </h1>
+    </h2>
 
     {% include "core/registration/includes/address-details-uk.html" %}
 {% endblock %}
diff --git a/exporter/templates/core/registration/includes/registration-details-corporation.html b/exporter/templates/core/registration/includes/registration-details-corporation.html
@@ -1,7 +1,7 @@
 
-<h1 class="govuk-heading-m">
+<h2 class="govuk-heading-m">
     Register a commercial organisation
-</h1>
+</h2>
 <dl class="govuk-summary-list govuk-!-margin-bottom-9" id="registration-summary">
     <div class="govuk-summary-list__row" id="org-name">
         <dt class="govuk-summary-list__key">

diff --git a/exporter/templates/core/registration/includes/registration-details-individual.html b/exporter/templates/core/registration/includes/registration-details-individual.html
@@ -1,8 +1,8 @@
 
 
-<h1 class="govuk-heading-m">
+<h2 class="govuk-heading-m">
     Organisation details
-</h1>
+</h2>
 <dl class="govuk-summary-list govuk-!-margin-bottom-9" id="registration-summary">
     <div class="govuk-summary-list__row" id="name">
         <dt class="govuk-summary-list__key">

diff --git a/exporter/templates/organisation/members/index.html b/exporter/templates/organisation/members/index.html
@@ -22,7 +22,7 @@
 		<tbody class="govuk-table__body">
 			{% for user in data.results %}
 				<tr class="govuk-table__row">
-					<td class="govuk-table__header" scope="row">
+					<td class="govuk-table__cell">
 						{% if not user.pending %}
 							{{ user.first_name }} {{ user.last_name }}
 						{% else %}

diff --git a/exporter/templates/organisation/roles/index.html b/exporter/templates/organisation/roles/index.html
@@ -16,7 +16,7 @@
 		<tbody class="govuk-table__body">
 			{% for role in roles.results %}
 				<tr class="govuk-table__row" id="role-{{ role.name }}">
-					<td class="govuk-table__header" scope="row">
+					<td class="govuk-table__cell">
 						{{ role.name }}
 					</td>
 					<td class="govuk-table__cell">

diff --git a/exporter/templates/organisation/sites/index.html b/exporter/templates/organisation/sites/index.html
@@ -28,7 +28,7 @@
 		<tbody class="govuk-table__body">
 			{% for site in sites %}
 				<tr class="govuk-table__row">
-					<td class="govuk-table__header" scope="row">
+					<td class="govuk-table__cell">
 						{{ site.name }}
 						{% if site.id == organisation.primary_site.id %}
 							<span class="govuk-hint">(Registered office address)</span>

diff --git a/unit_tests/exporter/organisation/members/test_templates.py b/unit_tests/exporter/organisation/members/test_templates.py
@@ -8,8 +8,8 @@ def test_pending_users_in_organisation():
     context["data"] = {
         "results": [
             {
-                "id": "11c74ddd-c119-48cc-8696-e096218ca583",
-                "email": "[email protected]",
+                "id": "11c74ddd-c119-48cc-8696-e096218ca583",  # /PS-IGNORE
+                "email": "[email protected]",  # /PS-IGNORE
                 "first_name": "",
                 "last_name": "",
                 "status": "Active",
@@ -18,8 +18,8 @@ def test_pending_users_in_organisation():
                 "phone_number": "",
             },
             {
-                "id": "2a43805b-c082-47e7-9188-c8b3e1a83cb0",
-                "email": "[email protected]",
+                "id": "2a43805b-c082-47e7-9188-c8b3e1a83cb0",  # /PS-IGNORE
+                "email": "[email protected]",  # /PS-IGNORE
                 "first_name": "John",
                 "last_name": "Smith",
                 "status": "Active",
@@ -33,8 +33,13 @@ def test_pending_users_in_organisation():
     soup = BeautifulSoup(html, "html.parser")
     rows = soup.find("tbody", {"class": "govuk-table__body"}).find_all("tr", recursive=False)
     assert rows[0].find(class_="govuk-tag govuk-tag--blue").text.strip() == "Pending"
-    assert rows[1].find(class_="govuk-table__header").text.strip() == "John Smith"
 
-    values_for_assert = ["[email protected]", "Administrator", "Active", "View John Smith's profile"]
+    values_for_assert = [
+        "John Smith",
+        "[email protected]",  # /PS-IGNORE
+        "Administrator",
+        "Active",
+        "View John Smith's profile",
+    ]
     for index, value in enumerate(rows[1].find_all(class_="govuk-table__cell")):
         assert values_for_assert[index] == value.text.strip()