From c557cc1c5fce190c421b6a2ce7132ce3d76af903 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 19 Dec 2024 15:47:00 +0200 Subject: [PATCH 1/2] UHF-9507: Change Unit contact card paragraph heading from free text input to radiobutton selection --- ...ay.paragraph.unit_contact_card.default.yml | 12 ++++----- ...ay.paragraph.unit_contact_card.default.yml | 11 +++----- ...ontact_card.field_unit_contact_heading.yml | 23 ++++++++++++++++ ...e.paragraph.field_unit_contact_heading.yml | 27 +++++++++++++++++++ ...ontact_card.field_unit_contact_heading.yml | 2 ++ ...e.paragraph.field_unit_contact_heading.yml | 6 +++++ .../helfi_tpr_config/helfi_tpr_config.install | 4 +-- 7 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml create mode 100644 modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_heading.yml create mode 100644 modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml create mode 100644 modules/helfi_tpr_config/config/optional/language/fi/field.storage.paragraph.field_unit_contact_heading.yml diff --git a/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml b/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml index 7af2e77e1..beafff965 100644 --- a/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml +++ b/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.unit_contact_card.field_unit_contact_heading - field.field.paragraph.unit_contact_card.field_unit_contact_title - field.field.paragraph.unit_contact_card.field_unit_contact_unit - field.field.paragraph.unit_contact_card.field_unit_contact_use_address @@ -19,14 +20,12 @@ targetEntityType: paragraph bundle: unit_contact_card mode: default content: - field_unit_contact_title: - type: string_textfield + field_unit_contact_heading: + type: options_buttons weight: 0 region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } + settings: { } + third_party_settings: { } field_unit_contact_unit: type: entity_reference_autocomplete weight: 1 @@ -95,4 +94,5 @@ content: third_party_settings: { } hidden: created: true + field_unit_contact_title: true status: true diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml index 74887333d..aeedbd1c1 100644 --- a/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml +++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.unit_contact_card.field_unit_contact_heading - field.field.paragraph.unit_contact_card.field_unit_contact_title - field.field.paragraph.unit_contact_card.field_unit_contact_unit - field.field.paragraph.unit_contact_card.field_unit_contact_use_address @@ -19,14 +20,6 @@ targetEntityType: paragraph bundle: unit_contact_card mode: default content: - field_unit_contact_title: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: 0 - region: content field_unit_contact_unit: type: entity_reference_label label: hidden @@ -36,6 +29,8 @@ content: weight: 1 region: content hidden: + field_unit_contact_title: true + field_unit_contact_heading: true field_unit_contact_use_address: true field_unit_contact_use_details: true field_unit_contact_use_link: true diff --git a/modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml b/modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml new file mode 100644 index 000000000..f67a29a78 --- /dev/null +++ b/modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml @@ -0,0 +1,23 @@ +uuid: 6c99f53c-3860-4a4f-adde-0e465d98e131 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_heading + - paragraphs.paragraphs_type.unit_contact_card + module: + - options +id: paragraph.unit_contact_card.field_unit_contact_heading +field_name: field_unit_contact_heading +entity_type: paragraph +bundle: unit_contact_card +label: Heading +description: " The default heading for the component is “Contact information”. Choose the unit name as the heading if it is not clear which unit's contact information is being referred to." +required: true +translatable: false +default_value: + - + value: default +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_heading.yml b/modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_heading.yml new file mode 100644 index 000000000..72ee0109e --- /dev/null +++ b/modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_heading.yml @@ -0,0 +1,27 @@ +uuid: 5e3d0bce-6114-40f1-b778-8fece473c972 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_unit_contact_heading +field_name: field_unit_contact_heading +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: default + label: 'Contact information' + - + value: unit_name + label: 'The unit name' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml b/modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml new file mode 100644 index 000000000..f7f4611b2 --- /dev/null +++ b/modules/helfi_tpr_config/config/optional/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml @@ -0,0 +1,2 @@ +label: Otsikko +description: 'Komponentin oletusotsikko on ”Yhteystiedot”. Valitse otsikoksi kyseisen toimipisteen nimi, jos ei ole ilmeistä, minkä toimipisteen yhteystiedoista on kyse.' diff --git a/modules/helfi_tpr_config/config/optional/language/fi/field.storage.paragraph.field_unit_contact_heading.yml b/modules/helfi_tpr_config/config/optional/language/fi/field.storage.paragraph.field_unit_contact_heading.yml new file mode 100644 index 000000000..382e1fa91 --- /dev/null +++ b/modules/helfi_tpr_config/config/optional/language/fi/field.storage.paragraph.field_unit_contact_heading.yml @@ -0,0 +1,6 @@ +settings: + allowed_values: + - + label: Yhteystiedot + - + label: 'Kyseisen toimipisteen nimi' diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index d4ecf610b..d4f3b760f 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -381,9 +381,9 @@ function helfi_tpr_config_update_9052() : void { } /** - * UHF-10555: Update TPR Unit wide teaser display. + * UHF-9507: Change unit contact card heading logic. */ -function helfi_tpr_config_update_9072(): void { +function helfi_tpr_config_update_9073(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_tpr_config'); } From 598a58a903326b748d536baac686435d55b4edb8 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 20 Dec 2024 18:29:50 +0200 Subject: [PATCH 2/2] UHF-9507: Remove unit contact card field title --- ...ay.paragraph.unit_contact_card.default.yml | 2 -- ...ay.paragraph.unit_contact_card.default.yml | 2 -- ..._contact_card.field_unit_contact_title.yml | 19 ----------------- ...age.paragraph.field_unit_contact_title.yml | 21 ------------------- .../helfi_tpr_config/helfi_tpr_config.install | 10 +++++++-- 5 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml delete mode 100644 modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_title.yml diff --git a/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml b/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml index beafff965..cc2c9e724 100644 --- a/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml +++ b/modules/helfi_tpr_config/config/install/core.entity_form_display.paragraph.unit_contact_card.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.paragraph.unit_contact_card.field_unit_contact_heading - - field.field.paragraph.unit_contact_card.field_unit_contact_title - field.field.paragraph.unit_contact_card.field_unit_contact_unit - field.field.paragraph.unit_contact_card.field_unit_contact_use_address - field.field.paragraph.unit_contact_card.field_unit_contact_use_details @@ -94,5 +93,4 @@ content: third_party_settings: { } hidden: created: true - field_unit_contact_title: true status: true diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml index aeedbd1c1..055a867ca 100644 --- a/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml +++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.paragraph.unit_contact_card.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.paragraph.unit_contact_card.field_unit_contact_heading - - field.field.paragraph.unit_contact_card.field_unit_contact_title - field.field.paragraph.unit_contact_card.field_unit_contact_unit - field.field.paragraph.unit_contact_card.field_unit_contact_use_address - field.field.paragraph.unit_contact_card.field_unit_contact_use_details @@ -29,7 +28,6 @@ content: weight: 1 region: content hidden: - field_unit_contact_title: true field_unit_contact_heading: true field_unit_contact_use_address: true field_unit_contact_use_details: true diff --git a/modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml deleted file mode 100644 index c83855cae..000000000 --- a/modules/helfi_tpr_config/config/install/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 139be617-c05b-4b18-bd3e-562917be1790 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_unit_contact_title - - paragraphs.paragraphs_type.unit_contact_card -id: paragraph.unit_contact_card.field_unit_contact_title -field_name: field_unit_contact_title -entity_type: paragraph -bundle: unit_contact_card -label: Title -description: '' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_title.yml b/modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_title.yml deleted file mode 100644 index 425a41509..000000000 --- a/modules/helfi_tpr_config/config/install/field.storage.paragraph.field_unit_contact_title.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 9f58071d-b743-49eb-9f21-e00ed5bf8cc3 -langcode: en -status: true -dependencies: - module: - - paragraphs -id: paragraph.field_unit_contact_title -field_name: field_unit_contact_title -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index d4f3b760f..a64b58d3e 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -10,6 +10,7 @@ declare(strict_types=1); use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\linkit\Entity\Profile; +use Drupal\field\Entity\FieldStorageConfig; /** * Grants required permissions. @@ -381,9 +382,14 @@ function helfi_tpr_config_update_9052() : void { } /** - * UHF-9507: Change unit contact card heading logic. + * UHF-9507: Replace unit contact title with heading selector. */ -function helfi_tpr_config_update_9073(): void { +function helfi_tpr_config_update_9074(): void { + $field = FieldStorageConfig::loadByName('paragraph', 'field_unit_contact_title'); + if ($field) { + $field->delete(); + } + \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_tpr_config'); }