diff --git a/composer.lock b/composer.lock index b752d3b0..6c0f528a 100644 --- a/composer.lock +++ b/composer.lock @@ -3695,16 +3695,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.10", + "version": "6.5.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "a1158717f670b8ff61243af8cefb51f557722edf" + "reference": "1bceace4bc51d2a6ebfc368434485cbea20c1d52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/a1158717f670b8ff61243af8cefb51f557722edf", - "reference": "a1158717f670b8ff61243af8cefb51f557722edf", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1bceace4bc51d2a6ebfc368434485cbea20c1d52", + "reference": "1bceace4bc51d2a6ebfc368434485cbea20c1d52", "shasum": "" }, "require": { @@ -3722,23 +3722,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-05-07T08:17:22+00:00" + "time": "2024-05-20T09:37:47+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.1.6", + "version": "3.1.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "96f29332a57540bda695cd53e5b288bc96960076" + "reference": "33a217058068330c90b049e539e91b19d24d933d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/96f29332a57540bda695cd53e5b288bc96960076", - "reference": "96f29332a57540bda695cd53e5b288bc96960076", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/33a217058068330c90b049e539e91b19d24d933d", + "reference": "33a217058068330c90b049e539e91b19d24d933d", "shasum": "" }, "require": { @@ -3757,10 +3757,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.7", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-04-11T13:46:53+00:00" + "time": "2024-05-20T09:40:02+00:00" }, { "name": "drupal/health_check", @@ -4019,16 +4019,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.54", + "version": "4.3.55", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "7e54899eea80996a9438465f247336fc2ebc0695" + "reference": "20d94f8c39b204768df18d4af0e521aa9efb0b37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7e54899eea80996a9438465f247336fc2ebc0695", - "reference": "7e54899eea80996a9438465f247336fc2ebc0695", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/20d94f8c39b204768df18d4af0e521aa9efb0b37", + "reference": "20d94f8c39b204768df18d4af0e521aa9efb0b37", "shasum": "" }, "require": { @@ -4139,10 +4139,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.54", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.55", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-05-17T09:48:32+00:00" + "time": "2024-05-20T09:41:13+00:00" }, { "name": "drupal/helfi_proxy", @@ -7411,16 +7411,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4" + "reference": "7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4", - "reference": "4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce", + "reference": "7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce", "shasum": "" }, "require": { @@ -7463,9 +7463,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.1.0" + "source": "https://github.com/FileEye/MimeMap/tree/2.1.1" }, - "time": "2024-04-06T13:00:52+00:00" + "time": "2024-05-17T19:22:06+00:00" }, { "name": "fileeye/pel", @@ -7530,26 +7530,26 @@ }, { "name": "firebase/php-jwt", - "version": "v6.10.0", + "version": "v6.10.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "a49db6f0a5033aef5143295342f1c95521b075ff" + "reference": "500501c2ce893c824c801da135d02661199f60c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff", - "reference": "a49db6f0a5033aef5143295342f1c95521b075ff", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5", + "reference": "500501c2ce893c824c801da135d02661199f60c5", "shasum": "" }, "require": { - "php": "^7.4||^8.0" + "php": "^8.0" }, "require-dev": { - "guzzlehttp/guzzle": "^6.5||^7.4", + "guzzlehttp/guzzle": "^7.4", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "psr/cache": "^1.0||^2.0", + "psr/cache": "^2.0||^3.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0" }, @@ -7587,9 +7587,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.10.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.10.1" }, - "time": "2023-12-01T16:26:39+00:00" + "time": "2024-05-18T18:05:11+00:00" }, { "name": "galbar/jsonpath", diff --git a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml index 5e5aec15..054e98a1 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml @@ -2,8 +2,6 @@ uuid: b95230b8-fb95-4373-b877-6117cf4d0f46 langcode: en status: true dependencies: - config: - - field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id module: - external_entities _core: @@ -13,14 +11,6 @@ targetEntityType: helfi_news_groups bundle: helfi_news_groups mode: default content: - field_frontpage_term_id: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } title: type: string_textfield weight: -5 @@ -29,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index fb3d0442..87f00b83 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -2,8 +2,6 @@ uuid: d13089ef-9704-4770-90a9-fd9fedc50405 langcode: en status: true dependencies: - config: - - field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id module: - external_entities _core: @@ -13,14 +11,6 @@ targetEntityType: helfi_news_neighbourhoods bundle: helfi_news_neighbourhoods mode: default content: - field_frontpage_term_id: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } title: type: string_textfield weight: -5 @@ -29,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml index b958c404..eed8c213 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml @@ -2,8 +2,6 @@ uuid: 972acdae-8e71-4d12-a335-bc91828f4851 langcode: en status: true dependencies: - config: - - field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id module: - external_entities _core: @@ -13,14 +11,6 @@ targetEntityType: helfi_news_tags bundle: helfi_news_tags mode: default content: - field_frontpage_term_id: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } title: type: string_textfield weight: -5 @@ -29,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml index 7c71202d..bf9771d0 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml @@ -2,8 +2,6 @@ uuid: 045f335b-7059-4d6a-9240-43909f3c1704 langcode: en status: true dependencies: - config: - - field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id module: - external_entities _core: @@ -22,5 +20,5 @@ content: weight: 0 region: content hidden: - field_frontpage_term_id: true search_api_excerpt: true + tid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index 91cbb10b..911deca1 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -2,8 +2,6 @@ uuid: f8d0f0da-4aff-436c-a4b8-4df8c6ee82f8 langcode: en status: true dependencies: - config: - - field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id module: - external_entities _core: @@ -22,5 +20,5 @@ content: weight: 0 region: content hidden: - field_frontpage_term_id: true search_api_excerpt: true + tid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml index 9fc40811..af9d45f2 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml @@ -2,8 +2,6 @@ uuid: 7060dc64-5f95-4fa5-8046-bf0ad5e265c4 langcode: en status: true dependencies: - config: - - field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id module: - external_entities _core: @@ -22,5 +20,5 @@ content: weight: 0 region: content hidden: - field_frontpage_term_id: true search_api_excerpt: true + tid: true diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index 21ab788a..139ce530 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -3,37 +3,40 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: 3cezkDpNnpY89NCorCj-4mBIeItsVAEG803y-phaZTM + default_config_hash: daIUGTR2nijXztOFPGoKZP9hdqNwUXU1g1Iksa29Rxo id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' +generate_aliases: false read_only: true -generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: "$.attributes['title']" - main_image: - uri: "$.relationships['main_image']['data']['relationships']['media_image']['data']['attributes']['uri']['url']" - title: "$.relationships['main_image']['data']['relationships']['media_image']['data']['meta']['alt']" + value: '$._source.title[0]' + tags_uuid: + value: '$._source.news_tags_uuid[*]' tags: - value: "$.relationships['tags']['data'][*]['attributes']['name']" + value: '$._source.field_news_item_tags[*]' groups: - value: "$.relationships['groups']['data'][*]['attributes']['name']" + value: '$._source.field_news_groups[*]' + groups_uuid: + value: '$._source.news_groups_uuid[*]' neighbourhoods: - value: "$.relationships['neighbourhoods']['data'][*]['attributes']['name']" + value: '$._source.field_news_neighbourhoods[*]' + neighbourhoods_uuid: + value: '$._source.neighbourhoods_uuid[*]' node_url: - value: "$.attributes['path']['alias']" + value: '$._source.url[0]' published_at: - value: "$.attributes['published_at']" + value: '$._source.published_at[0]' short_title: - value: "$.attributes['short_title']" + value: '$._source.short_title[0]' storage_client_id: helfi_news storage_client_config: { } persistent_cache_max_age: 1800 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index a5e96c1f..db83d336 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -3,24 +3,24 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: U7yZGEsFvk5UxcRUripTm4JXrM9_gU_UV1aMQ8986a4 + default_config_hash: 1KCEz52lFemwPMfVitwlGcbzmkcAJPGSSe6loUbVJc8 id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: '$.attributes["name"]' - field_frontpage_term_id: - value: '$.attributes["drupal_internal__tid"]' + value: '$._source.name[0]' + tid: + value: '$._source.tid[0]' storage_client_id: helfi_news_groups storage_client_config: { } persistent_cache_max_age: 86400 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 40197578..2f99e033 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -3,24 +3,24 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: tM9Z1SfXjTcoCvjFIESPPl2sya7IyIQ9kZ-zQFFNppU + default_config_hash: 5s8g-adBsUuIIMte5BCEwSFlQjxwFJ_Gq2Do7EEwq2E id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: '$.attributes["name"]' - field_frontpage_term_id: - value: '$.attributes["drupal_internal__tid"]' + value: '$._source.name[0]' + tid: + value: '$._source.tid[0]' storage_client_id: helfi_news_neighbourhoods storage_client_config: { } persistent_cache_max_age: 86400 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 573d5c52..ee5a23ee 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -3,24 +3,24 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: LOL9fkfvgT6MB8SjNXI0WXRQqedWBH2oV7g4gfQjkuc + default_config_hash: vs16WpCdsWseKb-U81zRJbzykB25mE69iOEXv4ZhxCM id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: '$.attributes["name"]' - field_frontpage_term_id: - value: '$.attributes["drupal_internal__tid"]' + value: '$._source.name[0]' + tid: + value: '$._source.tid[0]' storage_client_id: helfi_news_tags storage_client_config: { } persistent_cache_max_age: 86400 diff --git a/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml deleted file mode 100644 index a51e18ab..00000000 --- a/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 42a81125-44b7-45d8-b676-46a27a7dbc07 -langcode: en -status: true -dependencies: - config: - - field.storage.helfi_news_groups.field_frontpage_term_id - module: - - external_entities -_core: - default_config_hash: HB3lPK7ZdS9DZrpuk_0u_uxhvGdVwBQufeLISCVeyG4 -id: helfi_news_groups.helfi_news_groups.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_groups -bundle: helfi_news_groups -label: 'Frontpage term id' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml deleted file mode 100644 index a91a4319..00000000 --- a/conf/cmi/field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: eff4aa71-c0d3-470c-aa37-86ff0b3ef5b7 -langcode: en -status: true -dependencies: - config: - - field.storage.helfi_news_neighbourhoods.field_frontpage_term_id - module: - - external_entities -_core: - default_config_hash: M1Kwl-JPBcmBgWPZoM0n3LL-U4tsgeRVigror_ggJ6k -id: helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_neighbourhoods -bundle: helfi_news_neighbourhoods -label: 'Frontpage term id' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml deleted file mode 100644 index 219199f8..00000000 --- a/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: f6923133-8d94-49ec-a95c-48fadc1391ab -langcode: en -status: true -dependencies: - config: - - field.storage.helfi_news_tags.field_frontpage_term_id - module: - - external_entities -_core: - default_config_hash: yL10FWYxH4QZnzsm1DGdoh0-TQTErUeZukz_M_S1Gz4 -id: helfi_news_tags.helfi_news_tags.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_tags -bundle: helfi_news_tags -label: 'Frontpage term id' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml index 44ecdcf7..84d41250 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_helfi_news_groups - paragraphs.paragraphs_type.news_list _core: - default_config_hash: nmozVFbkBc-ubKtpWG_OgdeT4yNxsLcsbBYaGDHRnUQ + default_config_hash: r2rQghOD9sgt6njK6kYTkRi6vHRKoshKBhS6eXAj2_0 id: paragraph.news_list.field_helfi_news_groups field_name: field_helfi_news_groups entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml index b7d19477..7b7dea04 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_helfi_news_neighbourhoods - paragraphs.paragraphs_type.news_list _core: - default_config_hash: If5nJKeaunQ7ITUWZ4daCyykb7mslZDLTVrLX7Gd1Qw + default_config_hash: ZyD4oFSt-0k-wITi8xejPiJQM_pMGPGBgtyMkd4yzYI id: paragraph.news_list.field_helfi_news_neighbourhoods field_name: field_helfi_news_neighbourhoods entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml index 020596a8..20a5e967 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_helfi_news_tags - paragraphs.paragraphs_type.news_list _core: - default_config_hash: imhJdbO9eLYZPslj0VosAANrRZBizg4wyPgIYQ3SOXc + default_config_hash: tfWJCTuuqYCedZj4qD0LfgjK99kSKhDbEuW8ziVcwnM id: paragraph.news_list.field_helfi_news_tags field_name: field_helfi_news_tags entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_limit.yml b/conf/cmi/field.field.paragraph.news_list.field_limit.yml index 8c61fd38..e583bfaf 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_limit.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_limit.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_limit - paragraphs.paragraphs_type.news_list _core: - default_config_hash: U69lOLLSGh16cOtXvhZr3E_x2lmlZOfxD0CmQeIMb6U + default_config_hash: 4kAYV9U8y3qkYQKOzN40EOym0oqgr0IqaNJeaLgTwSs id: paragraph.news_list.field_limit field_name: field_limit entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml index c4149fc2..1d4a38e1 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml @@ -13,7 +13,7 @@ third_party_settings: allowed_formats: - minimal _core: - default_config_hash: 7yDWmbqqH_qTaQ4iyJ6QTLaEcqUnL0oVp-t1huDnK_g + default_config_hash: Ba7omOgoQ1RguPjBSpjtpx8YqwE5BXBoNRVs_eQzNRQ id: paragraph.news_list.field_news_list_description field_name: field_news_list_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml index ed8556f6..d9dc2b5e 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_news_list_title - paragraphs.paragraphs_type.news_list _core: - default_config_hash: BVbXiEVCf8X8ZJUYKyiiyevct1RogayM-YXEWiSnuDw + default_config_hash: RDGC7tc3EzJDFQyJSUHpJc8vP__9Q6BJ27icD5o4APY id: paragraph.news_list.field_news_list_title field_name: field_news_list_title entity_type: paragraph diff --git a/conf/cmi/field.storage.helfi_news_groups.field_frontpage_term_id.yml b/conf/cmi/field.storage.helfi_news_groups.field_frontpage_term_id.yml deleted file mode 100644 index c5bc8c1c..00000000 --- a/conf/cmi/field.storage.helfi_news_groups.field_frontpage_term_id.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: c62ebe15-2cb6-4553-b00d-3c21a0c1033b -langcode: en -status: true -dependencies: - module: - - external_entities -_core: - default_config_hash: b992_ctKi8x2uXo88S2tFAxA93ZE0BXLdaTCeEictWk -id: helfi_news_groups.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_groups -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/field.storage.helfi_news_neighbourhoods.field_frontpage_term_id.yml b/conf/cmi/field.storage.helfi_news_neighbourhoods.field_frontpage_term_id.yml deleted file mode 100644 index 1561ccda..00000000 --- a/conf/cmi/field.storage.helfi_news_neighbourhoods.field_frontpage_term_id.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: aee9a7c0-c5e1-40eb-a2a6-f89250953161 -langcode: en -status: true -dependencies: - module: - - external_entities -_core: - default_config_hash: X6qvfKybqnwfeHyr_f5PzxdXg9ihP8D-ryRes0_wh7Q -id: helfi_news_neighbourhoods.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_neighbourhoods -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/field.storage.helfi_news_tags.field_frontpage_term_id.yml b/conf/cmi/field.storage.helfi_news_tags.field_frontpage_term_id.yml deleted file mode 100644 index f8cfad43..00000000 --- a/conf/cmi/field.storage.helfi_news_tags.field_frontpage_term_id.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 636d25cf-d069-4660-bce2-10059bb6c5fe -langcode: en -status: true -dependencies: - module: - - external_entities -_core: - default_config_hash: PkhrfcRaL2lqTDnoXDNoge-nlPEfXT6WGBZyKIFahqs -id: helfi_news_tags.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_tags -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/field.storage.paragraph.field_helfi_news_groups.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml index e1663f98..60781dff 100644 --- a/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml @@ -6,7 +6,7 @@ dependencies: - external_entities - paragraphs _core: - default_config_hash: _fM_KH15dd3VWM1oQkpfJUipPHD3pK-CiqLPcuj5ssQ + default_config_hash: wq65JaPUw7t2ky47ukc-A2jTYVFxzQYWTyIMKvVWqy4 id: paragraph.field_helfi_news_groups field_name: field_helfi_news_groups entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml index ece20346..a5371ace 100644 --- a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml @@ -6,7 +6,7 @@ dependencies: - external_entities - paragraphs _core: - default_config_hash: VVgm-VdlvDCYm-mIewtHi0RZp_7pCoE94esxuAat4CE + default_config_hash: hy1Tpmlf5WcTYBFp3oNoXSb5W-PJnpZGdxFL3PBi_b8 id: paragraph.field_helfi_news_neighbourhoods field_name: field_helfi_news_neighbourhoods entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml index da56a0a5..ef592546 100644 --- a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml @@ -6,7 +6,7 @@ dependencies: - external_entities - paragraphs _core: - default_config_hash: nWHDiteOOAcjVLeo90MtcJBVL0ABYuABPztRIvhiv_0 + default_config_hash: V9NNGo5t1lmcXJDwJC4J7KKMQ_xFClm35zZNiIcgjDg id: paragraph.field_helfi_news_tags field_name: field_helfi_news_tags entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_limit.yml b/conf/cmi/field.storage.paragraph.field_limit.yml index fa4c1ec2..a22e8bc0 100644 --- a/conf/cmi/field.storage.paragraph.field_limit.yml +++ b/conf/cmi/field.storage.paragraph.field_limit.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: BN27jqBir0CqxJ0z1RtYc8WNNohSkDdtzv_9l-HRKhk + default_config_hash: UY9Qakkj3TBaF4CVQe9dOaOcUHeggIBAwDWE1nNRROk id: paragraph.field_limit field_name: field_limit entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_news_list_description.yml b/conf/cmi/field.storage.paragraph.field_news_list_description.yml index 1fb411d3..c7afee77 100644 --- a/conf/cmi/field.storage.paragraph.field_news_list_description.yml +++ b/conf/cmi/field.storage.paragraph.field_news_list_description.yml @@ -6,7 +6,7 @@ dependencies: - paragraphs - text _core: - default_config_hash: V_erLPi4c9bT-uhAlgcpJJX8LbR02Btsi8yzMVAIpo4 + default_config_hash: BA64kRk5MQLN_q3GY18R5uWkGRpH6NUZuEBGh4WfWdc id: paragraph.field_news_list_description field_name: field_news_list_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_news_list_title.yml b/conf/cmi/field.storage.paragraph.field_news_list_title.yml index 60321231..99faaa12 100644 --- a/conf/cmi/field.storage.paragraph.field_news_list_title.yml +++ b/conf/cmi/field.storage.paragraph.field_news_list_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: xapLq-jZodnhyWktgf76RTu9dEBAgWBq-ay41DJpsXQ + default_config_hash: 9nFZzI_rcVVomJTSrdrbAkvTkwFwTcwMjUpMP0fafMo id: paragraph.field_news_list_title field_name: field_news_list_title entity_type: paragraph diff --git a/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_groups.yml new file mode 100644 index 00000000..c804c15e --- /dev/null +++ b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_groups.yml @@ -0,0 +1,2 @@ +label: 'Uutisten kohderyhmät' +label_plural: 'Uutisten kohderyhmät' diff --git a/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..13ece827 --- /dev/null +++ b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -0,0 +1,2 @@ +label: 'Uutisten kaupunginosat' +label_plural: 'Uutisten kaupunginosat' diff --git a/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_tags.yml new file mode 100644 index 00000000..13ece827 --- /dev/null +++ b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_tags.yml @@ -0,0 +1,2 @@ +label: 'Uutisten kaupunginosat' +label_plural: 'Uutisten kaupunginosat' diff --git a/conf/cmi/paragraphs.paragraphs_type.news_list.yml b/conf/cmi/paragraphs.paragraphs_type.news_list.yml index 50779f43..715a5ffe 100644 --- a/conf/cmi/paragraphs.paragraphs_type.news_list.yml +++ b/conf/cmi/paragraphs.paragraphs_type.news_list.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: 4NG1c_DFfBfzUCPfnwS5Sneo_G7lU_0YRfarh-p749M + default_config_hash: GqSJkJJNFYj7_Yrzletng06pW-sS9r0nS5BeDi8Q69w id: news_list label: 'News list' icon_uuid: null diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh index 6a098241..4c02d6f1 100644 --- a/docker/openshift/entrypoints/20-deploy.sh +++ b/docker/openshift/entrypoints/20-deploy.sh @@ -1,5 +1,11 @@ #!/bin/bash +# Skip deployment script if ENV var is true +if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then + echo "SKIP_DEPLOY_SCRIPTS is true. Skipping the steps." + return +fi + source /init.sh function rollback_deployment { @@ -36,10 +42,9 @@ if [ "$CURRENT_DEPLOY_ID" != "$OPENSHIFT_BUILD_NAME" ]; then # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md drush helfi:pre-deploy || true # Run maintenance tasks (config import, database updates etc) - drush deploy - + OUTPUT=$(sh -c '(drush deploy); exit $?' 2>&1) if [ $? -ne 0 ]; then - rollback_deployment "drush deploy failed with {$?} exit code. See logs for more information." $CURRENT_DEPLOY_ID + rollback_deployment "drush deploy failed with {$?} exit code. ${OUTPUT}" $CURRENT_DEPLOY_ID exit 1 fi # Run post-deploy tasks.