From 728dfbbf55205cda6763a8d80ab0f9bafdb2880c Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Wed, 17 Apr 2024 16:32:26 +0200
Subject: [PATCH 01/17] HPC-9466: Ground work for replacing the
 botton_figure_row paragraph type with 2 new types: top_figures and
 top_figures_small

---
 composer.json                                 |    3 +-
 composer.lock                                 |   97 +-
 ...ay.paragraph.bottom_figure_row.default.yml |    2 -
 ..._display.paragraph.top_figures.default.yml |   37 +
 ...ay.paragraph.top_figures_small.default.yml |   37 +
 ...ay.paragraph.bottom_figure_row.default.yml |    4 +-
 ...aragraph.bottom_figure_row.top_figures.yml |    2 -
 ..._display.paragraph.top_figures.default.yml |   23 +
 ...ay.paragraph.top_figures_small.default.yml |   23 +
 config/core.extension.yml                     |    1 +
 ...ld.field.node.article.field_paragraphs.yml |   57 +-
 ...bottom_figure_row.field_bottom_figures.yml |   39 -
 ...ld.paragraph.top_figures.field_figures.yml |   78 ++
 ...agraph.top_figures_small.field_figures.yml |   78 ++
 ...storage.paragraph.field_bottom_figures.yml |   32 -
 ...aphs.paragraphs_type.bottom_figure_row.yml |    6 +-
 ...paragraphs.paragraphs_type.top_figures.yml |   14 +
 ...aphs.paragraphs_type.top_figures_small.yml |   14 +
 .../custom/gho_fields/gho_fields.deploy.php   |  111 ++
 html/modules/custom/gho_figures/README.md     |    8 -
 html/modules/custom/gho_figures/composer.json |   20 -
 .../custom/gho_figures/gho_figures.info.yml   |    5 -
 .../gho_figures/gho_figures.links.action.yml  |    5 -
 .../custom/gho_figures/gho_figures.module     |    6 -
 .../gho_figures/gho_figures.permissions.yml   |    3 -
 .../gho_figures/gho_figures.routing.yml       |    7 -
 ...sImportNeedsAndRequirementsFiguresForm.php | 1200 -----------------
 .../config/install/gho_figures.settings.yml   |    4 -
 .../common_design_subtheme.libraries.yml      |    5 +
 .../components/gho-top-figures/README.md      |    4 +
 .../gho-top-figures/gho-top-figures.css       |   66 +
 .../paragraph--top-figures-small.html.twig    |   59 +
 ....twig => paragraph--top-figures.html.twig} |    2 +-
 33 files changed, 675 insertions(+), 1377 deletions(-)
 create mode 100644 config/core.entity_form_display.paragraph.top_figures.default.yml
 create mode 100644 config/core.entity_form_display.paragraph.top_figures_small.default.yml
 create mode 100644 config/core.entity_view_display.paragraph.top_figures.default.yml
 create mode 100644 config/core.entity_view_display.paragraph.top_figures_small.default.yml
 delete mode 100755 config/field.field.paragraph.bottom_figure_row.field_bottom_figures.yml
 create mode 100644 config/field.field.paragraph.top_figures.field_figures.yml
 create mode 100644 config/field.field.paragraph.top_figures_small.field_figures.yml
 delete mode 100755 config/field.storage.paragraph.field_bottom_figures.yml
 create mode 100644 config/paragraphs.paragraphs_type.top_figures.yml
 create mode 100644 config/paragraphs.paragraphs_type.top_figures_small.yml
 delete mode 100644 html/modules/custom/gho_figures/README.md
 delete mode 100644 html/modules/custom/gho_figures/composer.json
 delete mode 100644 html/modules/custom/gho_figures/gho_figures.info.yml
 delete mode 100644 html/modules/custom/gho_figures/gho_figures.links.action.yml
 delete mode 100644 html/modules/custom/gho_figures/gho_figures.module
 delete mode 100644 html/modules/custom/gho_figures/gho_figures.permissions.yml
 delete mode 100644 html/modules/custom/gho_figures/gho_figures.routing.yml
 delete mode 100644 html/modules/custom/gho_figures/src/Form/GhoFiguresImportNeedsAndRequirementsFiguresForm.php
 delete mode 100644 html/modules/custom/gho_figures/src/config/install/gho_figures.settings.yml
 create mode 100644 html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md
 create mode 100644 html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
 create mode 100644 html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig
 rename html/themes/custom/common_design_subtheme/templates/paragraphs/{paragraph--needs-and-requirements.html.twig => paragraph--top-figures.html.twig} (97%)

diff --git a/composer.json b/composer.json
index b5eccad8..a7ace90f 100644
--- a/composer.json
+++ b/composer.json
@@ -58,13 +58,14 @@
         "drupal/core-recommended": "^10",
         "drupal/csp": "^1.16",
         "drupal/ctools": "^4.0",
-        "drupal/custom_field": "^2.0@RC",
+        "drupal/custom_field": "^3",
         "drupal/diff": "^1.1",
         "drupal/double_field": "^4.0",
         "drupal/editor_advanced_link": "^2.0",
         "drupal/entity_browser": "^2.9",
         "drupal/entity_browser_table": "^1.4",
         "drupal/entity_usage": "^2.0@beta",
+        "drupal/field_config_cardinality": "^3.0",
         "drupal/field_group": "^3.4",
         "drupal/gin": "^3.0@RC",
         "drupal/google_tag": "^1.4",
diff --git a/composer.lock b/composer.lock
index bdefa7d0..61ac32fd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "12569a8c6834a7ab5add06011793900c",
+    "content-hash": "4f27d49a18c45b36b1b0efc31701439b",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3512,30 +3512,30 @@
         },
         {
             "name": "drupal/custom_field",
-            "version": "2.0.0-rc6",
+            "version": "3.0.0-rc1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/custom_field.git",
-                "reference": "2.0.0-rc6"
+                "reference": "3.0.0-rc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/custom_field-2.0.0-rc6.zip",
-                "reference": "2.0.0-rc6",
-                "shasum": "53db8135daee8c9273006de3ca208ba9de4a74f0"
+                "url": "https://ftp.drupal.org/files/projects/custom_field-3.0.0-rc1.zip",
+                "reference": "3.0.0-rc1",
+                "shasum": "3aec02cf915a3177eb6d107f4eaebd1a4840282e"
             },
             "require": {
-                "drupal/core": "^9.4 || ^10.1"
+                "drupal/core": "^10.2"
             },
             "require-dev": {
                 "drupal/feeds": "3.x-dev",
-                "drupal/linkit": "^6"
+                "drupal/linkit": "^6.1"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-rc6",
-                    "datestamp": "1703275144",
+                    "version": "3.0.0-rc1",
+                    "datestamp": "1712345809",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -4046,6 +4046,82 @@
                 "issues": "http://drupal.org/project/issues/entity_usage"
             }
         },
+        {
+            "name": "drupal/field_config_cardinality",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/field_config_cardinality.git",
+                "reference": "3.0.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/field_config_cardinality-3.0.1.zip",
+                "reference": "3.0.1",
+                "shasum": "47a2d933514464bea620617eb2ec34988b60ce37"
+            },
+            "require": {
+                "drupal/core": "^9 || ^10"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "3.0.1",
+                    "datestamp": "1680866025",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "ayalon",
+                    "homepage": "https://www.drupal.org/user/419226"
+                },
+                {
+                    "name": "brittany.huntzberry",
+                    "homepage": "https://www.drupal.org/user/3552960"
+                },
+                {
+                    "name": "dealancer",
+                    "homepage": "https://www.drupal.org/user/243418"
+                },
+                {
+                    "name": "devkinetic",
+                    "homepage": "https://www.drupal.org/user/114708"
+                },
+                {
+                    "name": "e.bogatyrev",
+                    "homepage": "https://www.drupal.org/user/2760527"
+                },
+                {
+                    "name": "eloivaque",
+                    "homepage": "https://www.drupal.org/user/605038"
+                },
+                {
+                    "name": "Naveen Kumar Reddy",
+                    "homepage": "https://www.drupal.org/user/3693535"
+                },
+                {
+                    "name": "Shruthi Shetty M",
+                    "homepage": "https://www.drupal.org/user/3580970"
+                },
+                {
+                    "name": "stefan.korn",
+                    "homepage": "https://www.drupal.org/user/1942204"
+                }
+            ],
+            "description": "Allow apply cardinality on Field Config (Cardinality Instance)",
+            "homepage": "https://www.drupal.org/project/field_config_cardinality",
+            "support": {
+                "source": "https://git.drupalcode.org/project/field_config_cardinality"
+            }
+        },
         {
             "name": "drupal/field_group",
             "version": "3.4.0",
@@ -16651,7 +16727,6 @@
     "stability-flags": {
         "drupal/bigint": 20,
         "drupal/bulk_update_fields": 15,
-        "drupal/custom_field": 5,
         "drupal/entity_usage": 10,
         "drupal/gin": 5,
         "drupal/imageapi_optimize_binaries": 15,
diff --git a/config/core.entity_form_display.paragraph.bottom_figure_row.default.yml b/config/core.entity_form_display.paragraph.bottom_figure_row.default.yml
index 76ac6b89..4bf1c113 100755
--- a/config/core.entity_form_display.paragraph.bottom_figure_row.default.yml
+++ b/config/core.entity_form_display.paragraph.bottom_figure_row.default.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.bottom_figure_row.field_bottom_figures
     - field.field.paragraph.bottom_figure_row.field_dataset
     - field.field.paragraph.bottom_figure_row.field_figures
     - paragraphs.paragraphs_type.bottom_figure_row
@@ -94,5 +93,4 @@ content:
     third_party_settings: {  }
 hidden:
   created: true
-  field_bottom_figures: true
   translation: true
diff --git a/config/core.entity_form_display.paragraph.top_figures.default.yml b/config/core.entity_form_display.paragraph.top_figures.default.yml
new file mode 100644
index 00000000..312acdf2
--- /dev/null
+++ b/config/core.entity_form_display.paragraph.top_figures.default.yml
@@ -0,0 +1,37 @@
+uuid: 382ed4e3-c4ba-4ba5-8d7f-12572773dbba
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.top_figures.field_figures
+    - paragraphs.paragraphs_type.top_figures
+  module:
+    - custom_field
+id: paragraph.top_figures.default
+targetEntityType: paragraph
+bundle: top_figures
+mode: default
+content:
+  field_figures:
+    type: custom_flex
+    weight: 0
+    region: content
+    settings:
+      label: false
+      wrapper: div
+      open: true
+      columns:
+        label: auto
+        value: auto
+        footnote: auto
+      breakpoint: ''
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 1
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+hidden:
+  created: true
diff --git a/config/core.entity_form_display.paragraph.top_figures_small.default.yml b/config/core.entity_form_display.paragraph.top_figures_small.default.yml
new file mode 100644
index 00000000..7ca4fa33
--- /dev/null
+++ b/config/core.entity_form_display.paragraph.top_figures_small.default.yml
@@ -0,0 +1,37 @@
+uuid: dd76a23b-79b9-4342-82df-f28128fb1780
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.top_figures_small.field_figures
+    - paragraphs.paragraphs_type.top_figures_small
+  module:
+    - custom_field
+id: paragraph.top_figures_small.default
+targetEntityType: paragraph
+bundle: top_figures_small
+mode: default
+content:
+  field_figures:
+    type: custom_flex
+    weight: 0
+    region: content
+    settings:
+      label: false
+      wrapper: div
+      open: true
+      columns:
+        label: auto
+        value: auto
+        footnote: auto
+      breakpoint: ''
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 1
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+hidden:
+  created: true
diff --git a/config/core.entity_view_display.paragraph.bottom_figure_row.default.yml b/config/core.entity_view_display.paragraph.bottom_figure_row.default.yml
index 14a618f9..907cdc4d 100755
--- a/config/core.entity_view_display.paragraph.bottom_figure_row.default.yml
+++ b/config/core.entity_view_display.paragraph.bottom_figure_row.default.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.bottom_figure_row.field_bottom_figures
     - field.field.paragraph.bottom_figure_row.field_dataset
     - field.field.paragraph.bottom_figure_row.field_figures
     - paragraphs.paragraphs_type.bottom_figure_row
@@ -29,5 +28,4 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
-hidden:
-  field_bottom_figures: true
+hidden: {  }
diff --git a/config/core.entity_view_display.paragraph.bottom_figure_row.top_figures.yml b/config/core.entity_view_display.paragraph.bottom_figure_row.top_figures.yml
index 5bb705e9..6465e2fb 100755
--- a/config/core.entity_view_display.paragraph.bottom_figure_row.top_figures.yml
+++ b/config/core.entity_view_display.paragraph.bottom_figure_row.top_figures.yml
@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.paragraph.top_figures
-    - field.field.paragraph.bottom_figure_row.field_bottom_figures
     - field.field.paragraph.bottom_figure_row.field_dataset
     - field.field.paragraph.bottom_figure_row.field_figures
     - paragraphs.paragraphs_type.bottom_figure_row
@@ -29,5 +28,4 @@ content:
     weight: 0
     region: content
 hidden:
-  field_bottom_figures: true
   field_dataset: true
diff --git a/config/core.entity_view_display.paragraph.top_figures.default.yml b/config/core.entity_view_display.paragraph.top_figures.default.yml
new file mode 100644
index 00000000..baeec5b2
--- /dev/null
+++ b/config/core.entity_view_display.paragraph.top_figures.default.yml
@@ -0,0 +1,23 @@
+uuid: 9aacccd4-0a89-4c5f-8a45-f9f19e47cd49
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.top_figures.field_figures
+    - paragraphs.paragraphs_type.top_figures
+  module:
+    - gho_fields
+id: paragraph.top_figures.default
+targetEntityType: paragraph
+bundle: top_figures
+mode: default
+content:
+  field_figures:
+    type: gho_figures
+    label: hidden
+    settings:
+      format: large
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden: {  }
diff --git a/config/core.entity_view_display.paragraph.top_figures_small.default.yml b/config/core.entity_view_display.paragraph.top_figures_small.default.yml
new file mode 100644
index 00000000..d15197b2
--- /dev/null
+++ b/config/core.entity_view_display.paragraph.top_figures_small.default.yml
@@ -0,0 +1,23 @@
+uuid: 21c9311d-5370-495e-bf19-2a75a324e4f2
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.top_figures_small.field_figures
+    - paragraphs.paragraphs_type.top_figures_small
+  module:
+    - gho_fields
+id: paragraph.top_figures_small.default
+targetEntityType: paragraph
+bundle: top_figures_small
+mode: default
+content:
+  field_figures:
+    type: gho_figures
+    label: hidden
+    settings:
+      format: small
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden: {  }
diff --git a/config/core.extension.yml b/config/core.extension.yml
index ec08109c..92f238f3 100755
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -33,6 +33,7 @@ module:
   entity_browser_table: 0
   entity_reference_revisions: 0
   field: 0
+  field_config_cardinality: 0
   field_group: 0
   field_ui: 0
   file: 0
diff --git a/config/field.field.node.article.field_paragraphs.yml b/config/field.field.node.article.field_paragraphs.yml
index 5ac43a0d..c12a1457 100755
--- a/config/field.field.node.article.field_paragraphs.yml
+++ b/config/field.field.node.article.field_paragraphs.yml
@@ -9,6 +9,14 @@ dependencies:
     - paragraphs.paragraphs_type.article_card_list
   module:
     - entity_reference_revisions
+    - field_config_cardinality
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '-1'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
 id: node.article.field_paragraphs
 field_name: field_paragraphs
 entity_type: node
@@ -28,66 +36,69 @@ settings:
     negate: 1
     target_bundles_drag_drop:
       achievement:
-        weight: 22
+        weight: -35
         enabled: true
       achievement_list:
-        weight: 21
+        weight: -36
         enabled: false
       article_card_list:
-        weight: 23
+        weight: -34
         enabled: true
       article_list:
-        weight: 24
+        weight: -33
         enabled: false
       bottom_figure_row:
-        weight: 8
+        weight: -43
         enabled: false
       document_articles:
-        weight: 28
+        weight: -31
         enabled: false
       document_chapter:
-        weight: 29
+        weight: -29
         enabled: false
       download_button:
-        weight: 26
+        weight: -32
         enabled: false
       facts_and_figures:
-        weight: 9
+        weight: -42
         enabled: false
       further_reading:
-        weight: 28
+        weight: -30
         enabled: false
       heading:
-        weight: 29
+        weight: -28
         enabled: false
       image_with_text:
-        weight: 12
+        weight: -38
         enabled: false
       infographic:
-        weight: 36
+        weight: -26
         enabled: false
       interactive_content:
-        weight: 31
+        weight: -27
         enabled: false
       interactive_content_2_columns:
-        weight: 39
+        weight: -25
         enabled: false
-      layout:
-        weight: 8
-        enabled: true
       photo_gallery:
-        weight: 11
+        weight: -39
         enabled: false
       separator:
-        weight: 15
+        weight: -37
         enabled: false
       story:
-        weight: 10
+        weight: -41
         enabled: false
       sub_article:
-        weight: 39
+        weight: -24
         enabled: false
       text:
-        weight: 10
+        weight: -40
+        enabled: false
+      top_figures:
+        weight: -45
+        enabled: false
+      top_figures_small:
+        weight: -44
         enabled: false
 field_type: entity_reference_revisions
diff --git a/config/field.field.paragraph.bottom_figure_row.field_bottom_figures.yml b/config/field.field.paragraph.bottom_figure_row.field_bottom_figures.yml
deleted file mode 100755
index 041a3a1e..00000000
--- a/config/field.field.paragraph.bottom_figure_row.field_bottom_figures.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 25815140-0e56-4211-9be6-f89af6c289a8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_bottom_figures
-    - paragraphs.paragraphs_type.bottom_figure_row
-  module:
-    - double_field
-id: paragraph.bottom_figure_row.field_bottom_figures
-field_name: field_bottom_figures
-entity_type: paragraph
-bundle: bottom_figure_row
-label: 'Figures (Deprecated)'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  first:
-    label: Label
-    list: false
-    allowed_values: {  }
-    max: null
-    min: null
-    required: true
-    on_label: 'On'
-    off_label: 'Off'
-  second:
-    label: Value
-    list: false
-    allowed_values: {  }
-    max: null
-    min: null
-    required: true
-    on_label: 'On'
-    off_label: 'Off'
-field_type: double_field
diff --git a/config/field.field.paragraph.top_figures.field_figures.yml b/config/field.field.paragraph.top_figures.field_figures.yml
new file mode 100644
index 00000000..cc8a9ea4
--- /dev/null
+++ b/config/field.field.paragraph.top_figures.field_figures.yml
@@ -0,0 +1,78 @@
+uuid: ef933458-7a8c-4ae0-8ff9-8060b5c446de
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_figures
+    - paragraphs.paragraphs_type.top_figures
+  module:
+    - custom_field
+    - field_config_cardinality
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '3'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
+id: paragraph.top_figures.field_figures
+field_name: field_figures
+entity_type: paragraph
+bundle: top_figures
+label: 'Top figures'
+description: 'You can add up to 3 top figures to this paragraph'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  field_settings:
+    label:
+      type: text
+      weight: 0
+      check_empty: false
+      widget_settings:
+        label: Label
+        settings:
+          description: ''
+          description_display: after
+          size: 30
+          placeholder: 'Ex: Population'
+          maxlength: 255
+          maxlength_js: false
+          prefix: ''
+          suffix: ''
+          required: false
+    value:
+      type: text
+      weight: 0
+      check_empty: false
+      widget_settings:
+        label: Value
+        settings:
+          description: ''
+          description_display: after
+          size: 30
+          placeholder: 'Ex: 10.4 million'
+          maxlength: 255
+          maxlength_js: false
+          prefix: ''
+          suffix: ''
+          required: false
+    footnote:
+      type: text
+      weight: 0
+      check_empty: false
+      widget_settings:
+        label: Footnote
+        settings:
+          description: ''
+          description_display: after
+          size: 30
+          placeholder: ''
+          maxlength: 255
+          maxlength_js: false
+          prefix: ''
+          suffix: ''
+          required: false
+field_type: custom
diff --git a/config/field.field.paragraph.top_figures_small.field_figures.yml b/config/field.field.paragraph.top_figures_small.field_figures.yml
new file mode 100644
index 00000000..57147e84
--- /dev/null
+++ b/config/field.field.paragraph.top_figures_small.field_figures.yml
@@ -0,0 +1,78 @@
+uuid: 94a317bf-feba-4285-b5c5-a43281ab9bcb
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_figures
+    - paragraphs.paragraphs_type.top_figures_small
+  module:
+    - custom_field
+    - field_config_cardinality
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '6'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
+id: paragraph.top_figures_small.field_figures
+field_name: field_figures
+entity_type: paragraph
+bundle: top_figures_small
+label: Figures
+description: 'You can add up to 6 figures to this paragraph'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  field_settings:
+    label:
+      type: text
+      weight: 0
+      check_empty: false
+      widget_settings:
+        label: Label
+        settings:
+          description: ''
+          description_display: after
+          size: 30
+          placeholder: 'Ex: Population'
+          maxlength: 255
+          maxlength_js: false
+          prefix: ''
+          suffix: ''
+          required: false
+    value:
+      type: text
+      weight: 0
+      check_empty: false
+      widget_settings:
+        label: Value
+        settings:
+          description: ''
+          description_display: after
+          size: 30
+          placeholder: 'Ex: 10.4 million'
+          maxlength: 255
+          maxlength_js: false
+          prefix: ''
+          suffix: ''
+          required: false
+    footnote:
+      type: text
+      weight: 0
+      check_empty: false
+      widget_settings:
+        label: Footnote
+        settings:
+          description: ''
+          description_display: after
+          size: 30
+          placeholder: ''
+          maxlength: 255
+          maxlength_js: false
+          prefix: ''
+          suffix: ''
+          required: false
+field_type: custom
diff --git a/config/field.storage.paragraph.field_bottom_figures.yml b/config/field.storage.paragraph.field_bottom_figures.yml
deleted file mode 100755
index 8b1628a1..00000000
--- a/config/field.storage.paragraph.field_bottom_figures.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-uuid: b3bc588b-4076-4280-ab42-663b687b7571
-langcode: en
-status: true
-dependencies:
-  module:
-    - double_field
-    - paragraphs
-id: paragraph.field_bottom_figures
-field_name: field_bottom_figures
-entity_type: paragraph
-type: double_field
-settings:
-  storage:
-    first:
-      type: string
-      maxlength: 255
-      precision: 10
-      scale: 2
-      datetime_type: datetime
-    second:
-      type: string
-      maxlength: 255
-      precision: 10
-      scale: 2
-      datetime_type: datetime
-module: double_field
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/paragraphs.paragraphs_type.bottom_figure_row.yml b/config/paragraphs.paragraphs_type.bottom_figure_row.yml
index facb9f2d..34ee6cf8 100755
--- a/config/paragraphs.paragraphs_type.bottom_figure_row.yml
+++ b/config/paragraphs.paragraphs_type.bottom_figure_row.yml
@@ -3,18 +3,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
     - ncms_publisher
     - paragraphs_viewmode
 id: bottom_figure_row
-label: 'Bottom figure row'
+label: 'Bottom figure row (deprecated)'
 icon_uuid: null
 icon_default: null
 description: 'A row of textual figures with custom labels.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   paragraphs_viewmode_behavior:
     enabled: true
     override_mode: default
diff --git a/config/paragraphs.paragraphs_type.top_figures.yml b/config/paragraphs.paragraphs_type.top_figures.yml
new file mode 100644
index 00000000..52ecda8d
--- /dev/null
+++ b/config/paragraphs.paragraphs_type.top_figures.yml
@@ -0,0 +1,14 @@
+uuid: 42ca3952-bcb5-40ed-89ec-39ff9ef0a4f0
+langcode: en
+status: true
+dependencies:
+  module:
+    - ncms_publisher
+id: top_figures
+label: 'Top figures'
+icon_uuid: null
+icon_default: null
+description: 'A set of label/value pairs to show top figures'
+behavior_plugins:
+  promoted_behavior:
+    enabled: true
diff --git a/config/paragraphs.paragraphs_type.top_figures_small.yml b/config/paragraphs.paragraphs_type.top_figures_small.yml
new file mode 100644
index 00000000..0a893aa5
--- /dev/null
+++ b/config/paragraphs.paragraphs_type.top_figures_small.yml
@@ -0,0 +1,14 @@
+uuid: 00352a35-f75b-43bb-aa8a-8dfb622949dc
+langcode: en
+status: true
+dependencies:
+  module:
+    - ncms_publisher
+id: top_figures_small
+label: 'Top figures (small)'
+icon_uuid: null
+icon_default: null
+description: 'A set of label/value pairs to show top figures in a less prominent way'
+behavior_plugins:
+  promoted_behavior:
+    enabled: true
diff --git a/html/modules/custom/gho_fields/gho_fields.deploy.php b/html/modules/custom/gho_fields/gho_fields.deploy.php
index 0403c990..36700bc7 100644
--- a/html/modules/custom/gho_fields/gho_fields.deploy.php
+++ b/html/modules/custom/gho_fields/gho_fields.deploy.php
@@ -5,6 +5,8 @@
  * Post update functions for GHO Fields.
  */
 
+use Drupal\paragraphs\ParagraphInterface;
+
 /**
  * Copy data from old fields to new fields.
  */
@@ -79,3 +81,112 @@ function gho_fields_deploy_migrate_bottom_figure_rows() {
     }
   }
 }
+
+/**
+ * Migrate bottom figure row paragraph types to the new paragraph types.
+ */
+function gho_fields_deploy_migrate_bottom_figure_rows_paragraphs_to_top_figures() {
+  $entity_type_manager = \Drupal::entityTypeManager();
+  $storage = $entity_type_manager->getStorage('paragraph');
+
+  /** @var \Drupal\paragraphs\ParagraphInterface[] $paragraphs */
+  $paragraphs = $storage->loadByProperties([
+    'type' => ['bottom_figure_row'],
+  ]);
+  foreach ($paragraphs as $paragraph) {
+    if (!$paragraph->hasField('field_figures') || $paragraph->get('field_figures')->isEmpty()) {
+      $paragraph->delete();
+      continue;
+    }
+
+    $view_mode = $paragraph->getBehaviorSetting('paragraphs_viewmode_behavior', 'view_mode');
+    $target_bundle = $view_mode == 'top_figures' ? 'top_figures' : 'top_figures_small';
+
+    $field_config = $entity_type_manager
+      ->getStorage('field_config')
+      ->load($paragraph->getEntityTypeId() . '.' . $target_bundle . '.field_figures');
+
+    $figures = $paragraph->get('field_figures');
+    $max_figures = $field_config->getThirdPartySetting('field_config_cardinality', 'cardinality_config');
+    if ($figures->count() > $max_figures) {
+      continue;
+    }
+
+    foreach ($paragraph->getTranslationLanguages() as $language) {
+      if ($language->isDefault()) {
+        continue;
+      }
+      if (!$paragraph->hasTranslation($language->getId())) {
+        continue;
+      }
+      $translated_paragraph = \Drupal::service('entity.repository')->getTranslationFromContext($paragraph, $language->getId());
+      $figures = $translated_paragraph->get('field_figures');
+      if (!$figures || $figures->isEmpty()) {
+        $translated_paragraph->delete();
+        continue;
+      }
+
+      if ($figures->count() > $max_figures) {
+        continue;
+      }
+
+      /** @var \Drupal\paragraphs\ParagraphInterface $top_figures_paragraph */
+      $top_figures_paragraph = ghi_fields_create_top_figures_from_paragraph($translated_paragraph, $target_bundle);
+      if ($top_figures_paragraph) {
+        $translated_paragraph->delete();
+      }
+    }
+
+    $top_figures_paragraph = ghi_fields_create_top_figures_from_paragraph($paragraph, $target_bundle);
+    if ($top_figures_paragraph) {
+      $paragraph->delete();
+    }
+  }
+}
+
+/**
+ * Create a top figures paragraph from a bottom_figure_row paragraph.
+ *
+ * @param \Drupal\paragraphs\ParagraphInterface $paragraph
+ *   The original bottom_figure_row paragraph.
+ * @param string $bundle
+ *   The new paragraph type, either top_figures or top_figures_small.
+ *
+ * @return \Drupal\paragraphs\ParagraphInterface
+ *   The newly created paragraph.
+ */
+function ghi_fields_create_top_figures_from_paragraph(ParagraphInterface $paragraph, $bundle) {
+  if ($paragraph->bundle() != 'bottom_figure_row') {
+    return NULL;
+  }
+  $entity_type_manager = \Drupal::entityTypeManager();
+  $storage = $entity_type_manager->getStorage('paragraph');
+  /** @var \Drupal\paragraphs\ParagraphInterface $top_figures_paragraph */
+  $top_figures_paragraph = $storage->create([
+    'type' => $bundle,
+    'status' => $paragraph->isPublished(),
+    'parent_id' => $paragraph->get('parent_id')->value,
+    'parent_type' => $paragraph->get('parent_type')->value,
+    'parent_field_name' => $paragraph->get('parent_field_name')->value,
+    'field_figures' => $paragraph->get('field_figures')->getValue(),
+  ]);
+  $top_figures_paragraph->setBehaviorSettings('promoted_behavior', $paragraph->getAllBehaviorSettings()['promoted_behavior'] ?? []);
+  $top_figures_paragraph->setSyncing(TRUE);
+  $top_figures_paragraph->save();
+
+  $parent_field_name = $paragraph->get('parent_field_name')->value;
+  $parent = $paragraph->getParentEntity();
+  $values = $parent->get($parent_field_name)->getValue();
+
+  foreach ($values as &$item) {
+    if ($item['target_id'] != $paragraph->id()) {
+      continue;
+    }
+    $item['target_id'] = $top_figures_paragraph->id();
+    $item['target_revision_id'] = $top_figures_paragraph->getRevisionId();
+  }
+  $parent->get($parent_field_name)->setValue($values);
+  $parent->save();
+
+  return $top_figures_paragraph;
+}
diff --git a/html/modules/custom/gho_figures/README.md b/html/modules/custom/gho_figures/README.md
deleted file mode 100644
index cb4618bc..00000000
--- a/html/modules/custom/gho_figures/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-HPC Content Module - Figures Module
-=============================================
-
-This module provides a form (/admin/content/needs-and-requirements/import) to
-import a spreadsheet with the "needs and requirements" figures (also known as
-"top figures").
-
-This requires the "Needs and requirements" vocabulary.
diff --git a/html/modules/custom/gho_figures/composer.json b/html/modules/custom/gho_figures/composer.json
deleted file mode 100644
index eba9bf6b..00000000
--- a/html/modules/custom/gho_figures/composer.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "unocha/gho_figures",
-    "description": "HPC Content Module Figures Import.",
-    "type": "drupal-module",
-    "authors": [
-        {
-            "name": "UNOCHA"
-        }
-    ],
-    "keywords": [
-        "Drupal",
-        "Spreadsheet",
-        "Excel"
-    ],
-    "require": {
-        "phpoffice/phpspreadsheet": "^1.14.1"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/html/modules/custom/gho_figures/gho_figures.info.yml b/html/modules/custom/gho_figures/gho_figures.info.yml
deleted file mode 100644
index ce1cd223..00000000
--- a/html/modules/custom/gho_figures/gho_figures.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-type: module
-name: GHO Figures
-description: 'DEPRECATED Figures import handling (ex: needs and requirements).'
-package: gho
-core_version_requirement: ^9.3 || ^10
diff --git a/html/modules/custom/gho_figures/gho_figures.links.action.yml b/html/modules/custom/gho_figures/gho_figures.links.action.yml
deleted file mode 100644
index 270a8b2f..00000000
--- a/html/modules/custom/gho_figures/gho_figures.links.action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-gho_figures.import_needs_and_requirements:
-  title: 'Import needs and requirements figures'
-  route_name: gho_figures.import_needs_and_requirements
-  appears_on:
-    - view.needs_and_requirements.page_needs_and_requirements
diff --git a/html/modules/custom/gho_figures/gho_figures.module b/html/modules/custom/gho_figures/gho_figures.module
deleted file mode 100644
index 1976e0aa..00000000
--- a/html/modules/custom/gho_figures/gho_figures.module
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Code for the GHO figures module.
- */
diff --git a/html/modules/custom/gho_figures/gho_figures.permissions.yml b/html/modules/custom/gho_figures/gho_figures.permissions.yml
deleted file mode 100644
index adec5775..00000000
--- a/html/modules/custom/gho_figures/gho_figures.permissions.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-import needs and requirements figures:
-  title: 'Import needs and requirements figures'
-  description: "Allow access to the form to upload a spreadsheet with new Needs and Requirements figures"
diff --git a/html/modules/custom/gho_figures/gho_figures.routing.yml b/html/modules/custom/gho_figures/gho_figures.routing.yml
deleted file mode 100644
index c82c8899..00000000
--- a/html/modules/custom/gho_figures/gho_figures.routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-gho_figures.import_needs_and_requirements:
-  path: '/admin/content/needs_and_requirements/import'
-  defaults:
-    _form: '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm'
-    _title: 'Import needs and requirements figures'
-  requirements:
-    _permission: 'import needs and requirements figures'
diff --git a/html/modules/custom/gho_figures/src/Form/GhoFiguresImportNeedsAndRequirementsFiguresForm.php b/html/modules/custom/gho_figures/src/Form/GhoFiguresImportNeedsAndRequirementsFiguresForm.php
deleted file mode 100644
index a274ec89..00000000
--- a/html/modules/custom/gho_figures/src/Form/GhoFiguresImportNeedsAndRequirementsFiguresForm.php
+++ /dev/null
@@ -1,1200 +0,0 @@
-<?php
-
-namespace Drupal\gho_figures\Form;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Core\Config\ConfigFactory;
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\File\FileSystemInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Messenger\MessengerInterface;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\taxonomy\Entity\Term;
-use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\IOFactory;
-use PhpOffice\PhpSpreadsheet\Worksheet\Row;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * GHO figures import form implementation.
- */
-class GhoFiguresImportNeedsAndRequirementsFiguresForm extends FormBase {
-
-  /**
-   * Supported spreadsheet columns.
-   *
-   * Each column defintion can contain the following values:
-   * - legacy: indicates that the column itself is not used as is anymore
-   *   though it may still be used when processing other columns.
-   * - mandatory: indicates that the column must be present.
-   * - multiple: indicates that there may be multiple values for the column.
-   * - field: indicates the "needs and requirements" term's field to which the
-   *   column data will be added.
-   * - preprocess: array with a callback as first item and additional
-   *   arguments. The cell data will be preprocessed by this callback when
-   *   parsing a row. The callback will be passed the whole row's data by
-   *   reference and is expecting to modify the data (no return value).
-   *   The callback should return FALSE if the value was invalid.
-   * - process: array with a callback as first item and additional
-   *   arguments. The cell data will be processed by this callback when
-   *   added to the field.
-   * - table_display: array with a callback as first item and additional
-   *   arguments. The function will be called to generate the value to
-   *   display in the figures table in the confirmation step. The callback will
-   *   be passed the whole row's data.
-   *
-   * @var array
-   */
-  public static $columns = [
-    'name' => [
-      'mandatory' => TRUE,
-      'field' => 'name',
-      'label' => '',
-    ],
-    'people in need' => [
-      'mandatory' => TRUE,
-      'field' => 'field_people_in_need',
-      'label' => 'People in need',
-      'preprocess' => [
-        '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm::preprocessNumber',
-      ],
-      'table_display' => [
-        '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm::displayNumber',
-      ],
-    ],
-    'people targeted' => [
-      'mandatory' => TRUE,
-      'field' => 'field_people_targeted',
-      'label' => 'People targeted',
-      'preprocess' => [
-        '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm::preprocessNumber',
-      ],
-      'table_display' => [
-        '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm::displayNumber',
-      ],
-    ],
-    'requirements (us$)' => [
-      'mandatory' => TRUE,
-      'field' => 'field_requirements',
-      'label' => 'Requirements (US$)',
-      'preprocess' => [
-        '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm::preprocessNumber',
-      ],
-      'table_display' => [
-        '\Drupal\gho_figures\Form\GhoFiguresImportNeedsAndRequirementsFiguresForm::displayNumber',
-      ],
-    ],
-  ];
-
-  /**
-   * Database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * File system service.
-   *
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  protected $fileSystem;
-
-  /**
-   * Configuration Factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactory
-   */
-  protected $configFactory;
-
-  /**
-   * Entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Messenger service.
-   *
-   * @var \Drupal\Core\Messenger\MessengerInterface
-   */
-  protected $messenger;
-
-  /**
-   * Class constructor.
-   *
-   * @param \Drupal\Core\Database\Connection $database
-   *   Database connection.
-   * @param \Drupal\Core\File\FileSystemInterface $file_system
-   *   File system service.
-   * @param \Drupal\Core\Config\ConfigFactory $config_factory
-   *   Config factory.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   Entity type manager service.
-   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
-   *   Messenger service.
-   */
-  public function __construct(Connection $database, FileSystemInterface $file_system, ConfigFactory $config_factory, EntityTypeManagerInterface $entity_type_manager, MessengerInterface $messenger) {
-    $this->database = $database;
-    $this->fileSystem = $file_system;
-    $this->configFactory = $config_factory;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->messenger = $messenger;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('database'),
-      $container->get('file_system'),
-      $container->get('config.factory'),
-      $container->get('entity_type.manager'),
-      $container->get('messenger')
-    );
-  }
-
-  /**
-   * Get a setting for the gho_figures module.
-   *
-   * @param string $setting
-   *   Setting name.
-   * @param mixed $default
-   *   Default value for the setting.
-   *
-   * @return mixed
-   *   Value for the setting.
-   */
-  public function getSetting($setting, $default = NULL) {
-    static $settings;
-    if (!isset($settings)) {
-      $settings = $this->configFactory->get('gho_figures.settings');
-    }
-    return $settings->get($setting) ?? $default;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'gho_figures_import_needs_and_requirements_figures_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['actions'] = [
-      '#type' => 'actions',
-      // Ensure it's at the bottom of the list.
-      '#weight' => 10,
-    ];
-
-    if ($form_state->has('step') && $form_state->get('step') == 2) {
-      return self::buildFormStepTwo($form, $form_state);
-    }
-    else {
-      return self::buildFormStepOne($form, $form_state);
-    }
-  }
-
-  /**
-   * Build the first step of the form with the file upload.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return array
-   *   Modified form.
-   */
-  public function buildFormStepOne(array $form, FormStateInterface $form_state) {
-    $form_state->set('step', 1);
-
-    $form['description'] = [
-      '#type' => 'item',
-      '#title' => $this->t('<h2>Step 1: File Upload</h2>'),
-    ];
-
-    $form['tips'] = [
-      '#type' => 'item',
-      '#markup' => $this->t('
-        <h3>Tips</h3>
-        <ul>
-          <li>Make sure the spreadsheet contains those 4 columns:
-            <ol>
-              <li>"Name" column (with overviews and appeals; assumed to be the first column)</li>
-              <li>People in need</li>
-              <li>People targeted</li>
-              <li>Requirements (US$)</li>
-            </ol>
-          </li>
-          <li>Make sure all the figures are non formatted numbers (ex: 1200000 not 1.2 million)</li>
-          <li>Use 0, -1, - or TBC to indicate a missing value</li>
-        </ul>
-      '),
-    ];
-
-    $form['file'] = [
-      '#type' => 'managed_file',
-      '#title' => $this->t('Spreadsheet file'),
-      '#description' => $this->t('Spreadsheet file with the figures. Accepted formats are: xls, xlsx, ods, csv.'),
-      '#required' => TRUE,
-      '#default_value' => $form_state->getValue('file'),
-      '#upload_location' => 'temporary://figures-import',
-      '#upload_validators' => [
-        'file_validate_extensions' => ['xls xlsx ods csv'],
-      ],
-    ];
-
-    // Proceed to step 2.
-    $form['actions']['next'] = [
-      '#type' => 'submit',
-      '#button_type' => 'primary',
-      '#value' => $this->t('Next'),
-      '#submit' => ['::submitFormStepOne'],
-      '#validate' => ['::validateFormStepOne'],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * Validate the first step of the form.
-   *
-   * Here we also parse the spreadsheet file and extract the figures.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function validateFormStepOne(array &$form, FormStateInterface $form_state) {
-    $fids = $form_state->getValue('file');
-    if (!empty($fids)) {
-      // Load the file object and get its real path as that's what
-      // PHPSpreadsheet expects.
-      $file = $this->entityTypeManager->getStorage('file')->load(reset($fids));
-      $path = $this->fileSystem->realpath($file->getFileUri());
-
-      // Maximum number of rows that can be parsed to limit memory consumption.
-      // In our case, there will be probably be less than 100 rows.
-      $max_rows = $this->getSetting('max_rows', 9999);
-
-      // Extract the figures from the spreadsheet.
-      $figures = static::parseSpreadsheet($path, $max_rows);
-      if (empty($figures['figures']) && !empty($figures['errors'])) {
-        $form_state->setErrorByName('file', $this->t("Unable to extract figures from the spreadsheet: \n@errors.", [
-          '@errors' => static::formatList($figures['errors']),
-        ]));
-      }
-      else {
-        $form_state->set('figures', $figures);
-      }
-    }
-  }
-
-  /**
-   * Submit the first step of the form.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function submitFormStepOne(array &$form, FormStateInterface $form_state) {
-    $form_state
-      ->set('first_step_values', ['file' => $form_state->getValue('file')])
-      ->set('step', 2)
-      ->setRebuild(TRUE);
-  }
-
-  /**
-   * Build the second step of the form with the confirmation.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return array
-   *   Modified form.
-   */
-  public function buildFormStepTwo(array $form, FormStateInterface $form_state) {
-    $form_state->set('step', 2);
-
-    $form['description'] = [
-      '#type' => 'item',
-      '#title' => $this->t('<h2>Step 2: Confirmation</h2>'),
-    ];
-
-    // Display the table with the list of figures to import.
-    $figures = $form_state->get('figures');
-    if (!empty($figures['figures'])) {
-      // Maximum number of figures to show.
-      $count = count($figures['figures']);
-      $headers = static::getTableHeaders($figures['columns']);
-      $rows = static::getTableRows($headers, $figures['figures']);
-
-      $form['figure-list'] = [
-        '#type' => 'details',
-        '#title' => $this->formatPlural($count,
-          '@count figure to import',
-          '@count figures to import'
-        ),
-        'table' => [
-          '#type' => 'table',
-          '#header' => $headers,
-          '#rows' => $rows,
-        ],
-      ];
-    }
-
-    // Display the errors detected while parsing the spreadsheet.
-    if (!empty($figures['errors'])) {
-      $count = count($figures['errors']);
-
-      $form['error-list'] = [
-        '#type' => 'details',
-        '#title' => $this->formatPlural($count,
-          '@count parsing error',
-          '@count parsing errors'
-        ),
-        'list' => [
-          '#theme' => 'item_list',
-          '#list_type' => 'ul',
-          '#items' => $figures['errors'],
-        ],
-      ];
-    }
-
-    // Button to go back to the step 1.
-    $form['actions']['back'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Back'),
-      '#submit' => ['::cancelFormStepTwo'],
-      // Prevent validation errors as we are going back and the values from
-      // the step 2 should be ignored then.
-      '#limit_validation_errors' => [],
-    ];
-
-    // Submit the form, actually replacing the figures.
-    // We default to base form submit and validation callbacks.
-    $form['actions']['submit'] = [
-      '#type' => 'submit',
-      '#button_type' => 'primary',
-      '#value' => $this->t('Import figures'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * Get the figures table headers to display in the import confirmation step.
-   *
-   * @param array $columns
-   *   Array of Header columns with the names as keys.
-   *
-   * @return array
-   *   List of table headers.
-   */
-  public static function getTableHeaders(array $columns) {
-    $headers = [];
-
-    foreach (static::$columns as $name => $definition) {
-      if (isset($columns[$name])) {
-        $headers[$name] = $definition['label'];
-      }
-    }
-
-    return $headers;
-  }
-
-  /**
-   * Get the figures table rows to display in the import confirmation step.
-   *
-   * @param array $headers
-   *   List of header column names.
-   * @param array $figures
-   *   List of figures data extracted from the spreadsheet.
-   *
-   * @return array
-   *   Table rows. Each row contains cells for each column. Each cell can be
-   *   either a string or a render array.
-   */
-  public static function getTableRows(array $headers, array $figures) {
-    $rows = [];
-    foreach ($figures as $data) {
-      $row = [];
-      foreach ($headers as $name => $label) {
-        if (isset(static::$columns[$name]['table_display'])) {
-          $row[$name] = static::call(static::$columns[$name]['table_display'] + [
-            'name' => $name,
-          ], $data);
-        }
-        else {
-          $row[$name] = $data[$name] ?? '';
-        }
-      }
-      $rows[] = $row;
-    }
-    return $rows;
-  }
-
-  /**
-   * Return to the first step.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function cancelFormStepTwo(array &$form, FormStateInterface $form_state) {
-    $form_state
-      ->setValues($form_state->get('first_step_values'))
-      ->set('step', 1)
-      ->setRebuild(TRUE);
-  }
-
-  /**
-   * Validate the form (after step 2).
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    // Nothing to validate.
-  }
-
-  /**
-   * Submit the form (after step 2).
-   *
-   * Generate the batch to update the "needs and requirements" figures.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $batch_size = $this->getSetting('batch_size', 50);
-
-    // We will (optionally) delete the old figures and create the new ones
-    // in batches as that takes time.
-    $figures = $form_state->get('figures');
-    if (!empty($figures['figures'])) {
-      $operations = [];
-
-      // We log the parsing errors (if any) during the batch process because
-      // otherwise it slows down too much the parsing. Also it makes more sense
-      // to log them when actually proceeding with the import.
-      $operations[] = [
-        __CLASS__ . '::logParsingInfo',
-        [$figures['path'], $figures['errors']],
-      ];
-
-      // Extract the name of the figures to update/create.
-      $names = array_map(function ($figure) {
-        return $figure['name'];
-      }, $figures['figures']);
-
-      // Create batch steps to delete figure terms not present in the list.
-      $records = $this->entityTypeManager->getStorage('taxonomy_term')->getQuery()
-        ->condition('vid', 'needs_and_requirements')
-        ->condition('name', $names, 'NOT IN')
-        ->accessCheck(FALSE)
-        ->execute();
-
-      if (!empty($records)) {
-        foreach (array_chunk($records, $batch_size) as $ids) {
-          $operations[] = [__CLASS__ . '::deleteFigureTerms', [$ids]];
-        }
-      }
-
-      // Create batch steps to create the new figure terms.
-      foreach (array_chunk($figures['figures'], $batch_size) as $data) {
-        $operations[] = [__CLASS__ . '::createFigureTerms', [$data]];
-      }
-
-      $batch = [
-        'title' => $this->t('Importing figures...'),
-        'operations' => $operations,
-        'finished' => __CLASS__ . '::batchFinished',
-      ];
-      batch_set($batch);
-    }
-    else {
-      $this->messenger->addWarning($this->t('No figures to import. Existing figures will not be updated.'));
-    }
-  }
-
-  /**
-   * Log the parsing errors.
-   *
-   * @param string $path
-   *   The path of the spreadsheet.
-   * @param array $errors
-   *   The parsing errors.
-   * @param array $context
-   *   The batch context.
-   */
-  public static function logParsingInfo($path, array $errors, array &$context) {
-    // Log the filename to help make sense of the parsing errors.
-    static::log(new FormattableMarkup('Parsed spreadsheet: @path', [
-      '@path' => $path,
-    ]), 'info');
-
-    // We log the errors as notices because they don't impact the whole site.
-    foreach ($errors as $error) {
-      static::log($error, 'notice');
-    }
-
-    // Set a message for the current batch and update the progress status.
-    $count = count($errors);
-    $context['message'] = \Drupal::translation()->formatPlural($count,
-      'Logged @count parsing error.',
-      'Logged @count parsing errors.'
-    );
-    $context['results']['logged'][] = $count;
-  }
-
-  /**
-   * Delete the "needs and requirements" figure terms for the given ids.
-   *
-   * Note: we don't actually delete the terms but wipe out their data and
-   * unpublish them so that we can preserve any references to them in article
-   * nodes for example, in case they are updated later on.
-   *
-   * @param array $ids
-   *   Term ids.
-   * @param array $context
-   *   The batch context.
-   */
-  public static function deleteFigureTerms(array $ids, array &$context) {
-    $storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
-
-    // Unpublish the terms that are not used.
-    $terms = $storage->loadMultiple($ids);
-    foreach ($terms as $term) {
-      // Mark as unpublished.
-      $term->status = 0;
-      // Wipe out the values of the figures for the term.
-      foreach (static::$columns as $field => $definition) {
-        // The term name is a mandatory field that cannot be empty. It's also
-        // the field we use when matching figures before creating a new one.
-        if ($field !== 'name' && isset($definition['field'])) {
-          $term->set($definition['field'], NULL);
-        }
-      }
-      $term->save();
-    }
-
-    // Set a message for the current batch and update the progress status.
-    $count = count($ids);
-    $context['message'] = \Drupal::translation()->formatPlural($count,
-      'Deleted @count old figure.',
-      'Deleted @count old figures.'
-    );
-    $context['results']['deleted'][] = $count;
-  }
-
-  /**
-   * Create new "needs and requirements" figure terms.
-   *
-   * Note: if a term already exists, we simply update it.
-   *
-   * @param array $figures
-   *   Figure data.
-   * @param array $context
-   *   The batch context.
-   */
-  public static function createFigureTerms(array $figures, array &$context) {
-    $storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
-
-    // Create a new term for each figure.
-    foreach ($figures as $figure) {
-      // Check if a term with the same name already exists and re-use it.
-      $terms = $storage->loadByProperties([
-        'vid' => 'needs_and_requirements',
-        'name' => $figure['name'],
-      ]);
-
-      if (!empty($terms)) {
-        $term = reset($terms);
-      }
-      else {
-        $term = $storage->create(['vid' => 'needs_and_requirements']);
-      }
-
-      // Update the term fields.
-      static::updateFigureTerm($term, $figure);
-      // Mark as published.
-      $term->status = 1;
-      $term->save();
-    }
-
-    // Set a message for the current batch and update the progress status.
-    $count = count($figures);
-    $context['message'] = \Drupal::translation()->formatPlural($count,
-      'Created/updated @count new figure.',
-      'Created/updated @count new figures.'
-    );
-    $context['results']['created'][] = $count;
-  }
-
-  /**
-   * Update a "needs and requirements" figure term's fields with new data.
-   *
-   * @param \Drupal\taxonomy\Entity\Term $term
-   *   Node to update.
-   * @param array $data
-   *   New figure data.
-   *
-   * @todo review if we should get the node fields via ::getFields() and
-   * reset all the fields for which there is no corresponding data.
-   */
-  public static function updateFigureTerm(Term $term, array $data) {
-    foreach (static::$columns as $name => $definition) {
-      if (!isset($definition['field'])) {
-        continue;
-      }
-      $field = $definition['field'];
-      $value = NULL;
-      if (isset($data[$name])) {
-        $value = $data[$name];
-
-        if (isset($definition['process'])) {
-          $value = static::call($definition['process'] + ['name' => $name], $value);
-        }
-      }
-      $term->set($field, $value);
-    }
-  }
-
-  /**
-   * Display message after the batch import is finished.
-   *
-   * @param bool $success
-   *   Whether the batch process succeeeded or not.
-   * @param array $results
-   *   Batch results.
-   * @param array $operations
-   *   List of batch operations.
-   */
-  public static function batchFinished($success, array $results, array $operations) {
-    if ($success) {
-      if (!empty($results['deleted'])) {
-        \Drupal::messenger()->addStatus(t('Deleted %deleted old figures.', [
-          '%deleted' => array_sum($results['deleted']),
-        ]));
-      }
-      if (!empty($results['created'])) {
-        \Drupal::messenger()->addStatus(t('Created/updated %created figures.', [
-          '%created' => array_sum($results['created']),
-        ]));
-      }
-    }
-    else {
-      // @todo Show a more useful error message?
-      \Drupal::messenger()->addError(t('No figures to import. Old figures were not deleted.'));
-    }
-  }
-
-  /**
-   * Get a taxonomy term ID. Create a new term if necessary.
-   *
-   * @param string $vocabulary
-   *   Taxonomy vocabulary.
-   * @param string|array $name
-   *   Taxonomy term name or array of names.
-   *
-   * @return int|null
-   *   Id of the first term, newly created if doesn't already exists.
-   */
-  public static function getTermId($vocabulary, $name) {
-    $multiple = is_array($name);
-
-    $names = array_filter(array_map('trim', $multiple ? $name : [$name]));
-
-    if (empty($names)) {
-      return NULL;
-    }
-
-    $results = [];
-    foreach ($names as $name) {
-      $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
-
-      // Sanitize and truncate the term if necessary.
-      $words = preg_split('/' . Unicode::PREG_CLASS_WORD_BOUNDARY . '/u', $name, -1, PREG_SPLIT_NO_EMPTY);
-      if (count($words) > 10) {
-        $name = implode(' ', array_slice($words, 0, 10)) . ' ...';
-      }
-
-      // Get any existing taxonomy term matching the given term name.
-      $terms = $term_storage->loadByProperties([
-        'vid' => $vocabulary,
-        'name' => $name,
-      ]);
-
-      // Get the first existing term or create one.
-      if (!empty($terms)) {
-        $term = reset($terms);
-      }
-      else {
-        $term = $term_storage->create([
-          'vid' => $vocabulary,
-          'name' => $name,
-        ]);
-        $term->save();
-      }
-      $results[] = $term->id();
-    }
-
-    return $multiple ? $results : reset($results);
-  }
-
-  /**
-   * Extract figures from a spreadsheet.
-   *
-   * @param string $path
-   *   File path.
-   * @param int $max_rows
-   *   Maximum number rows to parse.
-   *
-   * @return array
-   *   Associative array with the spreadsheet file path, the header columns,
-   *   figure list and potential parsing errors.
-   */
-  public static function parseSpreadsheet($path, $max_rows) {
-    $columns = [];
-    $figures = [];
-    $errors = [];
-
-    // We wrap this code in a try...catch because PHPSpreadsheet can throw
-    // various exceptions when parsing a spreadsheet.
-    try {
-      // Get the worksheet to work with (pun intended).
-      $sheet = static::getWorksheet($path);
-
-      // Get the row to which will stop the parsing.
-      $max_rows = min($sheet->getHighestDataRow(), $max_rows);
-
-      // Parse the sheet, extracting figure data.
-      $header_row_found = FALSE;
-      foreach ($sheet->getRowIterator(1, $max_rows) as $row) {
-        // Parse the row to see if it's the header one.
-        if ($header_row_found === FALSE) {
-          $data = static::parseHeaderRow($sheet, $row);
-          // There are errors if the header row was found but some mandatory
-          // columns are missing. In that case we abort the parsing.
-          if (!empty($data['errors'])) {
-            $errors = array_merge($errors, $data['errors']);
-            break;
-          }
-          // Otherwise if the header row was found, we store the columns and
-          // make sure we can start parsing the data. If not, we continue
-          // looking for it.
-          elseif (!empty($data['columns'])) {
-            $columns = $data['columns'];
-            $header_row_found = TRUE;
-          }
-        }
-        // Parse a figure data row.
-        else {
-          $data = static::parseDataRow($columns, $sheet, $row);
-          if (!empty($data['data'])) {
-            // Log the errors only for "useful" rows with some data.
-            if (!empty($data['errors'])) {
-              $errors = array_merge($errors, $data['errors']);
-            }
-            // If there is an email, merge the data with the figure entry with
-            // the same email address if any, otherwise create a new entry if
-            // the data is "valid", meaning, it has all the mandatory fields.
-            if (!empty($data['data']['name'])) {
-              $figures[$data['data']['name']] = $data['data'];
-            }
-          }
-        }
-      }
-    }
-    catch (\Exception $exception) {
-      $errors[] = $exception->getMessage();
-    }
-
-    return [
-      'path' => $path,
-      'columns' => $columns,
-      'figures' => $figures,
-      'errors' => $errors,
-    ];
-  }
-
-  /**
-   * Load a spreadsheet and return its first worksheet.
-   *
-   * @param string $path
-   *   File path.
-   *
-   * @return \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-   *   First worksheet.
-   */
-  public static function getWorksheet($path) {
-    if (!file_exists($path)) {
-      throw new \Exception("The spreadsheet file doesn't exist.");
-    }
-
-    // Get the spreadsheet type.
-    $filetype = IOFactory::identify($path);
-
-    // Create the spreadsheet reader.
-    $reader = IOFactory::createReader($filetype);
-
-    // Start reading the file.
-    $spreadsheet = $reader->load($path);
-
-    // We only deal with the first sheet.
-    return $spreadsheet->getActiveSheet();
-  }
-
-  /**
-   * Parse a row, attempting to determine if its the header row.
-   *
-   * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet
-   *   Spreadsheet worksheet.
-   * @param \PhpOffice\PhpSpreadsheet\Worksheet\Row $row
-   *   Spreadsheet row.
-   *
-   * @return array
-   *   Empty array if the row is not the header row, otherwise, return an
-   *   associative array with the found columns which is an associative array
-   *   with the column name (header) as value and the column letter as value.
-   *   If the row is the header one but some mandatory columns are missing, the
-   *   returnning array will have an `errors` key with the list of errors.
-   */
-  public static function parseHeaderRow(Worksheet $sheet, Row $row) {
-    $columns = [];
-    foreach ($row->getCellIterator() as $index => $cell) {
-      $value = mb_strtolower(static::getCellValue($sheet, $cell->getCoordinate()));
-      // Fix malformed column names...
-      $value = trim(preg_replace('/\s+/u', ' ', $value));
-      if (isset($value, static::$columns[$value]) && !isset($columns[$value])) {
-        $columns[$value] = $cell->getColumn();
-      }
-      // If the first column doesn't have a name we assume it is the "name"
-      // column with the overviews and appeals.
-      elseif ($index === 'A') {
-        $columns['name'] = $cell->getColumn();
-      }
-    }
-
-    if (count($columns) < 2) {
-      return [];
-    }
-
-    // Validate mandatory columns.
-    $errors = [];
-    foreach (static::$columns as $name => $definition) {
-      if (!static::checkMandatoryField($name, $definition, $columns)) {
-        // We use TranslatableMarkup so that the error can be displayed
-        // translated in the confirmation step.
-        $errors[] = new TranslatableMarkup('Missing @column column.', [
-          '@column' => $name,
-        ]);
-      }
-    }
-
-    return [
-      'columns' => $columns,
-      'errors' => $errors,
-    ];
-  }
-
-  /**
-   * Parse a row with figure data.
-   *
-   * @todo Check if we need to use getCalculatedValue() instead of getValue().
-   *
-   * @param array $columns
-   *   Associative array of header columns with their associated column index.
-   * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet
-   *   Spreadsheet worksheet.
-   * @param \PhpOffice\PhpSpreadsheet\Worksheet\Row $row
-   *   Spreadsheet row.
-   *
-   * @return array
-   *   Associative array with the following keys:
-   *   - data: associative array mapping the column names to their values,
-   *   - errors: array with a list of parsing errors,
-   *   - valid: a flag to indicate that the data contains all the mandatory
-   *   fields.
-   */
-  public static function parseDataRow(array $columns, Worksheet $sheet, Row $row) {
-    $index = $row->getRowIndex();
-    $data = [];
-    $errors = [];
-    $valid = TRUE;
-
-    // Get the data from the row foreach column with a recognized header.
-    foreach ($columns as $name => $column) {
-      $data[$name] = static::getCellValue($sheet, $column . $index);
-    }
-
-    // Skip if there no valid cell beside the name one as it's probably
-    // not a data row.
-    $skip = count(array_filter($data, function ($value, $name) {
-      return $name !== 'name' && $value !== '';
-    }, ARRAY_FILTER_USE_BOTH)) === 0;
-
-    if ($skip) {
-      return [];
-    }
-
-    // Process the row's data.
-    foreach (static::$columns as $name => $definition) {
-      if (isset($definition['preprocess'])) {
-        if (!static::call($definition['preprocess'] + ['name' => $name], $data)) {
-          $errors[$name] = new TranslatableMarkup('Invalid @column on row @row.', [
-            '@column' => $name,
-            '@row' => $index,
-          ]);
-        }
-      }
-    }
-
-    // Check mandatory fields. This is not done in the loop above because
-    // the data may change during preprocessing.
-    foreach (static::$columns as $name => $definition) {
-      if (!static::checkMandatoryField($name, $definition, $data)) {
-        // No need to add different error messages for the same field, for
-        // example if the field data was found invalid during preprocessing.
-        if (!isset($errors[$name])) {
-          $errors[$name] = new TranslatableMarkup('Missing @column on row @row.', [
-            '@column' => $name,
-            '@row' => $index,
-          ]);
-        }
-        $valid = FALSE;
-      }
-    }
-
-    return [
-      'data' => $data,
-      'errors' => array_values($errors),
-      'valid' => $valid,
-    ];
-  }
-
-  /**
-   * Get a cell value.
-   *
-   * This extracts the value of a cell. If the cell is merged with other cells
-   * we extract the combine value for the whole merge range.
-   *
-   * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet
-   *   Spreadsheet worksheet.
-   * @param string $reference
-   *   Cell reference (ex: A1).
-   *
-   * @return string
-   *   Extracted value, defaulting to an empty string.
-   */
-  public static function getCellValue(Worksheet $sheet, $reference) {
-    static $references;
-    static $values;
-
-    if (!isset($references, $values)) {
-      [$references, $values] = static::extractMergedCells($sheet);
-    }
-
-    if (isset($references[$reference])) {
-      return $values[$references[$reference]];
-    }
-    elseif ($sheet->getCellCollection()->has($reference)) {
-      return trim($sheet->getCellCollection()->get($reference)->getValue());
-    }
-    return '';
-  }
-
-  /**
-   * Extract the values for the merged cells.
-   *
-   * We store the merged cells references and the merge range values so that
-   * we don't have to parse the merge ranges every time we try to get a cell
-   * value. This speeds tremendously the spreadsheet parsing at the cost of
-   * increased memory usage.
-   *
-   * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet
-   *   Worksheet from which to extract the merged cells data.
-   *
-   * @return array
-   *   Array containing 2 elements: an associative array  of the references of
-   *   the cells included in merge ranges mapped to to the range reference, and
-   *   an associative array mapping range references to their values.
-   */
-  public static function extractMergedCells(Worksheet $sheet) {
-    $references = [];
-    $values = [];
-
-    foreach ($sheet->getMergeCells() as $range) {
-      // Extract all the merged cell references and store their mapping to
-      // the merge range. We don't copy directly the merge range value to
-      // reduce memory usage.
-      foreach (Coordinate::extractAllCellReferencesInRange($range) as $index => $reference) {
-        // The first cell of the range is supposed to contain the value of the
-        // range.
-        // @see \PhpOffice\PhpSpreadsheet\Cell\Cell::isMergeRangeValueCell()
-        if ($index === 0) {
-          if ($sheet->getCellCollection()->has($reference)) {
-            $values[$range] = trim($sheet->getCellCollection()->get($reference)->getValue());
-          }
-          else {
-            $values[$range] = '';
-          }
-        }
-        $references[$reference] = $range;
-      }
-    }
-    return [$references, $values];
-  }
-
-  /**
-   * Preprocess the duty station country field.
-   *
-   * This extracts the countries from the `country` field or from the
-   * `duty station country` field if the former is empty.
-   *
-   * @param string $name
-   *   Field name.
-   * @param array $data
-   *   Row data.
-   *
-   * @return bool
-   *   FALSE if the data was invalid, TRUE otherwise.
-   */
-  public static function preprocessNumber($name, array &$data) {
-    if (isset($data[$name])) {
-      $value = $data[$name];
-      if ($value <= 0 || $value === '-' || strtoupper($value) === 'TBC') {
-        $value = 0;
-      }
-      else {
-        $options = ['options' => ['min_range' => 0]];
-        $value = filter_var($data[$name], FILTER_VALIDATE_INT, $options);
-      }
-      // Remove the value if it's not a positive integer so that the row
-      // will be removed and an error displayed.
-      if ($value === FALSE) {
-        unset($data[$name]);
-        return FALSE;
-      }
-      else {
-        $data[$name] = $value;
-        return TRUE;
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * Get a render array/string to display a formatted number (ex: 1.2 million).
-   *
-   * @param string $name
-   *   Field name.
-   * @param array $data
-   *   Figure data.
-   *
-   * @return array|string
-   *   Render array or empty string.
-   */
-  public static function displayNumber($name, array $data) {
-    if (!isset($data[$name])) {
-      return '';
-    }
-    if ($data[$name] == 0) {
-      return 'TBC';
-    }
-    // @todo use the same formatter as the one used to render the figures in
-    // the frontend (ex: 1.2 million).
-    return number_format($data[$name]);
-  }
-
-  /**
-   * Helper method to display a list of items as a HTML list.
-   *
-   * @param array $items
-   *   List of strings.
-   *
-   * @return \Drupal\Component\Render\FormattableMarkup
-   *   FormattableMarkup object containing the HTML list that can be passed
-   *   as placeholder replacement to `t()`.
-   */
-  public static function formatList(array $items) {
-    $html = '<ul><li>' . implode('</li><li>', $items) . '</li></ul>';
-    return new FormattableMarkup($html, []);
-  }
-
-  /**
-   * Check of the given data contains the mandatory field data.
-   *
-   * @param string $name
-   *   Column name.
-   * @param array $definition
-   *   Column definition.
-   * @param array $data
-   *   Field data.
-   *
-   * @return bool
-   *   Whether the field is present or not.
-   */
-  public static function checkMandatoryField($name, array $definition, array $data) {
-    return empty($definition['mandatory']) || isset($data[$name]);
-  }
-
-  /**
-   * Call a function with the given arguments and data.
-   *
-   * @param array $arguments
-   *   Array with the callable function/method as first element and with the
-   *   rest as parameters to pass to the callable.
-   * @param mixed $data
-   *   Additional data to pass to the callable. It is passed by reference and
-   *   may be modified by the callable.
-   *
-   * @return mixed
-   *   The result of the call.
-   */
-  public static function call(array $arguments, &$data) {
-    $callable = array_shift($arguments);
-    $arguments[] = &$data;
-    return call_user_func_array($callable, array_values($arguments));
-  }
-
-  /**
-   * Log a message.
-   *
-   * @param mixed $message
-   *   String-ish value. If the message is an instance of
-   *   \Drupal\Core\StringTranslation\TranslatableMarkup then we build a non
-   *   translated message as the logs are for internal information and it
-   *   doesn't make sense to have them in the display language of the current
-   *   user.
-   * @param string $level
-   *   Log level.
-   */
-  public static function log($message, $level = 'info') {
-    if ($message instanceof TranslatableMarkup) {
-      $message = new FormattableMarkup($message->getUntranslatedString(), $message->getArguments());
-    }
-    \Drupal::logger('gho-figures-import')->log($level, $message);
-  }
-
-}
diff --git a/html/modules/custom/gho_figures/src/config/install/gho_figures.settings.yml b/html/modules/custom/gho_figures/src/config/install/gho_figures.settings.yml
deleted file mode 100644
index 69987793..00000000
--- a/html/modules/custom/gho_figures/src/config/install/gho_figures.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Maximum number of rows to parse in the spreadsheet.
-max_rows: 9999
-# Number of figures to delete/create per batch.
-batch_size: 50
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index ac1b29c0..6719986e 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -37,6 +37,11 @@ gho-bottom-figure-row:
     theme:
       components/gho-bottom-figure-row/gho-bottom-figure-row.css: {}
 
+gho-top-figures:
+  css:
+    theme:
+      components/gho-top-figures/gho-top-figures.css: {}
+
 gho-download-button:
   css:
     theme:
diff --git a/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md b/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md
new file mode 100644
index 00000000..1476eaa8
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md
@@ -0,0 +1,4 @@
+HPC Content Module - Top Figures Component
+==========================================================
+
+Displays a horizontal row of manually-entered textual figures (label + figure).
diff --git a/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css b/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
new file mode 100644
index 00000000..ad834d63
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
@@ -0,0 +1,66 @@
+/**
+ * Base field.
+ */
+.gho-top-figures {
+  margin-top: 2rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+/* The border is not on the container itself due to eventual left/right padding
+ * values that can interfere. Ex: when it has the `content-width` class. */
+.gho-top-figures::before {
+  display: block;
+  padding-bottom: 2rem;
+  content: "";
+  border-top: 1px solid #d8d8d8;
+}
+/* Hide the border when the figures follow a NaR paragraph. */
+.gho-needs-and-requirements-paragraph + .gho-top-figures::before {
+  content: none;
+}
+
+.gho-top-figures .gho-figures {
+  display: flex;
+  overflow-x: hidden;
+  flex-flow: row wrap;
+  align-content: space-around;
+  justify-content: flex-start;
+  /* Compensate for the margins of the figure items. */
+  margin: -1rem 0 0 0;
+  padding-bottom: 2rem;
+  border-bottom: 1px solid #d8d8d8;
+}
+
+.gho-top-figures .gho-figure {
+  flex: 0 1 auto;
+  min-width: 140px;
+  margin: 1rem 0 0 0;
+}
+[dir="ltr"] .gho-top-figures .gho-figure {
+  margin-right: 0;
+  /* The left margin combined with the overflow-x: hidden of the parent
+   * ensures the left border and padding are hidden for the first item of each
+   * row. */
+  margin-left: calc(-1rem - 1px);
+  padding: 0 2rem 0 1rem;
+  border-right: none;
+  border-left: 1px solid #d8d8d8;
+}
+[dir="rtl"] .gho-top-figures .gho-figure {
+  margin-right: calc(-1rem - 1px);
+  /* The right margin combined with the overflow-x: hidden of the parent
+   * ensures the right border and padding are hidden for the first item of each
+   * row. */
+  margin-left: 0;
+  padding: 0 1rem 0 2rem;
+  border-right: 1px solid #d8d8d8;
+  border-left: none;
+}
+
+.gho-top-figures .gho-figure__label,
+.gho-top-figures .gho-figure__value {
+  display: block;
+}
+.gho-top-figures .gho-figure__label {
+  font-weight: 700;
+}
diff --git a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig
new file mode 100644
index 00000000..84b29572
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig
@@ -0,0 +1,59 @@
+{#
+/**
+ * @file
+ * Theme implementation for a Bottom Figure Row paragraph.
+ *
+ * Overrides paragraphs/templates/paragraph.html.twig.
+ *
+ * Available variables:
+ * - paragraph: Full paragraph entity.
+ *   Only method names starting with "get", "has", or "is" and a few common
+ *   methods such as "id", "label", and "bundle" are available. For example:
+ *   - paragraph.getCreatedTime() will return the paragraph creation timestamp.
+ *   - paragraph.id(): The paragraph ID.
+ *   - paragraph.bundle(): The type of the paragraph, for example, "image" or "text".
+ *   - paragraph.getOwnerId(): The user ID of the paragraph author.
+ *   See Drupal\paragraphs\Entity\Paragraph for a full list of public properties
+ *   and methods for the paragraph object.
+ * - content: All paragraph items. Use {{ content }} to print them all,
+ *   or print a subset such as {{ content.field_example }}. Use
+ *   {{ content|without('field_example') }} to temporarily suppress the printing
+ *   of a given child element.
+ * - attributes: HTML attributes for the containing element.
+ *   The attributes.class element may contain one or more of the following
+ *   classes:
+ *   - paragraphs: The current template type (also known as a "theming hook").
+ *   - paragraphs--type-[type]: The current paragraphs type. For example, if the paragraph is an
+ *     "Image" it would result in "paragraphs--type--image". Note that the machine
+ *     name will often be in a short form of the human readable label.
+ *   - paragraphs--view-mode--[view_mode]: The View Mode of the paragraph; for example, a
+ *     preview would result in: "paragraphs--view-mode--preview", and
+ *     default: "paragraphs--view-mode--default".
+ * - view_mode: View mode; for example, "preview" or "full".
+ * - logged_in: Flag for authenticated user status. Will be true when the
+ *   current user is a logged-in member.
+ * - is_admin: Flag for admin user status. Will be true when the current user
+ *   is an administrator.
+ *
+ * @see template_preprocess_paragraph()
+ *
+ * @ingroup themeable
+ */
+#}
+{{ attach_library('common_design_subtheme/gho-top-figures') }}
+{%
+  set classes = [
+    'paragraph',
+    'paragraph--type--' ~ paragraph.bundle|clean_class,
+    not paragraph.isPublished() ? 'paragraph--unpublished',
+    'gho-top-figures',
+    'content-width',
+  ]
+%}
+{% block paragraph %}
+  <div{{ attributes.addClass(classes) }}>
+    {% block content %}
+      {{ content }}
+    {% endblock %}
+  </div>
+{% endblock paragraph %}
diff --git a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--needs-and-requirements.html.twig b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig
similarity index 97%
rename from html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--needs-and-requirements.html.twig
rename to html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig
index 3b52d97a..84962867 100644
--- a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--needs-and-requirements.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig
@@ -1,7 +1,7 @@
 {#
 /**
  * @file
- * Theme implementation for a Needs and Requirements paragraph.
+ * Theme implementation for a Bottom Figure Row paragraph as "top figures".
  *
  * Overrides paragraphs/templates/paragraph.html.twig.
  *

From 43b63bcf0b514f5286076fd02e1e743de3988c19 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Thu, 18 Apr 2024 18:05:36 +0200
Subject: [PATCH 02/17] HPC-9466: Streamline paragraph form UI for editory,
 single place for status flag, always visible, move behavior plugin settings
 into horizontal tabs, this also removes the promoted behavior from a couple
 of paragraph types that don't need it, and it removes document_articles and
 document_chapter from article paragraphs

---
 ...lay.paragraph.achievement_list.default.yml | 68 ++++++++++++++++--
 ...display.paragraph.article_list.default.yml | 39 ++++++++++-
 ...ay.paragraph.facts_and_figures.default.yml | 51 ++++++++++++--
 ...play.paragraph.further_reading.default.yml | 36 +++++++++-
 ....paragraph.interactive_content.default.yml | 69 ++++++++++++++++---
 ...ty_form_display.paragraph.text.default.yml | 39 ++++++++++-
 ..._display.paragraph.top_figures.default.yml | 62 ++++++++++++++++-
 ...ay.paragraph.top_figures_small.default.yml | 62 ++++++++++++++++-
 ..._display.paragraph.top_figures.default.yml |  8 +++
 ...ay.paragraph.top_figures_small.default.yml |  8 +++
 ...ld.field.node.article.field_paragraphs.yml |  8 ++-
 ...ld.paragraph.top_figures.field_dataset.yml | 31 +++++++++
 ...agraph.top_figures_small.field_dataset.yml | 31 +++++++++
 ...ragraphs.paragraphs_type.photo_gallery.yml | 12 +---
 config/paragraphs.paragraphs_type.story.yml   | 12 +---
 ...paragraphs.paragraphs_type.sub_article.yml | 12 +---
 config/views.view.trash_nodes.yml             |  2 +
 .../paragraphs/Behavior/PromoteBehavior.php   |  1 +
 .../css/edit-form/paragraph_edit_form.css     |  5 ++
 .../custom/ncms_ui/css/frontend_styles.css    |  4 +-
 html/modules/custom/ncms_ui/css/ncms_gin.css  |  1 +
 .../custom/ncms_ui/ncms_ui.libraries.yml      |  4 ++
 html/modules/custom/ncms_ui/ncms_ui.module    | 24 ++++++-
 23 files changed, 523 insertions(+), 66 deletions(-)
 create mode 100644 config/field.field.paragraph.top_figures.field_dataset.yml
 create mode 100644 config/field.field.paragraph.top_figures_small.field_dataset.yml
 create mode 100644 html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css

diff --git a/config/core.entity_form_display.paragraph.achievement_list.default.yml b/config/core.entity_form_display.paragraph.achievement_list.default.yml
index c085d6b8..2c0e0baa 100755
--- a/config/core.entity_form_display.paragraph.achievement_list.default.yml
+++ b/config/core.entity_form_display.paragraph.achievement_list.default.yml
@@ -7,28 +7,84 @@ dependencies:
     - field.field.paragraph.achievement_list.field_text
     - paragraphs.paragraphs_type.achievement_list
   module:
+    - field_group
     - paragraphs
     - text
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_achievements
+        - group_caption
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_achievements:
+      children:
+        - field_achievements
+      label: Achievements
+      region: content
+      parent_name: group_tabs
+      weight: 6
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
+    group_caption:
+      children:
+        - field_text
+      label: Caption
+      region: content
+      parent_name: group_tabs
+      weight: 7
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
 id: paragraph.achievement_list.default
 targetEntityType: paragraph
 bundle: achievement_list
 mode: default
 content:
   field_achievements:
-    type: entity_reference_paragraphs
-    weight: 0
+    type: paragraphs
+    weight: 1
     region: content
     settings:
       title: Paragraph
       title_plural: Paragraphs
       edit_mode: open
+      closed_mode: summary
+      autocollapse: none
+      closed_mode_threshold: 0
       add_mode: dropdown
       form_display_mode: default
-      default_paragraph_type: ''
+      default_paragraph_type: achievement
+      features:
+        add_above: '0'
+        collapse_edit_all: collapse_edit_all
+        convert: '0'
+        duplicate: duplicate
     third_party_settings: {  }
   field_text:
     type: text_textarea
-    weight: 1
+    weight: 2
     region: content
     settings:
       rows: 5
@@ -36,13 +92,13 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 2
+    weight: 3
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   translation:
-    weight: 3
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
diff --git a/config/core.entity_form_display.paragraph.article_list.default.yml b/config/core.entity_form_display.paragraph.article_list.default.yml
index 28b933fb..12cdb53e 100755
--- a/config/core.entity_form_display.paragraph.article_list.default.yml
+++ b/config/core.entity_form_display.paragraph.article_list.default.yml
@@ -7,7 +7,40 @@ dependencies:
     - field.field.paragraph.article_list.field_title
     - paragraphs.paragraphs_type.article_list
   module:
+    - field_group
     - link
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_article_list
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_article_list:
+      children:
+        - field_title
+        - field_links
+      label: 'Article list'
+      region: content
+      parent_name: group_tabs
+      weight: 6
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
 id: paragraph.article_list.default
 targetEntityType: paragraph
 bundle: article_list
@@ -15,7 +48,7 @@ mode: default
 content:
   field_links:
     type: link_default
-    weight: 1
+    weight: 8
     region: content
     settings:
       placeholder_url: ''
@@ -23,7 +56,7 @@ content:
     third_party_settings: {  }
   field_title:
     type: string_textfield
-    weight: 0
+    weight: 7
     region: content
     settings:
       size: 60
@@ -31,7 +64,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 2
+    weight: 3
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.facts_and_figures.default.yml b/config/core.entity_form_display.paragraph.facts_and_figures.default.yml
index d279f3f8..b136b1da 100755
--- a/config/core.entity_form_display.paragraph.facts_and_figures.default.yml
+++ b/config/core.entity_form_display.paragraph.facts_and_figures.default.yml
@@ -7,27 +7,68 @@ dependencies:
     - field.field.paragraph.facts_and_figures.field_title
     - paragraphs.paragraphs_type.facts_and_figures
   module:
+    - field_group
     - paragraphs
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_facts_and_figures
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_facts_and_figures:
+      children:
+        - field_title
+        - field_paragraphs
+      label: 'Facts and figures'
+      region: content
+      parent_name: group_tabs
+      weight: 6
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
 id: paragraph.facts_and_figures.default
 targetEntityType: paragraph
 bundle: facts_and_figures
 mode: default
 content:
   field_paragraphs:
-    type: entity_reference_paragraphs
-    weight: 1
+    type: paragraphs
+    weight: 2
     region: content
     settings:
       title: 'Fact and figure'
       title_plural: 'Facts and figures'
-      edit_mode: preview
+      edit_mode: closed
+      closed_mode: preview
+      autocollapse: none
+      closed_mode_threshold: 0
       add_mode: button
       form_display_mode: default
       default_paragraph_type: image_with_text
+      features:
+        add_above: '0'
+        collapse_edit_all: collapse_edit_all
+        convert: '0'
+        duplicate: duplicate
     third_party_settings: {  }
   field_title:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
@@ -35,7 +76,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 2
+    weight: 3
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.further_reading.default.yml b/config/core.entity_form_display.paragraph.further_reading.default.yml
index 3382f94a..de343120 100755
--- a/config/core.entity_form_display.paragraph.further_reading.default.yml
+++ b/config/core.entity_form_display.paragraph.further_reading.default.yml
@@ -6,7 +6,39 @@ dependencies:
     - field.field.paragraph.further_reading.field_links
     - paragraphs.paragraphs_type.further_reading
   module:
+    - field_group
     - gho_fields
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_links
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_links:
+      children:
+        - field_links
+      label: Links
+      region: content
+      parent_name: group_tabs
+      weight: 5
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
 id: paragraph.further_reading.default
 targetEntityType: paragraph
 bundle: further_reading
@@ -14,7 +46,7 @@ mode: default
 content:
   field_links:
     type: gho_further_reading_link
-    weight: 0
+    weight: 1
     region: content
     settings:
       placeholder_url: 'https://example.com'
@@ -22,7 +54,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 1
+    weight: 2
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.interactive_content.default.yml b/config/core.entity_form_display.paragraph.interactive_content.default.yml
index 952496a8..122e0eb3 100755
--- a/config/core.entity_form_display.paragraph.interactive_content.default.yml
+++ b/config/core.entity_form_display.paragraph.interactive_content.default.yml
@@ -13,9 +13,62 @@ dependencies:
     - field.field.paragraph.interactive_content.field_type
     - paragraphs.paragraphs_type.interactive_content
   module:
+    - field_group
     - gho_fields
     - link
     - media_library
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_interactive_content
+        - group_source
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_interactive_content:
+      children:
+        - field_full_width
+        - field_title
+        - field_link
+        - field_image
+        - field_embed_code
+        - field_show_interactive_content
+      label: 'Interactive content'
+      region: content
+      parent_name: group_tabs
+      weight: 12
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
+    group_source:
+      children:
+        - field_dataset
+      label: Source
+      region: content
+      parent_name: group_tabs
+      weight: 13
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
 id: paragraph.interactive_content.default
 targetEntityType: paragraph
 bundle: interactive_content
@@ -23,7 +76,7 @@ mode: default
 content:
   field_dataset:
     type: gho_dataset_link
-    weight: 6
+    weight: 7
     region: content
     settings:
       placeholder_url: 'Ex: https://humdata.org/dataset'
@@ -31,7 +84,7 @@ content:
     third_party_settings: {  }
   field_embed_code:
     type: gho_interactive_content
-    weight: 4
+    weight: 5
     region: content
     settings:
       rows: 5
@@ -39,21 +92,21 @@ content:
     third_party_settings: {  }
   field_full_width:
     type: boolean_checkbox
-    weight: 0
+    weight: 1
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_image:
     type: media_library_widget
-    weight: 3
+    weight: 4
     region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
   field_link:
     type: link_default
-    weight: 2
+    weight: 3
     region: content
     settings:
       placeholder_url: 'Ex: https://datawrapper.de/content-page'
@@ -61,14 +114,14 @@ content:
     third_party_settings: {  }
   field_show_interactive_content:
     type: boolean_checkbox
-    weight: 5
+    weight: 6
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_title:
     type: string_textfield
-    weight: 1
+    weight: 2
     region: content
     settings:
       size: 60
@@ -76,7 +129,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 7
+    weight: 8
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.text.default.yml b/config/core.entity_form_display.paragraph.text.default.yml
index 25c405ff..5947d89e 100755
--- a/config/core.entity_form_display.paragraph.text.default.yml
+++ b/config/core.entity_form_display.paragraph.text.default.yml
@@ -8,7 +8,40 @@ dependencies:
     - paragraphs.paragraphs_type.text
   module:
     - allowed_formats
+    - field_group
     - text
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_content
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_content:
+      children:
+        - field_text
+        - field_footnotes
+      label: Content
+      region: content
+      parent_name: group_tabs
+      weight: 6
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
 id: paragraph.text.default
 targetEntityType: paragraph
 bundle: text
@@ -16,7 +49,7 @@ mode: default
 content:
   field_footnotes:
     type: text_textarea
-    weight: 1
+    weight: 2
     region: content
     settings:
       rows: 5
@@ -27,7 +60,7 @@ content:
         hide_guidelines: '1'
   field_text:
     type: text_textarea
-    weight: 0
+    weight: 1
     region: content
     settings:
       rows: 5
@@ -38,7 +71,7 @@ content:
         hide_guidelines: '1'
   status:
     type: boolean_checkbox
-    weight: 2
+    weight: 3
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.top_figures.default.yml b/config/core.entity_form_display.paragraph.top_figures.default.yml
index 312acdf2..91cca9e8 100644
--- a/config/core.entity_form_display.paragraph.top_figures.default.yml
+++ b/config/core.entity_form_display.paragraph.top_figures.default.yml
@@ -3,18 +3,76 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.top_figures.field_dataset
     - field.field.paragraph.top_figures.field_figures
     - paragraphs.paragraphs_type.top_figures
   module:
     - custom_field
+    - field_group
+    - gho_fields
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_figures
+        - group_source
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_figures:
+      children:
+        - field_figures
+      label: Figures
+      region: content
+      parent_name: group_tabs
+      weight: 3
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
+    group_source:
+      children:
+        - field_dataset
+      label: Source
+      region: content
+      parent_name: group_tabs
+      weight: 4
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
 id: paragraph.top_figures.default
 targetEntityType: paragraph
 bundle: top_figures
 mode: default
 content:
+  field_dataset:
+    type: gho_dataset_link
+    weight: 1
+    region: content
+    settings:
+      placeholder_url: 'https://example.com/link-to-data'
+      placeholder_title: 'Ex: Office for the Coordination of Humanitarian Affairs'
+    third_party_settings: {  }
   field_figures:
     type: custom_flex
-    weight: 0
+    weight: 2
     region: content
     settings:
       label: false
@@ -28,7 +86,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 1
+    weight: 2
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.top_figures_small.default.yml b/config/core.entity_form_display.paragraph.top_figures_small.default.yml
index 7ca4fa33..b1e57d9d 100644
--- a/config/core.entity_form_display.paragraph.top_figures_small.default.yml
+++ b/config/core.entity_form_display.paragraph.top_figures_small.default.yml
@@ -3,18 +3,76 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.top_figures_small.field_dataset
     - field.field.paragraph.top_figures_small.field_figures
     - paragraphs.paragraphs_type.top_figures_small
   module:
     - custom_field
+    - field_group
+    - gho_fields
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_figures
+        - group_source
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_figures:
+      children:
+        - field_figures
+      label: Figures
+      region: content
+      parent_name: group_tabs
+      weight: 5
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
+    group_source:
+      children:
+        - field_dataset
+      label: Source
+      region: content
+      parent_name: group_tabs
+      weight: 6
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
 id: paragraph.top_figures_small.default
 targetEntityType: paragraph
 bundle: top_figures_small
 mode: default
 content:
+  field_dataset:
+    type: gho_dataset_link
+    weight: 3
+    region: content
+    settings:
+      placeholder_url: 'https://example.com/link-to-data'
+      placeholder_title: 'Ex: Office for the Coordination of Humanitarian Affairs'
+    third_party_settings: {  }
   field_figures:
     type: custom_flex
-    weight: 0
+    weight: 1
     region: content
     settings:
       label: false
@@ -28,7 +86,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 1
+    weight: 2
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_view_display.paragraph.top_figures.default.yml b/config/core.entity_view_display.paragraph.top_figures.default.yml
index baeec5b2..2872922b 100644
--- a/config/core.entity_view_display.paragraph.top_figures.default.yml
+++ b/config/core.entity_view_display.paragraph.top_figures.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.top_figures.field_dataset
     - field.field.paragraph.top_figures.field_figures
     - paragraphs.paragraphs_type.top_figures
   module:
@@ -12,6 +13,13 @@ targetEntityType: paragraph
 bundle: top_figures
 mode: default
 content:
+  field_dataset:
+    type: gho_dataset_link
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
   field_figures:
     type: gho_figures
     label: hidden
diff --git a/config/core.entity_view_display.paragraph.top_figures_small.default.yml b/config/core.entity_view_display.paragraph.top_figures_small.default.yml
index d15197b2..6d1236c7 100644
--- a/config/core.entity_view_display.paragraph.top_figures_small.default.yml
+++ b/config/core.entity_view_display.paragraph.top_figures_small.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.top_figures_small.field_dataset
     - field.field.paragraph.top_figures_small.field_figures
     - paragraphs.paragraphs_type.top_figures_small
   module:
@@ -12,6 +13,13 @@ targetEntityType: paragraph
 bundle: top_figures_small
 mode: default
 content:
+  field_dataset:
+    type: gho_dataset_link
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
   field_figures:
     type: gho_figures
     label: hidden
diff --git a/config/field.field.node.article.field_paragraphs.yml b/config/field.field.node.article.field_paragraphs.yml
index c12a1457..ab32fee4 100755
--- a/config/field.field.node.article.field_paragraphs.yml
+++ b/config/field.field.node.article.field_paragraphs.yml
@@ -7,6 +7,8 @@ dependencies:
     - node.type.article
     - paragraphs.paragraphs_type.achievement
     - paragraphs.paragraphs_type.article_card_list
+    - paragraphs.paragraphs_type.document_articles
+    - paragraphs.paragraphs_type.document_chapter
   module:
     - entity_reference_revisions
     - field_config_cardinality
@@ -33,6 +35,8 @@ settings:
     target_bundles:
       achievement: achievement
       article_card_list: article_card_list
+      document_articles: document_articles
+      document_chapter: document_chapter
     negate: 1
     target_bundles_drag_drop:
       achievement:
@@ -52,10 +56,10 @@ settings:
         enabled: false
       document_articles:
         weight: -31
-        enabled: false
+        enabled: true
       document_chapter:
         weight: -29
-        enabled: false
+        enabled: true
       download_button:
         weight: -32
         enabled: false
diff --git a/config/field.field.paragraph.top_figures.field_dataset.yml b/config/field.field.paragraph.top_figures.field_dataset.yml
new file mode 100644
index 00000000..e0624529
--- /dev/null
+++ b/config/field.field.paragraph.top_figures.field_dataset.yml
@@ -0,0 +1,31 @@
+uuid: 45ec8d00-c54d-4a33-89bf-b77225c91b7d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_dataset
+    - paragraphs.paragraphs_type.top_figures
+  module:
+    - field_config_cardinality
+    - link
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '1'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
+id: paragraph.top_figures.field_dataset
+field_name: field_dataset
+entity_type: paragraph
+bundle: top_figures
+label: Source
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  title: 2
+  link_type: 16
+field_type: link
diff --git a/config/field.field.paragraph.top_figures_small.field_dataset.yml b/config/field.field.paragraph.top_figures_small.field_dataset.yml
new file mode 100644
index 00000000..504d73c4
--- /dev/null
+++ b/config/field.field.paragraph.top_figures_small.field_dataset.yml
@@ -0,0 +1,31 @@
+uuid: 65ea473d-f3d1-4de7-aa82-26fbea17572d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_dataset
+    - paragraphs.paragraphs_type.top_figures_small
+  module:
+    - field_config_cardinality
+    - link
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '1'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
+id: paragraph.top_figures_small.field_dataset
+field_name: field_dataset
+entity_type: paragraph
+bundle: top_figures_small
+label: Source
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  title: 2
+  link_type: 16
+field_type: link
diff --git a/config/paragraphs.paragraphs_type.photo_gallery.yml b/config/paragraphs.paragraphs_type.photo_gallery.yml
index ff3eff6a..25a6d228 100755
--- a/config/paragraphs.paragraphs_type.photo_gallery.yml
+++ b/config/paragraphs.paragraphs_type.photo_gallery.yml
@@ -1,18 +1,10 @@
 uuid: c5e5598e-d4e8-4eb7-a97a-79a1569b4030
 langcode: en
 status: true
-dependencies:
-  module:
-    - layout_paragraphs
-    - ncms_publisher
+dependencies: {  }
 id: photo_gallery
 label: 'Photo Gallery'
 icon_uuid: null
 icon_default: null
 description: 'A photo gallery with up to 4 images.'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
-  promoted_behavior:
-    enabled: true
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.story.yml b/config/paragraphs.paragraphs_type.story.yml
index de9909c9..71688ee7 100755
--- a/config/paragraphs.paragraphs_type.story.yml
+++ b/config/paragraphs.paragraphs_type.story.yml
@@ -1,18 +1,10 @@
 uuid: e4c10110-fb80-4288-91ec-f08bdc4b0beb
 langcode: en
 status: true
-dependencies:
-  module:
-    - layout_paragraphs
-    - ncms_publisher
+dependencies: {  }
 id: story
 label: Story
 icon_uuid: null
 icon_default: null
 description: 'A story (ex: a story from the field).'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
-  promoted_behavior:
-    enabled: true
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.sub_article.yml b/config/paragraphs.paragraphs_type.sub_article.yml
index b3d57b2e..b0384668 100755
--- a/config/paragraphs.paragraphs_type.sub_article.yml
+++ b/config/paragraphs.paragraphs_type.sub_article.yml
@@ -1,18 +1,10 @@
 uuid: aad0adc9-ea9e-44ae-8690-5eaaf50002d3
 langcode: en
 status: true
-dependencies:
-  module:
-    - layout_paragraphs
-    - ncms_publisher
+dependencies: {  }
 id: sub_article
 label: Sub-article
 icon_uuid: null
 icon_default: null
 description: 'A paragraph showing a sub-article.'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
-  promoted_behavior:
-    enabled: true
+behavior_plugins: {  }
diff --git a/config/views.view.trash_nodes.yml b/config/views.view.trash_nodes.yml
index 483aad6b..02c81010 100644
--- a/config/views.view.trash_nodes.yml
+++ b/config/views.view.trash_nodes.yml
@@ -719,6 +719,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags:
@@ -763,6 +764,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags:
diff --git a/html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php b/html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
index 0613fe6a..c856cb8f 100644
--- a/html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
+++ b/html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
@@ -37,6 +37,7 @@ public function buildBehaviorForm(ParagraphInterface $paragraph, array &$form, F
     $form['promoted'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Promoted'),
+      '#description' => $this->t('If this is checked, this paragraph will be marked as promoted. This allows external consumers to present this content differently.'),
       '#default_value' => $paragraph->getBehaviorSetting($this->getPluginId(), 'promoted', FALSE),
     ];
     return $form;
diff --git a/html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css b/html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css
new file mode 100644
index 00000000..9bcf915c
--- /dev/null
+++ b/html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css
@@ -0,0 +1,5 @@
+form.layout-paragraphs-component-form > .field--name-status {
+  position: absolute;
+  bottom: 0;
+  z-index: 10;
+}
diff --git a/html/modules/custom/ncms_ui/css/frontend_styles.css b/html/modules/custom/ncms_ui/css/frontend_styles.css
index 40da9ac2..53023d72 100644
--- a/html/modules/custom/ncms_ui/css/frontend_styles.css
+++ b/html/modules/custom/ncms_ui/css/frontend_styles.css
@@ -129,7 +129,7 @@
 }
 
 /* the label, e.g. "Separator: full" */
-.field--name-field-separator-size {
+.paragraph--view-mode--preview .field--name-field-separator-size {
   position: relative;
   text-align: center;
   z-index: 2;
@@ -137,7 +137,7 @@
   margin: 0 auto;
   background: #fcfcfa;
 }
-.field--name-field-separator-size::before {
+.paragraph--view-mode--preview .field--name-field-separator-size::before {
   content: 'Separator: ';
 }
 
diff --git a/html/modules/custom/ncms_ui/css/ncms_gin.css b/html/modules/custom/ncms_ui/css/ncms_gin.css
index 96427a2c..3da1a957 100644
--- a/html/modules/custom/ncms_ui/css/ncms_gin.css
+++ b/html/modules/custom/ncms_ui/css/ncms_gin.css
@@ -83,6 +83,7 @@ table {
 /* Improvements for the ui dialog (modal). */
 .ui-dialog.lpb-dialog {
   width: auto !important;
+  min-width: 30rem !important;
 }
 .ui-dialog .ui-widget-content.ui-dialog-content {
   padding: 1rem;
diff --git a/html/modules/custom/ncms_ui/ncms_ui.libraries.yml b/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
index e78b378b..fb58c851 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
+++ b/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
@@ -27,6 +27,10 @@ document_edit_form:
     component:
       css/edit-form/content_edit_form.css: {}
       css/edit-form/document_edit_form.css: {}
+paragraph_edit_form:
+  css:
+    component:
+      css/edit-form/paragraph_edit_form.css: {}
 revisions:
   css:
     component:
diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module
index 615f6dde..1df1b0f9 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.module
+++ b/html/modules/custom/ncms_ui/ncms_ui.module
@@ -338,8 +338,30 @@ function ncms_ui_form_node_preview_form_select_alter(&$form, FormStateInterface
  * Implements hook_form_FORM_ID_alter().
  */
 function ncms_ui_form_layout_paragraphs_component_form_alter(&$form, FormStateInterface $form_state) {
-  // Don't trigger "Required" messages when canceling the add/eddit form.
+  // Don't trigger "Required" messages when canceling the add/edit form.
   $form['actions']['cancel']['#limit_validation_errors'] = [];
+
+  // Move the behavior plugin from a stand-alone fieldset into existing field
+  // groups.
+  if (!empty($form['#fieldgroups']) && !empty($form['behavior_plugins'])) {
+    /** @var \Drupal\layout_paragraphs\Form\EditComponentForm $form_object */
+    $form_object = $form_state->getFormObject();
+    $form['behavior_plugins']['#parents'] = ['behavior_plugins'];
+    $form['behavior_plugins'] = $form_object->behaviorPluginsForm($form['behavior_plugins'], $form_state, $form);
+    unset($form['behavior_plugins']['#process']);
+
+    $group = clone end($form['#fieldgroups']);
+    $group->children = ['behavior_plugins'];
+    $group->label = t('Additional settings');
+    $group->format_settings['formatter'] = 'close';
+    $group->weight = $group->weight + 1;
+    $group->group_name = 'group_behaviors';
+    $form['#fieldgroups'][$group->group_name] = $group;
+    $form['#group_children']['behavior_plugins'] = 'group_behaviors';
+  }
+
+  // Add our library to improve the display.
+  $form['#attached']['library'][] = 'ncms_ui/paragraph_edit_form';
 }
 
 /**

From 84987ae9b7db28a77b584a25ee9bd0c4ebf8f01f Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Mon, 22 Apr 2024 15:00:00 +0200
Subject: [PATCH 03/17] HPC-9466: Create third party settings for paragraphs,
 handle category placement and disabled control there, change the UI for
 paragraph selection to use a category-based screen, consolidate css styles
 for top figures to get rid of NaR at some point, mark migrated paragraphs as
 replacing the old ones so that HA can react to that and place the new
 elements automatically, some more minor changes, e.g. validate the embed code
 on interactive content paragraphs

---
 composer.patches.json                         |   4 +
 ...lay.paragraph.document_chapter.default.yml |   3 +-
 ....paragraph.interactive_content.default.yml |  48 +++++-
 config/core.extension.yml                     |   1 +
 ...h.interactive_content.field_full_width.yml |  11 +-
 ...agraph.interactive_content.field_image.yml |  12 +-
 ...raphs.paragraphs_type.achievement_list.yml |   9 +-
 ...aragraphs.paragraphs_type.article_list.yml |   9 +-
 ...aphs.paragraphs_type.bottom_figure_row.yml |   5 +
 ...graphs.paragraphs_type.download_button.yml |  11 +-
 ...aphs.paragraphs_type.facts_and_figures.yml |   9 +-
 ...graphs.paragraphs_type.further_reading.yml |   9 +-
 config/paragraphs.paragraphs_type.heading.yml |  11 +-
 ...graphs.paragraphs_type.image_with_text.yml |  11 +-
 ...paragraphs.paragraphs_type.infographic.yml |  11 +-
 ...hs.paragraphs_type.interactive_content.yml |   9 +-
 ...phs_type.interactive_content_2_columns.yml |   5 +
 ...ragraphs.paragraphs_type.photo_gallery.yml |   8 +-
 .../paragraphs.paragraphs_type.separator.yml  |  11 +-
 config/paragraphs.paragraphs_type.story.yml   |   8 +-
 ...paragraphs.paragraphs_type.sub_article.yml |   8 +-
 config/paragraphs.paragraphs_type.text.yml    |   9 +-
 ...paragraphs.paragraphs_type.top_figures.yml |   5 +
 ...aphs.paragraphs_type.top_figures_small.yml |   5 +
 .../custom/gho_fields/gho_fields.deploy.php   |   4 +
 .../DataProducer/EntityConfiguration.php      |   3 +
 .../config/schema/ncms_paragraphs.schema.yml  |  13 ++
 .../ncms_paragraphs/css/component_menu.css    |  16 ++
 .../css/layout_paragraphs.css                 |   0
 .../css/paragraph_edit_form.css               |  41 +++++
 .../ncms_paragraphs/ncms_paragraphs.info.yml  |   8 +
 .../ncms_paragraphs.libraries.yml             |  12 ++
 .../ncms_paragraphs/ncms_paragraphs.module    | 111 +++++++++++++
 .../ncms_paragraphs.services.yml              |   7 +
 .../ncms_paragraphs/src/ComponentMenu.php     | 156 ++++++++++++++++++
 .../src/Entity/NcmsParagraphBase.php          |  18 ++
 .../src/Entity/NcmsParagraphInterface.php     |  18 ++
 .../Entity/Paragraph/InteractiveContent.php   |  36 ++++
 .../src/Helpers/StringHelper.php              |  34 ++++
 .../src/ParagraphsTypeSettings.php            |  87 ++++++++++
 .../src/Traits/VerticalTabsTrait.php          |  96 +++++++++++
 ...aragraphs-builder-component-menu.html.twig |  15 ++
 .../css/edit-form/paragraph_edit_form.css     |   5 -
 .../custom/ncms_ui/css/gin_entity_browser.css |   7 +
 .../custom/ncms_ui/ncms_ui.libraries.yml      |   4 -
 html/modules/custom/ncms_ui/ncms_ui.module    |  50 ------
 .../common_design_subtheme.libraries.yml      |   1 +
 .../components/gho-top-figures/README.md      |   5 +
 .../gho-top-figures--small.css                |  78 +++++++++
 .../gho-top-figures/gho-top-figures.css       | 120 +++++++-------
 .../gho-figures-formatter--large.html.twig    |   7 +-
 ...field-dataset--top-figures-small.html.twig |   5 +
 ...raph--field-dataset--top-figures.html.twig |   5 +
 .../paragraph--top-figures-small.html.twig    |   1 +
 .../paragraph--top-figures.html.twig          |   4 +-
 55 files changed, 1013 insertions(+), 186 deletions(-)
 create mode 100644 html/modules/custom/ncms_paragraphs/config/schema/ncms_paragraphs.schema.yml
 create mode 100644 html/modules/custom/ncms_paragraphs/css/component_menu.css
 rename html/modules/custom/{ncms_ui => ncms_paragraphs}/css/layout_paragraphs.css (100%)
 create mode 100644 html/modules/custom/ncms_paragraphs/css/paragraph_edit_form.css
 create mode 100644 html/modules/custom/ncms_paragraphs/ncms_paragraphs.info.yml
 create mode 100644 html/modules/custom/ncms_paragraphs/ncms_paragraphs.libraries.yml
 create mode 100644 html/modules/custom/ncms_paragraphs/ncms_paragraphs.module
 create mode 100644 html/modules/custom/ncms_paragraphs/ncms_paragraphs.services.yml
 create mode 100644 html/modules/custom/ncms_paragraphs/src/ComponentMenu.php
 create mode 100644 html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php
 create mode 100644 html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php
 create mode 100644 html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/InteractiveContent.php
 create mode 100644 html/modules/custom/ncms_paragraphs/src/Helpers/StringHelper.php
 create mode 100644 html/modules/custom/ncms_paragraphs/src/ParagraphsTypeSettings.php
 create mode 100644 html/modules/custom/ncms_paragraphs/src/Traits/VerticalTabsTrait.php
 create mode 100644 html/modules/custom/ncms_paragraphs/templates/layout-paragraphs-builder-component-menu.html.twig
 delete mode 100644 html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css
 create mode 100644 html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures--small.css
 create mode 100644 html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures-small.html.twig
 create mode 100644 html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures.html.twig

diff --git a/composer.patches.json b/composer.patches.json
index 2f132011..5401ef19 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -25,6 +25,10 @@
         "drupal/gin": {
             "Issue #3342513: Ajax behaviour on entity edit form action buttons can break": "https://www.drupal.org/files/issues/2024-02-02/3342513-entity-edit-form-update-ajax-ids-12.patch"
         },
+        "drupal/layout_paragraphs": {
+            "Issue #3265794: Modal form actions broken if subform has validation errors or certain AJAX callbacks": "https://git.drupalcode.org/project/layout_paragraphs/-/commit/9e6ce29756e7a44d1644f77a9606d3b598f67b5d.patch",
+            "Issue #3442062: Make selector less greedy, only look at the form actions": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/160.patch"
+        },
         "drupal/maintenance200": {
             "Issue #3288424: Automated Drupal 10 compatibility fixes": "./patches/maintenance200-drupal-10-compatibility.patch"
         },
diff --git a/config/core.entity_form_display.paragraph.document_chapter.default.yml b/config/core.entity_form_display.paragraph.document_chapter.default.yml
index e62db610..68f46b8f 100644
--- a/config/core.entity_form_display.paragraph.document_chapter.default.yml
+++ b/config/core.entity_form_display.paragraph.document_chapter.default.yml
@@ -51,7 +51,6 @@ third_party_settings:
         - group_title
         - field_summary
         - field_tags
-        - status
         - field_hide_from_navigation
       label: 'Chapter properties'
       region: content
@@ -149,7 +148,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 7
+    weight: 1
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_form_display.paragraph.interactive_content.default.yml b/config/core.entity_form_display.paragraph.interactive_content.default.yml
index 122e0eb3..90ca4278 100755
--- a/config/core.entity_form_display.paragraph.interactive_content.default.yml
+++ b/config/core.entity_form_display.paragraph.interactive_content.default.yml
@@ -22,7 +22,9 @@ third_party_settings:
     group_tabs:
       children:
         - group_interactive_content
+        - group_fallback_image
         - group_source
+        - group_settings
       label: Tabs
       region: content
       parent_name: ''
@@ -36,12 +38,9 @@ third_party_settings:
         width_breakpoint: 640
     group_interactive_content:
       children:
-        - field_full_width
         - field_title
         - field_link
-        - field_image
         - field_embed_code
-        - field_show_interactive_content
       label: 'Interactive content'
       region: content
       parent_name: group_tabs
@@ -60,6 +59,22 @@ third_party_settings:
       label: Source
       region: content
       parent_name: group_tabs
+      weight: 14
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
+    group_fallback_image:
+      children:
+        - field_show_interactive_content
+        - field_image
+      label: 'Fallback image'
+      region: content
+      parent_name: group_tabs
       weight: 13
       format_type: tab
       format_settings:
@@ -69,6 +84,21 @@ third_party_settings:
         formatter: closed
         description: ''
         required_fields: true
+    group_settings:
+      children:
+        - field_full_width
+      label: 'Additional settings'
+      region: content
+      parent_name: group_tabs
+      weight: 15
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
 id: paragraph.interactive_content.default
 targetEntityType: paragraph
 bundle: interactive_content
@@ -76,7 +106,7 @@ mode: default
 content:
   field_dataset:
     type: gho_dataset_link
-    weight: 7
+    weight: 14
     region: content
     settings:
       placeholder_url: 'Ex: https://humdata.org/dataset'
@@ -84,7 +114,7 @@ content:
     third_party_settings: {  }
   field_embed_code:
     type: gho_interactive_content
-    weight: 5
+    weight: 4
     region: content
     settings:
       rows: 5
@@ -92,14 +122,14 @@ content:
     third_party_settings: {  }
   field_full_width:
     type: boolean_checkbox
-    weight: 1
+    weight: 15
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_image:
     type: media_library_widget
-    weight: 4
+    weight: 6
     region: content
     settings:
       media_types: {  }
@@ -114,7 +144,7 @@ content:
     third_party_settings: {  }
   field_show_interactive_content:
     type: boolean_checkbox
-    weight: 6
+    weight: 5
     region: content
     settings:
       display_label: true
@@ -129,7 +159,7 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 8
+    weight: 1
     region: content
     settings:
       display_label: true
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 92f238f3..b3d78eeb 100755
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -72,6 +72,7 @@ module:
   monitoring: 0
   mysql: 0
   ncms_graphql: 0
+  ncms_paragraphs: 0
   ncms_publisher: 0
   ncms_ui: 0
   node: 0
diff --git a/config/field.field.paragraph.interactive_content.field_full_width.yml b/config/field.field.paragraph.interactive_content.field_full_width.yml
index 896c58ef..13d039ff 100755
--- a/config/field.field.paragraph.interactive_content.field_full_width.yml
+++ b/config/field.field.paragraph.interactive_content.field_full_width.yml
@@ -5,12 +5,21 @@ dependencies:
   config:
     - field.storage.paragraph.field_full_width
     - paragraphs.paragraphs_type.interactive_content
+  module:
+    - field_config_cardinality
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '1'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
 id: paragraph.interactive_content.field_full_width
 field_name: field_full_width
 entity_type: paragraph
 bundle: interactive_content
 label: 'Display at full width?'
-description: ''
+description: 'If checked, the interactive content will be shown at full-width. Otherwise it will be restricted to same width as the surrounding text content.'
 required: false
 translatable: true
 default_value:
diff --git a/config/field.field.paragraph.interactive_content.field_image.yml b/config/field.field.paragraph.interactive_content.field_image.yml
index e0f1b3e6..ee2f6169 100755
--- a/config/field.field.paragraph.interactive_content.field_image.yml
+++ b/config/field.field.paragraph.interactive_content.field_image.yml
@@ -6,11 +6,20 @@ dependencies:
     - field.storage.paragraph.field_image
     - media.type.image
     - paragraphs.paragraphs_type.interactive_content
+  module:
+    - field_config_cardinality
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '1'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
 id: paragraph.interactive_content.field_image
 field_name: field_image
 entity_type: paragraph
 bundle: interactive_content
-label: Thumbnail
+label: 'Fallback image'
 description: "Image representing the content. When clicked it will redirect to the interactive content's page."
 required: false
 translatable: true
@@ -23,6 +32,7 @@ settings:
       image: image
     sort:
       field: _none
+      direction: ASC
     auto_create: false
     auto_create_bundle: ''
 field_type: entity_reference
diff --git a/config/paragraphs.paragraphs_type.achievement_list.yml b/config/paragraphs.paragraphs_type.achievement_list.yml
index 3a6e5020..e61d80de 100755
--- a/config/paragraphs.paragraphs_type.achievement_list.yml
+++ b/config/paragraphs.paragraphs_type.achievement_list.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: list
+    disabled: 0
 id: achievement_list
 label: 'Achievement list'
 icon_uuid: null
 icon_default: null
 description: 'A list of Achievements with an optional caption.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.article_list.yml b/config/paragraphs.paragraphs_type.article_list.yml
index 576e365f..de997bff 100755
--- a/config/paragraphs.paragraphs_type.article_list.yml
+++ b/config/paragraphs.paragraphs_type.article_list.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: list
+    disabled: 0
 id: article_list
 label: 'Article list'
 icon_uuid: null
 icon_default: null
 description: 'A list of links to articles with an optional title.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.bottom_figure_row.yml b/config/paragraphs.paragraphs_type.bottom_figure_row.yml
index 34ee6cf8..13df9b4d 100755
--- a/config/paragraphs.paragraphs_type.bottom_figure_row.yml
+++ b/config/paragraphs.paragraphs_type.bottom_figure_row.yml
@@ -3,8 +3,13 @@ langcode: en
 status: true
 dependencies:
   module:
+    - ncms_paragraphs
     - ncms_publisher
     - paragraphs_viewmode
+third_party_settings:
+  ncms_paragraphs:
+    category: content
+    disabled: 1
 id: bottom_figure_row
 label: 'Bottom figure row (deprecated)'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.download_button.yml b/config/paragraphs.paragraphs_type.download_button.yml
index fdba0d77..853c4702 100755
--- a/config/paragraphs.paragraphs_type.download_button.yml
+++ b/config/paragraphs.paragraphs_type.download_button.yml
@@ -3,13 +3,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: misc
+    disabled: 0
 id: download_button
 label: 'Download button'
 icon_uuid: null
 icon_default: null
 description: 'A button that points to a document somewhere on the internet.'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.facts_and_figures.yml b/config/paragraphs.paragraphs_type.facts_and_figures.yml
index a0f79857..fbb318b0 100755
--- a/config/paragraphs.paragraphs_type.facts_and_figures.yml
+++ b/config/paragraphs.paragraphs_type.facts_and_figures.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: list
+    disabled: 0
 id: facts_and_figures
 label: 'Facts and figures'
 icon_uuid: null
 icon_default: null
 description: 'A list of facts and figures composed of images with a text.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.further_reading.yml b/config/paragraphs.paragraphs_type.further_reading.yml
index fdc2d6e6..722c207e 100755
--- a/config/paragraphs.paragraphs_type.further_reading.yml
+++ b/config/paragraphs.paragraphs_type.further_reading.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: misc
+    disabled: false
 id: further_reading
 label: 'Further reading'
 icon_uuid: null
 icon_default: null
 description: 'A list of links to futher information related to the topics of the article.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.heading.yml b/config/paragraphs.paragraphs_type.heading.yml
index 385be458..bc41c0e3 100755
--- a/config/paragraphs.paragraphs_type.heading.yml
+++ b/config/paragraphs.paragraphs_type.heading.yml
@@ -3,13 +3,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: content
+    disabled: 0
 id: heading
 label: Heading
 icon_uuid: null
 icon_default: null
 description: 'A generic heading.'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.image_with_text.yml b/config/paragraphs.paragraphs_type.image_with_text.yml
index 4635d01f..4c592163 100755
--- a/config/paragraphs.paragraphs_type.image_with_text.yml
+++ b/config/paragraphs.paragraphs_type.image_with_text.yml
@@ -3,13 +3,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: media
+    disabled: 0
 id: image_with_text
 label: 'Image with text'
 icon_uuid: null
 icon_default: null
 description: 'An image with a text.'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.infographic.yml b/config/paragraphs.paragraphs_type.infographic.yml
index 2bca4b61..d3ba2c73 100644
--- a/config/paragraphs.paragraphs_type.infographic.yml
+++ b/config/paragraphs.paragraphs_type.infographic.yml
@@ -3,13 +3,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: media
+    disabled: 0
 id: infographic
 label: Infographic
 icon_uuid: null
 icon_default: null
 description: 'An infographic media'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.interactive_content.yml b/config/paragraphs.paragraphs_type.interactive_content.yml
index fd57a7db..b3418e61 100755
--- a/config/paragraphs.paragraphs_type.interactive_content.yml
+++ b/config/paragraphs.paragraphs_type.interactive_content.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: widget
+    disabled: 0
 id: interactive_content
 label: 'Interactive content'
 icon_uuid: null
 icon_default: null
 description: 'Interactive content like an infographic, a map or a table.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml b/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml
index cafdf715..0238e291 100644
--- a/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml
+++ b/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml
@@ -4,6 +4,11 @@ status: true
 dependencies:
   module:
     - layout_paragraphs
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: widget
+    disabled: 0
 id: interactive_content_2_columns
 label: 'Interactive content (2 columns)'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.photo_gallery.yml b/config/paragraphs.paragraphs_type.photo_gallery.yml
index 25a6d228..c56ae89d 100755
--- a/config/paragraphs.paragraphs_type.photo_gallery.yml
+++ b/config/paragraphs.paragraphs_type.photo_gallery.yml
@@ -1,7 +1,13 @@
 uuid: c5e5598e-d4e8-4eb7-a97a-79a1569b4030
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: media
+    disabled: 0
 id: photo_gallery
 label: 'Photo Gallery'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.separator.yml b/config/paragraphs.paragraphs_type.separator.yml
index a061d9cf..94917d32 100755
--- a/config/paragraphs.paragraphs_type.separator.yml
+++ b/config/paragraphs.paragraphs_type.separator.yml
@@ -3,13 +3,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: misc
+    disabled: 0
 id: separator
 label: Separator
 icon_uuid: null
 icon_default: null
 description: 'A horizontal rule separating two sections of content.'
-behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
+behavior_plugins: {  }
diff --git a/config/paragraphs.paragraphs_type.story.yml b/config/paragraphs.paragraphs_type.story.yml
index 71688ee7..8aeaec41 100755
--- a/config/paragraphs.paragraphs_type.story.yml
+++ b/config/paragraphs.paragraphs_type.story.yml
@@ -1,7 +1,13 @@
 uuid: e4c10110-fb80-4288-91ec-f08bdc4b0beb
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: embed
+    disabled: false
 id: story
 label: Story
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.sub_article.yml b/config/paragraphs.paragraphs_type.sub_article.yml
index b0384668..4bcd8fb3 100755
--- a/config/paragraphs.paragraphs_type.sub_article.yml
+++ b/config/paragraphs.paragraphs_type.sub_article.yml
@@ -1,7 +1,13 @@
 uuid: aad0adc9-ea9e-44ae-8690-5eaaf50002d3
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - ncms_paragraphs
+third_party_settings:
+  ncms_paragraphs:
+    category: embed
+    disabled: false
 id: sub_article
 label: Sub-article
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.text.yml b/config/paragraphs.paragraphs_type.text.yml
index 7235869a..dc653dce 100755
--- a/config/paragraphs.paragraphs_type.text.yml
+++ b/config/paragraphs.paragraphs_type.text.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: content
+    disabled: 0
 id: text
 label: Text
 icon_uuid: null
 icon_default: null
 description: 'A text with a rich editor to allow basic formatting like bold, italic, list and links.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.top_figures.yml b/config/paragraphs.paragraphs_type.top_figures.yml
index 52ecda8d..91534569 100644
--- a/config/paragraphs.paragraphs_type.top_figures.yml
+++ b/config/paragraphs.paragraphs_type.top_figures.yml
@@ -3,7 +3,12 @@ langcode: en
 status: true
 dependencies:
   module:
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: content
+    disabled: 0
 id: top_figures
 label: 'Top figures'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.top_figures_small.yml b/config/paragraphs.paragraphs_type.top_figures_small.yml
index 0a893aa5..6bd04794 100644
--- a/config/paragraphs.paragraphs_type.top_figures_small.yml
+++ b/config/paragraphs.paragraphs_type.top_figures_small.yml
@@ -3,7 +3,12 @@ langcode: en
 status: true
 dependencies:
   module:
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: content
+    disabled: 0
 id: top_figures_small
 label: 'Top figures (small)'
 icon_uuid: null
diff --git a/html/modules/custom/gho_fields/gho_fields.deploy.php b/html/modules/custom/gho_fields/gho_fields.deploy.php
index 36700bc7..2c9067d5 100644
--- a/html/modules/custom/gho_fields/gho_fields.deploy.php
+++ b/html/modules/custom/gho_fields/gho_fields.deploy.php
@@ -169,8 +169,12 @@ function ghi_fields_create_top_figures_from_paragraph(ParagraphInterface $paragr
     'parent_type' => $paragraph->get('parent_type')->value,
     'parent_field_name' => $paragraph->get('parent_field_name')->value,
     'field_figures' => $paragraph->get('field_figures')->getValue(),
+    'field_dataset' => $paragraph->get('field_dataset')->getValue(),
   ]);
   $top_figures_paragraph->setBehaviorSettings('promoted_behavior', $paragraph->getAllBehaviorSettings()['promoted_behavior'] ?? []);
+  $top_figures_paragraph->setBehaviorSettings('ncms_paragraphs', [
+    'replaces' => $paragraph->uuid(),
+  ]);
   $top_figures_paragraph->setSyncing(TRUE);
   $top_figures_paragraph->save();
 
diff --git a/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityConfiguration.php b/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityConfiguration.php
index 59b5943b..c4752612 100644
--- a/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityConfiguration.php
+++ b/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityConfiguration.php
@@ -124,6 +124,9 @@ public function resolve(EntityInterface $entity, RefinableCacheableDependencyInt
             ];
           }
         }
+        if ($original_uuid = $entity->getBehaviorSetting('ncms_paragraphs', 'replaces')) {
+          $config['replaces'] = $original_uuid;
+        }
       }
       return Yaml::encode($this->mapObjectsToString($config));
     });
diff --git a/html/modules/custom/ncms_paragraphs/config/schema/ncms_paragraphs.schema.yml b/html/modules/custom/ncms_paragraphs/config/schema/ncms_paragraphs.schema.yml
new file mode 100644
index 00000000..cc7d890f
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/config/schema/ncms_paragraphs.schema.yml
@@ -0,0 +1,13 @@
+paragraphs.paragraphs_type.*.third_party.ncms_paragraphs:
+  type: config_entity
+  label: "Paragraph settings"
+  mapping:
+    category:
+      type: text
+      label: "Category"
+    disabled:
+      type: boolean
+      label: "Disabled"
+    replaces:
+      type: text
+      label: "Replaces (UUID)"
\ No newline at end of file
diff --git a/html/modules/custom/ncms_paragraphs/css/component_menu.css b/html/modules/custom/ncms_paragraphs/css/component_menu.css
new file mode 100644
index 00000000..b0157667
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/css/component_menu.css
@@ -0,0 +1,16 @@
+.lpb-component-list {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.lpb-component-list__group--menu {
+  --vertical-tabs-menu-width: 10rem;
+  min-width: 40rem;
+}
+.lpb-component-list .paragraph-category-links ul {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+.lpb-component-list .paragraph-category-links ul li {
+  list-style-type: none;
+}
\ No newline at end of file
diff --git a/html/modules/custom/ncms_ui/css/layout_paragraphs.css b/html/modules/custom/ncms_paragraphs/css/layout_paragraphs.css
similarity index 100%
rename from html/modules/custom/ncms_ui/css/layout_paragraphs.css
rename to html/modules/custom/ncms_paragraphs/css/layout_paragraphs.css
diff --git a/html/modules/custom/ncms_paragraphs/css/paragraph_edit_form.css b/html/modules/custom/ncms_paragraphs/css/paragraph_edit_form.css
new file mode 100644
index 00000000..fbb8f329
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/css/paragraph_edit_form.css
@@ -0,0 +1,41 @@
+/* Move the status checkbox into the bottom pane of the modal. */
+form.layout-paragraphs-component-form > .field--name-status {
+  position: absolute;
+  bottom: 0;
+  z-index: 10;
+}
+
+form.layout-paragraphs-component-form table.field-multiple-table tbody td.tabledrag-cell {
+  vertical-align: middle;
+}
+
+/* Give the tab content some space. */
+form.layout-paragraphs-component-form .horizontal-tabs-panes {
+  margin-top: 1rem;
+}
+
+/* Adjustments for some multi value fields that. */
+form.layout-paragraphs-component-form .details-wrapper > .form-wrapper > div > .form-item--multiple .tabledrag-toggle-weight-wrapper {
+  margin-top: -2rem;
+}
+form.layout-paragraphs-component-form .details-wrapper > .form-wrapper > div > .form-item--multiple > .field-actions {
+  align-items: center;
+}
+form.layout-paragraphs-component-form .details-wrapper > .form-wrapper > div > .form-item--multiple > .field-actions > em.placeholder {
+  padding-left: 0.2rem;
+}
+
+form.layout-paragraphs-component-form .field--type-custom[data-drupal-selector='edit-field-figures-wrapper'] table.field-multiple-table tbody tr td:nth-child(2) {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+form.layout-paragraphs-component-form .field--type-custom[data-drupal-selector='edit-field-figures-wrapper'] table.field-multiple-table tbody tr td:nth-child(2) input.button {
+  height: fit-content;
+}
+form.layout-paragraphs-component-form .field--type-custom[data-drupal-selector='edit-field-figures-wrapper'] table.field-multiple-table th.tabledrag-hide {
+  display: none;
+}
+form.layout-paragraphs-component-form .field--type-custom[data-drupal-selector='edit-field-figures-wrapper'] table.field-multiple-table th.tabledrag-hide[style*="none"] ~ th {
+  display: none;
+}
\ No newline at end of file
diff --git a/html/modules/custom/ncms_paragraphs/ncms_paragraphs.info.yml b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.info.yml
new file mode 100644
index 00000000..62141ba2
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.info.yml
@@ -0,0 +1,8 @@
+name: Better paragraph support for the HPC Content Module
+type: module
+description: 'Provides entity classes for paragraphs.'
+package: HPC Content Module
+core_version_requirement: ^9.3 || ^10
+dependencies:
+  - paragraphs:paragraphs
+  - layout_paragraphs:layout_paragraphs
\ No newline at end of file
diff --git a/html/modules/custom/ncms_paragraphs/ncms_paragraphs.libraries.yml b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.libraries.yml
new file mode 100644
index 00000000..b1272413
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.libraries.yml
@@ -0,0 +1,12 @@
+paragraph_edit_form:
+  css:
+    component:
+      css/paragraph_edit_form.css: {}
+layout_paragraphs:
+  css:
+    component:
+      css/layout_paragraphs.css: {}
+component_menu:
+  css:
+    component:
+      css/component_menu.css: {}
\ No newline at end of file
diff --git a/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module
new file mode 100644
index 00000000..d7a6be4b
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * @file
+ * NCMS Paragraphs module file.
+ */
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\ncms_paragraphs\Entity\NcmsParagraphInterface;
+use Drupal\ncms_paragraphs\Helpers\StringHelper;
+
+/**
+ * Implements hook_entity_bundle_info_alter().
+ */
+function ncms_paragraphs_entity_bundle_info_alter(array &$bundles) {
+  foreach (array_keys($bundles['paragraph'] ?? []) as $paragraph_type) {
+    $class_name = '\\Drupal\ncms_paragraphs\\Entity\\Paragraph\\' . StringHelper::makeCamelCase($paragraph_type, FALSE);
+    if (!class_exists($class_name)) {
+      continue;
+    }
+    $bundles['paragraph'][$paragraph_type]['class'] = $class_name;
+    $bundles['paragraph'][$paragraph_type]['label'] = ucfirst(str_replace('_', ' ', $paragraph_type));
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function ncms_paragraphs_form_layout_paragraphs_component_form_alter(&$form, FormStateInterface $form_state) {
+  /** @var \Drupal\layout_paragraphs\Form\EditComponentForm $form_object */
+  $form_object = $form_state->getFormObject();
+  $paragraph = $form_object->getParagraph();
+
+  if ($paragraph instanceof NcmsParagraphInterface) {
+    $paragraph->entityFormAlter($form, $form_state);
+  }
+
+  // Don't trigger "Required" messages when canceling the add/edit form.
+  $form['actions']['cancel']['#limit_validation_errors'] = [];
+
+  // Add our library to improve the display.
+  $form['#attached']['library'][] = 'ncms_paragraphs/paragraph_edit_form';
+
+  // Move the behavior plugin from a stand-alone fieldset into existing field
+  // groups.
+  if (!empty($form['#fieldgroups']) && !empty($form['behavior_plugins'])) {
+
+    $form['behavior_plugins']['#parents'] = ['behavior_plugins'];
+    $form['behavior_plugins'] = $form_object->behaviorPluginsForm($form['behavior_plugins'], $form_state, $form);
+    unset($form['behavior_plugins']['#process']);
+
+    $group_name = 'group_settings';
+    if (empty($form['#fieldgroups'][$group_name])) {
+      $group = clone end($form['#fieldgroups']);
+      $group->children = ['behavior_plugins'];
+      $group->format_settings['formatter'] = 'close';
+      $group->weight = $group->weight + 1;
+      $group->group_name = $group_name;
+      $form['#fieldgroups'][$group->group_name] = $group;
+    }
+    else {
+      $form['#fieldgroups'][$group_name]->children[] = 'behavior_plugins';
+    }
+    $form['#fieldgroups'][$group_name]->label = t('Additional settings');
+    $form['#group_children']['behavior_plugins'] = $group_name;
+  }
+
+  if (!empty($form['field_dataset'])) {
+    // Hide the fieldset.
+    $form['field_dataset']['widget'][0]['#type'] = 'container';
+  }
+
+}
+
+/**
+ * Implements hook_preprocess_layout_paragraphs_builder().
+ */
+function ncms_paragraphs_preprocess_layout_paragraphs_builder(&$variables) {
+  $variables['#attached']['library'][] = 'ncms_paragraphs/layout_paragraphs';
+}
+
+/**
+ * Implements hook_layout_paragraphs_builder_component_menu().
+ */
+function ncms_paragraphs_preprocess_layout_paragraphs_builder_component_menu(&$variables) {
+  /** @var \Drupal\ncms_paragraphs\ComponentMenu $component_menu */
+  $component_menu = \Drupal::service('ncms_paragraphs.component_menu');
+  $component_menu->preprocessTemplate($variables);
+}
+
+/**
+ * Implements hook_theme_registry_alter().
+ */
+function ncms_paragraphs_theme_registry_alter(&$theme_registry) {
+  // Override layout-paragraphs-builder-component-menu.html.twig to support
+  // the changes in \Drupal\ncms_paragraphs\ComponentMenu::preprocessTemplate.
+  $module_path = \Drupal::service('extension.path.resolver')->getPath('module', 'ncms_paragraphs');
+  $theme_registry['layout_paragraphs_builder_component_menu']['theme path'] = $module_path;
+  $theme_registry['layout_paragraphs_builder_component_menu']['path'] = $module_path . '/templates';
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Implements our third-party settings into the paragraphs type form.
+ */
+function ncms_paragraphs_form_paragraphs_type_edit_form_alter(&$form, FormStateInterface $form_state) {
+  /** @var \Drupal\ncms_paragraphs\ParagraphsTypeSettings $paragraph_type_settings */
+  $paragraph_type_settings = \Drupal::service('ncms_paragraphs.paragraph_type_settings');
+  $paragraph_type_settings->paragraphsTypeFormAlter($form, $form_state);
+}
diff --git a/html/modules/custom/ncms_paragraphs/ncms_paragraphs.services.yml b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.services.yml
new file mode 100644
index 00000000..8913ed66
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.services.yml
@@ -0,0 +1,7 @@
+services:
+  ncms_paragraphs.component_menu:
+    class: Drupal\ncms_paragraphs\ComponentMenu
+    arguments: ['@entity_type.manager', '@ncms_paragraphs.paragraph_type_settings']
+  ncms_paragraphs.paragraph_type_settings:
+    class: Drupal\ncms_paragraphs\ParagraphsTypeSettings
+    arguments: []
\ No newline at end of file
diff --git a/html/modules/custom/ncms_paragraphs/src/ComponentMenu.php b/html/modules/custom/ncms_paragraphs/src/ComponentMenu.php
new file mode 100644
index 00000000..a5a82925
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/ComponentMenu.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Drupal\ncms_paragraphs;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\SortArray;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Render\Element;
+use Drupal\Core\Render\Element\RenderElement;
+use Drupal\Core\Render\Element\VerticalTabs;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\ncms_paragraphs\Traits\VerticalTabsTrait;
+
+/**
+ * Service class for processing the component menu from layout paragraphs.
+ *
+ * @see ncms_paragraphs_preprocess_layout_paragraphs_builder_component_menu()
+ */
+class ComponentMenu {
+
+  use VerticalTabsTrait;
+  use StringTranslationTrait;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The paragraphs type settings service.
+   *
+   * @var \Drupal\ncms_paragraphs\ParagraphsTypeSettings
+   */
+  protected $paragraphsTypeSettings;
+
+  /**
+   * Public constructor.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
+   *   The entity type manager service.
+   * @param \Drupal\ncms_paragraphs\ParagraphsTypeSettings $paragraph_type_settings
+   *   The paragraphs type settings service.
+   */
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, ParagraphsTypeSettings $paragraph_type_settings) {
+    $this->entityTypeManager = $entityTypeManager;
+    $this->paragraphsTypeSettings = $paragraph_type_settings;
+  }
+
+  /**
+   * Preprocess the layout paragraphs component menu template.
+   *
+   * This turns the 2-category list into a custom list with multiple
+   * categories using verticala tabs.
+   *
+   * @param array $variables
+   *   The template variables to alter.
+   *
+   * @see ncms_paragraphs_theme_registry_alter()
+   */
+  public function preprocessTemplate(&$variables) {
+    $items = array_merge($variables['types']['content'], $variables['types']['layout']);
+    uasort($items, function ($a, $b) {
+      return SortArray::sortByKeyString($a, $b, 'label');
+    });
+
+    // Prepare a pseudo form where we can attach vertical tabs.
+    $form_state = new FormState();
+    $complete_form = [];
+    $form = [];
+    $form['category_header'] = [
+      '#type' => 'html_tag',
+      '#tag' => 'h5',
+      '#value' => $this->t('Choose a paragraph type from the following categories:'),
+    ];
+    $form['tabs'] = [
+      '#type' => 'vertical_tabs',
+      '#parents' => ['tabs'],
+    ];
+
+    $category_ids = array_keys($this->paragraphsTypeSettings->getCategoryOptions());
+    $categories = [];
+    foreach ($items as $item) {
+      /** @var \Drupal\paragraphs\Entity\ParagraphsType $entity */
+      $entity = $this->entityTypeManager->getStorage('paragraphs_type')->load($item['id']);
+      $settings = $entity->getThirdPartySettings('ncms_paragraphs');
+      if (!empty($settings['disabled'])) {
+        continue;
+      }
+
+      $category = $settings['category'] ?? NULL;
+      if (!$category) {
+        continue;
+      }
+      $category_label = $this->paragraphsTypeSettings->getCategoryLabel($category) ?? $this->t('Unknown');
+
+      $category_build = $categories[$category] ?? [
+        '#title' => $category_label,
+        'links' => [
+          '#theme' => 'links',
+          '#links' => [],
+        ],
+      ];
+      $category_build['links']['#links'][] = [
+        'title' => (string) $item['label'],
+        'url' => $item['url_object'],
+        'attributes' => [
+          'class' => ['use-ajax'],
+          'data-dialog-type' => 'dialog',
+          'data-dialog-renderer' => 'off_canvas',
+        ],
+      ];
+      $categories[$category] = $category_build;
+    }
+
+    $form['paragraph_categories'] = array_combine($category_ids, array_map(function ($category_id) use ($categories) {
+      return $categories[$category_id];
+    }, $category_ids));
+    $form['paragraph_categories']['#tree'] = TRUE;
+
+    // Let the tab element set itself up.
+    VerticalTabs::processVerticalTabs($form['tabs'], $form_state, $complete_form);
+    RenderElement::processGroup($form['tabs']['group'], $form_state, $complete_form);
+
+    // Default tab is the first one. We have to set #value instead of the
+    // #default_value, because this is not a real form and the normal form
+    // processing doesn't work.
+    $form['tabs']['tabs__active_tab']['#value'] = reset($categories);
+
+    // Now go over the block categories, add some required properties and
+    // run the process callback.
+    $form['paragraph_categories']['#parents'] = ['paragraph_categories'];
+    foreach (Element::children($form['paragraph_categories']) as $element_key) {
+      $form['paragraph_categories'][$element_key]['#type'] = 'details';
+      $form['paragraph_categories'][$element_key]['#group'] = 'tabs';
+      $form['paragraph_categories'][$element_key]['#id'] = Html::getId($element_key);
+      $form['paragraph_categories'][$element_key]['#parents'] = [
+        'paragraph_categories',
+        $element_key,
+      ];
+      $form['paragraph_categories'][$element_key]['#attributes'] = [
+        'class' => [
+          'paragraph-category-links',
+        ],
+      ];
+      RenderElement::processGroup($form['paragraph_categories'][$element_key], $form_state, $complete_form);
+    }
+    $this->processVerticalTabs($form, $form_state);
+
+    $variables['menu'] = $form;
+    $variables['#attached']['library'][] = 'ncms_paragraphs/component_menu';
+  }
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php
new file mode 100644
index 00000000..4d386452
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\ncms_paragraphs\Entity;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\paragraphs\Entity\Paragraph;
+
+/**
+ * Base class for NCMS paragraphs.
+ */
+abstract class NcmsParagraphBase extends Paragraph implements NcmsParagraphInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function entityFormAlter(&$form, FormStateInterface $form_state) {}
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php
new file mode 100644
index 00000000..362b0f9c
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\ncms_paragraphs\Entity;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\paragraphs\ParagraphInterface;
+
+/**
+ * Interface for NCMS paragraph entities.
+ */
+interface NcmsParagraphInterface extends ParagraphInterface {
+
+  /**
+   * Alter the entity form.
+   */
+  public function entityFormAlter(&$form, FormStateInterface $form_state);
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/InteractiveContent.php b/html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/InteractiveContent.php
new file mode 100644
index 00000000..0d0d6507
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/InteractiveContent.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\ncms_paragraphs\Entity\Paragraph;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\ncms_paragraphs\Entity\NcmsParagraphBase;
+
+/**
+ * Entity class for paragraphs of type interactive_content.
+ */
+class InteractiveContent extends NcmsParagraphBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function entityFormAlter(&$form, FormStateInterface $form_state) {
+    if (!empty($form['field_embed_code'])) {
+      $form['field_embed_code']['#element_validate'][] = [
+        $this,
+        'validateEmbedCodeField',
+      ];
+    }
+  }
+
+  /**
+   * Validate the embed code.
+   */
+  public function validateEmbedCodeField($element, FormStateInterface $form_state) {
+    $element_parents = array_merge($element['#array_parents'], [0, 'value']);
+    $embed_code = $form_state->getValue($element_parents);
+    if (strpos($embed_code, '<script ')) {
+      $form_state->setError($element, $this->t('The embed code must not contain any script tags.'));
+    }
+  }
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/src/Helpers/StringHelper.php b/html/modules/custom/ncms_paragraphs/src/Helpers/StringHelper.php
new file mode 100644
index 00000000..ae833b6b
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/Helpers/StringHelper.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\ncms_paragraphs\Helpers;
+
+/**
+ * Helper class for string handling.
+ */
+class StringHelper {
+
+  /**
+   * Make a string camel case.
+   */
+  public static function makeCamelCase($string, $initial_lower_case) {
+    $string = str_replace('_', '', ucwords($string, '_'));
+    if ($initial_lower_case) {
+      $string = lcfirst($string);
+    }
+    return $string;
+  }
+
+  /**
+   * Turn a camelcase string to an underscore separated string.
+   *
+   * @param string $string
+   *   The input string.
+   *
+   * @return string
+   *   The output string.
+   */
+  public static function camelCaseToUnderscoreCase($string) {
+    return strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $string));
+  }
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/src/ParagraphsTypeSettings.php b/html/modules/custom/ncms_paragraphs/src/ParagraphsTypeSettings.php
new file mode 100644
index 00000000..ab2f0379
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/ParagraphsTypeSettings.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Drupal\ncms_paragraphs;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+
+/**
+ * Third party settings for paragraph types.
+ */
+class ParagraphsTypeSettings {
+
+  use StringTranslationTrait;
+
+  /**
+   * Get the available category options.
+   *
+   * @return array
+   *   An array of key-value pairs, suitable for use in select form elements.
+   */
+  public function getCategoryOptions() {
+    return [
+      'content' => $this->t('Content'),
+      'media' => $this->t('Media'),
+      'widget' => $this->t('Widgets'),
+      'embed' => $this->t('Embedded'),
+      'list' => $this->t('Lists'),
+      'misc' => $this->t('Misc'),
+    ];
+  }
+
+  /**
+   * Get the label for a category.
+   *
+   * @param string $category
+   *   The category machine name.
+   *
+   * @return string|\Drupal\Component\Render\MarkupInterface|null
+   *   The label for the category.
+   */
+  public function getCategoryLabel($category) {
+    $categories = $this->getCategoryOptions();
+    return array_key_exists($category, $categories) ? $categories[$category] : NULL;
+  }
+
+  /**
+   * Form alter callback or paragraphs_type forms.
+   */
+  public function paragraphsTypeFormAlter(&$form, FormStateInterface $form_state) {
+    /** @var \Drupal\paragraphs\Entity\ParagraphsType $entity */
+    $entity = $form_state->getFormObject()->getEntity();
+    $category = $entity->getThirdPartySetting('ncms_paragraphs', 'category');
+    $disabled = $entity->getThirdPartySetting('ncms_paragraphs', 'disabled');
+    $options = $this->getCategoryOptions();
+
+    $form['paragraph_settings'] = [
+      '#type' => 'fieldset',
+      '#tree' => TRUE,
+      '#title' => $this->t('Paragraph settings'),
+    ];
+    $form['paragraph_settings']['category'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Category'),
+      '#description' => $this->t('Choose the category under which this paragraph type will be shown in the paragraph type browser when adding new paragraphs to entities.'),
+      '#options' => $options,
+      '#default_value' => array_key_exists($category, $options) ? $category : NULL,
+    ];
+    $form['paragraph_settings']['disabled'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Disable'),
+      '#description' => $this->t('If checked, the paragraph type will be disabled. No new paragraphs of this type can be added. Existing ones will continue to work and can still be edited.'),
+      '#default_value' => $disabled,
+    ];
+
+    $form['#entity_builders'][] = [$this, 'paragraphTypeFormBuilder'];
+  }
+
+  /**
+   * Builder callback for paragraphs_type forms.
+   */
+  public function paragraphTypeFormBuilder($entity_type, $entity, &$form, FormStateInterface $form_state) {
+    $paragraph_settings = $form_state->getValue(['paragraph_settings']);
+    $entity->setThirdPartySetting('ncms_paragraphs', 'category', $paragraph_settings['category'] ?? NULL);
+    $entity->setThirdPartySetting('ncms_paragraphs', 'disabled', $paragraph_settings['disabled'] ?? FALSE);
+  }
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/src/Traits/VerticalTabsTrait.php b/html/modules/custom/ncms_paragraphs/src/Traits/VerticalTabsTrait.php
new file mode 100644
index 00000000..67ef82cb
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/Traits/VerticalTabsTrait.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Drupal\ncms_paragraphs\Traits;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\Element;
+
+/**
+ * Helper trait class to make working with vertical tabs easier.
+ */
+trait VerticalTabsTrait {
+
+  /**
+   * Find vertical tabs elements in the given form.
+   *
+   * @param array $form
+   *   The form array.
+   *
+   * @return array
+   *   An aray of first-level element keys.
+   */
+  private function findVerticalTabsElementKeys(array $form) {
+    $element_keys = [];
+    foreach (Element::children($form) as $child_key) {
+      $child_element = &$form[$child_key];
+      if (array_key_exists('#type', $child_element) && $child_element['#type'] == 'vertical_tabs') {
+        $element_keys[] = $child_key;
+      }
+    }
+    return $element_keys;
+  }
+
+  /**
+   * Get the variable key used to store the current tab in the form storage.
+   *
+   * @param string $group
+   *   The group key.
+   *
+   * @return string
+   *   The variable key string.
+   */
+  private function getVariableKey($group) {
+    return $group . '__active_tab';
+  }
+
+  /**
+   * Process vertical tabs elements in the given form array.
+   *
+   * This processes only first-level elements. It sets the default tab and
+   * sets a non-unique id.
+   *
+   * @param array $form
+   *   The form array.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state object.
+   */
+  public function processVerticalTabs(array &$form, FormStateInterface $form_state) {
+    // Add easier support for vertical tabs.
+    foreach ($this->findVerticalTabsElementKeys($form) as $group) {
+      $child_element = &$form[$group];
+
+      $child_element['#parents'] = [$group];
+      $child_element['#default_tab'] = $form_state->get($this->getVariableKey($group));
+
+      foreach (Element::children($form) as $element_key) {
+        if (!array_key_exists('#group', $form[$element_key])) {
+          continue;
+        }
+        if ($form[$element_key]['#group'] != $group) {
+          continue;
+        }
+        $form[$element_key]['#id'] = 'edit-' . $group . '-' . $element_key;
+      }
+    }
+  }
+
+  /**
+   * Process vertical tabs submits.
+   *
+   * @param array $form
+   *   The form array.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state object.
+   */
+  public function processVerticalTabsSubmit(array $form, FormStateInterface $form_state) {
+    foreach ($this->findVerticalTabsElementKeys($form) as $group) {
+      $variable_key = $this->getVariableKey($group);
+      $value_key = [$group, $variable_key];
+      if ($form_state->hasValue($value_key)) {
+        // Set the active tab for this group.
+        $form_state->set($variable_key, $form_state->getValue($value_key));
+      }
+    }
+  }
+
+}
diff --git a/html/modules/custom/ncms_paragraphs/templates/layout-paragraphs-builder-component-menu.html.twig b/html/modules/custom/ncms_paragraphs/templates/layout-paragraphs-builder-component-menu.html.twig
new file mode 100644
index 00000000..e3edf2c0
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/templates/layout-paragraphs-builder-component-menu.html.twig
@@ -0,0 +1,15 @@
+{{ status_messages }}
+<div{{ attributes }}>
+  <h4 class="visually-hidden">{{ 'Add Item'|t }}</h4>
+  {% if menu|length > 1 %}
+  <div class="">
+    <div class="lpb-component-list__group--menu">
+      {{ menu }}
+    </div>
+  </div>
+  {% else %}
+  <div class="lpb-component-list__empty-message">
+    {{ empty_message }}
+  </div>
+  {% endif %}
+</div>
diff --git a/html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css b/html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css
deleted file mode 100644
index 9bcf915c..00000000
--- a/html/modules/custom/ncms_ui/css/edit-form/paragraph_edit_form.css
+++ /dev/null
@@ -1,5 +0,0 @@
-form.layout-paragraphs-component-form > .field--name-status {
-  position: absolute;
-  bottom: 0;
-  z-index: 10;
-}
diff --git a/html/modules/custom/ncms_ui/css/gin_entity_browser.css b/html/modules/custom/ncms_ui/css/gin_entity_browser.css
index 7ddf3275..80e8943a 100644
--- a/html/modules/custom/ncms_ui/css/gin_entity_browser.css
+++ b/html/modules/custom/ncms_ui/css/gin_entity_browser.css
@@ -39,14 +39,21 @@
   margin: 0;
 }
 .field--widget-entity-reference-browser-table-widget-ncms > details > .details-wrapper .layer-wrapper {
+  margin-top: 0;
   padding: 1rem 0;
   border: 0;
   border-radius: 0;
   box-shadow: none;
 }
+.field--widget-entity-reference-browser-table-widget-ncms > details > .details-wrapper .layer-wrapper .gin-table-scroll-wrapper {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
 .field--widget-entity-reference-browser-table-widget-ncms > details > .details-wrapper > .form-wrapper {
   position: absolute;
   bottom: 0;
+  z-index: 12;
+  right: 12rem;
 }
 .field--widget-entity-reference-browser-table-widget-ncms > details > .details-wrapper > .form-wrapper > input.button {
   margin: var(--gin-spacing-s) 0;
diff --git a/html/modules/custom/ncms_ui/ncms_ui.libraries.yml b/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
index fb58c851..e78b378b 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
+++ b/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
@@ -27,10 +27,6 @@ document_edit_form:
     component:
       css/edit-form/content_edit_form.css: {}
       css/edit-form/document_edit_form.css: {}
-paragraph_edit_form:
-  css:
-    component:
-      css/edit-form/paragraph_edit_form.css: {}
 revisions:
   css:
     component:
diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module
index 1df1b0f9..93ce56b9 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.module
+++ b/html/modules/custom/ncms_ui/ncms_ui.module
@@ -6,7 +6,6 @@
  */
 
 use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\SortArray;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
@@ -290,25 +289,6 @@ function ncms_ui_preprocess_node(&$variables) {
   }
 }
 
-/**
- * Implements hook_preprocess_layout_paragraphs_builder().
- */
-function ncms_ui_preprocess_layout_paragraphs_builder(&$variables) {
-  $variables['#attached']['library'][] = 'ncms_ui/layout_paragraphs';
-}
-
-/**
- * Implements hook_layout_paragraphs_builder_component_menu().
- */
-function ncms_ui_preprocess_layout_paragraphs_builder_component_menu(&$variables) {
-  $items = array_merge($variables['types']['content'], $variables['types']['layout']);
-  uasort($items, function ($a, $b) {
-    return SortArray::sortByKeyString($a, $b, 'label');
-  });
-  $variables['types']['content'] = $items;
-  $variables['types']['layout'] = [];
-}
-
 /**
  * Implements hook_preprocess_hook().
  */
@@ -334,36 +314,6 @@ function ncms_ui_form_node_preview_form_select_alter(&$form, FormStateInterface
   $form['#access'] = FALSE;
 }
 
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function ncms_ui_form_layout_paragraphs_component_form_alter(&$form, FormStateInterface $form_state) {
-  // Don't trigger "Required" messages when canceling the add/edit form.
-  $form['actions']['cancel']['#limit_validation_errors'] = [];
-
-  // Move the behavior plugin from a stand-alone fieldset into existing field
-  // groups.
-  if (!empty($form['#fieldgroups']) && !empty($form['behavior_plugins'])) {
-    /** @var \Drupal\layout_paragraphs\Form\EditComponentForm $form_object */
-    $form_object = $form_state->getFormObject();
-    $form['behavior_plugins']['#parents'] = ['behavior_plugins'];
-    $form['behavior_plugins'] = $form_object->behaviorPluginsForm($form['behavior_plugins'], $form_state, $form);
-    unset($form['behavior_plugins']['#process']);
-
-    $group = clone end($form['#fieldgroups']);
-    $group->children = ['behavior_plugins'];
-    $group->label = t('Additional settings');
-    $group->format_settings['formatter'] = 'close';
-    $group->weight = $group->weight + 1;
-    $group->group_name = 'group_behaviors';
-    $form['#fieldgroups'][$group->group_name] = $group;
-    $form['#group_children']['behavior_plugins'] = 'group_behaviors';
-  }
-
-  // Add our library to improve the display.
-  $form['#attached']['library'][] = 'ncms_ui/paragraph_edit_form';
-}
-
 /**
  * Implements hook_form_FORM_ID_alter().
  */
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 6719986e..022dd7d7 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -41,6 +41,7 @@ gho-top-figures:
   css:
     theme:
       components/gho-top-figures/gho-top-figures.css: {}
+      components/gho-top-figures/gho-top-figures--small.css: {}
 
 gho-download-button:
   css:
diff --git a/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md b/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md
index 1476eaa8..c499c567 100644
--- a/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md
+++ b/html/themes/custom/common_design_subtheme/components/gho-top-figures/README.md
@@ -2,3 +2,8 @@ HPC Content Module - Top Figures Component
 ==========================================================
 
 Displays a horizontal row of manually-entered textual figures (label + figure).
+
+This is supporting 2 different flavours of this element:
+
+- a more prominent one with larger labels and values and specific colors
+- a smaller one with labels and values in the default size and color
\ No newline at end of file
diff --git a/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures--small.css b/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures--small.css
new file mode 100644
index 00000000..d8908437
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures--small.css
@@ -0,0 +1,78 @@
+/**
+ * Base field.
+ */
+.gho-top-figures--small {
+  margin-top: 2rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+/* The border is not on the container itself due to eventual left/right padding
+ * values that can interfere. Ex: when it has the `content-width` class. */
+.gho-top-figures--small::before {
+  display: block;
+  padding-bottom: 2rem;
+  content: "";
+  border-top: 1px solid #d8d8d8;
+}
+/* Hide the border when the figures follow another top figures paragraph. */
+.gho-top-figures + .gho-top-figures--small::before {
+  content: none;
+}
+
+.gho-top-figures--small .gho-figures {
+  display: flex;
+  overflow-x: hidden;
+  flex-flow: row wrap;
+  align-content: space-around;
+  justify-content: flex-start;
+  /* Compensate for the margins of the figure items. */
+  margin: -1rem 0 0 0;
+  padding-bottom: 2rem;
+  padding-top: 0;
+  border-top: 0;
+  border-bottom: 1px solid #d8d8d8;
+}
+
+.gho-top-figures--small .gho-figures * {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  color: inherit;
+  font-weight: inherit;
+}
+
+.gho-top-figures--small .gho-figures .gho-figure {
+  flex: 0 1 auto;
+  min-width: 140px;
+  margin: 1rem 0 0 0;
+}
+[dir="ltr"] .gho-top-figures--small .gho-figures .gho-figure {
+  margin-right: 0;
+  /* The left margin combined with the overflow-x: hidden of the parent
+   * ensures the left border and padding are hidden for the first item of each
+   * row. */
+  margin-left: calc(-1rem - 1px);
+  padding: 0 2rem 0 1rem;
+  border-right: none;
+  border-left: 1px solid #d8d8d8;
+}
+[dir="rtl"] .gho-top-figures--small .gho-figures .gho-figure {
+  margin-right: calc(-1rem - 1px);
+  /* The right margin combined with the overflow-x: hidden of the parent
+   * ensures the right border and padding are hidden for the first item of each
+   * row. */
+  margin-left: 0;
+  padding: 0 1rem 0 2rem;
+  border-right: 1px solid #d8d8d8;
+  border-left: none;
+}
+
+.gho-top-figures--small .gho-figure__label,
+.gho-top-figures--small .gho-figure__value {
+  display: block;
+}
+.gho-top-figures--small .gho-figure__label {
+  font-weight: 700;
+}
+.gho-top-figures--small__source {
+  margin-top: 1rem;
+}
\ No newline at end of file
diff --git a/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css b/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
index ad834d63..0e1a769c 100644
--- a/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
@@ -1,66 +1,74 @@
-/**
- * Base field.
- */
-.gho-top-figures {
-  margin-top: 2rem;
-  font-size: 0.875rem;
-  line-height: 1.25rem;
-}
-/* The border is not on the container itself due to eventual left/right padding
- * values that can interfere. Ex: when it has the `content-width` class. */
-.gho-top-figures::before {
-  display: block;
-  padding-bottom: 2rem;
-  content: "";
-  border-top: 1px solid #d8d8d8;
-}
-/* Hide the border when the figures follow a NaR paragraph. */
-.gho-needs-and-requirements-paragraph + .gho-top-figures::before {
-  content: none;
-}
-
 .gho-top-figures .gho-figures {
-  display: flex;
-  overflow-x: hidden;
-  flex-flow: row wrap;
-  align-content: space-around;
-  justify-content: flex-start;
-  /* Compensate for the margins of the figure items. */
-  margin: -1rem 0 0 0;
   padding-bottom: 2rem;
   border-bottom: 1px solid #d8d8d8;
 }
-
-.gho-top-figures .gho-figure {
-  flex: 0 1 auto;
-  min-width: 140px;
-  margin: 1rem 0 0 0;
+.gho-top-figures:not(.gho-top-figures--small) .gho-figures .gho-figure {
+  padding: 2rem 0;
+  border-width: 1px 0 0 0;
+  border-style: solid;
+  border-color: #d8d8d8;
 }
-[dir="ltr"] .gho-top-figures .gho-figure {
-  margin-right: 0;
-  /* The left margin combined with the overflow-x: hidden of the parent
-   * ensures the left border and padding are hidden for the first item of each
-   * row. */
-  margin-left: calc(-1rem - 1px);
-  padding: 0 2rem 0 1rem;
-  border-right: none;
-  border-left: 1px solid #d8d8d8;
+/* hide border-top when top figures immediately follows a Hero image caption */
+.gho-caption--article + .gho-top-figures .gho-figures .gho-figure:first-child {
+  border-top: 0;
 }
-[dir="rtl"] .gho-top-figures .gho-figure {
-  margin-right: calc(-1rem - 1px);
-  /* The right margin combined with the overflow-x: hidden of the parent
-   * ensures the right border and padding are hidden for the first item of each
-   * row. */
-  margin-left: 0;
-  padding: 0 1rem 0 2rem;
-  border-right: 1px solid #d8d8d8;
-  border-left: none;
+.gho-top-figures .gho-figures .gho-figure:last-child {
+  padding-bottom: 0;
+}
+.gho-top-figures .gho-figure__label {
+  font-size: 1rem;
+  font-weight: bold;
+}
+.gho-top-figures .gho-figure__label small {
+  font-size: inherit;
+  font-weight: normal;
 }
-
-.gho-top-figures .gho-figure__label,
 .gho-top-figures .gho-figure__value {
-  display: block;
+  color: #5391cb;
+  font-size: 1.625rem;
+  font-weight: bold;
 }
-.gho-top-figures .gho-figure__label {
-  font-weight: 700;
+
+@media (min-width: 768px) {
+  .gho-top-figures .gho-figures {
+    display: flex;
+    justify-content: space-between;
+    padding-top: 2rem;
+    border-top: 1px solid #d8d8d8;
+  }
+  /* hide border-top when NaR immediately follows a Hero image caption */
+  .gho-caption--article + .gho-top-figures .gho-figures {
+    border-top: 0;
+  }
+  .gho-top-figures:not(.gho-top-figures--small) .gho-figures .gho-figure {
+    display: inline-block;
+    flex-basis: 33.33%;
+    flex-grow: 1;
+    flex-shrink: 0;
+    padding: 0 1.5rem;
+    border-width: 0 0 0 1px;
+  }
+  [dir="ltr"] .gho-top-figures:not(.gho-top-figures--small) .gho-figures .gho-figure:first-child {
+    padding-left: 0;
+    border-width: 0;
+  }
+  [dir="rtl"] .gho-top-figures:not(.gho-top-figures--small) .gho-figures .gho-figure:first-child {
+    padding-right: 0;
+    border-width: 0 0 0 1px;
+  }
+  [dir="rtl"] .gho-top-figures:not(.gho-top-figures--small) .gho-figures .gho-figure:last-child {
+    border-width: 0;
+  }
+  .gho-top-figures .gho-figure__label {
+    font-size: 1.125rem;
+  }
+  .gho-top-figures .gho-figure__value {
+    font-size: 2rem;
+  }
+}
+
+@media (min-width: 1024px) {
+  .gho-top-figures .gho-figure__value {
+    font-size: 2.25rem;
+  }
 }
diff --git a/html/themes/custom/common_design_subtheme/templates/content/gho-figures-formatter--large.html.twig b/html/themes/custom/common_design_subtheme/templates/content/gho-figures-formatter--large.html.twig
index c50e2943..70ced23c 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/gho-figures-formatter--large.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/gho-figures-formatter--large.html.twig
@@ -13,7 +13,6 @@
 #}
 {%
   set classes = [
-    'gho-needs-and-requirements',
     'gho-figures',
     'gho-figures--large',
   ]
@@ -21,9 +20,9 @@
 {% if figures %}
 <div{{ attributes.addClass(classes) }}>
 {% for figure in figures %}
-  <div class="gho-needs-and-requirements-figure gho-figure">
-    <div class="gho-needs-and-requirements-figure__label gho-figure__label">{{ figure.label }}</div>
-    <div class="gho-needs-and-requirements-figure__value gho-figure__value" data-footnote="{{ figure.footnote }}">{{ figure.value }}</div>
+  <div class="gho-figure">
+    <div class="gho-figure__label">{{ figure.label }}</div>
+    <div class="gho-figure__value" data-footnote="{{ figure.footnote }}">{{ figure.value }}</div>
   </div>
 {% endfor %}
 </div>
diff --git a/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures-small.html.twig b/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures-small.html.twig
new file mode 100644
index 00000000..67fc3bbe
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures-small.html.twig
@@ -0,0 +1,5 @@
+<div class="gho-top-figures__source">
+{%- for item in items -%}
+  {{ item.content }}
+{%- endfor -%}
+</div>
diff --git a/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures.html.twig b/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures.html.twig
new file mode 100644
index 00000000..67fc3bbe
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-dataset--top-figures.html.twig
@@ -0,0 +1,5 @@
+<div class="gho-top-figures__source">
+{%- for item in items -%}
+  {{ item.content }}
+{%- endfor -%}
+</div>
diff --git a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig
index 84b29572..5de98f44 100644
--- a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures-small.html.twig
@@ -47,6 +47,7 @@
     'paragraph--type--' ~ paragraph.bundle|clean_class,
     not paragraph.isPublished() ? 'paragraph--unpublished',
     'gho-top-figures',
+    'gho-top-figures--small',
     'content-width',
   ]
 %}
diff --git a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig
index 84962867..a06e1782 100644
--- a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--top-figures.html.twig
@@ -40,14 +40,14 @@
  * @ingroup themeable
  */
 #}
-{{ attach_library('common_design_subtheme/gho-needs-and-requirements') }}
+{{ attach_library('common_design_subtheme/gho-top-figures') }}
 {%
   set classes = [
     'paragraph',
     'paragraph--type--' ~ paragraph.bundle|clean_class,
     view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
     not paragraph.isPublished() ? 'paragraph--unpublished',
-    'gho-needs-and-requirements-paragraph',
+    'gho-top-figures',
     'content-width',
   ]
 %}

From 88b9d58425893d963df4f33c26dfb0024fb3048f Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Mon, 22 Apr 2024 18:03:45 +0200
Subject: [PATCH 04/17] HPC-9466: Better handle update of multi-language
 paragraph types, update configuration, don't show flag, but preprocess
 article_card_list template and add class for the flag

---
 ...ay.paragraph.article_card_list.default.yml | 74 +++++++++++++++++--
 ...ay.paragraph.article_card_list.default.yml | 13 +---
 ...ld.field.node.article.field_paragraphs.yml |  4 +-
 ...le_card_list.field_emphasize_first_row.yml | 13 +++-
 ...raphs.paragraphs_type.achievement_list.yml |  2 +-
 ...aphs.paragraphs_type.article_card_list.yml |  9 ++-
 ...aragraphs.paragraphs_type.article_list.yml |  2 +-
 ...aphs.paragraphs_type.bottom_figure_row.yml |  2 +-
 ...graphs.paragraphs_type.download_button.yml |  2 +-
 ...aphs.paragraphs_type.facts_and_figures.yml |  2 +-
 config/paragraphs.paragraphs_type.heading.yml |  2 +-
 ...graphs.paragraphs_type.image_with_text.yml |  2 +-
 ...paragraphs.paragraphs_type.infographic.yml |  2 +-
 ...hs.paragraphs_type.interactive_content.yml |  2 +-
 ...phs_type.interactive_content_2_columns.yml |  2 +-
 ...ragraphs.paragraphs_type.photo_gallery.yml |  2 +-
 .../paragraphs.paragraphs_type.separator.yml  |  2 +-
 config/paragraphs.paragraphs_type.text.yml    |  2 +-
 ...paragraphs.paragraphs_type.top_figures.yml |  2 +-
 ...aphs.paragraphs_type.top_figures_small.yml |  2 +-
 .../custom/gho_fields/gho_fields.deploy.php   | 22 ++++--
 .../ncms_paragraphs/ncms_paragraphs.module    | 12 ++-
 .../src/Entity/NcmsParagraphBase.php          |  5 ++
 .../src/Entity/NcmsParagraphInterface.php     |  5 ++
 .../src/Entity/Paragraph/ArticleCardList.php  | 21 ++++++
 .../paragraph--article-card-list.html.twig    |  3 +-
 26 files changed, 158 insertions(+), 53 deletions(-)
 create mode 100644 html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/ArticleCardList.php

diff --git a/config/core.entity_form_display.paragraph.article_card_list.default.yml b/config/core.entity_form_display.paragraph.article_card_list.default.yml
index d5888b23..9cb656c3 100755
--- a/config/core.entity_form_display.paragraph.article_card_list.default.yml
+++ b/config/core.entity_form_display.paragraph.article_card_list.default.yml
@@ -3,34 +3,92 @@ langcode: en
 status: true
 dependencies:
   config:
+    - entity_browser.browser.articles
     - field.field.paragraph.article_card_list.field_articles
     - field.field.paragraph.article_card_list.field_emphasize_first_row
     - paragraphs.paragraphs_type.article_card_list
+  module:
+    - field_group
+    - ncms_ui
+third_party_settings:
+  field_group:
+    group_tabs:
+      children:
+        - group_articles
+        - group_settings
+      label: Tabs
+      region: content
+      parent_name: ''
+      weight: 0
+      format_type: tabs
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        direction: horizontal
+        width_breakpoint: 640
+    group_articles:
+      children:
+        - field_articles
+      label: Articles
+      region: content
+      parent_name: group_tabs
+      weight: 6
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: open
+        description: ''
+        required_fields: true
+    group_settings:
+      children:
+        - field_emphasize_first_row
+      label: Settings
+      region: content
+      parent_name: group_tabs
+      weight: 7
+      format_type: tab
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        formatter: closed
+        description: ''
+        required_fields: true
 id: paragraph.article_card_list.default
 targetEntityType: paragraph
 bundle: article_card_list
 mode: default
 content:
   field_articles:
-    type: entity_reference_autocomplete
-    weight: 1
+    type: entity_reference_browser_table_widget_ncms
+    weight: 2
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+      open: false
+      entity_browser: articles
+      field_widget_display: label
+      field_widget_edit: '1'
+      field_widget_remove: '1'
+      selection_mode: selection_append
+      field_widget_replace: 0
+      additional_fields:
+        options:
+          status: 0
+      field_widget_display_settings: {  }
     third_party_settings: {  }
   field_emphasize_first_row:
     type: boolean_checkbox
-    weight: 0
+    weight: 2
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 2
+    weight: 3
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_view_display.paragraph.article_card_list.default.yml b/config/core.entity_view_display.paragraph.article_card_list.default.yml
index 8cb07106..05a6612c 100755
--- a/config/core.entity_view_display.paragraph.article_card_list.default.yml
+++ b/config/core.entity_view_display.paragraph.article_card_list.default.yml
@@ -20,14 +20,5 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
-  field_emphasize_first_row:
-    type: boolean
-    label: hidden
-    settings:
-      format: custom
-      format_custom_false: default
-      format_custom_true: show-2col
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden: {  }
+hidden:
+  field_emphasize_first_row: true
diff --git a/config/field.field.node.article.field_paragraphs.yml b/config/field.field.node.article.field_paragraphs.yml
index ab32fee4..f2bdea68 100755
--- a/config/field.field.node.article.field_paragraphs.yml
+++ b/config/field.field.node.article.field_paragraphs.yml
@@ -6,7 +6,6 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.article
     - paragraphs.paragraphs_type.achievement
-    - paragraphs.paragraphs_type.article_card_list
     - paragraphs.paragraphs_type.document_articles
     - paragraphs.paragraphs_type.document_chapter
   module:
@@ -34,7 +33,6 @@ settings:
   handler_settings:
     target_bundles:
       achievement: achievement
-      article_card_list: article_card_list
       document_articles: document_articles
       document_chapter: document_chapter
     negate: 1
@@ -47,7 +45,7 @@ settings:
         enabled: false
       article_card_list:
         weight: -34
-        enabled: true
+        enabled: false
       article_list:
         weight: -33
         enabled: false
diff --git a/config/field.field.paragraph.article_card_list.field_emphasize_first_row.yml b/config/field.field.paragraph.article_card_list.field_emphasize_first_row.yml
index 83a7d585..9c109a95 100755
--- a/config/field.field.paragraph.article_card_list.field_emphasize_first_row.yml
+++ b/config/field.field.paragraph.article_card_list.field_emphasize_first_row.yml
@@ -5,14 +5,23 @@ dependencies:
   config:
     - field.storage.paragraph.field_emphasize_first_row
     - paragraphs.paragraphs_type.article_card_list
+  module:
+    - field_config_cardinality
+third_party_settings:
+  field_config_cardinality:
+    cardinality_config: '1'
+    cardinality_label_config: false
+    unlimited_not_required: ''
+    limited_not_required: ''
+    limited_required: ''
 id: paragraph.article_card_list.field_emphasize_first_row
 field_name: field_emphasize_first_row
 entity_type: paragraph
 bundle: article_card_list
 label: 'Show first two items in 2-column layout?'
-description: ''
+description: 'Check this to display the first 2 articles bigger than the following.'
 required: false
-translatable: false
+translatable: true
 default_value:
   -
     value: 0
diff --git a/config/paragraphs.paragraphs_type.achievement_list.yml b/config/paragraphs.paragraphs_type.achievement_list.yml
index e61d80de..0ba79a8e 100755
--- a/config/paragraphs.paragraphs_type.achievement_list.yml
+++ b/config/paragraphs.paragraphs_type.achievement_list.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: list
-    disabled: 0
+    disabled: false
 id: achievement_list
 label: 'Achievement list'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.article_card_list.yml b/config/paragraphs.paragraphs_type.article_card_list.yml
index 8a6d5059..24513da5 100755
--- a/config/paragraphs.paragraphs_type.article_card_list.yml
+++ b/config/paragraphs.paragraphs_type.article_card_list.yml
@@ -3,16 +3,17 @@ langcode: en
 status: true
 dependencies:
   module:
-    - layout_paragraphs
+    - ncms_paragraphs
     - ncms_publisher
+third_party_settings:
+  ncms_paragraphs:
+    category: content
+    disabled: true
 id: article_card_list
 label: 'Article Card List'
 icon_uuid: null
 icon_default: null
 description: 'A list of Articles rendered as cards with thumbnails.'
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
   promoted_behavior:
     enabled: true
diff --git a/config/paragraphs.paragraphs_type.article_list.yml b/config/paragraphs.paragraphs_type.article_list.yml
index de997bff..a0487dfa 100755
--- a/config/paragraphs.paragraphs_type.article_list.yml
+++ b/config/paragraphs.paragraphs_type.article_list.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: list
-    disabled: 0
+    disabled: false
 id: article_list
 label: 'Article list'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.bottom_figure_row.yml b/config/paragraphs.paragraphs_type.bottom_figure_row.yml
index 13df9b4d..71e92179 100755
--- a/config/paragraphs.paragraphs_type.bottom_figure_row.yml
+++ b/config/paragraphs.paragraphs_type.bottom_figure_row.yml
@@ -9,7 +9,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: content
-    disabled: 1
+    disabled: true
 id: bottom_figure_row
 label: 'Bottom figure row (deprecated)'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.download_button.yml b/config/paragraphs.paragraphs_type.download_button.yml
index 853c4702..ec547c5f 100755
--- a/config/paragraphs.paragraphs_type.download_button.yml
+++ b/config/paragraphs.paragraphs_type.download_button.yml
@@ -7,7 +7,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: misc
-    disabled: 0
+    disabled: false
 id: download_button
 label: 'Download button'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.facts_and_figures.yml b/config/paragraphs.paragraphs_type.facts_and_figures.yml
index fbb318b0..5b1e480f 100755
--- a/config/paragraphs.paragraphs_type.facts_and_figures.yml
+++ b/config/paragraphs.paragraphs_type.facts_and_figures.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: list
-    disabled: 0
+    disabled: false
 id: facts_and_figures
 label: 'Facts and figures'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.heading.yml b/config/paragraphs.paragraphs_type.heading.yml
index bc41c0e3..adda1c16 100755
--- a/config/paragraphs.paragraphs_type.heading.yml
+++ b/config/paragraphs.paragraphs_type.heading.yml
@@ -7,7 +7,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: content
-    disabled: 0
+    disabled: false
 id: heading
 label: Heading
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.image_with_text.yml b/config/paragraphs.paragraphs_type.image_with_text.yml
index 4c592163..c059aeb8 100755
--- a/config/paragraphs.paragraphs_type.image_with_text.yml
+++ b/config/paragraphs.paragraphs_type.image_with_text.yml
@@ -7,7 +7,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: media
-    disabled: 0
+    disabled: false
 id: image_with_text
 label: 'Image with text'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.infographic.yml b/config/paragraphs.paragraphs_type.infographic.yml
index d3ba2c73..6e460b54 100644
--- a/config/paragraphs.paragraphs_type.infographic.yml
+++ b/config/paragraphs.paragraphs_type.infographic.yml
@@ -7,7 +7,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: media
-    disabled: 0
+    disabled: false
 id: infographic
 label: Infographic
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.interactive_content.yml b/config/paragraphs.paragraphs_type.interactive_content.yml
index b3418e61..86f956a2 100755
--- a/config/paragraphs.paragraphs_type.interactive_content.yml
+++ b/config/paragraphs.paragraphs_type.interactive_content.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: widget
-    disabled: 0
+    disabled: false
 id: interactive_content
 label: 'Interactive content'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml b/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml
index 0238e291..9b16f6f5 100644
--- a/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml
+++ b/config/paragraphs.paragraphs_type.interactive_content_2_columns.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: widget
-    disabled: 0
+    disabled: false
 id: interactive_content_2_columns
 label: 'Interactive content (2 columns)'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.photo_gallery.yml b/config/paragraphs.paragraphs_type.photo_gallery.yml
index c56ae89d..74af0d56 100755
--- a/config/paragraphs.paragraphs_type.photo_gallery.yml
+++ b/config/paragraphs.paragraphs_type.photo_gallery.yml
@@ -7,7 +7,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: media
-    disabled: 0
+    disabled: false
 id: photo_gallery
 label: 'Photo Gallery'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.separator.yml b/config/paragraphs.paragraphs_type.separator.yml
index 94917d32..f31bb184 100755
--- a/config/paragraphs.paragraphs_type.separator.yml
+++ b/config/paragraphs.paragraphs_type.separator.yml
@@ -7,7 +7,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: misc
-    disabled: 0
+    disabled: false
 id: separator
 label: Separator
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.text.yml b/config/paragraphs.paragraphs_type.text.yml
index dc653dce..a78311af 100755
--- a/config/paragraphs.paragraphs_type.text.yml
+++ b/config/paragraphs.paragraphs_type.text.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: content
-    disabled: 0
+    disabled: false
 id: text
 label: Text
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.top_figures.yml b/config/paragraphs.paragraphs_type.top_figures.yml
index 91534569..61ea04e1 100644
--- a/config/paragraphs.paragraphs_type.top_figures.yml
+++ b/config/paragraphs.paragraphs_type.top_figures.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: content
-    disabled: 0
+    disabled: false
 id: top_figures
 label: 'Top figures'
 icon_uuid: null
diff --git a/config/paragraphs.paragraphs_type.top_figures_small.yml b/config/paragraphs.paragraphs_type.top_figures_small.yml
index 6bd04794..c164ea2b 100644
--- a/config/paragraphs.paragraphs_type.top_figures_small.yml
+++ b/config/paragraphs.paragraphs_type.top_figures_small.yml
@@ -8,7 +8,7 @@ dependencies:
 third_party_settings:
   ncms_paragraphs:
     category: content
-    disabled: 0
+    disabled: false
 id: top_figures_small
 label: 'Top figures (small)'
 icon_uuid: null
diff --git a/html/modules/custom/gho_fields/gho_fields.deploy.php b/html/modules/custom/gho_fields/gho_fields.deploy.php
index 2c9067d5..abec277d 100644
--- a/html/modules/custom/gho_fields/gho_fields.deploy.php
+++ b/html/modules/custom/gho_fields/gho_fields.deploy.php
@@ -5,6 +5,7 @@
  * Post update functions for GHO Fields.
  */
 
+use Drupal\Core\Field\FieldItemInterface;
 use Drupal\paragraphs\ParagraphInterface;
 
 /**
@@ -105,13 +106,7 @@ function gho_fields_deploy_migrate_bottom_figure_rows_paragraphs_to_top_figures(
     $field_config = $entity_type_manager
       ->getStorage('field_config')
       ->load($paragraph->getEntityTypeId() . '.' . $target_bundle . '.field_figures');
-
-    $figures = $paragraph->get('field_figures');
     $max_figures = $field_config->getThirdPartySetting('field_config_cardinality', 'cardinality_config');
-    if ($figures->count() > $max_figures) {
-      continue;
-    }
-
     foreach ($paragraph->getTranslationLanguages() as $language) {
       if ($language->isDefault()) {
         continue;
@@ -119,8 +114,13 @@ function gho_fields_deploy_migrate_bottom_figure_rows_paragraphs_to_top_figures(
       if (!$paragraph->hasTranslation($language->getId())) {
         continue;
       }
-      $translated_paragraph = \Drupal::service('entity.repository')->getTranslationFromContext($paragraph, $language->getId());
+
+      $translated_paragraph = $paragraph->getTranslation($language->getId());
       $figures = $translated_paragraph->get('field_figures');
+      $figures->filter(function (FieldItemInterface $figure) use ($language) {
+        return $figure->getLangcode() == $language->getId();
+      });
+
       if (!$figures || $figures->isEmpty()) {
         $translated_paragraph->delete();
         continue;
@@ -137,6 +137,14 @@ function gho_fields_deploy_migrate_bottom_figure_rows_paragraphs_to_top_figures(
       }
     }
 
+    $figures = $paragraph->get('field_figures');
+    $figures->filter(function (FieldItemInterface $figure) use ($paragraph) {
+      return $figure->getLangcode() == $paragraph->language()->getId();
+    });
+    if ($figures->count() > $max_figures) {
+      continue;
+    }
+
     $top_figures_paragraph = ghi_fields_create_top_figures_from_paragraph($paragraph, $target_bundle);
     if ($top_figures_paragraph) {
       $paragraph->delete();
diff --git a/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module
index d7a6be4b..83736d52 100644
--- a/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module
+++ b/html/modules/custom/ncms_paragraphs/ncms_paragraphs.module
@@ -72,6 +72,16 @@ function ncms_paragraphs_form_layout_paragraphs_component_form_alter(&$form, For
 
 }
 
+/**
+ * Implements hook_preprocess_paragraph().
+ */
+function ncms_paragraphs_preprocess_paragraph(&$variables) {
+  $paragraph = $variables['paragraph'];
+  if ($paragraph instanceof NcmsParagraphInterface) {
+    $paragraph->preprocess($variables);
+  }
+}
+
 /**
  * Implements hook_preprocess_layout_paragraphs_builder().
  */
@@ -80,7 +90,7 @@ function ncms_paragraphs_preprocess_layout_paragraphs_builder(&$variables) {
 }
 
 /**
- * Implements hook_layout_paragraphs_builder_component_menu().
+ * Implements hook_preprocess_layout_paragraphs_builder_component_menu().
  */
 function ncms_paragraphs_preprocess_layout_paragraphs_builder_component_menu(&$variables) {
   /** @var \Drupal\ncms_paragraphs\ComponentMenu $component_menu */
diff --git a/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php
index 4d386452..475f38e4 100644
--- a/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php
+++ b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphBase.php
@@ -15,4 +15,9 @@ abstract class NcmsParagraphBase extends Paragraph implements NcmsParagraphInter
    */
   public function entityFormAlter(&$form, FormStateInterface $form_state) {}
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preprocess(&$variables) {}
+
 }
diff --git a/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php
index 362b0f9c..40556556 100644
--- a/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php
+++ b/html/modules/custom/ncms_paragraphs/src/Entity/NcmsParagraphInterface.php
@@ -15,4 +15,9 @@ interface NcmsParagraphInterface extends ParagraphInterface {
    */
   public function entityFormAlter(&$form, FormStateInterface $form_state);
 
+  /**
+   * Preprocess the entity view.
+   */
+  public function preprocess(&$variables);
+
 }
diff --git a/html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/ArticleCardList.php b/html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/ArticleCardList.php
new file mode 100644
index 00000000..0bd7192b
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/src/Entity/Paragraph/ArticleCardList.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\ncms_paragraphs\Entity\Paragraph;
+
+use Drupal\ncms_paragraphs\Entity\NcmsParagraphBase;
+
+/**
+ * Entity class for paragraphs of type article_card_list.
+ */
+class ArticleCardList extends NcmsParagraphBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preprocess(&$variables) {
+    if ($this->get('field_emphasize_first_row')->value) {
+      $variables['attributes']['class'][] = 'gho-article-card-list--show-2col';
+    }
+  }
+
+}
diff --git a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--article-card-list.html.twig b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--article-card-list.html.twig
index 64ecd6ac..1395837d 100644
--- a/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--article-card-list.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/paragraphs/paragraph--article-card-list.html.twig
@@ -48,12 +48,11 @@
     view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
     not paragraph.isPublished() ? 'paragraph--unpublished',
     'gho-article-card-list',
-    'gho-article-card-list--' ~ content.field_emphasize_first_row|render|striptags|trim|clean_class,
     'content-width',
   ]
 %}
 {% set title = content.field_title|render %}
-{% set content = content|without('field_title','field_emphasize_first_row')|render %}
+{% set content = content|without('field_title')|render %}
 {% if content %}
 {% block paragraph %}
   <div{{ attributes.addClass(classes) }}>

From cce73c61a2affccfd846f6d014dfa58d45d56f79 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Tue, 23 Apr 2024 09:32:41 +0200
Subject: [PATCH 05/17] HPC-9466: Add unit tests for the StringHelper class

---
 .../tests/src/Unit/StringHelperTest.php       | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 html/modules/custom/ncms_paragraphs/tests/src/Unit/StringHelperTest.php

diff --git a/html/modules/custom/ncms_paragraphs/tests/src/Unit/StringHelperTest.php b/html/modules/custom/ncms_paragraphs/tests/src/Unit/StringHelperTest.php
new file mode 100644
index 00000000..45da09ad
--- /dev/null
+++ b/html/modules/custom/ncms_paragraphs/tests/src/Unit/StringHelperTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\Tests\ncms_paragraphs\Unit;
+
+use Drupal\ncms_paragraphs\Helpers\StringHelper;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests the StringHelper service.
+ */
+class StringHelperTest extends UnitTestCase {
+
+  /**
+   * Data provider for testMakeCamelCase.
+   */
+  public function makeCamelCaseDataProvider() {
+    return [
+      ['camel_case', FALSE, 'CamelCase'],
+      ['Camel_Case', TRUE, 'camelCase'],
+      ['Camel Case', TRUE, 'camel Case'],
+      ['Camel-Case', TRUE, 'camel-Case'],
+      ['Camel Case_Case', TRUE, 'camel CaseCase'],
+      ['Camel-Case_Case', TRUE, 'camel-CaseCase'],
+    ];
+  }
+
+  /**
+   * Test making string camel case.
+   *
+   * @group StringHelper
+   * @dataProvider makeCamelCaseDataProvider
+   */
+  public function testMakeCamelCase($string, $initial_lower_case, $result) {
+    $this->assertEquals($result, StringHelper::makeCamelCase($string, $initial_lower_case));
+  }
+
+  /**
+   * Data provider for testCamelCaseToUnderscoreCase.
+   */
+  public function camelCaseToUnderscoreCaseDataProvider() {
+    return [
+      ['camelCase', 'camel_case'],
+      ['camelCaseCase', 'camel_case_case'],
+      ['CamelCaseCase', 'camel_case_case'],
+      ['CCC', 'ccc'],
+      ['CaCaCa', 'ca_ca_ca'],
+    ];
+  }
+
+  /**
+   * Test making string camel case.
+   *
+   * @group StringHelper
+   * @dataProvider camelCaseToUnderscoreCaseDataProvider
+   */
+  public function testCamelCaseToUnderscoreCase($string, $result) {
+    $this->assertEquals($result, StringHelper::camelCaseToUnderscoreCase($string));
+  }
+
+}

From c0443968268518afc937b57c99275af09eef8a5a Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Tue, 23 Apr 2024 09:56:17 +0200
Subject: [PATCH 06/17] HPC-9466: Move paragraph specific behavior to
 ncms_paragraphs for consistency

---
 html/modules/custom/ncms_graphql/ncms_graphql.info.yml          | 1 +
 .../src/Plugin/paragraphs/Behavior/PromoteBehavior.php          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename html/modules/custom/{ncms_publisher => ncms_paragraphs}/src/Plugin/paragraphs/Behavior/PromoteBehavior.php (96%)

diff --git a/html/modules/custom/ncms_graphql/ncms_graphql.info.yml b/html/modules/custom/ncms_graphql/ncms_graphql.info.yml
index dd38f9b0..ce6ca0ca 100644
--- a/html/modules/custom/ncms_graphql/ncms_graphql.info.yml
+++ b/html/modules/custom/ncms_graphql/ncms_graphql.info.yml
@@ -5,4 +5,5 @@ package: HPC Content Module
 dependencies:
   - graphql:graphql
   - node:node
+  - ncms_paragraphs:ncms_paragraphs
 core_version_requirement: ^9.3 || ^10
diff --git a/html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php b/html/modules/custom/ncms_paragraphs/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
similarity index 96%
rename from html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
rename to html/modules/custom/ncms_paragraphs/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
index c856cb8f..47ac7c42 100644
--- a/html/modules/custom/ncms_publisher/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
+++ b/html/modules/custom/ncms_paragraphs/src/Plugin/paragraphs/Behavior/PromoteBehavior.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\ncms_publisher\Plugin\paragraphs\Behavior;
+namespace Drupal\ncms_paragraphs\Plugin\paragraphs\Behavior;
 
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Form\FormStateInterface;

From e914fa81269a99a66724e9540df753db5797e5e7 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Tue, 23 Apr 2024 11:36:36 +0200
Subject: [PATCH 07/17] HPC-9466: Add unit tests for ContentSpaceManager

---
 .docksal/commands/phpunit                     |  20 +-
 .docksal/docksal.yml                          |   2 +
 .../src/Unit/ContentSpaceManagerTest.php      | 217 ++++++++++++++++++
 3 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Unit/ContentSpaceManagerTest.php

diff --git a/.docksal/commands/phpunit b/.docksal/commands/phpunit
index a2e2e90f..2513a903 100644
--- a/.docksal/commands/phpunit
+++ b/.docksal/commands/phpunit
@@ -11,7 +11,6 @@
 #   $DOCROOT - name of the docroot folder
 #   $DOCKER_RUNNING - (string) "true" or "false"
 
-args="$@"
 path="/var/www"
 phpunit_xml_path="$PROJECT_ROOT/phpunit.xml"
 
@@ -27,4 +26,21 @@ if [[ ! -f "$phpunit_path" ]]; then
   exit 1
 fi
 
-fin exec "php $path/${phpunit_path} -c $path ${args} $path/$DOCROOT/modules/custom"
\ No newline at end of file
+
+COVERAGE=false
+args=""
+while [ "$1" != "" ]; do
+  case $1 in
+    --open-coverage )  COVERAGE=true
+                       ;;
+    *)                 args="$args $1"
+                       ;;
+  esac
+  shift
+done
+
+fin exec "XDEBUG_MODE=coverage $path/${phpunit_path} -c $path ${args} $path/$DOCROOT/modules/custom --coverage-html $path/$DOCROOT/sites/simpletest/test-coverage"
+
+if $COVERAGE; then
+  fin utils/open-link "http://ghi-site.docksal.site/sites/simpletest/test-coverage/dashboard.html"
+fi
\ No newline at end of file
diff --git a/.docksal/docksal.yml b/.docksal/docksal.yml
index 328ab3f1..dc94ed86 100644
--- a/.docksal/docksal.yml
+++ b/.docksal/docksal.yml
@@ -9,6 +9,8 @@ services:
       - HID_CLIENT_SECRET
       - GRAPHQL_KEY
       - COMPOSER_MEMORY_LIMIT=-1
+      - XDEBUG_ENABLED=1
+      - XDEBUG_MODE=off
 
   browser:
     hostname: browser
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/ContentSpaceManagerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/ContentSpaceManagerTest.php
new file mode 100644
index 00000000..11bec69d
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/ContentSpaceManagerTest.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\Core\TempStore\PrivateTempStore;
+use Drupal\Core\TempStore\PrivateTempStoreFactory;
+use Drupal\ncms_ui\ContentSpaceManager;
+use Drupal\ncms_ui\Entity\Taxonomy\ContentSpace;
+use Drupal\taxonomy\TermStorageInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\user\UserInterface;
+use Drupal\user\UserStorageInterface;
+use Drupal\views\Plugin\ViewsHandlerManager;
+use Prophecy\Argument;
+
+/**
+ * Tests the ncms_ui.content_space.manager service.
+ */
+class ContentSpaceManagerTest extends UnitTestCase {
+
+  /**
+   * Data provider for testIsContentSpaceRestrictPath.
+   */
+  public function isContentSpaceRestrictPathDataProvider() {
+    return [
+      ['/admin/content', TRUE],
+      ['/admin/media/grid', TRUE],
+      ['/article/123', FALSE],
+    ];
+  }
+
+  /**
+   * Test the isContentSpaceRestrictPath method.
+   *
+   * @dataProvider isContentSpaceRestrictPathDataProvider
+   */
+  public function testIsContentSpaceRestrictPath($path, $result) {
+    $content_space_manager = $this->getContentSpaceManager();
+    $this->assertEquals($result, $content_space_manager->isContentSpaceRestrictPath($path));
+  }
+
+  /**
+   * Test the shouldRestrictContentSpaces method.
+   */
+  public function testShouldRestrictContentSpaces() {
+    $content_space_manager = $this->getContentSpaceManager();
+    $this->assertEquals(TRUE, $content_space_manager->shouldRestrictContentSpaces('node'));
+    $this->assertEquals(TRUE, $content_space_manager->shouldRestrictContentSpaces('media'));
+    $content_space_manager = $this->getContentSpaceManager(1, ['administer nodes']);
+    $this->assertEquals(FALSE, $content_space_manager->shouldRestrictContentSpaces('node'));
+    $this->assertEquals(TRUE, $content_space_manager->shouldRestrictContentSpaces('media'));
+    $content_space_manager = $this->getContentSpaceManager(1, ['administer media']);
+    $this->assertEquals(TRUE, $content_space_manager->shouldRestrictContentSpaces('node'));
+    $this->assertEquals(FALSE, $content_space_manager->shouldRestrictContentSpaces('media'));
+  }
+
+  /**
+   * Test the userIsInValidContentSpace method.
+   */
+  public function testUserIsInValidContentSpace() {
+    $content_spaces = [
+      1 => $this->createContentSpace(1, 'Content space 1'),
+      2 => $this->createContentSpace(2, 'Content space 2'),
+    ];
+    $current_content_space = 1;
+    $user_content_spaces = [1, 2];
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, $current_content_space, $user_content_spaces);
+    $this->assertEquals(TRUE, $content_space_manager->userIsInValidContentSpace());
+    $user_content_spaces = [2];
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, $current_content_space, $user_content_spaces);
+    $this->assertEquals(FALSE, $content_space_manager->userIsInValidContentSpace());
+  }
+
+  /**
+   * Test the getValidContentSpaceIdsForUser method.
+   */
+  public function testGetValidContentSpaceIdsForCurrentUser() {
+    $content_spaces = [
+      1 => $this->createContentSpace(1, 'Content space 1'),
+      2 => $this->createContentSpace(2, 'Content space 2'),
+      3 => $this->createContentSpace(3, 'Content space 3'),
+      4 => $this->createContentSpace(4, 'Content space 4'),
+    ];
+    $current_content_space = 1;
+    $user_content_spaces = [1, 2];
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, $current_content_space, $user_content_spaces);
+    $content_space_ids = $content_space_manager->getValidContentSpaceIdsForCurrentUser();
+    $this->assertIsArray($content_space_ids);
+    $this->assertEquals([1 => 1, 2 => 2], $content_space_ids);
+  }
+
+  /**
+   * Test the buildContentSpaceSelector method.
+   */
+  public function testBuildContentSpaceSelector() {
+    $content_spaces = [
+      1 => $this->createContentSpace(1, 'Content space 1'),
+      2 => $this->createContentSpace(2, 'Content space 2'),
+      3 => $this->createContentSpace(3, 'Content space 3'),
+      4 => $this->createContentSpace(4, 'Content space 4'),
+    ];
+    $current_content_space = 1;
+    $user_content_spaces = [1, 3];
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, $current_content_space, $user_content_spaces);
+    $selector_element = $content_space_manager->buildContentSpaceSelector();
+    $this->assertIsArray($selector_element);
+    $this->assertEquals(1, $selector_element['#default_value']);
+    $options = $selector_element['#options'];
+    $this->assertArrayHasKey('My content spaces', $options);
+    $this->assertEquals([
+      1 => 'Content space 1',
+      3 => 'Content space 3',
+    ], $options['My content spaces']);
+    $this->assertArrayHasKey('Other content spaces', $options);
+    $this->assertEquals([
+      2 => 'Content space 2',
+      4 => 'Content space 4',
+    ], $options['Other content spaces']);
+  }
+
+  /**
+   * Test the getCurrentContentSpace method.
+   */
+  public function testGetCurrentContentSpace() {
+    $content_spaces = [
+      1 => $this->createContentSpace(1, 'Content space 1'),
+      2 => $this->createContentSpace(2, 'Content space 2'),
+    ];
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, 1);
+    $this->assertEquals($content_spaces[1], $content_space_manager->getCurrentContentSpace());
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, NULL, [2]);
+    $this->assertEquals($content_spaces[2], $content_space_manager->getCurrentContentSpace());
+  }
+
+  /**
+   * Test the getCurrentContentSpaceId method.
+   */
+  public function testGetCurrentContentSpaceId() {
+    $content_spaces = [
+      1 => $this->createContentSpace(1, 'Content space 1'),
+      2 => $this->createContentSpace(2, 'Content space 2'),
+    ];
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, 1);
+    $this->assertEquals(1, $content_space_manager->getCurrentContentSpaceId());
+    $content_space_manager = $this->getContentSpaceManager(1, [], $content_spaces, NULL, [2]);
+    $this->assertEquals(2, $content_space_manager->getCurrentContentSpaceId());
+  }
+
+  /**
+   * Get the content space manager.
+   *
+   * @return Drupal\ncms_ui\ContentSpaceManager
+   *   The content space manager service.
+   */
+  private function getContentSpaceManager($uid = 1, array $user_permissions = NULL, array $content_spaces = NULL, $current_content_space_id = NULL, array $user_content_space_ids = NULL) {
+    $account = $this->prophesize(AccountInterface::class);
+    $account->id()->willReturn($uid);
+    $user = $this->prophesize(UserInterface::class);
+    if ($user_permissions) {
+      $user->hasPermission(Argument::any())->willReturn(FALSE);
+      foreach ($user_permissions as $permission) {
+        $user->hasPermission($permission)->willReturn(TRUE);
+      }
+    }
+    if ($user_content_space_ids) {
+      $content_space_field = $this->prophesize(EntityReferenceFieldItemListInterface::class);
+      $content_space_field->getValue()->willReturn(array_map(function ($id) {
+        return ['target_id' => $id];
+      }, $user_content_space_ids));
+      $user->get('field_content_spaces')->willReturn($content_space_field);
+    }
+    $user_storage = $this->prophesize(UserStorageInterface::class);
+    $user_storage->load($uid)->willReturn($user);
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+    $entity_type_manager->getStorage('user')->willReturn($user_storage);
+    if ($content_spaces) {
+      $term_storage = $this->prophesize(TermStorageInterface::class);
+      $term_storage->loadByProperties(['vid' => 'content_space'])->willReturn($content_spaces);
+      $term_storage->load(Argument::any())->willReturn(NULL);
+      foreach ($content_spaces as $id => $content_space) {
+        $term_storage->load($id)->willReturn($content_space);
+      }
+      $entity_type_manager->getStorage('taxonomy_term')->willReturn($term_storage);
+    }
+    $temp_store_factory = $this->prophesize(PrivateTempStoreFactory::class);
+    $private_temp_store = $this->prophesize(PrivateTempStore::class);
+    $private_temp_store->get('content_space')->willReturn($current_content_space_id);
+    $temp_store_factory->get('ncms_content_manager')->willReturn($private_temp_store);
+    $views_join = $this->prophesize(ViewsHandlerManager::class);
+
+    $content_space_manager = new ContentSpaceManager($entity_type_manager->reveal(), $account->reveal(), $temp_store_factory->reveal(), $views_join->reveal());
+    $string_translation = $this->prophesize(TranslationInterface::class);
+    $string_translation->translateString(Argument::cetera())->will(function ($args) {
+      return $args[0]->getUntranslatedString();
+    });
+    $content_space_manager->setStringTranslation($string_translation->reveal());
+    return $content_space_manager;
+  }
+
+  /**
+   * Create a content space term.
+   *
+   * @return \Drupal\ncms_ui\Entity\Taxonomy\ContentSpace
+   *   A content space term.
+   */
+  private function createContentSpace($id, $label) {
+    $term = $this->prophesize(ContentSpace::class);
+    $term->id()->willReturn($id);
+    $term->label()->willReturn($label);
+    return $term->reveal();
+  }
+
+}

From db89ad0d907bd0c215f7f15f7f550c1fcc2c4bb6 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Tue, 23 Apr 2024 13:47:58 +0200
Subject: [PATCH 08/17] HPC-9466: Add unit tests for ContentController,
 MediaController and TermController

---
 .../src/Controller/ContentController.php      | 11 +--
 .../src/Controller/MediaController.php        | 11 +--
 .../src/Traits/ContentSpaceManagerTrait.php   | 45 +++++++++
 .../tests/src/Unit/ContentControllerTest.php  | 96 +++++++++++++++++++
 .../tests/src/Unit/MediaControllerTest.php    | 69 +++++++++++++
 .../tests/src/Unit/TermControllerTest.php     | 48 ++++++++++
 6 files changed, 264 insertions(+), 16 deletions(-)
 create mode 100644 html/modules/custom/ncms_ui/src/Traits/ContentSpaceManagerTrait.php
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Unit/MediaControllerTest.php
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Unit/TermControllerTest.php

diff --git a/html/modules/custom/ncms_ui/src/Controller/ContentController.php b/html/modules/custom/ncms_ui/src/Controller/ContentController.php
index 7511e802..88be4df7 100644
--- a/html/modules/custom/ncms_ui/src/Controller/ContentController.php
+++ b/html/modules/custom/ncms_ui/src/Controller/ContentController.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\ncms_ui\ContentSpaceManager;
+use Drupal\ncms_ui\Traits\ContentSpaceManagerTrait;
 use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -17,13 +18,7 @@
 class ContentController extends ControllerBase implements ContainerInjectionInterface {
 
   use StringTranslationTrait;
-
-  /**
-   * The ncms content manager service.
-   *
-   * @var \Drupal\ncms_ui\ContentSpaceManager
-   */
-  protected $contentSpaceManager;
+  use ContentSpaceManagerTrait;
 
   /**
    * Creates a ContentController object.
@@ -55,7 +50,7 @@ public static function create(ContainerInterface $container) {
    *   will be TRUE.
    */
   public function nodeCreateAccess(AccountInterface $account) {
-    return $this->contentSpaceManager->userIsInValidContentSpace() ? AccessResult::allowed() : AccessResult::neutral();
+    return $this->getContentSpaceManager()->userIsInValidContentSpace($account) ? AccessResult::allowed() : AccessResult::neutral();
   }
 
   /**
diff --git a/html/modules/custom/ncms_ui/src/Controller/MediaController.php b/html/modules/custom/ncms_ui/src/Controller/MediaController.php
index 0328e1a2..670100a4 100644
--- a/html/modules/custom/ncms_ui/src/Controller/MediaController.php
+++ b/html/modules/custom/ncms_ui/src/Controller/MediaController.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\ncms_ui\ContentSpaceManager;
+use Drupal\ncms_ui\Traits\ContentSpaceManagerTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -16,13 +17,7 @@
 class MediaController extends ControllerBase implements ContainerInjectionInterface {
 
   use StringTranslationTrait;
-
-  /**
-   * The ncms content manager service.
-   *
-   * @var \Drupal\ncms_ui\ContentSpaceManager
-   */
-  protected $contentSpaceManager;
+  use ContentSpaceManagerTrait;
 
   /**
    * Creates a MediaController object.
@@ -54,7 +49,7 @@ public static function create(ContainerInterface $container) {
    *   will be TRUE.
    */
   public function mediaCreateAccess(AccountInterface $account) {
-    return $this->contentSpaceManager->userIsInValidContentSpace() ? AccessResult::allowed() : AccessResult::neutral();
+    return $this->getContentSpaceManager()->userIsInValidContentSpace($account) ? AccessResult::allowed() : AccessResult::neutral();
   }
 
 }
diff --git a/html/modules/custom/ncms_ui/src/Traits/ContentSpaceManagerTrait.php b/html/modules/custom/ncms_ui/src/Traits/ContentSpaceManagerTrait.php
new file mode 100644
index 00000000..1c05c438
--- /dev/null
+++ b/html/modules/custom/ncms_ui/src/Traits/ContentSpaceManagerTrait.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\ncms_ui\Traits;
+
+use Drupal\ncms_ui\ContentSpaceManager;
+
+/**
+ * Trait for entities supporting content spaces via ContentSpaceAwareInterface.
+ *
+ * This assumes that the implementing entity bundle has an entity reference
+ * field named 'field_content_space'.
+ */
+trait ContentSpaceManagerTrait {
+
+  /**
+   * The ncms content manager service.
+   *
+   * @var \Drupal\ncms_ui\ContentSpaceManager
+   */
+  protected $contentSpaceManager;
+
+  /**
+   * Get the content space manager service.
+   *
+   * @return \Drupal\ncms_ui\ContentSpaceManager
+   *   The content space manager.
+   */
+  public function getContentSpaceManager() {
+    if (!$this->contentSpaceManager) {
+      $this->contentSpaceManager = \Drupal::service('ncms_ui.content_space.manager');
+    }
+    return $this->contentSpaceManager;
+  }
+
+  /**
+   * Set the content space manager service.
+   *
+   * @param \Drupal\ncms_ui\ContentSpaceManager $content_space_manager
+   *   The content space manager.
+   */
+  public function setContentSpaceManager(ContentSpaceManager $content_space_manager) {
+    $this->contentSpaceManager = $content_space_manager;
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php
new file mode 100644
index 00000000..e63a2213
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\ncms_ui\ContentSpaceManager;
+use Drupal\ncms_ui\Controller\ContentController;
+use Drupal\node\NodeInterface;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+
+/**
+ * Tests the ContentController.
+ */
+class ContentControllerTest extends UnitTestCase {
+
+  /**
+   * The media controller.
+   *
+   * @var \Drupal\ncms_ui\Controller\ContentController
+   */
+  private $controller;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $content_space_manager = $this->prophesize(ContentSpaceManager::class);
+    $this->controller = new ContentController($content_space_manager->reveal());
+
+    $string_translation = $this->prophesize(TranslationInterface::class);
+    $string_translation->translateString(Argument::cetera())->will(function ($args) {
+      return $args[0]->getUntranslatedString();
+    });
+
+    $this->controller->setStringTranslation($string_translation->reveal());
+  }
+
+  /**
+   * Test the controller instantiation using ::create().
+   */
+  public function testCreateClass() {
+    $container = new ContainerBuilder();
+    $container->set('ncms_ui.content_space.manager', $this->prophesize(ContentSpaceManager::class)->reveal());
+    $controller = ContentController::create($container);
+    \Drupal::setContainer($container);
+    $this->assertInstanceOf(ContentController::class, $controller);
+  }
+
+  /**
+   * Test the mediaCreateAccess method.
+   */
+  public function testNodeCreateAccess() {
+    $content_space_manager = $this->prophesize(ContentSpaceManager::class);
+    $account = $this->prophesize(AccountInterface::class)->reveal();
+
+    $content_space_manager->userIsInValidContentSpace($account)->willReturn(TRUE);
+    $this->controller->setContentSpaceManager($content_space_manager->reveal());
+    $this->assertEquals(TRUE, $this->controller->nodeCreateAccess($account)->isAllowed());
+
+    $content_space_manager->userIsInValidContentSpace($account)->willReturn(FALSE);
+    $this->controller->setContentSpaceManager($content_space_manager->reveal());
+    $this->assertEquals(FALSE, $this->controller->nodeCreateAccess($account)->isAllowed());
+  }
+
+  /**
+   * Test the versionAccess method.
+   */
+  public function testVersionAccess() {
+    $account = $this->prophesize(AccountInterface::class)->reveal();
+    $node = $this->prophesize(NodeInterface::class);
+    $node->access('update', $account)->willReturn(TRUE);
+    $node->access('view revision', $account)->willReturn(TRUE);
+    $this->assertEquals(TRUE, $this->controller->versionAccess($node->reveal(), $account)->isAllowed());
+
+    $node = $this->prophesize(NodeInterface::class);
+    $node->access('update', $account)->willReturn(TRUE);
+    $node->access('view revision', $account)->willReturn(FALSE);
+    $this->assertEquals(FALSE, $this->controller->versionAccess($node->reveal(), $account)->isAllowed());
+
+    $node = $this->prophesize(NodeInterface::class);
+    $node->access('update', $account)->willReturn(FALSE);
+    $node->access('view revision', $account)->willReturn(TRUE);
+    $this->assertEquals(FALSE, $this->controller->versionAccess($node->reveal(), $account)->isAllowed());
+
+    $node = $this->prophesize(NodeInterface::class);
+    $node->access('update', $account)->willReturn(FALSE);
+    $node->access('view revision', $account)->willReturn(FALSE);
+    $this->assertEquals(FALSE, $this->controller->versionAccess($node->reveal(), $account)->isAllowed());
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/MediaControllerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/MediaControllerTest.php
new file mode 100644
index 00000000..404044c2
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/MediaControllerTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\ncms_ui\ContentSpaceManager;
+use Drupal\ncms_ui\Controller\MediaController;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+
+/**
+ * Tests the MediaController.
+ */
+class MediaControllerTest extends UnitTestCase {
+
+  /**
+   * The media controller.
+   *
+   * @var \Drupal\ncms_ui\Controller\MediaController
+   */
+  private $controller;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $content_space_manager = $this->prophesize(ContentSpaceManager::class);
+    $this->controller = new MediaController($content_space_manager->reveal());
+
+    $string_translation = $this->prophesize(TranslationInterface::class);
+    $string_translation->translateString(Argument::cetera())->will(function ($args) {
+      return $args[0]->getUntranslatedString();
+    });
+
+    $this->controller->setStringTranslation($string_translation->reveal());
+  }
+
+  /**
+   * Test the controller instantiation using ::create().
+   */
+  public function testCreateClass() {
+    $container = new ContainerBuilder();
+    $container->set('ncms_ui.content_space.manager', $this->prophesize(ContentSpaceManager::class)->reveal());
+    $controller = MediaController::create($container);
+    \Drupal::setContainer($container);
+    $this->assertInstanceOf(MediaController::class, $controller);
+  }
+
+  /**
+   * Test the mediaCreateAccess method.
+   */
+  public function testMediaCreateAccess() {
+    $content_space_manager = $this->prophesize(ContentSpaceManager::class);
+    $account = $this->prophesize(AccountInterface::class);
+
+    $content_space_manager->userIsInValidContentSpace($account->reveal())->willReturn(TRUE);
+    $this->controller->setContentSpaceManager($content_space_manager->reveal());
+    $this->assertEquals(TRUE, $this->controller->mediaCreateAccess($account->reveal())->isAllowed());
+
+    $content_space_manager->userIsInValidContentSpace($account->reveal())->willReturn(FALSE);
+    $this->controller->setContentSpaceManager($content_space_manager->reveal());
+    $this->assertEquals(FALSE, $this->controller->mediaCreateAccess($account->reveal())->isAllowed());
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/TermControllerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/TermControllerTest.php
new file mode 100644
index 00000000..d299fd87
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/TermControllerTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui;
+
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\ncms_ui\Controller\TermController;
+use Drupal\taxonomy\VocabularyInterface;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+
+/**
+ * Tests the TermController.
+ */
+class TermControllerTest extends UnitTestCase {
+
+  /**
+   * The term controller.
+   *
+   * @var \Drupal\ncms_ui\Controller\TermController
+   */
+  private $controller;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->controller = new TermController();
+
+    $string_translation = $this->prophesize(TranslationInterface::class);
+    $string_translation->translateString(Argument::cetera())->will(function ($args) {
+      return $args[0]->getUntranslatedString();
+    });
+
+    $this->controller->setStringTranslation($string_translation->reveal());
+  }
+
+  /**
+   * Test the addFormTitle method.
+   */
+  public function testAddFormTitle() {
+    $vocabulary = $this->prophesize(VocabularyInterface::class);
+    $vocabulary->label()->willReturn('Vocabulary label');
+    $this->assertEquals('Add vocabulary label', (string) $this->controller->addFormTitle($vocabulary->reveal()));
+  }
+
+}

From 869a3f05cc27ee3e2d7fd730d91bb47b4a398907 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Tue, 23 Apr 2024 16:31:45 +0200
Subject: [PATCH 09/17] HPC-9466: Add kernel tests for content entities

---
 html/modules/custom/ncms_ui/ncms_ui.info.yml  |   1 +
 .../ncms_ui/tests/src/Kernel/ArticleTest.php  | 262 ++++++++++++++++++
 .../ncms_ui/tests/src/Kernel/DocumentTest.php |  47 ++++
 .../ncms_ui/tests/src/Kernel/StoryTest.php    |  47 ++++
 phpunit.xml                                   |   2 +
 5 files changed, 359 insertions(+)
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php

diff --git a/html/modules/custom/ncms_ui/ncms_ui.info.yml b/html/modules/custom/ncms_ui/ncms_ui.info.yml
index 8da0b344..252942c9 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.info.yml
+++ b/html/modules/custom/ncms_ui/ncms_ui.info.yml
@@ -9,6 +9,7 @@ dependencies:
   - social_auth_hid:social_auth_hid
   - replicate_ui:replicate_ui
   - diff:diff
+  - views:views
   - drupal:content_moderation
   - entity_browser_table:entity_browser_table
   - paragraphs:paragraphs
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
new file mode 100644
index 00000000..9cb526af
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
@@ -0,0 +1,262 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\ncms_ui\Entity\Content\Article;
+use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentVersionInterface;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\user\Traits\UserCreationTrait;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Tests the article entity.
+ *
+ * @group ncms_ui
+ */
+class ArticleTest extends KernelTestBase {
+
+  use ContentModerationTestTrait;
+  use ContentTypeCreationTrait;
+  use UserCreationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'system',
+    'field',
+    'user',
+    'node',
+    'text',
+    'views',
+    'workflows',
+    'content_moderation',
+    'ncms_publisher',
+    'ncms_ui',
+    'ncms_ui_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->installSchema('node', 'node_access');
+    $this->installSchema('user', 'users_data');
+    $this->installEntitySchema('content_moderation_state');
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('workflow');
+    $this->installConfig([
+      'field',
+      'system',
+      'node',
+      'content_moderation',
+      'ncms_ui',
+    ]);
+
+    $this->createContentType([
+      'type' => 'article',
+    ]);
+    $workflow = $this->createArticleWorkflow();
+    $this->addEntityTypeAndBundleToWorkflow($workflow, 'node', 'article');
+  }
+
+  /**
+   * Test the overview url.
+   */
+  public function testGetOverviewUrl() {
+    $article = Article::create([
+      'title' => 'Article title',
+    ]);
+    $this->assertEquals('/admin/content', $article->getOverviewUrl()->toString());
+  }
+
+  /**
+   * Test the moderation states.
+   */
+  public function testModerationStates() {
+    $article = Article::create([
+      'title' => 'Article title',
+    ]);
+    $article->save();
+    $this->assertFalse($article->isNew());
+
+    $article->setUnpublished();
+    $article->setNewRevision(TRUE);
+    $article->save();
+    $this->assertEquals('draft', $article->moderation_state->value);
+    $this->assertEquals('Draft', $article->getModerationStateLabel());
+    $this->assertEquals(ContentBase::CONTENT_STATUS_DRAFT, $article->getContentStatus());
+    $this->assertEquals('Draft', $article->getContentStatusLabel());
+    $this->assertEquals('Draft', $article->getVersionStatusLabel());
+
+    $article->setPublished();
+    $article->setNewRevision(TRUE);
+    $article->save();
+    $this->assertEquals('published', $article->moderation_state->value);
+    $this->assertEquals('Published', $article->getModerationStateLabel());
+    $this->assertEquals(ContentBase::CONTENT_STATUS_PUBLISHED, $article->getContentStatus());
+    $this->assertEquals('Published', $article->getContentStatusLabel());
+    $this->assertEquals('Published', $article->getVersionStatusLabel());
+
+    $article->setUnpublished();
+    $article->setNewRevision(TRUE);
+    $article->save();
+    $this->assertEquals('draft', $article->moderation_state->value);
+    $this->assertEquals('Draft', $article->getModerationStateLabel());
+    $this->assertEquals(ContentBase::CONTENT_STATUS_PUBLISHED_WITH_DRAFT, $article->getContentStatus());
+    $this->assertEquals('Published with newer draft', $article->getContentStatusLabel());
+    $this->assertEquals('Draft', $article->getVersionStatusLabel());
+
+    $article->setDeleted();
+    $article->setNewRevision(TRUE);
+    $article->save();
+    $this->assertEquals('trash', $article->moderation_state->value);
+    $this->assertEquals('Archived', $article->getModerationStateLabel());
+    $this->assertEquals(ContentBase::CONTENT_STATUS_DELETED, $article->getContentStatus());
+    $this->assertEquals('Deleted', $article->getContentStatusLabel());
+    $this->assertEquals('Deleted', $article->getVersionStatusLabel());
+
+    $revision = $article->getPreviousRevision();
+    $this->assertInstanceOf(ContentVersionInterface::class, $revision);
+    $this->assertEquals('draft', $revision->moderation_state->value);
+
+    $this->assertEquals(TRUE, $article->isDeleted());
+  }
+
+  /**
+   * Test the entity operations.
+   */
+  public function testEntityOperations() {
+    $article = Article::create([
+      'title' => 'Article title',
+    ]);
+    $article->setPublished();
+    $article->setNewRevision(TRUE);
+    $article->save();
+
+    // Setting current user.
+    $this->setUpCurrentUser(['uid' => 1], [
+      'administer nodes',
+    ]);
+    $operations = $article->getEntityOperations();
+    $this->assertIsArray($operations);
+
+    $this->assertArrayHasKey('versions', $operations);
+    $this->assertArrayHasKey('soft_delete', $operations);
+    $this->assertArrayHasKey('restore', $operations);
+    $this->assertArrayHasKey('delete', $operations);
+
+    $article->setDeleted();
+    $article->setNewRevision(TRUE);
+    $article->save();
+
+    $operations = $article->getEntityOperations();
+    $this->assertIsArray($operations);
+
+    $this->assertArrayNotHasKey('versions', $operations);
+    $this->assertArrayNotHasKey('soft_delete', $operations);
+    // @todo These 2 operations should actually be available at this point.
+    // This test misses the setup of content spaces to fully test this.
+    $this->assertArrayNotHasKey('restore', $operations);
+    $this->assertArrayNotHasKey('delete', $operations);
+
+  }
+
+  /**
+   * Creates the article workflow.
+   *
+   * @return \Drupal\workflows\Entity\Workflow
+   *   The editorial workflow entity.
+   */
+  protected function createArticleWorkflow() {
+    $workflow = Workflow::create([
+      'type' => 'content_moderation',
+      'id' => 'article_workflow',
+      'label' => 'Publishing (with draft and soft delete)',
+      'type_settings' => [
+        'states' => [
+          'trash' => [
+            'label' => 'Archived',
+            'weight' => 5,
+            'published' => FALSE,
+            'default_revision' => TRUE,
+          ],
+          'draft' => [
+            'label' => 'Draft',
+            'published' => FALSE,
+            'default_revision' => FALSE,
+            'weight' => -2,
+          ],
+          'published' => [
+            'label' => 'Published',
+            'published' => TRUE,
+            'default_revision' => TRUE,
+            'weight' => 0,
+          ],
+        ],
+        'transitions' => [
+          'create_new_draft' => [
+            'label' => 'Create New Draft',
+            'to' => 'draft',
+            'weight' => 0,
+            'from' => [
+              'draft',
+            ],
+          ],
+          'delete' => [
+            'label' => 'Archive',
+            'from' => ['draft', 'published'],
+            'to' => 'trash',
+            'weight' => 2,
+          ],
+          'publish' => [
+            'label' => 'Publish',
+            'to' => 'published',
+            'weight' => 1,
+            'from' => [
+              'draft',
+            ],
+          ],
+          'restore_draft' => [
+            'label' => 'Restore to draft',
+            'to' => 'draft',
+            'weight' => 1,
+            'from' => [
+              'trash',
+            ],
+          ],
+          'restore_publish' => [
+            'label' => 'Restore and Publish',
+            'to' => 'published',
+            'weight' => 1,
+            'from' => [
+              'trash',
+            ],
+          ],
+
+          'save_draft_leave_current_published' => [
+            'label' => 'Create draft (leave current version published)',
+            'from' => ['published'],
+            'to' => 'draft',
+            'weight' => 3,
+          ],
+          'update' => [
+            'label' => 'Update',
+            'from' => ['published'],
+            'to' => 'published',
+            'weight' => 4,
+          ],
+        ],
+      ],
+    ]);
+    $workflow->save();
+    return $workflow;
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php
new file mode 100644
index 00000000..c92ffcd8
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\ncms_ui\Entity\Content\Document;
+
+/**
+ * Tests the document entity.
+ *
+ * @group ncms_ui
+ */
+class DocumentTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'field',
+    'user',
+    'node',
+    'views',
+    'ncms_publisher',
+    'ncms_ui',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig('field');
+  }
+
+  /**
+   * Test the overview url.
+   */
+  public function testGetOverviewUrl() {
+    $document = Document::create([
+      'title' => 'Document title',
+    ]);
+    $this->assertEquals('/admin/content/documents', $document->getOverviewUrl()->toString());
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php
new file mode 100644
index 00000000..d29049fc
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\ncms_ui\Entity\Content\Story;
+
+/**
+ * Tests the story entity.
+ *
+ * @group ncms_ui
+ */
+class StoryTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'field',
+    'user',
+    'node',
+    'views',
+    'ncms_publisher',
+    'ncms_ui',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig('field');
+  }
+
+  /**
+   * Test the overview url.
+   */
+  public function testGetOverviewUrl() {
+    $story = Story::create([
+      'title' => 'Story title',
+    ]);
+    $this->assertEquals('/admin/content/stories', $story->getOverviewUrl()->toString());
+  }
+
+}
diff --git a/phpunit.xml b/phpunit.xml
index 5738a5cd..86eefb29 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -20,6 +20,8 @@
     <env name="MINK_DRIVER_CLASS" value=''/>
     <env name="MINK_DRIVER_ARGS" value=''/>
     <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", { "chromeOptions": { "w3c": false } }, "http://browser:4444/wd/hub"]'/>
+
+    <!-- This is for tests based on ExistingSiteBase -->
     <env name="DTT_BASE_URL" value="http://hpc-content-site.docksal.site"/>
     <env name="DTT_API_URL" value="http://localhost:9222"/>
     <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", { "chromeOptions" : { "w3c": false } }, "http://localhost:4444/wd/hub"]'/>

From 62c547e2d2a90446e4a5e43a540199e4756758fa Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Tue, 23 Apr 2024 22:57:43 +0200
Subject: [PATCH 10/17] HPC-9466: Add kernel tests to cover ContentBase

---
 .../ncms_ui/tests/src/Kernel/ArticleTest.php  | 83 ++++++++++++++-----
 .../tests/src/Traits/ContentTestTrait.php     |  4 +-
 2 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
index 9cb526af..f1d48e42 100644
--- a/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
@@ -6,7 +6,7 @@
 use Drupal\ncms_ui\Entity\Content\Article;
 use Drupal\ncms_ui\Entity\Content\ContentBase;
 use Drupal\ncms_ui\Entity\ContentVersionInterface;
-use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+use Drupal\Tests\ncms_ui\Traits\ContentTestTrait;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\user\Traits\UserCreationTrait;
 use Drupal\workflows\Entity\Workflow;
@@ -18,9 +18,9 @@
  */
 class ArticleTest extends KernelTestBase {
 
-  use ContentModerationTestTrait;
   use ContentTypeCreationTrait;
   use UserCreationTrait;
+  use ContentTestTrait;
 
   /**
    * {@inheritdoc}
@@ -30,8 +30,11 @@ class ArticleTest extends KernelTestBase {
     'field',
     'user',
     'node',
+    'taxonomy',
     'text',
     'views',
+    'replicate',
+    'replicate_ui',
     'workflows',
     'content_moderation',
     'ncms_publisher',
@@ -50,11 +53,14 @@ protected function setUp(): void {
     $this->installEntitySchema('content_moderation_state');
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
+    $this->installEntitySchema('taxonomy_term');
     $this->installEntitySchema('workflow');
+    $this->installConfig(['replicate_ui']);
     $this->installConfig([
       'field',
       'system',
       'node',
+      'taxonomy',
       'content_moderation',
       'ncms_ui',
     ]);
@@ -63,7 +69,8 @@ protected function setUp(): void {
       'type' => 'article',
     ]);
     $workflow = $this->createArticleWorkflow();
-    $this->addEntityTypeAndBundleToWorkflow($workflow, 'node', 'article');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
+    $workflow->save();
   }
 
   /**
@@ -76,6 +83,37 @@ public function testGetOverviewUrl() {
     $this->assertEquals('/admin/content', $article->getOverviewUrl()->toString());
   }
 
+  /**
+   * Test the access method.
+   */
+  public function testAccess() {
+    $this->createVocabulary([
+      'vid' => 'content_space',
+    ]);
+    $this->setupContentSpaceStructure();
+
+    $content_space = $this->createContentSpace();
+    $user = $this->setUpCurrentUser([
+      'field_content_spaces' => [['target_id' => $content_space->id()]],
+    ], [], TRUE);
+    /** @var \Drupal\ncms_ui\Entity\Content\Article $article */
+    $article = $this->createArticleInContentSpace('Article in content space', $content_space->id());
+    $this->assertInstanceOf(Article::class, $article);
+    $this->assertEquals($content_space->id(), $article->getContentSpace()->id());
+    $this->assertEquals(TRUE, $article->hasContentSpaceAccess($user));
+    $this->assertTrue($article->access('update'));
+    $this->assertTrue($article->access('publish revision'));
+    $this->assertFalse($article->access('restore'));
+
+    $article->setDeleted();
+    $article->setNewRevision(TRUE);
+    $article->save();
+    $this->assertTrue($article->access('restore'));
+
+    $user = $this->setUpCurrentUser([], [], TRUE);
+    $this->assertFalse($article->access('delete'));
+  }
+
   /**
    * Test the moderation states.
    */
@@ -83,8 +121,12 @@ public function testModerationStates() {
     $article = Article::create([
       'title' => 'Article title',
     ]);
+    $this->assertTrue($article->isNew());
+    $this->assertFalse($article->isDeleted());
+    $this->assertNull($article->getVersionId());
     $article->save();
     $this->assertFalse($article->isNew());
+    $this->assertEquals(1, $article->getVersionId());
 
     $article->setUnpublished();
     $article->setNewRevision(TRUE);
@@ -133,39 +175,38 @@ public function testModerationStates() {
    * Test the entity operations.
    */
   public function testEntityOperations() {
-    $article = Article::create([
-      'title' => 'Article title',
+    $this->createVocabulary([
+      'vid' => 'content_space',
     ]);
-    $article->setPublished();
-    $article->setNewRevision(TRUE);
-    $article->save();
+    $this->setupContentSpaceStructure();
+
+    $content_space = $this->createContentSpace();
+    $user = $this->setUpCurrentUser([
+      'field_content_spaces' => [['target_id' => $content_space->id()]],
+    ], [], TRUE);
+    /** @var \Drupal\ncms_ui\Entity\Content\Article $article */
+    $article = $this->createArticleInContentSpace('Article in content space', $content_space->id());
+    $this->assertInstanceOf(Article::class, $article);
+    $this->assertEquals(TRUE, $article->hasContentSpaceAccess($user));
 
-    // Setting current user.
-    $this->setUpCurrentUser(['uid' => 1], [
-      'administer nodes',
-    ]);
     $operations = $article->getEntityOperations();
     $this->assertIsArray($operations);
-
     $this->assertArrayHasKey('versions', $operations);
     $this->assertArrayHasKey('soft_delete', $operations);
-    $this->assertArrayHasKey('restore', $operations);
-    $this->assertArrayHasKey('delete', $operations);
+    $this->assertArrayNotHasKey('restore', $operations);
+    $this->assertArrayNotHasKey('delete', $operations);
 
     $article->setDeleted();
     $article->setNewRevision(TRUE);
     $article->save();
+    $this->assertEquals(TRUE, $article->isDeleted());
 
     $operations = $article->getEntityOperations();
     $this->assertIsArray($operations);
-
     $this->assertArrayNotHasKey('versions', $operations);
     $this->assertArrayNotHasKey('soft_delete', $operations);
-    // @todo These 2 operations should actually be available at this point.
-    // This test misses the setup of content spaces to fully test this.
-    $this->assertArrayNotHasKey('restore', $operations);
-    $this->assertArrayNotHasKey('delete', $operations);
-
+    $this->assertArrayHasKey('restore', $operations);
+    $this->assertArrayHasKey('delete', $operations);
   }
 
   /**
diff --git a/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php b/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php
index dc840c5c..3e0bf238 100644
--- a/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php
+++ b/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php
@@ -36,7 +36,7 @@ protected function setupContentSpaceStructure() {
 
     $handler_settings = [
       'target_bundles' => [
-        'team' => 'content_space',
+        'content_space' => 'content_space',
       ],
     ];
     $this->createEntityReferenceField('node', 'article', 'field_content_space', 'Content space', 'taxonomy_term', 'default', $handler_settings);
@@ -49,7 +49,7 @@ protected function setupContentSpaceStructure() {
 
     $handler_settings = [
       'target_bundles' => [
-        'team' => 'content_space',
+        'content_space' => 'content_space',
       ],
     ];
     $this->createEntityReferenceField('user', 'user', 'field_content_spaces', 'Content spaces', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);

From 5354f6aedd05a561b0e5a928443875078bab8c48 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Wed, 24 Apr 2024 12:27:49 +0200
Subject: [PATCH 11/17] HPC-9466: Add more unit tests to cover ContentBase,
 refactor entity classes and interfaces to better support testing

---
 html/modules/custom/ncms_ui/ncms_ui.module    |   4 +
 .../ncms_ui/src/Controller/ViewController.php |  42 +++--
 .../src/Entity/Content/ContentBase.php        |  22 ++-
 .../ncms_ui/src/Entity/Content/Story.php      |  12 +-
 .../ncms_ui/src/Entity/ContentInterface.php   |  38 +++++
 .../Entity/IframeDisplayContentInterface.php  |  42 +++++
 .../src/Traits/IframeDisplayContentTrait.php  |  51 ++++++
 .../src/Kernel/{ => Entity}/ArticleTest.php   | 102 +-----------
 .../src/Kernel/{ => Entity}/DocumentTest.php  |   2 +-
 .../src/Kernel/{ => Entity}/StoryTest.php     |  21 ++-
 .../tests/src/Traits/ContentTestTrait.php     |  92 ++++++++++
 .../tests/src/Unit/ContentControllerTest.php  |   2 +-
 .../tests/src/Unit/ViewControllerTest.php     | 157 ++++++++++++++++++
 13 files changed, 459 insertions(+), 128 deletions(-)
 create mode 100644 html/modules/custom/ncms_ui/src/Entity/ContentInterface.php
 create mode 100644 html/modules/custom/ncms_ui/src/Entity/IframeDisplayContentInterface.php
 create mode 100644 html/modules/custom/ncms_ui/src/Traits/IframeDisplayContentTrait.php
 rename html/modules/custom/ncms_ui/tests/src/Kernel/{ => Entity}/ArticleTest.php (73%)
 rename html/modules/custom/ncms_ui/tests/src/Kernel/{ => Entity}/DocumentTest.php (94%)
 rename html/modules/custom/ncms_ui/tests/src/Kernel/{ => Entity}/StoryTest.php (60%)
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php

diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module
index 93ce56b9..b33ee60e 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.module
+++ b/html/modules/custom/ncms_ui/ncms_ui.module
@@ -24,6 +24,7 @@ use Drupal\ncms_ui\Entity\Content\Document;
 use Drupal\ncms_ui\Entity\Content\Story;
 use Drupal\ncms_ui\Entity\ContentSpaceAwareInterface;
 use Drupal\ncms_ui\Entity\EntityOverviewInterface;
+use Drupal\ncms_ui\Entity\IframeDisplayContentInterface;
 use Drupal\ncms_ui\Entity\Media\Author;
 use Drupal\ncms_ui\Entity\Media\Image;
 use Drupal\ncms_ui\Entity\Media\Infographic;
@@ -550,6 +551,9 @@ function ncms_ui_link_alter(&$variables) {
     $node_storage = \Drupal::entityTypeManager()->getStorage('node');
     /** @var \Drupal\node\NodeInterface $node */
     $node = $node_storage->load($route_params['node']);
+    if (!$node instanceof IframeDisplayContentInterface) {
+      return;
+    }
     $node_revision = !empty($route_params['node_revision']) ? $node_storage->loadRevision($route_params['node_revision']) : NULL;
 
     $title = t('Preview: @title', ['@title' => $variables['text']]);
diff --git a/html/modules/custom/ncms_ui/src/Controller/ViewController.php b/html/modules/custom/ncms_ui/src/Controller/ViewController.php
index 933b15d8..b487e128 100644
--- a/html/modules/custom/ncms_ui/src/Controller/ViewController.php
+++ b/html/modules/custom/ncms_ui/src/Controller/ViewController.php
@@ -5,12 +5,14 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\OpenModalDialogCommand;
+use Drupal\Core\Entity\EntityFormInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Url;
 use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\ncms_ui\Entity\ContentVersionInterface;
+use Drupal\ncms_ui\Entity\IframeDisplayContentInterface;
 use Drupal\node\Controller\NodeViewController;
 use Drupal\node\NodeInterface;
 
@@ -44,26 +46,20 @@ public function previewTitle(NodeInterface $node) {
    * Using an iframe to be able to use the full frontend styling from links in
    * the backend.
    */
-  public function viewIframe(NodeInterface $node, NodeInterface $node_revision = NULL, $preview = FALSE) {
+  public function viewIframe(IframeDisplayContentInterface $node, ContentInterface $node_revision = NULL, $preview = FALSE) {
     // Iframe dimensions. The height is set initially, but is adjusted in the
     // client.
     $max_width = '100%';
     $max_height = 800;
 
     if ($preview) {
-      $url = Url::fromRoute('entity.node.preview', [
-        'node_preview' => $node->uuid(),
-        'view_mode_id' => 'full',
-      ]);
+      $url = $node->getIframePreviewUrl();
     }
     elseif ($node_revision !== NULL) {
-      $url = Url::fromRoute('entity.node_revision.standalone', [
-        'node' => $node->id(),
-        'node_revision' => $node_revision->getRevisionId(),
-      ]);
+      $url = $node->getIframeStandaloneRevisionUrl();
     }
     else {
-      $url = Url::fromRoute('entity.node.standalone', ['node' => $node->id()]);
+      $url = $node->getIframeStandaloneUrl();
     }
 
     $build = [
@@ -83,7 +79,7 @@ public function viewIframe(NodeInterface $node, NodeInterface $node_revision = N
           // Add the page title, so that it can be set for the DOM document
           // via javascript once the iframe get's included.
           'data-page-title' => $this->t('@type preview: @label', [
-            '@type' => $node->type->entity->label(),
+            '@type' => $node->getBundleLabel(),
             '@label' => $node->label(),
           ]),
           // Adding this onload fixing formatting issues when printing from
@@ -109,19 +105,19 @@ public function viewIframe(NodeInterface $node, NodeInterface $node_revision = N
    *   The current state of the form.
    */
   public static function previewModal(array $form, FormStateInterface $form_state) {
+    $response = new AjaxResponse();
     /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
     $form_object = $form_state->getFormObject();
-    $entity = $form_object->getEntity();
-
-    $node_preview_controller = ViewController::create(\Drupal::getContainer());
-    $title = $node_preview_controller->previewTitle($entity);
-    $build = $node_preview_controller->viewIframe($entity, NULL, TRUE);
-
-    $response = new AjaxResponse();
-    $response->addCommand(new OpenModalDialogCommand($title, $build, [
-      'width' => '80%',
-      'dialogClass' => 'node-preview',
-    ]));
+    $entity = $form_object instanceof EntityFormInterface ? $form_object->getEntity() : NULL;
+    if ($entity instanceof IframeDisplayContentInterface) {
+      $node_preview_controller = ViewController::create(\Drupal::getContainer());
+      $title = $node_preview_controller->previewTitle($entity);
+      $build = $node_preview_controller->viewIframe($entity, NULL, TRUE);
+      $response->addCommand(new OpenModalDialogCommand($title, $build, [
+        'width' => '80%',
+        'dialogClass' => 'node-preview',
+      ]));
+    }
     return $response;
   }
 
diff --git a/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php b/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php
index 1845bf52..47518c04 100644
--- a/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php
+++ b/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php
@@ -9,20 +9,24 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\ncms_ui\Entity\ContentSpaceAwareInterface;
 use Drupal\ncms_ui\Entity\ContentVersionInterface;
 use Drupal\ncms_ui\Entity\EntityOverviewInterface;
+use Drupal\ncms_ui\Entity\IframeDisplayContentInterface;
 use Drupal\ncms_ui\Traits\ContentSpaceEntityTrait;
+use Drupal\ncms_ui\Traits\IframeDisplayContentTrait;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
 
 /**
  * Bundle class for organization nodes.
  */
-abstract class ContentBase extends Node implements ContentSpaceAwareInterface, ContentVersionInterface, EntityOverviewInterface {
+abstract class ContentBase extends Node implements ContentInterface, ContentSpaceAwareInterface, ContentVersionInterface, EntityOverviewInterface, IframeDisplayContentInterface {
 
   use StringTranslationTrait;
   use ContentSpaceEntityTrait;
+  use IframeDisplayContentTrait;
 
   /**
    * {@inheritdoc}
@@ -69,13 +73,17 @@ public function access($operation = 'view', AccountInterface $account = NULL, $r
   }
 
   /**
-   * Get the URL for the overview backend listing of this content type.
-   *
-   * @return \Drupal\Core\Url
-   *   A url object.
+   * {@inheritdoc}
    */
   abstract public function getOverviewUrl();
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundleLabel() {
+    return $this->type->entity->label();
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -93,7 +101,7 @@ public function setUnpublished() {
   }
 
   /**
-   * Mark this entity as deleted.
+   * {@inheritdoc}
    */
   public function setDeleted() {
     parent::setUnpublished();
@@ -104,7 +112,7 @@ public function setDeleted() {
   }
 
   /**
-   * See if this entity is deleted.
+   * {@inheritdoc}
    */
   public function isDeleted() {
     if ($this->isNew()) {
diff --git a/html/modules/custom/ncms_ui/src/Entity/Content/Story.php b/html/modules/custom/ncms_ui/src/Entity/Content/Story.php
index af0a0cc1..8a8ddcd6 100644
--- a/html/modules/custom/ncms_ui/src/Entity/Content/Story.php
+++ b/html/modules/custom/ncms_ui/src/Entity/Content/Story.php
@@ -5,15 +5,18 @@
 use Drupal\Core\Url;
 use Drupal\ncms_ui\Entity\ContentSpaceAwareInterface;
 use Drupal\ncms_ui\Entity\EntityOverviewInterface;
+use Drupal\ncms_ui\Entity\IframeDisplayContentInterface;
 use Drupal\ncms_ui\Traits\ContentSpaceEntityTrait;
+use Drupal\ncms_ui\Traits\IframeDisplayContentTrait;
 use Drupal\node\Entity\Node;
 
 /**
  * Bundle class for story nodes.
  */
-class Story extends Node implements ContentSpaceAwareInterface, EntityOverviewInterface {
+class Story extends Node implements ContentSpaceAwareInterface, EntityOverviewInterface, IframeDisplayContentInterface {
 
   use ContentSpaceEntityTrait;
+  use IframeDisplayContentTrait;
 
   /**
    * {@inheritdoc}
@@ -22,4 +25,11 @@ public function getOverviewUrl() {
     return Url::fromUri('base:/admin/content/stories');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundleLabel() {
+    return $this->type->entity->label();
+  }
+
 }
diff --git a/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php b/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php
new file mode 100644
index 00000000..7837878f
--- /dev/null
+++ b/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\ncms_ui\Entity;
+
+use Drupal\node\NodeInterface;
+
+/**
+ * Defines an interface for entities with content spaces.
+ */
+interface ContentInterface extends NodeInterface {
+
+  /**
+   * Get the URL for the overview backend listing of this content type.
+   *
+   * @return \Drupal\Core\Url
+   *   A url object.
+   */
+  public function getOverviewUrl();
+
+  /**
+   * Get the bundle label for this content.
+   *
+   * @return string
+   *   The bundle label.
+   */
+  public function getBundleLabel();
+
+  /**
+   * Mark this entity as deleted.
+   */
+  public function setDeleted();
+
+  /**
+   * See if this entity is deleted.
+   */
+  public function isDeleted();
+
+}
diff --git a/html/modules/custom/ncms_ui/src/Entity/IframeDisplayContentInterface.php b/html/modules/custom/ncms_ui/src/Entity/IframeDisplayContentInterface.php
new file mode 100644
index 00000000..8236014e
--- /dev/null
+++ b/html/modules/custom/ncms_ui/src/Entity/IframeDisplayContentInterface.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\ncms_ui\Entity;
+
+/**
+ * Defines an interface for entities with content spaces.
+ */
+interface IframeDisplayContentInterface {
+
+  /**
+   * Return the URL for previews inside iframes.
+   *
+   * @return \Drupal\Core\Url
+   *   The url of the preview page.
+   */
+  public function getIframePreviewUrl(array $options = []);
+
+  /**
+   * Return the URL for a standalone display inside iframes.
+   *
+   * @return \Drupal\Core\Url
+   *   The url of the standalone page.
+   */
+  public function getIframeStandaloneUrl(array $options = []);
+
+  /**
+   * Return the URL for a revisions standalone display inside iframes.
+   *
+   * @return \Drupal\Core\Url
+   *   The url of the standalone page for a revision.
+   */
+  public function getIframeStandaloneRevisionUrl(array $options = []);
+
+  /**
+   * Get the bundle label for this content.
+   *
+   * @return string
+   *   The bundle label.
+   */
+  public function getBundleLabel();
+
+}
diff --git a/html/modules/custom/ncms_ui/src/Traits/IframeDisplayContentTrait.php b/html/modules/custom/ncms_ui/src/Traits/IframeDisplayContentTrait.php
new file mode 100644
index 00000000..e3565b81
--- /dev/null
+++ b/html/modules/custom/ncms_ui/src/Traits/IframeDisplayContentTrait.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\ncms_ui\Traits;
+
+use Drupal\Core\Url;
+use Drupal\node\NodeInterface;
+
+/**
+ * Trait for entities supporting iframe display and preview.
+ */
+trait IframeDisplayContentTrait {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIframePreviewUrl(array $options = []) {
+    if (!$this instanceof NodeInterface) {
+      throw new \Exception('The IframeDisplayContentTrait can only be used by node entities');
+    }
+    return new Url('entity.node.preview', [
+      'node_preview' => $this->uuid(),
+      'view_mode_id' => 'full',
+    ], $options);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIframeStandaloneUrl(array $options = []) {
+    if (!$this instanceof NodeInterface) {
+      throw new \Exception('The IframeDisplayContentTrait can only be used by node entities');
+    }
+    return new Url('entity.node.standalone', [
+      'node' => $this->id(),
+    ], $options);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIframeStandaloneRevisionUrl(array $options = []) {
+    if (!$this instanceof NodeInterface) {
+      throw new \Exception('The IframeDisplayContentTrait can only be used by node entities');
+    }
+    return new Url('entity.node_revision.standalone', [
+      'node' => $this->id(),
+      'node_revision' => $this->getRevisionId(),
+    ], $options);
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php
similarity index 73%
rename from html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
rename to html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php
index f1d48e42..330f95aa 100644
--- a/html/modules/custom/ncms_ui/tests/src/Kernel/ArticleTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\ncms_ui\Kernel;
+namespace Drupal\Tests\ncms_ui\Kernel\Entity;
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\ncms_ui\Entity\Content\Article;
@@ -9,7 +9,6 @@
 use Drupal\Tests\ncms_ui\Traits\ContentTestTrait;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\user\Traits\UserCreationTrait;
-use Drupal\workflows\Entity\Workflow;
 
 /**
  * Tests the article entity.
@@ -83,6 +82,14 @@ public function testGetOverviewUrl() {
     $this->assertEquals('/admin/content', $article->getOverviewUrl()->toString());
   }
 
+  /**
+   * Test the bundle label.
+   */
+  public function testGetBundleLabel() {
+    $article = Article::create();
+    $this->assertEquals('article', $article->getBundleLabel());
+  }
+
   /**
    * Test the access method.
    */
@@ -209,95 +216,4 @@ public function testEntityOperations() {
     $this->assertArrayHasKey('delete', $operations);
   }
 
-  /**
-   * Creates the article workflow.
-   *
-   * @return \Drupal\workflows\Entity\Workflow
-   *   The editorial workflow entity.
-   */
-  protected function createArticleWorkflow() {
-    $workflow = Workflow::create([
-      'type' => 'content_moderation',
-      'id' => 'article_workflow',
-      'label' => 'Publishing (with draft and soft delete)',
-      'type_settings' => [
-        'states' => [
-          'trash' => [
-            'label' => 'Archived',
-            'weight' => 5,
-            'published' => FALSE,
-            'default_revision' => TRUE,
-          ],
-          'draft' => [
-            'label' => 'Draft',
-            'published' => FALSE,
-            'default_revision' => FALSE,
-            'weight' => -2,
-          ],
-          'published' => [
-            'label' => 'Published',
-            'published' => TRUE,
-            'default_revision' => TRUE,
-            'weight' => 0,
-          ],
-        ],
-        'transitions' => [
-          'create_new_draft' => [
-            'label' => 'Create New Draft',
-            'to' => 'draft',
-            'weight' => 0,
-            'from' => [
-              'draft',
-            ],
-          ],
-          'delete' => [
-            'label' => 'Archive',
-            'from' => ['draft', 'published'],
-            'to' => 'trash',
-            'weight' => 2,
-          ],
-          'publish' => [
-            'label' => 'Publish',
-            'to' => 'published',
-            'weight' => 1,
-            'from' => [
-              'draft',
-            ],
-          ],
-          'restore_draft' => [
-            'label' => 'Restore to draft',
-            'to' => 'draft',
-            'weight' => 1,
-            'from' => [
-              'trash',
-            ],
-          ],
-          'restore_publish' => [
-            'label' => 'Restore and Publish',
-            'to' => 'published',
-            'weight' => 1,
-            'from' => [
-              'trash',
-            ],
-          ],
-
-          'save_draft_leave_current_published' => [
-            'label' => 'Create draft (leave current version published)',
-            'from' => ['published'],
-            'to' => 'draft',
-            'weight' => 3,
-          ],
-          'update' => [
-            'label' => 'Update',
-            'from' => ['published'],
-            'to' => 'published',
-            'weight' => 4,
-          ],
-        ],
-      ],
-    ]);
-    $workflow->save();
-    return $workflow;
-  }
-
 }
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/DocumentTest.php
similarity index 94%
rename from html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php
rename to html/modules/custom/ncms_ui/tests/src/Kernel/Entity/DocumentTest.php
index c92ffcd8..3ddcd3c2 100644
--- a/html/modules/custom/ncms_ui/tests/src/Kernel/DocumentTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/DocumentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\ncms_ui\Kernel;
+namespace Drupal\Tests\ncms_ui\Kernel\Entity;
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\ncms_ui\Entity\Content\Document;
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/StoryTest.php
similarity index 60%
rename from html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php
rename to html/modules/custom/ncms_ui/tests/src/Kernel/Entity/StoryTest.php
index d29049fc..641995d4 100644
--- a/html/modules/custom/ncms_ui/tests/src/Kernel/StoryTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/StoryTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\Tests\ncms_ui\Kernel;
+namespace Drupal\Tests\ncms_ui\Kernel\Entity;
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\ncms_ui\Entity\Content\Story;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 
 /**
  * Tests the story entity.
@@ -12,6 +13,8 @@
  */
 class StoryTest extends KernelTestBase {
 
+  use ContentTypeCreationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -19,6 +22,8 @@ class StoryTest extends KernelTestBase {
     'field',
     'user',
     'node',
+    'text',
+    'system',
     'views',
     'ncms_publisher',
     'ncms_ui',
@@ -31,7 +36,7 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('node');
-    $this->installConfig('field');
+    $this->installConfig(['field', 'system', 'node']);
   }
 
   /**
@@ -44,4 +49,16 @@ public function testGetOverviewUrl() {
     $this->assertEquals('/admin/content/stories', $story->getOverviewUrl()->toString());
   }
 
+  /**
+   * Test the bundle label.
+   */
+  public function testGetBundleLabel() {
+    $this->createContentType([
+      'type' => 'story',
+      'name' => 'Story',
+    ]);
+    $story = Story::create();
+    $this->assertEquals('Story', $story->getBundleLabel());
+  }
+
 }
diff --git a/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php b/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php
index 3e0bf238..809b9d3c 100644
--- a/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php
+++ b/html/modules/custom/ncms_ui/tests/src/Traits/ContentTestTrait.php
@@ -12,6 +12,7 @@
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\paragraphs\FunctionalJavascript\ParagraphsTestBaseTrait;
 use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Common helper trait for functional and webdriver tests.
@@ -187,4 +188,95 @@ protected function getContentSpace() {
     return $content_manager->getCurrentContentSpace();
   }
 
+  /**
+   * Creates the article workflow.
+   *
+   * @return \Drupal\workflows\Entity\Workflow
+   *   The editorial workflow entity.
+   */
+  protected function createArticleWorkflow() {
+    $workflow = Workflow::create([
+      'type' => 'content_moderation',
+      'id' => 'article_workflow',
+      'label' => 'Publishing (with draft and soft delete)',
+      'type_settings' => [
+        'states' => [
+          'trash' => [
+            'label' => 'Archived',
+            'weight' => 5,
+            'published' => FALSE,
+            'default_revision' => TRUE,
+          ],
+          'draft' => [
+            'label' => 'Draft',
+            'published' => FALSE,
+            'default_revision' => FALSE,
+            'weight' => -2,
+          ],
+          'published' => [
+            'label' => 'Published',
+            'published' => TRUE,
+            'default_revision' => TRUE,
+            'weight' => 0,
+          ],
+        ],
+        'transitions' => [
+          'create_new_draft' => [
+            'label' => 'Create New Draft',
+            'to' => 'draft',
+            'weight' => 0,
+            'from' => [
+              'draft',
+            ],
+          ],
+          'delete' => [
+            'label' => 'Archive',
+            'from' => ['draft', 'published'],
+            'to' => 'trash',
+            'weight' => 2,
+          ],
+          'publish' => [
+            'label' => 'Publish',
+            'to' => 'published',
+            'weight' => 1,
+            'from' => [
+              'draft',
+            ],
+          ],
+          'restore_draft' => [
+            'label' => 'Restore to draft',
+            'to' => 'draft',
+            'weight' => 1,
+            'from' => [
+              'trash',
+            ],
+          ],
+          'restore_publish' => [
+            'label' => 'Restore and Publish',
+            'to' => 'published',
+            'weight' => 1,
+            'from' => [
+              'trash',
+            ],
+          ],
+
+          'save_draft_leave_current_published' => [
+            'label' => 'Create draft (leave current version published)',
+            'from' => ['published'],
+            'to' => 'draft',
+            'weight' => 3,
+          ],
+          'update' => [
+            'label' => 'Update',
+            'from' => ['published'],
+            'to' => 'published',
+            'weight' => 4,
+          ],
+        ],
+      ],
+    ]);
+    $workflow->save();
+    return $workflow;
+  }
+
 }
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php
index e63a2213..d1667b03 100644
--- a/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/ContentControllerTest.php
@@ -17,7 +17,7 @@
 class ContentControllerTest extends UnitTestCase {
 
   /**
-   * The media controller.
+   * The content controller.
    *
    * @var \Drupal\ncms_ui\Controller\ContentController
    */
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php
new file mode 100644
index 00000000..5b74c4b7
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui;
+
+use Drupal\Core\Access\AccessResultInterface;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Entity\EntityFormInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\UrlGeneratorInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\Core\Url;
+use Drupal\ncms_ui\Controller\ViewController;
+use Drupal\ncms_ui\Entity\Content\Article;
+use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\Content\Story;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+
+/**
+ * Tests the ViewController.
+ */
+class ViewControllerTest extends UnitTestCase {
+
+  /**
+   * The term controller.
+   *
+   * @var \Drupal\ncms_ui\Controller\ViewController
+   */
+  private $controller;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $string_translation = $this->prophesize(TranslationInterface::class);
+    $string_translation->translateString(Argument::cetera())->will(function ($args) {
+      return $args[0]->getUntranslatedString();
+    });
+
+    $container = new ContainerBuilder();
+    $container->set('entity_type.manager', $this->prophesize(EntityTypeManagerInterface::class)->reveal());
+    $container->set('renderer', $this->prophesize(RendererInterface::class)->reveal());
+    $container->set('current_user', $this->prophesize(AccountProxyInterface::class)->reveal());
+    $container->set('entity.repository', $this->prophesize(EntityRepositoryInterface::class)->reveal());
+    $container->set('url_generator', $this->prophesize(UrlGeneratorInterface::class)->reveal());
+    $container->set('string_translation', $string_translation->reveal());
+    \Drupal::setContainer($container);
+
+    $this->controller = ViewController::create($container);
+    // $this->controller->setStringTranslation($string_translation->reveal());
+  }
+
+  /**
+   * Test the previewTitle method.
+   */
+  public function testPreviewTitle() {
+    $article = $this->prophesize(Article::class);
+    $article->label()->willReturn('Article title');
+    $article->getContentStatus()->willReturn(ContentBase::CONTENT_STATUS_PUBLISHED);
+    $this->assertEquals('Preview: Article title (Latest published)', (string) $this->controller->previewTitle($article->reveal()));
+    $article->getContentStatus()->willReturn(ContentBase::CONTENT_STATUS_DRAFT);
+    $this->assertEquals('Preview: Article title (Latest draft)', (string) $this->controller->previewTitle($article->reveal()));
+    $article->getContentStatus()->willReturn(ContentBase::CONTENT_STATUS_PUBLISHED_WITH_DRAFT);
+    $this->assertEquals('Preview: Article title (Latest draft)', (string) $this->controller->previewTitle($article->reveal()));
+
+    $story = $this->prophesize(Story::class);
+    $story->label()->willReturn('Story title');
+    $this->assertEquals('Preview: Story title', (string) $this->controller->previewTitle($story->reveal()));
+  }
+
+  /**
+   * Test the preview method.
+   */
+  public function testPreviewModal() {
+    $url = $this->prophesize(Url::class);
+    $url->toString()->willReturn('/some-url');
+
+    $article = $this->prophesize(Article::class);
+    $article->label()->willReturn('Article title');
+    $article->getBundleLabel()->willReturn('Article');
+    $article->getIframePreviewUrl()->willReturn($url->reveal());
+    $article->getContentStatus()->willReturn(ContentBase::CONTENT_STATUS_PUBLISHED);
+
+    $form_object = $this->prophesize(EntityFormInterface::class);
+    $form_object->getEntity()->willReturn($article->reveal());
+
+    $form_state = $this->prophesize(FormStateInterface::class);
+    $form_state->getFormObject()->willReturn($form_object->reveal());
+
+    $response = $this->controller->previewModal([], $form_state->reveal());
+    $this->assertInstanceOf(AjaxResponse::class, $response);
+  }
+
+  /**
+   * Test the viewIframe method.
+   */
+  public function testViewIframe() {
+    $article = $this->prophesize(Article::class);
+    $article->label()->willReturn('Article title');
+    $article->getBundleLabel()->willReturn('Article');
+
+    // Assert general structure.
+    $url = $this->prophesize(Url::class);
+    $url->toString()->willReturn('/some-url');
+    $article->getIframeStandaloneUrl()->willReturn($url->reveal());
+    $build = $this->controller->viewIframe($article->reveal());
+    $this->assertIsArray($build);
+    $this->assertEquals('/some-url', $build['iframe']['#attributes']['src']);
+
+    // Assert the different types of iframe sources.
+    $article->getIframeStandaloneUrl()
+      ->willReturn($url->reveal())
+      ->shouldBeCalled();
+    $this->controller->viewIframe($article->reveal(), NULL, FALSE);
+
+    $article->getIframeStandaloneRevisionUrl()
+      ->willReturn($url->reveal())
+      ->shouldBeCalled();
+    $this->controller->viewIframe($article->reveal(), $article->reveal(), FALSE);
+
+    $article->getIframePreviewUrl()
+      ->willReturn($url->reveal())
+      ->shouldBeCalled();
+    $this->controller->viewIframe($article->reveal(), NULL, TRUE);
+  }
+
+  /**
+   * Test the nodeCanonicalRouteAccess method.
+   */
+  public function testNodeCanonicalRouteAccess() {
+    $account = $this->prophesize(AccountInterface::class);
+    $account->isAuthenticated()->willReturn(FALSE);
+    $article = $this->prophesize(Article::class);
+    $article->access('update', $account->reveal())->willReturn(FALSE);
+    $result = $this->controller->nodeCanonicalRouteAccess($article->reveal(), $account->reveal());
+    $this->assertInstanceOf(AccessResultInterface::class, $result);
+    $this->assertFalse($result->isAllowed());
+
+    $account->isAuthenticated()->willReturn(TRUE);
+    $article->access('update', $account->reveal())->willReturn(FALSE);
+    $result = $this->controller->nodeCanonicalRouteAccess($article->reveal(), $account->reveal());
+    $this->assertFalse($result->isAllowed());
+
+    $article->access('update', $account->reveal())->willReturn(TRUE);
+    $result = $this->controller->nodeCanonicalRouteAccess($article->reveal(), $account->reveal());
+    $this->assertTrue($result->isAllowed());
+  }
+
+}

From 74dc6060cb56e7fd61bc43368072687018eda2b1 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Wed, 24 Apr 2024 18:51:22 +0200
Subject: [PATCH 12/17] HPC-9466: Slight adjustements to the corporate colors
 in the admin menu

---
 html/modules/custom/ncms_ui/css/ncms_gin.css | 52 +++++++++++++++-----
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/html/modules/custom/ncms_ui/css/ncms_gin.css b/html/modules/custom/ncms_ui/css/ncms_gin.css
index 3da1a957..52908f26 100644
--- a/html/modules/custom/ncms_ui/css/ncms_gin.css
+++ b/html/modules/custom/ncms_ui/css/ncms_gin.css
@@ -7,34 +7,60 @@
 .gin--horizontal-toolbar nav#toolbar-bar {
   width: auto;
 }
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav,
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu,
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li,
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > a.is-active,
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > .toolbar-box > .toolbar-handle:focus {
+.gin--horizontal-toolbar nav#gin-toolbar-bar,
+.gin--horizontal-toolbar nav#gin-toolbar-bar .toolbar .toolbar-menu,
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu,
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu > li,
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu > li > a.is-active,
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu > li > .toolbar-box > .toolbar-handle:focus {
   background-color: rgb(5, 80, 230) !important;
 }
+.toolbar .toolbar-menu,
+.toolbar-horizontal .toolbar-tray,
+.toolbar-horizontal .toolbar-tray .menu-item--expanded.menu-item--expanded,
+.toolbar-tray-horizontal .menu-item--expanded.menu-item--expanded {
+  background-color: rgb(5, 80, 230) !important;
+}
+
+.toolbar-tray-vertical .toolbar-menu,
+.toolbar-tray-vertical .menu-item--expanded.menu-item--expanded,
+.toolbar-tray-vertical .menu-item--expanded.menu-item--expanded li,
+.toolbar-vertical .toolbar-tray .menu-item--expanded.menu-item--expanded li,
+.toolbar-horizontal .toolbar-tray .menu-item--expanded.menu-item--expanded li,
+.toolbar-horizontal .toolbar-menu-administration .toolbar-icon:hover::before {
+  background-color: var(--gin-bg-layer) !important;
+}
+
+#toolbar-bar .toolbar-tab--toolbar-item-user {
+  display: none;
+}
 
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > a.toolbar-icon,
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > .toolbar-box > a.toolbar-icon {
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu > li > a.toolbar-icon,
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu > li > .toolbar-box > a.toolbar-icon {
   color: white !important;
 }
-.gin--horizontal-toolbar #toolbar-item-administration-tray > nav > div > .toolbar-menu > li > a.toolbar-icon::before {
+.gin--horizontal-toolbar .toolbar-tray-horizontal > nav > div > .toolbar-menu > li > a.toolbar-icon::before {
   background-color: white;
 }
-.toolbar .toolbar-bar #toolbar-item-administration-tray .toolbar-icon-admin-toolbar-tools-help.toolbar-icon-default:before {
+.toolbar .toolbar-bar .toolbar-icon-admin-toolbar-tools-help.toolbar-icon-default:before {
   mask-image: url(../assets/toolbar-logo.svg) !important;
   -webkit-mask-image: url(../assets/toolbar-logo.svg) !important;
+  width: 28px !important;
+}
+.toolbar .toolbar-bar .toolbar-tray-horizontal .toolbar-icon-admin-toolbar-tools-help.toolbar-icon-default:before {
   background-color: white !important;
-  width: 28px;
 }
 
-.toolbar .toolbar-bar .toolbar-menu-administration > .toolbar-menu > .menu-item > .toolbar-icon::before,
-.toolbar .toolbar-bar .toolbar-menu-administration > .toolbar-menu > .menu-item > .toolbar-box > .toolbar-icon::before,
-.toolbar .toolbar-bar .toolbar-menu-administration .level-2 .toolbar-handle:focus {
+.gin--horizontal-toolbar .toolbar-tray-horizontal .toolbar-menu > .menu-item > .toolbar-icon::before,
+.gin--horizontal-toolbar .toolbar-tray-horizontal .toolbar-menu > .menu-item > .toolbar-box > .toolbar-icon::before,
+.gin--horizontal-toolbar .toolbar-tray-horizontal .level-2 .toolbar-handle:focus {
   background-color: white;
 }
 
+.gin--horizontal-toolbar .toolbar-tray-vertical nav.toolbar-lining {
+  background-color: var(--gin-bg-layer);
+}
+
 /* The secondary toolbar. */
 .gin-secondary-toolbar .gin-breadcrumb-wrapper {
   display: none;

From 2cfe50c965b145f2f48b7d637dfab080db272cbb Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Thu, 25 Apr 2024 23:36:37 +0200
Subject: [PATCH 13/17] HPC-9466: Fix build

---
 composer.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index 61ac32fd..04746783 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4f27d49a18c45b36b1b0efc31701439b",
+    "content-hash": "26e93d38d1c5ff6c15abae3101f2879d",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3512,17 +3512,17 @@
         },
         {
             "name": "drupal/custom_field",
-            "version": "3.0.0-rc1",
+            "version": "3.0.0-rc2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/custom_field.git",
-                "reference": "3.0.0-rc1"
+                "reference": "3.0.0-rc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/custom_field-3.0.0-rc1.zip",
-                "reference": "3.0.0-rc1",
-                "shasum": "3aec02cf915a3177eb6d107f4eaebd1a4840282e"
+                "url": "https://ftp.drupal.org/files/projects/custom_field-3.0.0-rc2.zip",
+                "reference": "3.0.0-rc2",
+                "shasum": "0a7e27a71a20a9483bb92845625f0827bce9f354"
             },
             "require": {
                 "drupal/core": "^10.2"
@@ -3534,8 +3534,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.0-rc1",
-                    "datestamp": "1712345809",
+                    "version": "3.0.0-rc2",
+                    "datestamp": "1713762104",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."

From 70a633e5e85347447ff753f3c0a51d089e7c0950 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Fri, 26 Apr 2024 13:21:22 +0200
Subject: [PATCH 14/17] HPC-9466: Add composer install to post-deploy command

---
 .docksal/commands/post-deploy | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.docksal/commands/post-deploy b/.docksal/commands/post-deploy
index d7e0de7e..99123d6c 100644
--- a/.docksal/commands/post-deploy
+++ b/.docksal/commands/post-deploy
@@ -34,6 +34,9 @@ while [ "$1" != "" ]; do
   shift
 done
 
+# First make sure that the code base is up to date.
+composer install
+
 if $IMPORT_BACKUP; then
   BACKUP_DIRECTORY="$PROJECT_ROOT/.docksal/backups"
   echo "Looking for backups in ${BACKUP_DIRECTORY}"

From 0820aaea1b50ee65409bdbbcf77475b8c345f1cf Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Fri, 26 Apr 2024 13:22:54 +0200
Subject: [PATCH 15/17] HPC-9466: Save updated entities without creating new
 revisions

---
 html/modules/custom/gho_fields/gho_fields.deploy.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/modules/custom/gho_fields/gho_fields.deploy.php b/html/modules/custom/gho_fields/gho_fields.deploy.php
index abec277d..771a1227 100644
--- a/html/modules/custom/gho_fields/gho_fields.deploy.php
+++ b/html/modules/custom/gho_fields/gho_fields.deploy.php
@@ -198,6 +198,8 @@ function ghi_fields_create_top_figures_from_paragraph(ParagraphInterface $paragr
     $item['target_revision_id'] = $top_figures_paragraph->getRevisionId();
   }
   $parent->get($parent_field_name)->setValue($values);
+  $parent->setNewRevision(FALSE);
+  $parent->setSyncing(TRUE);
   $parent->save();
 
   return $top_figures_paragraph;

From 29f9fe2930f02683793f19483b8ff7fe379dabeb Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Mon, 29 Apr 2024 12:03:14 +0200
Subject: [PATCH 16/17] HPC-9466: Fix an issue with duplicated trash revisions
 for content

---
 .docksal/commands/post-deploy                 |   6 +-
 .../ncms_publisher/ncms_publisher.module      |   4 +-
 .../modules/custom/ncms_ui/ncms_ui.deploy.php |  10 +-
 html/modules/custom/ncms_ui/ncms_ui.install   |  33 ++++
 html/modules/custom/ncms_ui/ncms_ui.module    |  11 +-
 .../src/Controller/RevisionController.php     |  10 +-
 .../src/Entity/Content/ContentBase.php        |  49 ++++--
 .../ncms_ui/src/Entity/ContentInterface.php   |  10 +-
 .../src/Entity/ContentVersionInterface.php    |  35 ++++
 .../src/Entity/Storage/ContentStorage.php     |  76 ++++++++-
 .../ncms_ui/src/Form/ContentBaseFormAlter.php |  13 +-
 .../ncms_ui/src/Form/ContentRestoreForm.php   |  41 +----
 .../src/Form/ContentSoftDeleteForm.php        |   6 +-
 .../src/Form/ContentSpaceFormAlter.php        |   2 +-
 .../src/Form/RevisionOverviewFormAlter.php    |   2 +-
 .../Plugin/views/field/ContentStatusField.php |   4 +-
 .../tests/src/Functional/ContentEditTest.php  |   6 +-
 .../src/Functional/ContentOverviewTest.php    |  10 +-
 .../src/Functional/ContentVersionTest.php     |   6 +-
 .../ContentEditModalsTest.php                 |  18 +-
 .../FunctionalJavascript/DocumentEditTest.php |   6 +-
 .../tests/src/Kernel/Entity/ArticleTest.php   |  10 +-
 .../src/Kernel/Entity/ContentVersionTest.php  | 160 ++++++++++++++++++
 .../tests/src/Unit/ViewControllerTest.php     |   1 -
 24 files changed, 408 insertions(+), 121 deletions(-)
 create mode 100644 html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ContentVersionTest.php

diff --git a/.docksal/commands/post-deploy b/.docksal/commands/post-deploy
index 99123d6c..cbcb433f 100644
--- a/.docksal/commands/post-deploy
+++ b/.docksal/commands/post-deploy
@@ -34,9 +34,6 @@ while [ "$1" != "" ]; do
   shift
 done
 
-# First make sure that the code base is up to date.
-composer install
-
 if $IMPORT_BACKUP; then
   BACKUP_DIRECTORY="$PROJECT_ROOT/.docksal/backups"
   echo "Looking for backups in ${BACKUP_DIRECTORY}"
@@ -68,6 +65,9 @@ if $IMPORT_BACKUP; then
   fi
 fi
 
+# Make sure that the code base is up to date.
+composer install
+
 echo "Set maintenance mode to on"
 drush sset system.maintenance_mode 1 -y
 
diff --git a/html/modules/custom/ncms_publisher/ncms_publisher.module b/html/modules/custom/ncms_publisher/ncms_publisher.module
index e5a20dbf..c531d9e7 100644
--- a/html/modules/custom/ncms_publisher/ncms_publisher.module
+++ b/html/modules/custom/ncms_publisher/ncms_publisher.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 
 /**
  * Implements hook_form_FORM_ID_alter().
@@ -16,7 +16,7 @@ function ncms_publisher_form_node_form_alter(&$form, FormStateInterface $form_st
   /** @var \Drupal\node\NodeForm $form_object */
   $form_object = $form_state->getFormObject();
   $entity = $form_object->getEntity();
-  if (!$entity instanceof ContentBase) {
+  if (!$entity instanceof ContentInterface) {
     return;
   }
 
diff --git a/html/modules/custom/ncms_ui/ncms_ui.deploy.php b/html/modules/custom/ncms_ui/ncms_ui.deploy.php
index 24406899..41774108 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.deploy.php
+++ b/html/modules/custom/ncms_ui/ncms_ui.deploy.php
@@ -8,7 +8,7 @@
 use Drupal\content_moderation\Entity\ContentModerationState;
 use Drupal\content_moderation\Entity\ContentModerationStateInterface;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 
 /**
@@ -63,7 +63,7 @@ function ncms_ui_deploy_set_moderation_state() {
     /** @var \Drupal\node\NodeInterface[] $revisions */
     $revisions = $node_storage->loadMultipleRevisions($revision_ids);
     foreach ($revisions as $revision) {
-      if (!$revision instanceof ContentBase || $revision->isDefaultRevision() || $revision->isLatestRevision()) {
+      if (!$revision instanceof ContentInterface || $revision->isDefaultRevision() || $revision->isLatestRevision()) {
         continue;
       }
 
@@ -85,7 +85,7 @@ function ncms_ui_deploy_set_moderation_state() {
     /** @var \Drupal\node\NodeInterface[] $revisions */
     $revisions = $node_storage->loadMultipleRevisions($revision_ids);
     foreach ($revisions as $revision) {
-      if (!$revision instanceof ContentBase || $revision->isDefaultRevision() || $revision->isLatestRevision() || !$revision->isPublished()) {
+      if (!$revision instanceof ContentInterface || $revision->isDefaultRevision() || $revision->isLatestRevision() || !$revision->isPublished()) {
         continue;
       }
       $node_storage->updateRevisionStatus($revision, NodeInterface::NOT_PUBLISHED, FALSE);
@@ -260,7 +260,7 @@ function ncms_ui_deploy_correct_changed_date(&$sandbox) {
   ]);
 
   foreach ($nodes as $node) {
-    if (!$node instanceof ContentBase) {
+    if (!$node instanceof ContentInterface) {
       continue;
     }
 
@@ -271,7 +271,7 @@ function ncms_ui_deploy_correct_changed_date(&$sandbox) {
     }
     $revision_ids = array_values(array_reverse($revision_ids));
 
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $revision */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $revision */
     $revision = $node_storage->loadRevision($revision_ids[0]);
     if (!$revision) {
       continue;
diff --git a/html/modules/custom/ncms_ui/ncms_ui.install b/html/modules/custom/ncms_ui/ncms_ui.install
index 2e6165e1..6fb86763 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.install
+++ b/html/modules/custom/ncms_ui/ncms_ui.install
@@ -6,6 +6,7 @@
  */
 
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\ncms_ui\Entity\ContentInterface;
 
 /**
  * Remove existing terms of type article type.
@@ -127,3 +128,35 @@ function ncms_ui_update_9007(&$sandox) {
   }
   return 'Deleted ' . count($ids) . ' paragraphs of type "layout"';
 }
+
+/**
+ * Remove duplicated trash revisions.
+ *
+ * There should really only be one per entity.
+ */
+function ncms_ui_update_9008(&$sandbox) {
+  $database = \Drupal::database();
+  $query = $database->query('SELECT content_entity_id, COUNT(id) AS cnt FROM {content_moderation_state_field_revision} m
+    WHERE moderation_state = :moderation_state
+    GROUP BY content_entity_id
+    HAVING cnt > 1', [
+      ':moderation_state' => 'trash',
+    ]);
+  $result = $query->fetchAll();
+  if (!$result) {
+    return;
+  }
+
+  /** @var \Drupal\ncms_ui\Entity\Storage\ContentStorage $node_storage */
+  $node_storage = \Drupal::entityTypeManager()->getStorage('node');
+  foreach ($result as $row) {
+    $entity_id = $row->content_entity_id;
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $entity */
+    $entity = $node_storage->load($entity_id);
+    while ($entity instanceof ContentInterface && $entity?->getPreviousRevision()?->isModerationState('trash')) {
+      $node_storage->deleteLatestRevision($entity);
+      /** @var \Drupal\ncms_ui\Entity\ContentInterface $entity */
+      $entity = $node_storage->load($entity_id);
+    }
+  }
+}
diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module
index b33ee60e..a6c3f6a8 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.module
+++ b/html/modules/custom/ncms_ui/ncms_ui.module
@@ -22,6 +22,7 @@ use Drupal\ncms_ui\Entity\Content\Article;
 use Drupal\ncms_ui\Entity\Content\ContentBase;
 use Drupal\ncms_ui\Entity\Content\Document;
 use Drupal\ncms_ui\Entity\Content\Story;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\ncms_ui\Entity\ContentSpaceAwareInterface;
 use Drupal\ncms_ui\Entity\EntityOverviewInterface;
 use Drupal\ncms_ui\Entity\IframeDisplayContentInterface;
@@ -89,7 +90,7 @@ function ncms_ui_entity_base_field_info_alter(&$fields, $entity_type) {
  */
 function ncms_ui_entity_operation(EntityInterface $entity) {
   $operations = [];
-  if ($entity instanceof ContentBase) {
+  if ($entity instanceof ContentInterface) {
     $operations = $entity->getEntityOperations();
   }
   return $operations;
@@ -247,7 +248,7 @@ function ncms_ui_preprocess_html(&$variables) {
     $variables['page']['content']['system_main']['#attached']['library'][] = 'ncms_ui/diff';
   }
 
-  if ($route_name == 'entity.node.edit_form' && $route_match->getParameter('node') instanceof ContentBase) {
+  if ($route_name == 'entity.node.edit_form' && $route_match->getParameter('node') instanceof ContentInterface) {
     $variables['attributes']['class'][] = 'node-content-base';
   }
   /** @var \Drupal\node\Entity\NodeType $node_type */
@@ -339,7 +340,7 @@ function ncms_ui_form_node_form_alter(&$form, FormStateInterface $form_state) {
     $form['#attached']['library'][] = 'ncms_ui/article_edit_form';
   }
 
-  if ($node instanceof ContentBase) {
+  if ($node instanceof ContentInterface) {
     /** @var \Drupal\ncms_ui\Form\ContentBaseFormAlter $content_base_form_alter */
     $content_base_form_alter = \Drupal::service('ncms_ui.content_base_form_alter');
     $content_base_form_alter->alterForm($form, $form_state);
@@ -557,13 +558,13 @@ function ncms_ui_link_alter(&$variables) {
     $node_revision = !empty($route_params['node_revision']) ? $node_storage->loadRevision($route_params['node_revision']) : NULL;
 
     $title = t('Preview: @title', ['@title' => $variables['text']]);
-    if ($node && $node instanceof ContentBase) {
+    if ($node && $node instanceof ContentInterface) {
       $title = t('Preview: @title (@status)', [
         '@title' => $node->label(),
         '@status' => $node->isPublished() ? t('Latest published') : t('Latest draft'),
       ]);
     }
-    if ($node_revision && $node_revision instanceof ContentBase) {
+    if ($node_revision && $node_revision instanceof ContentInterface) {
       $title = t('Preview: #@version (@status) - @date', [
         '@version' => $node_revision->getVersionId(),
         '@status' => $node_revision->getVersionStatusLabel(),
diff --git a/html/modules/custom/ncms_ui/src/Controller/RevisionController.php b/html/modules/custom/ncms_ui/src/Controller/RevisionController.php
index 417b49d8..8b1f4ec9 100644
--- a/html/modules/custom/ncms_ui/src/Controller/RevisionController.php
+++ b/html/modules/custom/ncms_ui/src/Controller/RevisionController.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\ncms_ui\Entity\Storage\ContentStorage;
 use Drupal\node\NodeInterface;
 
@@ -19,13 +19,13 @@ class RevisionController extends ControllerBase implements ContainerInjectionInt
   /**
    * Publish a node revision.
    *
-   * @param \Drupal\ncms_ui\Entity\Content\ContentBase $node_revision
+   * @param \Drupal\ncms_ui\Entity\ContentInterface $node_revision
    *   The node revision.
    *
    * @return array
    *   An array suitable for \Drupal\Core\Render\RendererInterface::render().
    */
-  public function publish(ContentBase $node_revision) {
+  public function publish(ContentInterface $node_revision) {
     if ($this->setRevisionStatus($node_revision, NodeInterface::PUBLISHED)) {
       $this->messenger()->addStatus($this->t('Version #@version has been published', [
         '@version' => $node_revision->getVersionId(),
@@ -43,13 +43,13 @@ public function publish(ContentBase $node_revision) {
   /**
    * Publish a node revision.
    *
-   * @param \Drupal\ncms_ui\Entity\Content\ContentBase $node_revision
+   * @param \Drupal\ncms_ui\Entity\ContentInterface $node_revision
    *   The node revision.
    *
    * @return array
    *   An array suitable for \Drupal\Core\Render\RendererInterface::render().
    */
-  public function unpublish(ContentBase $node_revision) {
+  public function unpublish(ContentInterface $node_revision) {
     if ($this->setRevisionStatus($node_revision, NodeInterface::NOT_PUBLISHED)) {
       $this->messenger()->addStatus($this->t('Version #@version has been unpublished', [
         '@version' => $node_revision->getVersionId(),
diff --git a/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php b/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php
index 47518c04..8fd6bc91 100644
--- a/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php
+++ b/html/modules/custom/ncms_ui/src/Entity/Content/ContentBase.php
@@ -10,10 +10,7 @@
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
 use Drupal\ncms_ui\Entity\ContentInterface;
-use Drupal\ncms_ui\Entity\ContentSpaceAwareInterface;
 use Drupal\ncms_ui\Entity\ContentVersionInterface;
-use Drupal\ncms_ui\Entity\EntityOverviewInterface;
-use Drupal\ncms_ui\Entity\IframeDisplayContentInterface;
 use Drupal\ncms_ui\Traits\ContentSpaceEntityTrait;
 use Drupal\ncms_ui\Traits\IframeDisplayContentTrait;
 use Drupal\node\Entity\Node;
@@ -22,7 +19,7 @@
 /**
  * Bundle class for organization nodes.
  */
-abstract class ContentBase extends Node implements ContentInterface, ContentSpaceAwareInterface, ContentVersionInterface, EntityOverviewInterface, IframeDisplayContentInterface {
+abstract class ContentBase extends Node implements ContentInterface {
 
   use StringTranslationTrait;
   use ContentSpaceEntityTrait;
@@ -89,7 +86,7 @@ public function getBundleLabel() {
    */
   public function setPublished() {
     parent::setPublished();
-    $this->moderation_state->value = 'published';
+    $this->setModerationState('published');
   }
 
   /**
@@ -97,7 +94,7 @@ public function setPublished() {
    */
   public function setUnpublished() {
     parent::setUnpublished();
-    $this->moderation_state->value = 'draft';
+    $this->setModerationState('draft');
   }
 
   /**
@@ -108,7 +105,7 @@ public function setDeleted() {
     $this->isDefaultRevision(TRUE);
     $this->setNewRevision(TRUE);
     $this->setRevisionTranslationAffectedEnforced(TRUE);
-    $this->moderation_state->value = 'trash';
+    $this->setModerationState('trash');
   }
 
   /**
@@ -118,7 +115,7 @@ public function isDeleted() {
     if ($this->isNew()) {
       return FALSE;
     }
-    return $this->getLatestRevision()->moderation_state->value == 'trash';
+    return $this->getLatestRevision()->isModerationState('trash');
   }
 
   /**
@@ -132,6 +129,27 @@ public function getVersionId() {
     return $version_key !== FALSE ? $version_key + 1 : NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getModerationState() {
+    return $this->moderation_state->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setModerationState($state) {
+    $this->moderation_state->value = $state;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isModerationState($state) {
+    return $this->getModerationState() == $state;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -193,10 +211,7 @@ public function getVersionStatusLabel() {
   }
 
   /**
-   * Get the latest revision.
-   *
-   * @return \Drupal\ncms_ui\Entity\Content\ContentBase|null
-   *   The latest revision if available.
+   * {@inheritdoc}
    */
   public function getLatestRevision() {
     /** @var \Drupal\Node\NodeStorageInterface $node_storage */
@@ -230,18 +245,18 @@ public function getPreviousRevision() {
     /** @var \Drupal\Node\NodeStorageInterface $node_storage */
     $node_storage = $this->entityTypeManager()->getStorage('node');
     $revision_ids = array_reverse($node_storage->revisionIds($this));
+    if (count($revision_ids) < 2) {
+      return NULL;
+    }
     array_shift($revision_ids);
     $previous_revision_id = array_shift($revision_ids);
 
     /** @var \Drupal\node\NodeInterface[] $revisions */
-    return $node_storage->loadRevision($previous_revision_id);
+    return $previous_revision_id ? $node_storage->loadRevision($previous_revision_id) : NULL;
   }
 
   /**
-   * Retrieve entity operations specific to our workflows.
-   *
-   * @return array
-   *   An array of operation links.
+   * {@inheritdoc}
    */
   public function getEntityOperations() {
     $operations = [];
diff --git a/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php b/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php
index 7837878f..daea9d63 100644
--- a/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php
+++ b/html/modules/custom/ncms_ui/src/Entity/ContentInterface.php
@@ -7,7 +7,7 @@
 /**
  * Defines an interface for entities with content spaces.
  */
-interface ContentInterface extends NodeInterface {
+interface ContentInterface extends NodeInterface, ContentSpaceAwareInterface, ContentVersionInterface, EntityOverviewInterface, IframeDisplayContentInterface {
 
   /**
    * Get the URL for the overview backend listing of this content type.
@@ -35,4 +35,12 @@ public function setDeleted();
    */
   public function isDeleted();
 
+  /**
+   * Retrieve entity operations specific to our workflows.
+   *
+   * @return array
+   *   An array of operation links.
+   */
+  public function getEntityOperations();
+
 }
diff --git a/html/modules/custom/ncms_ui/src/Entity/ContentVersionInterface.php b/html/modules/custom/ncms_ui/src/Entity/ContentVersionInterface.php
index 76f5c956..3230e083 100644
--- a/html/modules/custom/ncms_ui/src/Entity/ContentVersionInterface.php
+++ b/html/modules/custom/ncms_ui/src/Entity/ContentVersionInterface.php
@@ -25,6 +25,33 @@ interface ContentVersionInterface extends NodeInterface {
    */
   public function getVersionId();
 
+  /**
+   * Get the moderation state of the entity.
+   *
+   * @return string
+   *   The moderation state string identifier.
+   */
+  public function getModerationState();
+
+  /**
+   * Set the moderation state of the entity.
+   *
+   * @param string $state
+   *   The moderation state string identifier.
+   */
+  public function setModerationState($state);
+
+  /**
+   * Check if the moderation state of the entity has the given state.
+   *
+   * @param string $state
+   *   The moderation state string identifier.
+   *
+   * @return bool
+   *   TRUE if the moderation state is equal to the given one, FALSE otherwise.
+   */
+  public function isModerationState($state);
+
   /**
    * Get the current moderation state label.
    *
@@ -73,4 +100,12 @@ public function getLastPublishedRevision();
    */
   public function getPreviousRevision();
 
+  /**
+   * Get the latest revision.
+   *
+   * @return \Drupal\ncms_ui\Entity\Content\ContentInterface|null
+   *   The latest revision if available.
+   */
+  public function getLatestRevision();
+
 }
diff --git a/html/modules/custom/ncms_ui/src/Entity/Storage/ContentStorage.php b/html/modules/custom/ncms_ui/src/Entity/Storage/ContentStorage.php
index b4aa31e7..c79d96c0 100644
--- a/html/modules/custom/ncms_ui/src/Entity/Storage/ContentStorage.php
+++ b/html/modules/custom/ncms_ui/src/Entity/Storage/ContentStorage.php
@@ -2,11 +2,12 @@
 
 namespace Drupal\ncms_ui\Entity\Storage;
 
+use Drupal\content_moderation\Entity\ContentModerationState;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 use Drupal\node\NodeStorage;
 
@@ -21,7 +22,7 @@ class ContentStorage extends NodeStorage {
   /**
    * Update the status for an entity revision.
    *
-   * @param \Drupal\ncms_ui\Entity\Content\ContentBase $entity
+   * @param \Drupal\ncms_ui\Entity\ContentInterface $entity
    *   The entity object.
    * @param int $status
    *   The status of the revision.
@@ -31,11 +32,10 @@ class ContentStorage extends NodeStorage {
    * @return int
    *   The revision id.
    */
-  public function updateRevisionStatus(ContentBase $entity, $status, $update_moderation_state = TRUE) {
+  public function updateRevisionStatus(ContentInterface $entity, $status, $update_moderation_state = TRUE) {
     if ($entity->isNewRevision()) {
       throw new EntityStorageException("Can't update new revision {$entity->id()}");
     }
-
     $result = $this->database
       ->update($this->revisionDataTable)
       ->fields((array) [
@@ -94,12 +94,16 @@ public function updateRevisionStatus(ContentBase $entity, $status, $update_moder
   protected function doPostSave(EntityInterface $entity, $update) {
     parent::doPostSave($entity, $update);
 
-    if (!$entity instanceof ContentBase || $entity->isDeleted()) {
+    if (!$entity instanceof ContentInterface || $entity->isDeleted()) {
+      return;
+    }
+
+    if ($entity->isModerationState('trash')) {
       return;
     }
 
-    // For entities of type ContentBase, we want to make sure that there is
-    // always a meaningful default revision.
+    // For ContentInterface entities, we want to make sure that there is always
+    // a meaningful default revision.
     $last_published = $entity->getLastPublishedRevision();
     $latest_revision = $entity->getLatestRevision();
     if ($last_published && $last_published->getRevisionId() != $entity->getRevisionId() && !$last_published->isDefaultRevision()) {
@@ -127,7 +131,7 @@ protected function hasFieldValueChanged(FieldDefinitionInterface $field_definiti
     // translations sometimes doesn't save correctly when using the
     // "Publish as correction" or "Publish as revision" submit buttons on the
     // node edit form.
-    if ($entity instanceof ContentBase && $entity->getTranslationLanguages(FALSE)) {
+    if ($entity instanceof ContentInterface && $entity->getTranslationLanguages(FALSE)) {
       // Always return TRUE if the content has translations. The reason is that
       // hasFieldValueChanged() doesn't fetch the previous revisions field
       // values and thus falsely reports the fields to not have changed,
@@ -139,4 +143,60 @@ protected function hasFieldValueChanged(FieldDefinitionInterface $field_definiti
     return parent::hasFieldValueChanged($field_definition, $entity, $original);
   }
 
+  /**
+   * Safely delete the latest revision.
+   *
+   * This will take care of setting new default revisions, and also update
+   * related content moderation entities.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   The node for which the latest revision should be deleted.
+   */
+  public function deleteLatestRevision($node) {
+    if (!$node instanceof ContentInterface) {
+      return;
+    }
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $entity */
+    $entity = $node->getLatestRevision();
+
+    // First we need to set the previous revision to be the default one.
+    $new_default_revision = $entity->getPreviousRevision();
+    if (!$new_default_revision) {
+      // If there is no previous revision, there is no sense in going further.
+      return;
+    }
+
+    // Get the last published revision only if the previous revision is not in
+    // the trash bin.
+    $last_published = !$new_default_revision->isModerationState('trash') ? $entity->getLastPublishedRevision() : NULL;
+
+    // Set default revision based on whether there is a published revision or
+    // not.
+    $new_default_revision->isDefaultRevision(empty($last_published));
+    $new_default_revision->setNewRevision(FALSE);
+    $new_default_revision->setSyncing(TRUE);
+    $new_default_revision->save();
+
+    if ($last_published) {
+      $last_published->isDefaultRevision(TRUE);
+      $last_published->setNewRevision(FALSE);
+      $last_published->setSyncing(TRUE);
+      $last_published->save();
+    }
+
+    // Update the content moderation state.
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($new_default_revision);
+    if ($content_moderation_state) {
+      $content_moderation_state->isDefaultRevision(TRUE);
+      $content_moderation_state->setNewRevision(FALSE);
+      $content_moderation_state->setSyncing(TRUE);
+      ContentModerationState::updateOrCreateFromEntity($content_moderation_state);
+    }
+
+    // And then finally delete the latest revision, which is the one that
+    // marked the whole entity as being deleted.
+    $this->deleteRevision($entity->getRevisionId());
+    $this->resetCache([$node->id()]);
+  }
+
 }
diff --git a/html/modules/custom/ncms_ui/src/Form/ContentBaseFormAlter.php b/html/modules/custom/ncms_ui/src/Form/ContentBaseFormAlter.php
index 5dc20e95..d8471371 100644
--- a/html/modules/custom/ncms_ui/src/Form/ContentBaseFormAlter.php
+++ b/html/modules/custom/ncms_ui/src/Form/ContentBaseFormAlter.php
@@ -17,6 +17,7 @@
 use Drupal\ncms_publisher\PublisherManager;
 use Drupal\ncms_ui\ContentSpaceManager;
 use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\ncms_ui\Entity\EntityCompare;
 use Drupal\node\NodeInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -113,9 +114,9 @@ public function __construct(RequestStack $request_stack, EntityTypeManagerInterf
   public function alterForm(&$form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\ContentEntityForm $form_object */
     $form_object = $form_state->getFormObject();
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $entity */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $entity */
     $entity = $form_object->getEntity();
-    if (!$entity instanceof ContentBase) {
+    if (!$entity instanceof ContentInterface) {
       return;
     }
 
@@ -232,14 +233,14 @@ public function ajaxConfirm(array &$form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\EntityForm $form_object */
     $form_object = $form_state->getFormObject();
 
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $original_entity */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $original_entity */
     $original_entity = $form_state->get('original_entity');
 
     // Get the triggering element.
     $triggering_element = $form_state->getTriggeringElement();
 
     // Check if the entity has changes.
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $updated_entity */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $updated_entity */
     $updated_entity = $form_object->buildEntity($form, $form_state);
     $entity_updated = $this->entityCompare->hasChanged($updated_entity, $original_entity);
 
@@ -298,14 +299,14 @@ public function submitForm(array &$form, FormStateInterface $form_state, $submit
     /** @var \Drupal\Core\Entity\EntityForm $form_object */
     $form_object = $form_state->getFormObject();
 
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $original_entity */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $original_entity */
     $original_entity = $form_state->get('original_entity');
 
     // Get the triggering element.
     $triggering_element = $form_state->getTriggeringElement();
 
     // Check if the entity has changes.
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $updated_entity */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $updated_entity */
     $updated_entity = $form_object->buildEntity($form, $form_state);
     $entity_updated = $this->entityCompare->hasChanged($updated_entity, $original_entity);
 
diff --git a/html/modules/custom/ncms_ui/src/Form/ContentRestoreForm.php b/html/modules/custom/ncms_ui/src/Form/ContentRestoreForm.php
index cd435325..22b1fedb 100644
--- a/html/modules/custom/ncms_ui/src/Form/ContentRestoreForm.php
+++ b/html/modules/custom/ncms_ui/src/Form/ContentRestoreForm.php
@@ -2,14 +2,13 @@
 
 namespace Drupal\ncms_ui\Form;
 
-use Drupal\content_moderation\Entity\ContentModerationState;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\CloseModalDialogCommand;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\ncms_ui\Ajax\ReloadPageCommand;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -112,43 +111,19 @@ public function submitForm(array &$form, FormStateInterface $form_state, $submit
       // confirmation.
       return;
     }
-    $entity = $this->getNodeFromRouteMatch()->getLatestRevision();
-    $last_published = $entity->getLastPublishedRevision();
 
     // Confirmed, so we can delete the revision where the node got marked as
-    // deleted. First we need to set the previous revision to be the default
-    // one.
-    $new_default_revision = $entity->getPreviousRevision();
-    $new_default_revision->isDefaultRevision(empty($last_published));
-    $new_default_revision->setNewRevision(FALSE);
-    $new_default_revision->setSyncing(TRUE);
-    $new_default_revision->save();
-
-    if ($last_published) {
-      $last_published->isDefaultRevision(TRUE);
-      $last_published->setNewRevision(FALSE);
-      $last_published->setSyncing(TRUE);
-      $last_published->save();
-    }
-
-    // Do the same for the content moderation entity.
-    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($new_default_revision);
-    if ($content_moderation_state) {
-      $content_moderation_state->isDefaultRevision(TRUE);
-      $content_moderation_state->setNewRevision(FALSE);
-      $content_moderation_state->setSyncing(TRUE);
-      ContentModerationState::updateOrCreateFromEntity($content_moderation_state);
-    }
+    // deleted.
+    $entity = $this->getNodeFromRouteMatch();
 
-    // And then finally delete the latest revision, which is the one that
-    // marked the whole entity as being deleted.
     /** @var \Drupal\ncms_ui\Entity\Storage\ContentStorage $node_storage */
     $node_storage = $this->entityTypeManager->getStorage('node');
-    $node_storage->deleteRevision($entity->getRevisionId());
+    $node_storage->deleteLatestRevision($entity);
 
     // And inform the user.
-    $this->messenger()->addStatus($this->t('@type %title has been restored from the trash bin.', [
+    $this->messenger()->addStatus($this->t('@type <a href="@url">%title</a> has been restored from the trash bin.', [
       '@type' => $entity->type->entity->label(),
+      '@url' => $entity->toUrl('edit-form')->toString(),
       '%title' => $entity->label(),
     ]));
 
@@ -158,12 +133,12 @@ public function submitForm(array &$form, FormStateInterface $form_state, $submit
   /**
    * Get the current entity from the route match.
    *
-   * @return \Drupal\ncms_ui\Entity\Content\ContentBase|null
+   * @return \Drupal\ncms_ui\Entity\ContentInterface|null
    *   The entity or NULL.
    */
   private function getNodeFromRouteMatch() {
     $entity = $this->getRouteMatch()->getParameter('node');
-    return $entity && $entity instanceof ContentBase ? $entity : NULL;
+    return $entity && $entity instanceof ContentInterface ? $entity : NULL;
   }
 
 }
diff --git a/html/modules/custom/ncms_ui/src/Form/ContentSoftDeleteForm.php b/html/modules/custom/ncms_ui/src/Form/ContentSoftDeleteForm.php
index be78127d..81e45d10 100644
--- a/html/modules/custom/ncms_ui/src/Form/ContentSoftDeleteForm.php
+++ b/html/modules/custom/ncms_ui/src/Form/ContentSoftDeleteForm.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\ncms_ui\Ajax\ReloadPageCommand;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 
 /**
  * Form class for content submit confirm forms.
@@ -111,12 +111,12 @@ public function submitForm(array &$form, FormStateInterface $form_state, $submit
   /**
    * Get the current entity from the route match.
    *
-   * @return \Drupal\ncms_ui\Entity\Content\ContentBase|null
+   * @return \Drupal\ncms_ui\Entity\ContentInterface|null
    *   The entity or NULL.
    */
   private function getNodeFromRouteMatch() {
     $entity = $this->getRouteMatch()->getParameter('node');
-    return $entity && $entity instanceof ContentBase ? $entity : NULL;
+    return $entity && $entity instanceof ContentInterface ? $entity : NULL;
   }
 
 }
diff --git a/html/modules/custom/ncms_ui/src/Form/ContentSpaceFormAlter.php b/html/modules/custom/ncms_ui/src/Form/ContentSpaceFormAlter.php
index b6026130..45f761c8 100644
--- a/html/modules/custom/ncms_ui/src/Form/ContentSpaceFormAlter.php
+++ b/html/modules/custom/ncms_ui/src/Form/ContentSpaceFormAlter.php
@@ -50,7 +50,7 @@ public function __construct(ContentSpaceManager $content_manager, MessengerInter
   public function alterForm(&$form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\ContentEntityForm $form_object */
     $form_object = $form_state->getFormObject();
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $entity */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $entity */
     $entity = $form_object->getEntity();
     if (!$entity instanceof ContentSpaceAwareInterface) {
       return;
diff --git a/html/modules/custom/ncms_ui/src/Form/RevisionOverviewFormAlter.php b/html/modules/custom/ncms_ui/src/Form/RevisionOverviewFormAlter.php
index eac4ccd0..b8118397 100644
--- a/html/modules/custom/ncms_ui/src/Form/RevisionOverviewFormAlter.php
+++ b/html/modules/custom/ncms_ui/src/Form/RevisionOverviewFormAlter.php
@@ -159,7 +159,7 @@ public function alterForm(&$form, FormStateInterface $form_state) {
       $revision_ids = array_slice($revision_ids, $offset, $pager->getLimit());
     }
 
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase[] $revisions */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface[] $revisions */
     $revisions = array_values($node_storage->loadMultipleRevisions($revision_ids));
 
     $header = &$form['node_revisions_table']['#header'];
diff --git a/html/modules/custom/ncms_ui/src/Plugin/views/field/ContentStatusField.php b/html/modules/custom/ncms_ui/src/Plugin/views/field/ContentStatusField.php
index f58b46fb..20f17de7 100644
--- a/html/modules/custom/ncms_ui/src/Plugin/views/field/ContentStatusField.php
+++ b/html/modules/custom/ncms_ui/src/Plugin/views/field/ContentStatusField.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\ncms_ui\Plugin\views\field;
 
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\views\ResultRow;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -47,7 +47,7 @@ public function query() {
    * {@inheritdoc}
    */
   public function render(ResultRow $row) {
-    $build = $row->_entity instanceof ContentBase ? $row->_entity->getContentStatusLabel() : NULL;
+    $build = $row->_entity instanceof ContentInterface ? $row->_entity->getContentStatusLabel() : NULL;
     return $build;
   }
 
diff --git a/html/modules/custom/ncms_ui/tests/src/Functional/ContentEditTest.php b/html/modules/custom/ncms_ui/tests/src/Functional/ContentEditTest.php
index 0fc8578e..06554b08 100644
--- a/html/modules/custom/ncms_ui/tests/src/Functional/ContentEditTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Functional/ContentEditTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\ncms_ui\Functional;
 
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 
 /**
@@ -60,8 +60,8 @@ public function testContentEdit() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id(), NodeInterface::NOT_PUBLISHED);
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     $this->assertContentModerationTableEntry($node_1_1);
 
diff --git a/html/modules/custom/ncms_ui/tests/src/Functional/ContentOverviewTest.php b/html/modules/custom/ncms_ui/tests/src/Functional/ContentOverviewTest.php
index fd7c0956..ea110af3 100644
--- a/html/modules/custom/ncms_ui/tests/src/Functional/ContentOverviewTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Functional/ContentOverviewTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\ncms_ui\Functional;
 
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 
 /**
@@ -21,8 +21,8 @@ public function testContentOverviewPage() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id(), NodeInterface::NOT_PUBLISHED);
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $overview_url = '/admin/content';
@@ -112,9 +112,9 @@ public function testTrashBin() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id(), NodeInterface::NOT_PUBLISHED);
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
     $this->assertContentModerationTableEntry($node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $overview_url = '/admin/content';
diff --git a/html/modules/custom/ncms_ui/tests/src/Functional/ContentVersionTest.php b/html/modules/custom/ncms_ui/tests/src/Functional/ContentVersionTest.php
index 1bdd1d35..c13c5a8a 100644
--- a/html/modules/custom/ncms_ui/tests/src/Functional/ContentVersionTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Functional/ContentVersionTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\ncms_ui\Functional;
 
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 
 /**
@@ -21,8 +21,8 @@ public function testVersionOverviewPage() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id(), NodeInterface::NOT_PUBLISHED);
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $edit_url = '/node/' . $node_1_1->id() . '/edit';
diff --git a/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/ContentEditModalsTest.php b/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/ContentEditModalsTest.php
index 1df194d7..1e003a08 100644
--- a/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/ContentEditModalsTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/ContentEditModalsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\ncms_ui\FunctionalJavascript;
 
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 
 /**
@@ -26,8 +26,8 @@ public function testContentEditModals() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id(), NodeInterface::NOT_PUBLISHED);
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $edit_url = '/node/' . $node_1_1->id() . '/edit';
@@ -113,8 +113,8 @@ public function testContentEditPublishAsCorrectionModals() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id());
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $edit_url = '/node/' . $node_1_1->id() . '/edit';
@@ -182,8 +182,8 @@ public function testContentEditPublishAsRevisionModals() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id());
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $edit_url = '/node/' . $node_1_1->id() . '/edit';
@@ -251,8 +251,8 @@ public function testContentEditNoChangesModals() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id());
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     // Define some urls.
     $edit_url = '/node/' . $node_1_1->id() . '/edit';
diff --git a/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/DocumentEditTest.php b/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/DocumentEditTest.php
index 515aa774..a820db9b 100644
--- a/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/DocumentEditTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/FunctionalJavascript/DocumentEditTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\ncms_ui\FunctionalJavascript;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\ncms_ui\Entity\Content\ContentBase;
+use Drupal\ncms_ui\Entity\ContentInterface;
 use Drupal\node\NodeInterface;
 use Drupal\Tests\ncms_ui\Traits\ContentTestTrait;
 
@@ -115,8 +115,8 @@ public function testDocumentCreate() {
 
     // Create node for content space 1.
     $node_1_1 = $this->createArticleInContentSpace('Article 1 for Content space 1', $content_space_1->id(), NodeInterface::NOT_PUBLISHED);
-    $this->assertInstanceOf(ContentBase::class, $node_1_1);
-    /** @var \Drupal\ncms_ui\Entity\Content\ContentBase $node_1_1 */
+    $this->assertInstanceOf(ContentInterface::class, $node_1_1);
+    /** @var \Drupal\ncms_ui\Entity\ContentInterface $node_1_1 */
 
     /** @var \Drupal\FunctionalJavascriptTests\WebDriverWebAssert $assert_session */
     $assert_session = $this->assertSession();
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php
index 330f95aa..d19a08e0 100644
--- a/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ArticleTest.php
@@ -138,7 +138,7 @@ public function testModerationStates() {
     $article->setUnpublished();
     $article->setNewRevision(TRUE);
     $article->save();
-    $this->assertEquals('draft', $article->moderation_state->value);
+    $this->assertEquals('draft', $article->getModerationState());
     $this->assertEquals('Draft', $article->getModerationStateLabel());
     $this->assertEquals(ContentBase::CONTENT_STATUS_DRAFT, $article->getContentStatus());
     $this->assertEquals('Draft', $article->getContentStatusLabel());
@@ -147,7 +147,7 @@ public function testModerationStates() {
     $article->setPublished();
     $article->setNewRevision(TRUE);
     $article->save();
-    $this->assertEquals('published', $article->moderation_state->value);
+    $this->assertEquals('published', $article->getModerationState());
     $this->assertEquals('Published', $article->getModerationStateLabel());
     $this->assertEquals(ContentBase::CONTENT_STATUS_PUBLISHED, $article->getContentStatus());
     $this->assertEquals('Published', $article->getContentStatusLabel());
@@ -156,7 +156,7 @@ public function testModerationStates() {
     $article->setUnpublished();
     $article->setNewRevision(TRUE);
     $article->save();
-    $this->assertEquals('draft', $article->moderation_state->value);
+    $this->assertEquals('draft', $article->getModerationState());
     $this->assertEquals('Draft', $article->getModerationStateLabel());
     $this->assertEquals(ContentBase::CONTENT_STATUS_PUBLISHED_WITH_DRAFT, $article->getContentStatus());
     $this->assertEquals('Published with newer draft', $article->getContentStatusLabel());
@@ -165,7 +165,7 @@ public function testModerationStates() {
     $article->setDeleted();
     $article->setNewRevision(TRUE);
     $article->save();
-    $this->assertEquals('trash', $article->moderation_state->value);
+    $this->assertEquals('trash', $article->getModerationState());
     $this->assertEquals('Archived', $article->getModerationStateLabel());
     $this->assertEquals(ContentBase::CONTENT_STATUS_DELETED, $article->getContentStatus());
     $this->assertEquals('Deleted', $article->getContentStatusLabel());
@@ -173,7 +173,7 @@ public function testModerationStates() {
 
     $revision = $article->getPreviousRevision();
     $this->assertInstanceOf(ContentVersionInterface::class, $revision);
-    $this->assertEquals('draft', $revision->moderation_state->value);
+    $this->assertEquals('draft', $revision->getModerationState());
 
     $this->assertEquals(TRUE, $article->isDeleted());
   }
diff --git a/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ContentVersionTest.php b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ContentVersionTest.php
new file mode 100644
index 00000000..bbc99694
--- /dev/null
+++ b/html/modules/custom/ncms_ui/tests/src/Kernel/Entity/ContentVersionTest.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Drupal\Tests\ncms_ui\Kernel\Entity;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\ncms_ui\Entity\Content\Article;
+use Drupal\ncms_ui\Entity\Storage\ContentStorage;
+use Drupal\Tests\ncms_ui\Traits\ContentTestTrait;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\user\Traits\UserCreationTrait;
+
+/**
+ * Tests the article entity.
+ *
+ * @group ncms_ui
+ */
+class ContentVersionTest extends KernelTestBase {
+
+  use ContentTypeCreationTrait;
+  use UserCreationTrait;
+  use ContentTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'system',
+    'field',
+    'user',
+    'node',
+    'taxonomy',
+    'text',
+    'views',
+    'replicate',
+    'replicate_ui',
+    'workflows',
+    'content_moderation',
+    'ncms_publisher',
+    'ncms_ui',
+    'ncms_ui_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->installSchema('node', 'node_access');
+    $this->installSchema('user', 'users_data');
+    $this->installEntitySchema('content_moderation_state');
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('workflow');
+    $this->installConfig(['replicate_ui']);
+    $this->installConfig([
+      'field',
+      'system',
+      'node',
+      'taxonomy',
+      'content_moderation',
+      'ncms_ui',
+    ]);
+
+    $this->createContentType([
+      'type' => 'article',
+    ]);
+    $workflow = $this->createArticleWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
+    $workflow->save();
+  }
+
+  /**
+   * Test deletion of the last revision.
+   *
+   * @covers \Drupal\ncms_ui\Entity\Storage\ContentStorage::deleteLatestRevision()
+   */
+  public function testDeleteLatestRevision() {
+    $article = Article::create([
+      'title' => 'Article title #1',
+    ]);
+    $this->assertTrue($article->isNew());
+    $this->assertFalse($article->isDeleted());
+    $this->assertNull($article->getVersionId());
+    $article->save();
+    $this->assertFalse($article->isNew());
+    $this->assertEquals(1, $article->getVersionId());
+
+    $article->title = 'Article title #2';
+    $article->save();
+    $this->assertEquals(2, $article->getVersionId());
+    $this->assertEquals('Article title #2', $article->label());
+    $this->assertTrue($article->getLatestRevision()->isDefaultRevision());
+
+    $this->assertNull($article->getLastPublishedRevision());
+
+    $previous_revision = $article->getPreviousRevision();
+    $this->assertInstanceof(Article::class, $previous_revision);
+    $this->assertEquals(1, $previous_revision->getVersionId());
+
+    $article->setDeleted();
+    $article->save();
+    $this->assertEquals(3, $article->getVersionId());
+    $this->assertEquals('Article title #2', $article->label());
+
+    /** @var \Drupal\ncms_ui\Entity\Storage\ContentStorage $node_storage */
+    $node_storage = $this->container->get('entity_type.manager')->getStorage('node');
+    $this->assertInstanceOf(ContentStorage::class, $node_storage);
+    $node_storage->deleteLatestRevision($article);
+
+    $article = Article::load($article->id());
+    $this->assertEquals(2, $article->getVersionId());
+    $this->assertEquals('Article title #2', $article->label());
+
+    // Create a new published version, to test that the deletion of the second
+    // trashed revision further down does not accidentally set the default
+    // revision to the published one.
+    $article->title = 'Article title #3';
+    $article->setPublished();
+    $article->save();
+    $this->assertEquals(3, $article->getVersionId());
+    $this->assertEquals('Article title #3', $article->label());
+
+    // Move the article to the trash.
+    $article->setDeleted();
+    $article->save();
+    $this->assertEquals(4, $article->getVersionId());
+    $this->assertEquals('Article title #3', $article->label());
+    $this->assertFalse($article->isPublished());
+
+    // Intentionally create a problem, be created a second deleted revision.
+    // Our interface logic prevents that from happening, but it might happen
+    // when updating nodes programmatically, so we want to make sure the
+    // revision delete logic can cope with that situation.
+    $article->setDeleted();
+    $article->setNewRevision(TRUE);
+    $article->save();
+    $this->assertEquals(5, $article->getVersionId());
+    $this->assertEquals('Article title #3', $article->label());
+    $this->assertFalse($article->isPublished());
+
+    // Now delete the last revision, which should revert the article back to
+    // the previous deleted revision which should not be published.
+    $node_storage->deleteLatestRevision($article);
+    $article = Article::load($article->id());
+    $this->assertEquals(4, $article->getVersionId());
+    $this->assertEquals('Article title #3', $article->label());
+    $this->assertFalse($article->isPublished());
+
+    // And delete again, which should leave us with the published revision in
+    // the end, having restored the article from the trash bin.
+    $node_storage->deleteLatestRevision($article);
+    $article = Article::load($article->id());
+    $this->assertEquals(3, $article->getVersionId());
+    $this->assertEquals('Article title #3', $article->label());
+    $this->assertTrue($article->isPublished());
+  }
+
+}
diff --git a/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php b/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php
index 5b74c4b7..133cc37b 100644
--- a/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php
+++ b/html/modules/custom/ncms_ui/tests/src/Unit/ViewControllerTest.php
@@ -55,7 +55,6 @@ protected function setUp(): void {
     \Drupal::setContainer($container);
 
     $this->controller = ViewController::create($container);
-    // $this->controller->setStringTranslation($string_translation->reveal());
   }
 
   /**

From 30518f518116a31e014371814ce76315e073933a Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Mon, 6 May 2024 16:43:58 +0200
Subject: [PATCH 17/17] HPC-9466: Patch core as to not update the changed
 timestamp when syncing

---
 composer.patches.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.patches.json b/composer.patches.json
index 5401ef19..a10f7440 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -1,7 +1,8 @@
 {
     "patches": {
         "drupal/core": {
-            "https://www.drupal.org/project/drupal/issues/2544110": "./patches/2544110-2024-02-15.patch",
+            "Issue #2544110: XSS attribute filtering is inconsistent and strips valid attributes": "./patches/2544110-2024-02-15.patch",
+            "Issue #2329253: Allow the ChangedItem to skip updating the entity's changed timestamp when synchronizing (f.e. when migrating)": "https://www.drupal.org/files/issues/2024-04-18/2329253-127-10.2.5.patch",
             "Issue #3392572: strnatcasecmp(): Passing null to parameter #2 in LayoutPluginManager": "https://www.drupal.org/files/issues/2023-10-25/drupal-strnatcasecmp_string_only-3392572-10.patch",
             "Issue #3413079: Cannot read properties of null (reading 'nodeType') on node.page.body": "https://www.drupal.org/files/issues/2024-01-08/3413079-9.patch",
             "Issue #3274635: [upstream] Use CKEditor 5's native <ol type> and <ul type> UX": "https://www.drupal.org/files/issues/2024-03-20/ckeditor5_custom_patch_file.patch",
@@ -36,7 +37,7 @@
             "Issue #3345123: entityViewModeAlter throws an exception in php 8.2": "https://www.drupal.org/files/issues/2023-03-01/paragraphs_viewmode-remove-context-parameter-3345123-2.patch"
         },
         "drupal/user_expire": {
-            "Allow the notification email to be customised": "https://git.drupalcode.org/project/user_expire/-/merge_requests/5.patch",
+            "Issue #2836514: Disable or customize expiration email": "https://git.drupalcode.org/project/user_expire/-/merge_requests/5.patch",
             "Issue #2855005: Reset expiration when user is reactivated": "https://www.drupal.org/files/issues/2022-11-22/2855005-13.patch"
         }
     }