diff --git a/composer.lock b/composer.lock index a9025f04..7b8bb808 100644 --- a/composer.lock +++ b/composer.lock @@ -4063,16 +4063,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.7", + "version": "4.3.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "ced6870c099b2c1d52be3e3bb8a095a502238644" + "reference": "c9651938b36e6234d0aa931471e9a27b51571538" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/ced6870c099b2c1d52be3e3bb8a095a502238644", - "reference": "ced6870c099b2c1d52be3e3bb8a095a502238644", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c9651938b36e6234d0aa931471e9a27b51571538", + "reference": "c9651938b36e6234d0aa931471e9a27b51571538", "shasum": "" }, "require": { @@ -4087,10 +4087,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.7", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.9", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-12-14T08:23:01+00:00" + "time": "2022-12-21T10:06:29+00:00" }, { "name": "drupal/hdbt_admin", @@ -4126,16 +4126,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.6", + "version": "2.3.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "f25f99abb17896c15531b4834f0908ba560437bd" + "reference": "bbf138db7bac7701097881a36832288ae809bf7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f25f99abb17896c15531b4834f0908ba560437bd", - "reference": "f25f99abb17896c15531b4834f0908ba560437bd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bbf138db7bac7701097881a36832288ae809bf7f", + "reference": "bbf138db7bac7701097881a36832288ae809bf7f", "shasum": "" }, "require": { @@ -4158,10 +4158,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-11-28T07:46:25+00:00" + "time": "2022-12-21T10:10:38+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4290,16 +4290,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.16.1", + "version": "2.16.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae" + "reference": "32c89257897002810223079f2e3dd4363da6d692" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae", - "reference": "c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/32c89257897002810223079f2e3dd4363da6d692", + "reference": "32c89257897002810223079f2e3dd4363da6d692", "shasum": "" }, "require": { @@ -4398,6 +4398,9 @@ }, "drupal/field_group": { "[#UHF-3268] Support for field group translations": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/736077493b73d83b63081820790dc68e226a6460/patches/field_group_fix-translations_label_description-3111107-31-rerolled.patch" + }, + "drupal/publication_date": { + "[#UHF-7721] Fixed node preview when publication date is not set. (https://www.drupal.org/project/publication_date/issues/3074373)": "https://www.drupal.org/files/issues/2022-12-20/publication_date_is_required_for_completing_the_form-3074373-11.patch" } } }, @@ -4406,10 +4409,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-12-16T11:47:12+00:00" + "time": "2022-12-21T10:49:51+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.entity_form_display.paragraph.popular_services.default.yml b/conf/cmi/core.entity_form_display.paragraph.popular_services.default.yml index a8a38103..d7a15395 100644 --- a/conf/cmi/core.entity_form_display.paragraph.popular_services.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.popular_services.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.popular_services.field_popular_services_title - field.field.paragraph.popular_services.field_service_items - paragraphs.paragraphs_type.popular_services module: @@ -16,7 +17,7 @@ mode: default content: field_service_items: type: paragraphs - weight: 0 + weight: 1 region: content settings: title: Paragraph @@ -32,6 +33,15 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } + field_popular_services_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } hidden: created: true + field_popular_services_title: true status: true diff --git a/conf/cmi/core.entity_view_display.paragraph.popular_services.default.yml b/conf/cmi/core.entity_view_display.paragraph.popular_services.default.yml index f0ba0594..4fcf6012 100644 --- a/conf/cmi/core.entity_view_display.paragraph.popular_services.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.popular_services.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.popular_services.field_popular_services_title - field.field.paragraph.popular_services.field_service_items - paragraphs.paragraphs_type.popular_services module: @@ -21,7 +22,16 @@ content: view_mode: default link: '' third_party_settings: { } + weight: 1 + region: content + field_popular_services_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } weight: 0 region: content hidden: + field_popular_services_title: true search_api_excerpt: true diff --git a/conf/cmi/field.field.paragraph.popular_services.field_popular_services_title.yml b/conf/cmi/field.field.paragraph.popular_services.field_popular_services_title.yml new file mode 100644 index 00000000..e26228e2 --- /dev/null +++ b/conf/cmi/field.field.paragraph.popular_services.field_popular_services_title.yml @@ -0,0 +1,19 @@ +uuid: 053f5137-5e5d-49cb-a412-14a730447da6 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_popular_services_title + - paragraphs.paragraphs_type.popular_services +id: paragraph.popular_services.field_popular_services_title +field_name: field_popular_services_title +entity_type: paragraph +bundle: popular_services +label: Title +description: 'If this field is left empty, the title will be "Popular services"' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_popular_services_title.yml b/conf/cmi/field.storage.paragraph.field_popular_services_title.yml new file mode 100644 index 00000000..60af3cf0 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_popular_services_title.yml @@ -0,0 +1,21 @@ +uuid: f15e0765-32d1-48d8-95a3-ffe224bfe876 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_popular_services_title +field_name: field_popular_services_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/conf/cmi/language/fi/field.field.paragraph.popular_services.field_popular_services_title.yml b/conf/cmi/language/fi/field.field.paragraph.popular_services.field_popular_services_title.yml new file mode 100644 index 00000000..6c4b1d16 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.popular_services.field_popular_services_title.yml @@ -0,0 +1 @@ +description: 'Jos kenttä jätetään tyhjäksi, otsikoksi tulee "Suosittuja palveluja"' diff --git a/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml b/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml new file mode 100644 index 00000000..f7800f7f --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml @@ -0,0 +1 @@ +description: 'Om detta lämnas tomt, titel är "Populära tjänster"'