diff --git a/composer.lock b/composer.lock index 9ea5b298..ee292279 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", @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.11", + "version": "5.5.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "8c2b38e3d3c37d7c1474204828bbd13260f6850b" + "reference": "b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8c2b38e3d3c37d7c1474204828bbd13260f6850b", - "reference": "8c2b38e3d3c37d7c1474204828bbd13260f6850b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8", + "reference": "b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.11", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.12", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-30T11:32:12+00:00" + "time": "2023-08-31T06:14:18+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3870,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": { @@ -3905,10 +3905,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", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.8", + "version": "3.3.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "aaeb7062b3de2ec1a534122caffcd85f625a04ce" + "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/aaeb7062b3de2ec1a534122caffcd85f625a04ce", - "reference": "aaeb7062b3de2ec1a534122caffcd85f625a04ce", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/44bd43974a82eab9c9c95cf2727b383b6da2d82a", + "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a", "shasum": "" }, "require": { @@ -4126,10 +4126,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.8", + "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-30T11:47:11+00:00" + "time": "2023-09-01T08:09:08+00:00" }, { "name": "drupal/helfi_proxy", 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..cb463be4 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml @@ -0,0 +1,36 @@ +uuid: a095a5df-42a7-47f5-9357-edddaf845fce +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..f042b034 --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml @@ -0,0 +1,123 @@ +uuid: 744b98e5-1fb5-4368-9000-925d40d67d20 +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 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..b81799e0 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -0,0 +1,39 @@ +uuid: 4f1ecb97-7710-48ed-895d-b1bba66e77d7 +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 3982a58a..f3deeb31 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -62,6 +62,7 @@ module: 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 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..d85930f3 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -0,0 +1,54 @@ +uuid: 9b3d1fa1-671e-4680-b792-effa3645ffc2 +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 e176a6b9..0dc3bfd5 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.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map @@ -59,6 +60,7 @@ settings: unit_search: unit_search service_list: service_list service_list_search: service_list_search + hearings: hearings negate: 0 target_bundles_drag_drop: banner: @@ -82,6 +84,9 @@ settings: from_library: weight: 0 enabled: true + hearings: + weight: 0 + enabled: true liftup_with_image: 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..8a24abf4 --- /dev/null +++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml @@ -0,0 +1,28 @@ +uuid: 1d83352b-4051-4fea-9099-bb3190f18a2e +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..38722df8 --- /dev/null +++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml @@ -0,0 +1,21 @@ +uuid: 8a2d4966-b64f-4b6c-91c8-e2639f409214 +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..adced72f --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_hearings_description.yml @@ -0,0 +1,21 @@ +uuid: 78ce8525-c323-4057-bfa3-fda00dd40a35 +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..694c687c --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_hearings_title.yml @@ -0,0 +1,23 @@ +uuid: 11a58cb6-f38c-4dc8-9fd3-8a8b71fc917c +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/paragraphs.paragraphs_type.hearings.yml b/conf/cmi/paragraphs.paragraphs_type.hearings.yml new file mode 100644 index 00000000..cd732101 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.hearings.yml @@ -0,0 +1,12 @@ +uuid: e0966fde-3d2d-40c5-9fc9-30bd4c5a620f +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/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