Fixed hook update, visibility and default values on landing page and …

…publication
dpc-sdp · Dec 18, 2024 · 8f1be43 · 8f1be43
1 parent a89cd26
commit 8f1be43
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/...s/tide_landing_page/config/install/core.entity_form_display.node.landing_page.default.yml b/...s/tide_landing_page/config/install/core.entity_form_display.node.landing_page.default.yml
@@ -223,8 +223,8 @@ third_party_settings:
       label: 'Customised Header'
       parent_name: group_section_header
       children:
-        - field_landing_page_hero_image
         - field_landing_page_hero_theme
+        - field_landing_page_hero_image
         - field_landing_page_hero_logo
         - field_graphical_image
         - field_bottom_graphical_image

diff --git a/...nding_page/config/install/field.field.node.landing_page.field_landing_page_hero_theme.yml b/...nding_page/config/install/field.field.node.landing_page.field_landing_page_hero_theme.yml
@@ -14,7 +14,9 @@ label: Page title display style
 description: 'By default the page title will display in the site’s primary colour. If you choose ‘Reverse blocked text’ the heading and introduction text will be white with a coloured block behind the text (the site’s ‘accent contrast’ and ‘accent alternate’ colours). See <a href="https://ripple.sdp.vic.gov.au/design-system/components/header">Ripple header page to understand the header </a>component design.'
 required: true
 translatable: false
-default_value: {  }
+default_value:
+  -
+    value: light
 default_value_callback: ''
 settings: {  }
 field_type: list_string
diff --git a/modules/tide_landing_page/tide_landing_page.install b/modules/tide_landing_page/tide_landing_page.install
@@ -232,12 +232,11 @@ function tide_landing_page_update_10108() {
 function tide_landing_page_update_10109() {
   $config = \Drupal::configFactory()->getEditable('field.storage.node.field_landing_page_hero_theme');
   $allowed_values = $config->get('settings.allowed_values');
-  foreach ($allowed_values as $allowed_value) {
+  foreach ($allowed_values as $key => $allowed_value) {
     if ($allowed_value['label'] === 'Dark') {
-      $allowed_value['label'] = 'Reverse blocked text';
-    }
-    elseif ($allowed_value['label'] === 'Light') {
-      $allowed_value['label'] = 'Default';
+      $allowed_values[$key]['label'] = 'Reverse blocked text';
+    } elseif ($allowed_value['label'] === 'Light') {
+      $allowed_values[$key]['label'] = 'Default';
     }
   }
   $config->set('settings.allowed_values', $allowed_values);

diff --git a/...les/tide_publication/config/install/core.entity_form_display.node.publication.default.yml b/...les/tide_publication/config/install/core.entity_form_display.node.publication.default.yml
@@ -133,8 +133,8 @@ third_party_settings:
       label: 'Customised Header'
       parent_name: group_section_header
       children:
-        - field_landing_page_hero_image
         - field_landing_page_hero_theme
+        - field_landing_page_hero_image
       format_type: tab
       format_settings:
         description: ''

diff --git a/...ide_publication/config/install/core.entity_form_display.node.publication_page.default.yml b/...ide_publication/config/install/core.entity_form_display.node.publication_page.default.yml
@@ -126,8 +126,8 @@ third_party_settings:
       label: 'Customised Header'
       parent_name: group_section_header
       children:
-        - field_landing_page_hero_image
         - field_landing_page_hero_theme
+        - field_landing_page_hero_image
       format_type: tab
       format_settings:
         description: ''

diff --git a/...publication/config/install/field.field.node.publication.field_landing_page_hero_theme.yml b/...publication/config/install/field.field.node.publication.field_landing_page_hero_theme.yml
@@ -16,7 +16,7 @@ required: true
 translatable: true
 default_value:
   -
-    value: default
+    value: light
 default_value_callback: ''
 settings: {  }
 field_type: list_string
diff --git a/...cation/config/install/field.field.node.publication_page.field_landing_page_hero_theme.yml b/...cation/config/install/field.field.node.publication_page.field_landing_page_hero_theme.yml
@@ -16,7 +16,7 @@ required: true
 translatable: true
 default_value:
   -
-    value: default
+    value: light
 default_value_callback: ''
 settings: {  }
 field_type: list_string
diff --git a/modules/tide_publication/tide_publication.module b/modules/tide_publication/tide_publication.module
@@ -72,12 +72,6 @@ function tide_publication_form_node_form_alter(&$form, FormStateInterface $form_
 
     $form['#process'][] = '_tide_publication_form_node_form_process';
 
-    // Move Hero Image theme to Hero Image field group.
-    if (isset($form['field_landing_page_hero_theme']) && isset($form['field_landing_page_hero_image']['widget'])) {
-      $form['field_landing_page_hero_image']['widget']['field_landing_page_hero_theme'] = $form['field_landing_page_hero_theme'];
-      unset($form['field_landing_page_hero_theme']);
-    }
-
     // Add conditional field for show table of content.
     if (isset($form['field_node_display_headings'])) {
       $form['field_node_display_headings']['#states'] = [
@@ -126,6 +120,13 @@ function _tide_publication_form_node_form_process(array $form, FormStateInterfac
       'default' => t('Default appearance'),
       'fullwidth' => t('Full-width  background image'),
     ],
+    '#ajax' => [
+      'callback' => 'tide_landing_page_set_value_hero_image_theme',
+    ],
+  ];
+
+  $form['field_landing_page_hero_theme']['#states']['enabled'] = [
+    ':input[name="_header_style_options"]' => ['value' => 'corner'],
   ];
 
   $form['field_landing_page_hero_image']['#states']['visible'] = [