Merge pull request #3392 from uktrade/develop

Release PR
uktrade · Sep 11, 2024 · 6f5d88b · 6f5d88b
2 parents ac18cf4 + c54e808
commit 6f5d88b
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 38 deletions.
diff --git a/config/url_redirects.py b/config/url_redirects.py
@@ -541,6 +541,10 @@
 
 if settings.FEATURE_UNGUIDED_JOURNEY:
     unguided_journey_redirects += [
+        re_path(
+            r'^support/$',
+            PermanentQuerystringRedirectView.as_view(url=DIGITAL_ENTRY_POINT_TRIAGE_HOMEPAGE),
+        ),
         re_path(
             r'^support/customs-taxes-declarations/$',
             QuerystringRedirectView.as_view(url=DIGITAL_ENTRY_POINT_TRIAGE_HOMEPAGE),

diff --git a/contact/templates/domestic/contact/export-support/support.html b/contact/templates/domestic/contact/export-support/support.html
@@ -3,8 +3,8 @@
 {% load wagtailimages_tags %}
 {% load static %}
 {% load add_govuk_classes url_type from content_tags %}
-{% block head_title %}Support{% endblock %}
-{% block meta_title %}Support{% endblock %}
+{% block head_title %}Export support for UK businesses{% endblock %}
+{% block meta_title %}Export support for UK businessest{% endblock %}
 {% block body_js %}
     {{ block.super }}
     <script src="{% static 'javascript/digital-entry-point.js' %}"></script>

diff --git a/contact/templates/domestic/contact/export-support/task-based-category-page.html b/contact/templates/domestic/contact/export-support/task-based-category-page.html
@@ -3,7 +3,6 @@
 {% load wagtailimages_tags %}
 {% load static %}
 {% load add_govuk_classes url_type get_category_page_breadcrumbs from content_tags %}
-{% block meta_tags %}<meta name="robots" content="noindex">{% endblock %}
 {% block head_title %}{{ page.page_title }}{% endblock %}
 {% block meta_title %}{{ page.page_title }}{% endblock %}
 {% block body_js %}

diff --git a/contact/templates/domestic/contact/export-support/task-based-sub-category-page.html b/contact/templates/domestic/contact/export-support/task-based-sub-category-page.html
@@ -3,7 +3,6 @@
 {% load wagtailimages_tags %}
 {% load static %}
 {% load add_govuk_classes url_type get_sub_category_page_breadcrumbs get_meta_tag_label get_meta_tag_icon_path from content_tags %}
-{% block meta_tags %}<meta name="robots" content="noindex">{% endblock %}
 {% block head_title %}{{ page.page_title }}{% endblock %}
 {% block meta_title %}{{ page.page_title }}{% endblock %}
 {% block body_js %}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "sass-loader": "^12.3.0",
     "style-loader": "1.1.3",
     "url-loader": "^4.1.1",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.8.0"
   },
   "dependencies": {

diff --git a/react-components/dist/magna.js b/react-components/dist/magna.js
diff --git a/react-components/dist/magna.js.map b/react-components/dist/magna.js.map
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -365,7 +365,7 @@ googleapis-common-protos==1.65.0
     #   opentelemetry-exporter-otlp-proto-http
 great-components==2.6.5
     # via -r requirements.in
-greenlet==3.0.3
+greenlet==3.1.0
     # via gevent
 grpcio==1.66.1
     # via opentelemetry-exporter-otlp-proto-grpc