From 8421d00a6d11c0dfac2cb5c957ba1e39ad550ea3 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Mon, 29 Jul 2024 14:43:41 +1000 Subject: [PATCH 01/19] deleted style field --- ...splay.paragraph.call_to_action.default.yml | 7 --- ...splay.paragraph.call_to_action.default.yml | 9 ---- ...ll_to_action.field_paragraph_cta_style.yml | 22 --------- ...ge.paragraph.field_paragraph_cta_style.yml | 26 ---------- ...agraphs.paragraphs_type.call_to_action.yml | 2 +- ...ource_config.paragraph--call_to_action.yml | 48 ++++++++++++++++--- tide_landing_page.info.yml | 2 - tide_landing_page.install | 33 +++++++++++++ 8 files changed, 76 insertions(+), 73 deletions(-) delete mode 100644 config/install/field.field.paragraph.call_to_action.field_paragraph_cta_style.yml delete mode 100644 config/install/field.storage.paragraph.field_paragraph_cta_style.yml diff --git a/config/install/core.entity_form_display.paragraph.call_to_action.default.yml b/config/install/core.entity_form_display.paragraph.call_to_action.default.yml index 840b9d5b..9aa57704 100644 --- a/config/install/core.entity_form_display.paragraph.call_to_action.default.yml +++ b/config/install/core.entity_form_display.paragraph.call_to_action.default.yml @@ -5,7 +5,6 @@ dependencies: - entity_browser.browser.tide_image_browser - field.field.paragraph.call_to_action.field_paragraph_body - field.field.paragraph.call_to_action.field_paragraph_cta - - field.field.paragraph.call_to_action.field_paragraph_cta_style - field.field.paragraph.call_to_action.field_paragraph_media - field.field.paragraph.call_to_action.field_paragraph_title - paragraphs.paragraphs_type.call_to_action @@ -35,12 +34,6 @@ content: third_party_settings: { } type: link_default region: content - field_paragraph_cta_style: - weight: 105 - settings: { } - third_party_settings: { } - type: options_select - region: content field_paragraph_media: weight: 103 settings: diff --git a/config/install/core.entity_view_display.paragraph.call_to_action.default.yml b/config/install/core.entity_view_display.paragraph.call_to_action.default.yml index 97c17d6c..5d5c3228 100644 --- a/config/install/core.entity_view_display.paragraph.call_to_action.default.yml +++ b/config/install/core.entity_view_display.paragraph.call_to_action.default.yml @@ -4,14 +4,12 @@ dependencies: config: - field.field.paragraph.call_to_action.field_paragraph_body - field.field.paragraph.call_to_action.field_paragraph_cta - - field.field.paragraph.call_to_action.field_paragraph_cta_style - field.field.paragraph.call_to_action.field_paragraph_media - field.field.paragraph.call_to_action.field_paragraph_title - paragraphs.paragraphs_type.call_to_action module: - link - media - - options - text id: paragraph.call_to_action.default targetEntityType: paragraph @@ -37,13 +35,6 @@ content: third_party_settings: { } type: link region: content - field_paragraph_cta_style: - weight: 4 - label: above - settings: { } - third_party_settings: { } - type: list_default - region: content field_paragraph_media: weight: 2 label: above diff --git a/config/install/field.field.paragraph.call_to_action.field_paragraph_cta_style.yml b/config/install/field.field.paragraph.call_to_action.field_paragraph_cta_style.yml deleted file mode 100644 index 3cf8481d..00000000 --- a/config/install/field.field.paragraph.call_to_action.field_paragraph_cta_style.yml +++ /dev/null @@ -1,22 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_paragraph_cta_style - - paragraphs.paragraphs_type.call_to_action - module: - - options -id: paragraph.call_to_action.field_paragraph_cta_style -field_name: field_paragraph_cta_style -entity_type: paragraph -bundle: call_to_action -label: Style -description: '' -required: false -translatable: false -default_value: - - - value: banner -default_value_callback: '' -settings: { } -field_type: list_string diff --git a/config/install/field.storage.paragraph.field_paragraph_cta_style.yml b/config/install/field.storage.paragraph.field_paragraph_cta_style.yml deleted file mode 100644 index 80a13873..00000000 --- a/config/install/field.storage.paragraph.field_paragraph_cta_style.yml +++ /dev/null @@ -1,26 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - options - - paragraphs -id: paragraph.field_paragraph_cta_style -field_name: field_paragraph_cta_style -entity_type: paragraph -type: list_string -settings: - allowed_values: - - - value: banner - label: Banner - - - value: card - label: Card - allowed_values_function: '' -module: options -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/install/paragraphs.paragraphs_type.call_to_action.yml b/config/install/paragraphs.paragraphs_type.call_to_action.yml index c221eeb9..6072e318 100644 --- a/config/install/paragraphs.paragraphs_type.call_to_action.yml +++ b/config/install/paragraphs.paragraphs_type.call_to_action.yml @@ -5,5 +5,5 @@ id: call_to_action label: 'Call to action' icon_uuid: 239a823e-0af9-493b-bbeb-244632dd3876 icon_default: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjgiIGhlaWdodD0iNzciIHZpZXdCb3g9IjAgMCA2OCA3NyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHJlY3Qgd2lkdGg9IjY4IiBoZWlnaHQ9Ijc3IiBmaWxsPSJ3aGl0ZSIvPgo8cmVjdCB4PSI4IiB5PSI4IiB3aWR0aD0iNTIiIGhlaWdodD0iNjEiIHJ4PSIzIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSIjQzRDNEM0IiBzdHJva2Utd2lkdGg9IjIiLz4KPHJlY3QgeD0iMTMiIHk9IjUyIiB3aWR0aD0iMzEiIGhlaWdodD0iMyIgZmlsbD0iI0M0QzRDNCIvPgo8cmVjdCB4PSIxMyIgeT0iNDYiIHdpZHRoPSI0MiIgaGVpZ2h0PSIzIiBmaWxsPSIjQzRDNEM0Ii8+CjxyZWN0IHg9IjEzIiB5PSI1OCIgd2lkdGg9IjIwIiBoZWlnaHQ9IjYiIHJ4PSIzIiBmaWxsPSIjQTFBMUExIi8+CjxjaXJjbGUgY3g9IjI3IiBjeT0iMjciIHI9IjE0IiBmaWxsPSIjQzRDNEM0Ii8+CjxwYXRoIGQ9Ik0zMi44MDA1IDIyLjA1MjZDMzIuODAwNSAyMC45MjExIDMxLjg4MyAyMCAzMC43NTU4IDIwQzI5LjYwMjQgMjAgMjguNjg0OSAyMC45MjExIDI4LjcxMTEgMjIuMDUyNkMyOC43MTExIDIzLjE4NDIgMjkuNjI4NiAyNC4xMDUzIDMwLjc1NTggMjQuMTA1M0MzMS44ODMgMjQuMTA1MyAzMi44MDA1IDIzLjE4NDIgMzIuODAwNSAyMi4wNTI2WiIgZmlsbD0iI0EyQTJBMiIvPgo8cGF0aCBkPSJNMTguOTA3IDMySDMzLjA4ODlDMzMuOTAxNSAzMiAzNC4yOTQ4IDMxLjA1MjYgMzMuNzQ0MiAzMC41TDMwLjc1NTggMjcuMzQyMUMzMC4zODg4IDI2Ljk3MzcgMjkuODM4MyAyNi45NzM3IDI5LjQ3MTMgMjcuMzE1OEwyOC4zNzAzIDI4LjM2ODRDMjguMTg2OCAyOC41NTI2IDI3Ljg3MjIgMjguNTI2MyAyNy43NDEyIDI4LjI4OTVMMjQuNTY5MiAyMy4wNTI2QzI0LjIyODUgMjIuNDczNyAyMy40MTU4IDIyLjQ3MzcgMjMuMDQ4OCAyMy4wMjYzTDE4LjE0NjcgMzAuNjA1M0MxNy43NTM1IDMxLjIxMDUgMTguMTk5MiAzMiAxOC45MDcgMzJaIiBmaWxsPSIjQTJBMkEyIi8+Cjwvc3ZnPgo=' -description: 'Add a large card or banner with a prominent button to prompt users to take action.' +description: 'Add a banner with a prominent button to prompt users to take action.' behavior_plugins: { } diff --git a/config/optional/jsonapi_extras.jsonapi_resource_config.paragraph--call_to_action.yml b/config/optional/jsonapi_extras.jsonapi_resource_config.paragraph--call_to_action.yml index c21ea1a6..0f4d1b0b 100644 --- a/config/optional/jsonapi_extras.jsonapi_resource_config.paragraph--call_to_action.yml +++ b/config/optional/jsonapi_extras.jsonapi_resource_config.paragraph--call_to_action.yml @@ -14,129 +14,165 @@ resourceFields: enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' uuid: fieldName: uuid publicName: uuid enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' revision_id: fieldName: revision_id publicName: revision_id enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' type: fieldName: type publicName: entity_type enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' langcode: fieldName: langcode publicName: langcode enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' uid: fieldName: uid publicName: uid enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' status: fieldName: status publicName: status enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' created: fieldName: created publicName: created enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' revision_uid: fieldName: revision_uid publicName: revision_uid enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' parent_id: fieldName: parent_id publicName: parent_id enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' parent_type: fieldName: parent_type publicName: parent_type enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' parent_field_name: fieldName: parent_field_name publicName: parent_field_name enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' behavior_settings: fieldName: behavior_settings publicName: behavior_settings enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' default_langcode: fieldName: default_langcode publicName: default_langcode enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' revision_default: fieldName: revision_default publicName: revision_default enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' revision_translation_affected: fieldName: revision_translation_affected publicName: revision_translation_affected enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' moderation_state: fieldName: moderation_state publicName: moderation_state enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' field_paragraph_body: fieldName: field_paragraph_body publicName: field_paragraph_body enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' field_paragraph_cta: fieldName: field_paragraph_cta publicName: field_paragraph_cta enhancer: id: link_enhancer disabled: false - field_paragraph_cta_style: - fieldName: field_paragraph_cta_style - publicName: field_paragraph_cta_style - enhancer: - id: '' - disabled: false + advancedOptionsIcon: '' + enhancer_label: '' field_paragraph_media: fieldName: field_paragraph_media publicName: field_paragraph_media enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' field_paragraph_title: fieldName: field_paragraph_title publicName: field_paragraph_title enhancer: id: '' disabled: false + advancedOptionsIcon: '' + enhancer_label: '' diff --git a/tide_landing_page.info.yml b/tide_landing_page.info.yml index 25b6b6d9..ef9e2908 100644 --- a/tide_landing_page.info.yml +++ b/tide_landing_page.info.yml @@ -130,7 +130,6 @@ config_devel: - field.field.paragraph.basic_text.field_paragraph_body - field.field.paragraph.call_to_action.field_paragraph_body - field.field.paragraph.call_to_action.field_paragraph_cta - - field.field.paragraph.call_to_action.field_paragraph_cta_style - field.field.paragraph.call_to_action.field_paragraph_media - field.field.paragraph.call_to_action.field_paragraph_title - field.field.paragraph.card_event_auto.field_paragraph_cta_text @@ -241,7 +240,6 @@ config_devel: - field.storage.paragraph.field_paragraph_background_image - field.storage.paragraph.field_paragraph_body - field.storage.paragraph.field_paragraph_cta_card_event - - field.storage.paragraph.field_paragraph_cta_style - field.storage.paragraph.field_paragraph_cta_text - field.storage.paragraph.field_complex_image_data - field.storage.paragraph.field_complex_image_data_label diff --git a/tide_landing_page.install b/tide_landing_page.install index 43b3a1e9..01e18747 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -64,3 +64,36 @@ function tide_landing_page_update_10101() { \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/updates'); _tide_core_content_category_form_display('landing_page'); } + +/** + * Remove style option field from call to action component. + */ +function solar_core_update_10102() { + // Delete field configuration manually. + $field_names = ['field_paragraph_cta_style']; + foreach ($field_names as $field_name) { + $field_config = FieldConfig::loadByName('paragraph', 'call_to_action', $field_name); + if ($field_config) { + $field_config->delete(); + } + + $field_storage_config = FieldStorageConfig::loadByName('paragraph', $field_name); + if ($field_storage_config) { + $field_storage_config->delete(); + } + } + + $form_configs = [ + 'core.entity_form_display.paragraph.call_to_action.default', + 'core.entity_view_display.paragraph.call_to_action.default', + 'paragraphs.paragraphs_type.call_to_action', + ]; + foreach ($form_configs as $form_config) { + $config = \Drupal::configFactory()->getEditable($form_config); + $config_read = _tide_read_config($form_config, $config_location, FALSE); + $config->set('dependencies', $config_read['dependencies']); + $config->set('content', $config_read['content']); + $config->set('hidden', $config_read['hidden']); + $config->save(); + } +} From fcf624a81bc5f104794d52665ff71db994693a72 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Mon, 29 Jul 2024 15:04:05 +1000 Subject: [PATCH 02/19] added alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b449210..3dd36466 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_core": "^4.0.0", + "dpc-sdp/tide_core": "dev-feature/update-patch-token-body-summary as dev-develop", "dpc-sdp/tide_media": "^4.0.0", "dpc-sdp/tide_event": "^4.0.0", "dpc-sdp/tide_api": "^4.0.0" From c15f9d53b0461eddfb24bc811ce0c3566e364588 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Mon, 29 Jul 2024 22:30:32 +1000 Subject: [PATCH 03/19] updated alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3dd36466..15ef6572 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_core": "dev-feature/update-patch-token-body-summary as dev-develop", + "dpc-sdp/tide_core": "dev-feature/update_token_version as 4.0.0", "dpc-sdp/tide_media": "^4.0.0", "dpc-sdp/tide_event": "^4.0.0", "dpc-sdp/tide_api": "^4.0.0" From 6668f4cb6b0dce2e611bc8fa34c0b74f9e46a802 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Mon, 29 Jul 2024 22:52:45 +1000 Subject: [PATCH 04/19] updated var --- tide_landing_page.install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tide_landing_page.install b/tide_landing_page.install index 1f007da2..0cd6b1ef 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -95,6 +95,8 @@ function tide_landing_page_update_10102() { * Remove style option field from call to action component. */ function tide_landing_update_10103() { + module_load_include('inc', 'tide_core', 'includes/helpers'); + $config_location = [\Drupal::service('extension.list.module')->getPath('tide_landing_page') . '/config/install']; // Delete field configuration manually. $field_names = ['field_paragraph_cta_style']; foreach ($field_names as $field_name) { From e62d975e0b654b33376c380cf6f33cd6537f6eb6 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Wed, 31 Jul 2024 13:28:06 +1000 Subject: [PATCH 05/19] added use statements --- tide_landing_page.install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tide_landing_page.install b/tide_landing_page.install index 0cd6b1ef..038b9df4 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -5,6 +5,8 @@ * Tide Landing Page install. */ +use Drupal\field\Entity\FieldConfig; +use Drupal\field\Entity\FieldStorageConfig; use Drupal\paragraphs\Entity\Paragraph; use Drupal\tide_landing_page\TideLandingPageOperation; From 4fbe2b852dcfd6dff5512ea63ca9f20fc9da9e49 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Wed, 31 Jul 2024 15:28:46 +1000 Subject: [PATCH 06/19] updated name --- tide_landing_page.install | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tide_landing_page.install b/tide_landing_page.install index 038b9df4..b6f6a277 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -96,7 +96,7 @@ function tide_landing_page_update_10102() { /** * Remove style option field from call to action component. */ -function tide_landing_update_10103() { +function tide_landing_page_update_10103() { module_load_include('inc', 'tide_core', 'includes/helpers'); $config_location = [\Drupal::service('extension.list.module')->getPath('tide_landing_page') . '/config/install']; // Delete field configuration manually. @@ -121,9 +121,7 @@ function tide_landing_update_10103() { foreach ($form_configs as $form_config) { $config = \Drupal::configFactory()->getEditable($form_config); $config_read = _tide_read_config($form_config, $config_location, FALSE); - $config->set('dependencies', $config_read['dependencies']); - $config->set('content', $config_read['content']); - $config->set('hidden', $config_read['hidden']); + $config->set('description', $config_read['description']); $config->save(); } } From cf8d317d5efd981525596c65398278d86a544e12 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Wed, 31 Jul 2024 16:26:39 +1000 Subject: [PATCH 07/19] updated weight --- ...field.node.landing_page.field_landing_page_component.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/install/field.field.node.landing_page.field_landing_page_component.yml b/config/install/field.field.node.landing_page.field_landing_page_component.yml index 4a488e41..68c1b728 100644 --- a/config/install/field.field.node.landing_page.field_landing_page_component.yml +++ b/config/install/field.field.node.landing_page.field_landing_page_component.yml @@ -42,6 +42,7 @@ settings: promotion_card: promotion_card navigation_card: navigation_card card_keydates: card_keydates + call_to_action: call_to_action card_carousel: card_carousel embedded_webform: embedded_webform form_embed_openforms: form_embed_openforms @@ -49,7 +50,6 @@ settings: complex_image: complex_image timelines: timelines compact_card_collection: compact_card_collection - call_to_action: call_to_action data_table: data_table statistics_grid: statistics_grid target_bundles_drag_drop: @@ -96,11 +96,11 @@ settings: weight: -6 enabled: false keydates: - weight: -5 + weight: -4 enabled: false call_to_action: enabled: true - weight: -12 + weight: -5 embedded_webform: enabled: true weight: -20 From 5fcacfd99383e12cff5c4966c6751c25ccb90130 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Wed, 31 Jul 2024 17:37:01 +1000 Subject: [PATCH 08/19] updated weight --- tide_landing_page.install | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tide_landing_page.install b/tide_landing_page.install index b6f6a277..03f9ae59 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -125,3 +125,38 @@ function tide_landing_page_update_10103() { $config->save(); } } + +/** + * Change weight of paragraph types. + */ +function tide_landing_page_update_10104() { + module_load_include('inc', 'tide_core', 'includes/helpers'); + $config_location = [drupal_get_path('module', 'tide_landing_page') . '/config/install']; + $config = 'field.field.node.landing_page.field_landing_page_component'; + // Read only from /config/install. + $config_read = _tide_read_config($config, $config_location, FALSE); + // Get the sync file to update. + $config_factory = \Drupal::configFactory(); + $config_sync = $config_factory->getEditable($config); + $paragraphs = [ + 'basic_text', + 'accordion', + 'promotion_card', + 'navigation_card', + 'card_keydates', + 'call_to_action', + 'embedded_webform', + 'form_embed_openforms', + 'media_gallery', + 'complex_image', + 'timelines', + 'compact_card_collection', + 'data_table', + 'statistics_grid', + ]; + foreach ($paragraphs as $paragraph_type_id) { + // Changing weight. + $new_weight = $config_read['settings']['handler_settings']['target_bundles_drag_drop'][$paragraph_type_id]['weight']; + $config_sync->set('settings.handler_settings.target_bundles_drag_drop.' . $paragraph_type_id . '.weight', $new_weight)->save(); + } +} From 9064f577d8f76d4c78822bb6241ed1286cd74552 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Fri, 2 Aug 2024 10:06:45 +1000 Subject: [PATCH 09/19] updated function --- tide_landing_page.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tide_landing_page.install b/tide_landing_page.install index 03f9ae59..ff91650c 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -131,7 +131,7 @@ function tide_landing_page_update_10103() { */ function tide_landing_page_update_10104() { module_load_include('inc', 'tide_core', 'includes/helpers'); - $config_location = [drupal_get_path('module', 'tide_landing_page') . '/config/install']; + $config_location = [\Drupal::service('extension.list.module')->getPath('tide_landing_page') . '/config/install']; $config = 'field.field.node.landing_page.field_landing_page_component'; // Read only from /config/install. $config_read = _tide_read_config($config, $config_location, FALSE); From e72fa8fd16a297f64e6e32bce75de0fd3c459113 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Fri, 2 Aug 2024 10:13:36 +1000 Subject: [PATCH 10/19] bumped tide core version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 15ef6572..1d1c9733 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_core": "dev-feature/update_token_version as 4.0.0", + "dpc-sdp/tide_core": "4.1.3", "dpc-sdp/tide_media": "^4.0.0", "dpc-sdp/tide_event": "^4.0.0", "dpc-sdp/tide_api": "^4.0.0" From ac5aa5da5ac245d32e67e0ee5550c0f7ef981858 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Fri, 2 Aug 2024 10:19:07 +1000 Subject: [PATCH 11/19] updated composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1d1c9733..7b449210 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_core": "4.1.3", + "dpc-sdp/tide_core": "^4.0.0", "dpc-sdp/tide_media": "^4.0.0", "dpc-sdp/tide_event": "^4.0.0", "dpc-sdp/tide_api": "^4.0.0" From 7a5397687e13554f6600d236eaaa8f097b7a0e91 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Fri, 2 Aug 2024 14:39:22 +1000 Subject: [PATCH 12/19] updated weights --- ...ding_page.field_landing_page_component.yml | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/config/install/field.field.node.landing_page.field_landing_page_component.yml b/config/install/field.field.node.landing_page.field_landing_page_component.yml index 68c1b728..f5ed2bd0 100644 --- a/config/install/field.field.node.landing_page.field_landing_page_component.yml +++ b/config/install/field.field.node.landing_page.field_landing_page_component.yml @@ -54,105 +54,105 @@ settings: statistics_grid: statistics_grid target_bundles_drag_drop: banner: - weight: -33 + weight: -95 enabled: false basic_text: enabled: true - weight: -32 + weight: -94 accordion: enabled: true - weight: -31 + weight: -93 card_promotion: enabled: false - weight: -27 + weight: -89 card_promotion_auto: enabled: false - weight: -26 + weight: -88 compact_card: - weight: -1 + weight: -66 enabled: false compact_card_collection: - weight: -13 + weight: -65 enabled: true complex_image: enabled: true - weight: -17 + weight: -79 data_table: enabled: true - weight: -8 + weight: -75 key_journeys: - weight: -25 + weight: -87 enabled: false related_links: - weight: -24 + weight: -86 enabled: false links: - weight: -23 + weight: -85 enabled: false card_keydates: enabled: true - weight: -22 + weight: -84 accordion_content: weight: -6 enabled: false keydates: - weight: -4 + weight: -73 enabled: false call_to_action: enabled: true - weight: -5 + weight: -83 embedded_webform: enabled: true - weight: -20 + weight: -81 form_embed_openforms: enabled: true - weight: 23 + weight: -71 navigation_card: enabled: true - weight: -29 + weight: -91 media_gallery: enabled: true - weight: -18 + weight: -80 card_carousel: enabled: true - weight: -21 + weight: -82 contact_us: - weight: 34 + weight: -70 enabled: false call_to_action_image: - weight: 35 + weight: -69 enabled: false phone: - weight: 38 + weight: -68 enabled: false promotion_card: enabled: true - weight: -30 + weight: -92 statistic_block: - weight: 151 + weight: -49 enabled: false statistics_grid: enabled: true - weight: 150 + weight: -50 social_link: - weight: 40 + weight: -67 enabled: false event_details: - weight: 46 + weight: -64 enabled: false introduction_banner: - weight: 48 + weight: -63 enabled: false embedded_search_form: - weight: 52 + weight: -62 enabled: false grants_overview: weight: 56 enabled: false timeline: - weight: 67 + weight: -58 enabled: false timelines: enabled: true - weight: -16 + weight: -78 field_type: entity_reference_revisions From 50133093c94ac58fc8cc5700d59218eb38dd6a6b Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Mon, 5 Aug 2024 14:05:44 +1000 Subject: [PATCH 13/19] added tide core alias in composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b449210..58b7c4af 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_core": "^4.0.0", + "dpc-sdp/tide_core": "dev-feature/remove-field-group-patch as 4.1.3", "dpc-sdp/tide_media": "^4.0.0", "dpc-sdp/tide_event": "^4.0.0", "dpc-sdp/tide_api": "^4.0.0" From 3c20d9e151aa697bda52232b53ffdee83dda56f5 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Sun, 18 Aug 2024 17:39:25 +1000 Subject: [PATCH 14/19] Updated weights --- ...ding_page.field_landing_page_component.yml | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/config/install/field.field.node.landing_page.field_landing_page_component.yml b/config/install/field.field.node.landing_page.field_landing_page_component.yml index f5ed2bd0..2bd28540 100644 --- a/config/install/field.field.node.landing_page.field_landing_page_component.yml +++ b/config/install/field.field.node.landing_page.field_landing_page_component.yml @@ -41,9 +41,9 @@ settings: accordion: accordion promotion_card: promotion_card navigation_card: navigation_card + card_carousel: card_carousel card_keydates: card_keydates call_to_action: call_to_action - card_carousel: card_carousel embedded_webform: embedded_webform form_embed_openforms: form_embed_openforms media_gallery: media_gallery @@ -62,60 +62,66 @@ settings: accordion: enabled: true weight: -93 + promotion_card: + enabled: true + weight: -92 + navigation_card: + enabled: true + weight: -91 card_promotion: enabled: false - weight: -89 + weight: -90 card_promotion_auto: enabled: false + weight: -89 + key_journeys: weight: -88 - compact_card: - weight: -66 enabled: false - compact_card_collection: - weight: -65 + related_links: + weight: -87 + enabled: false + links: + weight: -86 + enabled: false + card_carousel: + enabled: true + weight: -84 + card_keydates: + enabled: true + weight: -83 + call_to_action: enabled: true + weight: -82 + form_embed_openforms: + enabled: true + weight: -81 + media_gallery: + enabled: true + weight: -80 complex_image: enabled: true weight: -79 + timelines: + enabled: true + weight: -78 data_table: enabled: true weight: -75 - key_journeys: - weight: -87 - enabled: false - related_links: - weight: -86 - enabled: false - links: - weight: -85 + compact_card: + weight: -66 enabled: false - card_keydates: + compact_card_collection: + weight: -65 enabled: true - weight: -84 accordion_content: - weight: -6 + weight: -74 enabled: false keydates: weight: -73 enabled: false - call_to_action: - enabled: true - weight: -83 embedded_webform: enabled: true weight: -81 - form_embed_openforms: - enabled: true - weight: -71 - navigation_card: - enabled: true - weight: -91 - media_gallery: - enabled: true - weight: -80 - card_carousel: - enabled: true - weight: -82 contact_us: weight: -70 enabled: false @@ -125,15 +131,12 @@ settings: phone: weight: -68 enabled: false - promotion_card: - enabled: true - weight: -92 statistic_block: weight: -49 enabled: false statistics_grid: enabled: true - weight: -50 + weight: -61 social_link: weight: -67 enabled: false @@ -150,9 +153,6 @@ settings: weight: 56 enabled: false timeline: - weight: -58 + weight: -5 enabled: false - timelines: - enabled: true - weight: -78 field_type: entity_reference_revisions From a282e770dea43ca4b3f55969e801ef3c51de31a7 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Sun, 18 Aug 2024 21:19:29 +1000 Subject: [PATCH 15/19] revert alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 58b7c4af..7b449210 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "dpc-sdp/tide_core": "dev-feature/remove-field-group-patch as 4.1.3", + "dpc-sdp/tide_core": "^4.0.0", "dpc-sdp/tide_media": "^4.0.0", "dpc-sdp/tide_event": "^4.0.0", "dpc-sdp/tide_api": "^4.0.0" From 6788fc9e29b5adbfcd3413caea61a381d1cd24a1 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Mon, 19 Aug 2024 23:01:02 +1000 Subject: [PATCH 16/19] Fixed issue with field_deleted_data_xxxxx and updated weights --- ...ding_page.field_landing_page_component.yml | 29 ++++++++++--------- tide_landing_page.install | 9 ++++++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/config/install/field.field.node.landing_page.field_landing_page_component.yml b/config/install/field.field.node.landing_page.field_landing_page_component.yml index 2bd28540..bf7315a9 100644 --- a/config/install/field.field.node.landing_page.field_landing_page_component.yml +++ b/config/install/field.field.node.landing_page.field_landing_page_component.yml @@ -83,30 +83,36 @@ settings: links: weight: -86 enabled: false - card_carousel: - enabled: true - weight: -84 card_keydates: enabled: true weight: -83 call_to_action: enabled: true weight: -82 + card_event: + weight: -81 + enabled: true + card_carousel: + weight: -80 + enabled: true + embedded_webform: + enabled: true + weight: -79 form_embed_openforms: enabled: true - weight: -81 + weight: -78 media_gallery: enabled: true - weight: -80 + weight: -77 complex_image: enabled: true - weight: -79 + weight: -76 timelines: enabled: true - weight: -78 + weight: -75 data_table: enabled: true - weight: -75 + weight: -74 compact_card: weight: -66 enabled: false @@ -114,14 +120,11 @@ settings: weight: -65 enabled: true accordion_content: - weight: -74 + weight: -73 enabled: false keydates: - weight: -73 + weight: -72 enabled: false - embedded_webform: - enabled: true - weight: -81 contact_us: weight: -70 enabled: false diff --git a/tide_landing_page.install b/tide_landing_page.install index ff91650c..3b7e6f0d 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -9,6 +9,7 @@ use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\paragraphs\Entity\Paragraph; use Drupal\tide_landing_page\TideLandingPageOperation; +use Drush\Drush; /** * Implements hook_install(). @@ -97,6 +98,12 @@ function tide_landing_page_update_10102() { * Remove style option field from call to action component. */ function tide_landing_page_update_10103() { + // To avoid error `table for the field couldn't be renamed to the field_deleted_data_xxxxx{long-hash-string} + // because the table already exists` + // @link https://www.drupal.org/project/drupal/issues/2836539 + $alias_manager = Drush::service('site.alias.manager'); + Drush::drush($alias_manager->getSelf(), 'cron')->run(); + module_load_include('inc', 'tide_core', 'includes/helpers'); $config_location = [\Drupal::service('extension.list.module')->getPath('tide_landing_page') . '/config/install']; // Delete field configuration manually. @@ -145,6 +152,8 @@ function tide_landing_page_update_10104() { 'navigation_card', 'card_keydates', 'call_to_action', + 'card_event', + 'card_carousel', 'embedded_webform', 'form_embed_openforms', 'media_gallery', From 7d1915367855330573042f46b6b7670330c740f9 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Tue, 20 Aug 2024 09:33:17 +1000 Subject: [PATCH 17/19] fixed lint --- tide_landing_page.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tide_landing_page.install b/tide_landing_page.install index 3b7e6f0d..94072a88 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -98,8 +98,8 @@ function tide_landing_page_update_10102() { * Remove style option field from call to action component. */ function tide_landing_page_update_10103() { - // To avoid error `table for the field couldn't be renamed to the field_deleted_data_xxxxx{long-hash-string} - // because the table already exists` + // To avoid error `table for the field couldn't be renamed to the + // field_deleted_data_xxxxx{long-hash-string} because the table already exists`. // @link https://www.drupal.org/project/drupal/issues/2836539 $alias_manager = Drush::service('site.alias.manager'); Drush::drush($alias_manager->getSelf(), 'cron')->run(); From cc32d4e20a89e724a4029985c4dbbf61d6d2c416 Mon Sep 17 00:00:00 2001 From: Yeni Atencio Date: Tue, 20 Aug 2024 09:48:57 +1000 Subject: [PATCH 18/19] fixed lint --- tide_landing_page.install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tide_landing_page.install b/tide_landing_page.install index 94072a88..1d61b284 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -98,8 +98,9 @@ function tide_landing_page_update_10102() { * Remove style option field from call to action component. */ function tide_landing_page_update_10103() { - // To avoid error `table for the field couldn't be renamed to the - // field_deleted_data_xxxxx{long-hash-string} because the table already exists`. + // To avoid error `table for the field couldn't be renamed to + // the field_deleted_data_xxxxx{long-hash-string} because + // the table already exists`. // @link https://www.drupal.org/project/drupal/issues/2836539 $alias_manager = Drush::service('site.alias.manager'); Drush::drush($alias_manager->getSelf(), 'cron')->run(); From 69a7dbc6651dbd9fd1109f66d8cea16c4868a3b6 Mon Sep 17 00:00:00 2001 From: Yeni Atencio <47239456+yeniatencio@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:56:58 +1000 Subject: [PATCH 19/19] Update tide_landing_page.install revert --- tide_landing_page.install | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tide_landing_page.install b/tide_landing_page.install index 1d61b284..c5b4bad1 100644 --- a/tide_landing_page.install +++ b/tide_landing_page.install @@ -9,7 +9,6 @@ use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\paragraphs\Entity\Paragraph; use Drupal\tide_landing_page\TideLandingPageOperation; -use Drush\Drush; /** * Implements hook_install(). @@ -98,13 +97,6 @@ function tide_landing_page_update_10102() { * Remove style option field from call to action component. */ function tide_landing_page_update_10103() { - // To avoid error `table for the field couldn't be renamed to - // the field_deleted_data_xxxxx{long-hash-string} because - // the table already exists`. - // @link https://www.drupal.org/project/drupal/issues/2836539 - $alias_manager = Drush::service('site.alias.manager'); - Drush::drush($alias_manager->getSelf(), 'cron')->run(); - module_load_include('inc', 'tide_core', 'includes/helpers'); $config_location = [\Drupal::service('extension.list.module')->getPath('tide_landing_page') . '/config/install']; // Delete field configuration manually.