Merge branch 'development'

.platform.app.yaml

@@ -83,8 +83,7 @@ hooks:
     drush -y updatedb
     # General config import
     drush -y config-import
-    # Force partial imports of migration config.
-    ../migrate-config-sync.sh
+    # Final cache rebuild.
     drush -y cache-rebuild
 # The configuration of app when it is exposed to the web.
 web:

.platform/services.yaml

@@ -7,7 +7,7 @@ db:
   # the CLI will return an error.
   type: mariadb:10.4
   # The disk attribute is the size of the persistent disk (in MB) allocated to the service.
-  disk: 8192
+  disk: 20480
   configuration:
     schemas:
       - main

composer.json

@@ -42,12 +42,12 @@
     "require": {
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.6.5",
-        "dof-dss/nicsdru_nidirect_theme": "^0.15.1",
+        "dof-dss/nicsdru_nidirect_theme": "^1.0",
         "dof-dss/nicsdru_origins_modules": "^0.9.16",
         "dof-dss/nicsdru_origins_theme": "^0.3.15",
-        "dof-dss/nidirect-d8-test-install-profile": "^0.12.2",
-        "dof-dss/nidirect-migrations": "^0.15.1",
-        "dof-dss/nidirect-site-modules": "^0.15.1",
+        "dof-dss/nidirect-d8-test-install-profile": "^1.0",
+        "dof-dss/nidirect-migrations": "^1.0",
+        "dof-dss/nidirect-site-modules": "^1.0",
         "drupal/address": "^1.7",
         "drupal/admin_toolbar": "^2.0",
         "drupal/adminimal_theme": "^1.5",

config/sync/block.block.featuredcontent.yml

@@ -18,7 +18,7 @@ settings:
   label: Featured
   provider: nidirect_homepage
   label_display: visible
-  featured_items: '16027'
+  featured_items: '16086'
 visibility:
   request_path:
     id: request_path

config/sync/block.block.featuredcontent_covid19.yml

@@ -18,7 +18,7 @@ settings:
   label: 'Featured content: COVID-19'
   provider: nidirect_homepage
   label_display: '0'
-  featured_items: '16028'
+  featured_items: '16087'
 visibility:
   request_path:
     id: request_path

config/sync/core.entity_form_display.node.health_condition.default.yml

@@ -20,7 +20,6 @@ dependencies:
     - field.field.node.health_condition.field_index_letter
     - field.field.node.health_condition.field_last_review_date
     - field.field.node.health_condition.field_meta_tags
-    - field.field.node.health_condition.field_next_audit_due
     - field.field.node.health_condition.field_next_review_date
     - field.field.node.health_condition.field_parent_condition
     - field.field.node.health_condition.field_photo
@@ -33,6 +32,7 @@ dependencies:
     - field.field.node.health_condition.field_teaser
     - field.field.node.health_condition.field_top_level_theme
     - node.type.health_condition
+    - workflows.workflow.nics_editorial_workflow
   module:
     - content_moderation
     - datetime
@@ -422,4 +422,3 @@ content:
 hidden:
   field_alternative_title: true
   field_index_letter: true
-  field_next_audit_due: true

config/sync/core.entity_view_display.node.health_condition.default.yml

@@ -159,7 +159,6 @@ hidden:
   field_hc_secondary_symptoms: true
   field_index_letter: true
   field_last_review_date: true
-  field_next_audit_due: true
   field_next_review_date: true
   field_published_date: true
   field_related_conditions: true

config/sync/core.entity_view_display.node.health_condition.diff.yml

@@ -278,7 +278,6 @@ hidden:
   field_additional_info: true
   field_banner_image: true
   field_index_letter: true
-  field_next_audit_due: true
   field_published_date: true
   field_subtheme: true
   field_top_level_theme: true

config/sync/core.entity_view_display.node.health_condition.full.yml

@@ -21,7 +21,6 @@ dependencies:
     - field.field.node.health_condition.field_index_letter
     - field.field.node.health_condition.field_last_review_date
     - field.field.node.health_condition.field_meta_tags
-    - field.field.node.health_condition.field_next_audit_due
     - field.field.node.health_condition.field_next_review_date
     - field.field.node.health_condition.field_parent_condition
     - field.field.node.health_condition.field_photo
@@ -159,7 +158,6 @@ hidden:
   field_hc_secondary_symptoms: true
   field_index_letter: true
   field_meta_tags: true
-  field_next_audit_due: true
   field_parent_condition: true
   field_related_conditions: true
   field_site_themes: true

config/sync/core.entity_view_display.node.health_condition.search_result.yml

@@ -114,7 +114,6 @@ hidden:
   field_index_letter: true
   field_last_review_date: true
   field_meta_tags: true
-  field_next_audit_due: true
   field_next_review_date: true
   field_parent_condition: true
   field_photo: true

config/sync/core.entity_view_display.node.health_condition.teaser.yml

@@ -82,7 +82,6 @@ hidden:
   field_index_letter: true
   field_last_review_date: true
   field_meta_tags: true
-  field_next_audit_due: true
   field_next_review_date: true
   field_parent_condition: true
   field_photo: true

config/sync/eu_cookie_compliance.settings.yml

@@ -17,7 +17,7 @@ langcode: en
 popup_agreed:
   value: |
     <h2>Thank you for accepting cookies</h2>
-
+    
     <p>You can now hide this message or find out more about cookies.</p>
   format: full_html
 popup_agree_button_message: 'Accept cookies'
@@ -36,8 +36,8 @@ popup_hide_button_message: Hide
 popup_info:
   value: |
     <h2 class="eu-cookie-compliance-title">Cookies on nidirect</h2>
-
-    <p><strong>We use some essential cookies to make this service work. We’d like to set additional cookies so we can remember your settings, understand how people use the service and make improvements. Some of our pages allow selected third parties to set cookies – for example, pages that contain YouTube videos or Google Maps.</strong><br />
+    
+    <p>We use some essential cookies to make this service work. We’d like to set additional cookies so we can remember your settings, understand how people use the service and make improvements. Some of our pages allow selected third parties to set cookies – for example, pages that contain YouTube videos or Google Maps.&nbsp;<br />
     <a href="/articles/how-we-use-cookies">Find out more about how we use cookies</a></p>
   format: full_html
 mobile_popup_info:
@@ -66,7 +66,7 @@ consent_storage_method: do_not_store
 withdraw_message:
   value: |
     <h2>We use cookies on this site to enhance your user experience</h2>
-
+    
     <p>You have given your consent for us to set cookies.</p>
   format: full_html
 withdraw_action_button_label: 'Withdraw consent'