From 60bfc763c25ca86b932c60d272c072a2c76b75a7 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 15 Oct 2024 06:23:52 +0000 Subject: [PATCH] Update configuration --- composer.lock | 91 ++++++++++--------- ...tem.paragraphs_library_item.paragraphs.yml | 5 - ...form_display.node.landing_page.default.yml | 2 +- ...splay.paragraph.content_liftup.default.yml | 27 ------ ...y.paragraph.list_of_links_item.default.yml | 2 +- ..._display.helfi_news.helfi_news.default.yml | 3 + ...ay.helfi_news.helfi_news.medium_teaser.yml | 3 + ...splay.paragraph.content_liftup.default.yml | 25 ----- ...iew_display.paragraph.hearings.default.yml | 2 +- conf/cmi/core.extension.yml | 1 - ...es.external_entity_type.helfi_hearings.yml | 2 +- ....field.node.landing_page.field_content.yml | 6 +- .../field.field.node.page.field_content.yml | 6 +- ...ld.field.node.page.field_lower_content.yml | 6 +- ...ntent_liftup.field_content_liftup_unit.yml | 27 ------ ...ge.paragraph.field_content_liftup_unit.yml | 22 ----- ...e.entity_view_mode.media.list_of_links.yml | 2 +- ...ntent_liftup.field_content_liftup_unit.yml | 4 - ...agraphs.paragraphs_type.content_liftup.yml | 2 - .../responsive_image.styles.list_of_links.yml | 1 + conf/cmi/menu_link_attributes.config.yml | 6 +- conf/cmi/metatag.metatag_defaults.global.yml | 1 + ...agraphs.paragraphs_type.content_liftup.yml | 12 --- public/sites/default/settings.php | 4 + tools/make/project/install.mk | 11 ++- 25 files changed, 78 insertions(+), 195 deletions(-) delete mode 100644 conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml delete mode 100644 conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml delete mode 100644 conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml delete mode 100644 conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml delete mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml create mode 100644 conf/cmi/language/fi/responsive_image.styles.list_of_links.yml delete mode 100644 conf/cmi/paragraphs.paragraphs_type.content_liftup.yml diff --git a/composer.lock b/composer.lock index 9fae799f..437b76f3 100644 --- a/composer.lock +++ b/composer.lock @@ -4074,16 +4074,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.9", + "version": "6.7.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "09da3d83c2c01a36420329b87592eb701ae8ccb7" + "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/09da3d83c2c01a36420329b87592eb701ae8ccb7", - "reference": "09da3d83c2c01a36420329b87592eb701ae8ccb7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5f9902895d8690e0167af2b8df37e84798c1ab8b", + "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b", "shasum": "" }, "require": { @@ -4102,23 +4102,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-09T08:00:11+00:00" + "time": "2024-10-11T08:54:21+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.2.3", + "version": "3.2.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33" + "reference": "f3284d00c7cb52126c727b744ccac5108195544c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2d5454a08e66621f0e7ef5116066c1eb450cea33", - "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/f3284d00c7cb52126c727b744ccac5108195544c", + "reference": "f3284d00c7cb52126c727b744ccac5108195544c", "shasum": "" }, "require": { @@ -4139,10 +4139,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-10-02T11:54:42+00:00" + "time": "2024-10-11T08:52:57+00:00" }, { "name": "drupal/health_check", @@ -4196,16 +4196,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.8", + "version": "2.7.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "7a37870d06234179c50f9f5c5d190d49af7c2e62" + "reference": "189161e8d674072f0a345c45b93dd4c42896b52b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7a37870d06234179c50f9f5c5d190d49af7c2e62", - "reference": "7a37870d06234179c50f9f5c5d190d49af7c2e62", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/189161e8d674072f0a345c45b93dd4c42896b52b", + "reference": "189161e8d674072f0a345c45b93dd4c42896b52b", "shasum": "" }, "require": { @@ -4235,23 +4235,23 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-10-03T06:20:46+00:00" + "time": "2024-10-10T08:24:13+00:00" }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.5", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "955f8b742147cab0cf82370b6cc93a6901624261" + "reference": "f35b0a703e2da09374c4ca137dd6519274db552a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/955f8b742147cab0cf82370b6cc93a6901624261", - "reference": "955f8b742147cab0cf82370b6cc93a6901624261", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/f35b0a703e2da09374c4ca137dd6519274db552a", + "reference": "f35b0a703e2da09374c4ca137dd6519274db552a", "shasum": "" }, "require": { @@ -4273,6 +4273,9 @@ }, "twistor/flysystem-stream-wrapper": { "PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch" + }, + "drupal/flysystem": { + "UHF-10544 D10.3 support (https://drupal.org/i/3457193)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/82f0dc93d14357011d12d219f5d1641da7ae6960/patches/3457193.patch" } } }, @@ -4281,10 +4284,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2024-10-03T06:32:56+00:00" + "time": "2024-10-11T07:42:06+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4407,16 +4410,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.11", + "version": "4.6.15", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb" + "reference": "96e619f1399be1140cef46c5dd67cce2a035613e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46f83e38d3e63714779f3b040e040c9b4be406bb", - "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/96e619f1399be1140cef46c5dd67cce2a035613e", + "reference": "96e619f1399be1140cef46c5dd67cce2a035613e", "shasum": "" }, "require": { @@ -4437,7 +4440,7 @@ "drupal/elasticsearch_connector": "^7.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", - "drupal/eu_cookie_compliance": "^1.24", + "drupal/eu_cookie_compliance": "1.24", "drupal/external_entities": "^2.0@beta", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", @@ -4535,10 +4538,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.11", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.15", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-08T06:10:45+00:00" + "time": "2024-10-14T06:10:36+00:00" }, { "name": "drupal/helfi_proxy", @@ -5081,17 +5084,17 @@ }, { "name": "drupal/linkit", - "version": "6.1.4", + "version": "6.1.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.4" + "reference": "6.1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.4.zip", - "reference": "6.1.4", - "shasum": "f5544a39d691af5efd1532bd5403862a7153f60b" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.5.zip", + "reference": "6.1.5", + "shasum": "ce2e0f545e5213874e658a44ed3ef606b80b760d" }, "require": { "drupal/core": "^10.1" @@ -5103,8 +5106,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.4", - "datestamp": "1715203830", + "version": "6.1.5", + "datestamp": "1728680387", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -17088,16 +17091,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.32.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -17129,9 +17132,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-09-26T07:23:32+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml index 7eae1e65..6e95f80c 100644 --- a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml +++ b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml @@ -8,7 +8,6 @@ dependencies: - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - - paragraphs.paragraphs_type.content_liftup - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links @@ -45,7 +44,6 @@ settings: columns: columns contact_card_listing: contact_card_listing content_cards: content_cards - content_liftup: content_liftup image: image liftup_with_image: liftup_with_image list_of_links: list_of_links @@ -72,9 +70,6 @@ settings: content_cards: weight: 0 enabled: true - content_liftup: - weight: 0 - enabled: true image: weight: 0 enabled: true diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index 62daf9d9..c05932a0 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 - region: content settings: { } third_party_settings: { } + region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml b/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml deleted file mode 100644 index 4f81e0b0..00000000 --- a/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 28a958f6-b480-4aa9-83a6-b9446ae59eaf -langcode: en -status: true -dependencies: - config: - - field.field.paragraph.content_liftup.field_content_liftup_unit - - paragraphs.paragraphs_type.content_liftup -_core: - default_config_hash: xULweJ9JMlJZPMLEKe6rT2QooMGsSyiqRMh9VCv95fM -id: paragraph.content_liftup.default -targetEntityType: paragraph -bundle: content_liftup -mode: default -content: - field_content_liftup_unit: - type: entity_reference_autocomplete - weight: 1 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } -hidden: - created: true - status: true diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml index 4335497f..1c6023b9 100644 --- a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml @@ -40,8 +40,8 @@ content: weight: 1 region: content settings: - linkit_auto_link_text: false linkit_profile: helfi + linkit_auto_link_text: false third_party_settings: { } hidden: created: true diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml index bebd64f4..abbda104 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -33,8 +33,11 @@ content: region: content hidden: groups: true + groups_uuid: true neighbourhoods: true + neighbourhoods_uuid: true node_url: true published_at: true short_title: true tags: true + tags_uuid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml index 26b586c5..ce2dd064 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -34,8 +34,11 @@ content: region: content hidden: groups: true + groups_uuid: true neighbourhoods: true + neighbourhoods_uuid: true node_url: true published_at: true short_title: true tags: true + tags_uuid: true diff --git a/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml b/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml deleted file mode 100644 index 2fef3910..00000000 --- a/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 3e47ee20-f410-4871-80cd-2713aea79af6 -langcode: en -status: true -dependencies: - config: - - field.field.paragraph.content_liftup.field_content_liftup_unit - - paragraphs.paragraphs_type.content_liftup -_core: - default_config_hash: dPsp5m4FRvYce8_hXZJSdT2m-WOFaFpX1hOQw-mrgGE -id: paragraph.content_liftup.default -targetEntityType: paragraph -bundle: content_liftup -mode: default -content: - field_content_liftup_unit: - type: entity_reference_entity_view - label: hidden - settings: - view_mode: wide_teaser - link: false - third_party_settings: { } - weight: 2 - region: content -hidden: - search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml index 50ff8cac..2cb138b5 100644 --- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -31,9 +31,9 @@ content: weight: 0 region: content list: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: search_api_excerpt: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 5c9ea9d1..030cc9a9 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -60,7 +60,6 @@ module: helfi_paragraphs_columns: 0 helfi_paragraphs_contact_card_listing: 0 helfi_paragraphs_content_cards: 0 - helfi_paragraphs_content_liftup: 0 helfi_paragraphs_hearings: 0 helfi_paragraphs_hero: 0 helfi_paragraphs_image: 0 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index 89082431..a2ab0140 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index cea1f22a..75d9bfd0 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -9,7 +9,6 @@ dependencies: - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.content_cards - - paragraphs.paragraphs_type.content_liftup - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.hearings @@ -58,9 +57,9 @@ settings: event_list: event_list news_list: news_list hearings: hearings - content_liftup: content_liftup service_list: service_list service_list_search: service_list_search + unit_search: unit_search unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: @@ -76,9 +75,6 @@ settings: content_cards: weight: 1 enabled: true - content_liftup: - weight: 11 - enabled: true event_list: weight: 13 enabled: true diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 82fde430..795cc346 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -12,7 +12,6 @@ dependencies: - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - - paragraphs.paragraphs_type.content_liftup - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image @@ -59,8 +58,8 @@ settings: event_list: event_list contact_card_listing: contact_card_listing news_list: news_list - content_liftup: content_liftup service_list_search: service_list_search + unit_search: unit_search unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: @@ -85,9 +84,6 @@ settings: content_cards: weight: 5 enabled: true - content_liftup: - weight: 12 - enabled: true event_list: weight: 13 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index 76577690..ba9cd99e 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -12,7 +12,6 @@ dependencies: - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - - paragraphs.paragraphs_type.content_liftup - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image @@ -59,8 +58,8 @@ settings: event_list: event_list contact_card_listing: contact_card_listing news_list: news_list - content_liftup: content_liftup service_list_search: service_list_search + unit_search: unit_search unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: @@ -85,9 +84,6 @@ settings: content_cards: weight: 1 enabled: true - content_liftup: - weight: 12 - enabled: true event_list: weight: 13 enabled: true diff --git a/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml deleted file mode 100644 index 0024156a..00000000 --- a/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 7dfcf5b9-67ce-4157-be0a-d91573baced6 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_content_liftup_unit - - paragraphs.paragraphs_type.content_liftup -_core: - default_config_hash: PDfXJdsEFnyW-qrv229_Y5bkaK0ztYhLPJc6JutjBfs -id: paragraph.content_liftup.field_content_liftup_unit -field_name: field_content_liftup_unit -entity_type: paragraph -bundle: content_liftup -label: Unit -description: 'Add here the content that you want to appear as cards to the block. Works only with TPR Unit in alpha version' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: views - handler_settings: - view: - view_name: er_tpr_unit - display_name: entity_reference - arguments: { } -field_type: entity_reference diff --git a/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml b/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml deleted file mode 100644 index c6eb01eb..00000000 --- a/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 154bac2f-6a97-4fb4-8c81-b4f63cd8c87c -langcode: en -status: true -dependencies: - module: - - helfi_tpr - - paragraphs -_core: - default_config_hash: qDXN7Cf4Za-x_Udo3DzY4P9LhxH6YTQW0D0YhB66BnQ -id: paragraph.field_content_liftup_unit -field_name: field_content_liftup_unit -entity_type: paragraph -type: entity_reference -settings: - target_type: tpr_unit -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.list_of_links.yml b/conf/cmi/language/fi/core.entity_view_mode.media.list_of_links.yml index ddd3034a..2d8d0d68 100644 --- a/conf/cmi/language/fi/core.entity_view_mode.media.list_of_links.yml +++ b/conf/cmi/language/fi/core.entity_view_mode.media.list_of_links.yml @@ -1 +1 @@ -label: Linkkilista +label: 'List of Links' diff --git a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml deleted file mode 100644 index 32a00dda..00000000 --- a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: Toimipiste -description: |- - Lisää tähän sen sisällön otsikko jonka haluat nostaa sivulle. - Voit toistaiseksi valita vain toimipisteitä. \ No newline at end of file diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml deleted file mode 100644 index f53c74ff..00000000 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml +++ /dev/null @@ -1,2 +0,0 @@ -label: Toimipistekortti -description: 'With content liftup you can reference to a single content inside this site. The information about the content is automatically fetched through the reference.' diff --git a/conf/cmi/language/fi/responsive_image.styles.list_of_links.yml b/conf/cmi/language/fi/responsive_image.styles.list_of_links.yml new file mode 100644 index 00000000..2d8d0d68 --- /dev/null +++ b/conf/cmi/language/fi/responsive_image.styles.list_of_links.yml @@ -0,0 +1 @@ +label: 'List of Links' diff --git a/conf/cmi/menu_link_attributes.config.yml b/conf/cmi/menu_link_attributes.config.yml index 04f7e7e5..2ea4970d 100644 --- a/conf/cmi/menu_link_attributes.config.yml +++ b/conf/cmi/menu_link_attributes.config.yml @@ -2,10 +2,10 @@ attributes: icon: label: '' class: - label: 'Link class(es)' - description: 'CSS class for the link (<a href>). Separate multiple classes by space.' + label: '' + description: '' target: - label: 'Link target' + label: '' description: '' options: _blank: 'New window (_blank)' diff --git a/conf/cmi/metatag.metatag_defaults.global.yml b/conf/cmi/metatag.metatag_defaults.global.yml index b720f374..e754d156 100644 --- a/conf/cmi/metatag.metatag_defaults.global.yml +++ b/conf/cmi/metatag.metatag_defaults.global.yml @@ -12,3 +12,4 @@ tags: og_image: '[site:shareable-image]' twitter_cards_image: '[site:shareable-image]' og_site_name: '[site:page-title-suffix]' + twitter_cards_page_url: '[current-page:url]' diff --git a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml deleted file mode 100644 index d01a0f08..00000000 --- a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml +++ /dev/null @@ -1,12 +0,0 @@ -uuid: cb3e45ee-191f-4456-a1e5-37528044794a -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: ONSzgYJ_Jc8pZ002ZLaFDdkbCXm0lKyjjWMpiEYA3v8 -id: content_liftup -label: 'Content liftup' -icon_uuid: null -icon_default: null -description: 'With content liftup you can reference to a single content inside this site. The information about the content is automatically fetched through the reference.' -behavior_plugins: { } diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9813b60a..872d57aa 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -385,6 +385,10 @@ function drupal_get_env(string|array $variables) : mixed { } } +// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels. +$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug'; +$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level; + /** * Deployment identifier. * diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 02cca319..fade4de0 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -1,9 +1,9 @@ ifeq ($(DRUPAL_CONF_EXISTS),yes) - DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock drush-uli else - DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock drush-uli endif -DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-uli +DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token') @@ -46,3 +46,8 @@ drush-helfi-locale-import: ## Update translations from helfi platform config. $(call step,Import helfi platform config translations...) $(call drush,helfi:locale-import helfi_platform_config) $(call drush,cr) + +PHONY += drush-unblock +drush-unblock: ## Get login link + $(call step,Unblocking helfi-admin...\n) + $(call drush,user:unblock --uid=1)