Merge pull request #1425 from uktrade/release

Prod release

.circleci/config.yml

@@ -5,10 +5,10 @@ version: 2
 ###############################################################################
 
 python: &python
-  image: circleci/python:3.9.1
+  image: circleci/python:3.9.5
 
 python_node_browsers: &python_node_browsers
-  image: circleci/python:3.9.1-node-browsers
+  image: circleci/python:3.9.5-node-browsers
 
 node: &node
   image: circleci/node:12

CHANGELOG.md

@@ -1,16 +1,98 @@
 # Changelog
 
 ## Pre-release changes - please put everything in the appropriate category below
+
+### Enhancements
+- GP2-2986 - Merge companies-house api views
+- no-ticket - Fix for case study listing view if empty related page selected in any case study
+- GA2-3054 - Updated GA360 mixin for special exception for authenticated staff users
+- GP2-2841 - Pinned CF buildpack and upgraded python to 3.9.5
+- GP2-2982 - Rebuild sitemap.xml in great-cms
+- GP2-2981 - Port Search Feedback page from V1 into V2
+- GP2-2980 - Port Market Access / 'Report a Trade Barrier' pages from V1 into V2
+- GP2-2977 - Port E-Commerce Export Support pages from V1 into V2
+- GP2-1618 - Port legacy EU Exit / transition period forms from V1 into V2
+- GP2-1617 - Port get-finance/UKEF contact form from great-domestic-ui
+- GP2-2856 - remove unused api calls
+- GP2-3065 - Simplify 3CE url config
+- no-ticket - Fix for case study listing view if empty related page selected in any case study
+- GA2-3054 - Updated GA360 mixin for special exception for authenticated staff users
+- GP2-2841 - Pinned CF buildpack and upgraded python to 3.9.5
+- GP2-2982 - Rebuild sitemap.xml in great-cms
+- GP2-2981 - Port Search Feedback page from V1 into V2
+- GP2-2980 - Port Market Access / 'Report a Trade Barrier' pages from V1 into V2
+- GP2-2977 - Port E-Commerce Export Support pages from V1 into V2
+- GP2-1618 - Port legacy EU Exit / transition period forms from V1 into V2
+- GP2-1617 - Port get-finance/UKEF contact form from great-domestic-ui
+- GP2-2856 - remove unused api calls
+- no-ticket - package upgrade
+- GP2-2856 - remove target market
+
+### Fixed bugs
+- GP2-2933 - DAC_Custom_Controls_01 Select widget
+- GP2-2924 - DAC_CSS_Images_as_Labels_03 Select widget expander
+- GP2-2908 - DAC_Headings_07 Learning step headings
+- GP2-2909 - DAC_Headings_08 WTE captions in mobile
+- GP2-2920 - DAC_CSS_Content_05 Radio buttons
+
+- GP2-2934 - DAC_Custom_Controls_02 Tab management on WTE
+- GP2-2893 - DAC_Link_Purpose_02 Learning backlinks
+- GP2-2901 - DAC_Label_in_Name - Product finder
+- GP2-2900 - DAC_Label_in_Name - Search_inputs
+- GP2-2935 - DAC_Custom_Controls_03 Tooltips
+
+- GP2-2915 - DAC_Information_and_Relationships_06 Roles on WTE tables
+- GP2-2914 - DAC_Information_and_Relationships_05 Dynamic caption on WTE
+- GP2-2863 - Skip GA360 on search path
+- GP2-2912 - DAC_Information_and_Relationships_03 Radio fieldsets
+- GP2-2910 - DAC_Information_and_Relationships_01 Learnin categories links
+- GP2-2911 - DAC_Information_and_Relationships_02 learning blockquotes
+- GP2-2910 - DAC_Information_and_Relationships_01 Learning categories links
+- GP2-2887 - DAC_Focus_Order_04 - EP data snapshot fix
+- GP2-2886 - DAC_Focus_Order_03 - EP Objectives list focus management
+- GP2-2885 - DAC_Focus_Order_02 - Dynamic aria label and focus on WTM page
+- GP2-2884 - DAC Focus Order 01 - tabindex on mobile header
+- GP2-2893 - DAC Link Purpose 01
+- GP2-2868 - Tech Debt fix sentry errors
+- GP2-2902 - DAC_Headings_01
+- GP2-2903 - DAC_Headings_02
+- GP2-2904 - DAC_Headings_03
+- GP2-2905 - DAC_Headings_04
+- GP2-2906 - DAC_Headings_05
+- GP2-2907 - DAC_Headings_06
+- GP2-2929 - DAC_Accordions_01
+- GP2-2931 - DAC_Accordions_03
+- GP2-2916 - DAC_CSS_Content_01
+- GP2-2917 - DAC_CSS_Content_02
+- GP2-2918 - DAC_CSS_Content_03
+- GP2-2919 - DAC_CSS_Content_04
+- GP2-2897 - DAC_Name_Role_Value_01
+- GP2-2899 - DAC_Name_Role_Value_03
+- GP2-2943 - DAC_Status_Messages_01
+- GP2-2937 - DAC_Nondescriptive_Labels_01
+- GP2-2923 - DAC_CSS_Images_as_Labels_02
+- GP2-2942 - DAC_Focus_Visible_03
+- GP2-2941 - DAC_Focus_Visible_02 (AA)
+- GP2-2944 - DAC_Reflow_01
+- GP2-2936 - DAC_Custom_Controls_04
+
+## [1.10.1](https://github.com/uktrade/great-cms/releases/tag/1.10.1)
 ### Enhancements
 - NOTICKET - update changelog, post-release
 ### Fixed bugs
+- GP2-2879 - DAC_Parsing_01 (A)
+
 - GP2-2890 - DAC NonText Content 01
-- GP2-2835 - Disable caching on homepage
+- GP2-2835 - Redirect fix for initial request for domestic going to international/ Disable caching on homepage
 - GP2-2889 - DAC Decorative_Images_01 - clear alt tags on decorative images
 - GP2-2888 - DAC Dialog_01 - aria-modal on confirmation dialogues.
 - GP2-2831 - fix typo on 404 page
 - GP2-2881 - Accessibility fix - alert screen readers for text updates
 - GP2-2883 - Accessibility fix - fix sign out menu button keyboard issues
+- GP2-2868 - Tech Debt fix sentry errors
+- GP2-2870 - rename /sso/ path to /great-cms-sso/
+
+- GP2-2882 - Accessibility fix - make modal content area keyboard accessible
 
 ## [1.10.0](https://github.com/uktrade/great-cms/releases/tag/1.10.0)
 
@@ -161,6 +243,7 @@ _ GP2-2775 - getting paid error
 - GP2-2138 - Fix domestic tab alignment
 - GP2-2234 - Sign up / in tablet
 - GP2-2139 - Menu button moves on mobile after selection
+- NOTICKET - remove disallow sso robots.txt
 
 ## [1.8.0](https://github.com/uktrade/great-cms/releases/tag/1.8.0)
 

cms_extras/modeladmin.py

@@ -10,7 +10,10 @@
 )
 from wagtail.contrib.modeladmin.views import IndexView
 
-from contact.modeladmin import ContactSuccessSnippetAdmin
+from contact.modeladmin import (
+    ContactPageContentSnippetAdmin,
+    ContactSuccessSnippetAdmin,
+)
 from core.models import CaseStudy
 
 
@@ -184,7 +187,7 @@ def get_related_pages(self, obj):
         return format_html_join(
             '',
             '<strong>{}: </strong> {}<br>',  # noqa
-            ((page_mapping.get(x.page.specific._meta.model_name), x.page) for x in obj.related_pages.all()),
+            ((page_mapping.get(x.page.specific._meta.model_name), x.page) for x in obj.related_pages.all() if x.page),
         )
 
     get_related_pages.short_description = 'Associated pages'
@@ -211,6 +214,7 @@ class NonCMSContentGroup(ModelAdminGroup):
     menu_icon = 'folder-open-inverse'  # change as required
     menu_order = 200
     items = (
+        ContactPageContentSnippetAdmin,
         ContactSuccessSnippetAdmin,
         # Add more here
     )

config/env/dev

@@ -50,21 +50,15 @@ GOOGLE_TAG_MANAGER_ID=GTM-1234567
 GOOGLE_TAG_MANAGER_ENV=dev
 UTM_COOKIE_DOMAIN=.trade.great
 PRIVACY_COOKIE_DOMAIN=.trade.great
+UKEF_FORM_SUBMIT_TRACKER_URL=http://go.pardot.com/l/590031/2018-08-16/5kj25l
 
 FEATURE_FLAG_ENABLE_V1_CONTACT_PAGES=True
 CONTACT_ENQUIRIES_AGENT_EMAIL_ADDRESS=great-cms-local-dev@mail.ci.uktrade.digital
 UKEF_CONTACT_AGENT_EMAIL_ADDRESS=great-cms-local-dev@mail.ci.uktrade.digital
+CONTACT_ECOMMERCE_EXPORT_SUPPORT_AGENT_EMAIL_ADDRESS=great-cms-local-dev@mail.ci.uktrade.digital
 
-# Needed for Wagtail-Transfer local development. Also see env/config/dev-transfer-target
-WAGTAILTRANSFER_SECRET_KEY=local-one
-WAGTAIL_TRANSFER_LOCAL_DEV=False
+EU_EXIT_ZENDESK_SUBDOMAIN=debug
 
-# This ONLY takes effect if you also have the storage backend set to S3 in
-# your secrets-do-not-commit file, but needs to be defined here, because it needs to be defined
-# outside of secrets-do-not-commit else the same value will be used for both source and target sites
-# for Wagtail-Transfer. Sorry.
-AWS_S3_URL_PROTOCOL = env.str('AWS_S3_URL_PROTOCOL', 'http:')
-AWS_STORAGE_BUCKET_NAME=great-local-bucket-one
 RECAPTCHA_PUBLIC_KEY=test_key
 RECAPTCHA_PRIVATE_KEY=test_key
 FEATURE_INTERNATIONAL_CONTACT_TRIAGE_ENABLED=True
@@ -74,3 +68,17 @@ ACTIVITY_STREAM_SECRET_KEY=123-secret-key
 ACTIVITY_STREAM_URL=debug
 ACTIVITY_STREAM_IP_ALLOWLIST=debug
 FEATURE_TEST_SEARCH_API_PAGES_ENABLED=true
+
+FEATURE_SHOW_REPORT_BARRIER_CONTENT=True
+
+#####################################################################
+# Needed for Wagtail-Transfer local development. Also see env/config/dev-transfer-target
+WAGTAILTRANSFER_SECRET_KEY=local-one
+WAGTAIL_TRANSFER_LOCAL_DEV=False
+
+# This ONLY takes effect if you also have the storage backend set to S3 in
+# your secrets-do-not-commit file, but needs to be defined here, because it needs to be defined
+# outside of secrets-do-not-commit else the same value will be used for both source and target sites
+# for Wagtail-Transfer. Sorry.
+AWS_S3_URL_PROTOCOL = env.str('AWS_S3_URL_PROTOCOL', 'http:')
+AWS_STORAGE_BUCKET_NAME=great-local-bucket-one

config/settings.py

@@ -57,6 +57,7 @@
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
+    'django.contrib.sitemaps',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.forms',
@@ -90,7 +91,6 @@
     'wagtail.contrib.legacy.sitemiddleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
     'core.middleware.UserSpecificRedirectMiddleware',
-    'core.middleware.UserLocationStoreMiddleware',
     'core.middleware.StoreUserExpertiseMiddleware',
     'core.middleware.CheckGATags',
 ]
@@ -423,7 +423,7 @@
 # Google captcha
 RECAPTCHA_PUBLIC_KEY = env.str('RECAPTCHA_PUBLIC_KEY')
 RECAPTCHA_PRIVATE_KEY = env.str('RECAPTCHA_PRIVATE_KEY')
-RECAPTCHA_REQUIRED_SCORE = env.int('RECAPTCHA_REQUIRED_SCORE', 0.5)
+RECAPTCHA_REQUIRED_SCORE = env.float('RECAPTCHA_REQUIRED_SCORE', 0.5)
 SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error']
 
 # directory forms api client
@@ -457,8 +457,20 @@
 CONTACT_ENQUIRIES_USER_NOTIFY_TEMPLATE_ID = env.str(
     'CONTACT_ENQUIRIES_USER_NOTIFY_TEMPLATE_ID', '61c82be6-b140-46fc-aeb2-472df8a94d35'
 )
+CONTACT_ECOMMERCE_EXPORT_SUPPORT_AGENT_EMAIL_ADDRESS = env.str(
+    'CONTACT_ECOMMERCE_EXPORT_SUPPORT_AGENT_EMAIL_ADDRESS',
+)
+CONTACT_ECOMMERCE_EXPORT_SUPPORT_AGENT_NOTIFY_TEMPLATE_ID = env.str(
+    'CONTACT_ECOMMERCE_EXPORT_SUPPORT_AGENT_NOTIFY_TEMPLATE_ID', 'a56114d3-515e-4ee7-bb1a-9a0ceab04378'
+)
+CONTACT_ECOMMERCE_EXPORT_SUPPORT_NOTIFY_TEMPLATE_ID = env.str(
+    'CONTACT_ECOMMERCE_EXPORT_SUPPORT_NOTIFY_TEMPLATE_ID',
+    '18d807d2-f4cf-4b93-96c1-0d3169bd0906',
+)
 
-# UKEF CONTACT FORM
+EU_EXIT_ZENDESK_SUBDOMAIN = env.str('EU_EXIT_ZENDESK_SUBDOMAIN')
+
+# UK Export Finance
 UKEF_CONTACT_USER_NOTIFY_TEMPLATE_ID = env.str(
     'UKEF_CONTACT_USER_NOTIFY_TEMPLATE_ID', '09677460-1796-4a60-a37c-c1a59068219e'
 )
@@ -468,7 +480,7 @@
 UKEF_CONTACT_AGENT_EMAIL_ADDRESS = env.str(
     'UKEF_CONTACT_AGENT_EMAIL_ADDRESS',
 )
-
+UKEF_FORM_SUBMIT_TRACKER_URL = env.str('UKEF_FORM_SUBMIT_TRACKER_URL')  # A Pardot URL
 
 FEATURE_FLAG_ENABLE_V1_CONTACT_PAGES = env.bool('FEATURE_FLAG_ENABLE_V1_CONTACT_PAGES', False)
 
@@ -507,20 +519,12 @@
 DATA_WORLD_BANK_URL = env.str('DATA_WORLD_BANK_URL', 'https://data.worldbank.org/indicator/NY.ADJ.NNTY.PC.CD')
 UNITED_NATIONS_URL = env.str('UNITED_NATIONS_URL', 'https://www.un.org/en/')
 
-
 # 3CE commodity classification
-COMMODITY_SEARCH_URL = env.str(
-    'CCCE_COMMODITY_SEARCH_URL', 'http://info.dev.3ceonline.com/ccce/apis/classify/v1/interactive/classify-start'
-)
-COMMODITY_SEARCH_REFINE_URL = env.str(
-    'CCCE_COMMODITY_SEARCH_REFINE_URL',
-    'http://info.dev.3ceonline.com/ccce/apis/classify/v1/interactive/classify-continue',
-)
-CCCE_IMPORT_SCHEDULE_URL = env.str(
-    'CCCE_TRADE_DATA_URL', 'http://info.dev.3ceonline.com/ccce/apis/tradedata/import/v1/schedule'
-)
-
+CCCE_BASE_URL = env.str('CCCE_BASE_URL', 'https://info.stage.3ceonline.com')
 COMMODITY_SEARCH_TOKEN = env.str('CCCE_COMMODITY_SEARCH_TOKEN', '')
+COMMODITY_SEARCH_URL = CCCE_BASE_URL + '/ccce/apis/classify/v1/interactive/classify-start'
+COMMODITY_SEARCH_REFINE_URL = CCCE_BASE_URL + '/ccce/apis/classify/v1/interactive/classify-continue'
+CCCE_IMPORT_SCHEDULE_URL = CCCE_BASE_URL + '/ccce/apis/tradedata/import/v1/schedule'
 
 # directory constants
 DIRECTORY_CONSTANTS_URL_SINGLE_SIGN_ON = env.str('DIRECTORY_CONSTANTS_URL_SINGLE_SIGN_ON', '')
@@ -617,6 +621,10 @@
 AWS_STORAGE_BUCKET_NAME_DATA_SCIENCE = env.str('AWS_STORAGE_BUCKET_NAME_DATA_SCIENCE', '')
 AWS_S3_REGION_NAME_DATA_SCIENCE = env.str('AWS_S3_REGION_NAME_DATA_SCIENCE', '')
 
+# Report a Trade Barrier / "marketaccess"
+MARKET_ACCESS_ZENDESK_SUBJECT = env.str('MARKET_ACCESS_ZENDESK_SUBJECT', 'market access')
+MARKET_ACCESS_FORMS_API_ZENDESK_SERVICE_NAME = env.str('MARKET_ACCESS_FORMS_API_ZENDESK_SERVICE_NAME', 'market_access')
+
 
 # SEARCH
 FEATURE_FLAG_TEST_SEARCH_API_PAGES_ON = env.bool(

config/url_redirects.py

@@ -141,8 +141,7 @@
     ),
     url(
         r'^exporting-edge/$',
-        RedirectView.as_view(url='/get-finance/'),
-        # TODO: move back to pattern_name='get-finance' when it's migrated
+        RedirectView.as_view(pattern_name='domestic:get-finance'),
     ),
     url(
         r'^invest/$',

config/urls.py

@@ -28,6 +28,8 @@
     ]
 
 
+# WHEN ADDING TO THIS LIST CONSIDER WHETHER YOU SHOULD ALSO ADD ANY
+# URL NAMES TO core.views.StaticViewSitemap
 urlpatterns += [
     path('django-admin/', decorator_include(skip_ga360, admin.site.urls)),
     path(
@@ -38,7 +40,7 @@
     path('admin/cms-extras/', decorator_include(skip_ga360, cms_extras.urls, namespace='cms_extras')),
     path('admin/', decorator_include(skip_ga360, wagtailadmin_urls)),
     path('documents/', include(wagtaildocs_urls)),  # NB: doesn't skip GA as we may analytics on this
-    path('sso/', include(sso.urls)),
+    path('great-cms-sso/', include(sso.urls)),
     path('search/', include(search.urls, namespace='search')),
     path('activity-stream/', include(activitystream.urls, namespace='activitystream')),
     path('', include(domestic.urls, namespace='domestic')),
@@ -49,7 +51,7 @@
 # Should we show the contact pages we're porting from V1 yet?
 if settings.FEATURE_FLAG_ENABLE_V1_CONTACT_PAGES:
     urlpatterns += [
-        path('contact/', include(contact.urls)),
+        path('', include(contact.urls)),  # No prefix because not all of them start with /contact/
     ]
 
 urlpatterns += [