Merge pull request #2822 from uktrade/develop

Release to UAT/Production

config/env/test

@@ -45,3 +45,4 @@ FEATURE_COURSES_LANDING_PAGE=True
 FEATURE_DEA_V2=True
 FEATURE_SHOW_OLD_CONTACT_FORM=False
 FEATURE_HOMEPAGE_REDESIGN_V1=True
+FEATURE_SHARE_COMPONENT=True

config/settings.py

@@ -857,6 +857,7 @@
 FEATURE_DEA_V2 = env.bool('FEATURE_DEA_V2', False)
 FEATURE_SHOW_OLD_CONTACT_FORM = env.bool('FEATURE_SHOW_OLD_CONTACT_FORM', False)
 FEATURE_HOMEPAGE_REDESIGN_V1 = env.bool('FEATURE_HOMEPAGE_REDESIGN_V1', False)
+FEATURE_SHARE_COMPONENT = env.bool('FEATURE_SHARE_COMPONENT', False)
 
 MAX_COMPARE_PLACES_ALLOWED = env.int('MAX_COMPARE_PLACES_ALLOWED', 10)
 
@@ -1022,9 +1023,6 @@
 )  # noqa
 CSP_IMG_SRC = ("'self'", "data:", "https:")  # noqa
 CSP_FRAME_SRC = ("'self'", 'https://www.google.com', 'https:')
-CSP_FRAME_ANCESTORS = (
-    "'self'",
-    "'none'",
-)  # noqa
+CSP_FRAME_ANCESTORS = ("'self'",)  # noqa
 CSP_UPGRADE_INSECURE_REQUESTS = env.bool('CSP_UPGRADE_INSECURE_REQUESTS', True)
 CSP_BLOCK_ALL_MIXED_CONTENT = True

core/context_processors.py

@@ -78,6 +78,7 @@ def feature_flags(request):
     retval['features']['FEATURE_DEA_V2'] = settings.FEATURE_DEA_V2
     retval['features']['FEATURE_SHOW_OLD_CONTACT_FORM'] = settings.FEATURE_SHOW_OLD_CONTACT_FORM
     retval['features']['FEATURE_HOMEPAGE_REDESIGN_V1'] = settings.FEATURE_HOMEPAGE_REDESIGN_V1
+    retval['features']['FEATURE_SHARE_COMPONENT'] = settings.FEATURE_SHARE_COMPONENT
 
     return retval
 

core/migrations/0123_sharesettings.py

@@ -0,0 +1,47 @@
+# Generated by Django 4.1.10 on 2024-01-03 12:59
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('wagtailcore', '0083_workflowcontenttype'),
+        ('core', '0122_rename_side_links_listpage_popular_links'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ShareSettings',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'share_prefix',
+                    models.TextField(
+                        blank=True,
+                        help_text='Prepends draft social media post and email subject when using the share page component',
+                        max_length=255,
+                        verbose_name='Share prefix',
+                    ),
+                ),
+                (
+                    'hashtags',
+                    models.TextField(
+                        blank=True,
+                        help_text='Appends draft social media post when using the share page component. Prefixes each string with a #, removes spaces, and applies Pascal casing',
+                        max_length=255,
+                        verbose_name='Hashtags',
+                    ),
+                ),
+                (
+                    'site',
+                    models.OneToOneField(
+                        editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.site'
+                    ),
+                ),
+            ],
+            options={
+                'verbose_name': 'Sharing',
+            },
+        ),
+    ]