From 53ba35da92e43ecbf9305a00ee22989892a353c8 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 5 Sep 2023 05:24:48 +0000 Subject: [PATCH] Update configuration --- composer.lock | 86 ++++++------ ...orm_display.paragraph.hearings.default.yml | 36 +++++ ....helfi_hearings.helfi_hearings.default.yml | 124 ++++++++++++++++++ ...iew_display.paragraph.hearings.default.yml | 39 ++++++ conf/cmi/core.extension.yml | 1 + ...es.external_entity_type.helfi_hearings.yml | 54 ++++++++ ....field.node.landing_page.field_content.yml | 5 + ...ph.hearings.field_hearings_description.yml | 28 ++++ ...aragraph.hearings.field_hearings_title.yml | 21 +++ ...e.paragraph.field_hearings_description.yml | 21 +++ ...storage.paragraph.field_hearings_title.yml | 23 ++++ ...ph.hearings.field_hearings_description.yml | 1 + ...aragraph.hearings.field_hearings_title.yml | 1 + .../paragraphs.paragraphs_type.hearings.yml | 2 + conf/cmi/language/fi/views.view.redirect.yml | 12 -- .../paragraphs.paragraphs_type.hearings.yml | 12 ++ conf/cmi/views.view.redirect.yml | 2 +- tools/make/qa.mk | 4 +- tools/make/symfony.mk | 12 +- 19 files changed, 420 insertions(+), 64 deletions(-) create mode 100644 conf/cmi/core.entity_form_display.paragraph.hearings.default.yml create mode 100644 conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.hearings.default.yml create mode 100644 conf/cmi/external_entities.external_entity_type.helfi_hearings.yml create mode 100644 conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml create mode 100644 conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml create mode 100644 conf/cmi/field.storage.paragraph.field_hearings_description.yml create mode 100644 conf/cmi/field.storage.paragraph.field_hearings_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_description.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.hearings.yml diff --git a/composer.lock b/composer.lock index a59a1dea..1eeeee48 100644 --- a/composer.lock +++ b/composer.lock @@ -461,16 +461,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -520,9 +520,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -538,7 +538,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "consolidation/annotated-command", @@ -3816,23 +3816,23 @@ }, { "name": "drupal/hdbt", - "version": "5.5.10", + "version": "5.5.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "7e26c936b71330c788143f97cc4e2a75f53e621f" + "reference": "3220b90ab23c442c75e9b00828824b4c0c251e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7e26c936b71330c788143f97cc4e2a75f53e621f", - "reference": "7e26c936b71330c788143f97cc4e2a75f53e621f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/3220b90ab23c442c75e9b00828824b4c0c251e26", + "reference": "3220b90ab23c442c75e9b00828824b4c0c251e26", "shasum": "" }, "require": { "drupal/twig_tweak": "^2.0 || ^3.0" }, "conflict": { - "drupal/helfi_platform_config": "<3.0" + "drupal/helfi_platform_config": "<3.3.8" }, "type": "drupal-theme", "license": [ @@ -3843,10 +3843,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.14", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-30T07:02:24+00:00" + "time": "2023-09-05T05:15:32+00:00" }, { "name": "drupal/hdbt_admin", @@ -3935,16 +3935,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.19", + "version": "2.4.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "917de458ac2ed2b046a9c4125094f3d233c47289" + "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/917de458ac2ed2b046a9c4125094f3d233c47289", - "reference": "917de458ac2ed2b046a9c4125094f3d233c47289", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/1da31a4c69b2c3620a4f4636e599642dd7d6907c", + "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c", "shasum": "" }, "require": { @@ -3970,10 +3970,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.19", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.20", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-25T05:23:13+00:00" + "time": "2023-08-31T06:57:37+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4020,12 +4020,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0" + "reference": "a7868ae97fee754fd8110a991c364decbb492f1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5445ad9e47c0231243068982ef6eeb64fa1363b0", - "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/a7868ae97fee754fd8110a991c364decbb492f1a", + "reference": "a7868ae97fee754fd8110a991c364decbb492f1a", "shasum": "" }, "default-branch": true, @@ -4038,7 +4038,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-07-25T08:32:03+00:00" + "time": "2023-08-30T11:41:00+00:00" }, { "name": "drupal/helfi_navigation", @@ -4076,16 +4076,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.7", + "version": "3.3.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" + "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/44bd43974a82eab9c9c95cf2727b383b6da2d82a", + "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a", "shasum": "" }, "require": { @@ -4191,10 +4191,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.9", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T11:40:56+00:00" + "time": "2023-09-01T08:09:08+00:00" }, { "name": "drupal/helfi_proxy", @@ -4242,16 +4242,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.2.5", + "version": "2.2.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "d44cc81f6f6827c1de90f4815a34bb1abb79386f" + "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d44cc81f6f6827c1de90f4815a34bb1abb79386f", - "reference": "d44cc81f6f6827c1de90f4815a34bb1abb79386f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f73c27c4d30522303dfadf1228c7331e120f04ac", + "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac", "shasum": "" }, "require": { @@ -4277,10 +4277,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-06-22T12:05:00+00:00" + "time": "2023-09-01T12:09:30+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5579,17 +5579,17 @@ }, { "name": "drupal/redirect", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.8" + "reference": "8.x-1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "a7a440423434472ff7115ae69df01553f763f839" + "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "2987de20f509e9f7cec8a0f81d3a6774f9b0ba3e" }, "require": { "drupal/core": "^9.2 || ^10" @@ -5597,8 +5597,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1661806955", + "version": "8.x-1.9", + "datestamp": "1693393506", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml new file mode 100644 index 00000000..4ae6a916 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml @@ -0,0 +1,36 @@ +uuid: d5be6ac3-1be3-49aa-b5b4-0215dab3bdbc +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.hearings.field_hearings_description + - field.field.paragraph.hearings.field_hearings_title + - paragraphs.paragraphs_type.hearings + module: + - text +_core: + default_config_hash: l2kryFebseDJ_OFETKLTOsXMlUe1CuLoZiQne_X2Glk +id: paragraph.hearings.default +targetEntityType: paragraph +bundle: hearings +mode: default +content: + field_hearings_description: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_hearings_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml new file mode 100644 index 00000000..e71d953e --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml @@ -0,0 +1,124 @@ +uuid: be1075c6-ab1a-40ff-9908-1e8fca5abebb +langcode: en +status: true +dependencies: + config: + - responsive_image.styles.image__3_2 + module: + - external_entities + - imagecache_external +_core: + default_config_hash: fILQEVNfZTZZh_DbxUgOfgAwVP5-S0z3Ud7QI4g8ato +id: helfi_hearings.helfi_hearings.default +targetEntityType: helfi_hearings +bundle: helfi_hearings +mode: default +content: + close_at: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + comments: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + count: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + created_at: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + existing_translations: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + langcode: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 + third_party_settings: { } + weight: 1 + region: content + main_image_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + open_at: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + organization: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + slug: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + url: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + abstract: true + 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 new file mode 100644 index 00000000..7a7f86a7 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -0,0 +1,39 @@ +uuid: 4e2e89e0-151b-4902-9d70-6c3bcbcef1fa +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.hearings.field_hearings_description + - field.field.paragraph.hearings.field_hearings_title + - paragraphs.paragraphs_type.hearings + module: + - text +_core: + default_config_hash: kS2OalHOAuM9YHvNdaO9be_ys26-Wdo1tQjjgSniWoI +id: paragraph.hearings.default +targetEntityType: paragraph +bundle: hearings +mode: default +content: + field_hearings_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_hearings_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + list: + weight: 100 + settings: { } + third_party_settings: { } + region: content +hidden: + search_api_excerpt: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 9ef960fa..c12a9a15 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -60,6 +60,7 @@ module: helfi_paragraphs_columns: 0 helfi_paragraphs_contact_card_listing: 0 helfi_paragraphs_content_cards: 0 + helfi_paragraphs_hearings: 0 helfi_paragraphs_hero: 0 helfi_paragraphs_image: 0 helfi_paragraphs_liftup_with_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 new file mode 100644 index 00000000..20ce27fa --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -0,0 +1,54 @@ +uuid: b6b2219c-d758-434a-be3d-25e15e889991 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: V9lWeTxHnS6dVGfiP_eapxOGbHw6NEaSSO5ePjVzWNc +id: helfi_hearings +label: 'Helfi: Hearing' +label_plural: 'Helfi: Hearing' +description: 'Helfi hearings from hearing api.' +generate_aliases: false +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: $.title + close_at: + value: $.close_at + created_at: + value: $.created_at + open_at: + value: $.open_at + slug: + value: $.slug + comments: + value: $.n_comments + organization: + value: $.organization + abstract: + value: $.abstract + main_image: + uri: $.main_image_url + main_image_title: + value: $.main_image_caption + count: + value: $.count + url: + value: $.url + langcode: + value: $.langcode + existing_translations: + value: $.existing_translations +storage_client_id: helfi_hearings +storage_client_config: { } +persistent_cache_max_age: 3600 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false 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 0a042798..0e997be1 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.content_liftup - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library + - paragraphs.paragraphs_type.hearings - paragraphs.paragraphs_type.job_search - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links @@ -60,6 +61,7 @@ settings: popular_services: popular_services target_group_links: target_group_links job_search: job_search + hearings: hearings negate: 0 target_bundles_drag_drop: banner: @@ -83,6 +85,9 @@ settings: from_library: weight: 0 enabled: true + hearings: + weight: 0 + enabled: true job_search: weight: 0 enabled: true diff --git a/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml new file mode 100644 index 00000000..e98b1cb8 --- /dev/null +++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml @@ -0,0 +1,28 @@ +uuid: e82249b1-4cea-4478-939a-1327dcaf8f76 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hearings_description + - paragraphs.paragraphs_type.hearings + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - minimal +_core: + default_config_hash: Hzutod731PQFSGM7oIqDKlHOOuWhCgfVW6PrPTUzBps +id: paragraph.hearings.field_hearings_description +field_name: field_hearings_description +entity_type: paragraph +bundle: hearings +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml b/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml new file mode 100644 index 00000000..5da10bdd --- /dev/null +++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml @@ -0,0 +1,21 @@ +uuid: ca4301c4-6582-4517-b397-10647554b6f4 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hearings_title + - paragraphs.paragraphs_type.hearings +_core: + default_config_hash: 7ND3L8b6WIkrG6ew034kRIVRBdyKZXVhRhEdlBu-tJ4 +id: paragraph.hearings.field_hearings_title +field_name: field_hearings_title +entity_type: paragraph +bundle: hearings +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_hearings_description.yml b/conf/cmi/field.storage.paragraph.field_hearings_description.yml new file mode 100644 index 00000000..b9befd36 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_hearings_description.yml @@ -0,0 +1,21 @@ +uuid: a11797ad-4886-49cd-b407-d8901912f347 +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +_core: + default_config_hash: '-wixoAUHw5pe0XRvRilN50lCY_xQEdOGkGO5nVM-22M' +id: paragraph.field_hearings_description +field_name: field_hearings_description +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_hearings_title.yml b/conf/cmi/field.storage.paragraph.field_hearings_title.yml new file mode 100644 index 00000000..d45a08ac --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_hearings_title.yml @@ -0,0 +1,23 @@ +uuid: f91eb3c0-2085-4b8b-ab8b-0c5e78306532 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: xpZE8O1B6Kf07XLP2CWf7FdWEwtSMvHUfl_gsLicNEo +id: paragraph.field_hearings_title +field_name: field_hearings_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.hearings.field_hearings_description.yml b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml new file mode 100644 index 00000000..2f308756 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml @@ -0,0 +1,2 @@ +label: Kuulemiset +description: 'Listaa viimeisimmät kuulemiset Kerrokantasi palvelusta.' diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml index e52be165..190fb626 100644 --- a/conf/cmi/language/fi/views.view.redirect.yml +++ b/conf/cmi/language/fi/views.view.redirect.yml @@ -5,18 +5,6 @@ display: status_code: group_info: group_items: - 15: - title: '300 Useita valintoja' - 16: - title: '301 Pysyvästi siirretty' - 17: - title: '302 Löydetty' - 18: - title: '303 Kts. toinen' - 19: - title: '304 Muuttamaton' - 20: - title: '305 Käytä proxyä' 7: title: '300 Multiple Choices' label: Tilakoodi diff --git a/conf/cmi/paragraphs.paragraphs_type.hearings.yml b/conf/cmi/paragraphs.paragraphs_type.hearings.yml new file mode 100644 index 00000000..b0ab56f1 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.hearings.yml @@ -0,0 +1,12 @@ +uuid: 7ee78422-bf89-41f6-a05d-fd5dd5285e30 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: d0QTGlsuM8eoA_FwYt3CPKctSfup5wapuDC__Kj5Os4 +id: hearings +label: Hearings +icon_uuid: null +icon_default: null +description: 'Lists latest hearings from Kerrokantasi service. ' +behavior_plugins: { } diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index af2123eb..bb24c780 100644 --- a/conf/cmi/views.view.redirect.yml +++ b/conf/cmi/views.view.redirect.yml @@ -247,7 +247,7 @@ display: type: basic options: submit_button: Filter - reset_button: false + reset_button: true reset_button_label: Reset exposed_sorts_label: 'Sort by' expose_sort_order: true diff --git a/tools/make/qa.mk b/tools/make/qa.mk index c3596a79..f4988fbe 100644 --- a/tools/make/qa.mk +++ b/tools/make/qa.mk @@ -60,11 +60,11 @@ endef ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes) define cs -$(call docker_compose_exec,$(1)) +$(call docker_compose_exec,vendor/bin/$(1)) endef else ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-no) define cs -$(call docker_compose_exec,$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) +$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) endef else define cs diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk index a756dc7b..069c6a78 100644 --- a/tools/make/symfony.mk +++ b/tools/make/symfony.mk @@ -1,6 +1,7 @@ SF_FRESH_TARGETS := up build sf-cw sf-about sf-open FIX_TARGETS += fix-symfony LINT_PHP_TARGETS += lint-symfony +CS_FIXER_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/php-cs-fixer && echo yes || echo no) PHONY += encore-dev encore-dev: ## Do Encore development build @@ -49,13 +50,12 @@ fresh: ## Build fresh development environment PHONY += fix-symfony fix-symfony: ## Fix Symfony code style $(call step,Fix Symfony code style...\n) - $(call docker_compose_exec,PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --diff --ansi) + $(call cs_symfony,fix --ansi src) PHONY += lint-symfony -lint-symfony: PATHS := src lint-symfony: ## Lint Symfony code style $(call step,Lint Symfony code style...\n) - $(call cs_symfony,$(PATHS)) + $(call cs_symfony,fix --dry-run --diff --ansi src) ifeq ($(RUN_ON),docker) define sf_console @@ -67,12 +67,12 @@ define sf_console endef endif -ifeq ($(CS_INSTALLED),yes) +ifeq ($(CS_FIXER_INSTALLED),yes) define cs_symfony -$(call docker_compose_exec,vendor/bin/phpcs --ignore=node_modules $(1)) +$(call docker_compose_exec,vendor/bin/php-cs-fixer $(1)) endef else define cs_symfony -$(call warn,CodeSniffer is not installed!) +$(call warn,PHP CS Fixer is not installed!) endef endif