diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 4b642e59..611a012d 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -39,7 +39,7 @@ jobs: run: | composer install $(drush sql:connect) < latest.sql - drush deploy + drush cim -y && drush updb -y && drush cr composer update drupal/helfi_* drupal/hdbt* -W drush cr && drush updb -y && drush cex -y # Update platform diff --git a/composer.lock b/composer.lock index d3f0fd64..2eda8af9 100644 --- a/composer.lock +++ b/composer.lock @@ -3859,16 +3859,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.2", + "version": "2.4.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "7cbeef9a7a7d158c103c9fdc88ebf05dc8e82700" + "reference": "033bd8c3874487d0960c2ee1ba6f276aaf633d69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7cbeef9a7a7d158c103c9fdc88ebf05dc8e82700", - "reference": "7cbeef9a7a7d158c103c9fdc88ebf05dc8e82700", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/033bd8c3874487d0960c2ee1ba6f276aaf633d69", + "reference": "033bd8c3874487d0960c2ee1ba6f276aaf633d69", "shasum": "" }, "require": { @@ -3892,10 +3892,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-04-20T08:24:46+00:00" + "time": "2023-04-20T10:53:37+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3991,16 +3991,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.0.27", + "version": "3.0.28", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c54b645677ad14e20ec9e3e4b4960648b7d3077f" + "reference": "a57c74f7432934c3a7fd63bdc5b9989259c87a24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c54b645677ad14e20ec9e3e4b4960648b7d3077f", - "reference": "c54b645677ad14e20ec9e3e4b4960648b7d3077f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a57c74f7432934c3a7fd63bdc5b9989259c87a24", + "reference": "a57c74f7432934c3a7fd63bdc5b9989259c87a24", "shasum": "" }, "require": { @@ -4100,10 +4100,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.27", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.28", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-04-17T08:46:28+00:00" + "time": "2023-04-20T08:51:20+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml index bee12bd1..e7506fff 100644 --- a/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml @@ -7,8 +7,10 @@ dependencies: - field.field.paragraph.social_media_link.field_social_media_link - paragraphs.paragraphs_type.social_media_link module: - - link - hdbt_admin_tools + - link +_core: + default_config_hash: aWojfz5AeLM97eeoyKxUlJpYkuG2X8qLl2KOaczBukY id: paragraph.social_media_link.default targetEntityType: paragraph bundle: social_media_link diff --git a/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml b/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml index 3eecc579..d38e1301 100644 --- a/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml @@ -15,8 +15,11 @@ dependencies: - paragraphs.paragraphs_type.contact_card module: - entity_reference_revisions + - helfi_platform_config - image - telephone +_core: + default_config_hash: X5x-5vSXj4FHXf2NNNyzzwVH7xlQUk6wGBYjejfb-iQ id: paragraph.contact_card.default targetEntityType: paragraph bundle: contact_card @@ -24,7 +27,7 @@ mode: default content: field_contact_description: type: text_span - label: visually_hidden + label: hidden settings: { } third_party_settings: { } weight: 5 @@ -50,7 +53,7 @@ content: region: content field_contact_name: type: string - label: visually_hidden + label: hidden settings: link_to_entity: false third_party_settings: { } @@ -67,7 +70,7 @@ content: region: content field_contact_title: type: string - label: visually_hidden + label: hidden settings: link_to_entity: false third_party_settings: { } @@ -75,14 +78,14 @@ content: region: content field_email: type: email_mailto - label: visually_hidden + label: hidden settings: { } third_party_settings: { } weight: 4 region: content field_phone_number: type: telephone_link - label: visually_hidden + label: hidden settings: title: '' third_party_settings: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml index f1abb1c4..7427a83f 100644 --- a/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml @@ -7,8 +7,10 @@ dependencies: - field.field.paragraph.social_media_link.field_social_media_link - paragraphs.paragraphs_type.social_media_link module: - - link - hdbt_admin_tools + - link +_core: + default_config_hash: WtJ8D0kqvYryjBD0kBTGg0SOQkCyGq7qF-uD4W_3z9g id: paragraph.social_media_link.default targetEntityType: paragraph bundle: social_media_link diff --git a/conf/cmi/easy_breadcrumb.settings.yml b/conf/cmi/easy_breadcrumb.settings.yml index 37514b14..df8fecbc 100644 --- a/conf/cmi/easy_breadcrumb.settings.yml +++ b/conf/cmi/easy_breadcrumb.settings.yml @@ -5,7 +5,7 @@ replaced_titles: '' custom_paths: '' include_home_segment: true alternative_title_field: '' -home_segment_title: Decision-making +home_segment_title: Decision home_segment_keep: false include_title_segment: true title_from_page_when_available: 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 69244295..d8007690 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -2,6 +2,8 @@ uuid: a59907e9-8dfe-482c-a091-df1469e35bd4 langcode: en status: true dependencies: { } +_core: + default_config_hash: imFLQtHenUWCDEXySYBm0H7gJ55i3_AF8zALft8uiqo id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' @@ -33,7 +35,7 @@ field_mapper_config: value: '$.attributes[''short_title'']' storage_client_id: helfi_news storage_client_config: { } -persistent_cache_max_age: 10800 +persistent_cache_max_age: 1800 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null 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 bf293c62..47678883 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,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: XSm-lbRmOWP_eJRFTo14HMiNtxsc5scm42lmq8Qjcy8 + default_config_hash: zCk_D7oSjREqCU2vFZI4uyGywY_PFNicpUIFuWxtawA id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' 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 708b177b..a77f841b 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,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: h4y6pjlsSfKM9cgEi9tWGsJ57_zj1b4CelECji9A1Y0 + default_config_hash: p1queceC0XdJdYY5diRNVw-hdAFymgdpq7fhQudsddE id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' 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 a7ac3eff..5a68a4d8 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,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: wkWXjXpGr6lPWM3nZ-8RqlBCt7nsAuHiP7EC1Vh4oMc + default_config_hash: OdJNKJELJhbOjN4qCgGAHw_Ypudx5Kt3NqcwLn2qbx0 id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' diff --git a/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml b/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml index f22f23f0..965d8d27 100644 --- a/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml +++ b/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml @@ -8,6 +8,8 @@ dependencies: - paragraphs.paragraphs_type.social_media_link module: - entity_reference_revisions +_core: + default_config_hash: _iSBK3sYqVn5QyzC_C451nR3IF0EGhan4bEp1liTbiU id: paragraph.contact_card.field_contact_social_media field_name: field_contact_social_media entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.contact_card.field_contact_title.yml b/conf/cmi/field.field.paragraph.contact_card.field_contact_title.yml index 6dd7ea6b..0a616db0 100644 --- a/conf/cmi/field.field.paragraph.contact_card.field_contact_title.yml +++ b/conf/cmi/field.field.paragraph.contact_card.field_contact_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_contact_title - paragraphs.paragraphs_type.contact_card _core: - default_config_hash: 3_-eiSIFayhR_hbFNjQDMu1oq8JCPYQ1v1lpVExyWOo + default_config_hash: pbFbrbO2unkgfSmtKMvjmixhJIx4Ac1sZ3r7u77lIC4 id: paragraph.contact_card.field_contact_title field_name: field_contact_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml index a304a412..b0480230 100644 --- a/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml +++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml @@ -8,6 +8,8 @@ dependencies: - paragraphs.paragraphs_type.contact_card_listing module: - entity_reference_revisions +_core: + default_config_hash: zR-r30I0kOV247OcU6yxNT2re2IFSq7pUjNogusJVxw id: paragraph.contact_card_listing.field_contact_card field_name: field_contact_card entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml index aa3cecce..6ede96dd 100644 --- a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml +++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_title - paragraphs.paragraphs_type.contact_card_listing +_core: + default_config_hash: kdKc_1jRpFFpVgiylfofxe6JZyl5xOjMYEAlvcwPdCU id: paragraph.contact_card_listing.field_title field_name: field_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.social_media_link.field_icon.yml b/conf/cmi/field.field.paragraph.social_media_link.field_icon.yml index 980f236e..b713757a 100644 --- a/conf/cmi/field.field.paragraph.social_media_link.field_icon.yml +++ b/conf/cmi/field.field.paragraph.social_media_link.field_icon.yml @@ -7,6 +7,8 @@ dependencies: - paragraphs.paragraphs_type.social_media_link module: - hdbt_admin_tools +_core: + default_config_hash: wqE_Zq3v_7AaVAV9KOkhWdkkT_SJTl-Z7wNW6DxFaXI id: paragraph.social_media_link.field_icon field_name: field_icon entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_contact_card.yml b/conf/cmi/field.storage.paragraph.field_contact_card.yml index 3c113a44..abaadb92 100644 --- a/conf/cmi/field.storage.paragraph.field_contact_card.yml +++ b/conf/cmi/field.storage.paragraph.field_contact_card.yml @@ -8,6 +8,8 @@ dependencies: enforced: config: - paragraphs.paragraphs_type.contact_card_listing +_core: + default_config_hash: hrjTJNnrxG5N3Ui9q7IAhEBLr4FburA9QNAA1X0FhTo id: paragraph.field_contact_card field_name: field_contact_card entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_contact_social_media.yml b/conf/cmi/field.storage.paragraph.field_contact_social_media.yml index 7c061917..2f5ea483 100644 --- a/conf/cmi/field.storage.paragraph.field_contact_social_media.yml +++ b/conf/cmi/field.storage.paragraph.field_contact_social_media.yml @@ -8,6 +8,8 @@ dependencies: enforced: config: - paragraphs.paragraphs_type.contact_card +_core: + default_config_hash: JHpZWWkBGCdrVGR6FpM2u4rbduOL4NCt2ihnVsSkYRc id: paragraph.field_contact_social_media field_name: field_contact_social_media 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 f7574eb6..f846cf21 100644 --- a/conf/cmi/field.storage.paragraph.field_news_list_description.yml +++ b/conf/cmi/field.storage.paragraph.field_news_list_description.yml @@ -5,6 +5,8 @@ dependencies: module: - paragraphs - text +_core: + default_config_hash: V_erLPi4c9bT-uhAlgcpJJX8LbR02Btsi8yzMVAIpo4 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 c242735d..8884fe0b 100644 --- a/conf/cmi/field.storage.paragraph.field_news_list_title.yml +++ b/conf/cmi/field.storage.paragraph.field_news_list_title.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - paragraphs +_core: + default_config_hash: xapLq-jZodnhyWktgf76RTu9dEBAgWBq-ay41DJpsXQ id: paragraph.field_news_list_title field_name: field_news_list_title entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_phone_number.yml b/conf/cmi/field.storage.paragraph.field_phone_number.yml index b88b375f..6aa35976 100644 --- a/conf/cmi/field.storage.paragraph.field_phone_number.yml +++ b/conf/cmi/field.storage.paragraph.field_phone_number.yml @@ -5,6 +5,8 @@ dependencies: module: - paragraphs - telephone +_core: + default_config_hash: kxmWRH9TJh5fRoM_YvyuycrIfHCulYKplVTkFm9DXAM id: paragraph.field_phone_number field_name: field_phone_number entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_social_media_link.yml b/conf/cmi/field.storage.paragraph.field_social_media_link.yml index f67fa220..a6a502f5 100644 --- a/conf/cmi/field.storage.paragraph.field_social_media_link.yml +++ b/conf/cmi/field.storage.paragraph.field_social_media_link.yml @@ -8,6 +8,8 @@ dependencies: enforced: config: - paragraphs.paragraphs_type.social_media_link +_core: + default_config_hash: '-njlxNwWIC8XUfPK115lFcUTt2_i0Lm6ldsKWrh6Ge8' id: paragraph.field_social_media_link field_name: field_social_media_link entity_type: paragraph diff --git a/conf/cmi/rest.resource.helfi_debug_data.yml b/conf/cmi/rest.resource.helfi_debug_data.yml index 9ddc792b..29073827 100644 --- a/conf/cmi/rest.resource.helfi_debug_data.yml +++ b/conf/cmi/rest.resource.helfi_debug_data.yml @@ -18,3 +18,4 @@ configuration: authentication: - cookie - basic_auth + - basic_auth diff --git a/conf/cmi/rest.resource.helfi_debug_package_version.yml b/conf/cmi/rest.resource.helfi_debug_package_version.yml index 2299f211..93b112db 100644 --- a/conf/cmi/rest.resource.helfi_debug_package_version.yml +++ b/conf/cmi/rest.resource.helfi_debug_package_version.yml @@ -18,3 +18,4 @@ configuration: authentication: - cookie - basic_auth + - basic_auth diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 0e41a605..17a25d4b 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -128,6 +128,16 @@ $config['helfi_navigation.api']['key'] = $navigation_authentication_key; } +// Make sure project name and app env are defined in GitHub actions too. +if ($github_repository = getenv('GITHUB_REPOSITORY')) { + if (!getenv('APP_ENV')) { + putenv('APP_ENV=ci'); + } + + if (!getenv('PROJECT_NAME')) { + putenv('PROJECT_NAME=' . $github_repository); + } +} $config['helfi_api_base.environment_resolver.settings']['environment_name'] = getenv('APP_ENV'); $config['helfi_api_base.environment_resolver.settings']['project_name'] = getenv('PROJECT_NAME');