From 9b1957d94d583041b08a2477049a4b4f72a437ed Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 19 Oct 2022 08:01:57 -0400
Subject: [PATCH] ISTWCMS-5880: trying to get features correct

---
 ....paragraph.uw_para_image_banner.field_uw_ban_image.yml | 8 ++++++--
 config/install/field.storage.node.field_uw_banner.yml     | 2 +-
 .../install/field.storage.node.field_uw_media_width.yml   | 2 +-
 .../install/field.storage.node.field_uw_type_of_media.yml | 2 +-
 ...layout_builder_styles.style.uw_lbs_contained_width.yml | 2 +-
 ...builder_styles.style.uw_lbs_contained_width_narrow.yml | 2 +-
 ...t_builder_styles.style.uw_lbs_contained_width_wide.yml | 2 +-
 .../layout_builder_styles.style.uw_lbs_full_width.yml     | 2 +-
 uw_cfg_common.info.yml                                    | 5 +++++
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/config/install/field.field.paragraph.uw_para_image_banner.field_uw_ban_image.yml b/config/install/field.field.paragraph.uw_para_image_banner.field_uw_ban_image.yml
index 5f38655f..95b29cec 100644
--- a/config/install/field.field.paragraph.uw_para_image_banner.field_uw_ban_image.yml
+++ b/config/install/field.field.paragraph.uw_para_image_banner.field_uw_ban_image.yml
@@ -5,13 +5,18 @@ dependencies:
     - field.storage.paragraph.field_uw_ban_image
     - media.type.uw_mt_image
     - paragraphs.paragraphs_type.uw_para_image_banner
+  module:
+    - require_on_publish
+third_party_settings:
+  require_on_publish:
+    require_on_publish: false
 id: paragraph.uw_para_image_banner.field_uw_ban_image
 field_name: field_uw_ban_image
 entity_type: paragraph
 bundle: uw_para_image_banner
 label: Image
 description: 'A minimum banner size of 1010x300 is recommended. Banners that are narrower or wider than their location will be automatically scaled to fit.'
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''
@@ -22,7 +27,6 @@ settings:
       uw_mt_image: uw_mt_image
     sort:
       field: _none
-      direction: ASC
     auto_create: false
     auto_create_bundle: ''
 field_type: entity_reference
diff --git a/config/install/field.storage.node.field_uw_banner.yml b/config/install/field.storage.node.field_uw_banner.yml
index 38e4c282..097743ba 100644
--- a/config/install/field.storage.node.field_uw_banner.yml
+++ b/config/install/field.storage.node.field_uw_banner.yml
@@ -13,7 +13,7 @@ settings:
   target_type: paragraph
 module: entity_reference_revisions
 locked: false
-cardinality: -1
+cardinality: 8
 translatable: true
 indexes: {  }
 persist_with_no_fields: false
diff --git a/config/install/field.storage.node.field_uw_media_width.yml b/config/install/field.storage.node.field_uw_media_width.yml
index 59ec105a..ad32cfde 100644
--- a/config/install/field.storage.node.field_uw_media_width.yml
+++ b/config/install/field.storage.node.field_uw_media_width.yml
@@ -10,7 +10,7 @@ entity_type: node
 type: list_string
 settings:
   allowed_values: {  }
-  allowed_values_function: '_uw_cfg_common_get_layout_builder_styles'
+  allowed_values_function: _uw_cfg_common_get_layout_builder_styles
 module: options
 locked: false
 cardinality: 1
diff --git a/config/install/field.storage.node.field_uw_type_of_media.yml b/config/install/field.storage.node.field_uw_type_of_media.yml
index 196be0af..bec04cb7 100644
--- a/config/install/field.storage.node.field_uw_type_of_media.yml
+++ b/config/install/field.storage.node.field_uw_type_of_media.yml
@@ -10,7 +10,7 @@ entity_type: node
 type: list_string
 settings:
   allowed_values: {  }
-  allowed_values_function: '_uw_cfg_common_allowed_media_types'
+  allowed_values_function: _uw_cfg_common_allowed_media_types
 module: options
 locked: false
 cardinality: 1
diff --git a/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml b/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml
index 0eb0779e..621cb4f5 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml
@@ -6,6 +6,7 @@ label: 'Extra-wide contained width'
 classes: uw-contained-width
 type: section
 group: default
+weight: -4
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
   - 'inline_block:uw_cbl_copy_text'
@@ -13,4 +14,3 @@ block_restrictions:
   - 'inline_block:uw_cbl_image'
   - 'inline_block:uw_cbl_remote_video'
 layout_restrictions: {  }
-weight: -4
diff --git a/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml b/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
index b0cd3fe2..c120b5b0 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
@@ -6,6 +6,6 @@ label: 'Narrow contained width'
 classes: "uw-contained-width\r\nuw-contained-width--narrow"
 type: section
 group: default
+weight: -6
 block_restrictions: {  }
 layout_restrictions: {  }
-weight: -6
diff --git a/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml b/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
index d18394fb..7f62da9b 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
@@ -6,6 +6,6 @@ label: 'Wide contained width'
 classes: "uw-contained-width\r\nuw-contained-width--wide"
 type: section
 group: default
+weight: -5
 block_restrictions: {  }
 layout_restrictions: {  }
-weight: -5
diff --git a/config/install/layout_builder_styles.style.uw_lbs_full_width.yml b/config/install/layout_builder_styles.style.uw_lbs_full_width.yml
index f0da2d64..f3124d84 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_full_width.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_full_width.yml
@@ -6,6 +6,7 @@ label: 'Full width'
 classes: uw-full-width
 type: section
 group: default
+weight: -3
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
   - 'inline_block:uw_cbl_copy_text'
@@ -13,4 +14,3 @@ block_restrictions:
   - 'inline_block:uw_cbl_image'
   - 'inline_block:uw_cbl_remote_video'
 layout_restrictions: {  }
-weight: -3
diff --git a/uw_cfg_common.info.yml b/uw_cfg_common.info.yml
index f79c1379..75235a63 100644
--- a/uw_cfg_common.info.yml
+++ b/uw_cfg_common.info.yml
@@ -30,10 +30,12 @@ dependencies:
   - 'drupal:layout_builder_modal'
   - 'drupal:layout_builder_restrictions'
   - 'drupal:layout_builder_styles'
+  - 'drupal:link'
   - 'drupal:linkit'
   - 'drupal:mailsystem'
   - 'drupal:media'
   - 'drupal:media_embed_extra'
+  - 'drupal:media_library'
   - 'drupal:metatag'
   - 'drupal:node'
   - 'drupal:options'
@@ -51,11 +53,14 @@ dependencies:
   - 'drupal:user'
   - 'drupal:userprotect'
   - 'drupal:views'
+  - 'entity_reference_revisions:entity_reference_revisions'
   - 'fillpdf:fillpdf'
   - 'layout_builder_ids:layout_builder_ids'
   - 'maxlength:maxlength'
   - 'metatag:metatag_extended_perms'
+  - 'paragraphs:paragraphs'
   - 'quick_node_clone:quick_node_clone'
+  - 'require_on_publish:require_on_publish'
   - 'scheduler:scheduler'
   - 'simple_sitemap:simple_sitemap'
   - 'subpathauto:subpathauto'
-- 
GitLab