Merge pull request #953 from usagov/dev

Sprint 67 HOTFIX to STAGE
usagov · Sep 3, 2024 · 75896cb · 75896cb
2 parents 8d1e22d + a30bc48
commit 75896cb
Show file tree

Hide file tree

Showing 46 changed files with 468 additions and 580 deletions.
diff --git a/config/local/config_split.patch.core.extension.yml b/config/local/config_split.patch.core.extension.yml
@@ -4,6 +4,5 @@ adding:
     devel: 0
     disable_language: 0
     field_ui: 0
-    responsive_image: 0
     views_ui: 0
 removing: {  }
diff --git a/config/sync/core.entity_form_display.block_content.nvrf_card.default.yml b/config/sync/core.entity_form_display.block_content.nvrf_card.default.yml
@@ -7,9 +7,7 @@ dependencies:
     - field.field.block_content.nvrf_card.body
     - field.field.block_content.nvrf_card.field_button_label
     - field.field.block_content.nvrf_card.field_heading
-    - field.field.block_content.nvrf_card.field_image
   module:
-    - media_library
     - text
 id: block_content.nvrf_card.default
 targetEntityType: block_content
@@ -42,13 +40,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_image:
-    type: media_library_widget
-    weight: 4
-    region: content
-    settings:
-      media_types: {  }
-    third_party_settings: {  }
   info:
     type: string_textfield
     weight: 0

diff --git a/config/sync/core.entity_form_display.block_content.nvrf_card.landing_page_component.yml b/config/sync/core.entity_form_display.block_content.nvrf_card.landing_page_component.yml
@@ -8,7 +8,6 @@ dependencies:
     - field.field.block_content.nvrf_card.body
     - field.field.block_content.nvrf_card.field_button_label
     - field.field.block_content.nvrf_card.field_heading
-    - field.field.block_content.nvrf_card.field_image
 id: block_content.nvrf_card.landing_page_component
 targetEntityType: block_content
 bundle: nvrf_card
@@ -45,4 +44,3 @@ content:
 hidden:
   body: true
   field_button_label: true
-  field_image: true
diff --git a/config/sync/core.entity_form_display.block_content.registration_form_selector.default.yml b/config/sync/core.entity_form_display.block_content.registration_form_selector.default.yml
@@ -6,21 +6,21 @@ dependencies:
     - block_content.type.registration_form_selector
     - field.field.block_content.registration_form_selector.field_default_option_label
     - field.field.block_content.registration_form_selector.field_description
-    - field.field.block_content.registration_form_selector.field_digital_form_link
+    - field.field.block_content.registration_form_selector.field_digital_form_link_label
     - field.field.block_content.registration_form_selector.field_digital_form_paragraph
     - field.field.block_content.registration_form_selector.field_heading
     - field.field.block_content.registration_form_selector.field_registration_form_link
     - field.field.block_content.registration_form_selector.field_submit_button_label
   module:
     - field_group
-    - link
     - link_attributes
     - text
 third_party_settings:
   field_group:
     group_digital_form:
       children:
         - field_digital_form_paragraph
+        - field_digital_form_link_label
         - field_digital_form_link
       label: 'Digital Form'
       region: content
@@ -55,13 +55,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_digital_form_link:
-    type: link_default
+  field_digital_form_link_label:
+    type: string_textfield
     weight: 10
     region: content
     settings:
-      placeholder_url: ''
-      placeholder_title: ''
+      size: 60
+      placeholder: ''
     third_party_settings: {  }
   field_digital_form_paragraph:
     type: text_textarea

diff --git a/config/sync/core.entity_form_display.node.nvrf_page.default.yml b/config/sync/core.entity_form_display.node.nvrf_page.default.yml
@@ -7,7 +7,6 @@ dependencies:
     - field.field.node.nvrf_page.field_content_version
     - field.field.node.nvrf_page.field_display_title
     - field.field.node.nvrf_page.field_general_instructions
-    - field.field.node.nvrf_page.field_omb_number
     - node.type.nvrf_page
     - workflows.workflow.publishing_content
   module:
@@ -78,14 +77,6 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  field_omb_number:
-    type: string_textfield
-    weight: 10
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 11

diff --git a/config/sync/core.entity_view_display.block_content.nvrf_card.default.yml b/config/sync/core.entity_view_display.block_content.nvrf_card.default.yml
@@ -7,7 +7,6 @@ dependencies:
     - field.field.block_content.nvrf_card.body
     - field.field.block_content.nvrf_card.field_button_label
     - field.field.block_content.nvrf_card.field_heading
-    - field.field.block_content.nvrf_card.field_image
   module:
     - text
 id: block_content.nvrf_card.default
@@ -38,14 +37,5 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
-  field_image:
-    type: entity_reference_entity_view
-    label: above
-    settings:
-      view_mode: default
-      link: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
 hidden:
   langcode: true
diff --git a/config/sync/core.entity_view_display.block_content.registration_form_selector.default.yml b/config/sync/core.entity_view_display.block_content.registration_form_selector.default.yml
@@ -6,7 +6,7 @@ dependencies:
     - block_content.type.registration_form_selector
     - field.field.block_content.registration_form_selector.field_default_option_label
     - field.field.block_content.registration_form_selector.field_description
-    - field.field.block_content.registration_form_selector.field_digital_form_link
+    - field.field.block_content.registration_form_selector.field_digital_form_link_label
     - field.field.block_content.registration_form_selector.field_digital_form_paragraph
     - field.field.block_content.registration_form_selector.field_heading
     - field.field.block_content.registration_form_selector.field_registration_form_link
@@ -35,17 +35,13 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_digital_form_link:
-    type: link_separate
+  field_digital_form_link_label:
+    type: string
     label: hidden
     settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
+      link_to_entity: false
     third_party_settings: {  }
-    weight: 7
+    weight: 9
     region: content
   field_digital_form_paragraph:
     type: text_default

diff --git a/config/sync/core.entity_view_display.media.icon.default.yml b/config/sync/core.entity_view_display.media.icon.default.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.field.media.icon.field_media_image
+    - image.style.medium
     - media.type.icon
   module:
     - svg_image
@@ -17,7 +18,7 @@ content:
     label: visually_hidden
     settings:
       image_link: ''
-      image_style: ''
+      image_style: medium
       image_loading:
         attribute: lazy
       svg_attributes:

diff --git a/config/sync/core.entity_view_display.media.image.scaled.yml b/config/sync/core.entity_view_display.media.image.scaled.yml
@@ -6,10 +6,10 @@ dependencies:
     - core.entity_view_mode.media.scaled
     - field.field.media.image.field_caption
     - field.field.media.image.field_media_image
-    - image.style.scaled_lg
     - media.type.image
+    - responsive_image.styles.scaled
   module:
-    - svg_image
+    - responsive_image
     - text
 id: media.image.scaled
 targetEntityType: media
@@ -24,17 +24,13 @@ content:
     weight: 1
     region: content
   field_media_image:
-    type: image
+    type: responsive_image
     label: visually_hidden
     settings:
+      responsive_image_style: scaled
       image_link: ''
-      image_style: scaled_lg
       image_loading:
         attribute: lazy
-      svg_attributes:
-        width: null
-        height: null
-      svg_render_as_image: true
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/config/sync/core.entity_view_display.node.nvrf_page.default.yml b/config/sync/core.entity_view_display.node.nvrf_page.default.yml
@@ -7,7 +7,6 @@ dependencies:
     - field.field.node.nvrf_page.field_content_version
     - field.field.node.nvrf_page.field_display_title
     - field.field.node.nvrf_page.field_general_instructions
-    - field.field.node.nvrf_page.field_omb_number
     - node.type.nvrf_page
   module:
     - text
@@ -52,14 +51,6 @@ content:
     third_party_settings: {  }
     weight: 101
     region: content
-  field_omb_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 102
-    region: content
   links:
     settings: {  }
     third_party_settings: {  }

diff --git a/config/sync/core.entity_view_display.node.nvrf_page.teaser.yml b/config/sync/core.entity_view_display.node.nvrf_page.teaser.yml
@@ -8,7 +8,6 @@ dependencies:
     - field.field.node.nvrf_page.field_content_version
     - field.field.node.nvrf_page.field_display_title
     - field.field.node.nvrf_page.field_general_instructions
-    - field.field.node.nvrf_page.field_omb_number
     - node.type.nvrf_page
   module:
     - user
@@ -32,6 +31,5 @@ hidden:
   field_content_version: true
   field_display_title: true
   field_general_instructions: true
-  field_omb_number: true
   langcode: true
   published_at: true
diff --git a/config/sync/core.entity_view_display.node.page.full.yml b/config/sync/core.entity_view_display.node.page.full.yml
@@ -21,27 +21,19 @@ content:
   content_moderation_control:
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 0
     region: content
   field_body:
     type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 2
-    region: content
-  field_media:
-    type: entity_reference_entity_view
-    label: hidden
-    settings:
-      view_mode: full
-      link: false
-    third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
   body: true
   field_content_version: true
+  field_media: true
   field_metatags: true
   langcode: true
   links: true

diff --git a/config/sync/core.entity_view_display.paragraph.hero.default.yml b/config/sync/core.entity_view_display.paragraph.hero.default.yml
@@ -8,11 +8,9 @@ dependencies:
     - field.field.paragraph.hero.field_heading
     - field.field.paragraph.hero.field_link
     - field.field.paragraph.hero.field_media
-    - image.style.scaled_xl
     - paragraphs.paragraphs_type.hero
   module:
     - link
-    - media
     - options
     - text
 id: paragraph.hero.default
@@ -55,13 +53,11 @@ content:
     weight: 2
     region: content
   field_media:
-    type: media_thumbnail
+    type: entity_reference_entity_view
     label: hidden
     settings:
-      image_link: ''
-      image_style: scaled_xl
-      image_loading:
-        attribute: lazy
+      view_mode: scaled
+      link: false
     third_party_settings: {  }
     weight: 3
     region: content

diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -61,6 +61,7 @@ module:
   path_alias: 0
   redirect: 0
   remove_http_headers: 0
+  responsive_image: 0
   rest: 0
   rest_views: 0
   robotstxt: 0

diff --git a/config/sync/field.field.block_content.nvrf_card.field_image.yml b/config/sync/field.field.block_content.nvrf_card.field_image.yml
diff --git a/config/sync/field.field.block_content.registration_form_selector.field_digital_form_link.yml b/config/sync/field.field.block_content.registration_form_selector.field_digital_form_link.yml
diff --git a/...nc/field.field.block_content.registration_form_selector.field_digital_form_link_label.yml b/...nc/field.field.block_content.registration_form_selector.field_digital_form_link_label.yml
@@ -0,0 +1,19 @@
+uuid: 015bc9c0-7cc7-4102-ab7a-be9b2b03410c
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.registration_form_selector
+    - field.storage.block_content.field_digital_form_link_label
+id: block_content.registration_form_selector.field_digital_form_link_label
+field_name: field_digital_form_link_label
+entity_type: block_content
+bundle: registration_form_selector
+label: 'Digital form link label'
+description: 'Entering a value in this field triggers the digital form page to be generated on the public site.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string