Merge pull request #1142 from uktrade/release

BETA release

CHANGELOG.md

@@ -2,16 +2,48 @@
 
 ## Pre-release changes - please put everything in the appropriate category above ======
 
+### Enhancements
 ### Fixed bugs
 
-### Enhancements
+## [1.6.0](https://github.com/uktrade/great-cms/releases/tag/1.6.0)
+[Full Changelog](https://github.com/uktrade/great-cms/compare/1.5.0...1.6.0)
+### Fixed bugs
 
+- GP2-2123 - Add new group select styling and layout
+- GP2-2110 - Use Django-based Contact Us view for now, after all - reverts part of GP2-1901
+- GP2-2051 - Fix bug of lesson page when no country is selected
+- GP2-1901 - use slugurl for footer links
+- GP2-2096 - Target market country data
+- NOTICKET - Add background colour support for example component
+- GP2-2075 - Fix header menu positioning bug
+- GP2-2076 - Display correct mobile header links
+- GP2-2078 - Make magna header and personalisation bar full width
+- GP2-2076 - Add sign out button to logged out header
+- GP2-2074 - redirect user to homepage after signout
+- GP2-1277 - Videos not displaying correctly for case studies
+- GP2-1710 - C&P units copy change, currency width and copy change.
+- GP2-1931 - add placeholder text
+- GP2-1930 - text changes, and update data structure whilst at it.
+- GP2-1948 - section complete copy
+- GP2-1913 - allow user to click anywhere inside the input field to toggle dropdown
+### Enhancements
 
-=======
+- GP2-1977 - asset path for CSS fonts
+- GP2-1915 - Align EP data snapshots with WTE
+- GP2-1935 - add confirmation modal - business objectives
+- GP2-1900 - port redirects from BAU
+- GP2-800 - Objectives page Date picker
+- GP2-1869 - Logged in magna mobile header
+- GP2-1840 - Logged in magna desktop header
+- GP2-1849 - Feature flag magna links in logged out mobile header
+- GP2-1927 - Modal window Issues--Export plan pages
+- GP2-1616 - Port UKEF pages from V1
+- GP2-1719 - Segmentation question
+- NOTICKET - Fix pdf static images
 
 ## [1.5.0](https://github.com/uktrade/great-cms/releases/tag/1.5.0)
-
 [Full Changelog](https://github.com/uktrade/great-cms/compare/1.4.0...1.5.0)
+
 ### Fixed bugs
 
 - GP2-1914 - Remove rogue backtick
@@ -33,11 +65,16 @@
 - NO TICKET - fix wagtail checkbox layout issue
 - NO TICKET - fix pdf generation
 - GP2-1792 - dashboard pages
+- GP2-1630 - add more data
+- Noticket pdf external datasources
 
 ### Implemented enhancements
 
+- GP2-2044 - CTA's only show sign in label by criteria
+- GP2-1852 - WTE responsive format
+- GP2-1849 - Logged out mobile header
 - GP2-1784 - Stop breadcrumbs showing for Structural Page
-- GP2-1559 - Structural page  for marketing articles
+- GP2-1559 - Structural page for marketing articles
 - GP2-1430 - Income data for target research page in EP
 - GP2-1575 - Added default text for case study summary_context field
 - GP2-1570 - CaseStudy UI seachability by summary, lead_title and some tags
@@ -49,6 +86,7 @@
 - GP2-1724 - Configurable compare country limit
 - GP2-1811 - Fix SEO title as main page title if it exists
 - GP2-1811 - Fix SEO title not appearing in meta tags
+- GP2-1839 - Logged in homepage content
 - GP2-1724 - WTE population tab using generic endpoints + cleanup
 - GP2-1858 - Change logged out header sign out to dashboard
 - GP2-1770 - Business risk content changes.

cms_extras/modeladmin.py

@@ -3,9 +3,14 @@
 from django.utils.html import format_html_join, strip_tags
 from wagtail.admin.views.mixins import Echo
 from wagtail.contrib.modeladmin.helpers import ButtonHelper
-from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
+from wagtail.contrib.modeladmin.options import (
+    ModelAdmin,
+    ModelAdminGroup,
+    modeladmin_register,
+)
 from wagtail.contrib.modeladmin.views import IndexView
 
+from contact.modeladmin import ContactSuccessSnippetAdmin
 from core.models import CaseStudy
 
 
@@ -195,3 +200,19 @@ def attribute(self, obj):
 
 
 modeladmin_register(CaseStudyAdmin)
+
+
+class NonCMSContentGroup(ModelAdminGroup):
+    """All of the snippets used for hybrid-content pages
+    should be registered as part of this group"""
+
+    menu_label = 'Non-page content'
+    menu_icon = 'folder-open-inverse'  # change as required
+    menu_order = 200
+    items = (
+        ContactSuccessSnippetAdmin,
+        # Add more here
+    )
+
+
+modeladmin_register(NonCMSContentGroup)

config/env/dev

@@ -51,6 +51,7 @@ UTM_COOKIE_DOMAIN=.great
 
 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
 
 # Needed for Wagtail-Transfer local development. Also see env/config/dev-transfer-target
 WAGTAILTRANSFER_SECRET_KEY=local-one
@@ -63,3 +64,4 @@ WAGTAIL_TRANSFER_LOCAL_DEV=False
 AWS_STORAGE_BUCKET_NAME=great-local-bucket-one
 RECAPTCHA_PUBLIC_KEY=test_key
 RECAPTCHA_PRIVATE_KEY=test_key
+FEATURE_INTERNATIONAL_CONTACT_TRIAGE_ENABLED=True

config/env/test

@@ -2,7 +2,7 @@ DATABASE_URL=postgres://debug:debug@localhost:5432/greatcms
 API_CACHE_DISABLED=true
 STATICFILES_STORAGE=django.contrib.staticfiles.storage.StaticFilesStorage
 DEBUG=false
-AWS_STORAGE_BUCKET_NAME=debug
+AWS_STORAGE_BUCKET_NAME=''
 AWS_ACCESS_KEY_ID=debug
 AWS_SECRET_ACCESS_KEY=debug
 EMAIL_HOST=debug

config/settings.py

@@ -81,7 +81,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
-    'wagtail.core.middleware.SiteMiddleware',
+    'wagtail.contrib.legacy.sitemiddleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
     'core.middleware.UserSpecificRedirectMiddleware',
     'core.middleware.UserLocationStoreMiddleware',
@@ -91,6 +91,8 @@
 ]
 
 ROOT_URLCONF = 'config.urls'
+ROOT_URLCONF_REDIRECTS = 'config.url_redirects'
+
 
 TEMPLATES = [
     {
@@ -195,9 +197,9 @@
 
 MEDIA_ROOT = str(ROOT_DIR('media'))
 MEDIA_URL = '/media/'  # NB: this is overriden later, if/when AWS is set up
+PDF_STATIC_URL = ''  # NB: overriiden by AWS public s3 if setup
 
 # Wagtail settings
-
 WAGTAIL_SITE_NAME = 'Great CMS MVP'
 WAGTAIL_FRONTEND_LOGIN_URL = reverse_lazy('core:login')
 
@@ -343,6 +345,9 @@
         hostname = f'{AWS_STORAGE_BUCKET_NAME}.{AWS_S3_HOST}'
     MEDIA_URL = f'{AWS_S3_URL_PROTOCOL}//{hostname}/'
 
+# PDF statics need to be stored on public s3 drive for access
+if AWS_STORAGE_BUCKET_NAME:
+    PDF_STATIC_URL = f'{AWS_S3_URL_PROTOCOL}//{AWS_STORAGE_BUCKET_NAME}.{AWS_S3_HOST}/export_plan_pdf_statics/'
 
 if DEBUG:
     INSTALLED_APPS += ['debug_toolbar']
@@ -432,6 +437,17 @@
     'CONTACT_ENQUIRIES_USER_NOTIFY_TEMPLATE_ID', '61c82be6-b140-46fc-aeb2-472df8a94d35'
 )
 
+# UKEF CONTACT FORM
+UKEF_CONTACT_USER_NOTIFY_TEMPLATE_ID = env.str(
+    'UKEF_CONTACT_USER_NOTIFY_TEMPLATE_ID', '09677460-1796-4a60-a37c-c1a59068219e'
+)
+UKEF_CONTACT_AGENT_NOTIFY_TEMPLATE_ID = env.str(
+    'UKEF_CONTACT_AGENT_NOTIFY_TEMPLATE_ID', 'e24ba486-6337-46ce-aba3-45d1d3a2aa66'
+)
+UKEF_CONTACT_AGENT_EMAIL_ADDRESS = env.str(
+    'UKEF_CONTACT_AGENT_EMAIL_ADDRESS',
+)
+
 
 FEATURE_FLAG_ENABLE_V1_CONTACT_PAGES = env.bool('FEATURE_FLAG_ENABLE_V1_CONTACT_PAGES', False)
 
@@ -444,6 +460,12 @@
     'GEOLOCATION_MAXMIND_DATABASE_FILE_URL', 'https://download.maxmind.com/app/geoip_download'
 )
 
+# redirects
+FEATURE_FLAG_INTERNATIONAL_CONTACT_TRIAGE_ENABLED = env.bool(
+    'FEATURE_INTERNATIONAL_CONTACT_TRIAGE_ENABLED',
+    False,
+)
+
 # directory-api
 DIRECTORY_API_CLIENT_BASE_URL = env.str('DIRECTORY_API_CLIENT_BASE_URL')
 DIRECTORY_API_CLIENT_API_KEY = env.str('DIRECTORY_API_CLIENT_API_KEY')
@@ -524,6 +546,8 @@
 FEATURE_COMPARE_MARKETS_TABS = env.str('FEATURE_COMPARE_MARKETS_TABS', '{ }')
 FEATURE_SHOW_REPORT_BARRIER_CONTENT = env.bool('FEATURE_SHOW_REPORT_BARRIER_CONTENT', False)
 FEATURE_SHOW_MARKET_GUIDE_BAU_LINKS = env.bool('FEATURE_SHOW_MARKET_GUIDE_BAU_LINKS', False)
+FEATURE_SHOW_MAGNA_LINKS_IN_HEADER = env.bool('FEATURE_SHOW_MAGNA_LINKS_IN_HEADER', False)
+FEATURE_SHOW_INTERNATIONAL_FOOTER_LINK = env.bool('FEATURE_SHOW_INTERNATIONAL_FOOTER_LINK', False)
 MAX_COMPARE_PLACES_ALLOWED = env.int('MAX_COMPARE_PLACES_ALLOWED', 10)
 
 BETA_ENVIRONMENT = env.str('BETA_TOKEN', default='')