Merge branch 'main' into fs-4604

communitiesuk · Oct 2, 2024 · 02421a7 · 02421a7
2 parents b2580cd + 3f302af
commit 02421a7
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 18 deletions.
diff --git a/app/blueprints/fund_builder/forms/round.py b/app/blueprints/fund_builder/forms/round.py
@@ -92,7 +92,7 @@ class RoundForm(FlaskForm):
     application_reminder_sent = RadioField(choices=[("true", "Yes"), ("false", "No")], default="false")
     contact_us_banner_json = TextAreaField("Contact Us Banner")
     reference_contact_page_over_email = RadioField(
-        "Reference contact page over emai", choices=[("true", "Yes"), ("false", "No")], default="false"
+        "Reference contact page over email", choices=[("true", "Yes"), ("false", "No")], default="false"
     )
     contact_email = StringField("Contact Email", validators=[DataRequired()])
     contact_phone = StringField("Contact Phone", validators=[DataRequired()])

diff --git a/app/blueprints/fund_builder/templates/fund.html b/app/blueprints/fund_builder/templates/fund.html
@@ -1,11 +1,12 @@
 {% extends "base.html" %}
+{% set pageHeading %}{{ 'Update a Fund' if fund_id else 'Create a Fund' }} {% endset %}
 {% from "macros/wtfToGovUk.html" import input %}
 {% from "macros/wtfToGovUk.html" import yes_no %}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-        <h1 class="govuk-heading-l">{{ 'Update a Fund' if fund_id else 'Create a Fund' }}</h1>
+        <h1 class="govuk-heading-l">{{pageHeading}}</h1>
         <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
                 <form method="POST">

diff --git a/app/blueprints/fund_builder/templates/fund_config.html b/app/blueprints/fund_builder/templates/fund_config.html
@@ -1,12 +1,15 @@
 {% extends "base.html" %}
+{% set pageHeading %}
+    Fund Settings
+{% endset %}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {%- from "govuk_frontend_jinja/components/accordion/macro.html" import govukAccordion -%}
 {%- from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList -%}
 {%- from "govuk_frontend_jinja/components/select/macro.html" import govukSelect -%}
 {% block content %}
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
-            <h1 class="govuk-heading-l">Fund Settings</h1>
+            <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
             <form method="POST">
                 {{ govukSelect({
                                 "id": "fund_id",

diff --git a/app/blueprints/fund_builder/templates/round.html b/app/blueprints/fund_builder/templates/round.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% set pageHeading %}{{ 'Update a Round' if round_id else 'Create a Round' }}{% endset %}
+
 {% from "macros/wtfToGovUk.html" import input %}
 {% from "macros/wtfToGovUk.html" import dateinput %}
 {% from "macros/wtfToGovUk.html" import multilineinput %}
@@ -8,7 +10,7 @@
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-        <h1 class="govuk-heading-l">{{ 'Update a Round' if round_id else 'Create a Round' }}</h1>
+        <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
         <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
                 <form method="POST">

diff --git a/app/blueprints/fund_builder/templates/section.html b/app/blueprints/fund_builder/templates/section.html
@@ -1,17 +1,18 @@
 {% extends "base.html" %}
+{% set pageHeading %}
+    {% if form.section_id.data %}
+        Update
+    {% else %}
+        Create{% endif %}&nbsp;Section
+{% endset %}
 {% from "macros/wtfToGovUk.html" import input %}
 {% from "macros/wtfToGovUk.html" import yes_no %}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {%- from "govuk_frontend_jinja/components/select/macro.html" import govukSelect -%}
 {% block content %}
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
-            <h1 class="govuk-heading-l">
-                {% if form.section_id.data %}
-                    Update
-                {% else %}
-                    Create{% endif %}&nbsp;Section
-                </h1>
+            <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
                 <form method="POST">
                     <div class="govuk-form-group">
                         <h3 class="govuk-heading-m">Section Name</h3>

diff --git a/app/blueprints/fund_builder/templates/view_assessment_config.html b/app/blueprints/fund_builder/templates/view_assessment_config.html
@@ -1,12 +1,13 @@
 {% extends "base.html" %}
+{% set pageHeading %}View Full Assessment Config {% endset %}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {%- from "govuk_frontend_jinja/components/accordion/macro.html" import govukAccordion -%}
 {%- from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList -%}
 {%- from "govuk_frontend_jinja/components/select/macro.html" import govukSelect -%}
 {% block content %}
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
-            <h1 class="govuk-heading-l">View Full Assessment Config</h1>
+            <h1 class="govuk-heading-l"> {{ pageHeading }}</h1>
             <h2 class="govuk-heading-m">{{ fund.short_name }} - {{ round.short_name }}</h2>
         </div>
     </div>

diff --git a/app/blueprints/self_serve/templates/create_form.html b/app/blueprints/self_serve/templates/create_form.html
@@ -1,12 +1,13 @@
 {% extends "base.html" %}
+{% set pageHeading %}Create Application Form{% endset %}
 
 {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%}
 {%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-        <h1 class="govuk-heading-l">Create Application Form</h1>
+        <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
         <form id="form_form" method="POST">
 
             <select multiple hidden name="selected_pages" id="frm_selected_pages"></select>

diff --git a/app/blueprints/self_serve/templates/create_page.html b/app/blueprints/self_serve/templates/create_page.html
@@ -1,12 +1,13 @@
 {% extends "base.html" %}
+{% set pageHeading %}Build Form Page{% endset %}
 
 {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%}
 {%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-        <h1 class="govuk-heading-l">Build Form Page</h1>
+        <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
         <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
                 <form method="POST" id="page_form">

diff --git a/app/blueprints/self_serve/templates/create_question.html b/app/blueprints/self_serve/templates/create_question.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%}
 {% from "govuk_frontend_jinja/components/radios/macro.html" import govukRadios %}

diff --git a/app/blueprints/self_serve/templates/create_section.html b/app/blueprints/self_serve/templates/create_section.html
@@ -1,12 +1,13 @@
 {% extends "base.html" %}
+{% set pageHeading %}Build Section{% endset %}
 
 {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%}
 {%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-        <h1 class="govuk-heading-l">Build Section</h1>
+        <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
         <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
                 <form method="POST" id="section_form">

diff --git a/app/create_app.py b/app/create_app.py
@@ -1,5 +1,6 @@
 from flask import Flask
 from flask_assets import Environment
+from fsd_utils.logging import logging
 from jinja2 import ChoiceLoader
 from jinja2 import PackageLoader
 from jinja2 import PrefixLoader
@@ -11,7 +12,6 @@
 from app.blueprints.templates.routes import template_bp
 from app.db.models import Fund  # noqa:F401
 from app.db.models import Round  # noqa:F401
-from fsd_utils.logging import logging
 
 
 def create_app() -> Flask:

diff --git a/app/db/queries/fund.py b/app/db/queries/fund.py
@@ -1,9 +1,9 @@
+from flask import current_app
 from sqlalchemy import select
 
 from app.db import db
 from app.db.models.fund import Fund
 from app.db.models.fund import Organisation
-from flask import current_app
 
 
 def add_organisation(organisation: Organisation) -> Organisation:

diff --git a/app/db/queries/round.py b/app/db/queries/round.py
@@ -1,8 +1,8 @@
+from flask import current_app
 from sqlalchemy import select
 
 from app.db import db
 from app.db.models.round import Round
-from flask import current_app
 
 
 def add_round(round: Round) -> Round:

diff --git a/copilot/fsd-fund-application-builder/manifest.yml b/copilot/fsd-fund-application-builder/manifest.yml
@@ -51,7 +51,8 @@ variables:
   AUTHENTICATOR_HOST: "https://authenticator.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
   COOKIE_DOMAIN: ".test.levellingup.gov.uk"
   FLASK_ENV: ${COPILOT_ENVIRONMENT_NAME}
-  FORMS_SERVICE_PUBLIC_HOST: "https://forms.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
+  FORM_RUNNER_EXTERNAL_HOST: "https://forms.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
+  FORM_RUNNER_INTERNAL_HOST: "http://fsd-form-runner-adapter:3009"
   FUND_STORE_API_HOST: "http://fsd-fund-store:8080"
   NOTIFICATION_SERVICE_HOST: http://fsd-notification:8080
   MAINTENANCE_MODE: false