Merge pull request #397 from communitiesuk/FLS-870-service-desk-urls

Service desk urls

config/envs/default.py

@@ -25,7 +25,8 @@ class DefaultConfig(object):
 
     FLASK_ROOT = str(Path(__file__).parent.parent.parent)
     FLASK_ENV = environ.get("FLASK_ENV")
-    SUPPORT_MAILBOX_EMAIL = "[email protected]"
+    SUPPORT_DESK_APPLY = "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/5/group/68"
+    SUPPORT_DESK_ASSESS = "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/5/group/70"
 
     # Logging
     FSD_LOG_LEVEL = logging.WARNING

frontend/default/routes.py

@@ -2,6 +2,8 @@
 
 from flask import Blueprint, current_app, render_template
 
+from config import Config
+
 default_bp = Blueprint("default_bp", __name__, template_folder="templates")
 
 
@@ -12,7 +14,11 @@ def index():
 
 @default_bp.errorhandler(404)
 def not_found(error):
-    return render_template("404.html", is_error=True), 404
+    return render_template(
+        "404.html",
+        is_error=True,
+        support_desk_apply=Config.SUPPORT_DESK_APPLY,
+    ), 404
 
 
 @default_bp.errorhandler(500)

frontend/magic_links/routes.py

@@ -92,6 +92,7 @@ def landing(link_id):
             application_guidance=app_guidance,
             round_prospectus=round_prospectus,
             migration_banner_enabled=Config.MIGRATION_BANNER_ENABLED,
+            support_desk_apply=Config.SUPPORT_DESK_APPLY,
             link_to_contact_us_page=round_data.reference_contact_page_over_email,
         )
     return redirect(

frontend/magic_links/templates/landing.html

@@ -76,11 +76,11 @@ <h2 class="govuk-heading-m">
             {% trans %}If you have questions about the form or the fund,{% endtrans %}
             <a class="govuk-link" href="{{ contact_us_url }}">{% trans %}contact us.{% endtrans %}</a>
         {% else %}
-            {% trans %}If you have any questions about the form or the fund, email us at{% endtrans %}
-            <a class="govuk-link" href="mailto:{{ contact_us_email_address }}">{{ contact_us_email_address }}</a>.
+        {% trans %}If you have any questions about the form or the fund, contact us through our {% endtrans %}
+        <a class="govuk-link" href="{{ support_desk_apply }}" target="_blank">{% trans %}support desk{% endtrans %}</a>.
         {% endif %}
     </p>
-    <p>{% trans %}Do not send any applications or attachments by email. We'll only accept applications through this service.{% endtrans %}</p>
+    <p>{% trans %}Do not send any applications or attachments from the service desk portal. We'll only accept applications through this service.{% endtrans %}</p>
 
     <h2 class="govuk-heading-m">
         {% trans %}How we'll use your information{% endtrans %}

frontend/magic_links/templates/landing_eoi.html

@@ -77,11 +77,11 @@ <h2 class="govuk-heading-m">
             {% trans %}If you have questions about the form or the fund,{% endtrans %}
             <a class="govuk-link" href="{{ contact_us_url }}">{% trans %}contact us.{% endtrans %}</a>
         {% else %}
-            {% trans %}If you have any questions about the form or the fund, email us at{% endtrans %}
-            <a class="govuk-link" href="mailto:{{ contact_us_email_address }}">{{ contact_us_email_address }}</a>.
+        {% trans %}If you have any questions about the form or the fund, contact us through our {% endtrans %}
+        <a class="govuk-link" href="{{ support_desk_apply }}" target="_blank">{% trans %}support desk{% endtrans %}</a>.
         {% endif %}
     </p>
-    <p>{% trans %}Do not send any applications or attachments by email. We'll only accept applications through this service.{% endtrans %}</p>
+    <p>{% trans %}Do not send any applications or attachments from the service desk portal. We'll only accept applications through this service.{% endtrans %}</p>
   </div>
 </div>
 

frontend/templates/404.html

@@ -14,7 +14,7 @@ <h1 class="govuk-heading-xl">Page not found</h1>
                 us to speak to an adviser.</p>
 
             {{ contact_details(
-                "[email protected]",
+                support_desk_apply,
                 "",
                 "",
                 "9am to 5pm",

frontend/templates/partials/contact_details.html

@@ -1,20 +1,17 @@
-{% macro contact_details(contact_us_email_address, contact_us_phone, contact_us_text_phone, opening_days, opening_time) %}
-    {% if contact_us_email_address %}
-        <h3 class="govuk-heading-s">{% trans %}Email{% endtrans %}</h3>
+{% macro contact_details(service_desk_url, contact_us_phone, contact_us_text_phone, opening_days, opening_time) %}
+
+    {% if service_desk_url %}
+        <h3 class="govuk-heading-s">{% trans %}Please contact us through our {% endtrans %}<a class="govuk-link" href="{{ service_desk_url }}" target="_blank">
+            {% trans %}support desk{% endtrans %}
+        </a>.</h3>
         <ul class="govuk-list">
-            <li>
-                <a class="govuk-link" href="mailto:{{ contact_us_email_address }}">
-                    {{ contact_us_email_address }}
-                </a>
-            </li>
             <li>
                 {{ opening_days }}: {{ opening_times }} ({% trans %}except public holidays{% endtrans %})
             </li>
         </ul>
 
         <div class="govuk-inset-text">
-            {% trans %}Do not send any applications or attachments by email. We'll only accept applications
-            through this service.{% endtrans %}
+            {% trans %}Do not send any applications or attachments from the service desk portal. We'll only accept applications through this service.{% endtrans %}
         </div>
     {% endif %}
     {% if contact_us_phone %}

frontend/user/routes.py

@@ -40,7 +40,7 @@ def user():
             logged_in_user=logged_in_user,
             login_url=url_for("api_sso.login"),
             logout_url=url_for("api_sso.logout"),
-            support_mailbox=Config.SUPPORT_MAILBOX_EMAIL,
+            support_desk_assess=Config.SUPPORT_DESK_ASSESS,
         ),
         status_code,
     )

frontend/user/templates/user.html

@@ -10,7 +10,7 @@ <h1 class="govuk-heading-xl">Apply for Funding</h1>
 
     {% if roles_required %}
     <p class="govuk-body">You do not have access as your account does not have the right permissions set up.
-    <p class="govuk-body">Please email the support mailbox ({{ support_mailbox }}) to request access or get help if you think this is a mistake.</p>
+    <p class="govuk-body">Please contact us through our support desk portal <a href="{{ support_desk_assess }}" target="_blank">here</a> to request access or get help if you think this is a mistake.</p>
     </p>
     {% else %}
 

tests/test_errors.py

@@ -1,5 +1,7 @@
 from bs4 import BeautifulSoup
 
+from config import Config
+
 
 def test_404(flask_test_client):
     response = flask_test_client.get("not_found")
@@ -8,7 +10,13 @@ def test_404(flask_test_client):
 
     soup = BeautifulSoup(response.data, "html.parser")
 
-    assert "[email protected]" in soup.find("li").text
+    # Find all links in the HTML
+    links = soup.find_all("a", href=True)
+
+    # Check if the portal link is present
+    assert any(
+        link["href"] == Config.SUPPORT_DESK_APPLY for link in links
+    ), f"Expected URL {Config.SUPPORT_DESK_APPLY} not found in the links"
 
 
 def test_500(flask_test_client):

tests/test_magic_links.py

@@ -11,6 +11,7 @@
 import frontend
 from api.session.auth_session import AuthSessionBase
 from app import app
+from config import Config
 from frontend.magic_links.forms import EmailForm
 from models.account import AccountMethods
 from security.utils import validate_token
@@ -152,7 +153,7 @@ def test_reused_magic_link_with_active_session_shows_landing(self, flask_test_cl
                     soup.find_all(
                         "a",
                         class_="govuk-link",
-                        string=lambda text: "[email protected]" in text,
+                        href=Config.SUPPORT_DESK_APPLY,
                     )
                 )
                 == 1

tests/test_signout.py

@@ -138,7 +138,9 @@ def test_user_page_with_missing_roles(self, flask_test_client):
             """<p class="govuk-body">You do not have access as your account does not have the right permissions set up."""  # noqa
             in response.get_data(as_text=True)
         )
-        assert """<p class="govuk-body">Please email the support mailbox""" in response.get_data(as_text=True)  # noqa
+        assert """<p class="govuk-body">Please contact us through our support desk portal""" in response.get_data(
+            as_text=True
+        )  # noqa
         assert (
             """<a href="/sso/login" role="button" draggable="false" class="govuk-button" data-module="govuk-button">\n  Sign in\n</a>"""  # noqa
             not in response.get_data(as_text=True)