From 2619213bc037844e8fb428b3ebb46ab901fbef59 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 30 Aug 2023 11:43:34 +0000 Subject: [PATCH 1/5] Update configuration --- composer.lock | 65 +++++++++++++++++--------------- conf/cmi/views.view.redirect.yml | 2 +- tools/make/qa.mk | 10 +++-- tools/make/symfony.mk | 12 +++--- 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 04da3e50..aa1afbf7 100644 --- a/composer.lock +++ b/composer.lock @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.9", + "version": "5.5.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a" + "reference": "8c2b38e3d3c37d7c1474204828bbd13260f6850b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8c2b38e3d3c37d7c1474204828bbd13260f6850b", + "reference": "8c2b38e3d3c37d7c1474204828bbd13260f6850b", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-28T13:26:21+00:00" + "time": "2023-08-30T11:32:12+00:00" }, { "name": "drupal/hdbt_admin", @@ -3955,12 +3955,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, @@ -3973,7 +3973,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", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.6", + "version": "3.3.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa" + "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a9f447f9a9e681a73ec609423c82b4e004d2e0aa", - "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc", + "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc", "shasum": "" }, "require": { @@ -4115,6 +4115,9 @@ }, "drupal/translatable_menu_link_uri": { "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" + }, + "drupal/simple_sitemap": { + "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" } } }, @@ -4123,10 +4126,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T07:11:13+00:00" + "time": "2023-08-29T11:40:56+00:00" }, { "name": "drupal/helfi_proxy", @@ -5446,17 +5449,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" @@ -5464,8 +5467,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" @@ -7145,16 +7148,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f" + "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/58fbd11312a8f69e0824a640b86b33a9d096fe7f", - "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", + "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", "shasum": "" }, "require": { @@ -7163,7 +7166,7 @@ "require-dev": { "composer-runtime-api": "^2.0.0", "phpstan/phpstan": "^1.2", - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^9 | ^10", "sebastian/comparator": ">=4", "sebastian/diff": ">=4", "squizlabs/php_codesniffer": ">=3.6", @@ -7171,7 +7174,7 @@ "symfony/filesystem": ">=5.4", "symfony/var-dumper": ">=5.4", "symfony/yaml": ">=5.4", - "vimeo/psalm": "^4.23" + "vimeo/psalm": "^4.23 | ^5" }, "bin": [ "bin/fileeye-mimemap" @@ -7201,9 +7204,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.1" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.2" }, - "time": "2023-02-11T19:58:58+00:00" + "time": "2023-08-29T16:20:26+00:00" }, { "name": "fileeye/pel", diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 53938368..e0176deb 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 0dae5b6c..c3596a79 100644 --- a/tools/make/qa.mk +++ b/tools/make/qa.mk @@ -2,6 +2,7 @@ TEST_TARGETS += test-phpunit FIX_TARGETS := LINT_PHP_TARGETS := CS_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/phpcs && echo yes || echo no) +CS_CONF_EXISTS := $(shell test -f phpcs.xml.dist && echo yes || echo no) TESTSUITES ?= unit,kernel,functional PHONY += fix @@ -57,10 +58,13 @@ define test_result @echo "\n${YELLOW}${1}:${NO_COLOR} ${GREEN}${2}${NO_COLOR}" endef -ifeq ($(CS_INSTALLED),yes) +ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes) define cs -$(call docker_compose_exec,vendor/bin/$(1) --config-set installed_paths $(CS_STANDARD_PATHS)) -$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) +$(call docker_compose_exec,$(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)) 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 From 4788c5a162cd0dc1e07a07395dfc4e60736881a6 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 30 Aug 2023 11:50:29 +0000 Subject: [PATCH 2/5] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index aa1afbf7..9ea5b298 100644 --- a/composer.lock +++ b/composer.lock @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.7", + "version": "3.3.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" + "reference": "aaeb7062b3de2ec1a534122caffcd85f625a04ce" }, "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/aaeb7062b3de2ec1a534122caffcd85f625a04ce", + "reference": "aaeb7062b3de2ec1a534122caffcd85f625a04ce", "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.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T11:40:56+00:00" + "time": "2023-08-30T11:47:11+00:00" }, { "name": "drupal/helfi_proxy", From c5f3a66bfdac42138ed037cef745752bef646142 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 1 Sep 2023 09:39:51 +0000 Subject: [PATCH 3/5] Update configuration --- composer.lock | 50 +++---- ...orm_display.paragraph.hearings.default.yml | 36 +++++ ....helfi_hearings.helfi_hearings.default.yml | 123 ++++++++++++++++++ ...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 + .../paragraphs.paragraphs_type.hearings.yml | 12 ++ tools/make/qa.mk | 4 +- 16 files changed, 394 insertions(+), 27 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 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 From 7f7c98f1710bef1490cd9701668af0917c7e4404 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 12 Sep 2023 07:00:56 +0000 Subject: [PATCH 4/5] Update configuration --- composer.lock | 119 +++++++++--------- ...unit_accessibility_information.default.yml | 27 ++++ ...ay.paragraph.unit_contact_card.default.yml | 100 +++++++++++++++ ...form_display.tpr_unit.tpr_unit.default.yml | 12 +- ...iew_display.paragraph.hearings.default.yml | 2 +- ...unit_accessibility_information.default.yml | 23 ++++ ...ay.paragraph.unit_contact_card.default.yml | 48 +++++++ ...view_display.tpr_unit.tpr_unit.default.yml | 1 - ...view_display.tpr_unit.tpr_unit.minimal.yml | 1 - ..._view_display.tpr_unit.tpr_unit.teaser.yml | 1 - ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 1 - ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 1 - ...es.external_entity_type.helfi_hearings.yml | 2 +- ...ormation.field_unit_accessibility_unit.yml | 28 +++++ ..._contact_card.field_unit_contact_title.yml | 21 ++++ ...t_contact_card.field_unit_contact_unit.yml | 28 +++++ ...ct_card.field_unit_contact_use_address.yml | 25 ++++ ...ct_card.field_unit_contact_use_details.yml | 25 ++++ ...ntact_card.field_unit_contact_use_link.yml | 25 ++++ ...ct_card.field_unit_contact_use_opening.yml | 25 ++++ ...t_card.field_unit_contact_use_override.yml | 25 ++++ ...tact_card.field_unit_contact_use_phone.yml | 25 ++++ ...ct_card.field_unit_contact_use_picture.yml | 25 ++++ ...act_card.field_unit_contact_use_postal.yml | 25 ++++ ....tpr_service.tpr_service.field_content.yml | 10 ++ ...ervice.tpr_service.field_lower_content.yml | 12 +- ...aragraph.field_unit_accessibility_unit.yml | 22 ++++ ...age.paragraph.field_unit_contact_title.yml | 23 ++++ ...rage.paragraph.field_unit_contact_unit.yml | 22 ++++ ...ragraph.field_unit_contact_use_address.yml | 20 +++ ...ragraph.field_unit_contact_use_details.yml | 20 +++ ....paragraph.field_unit_contact_use_link.yml | 20 +++ ...ragraph.field_unit_contact_use_opening.yml | 20 +++ ...agraph.field_unit_contact_use_override.yml | 20 +++ ...paragraph.field_unit_contact_use_phone.yml | 20 +++ ...ragraph.field_unit_contact_use_picture.yml | 20 +++ ...aragraph.field_unit_contact_use_postal.yml | 20 +++ conf/cmi/filter.format.full_html.yml | 4 +- conf/cmi/filter.format.minimal.yml | 4 +- ...ormation.field_unit_accessibility_unit.yml | 1 + ..._contact_card.field_unit_contact_title.yml | 1 + ...t_contact_card.field_unit_contact_unit.yml | 2 + ...ct_card.field_unit_contact_use_address.yml | 1 + ...ct_card.field_unit_contact_use_details.yml | 1 + ...ntact_card.field_unit_contact_use_link.yml | 1 + ...ct_card.field_unit_contact_use_opening.yml | 1 + ...t_card.field_unit_contact_use_override.yml | 1 + ...tact_card.field_unit_contact_use_phone.yml | 1 + ...ct_card.field_unit_contact_use_picture.yml | 1 + ...act_card.field_unit_contact_use_postal.yml | 1 + ...hs_type.unit_accessibility_information.yml | 1 + ...hs_type.unit_accessibility_information.yml | 12 ++ ...aphs.paragraphs_type.unit_contact_card.yml | 12 ++ conf/cmi/views.view.tpr_unit_list.yml | 2 + docker/openshift/crons/pubsub.sh | 15 +++ public/sites/default/azure.settings.php | 11 ++ public/sites/default/settings.php | 10 ++ tools/make/docker.mk | 2 +- tools/make/symfony.mk | 2 +- 59 files changed, 868 insertions(+), 83 deletions(-) create mode 100644 conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml create mode 100644 conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml create mode 100644 conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_title.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.unit_accessibility_information.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.unit_accessibility_information.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.unit_contact_card.yml create mode 100644 docker/openshift/crons/pubsub.sh diff --git a/composer.lock b/composer.lock index ee292279..9b28f53a 100644 --- a/composer.lock +++ b/composer.lock @@ -2639,10 +2639,6 @@ { "name": "tatarbj", "homepage": "https://www.drupal.org/user/649590" - }, - { - "name": "volkswagenchick", - "homepage": "https://www.drupal.org/user/3332522" } ], "description": "Adds configuration to the system breadcrumbs.", @@ -3751,23 +3747,23 @@ }, { "name": "drupal/hdbt", - "version": "5.5.12", + "version": "5.6.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8" + "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8", - "reference": "b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d4eeff38bc61f431613c8fa9a4d92a8755f66b09", + "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09", "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": [ @@ -3778,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-31T06:14:18+00:00" + "time": "2023-09-11T12:42:43+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3866,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.20", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c" + "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/1da31a4c69b2c3620a4f4636e599642dd7d6907c", - "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/10f5700e4c38c403d2cc54d2733cadaff72d67c1", + "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1", "shasum": "" }, "require": { @@ -3905,10 +3901,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.20", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-31T06:57:37+00:00" + "time": "2023-09-08T09:03:20+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3955,12 +3951,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "a7868ae97fee754fd8110a991c364decbb492f1a" + "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/a7868ae97fee754fd8110a991c364decbb492f1a", - "reference": "a7868ae97fee754fd8110a991c364decbb492f1a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", + "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", "shasum": "" }, "default-branch": true, @@ -3973,7 +3969,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-08-30T11:41:00+00:00" + "time": "2023-09-06T06:27:11+00:00" }, { "name": "drupal/helfi_navigation", @@ -4011,16 +4007,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.9", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a" + "reference": "09c19828ae17b7780efae2f38c5554849deaa6fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/44bd43974a82eab9c9c95cf2727b383b6da2d82a", - "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/09c19828ae17b7780efae2f38c5554849deaa6fe", + "reference": "09c19828ae17b7780efae2f38c5554849deaa6fe", "shasum": "" }, "require": { @@ -4113,9 +4109,6 @@ "drupal/social_media": { "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" }, - "drupal/translatable_menu_link_uri": { - "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" - }, "drupal/simple_sitemap": { "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" } @@ -4126,23 +4119,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.9", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-01T08:09:08+00:00" + "time": "2023-09-12T06:53:57+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "257e937e6e1d77e8da5ec1ef20f133109b9b1ed4" + "reference": "66121d5241d9cff17021f8a197a2d79361d06f80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/257e937e6e1d77e8da5ec1ef20f133109b9b1ed4", - "reference": "257e937e6e1d77e8da5ec1ef20f133109b9b1ed4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/66121d5241d9cff17021f8a197a2d79361d06f80", + "reference": "66121d5241d9cff17021f8a197a2d79361d06f80", "shasum": "" }, "require": { @@ -4170,23 +4163,23 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-08-11T05:35:26+00:00" + "time": "2023-09-04T11:31:52+00:00" }, { "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": { @@ -4212,10 +4205,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", @@ -4996,17 +4989,17 @@ }, { "name": "drupal/paragraphs", - "version": "1.15.0", + "version": "1.16.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs.git", - "reference": "8.x-1.15" + "reference": "8.x-1.16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.15.zip", - "reference": "8.x-1.15", - "shasum": "2ed2d3199553010fa1c500181bbebe676e9e60c1" + "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.16.zip", + "reference": "8.x-1.16", + "shasum": "48f60810fd8086a52d56e84af8b212cce7a270e8" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5030,8 +5023,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.15", - "datestamp": "1661440897", + "version": "8.x-1.16", + "datestamp": "1694007797", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6209,26 +6202,26 @@ }, { "name": "drupal/translatable_menu_link_uri", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/translatable_menu_link_uri.git", - "reference": "2.0.0" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.0.0.zip", - "reference": "2.0.0", - "shasum": "6960a485565d886cf35ee6dd56310de47e04e430" + "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.1.0.zip", + "reference": "2.1.0", + "shasum": "3bafa0a19761524560a2d232c945f10643e91053" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1597491393", + "version": "2.1.0", + "datestamp": "1694361965", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15638,16 +15631,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.1", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" + "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", "shasum": "" }, "require": { @@ -15679,9 +15672,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.23.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0" }, - "time": "2023-08-03T16:32:59+00:00" + "time": "2023-09-07T20:46:32+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml new file mode 100644 index 00000000..d9535294 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml @@ -0,0 +1,27 @@ +uuid: 90bb3b2f-2d4d-4235-b788-8624cf3345d7 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit + - paragraphs.paragraphs_type.unit_accessibility_information +_core: + default_config_hash: XTEz2KOP0AxeNZflb25hxjCLvb_Tl590CDAqqxbAFW4 +id: paragraph.unit_accessibility_information.default +targetEntityType: paragraph +bundle: unit_accessibility_information +mode: default +content: + field_unit_accessibility_unit: + type: entity_reference_autocomplete + weight: 0 + 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.unit_contact_card.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml new file mode 100644 index 00000000..c4fc4cf6 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml @@ -0,0 +1,100 @@ +uuid: cded2566-9400-4357-b1ac-29b2b7ce91b1 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_contact_card.field_unit_contact_title + - field.field.paragraph.unit_contact_card.field_unit_contact_unit + - field.field.paragraph.unit_contact_card.field_unit_contact_use_address + - field.field.paragraph.unit_contact_card.field_unit_contact_use_details + - field.field.paragraph.unit_contact_card.field_unit_contact_use_link + - field.field.paragraph.unit_contact_card.field_unit_contact_use_opening + - field.field.paragraph.unit_contact_card.field_unit_contact_use_override + - field.field.paragraph.unit_contact_card.field_unit_contact_use_phone + - field.field.paragraph.unit_contact_card.field_unit_contact_use_picture + - field.field.paragraph.unit_contact_card.field_unit_contact_use_postal + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: Bq6G32sj09-QkuhN599_1I8I8SYgRyC4LsKo7y2srSM +id: paragraph.unit_contact_card.default +targetEntityType: paragraph +bundle: unit_contact_card +mode: default +content: + field_unit_contact_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_unit_contact_unit: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + field_unit_contact_use_address: + type: boolean_checkbox + weight: 2 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_details: + type: boolean_checkbox + weight: 8 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_link: + type: boolean_checkbox + weight: 9 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_opening: + type: boolean_checkbox + weight: 5 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_override: + type: boolean_checkbox + weight: 7 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_phone: + type: boolean_checkbox + weight: 4 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_picture: + type: boolean_checkbox + weight: 6 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_postal: + type: boolean_checkbox + weight: 3 + region: content + settings: + display_label: true + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index e9687d7e..834c4cb8 100644 --- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -84,8 +84,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - weight: 36 region: content + weight: 36 settings: label: above formatter_type: null @@ -176,8 +176,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - weight: 32 region: content + weight: 33 settings: label: above formatter_type: null @@ -203,8 +203,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - weight: 35 region: content + weight: 31 settings: label: above formatter_type: null @@ -241,8 +241,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - weight: 31 region: content + weight: 32 settings: label: above formatter_type: null @@ -251,8 +251,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - weight: 33 region: content + weight: 34 settings: label: above formatter_type: null @@ -294,8 +294,8 @@ content: third_party_settings: { } price_info: type: readonly_field_widget - weight: 34 region: content + weight: 35 settings: label: above formatter_type: null 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 b81799e0..1435f6f0 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.entity_view_display.paragraph.unit_accessibility_information.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml new file mode 100644 index 00000000..9d03f3de --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml @@ -0,0 +1,23 @@ +uuid: 95975109-b870-4a20-8bcc-9d52578a1c5c +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit + - paragraphs.paragraphs_type.unit_accessibility_information +_core: + default_config_hash: fs0hvNS9lcziz7yNYs7VDWHmIs6wqeA2SZxMrkpb3KQ +id: paragraph.unit_accessibility_information.default +targetEntityType: paragraph +bundle: unit_accessibility_information +mode: default +content: + field_unit_accessibility_unit: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 0 + region: content +hidden: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml new file mode 100644 index 00000000..4308ce40 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml @@ -0,0 +1,48 @@ +uuid: 778d53bd-4342-45c8-b7ba-bd3ff1ed6814 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_contact_card.field_unit_contact_title + - field.field.paragraph.unit_contact_card.field_unit_contact_unit + - field.field.paragraph.unit_contact_card.field_unit_contact_use_address + - field.field.paragraph.unit_contact_card.field_unit_contact_use_details + - field.field.paragraph.unit_contact_card.field_unit_contact_use_link + - field.field.paragraph.unit_contact_card.field_unit_contact_use_opening + - field.field.paragraph.unit_contact_card.field_unit_contact_use_override + - field.field.paragraph.unit_contact_card.field_unit_contact_use_phone + - field.field.paragraph.unit_contact_card.field_unit_contact_use_picture + - field.field.paragraph.unit_contact_card.field_unit_contact_use_postal + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: EU0zJOIFt1tmZeUsDpYl1d3uFvYxMy7dPm6tX4qhGC0 +id: paragraph.unit_contact_card.default +targetEntityType: paragraph +bundle: unit_contact_card +mode: default +content: + field_unit_contact_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + field_unit_contact_unit: + type: entity_reference_label + label: hidden + settings: + link: false + third_party_settings: { } + weight: 1 + region: content +hidden: + field_unit_contact_use_address: true + field_unit_contact_use_details: true + field_unit_contact_use_link: true + field_unit_contact_use_opening: true + field_unit_contact_use_override: true + field_unit_contact_use_phone: true + field_unit_contact_use_picture: true + field_unit_contact_use_postal: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index a9d390db..22c41e1b 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -226,6 +226,5 @@ hidden: longitude: true other_info: true price_info: true - search_api_excerpt: true show_www: true streetview_entrance_url: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index 60ebe7e7..c579c110 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -69,7 +69,6 @@ hidden: picture_url_override: true price_info: true provided_languages: true - search_api_excerpt: true service_map_embed: true services: true show_www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index c757fa5f..df91ba80 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -87,7 +87,6 @@ hidden: phone: true price_info: true provided_languages: true - search_api_excerpt: true service_map_embed: true services: true show_www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index 17d5ef61..c201c265 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -88,7 +88,6 @@ hidden: other_info: true price_info: true provided_languages: true - search_api_excerpt: true service_map_embed: true services: true show_www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index 78b50608..de8cd468 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -101,7 +101,6 @@ hidden: other_info: true price_info: true provided_languages: true - search_api_excerpt: true service_map_embed: true services: true show_www: true 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 d85930f3..281cb8f9 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.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml b/conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..a3ad2b28 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml @@ -0,0 +1,28 @@ +uuid: d2443ad4-8788-451d-b36d-4c6ea24b4f4d +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_accessibility_unit + - paragraphs.paragraphs_type.unit_accessibility_information +_core: + default_config_hash: ALIooZkYAEjfYbY7WHEJz8hSboKA9IjSro9xUr5Lpxw +id: paragraph.unit_accessibility_information.field_unit_accessibility_unit +field_name: field_unit_accessibility_unit +entity_type: paragraph +bundle: unit_accessibility_information +label: Unit +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:tpr_unit' + handler_settings: + target_bundles: null + sort: + field: name + direction: DESC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml new file mode 100644 index 00000000..882b360d --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml @@ -0,0 +1,21 @@ +uuid: 7393d2ff-52fb-4f22-9a1c-a6f96c4da678 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_title + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: BBtHOIG5Kl00da2A5MGqujVP7Mv30KLIQo0EppzL_6Y +id: paragraph.unit_contact_card.field_unit_contact_title +field_name: field_unit_contact_title +entity_type: paragraph +bundle: unit_contact_card +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml new file mode 100644 index 00000000..4362ea19 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml @@ -0,0 +1,28 @@ +uuid: 0cada4b7-b9e7-4747-9d7f-69b49efb7820 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_unit + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: '-TJ64AvbccN9tM_3346W4uk62EMhack-1q7ScuxBvc8' +id: paragraph.unit_contact_card.field_unit_contact_unit +field_name: field_unit_contact_unit +entity_type: paragraph +bundle: unit_contact_card +label: Unit +description: 'Add here the unit that you want to appear as the contact card. The unit doesn''t have to be published.' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:tpr_unit' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml new file mode 100644 index 00000000..a6ed6d73 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml @@ -0,0 +1,25 @@ +uuid: 5022e364-9ab3-429b-815d-9ec9fa3e4f93 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_address + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: iLunbVe1WwilCBd7ga4v1cMXJVMBff5W71TtUaGBFMY +id: paragraph.unit_contact_card.field_unit_contact_use_address +field_name: field_unit_contact_use_address +entity_type: paragraph +bundle: unit_contact_card +label: 'Show address' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml new file mode 100644 index 00000000..f7907e6e --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml @@ -0,0 +1,25 @@ +uuid: 71f0087f-6c96-4fb0-a775-657e7a3ee2f3 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_details + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: mKUcY-77saUKuSnjzPmx8QHw-gtexDvlq60TkWZIfJw +id: paragraph.unit_contact_card.field_unit_contact_use_details +field_name: field_unit_contact_use_details +entity_type: paragraph +bundle: unit_contact_card +label: 'Show additional details' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml new file mode 100644 index 00000000..0da4df6d --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml @@ -0,0 +1,25 @@ +uuid: 7b72f3b9-f150-4c52-a566-f59f03ddea9f +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_link + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: 3C8lV79YWtodb_RzX5bcS31hANW92D4ic6XUUsSP5DA +id: paragraph.unit_contact_card.field_unit_contact_use_link +field_name: field_unit_contact_use_link +entity_type: paragraph +bundle: unit_contact_card +label: 'Show link to unit page' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml new file mode 100644 index 00000000..7b947f4e --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml @@ -0,0 +1,25 @@ +uuid: 96df47fd-6c59-48cd-87d3-f96920910dd8 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_opening + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: OAgqWDx1bTc8LKZaeOBw6xVxNTBrL6ivYhKXxO2YGQI +id: paragraph.unit_contact_card.field_unit_contact_use_opening +field_name: field_unit_contact_use_opening +entity_type: paragraph +bundle: unit_contact_card +label: 'Show opening hours' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml new file mode 100644 index 00000000..094d1222 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml @@ -0,0 +1,25 @@ +uuid: e3f7418a-e8f7-446c-a81d-84270abb588f +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_override + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: 8CkfaWELO_WKLOH9HtEAEjBJ4GXUTt-9nYYPvyOpT48 +id: paragraph.unit_contact_card.field_unit_contact_use_override +field_name: field_unit_contact_use_override +entity_type: paragraph +bundle: unit_contact_card +label: 'Prefer override picture' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml new file mode 100644 index 00000000..36a59807 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml @@ -0,0 +1,25 @@ +uuid: 4a996eb6-11b1-4613-8895-da3f60ef23ed +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_phone + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: BnO5qnDTPxaMoFFoYvGvl8YDm-kg_8u6ftGQEcrS8PQ +id: paragraph.unit_contact_card.field_unit_contact_use_phone +field_name: field_unit_contact_use_phone +entity_type: paragraph +bundle: unit_contact_card +label: 'Show phone number' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml new file mode 100644 index 00000000..0f1e2e3a --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml @@ -0,0 +1,25 @@ +uuid: 5804962b-32e6-49f6-81ea-23205877c106 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_picture + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: W9PYT8Kh6u4JtMcPeUHHWL7JCpUl9x9LGu3IUq7plzU +id: paragraph.unit_contact_card.field_unit_contact_use_picture +field_name: field_unit_contact_use_picture +entity_type: paragraph +bundle: unit_contact_card +label: 'Show picture' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml new file mode 100644 index 00000000..6deef637 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml @@ -0,0 +1,25 @@ +uuid: 4795c7e9-5b42-43e4-9e9d-a0c01a33103d +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_postal + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: LK-JB_ukUxsmyTtykK_7GlgaMDQMmgDvZ9MIMtIKjiA +id: paragraph.unit_contact_card.field_unit_contact_use_postal +field_name: field_unit_contact_use_postal +entity_type: paragraph +bundle: unit_contact_card +label: 'Show postal address' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml index 2660cf0f..2bf5b226 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml @@ -17,6 +17,8 @@ dependencies: - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text + - paragraphs.paragraphs_type.unit_accessibility_information + - paragraphs.paragraphs_type.unit_contact_card module: - entity_reference_revisions - helfi_tpr @@ -49,6 +51,8 @@ settings: contact_card_listing: contact_card_listing map: map event_list: event_list + unit_accessibility_information: unit_accessibility_information + unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: accordion: @@ -90,4 +94,10 @@ settings: text: weight: 0 enabled: true + unit_accessibility_information: + weight: 0 + enabled: true + unit_contact_card: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index d88f424a..60d790a3 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -19,6 +19,8 @@ dependencies: - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text + - paragraphs.paragraphs_type.unit_accessibility_information + - paragraphs.paragraphs_type.unit_contact_card module: - entity_reference_revisions - helfi_tpr @@ -38,6 +40,7 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: + text: text columns: columns accordion: accordion image: image @@ -50,9 +53,10 @@ settings: news_list: news_list event_list: event_list phasing: phasing - text: text contact_card_listing: contact_card_listing map: map + unit_accessibility_information: unit_accessibility_information + unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: accordion: @@ -100,4 +104,10 @@ settings: text: weight: 0 enabled: true + unit_accessibility_information: + weight: 0 + enabled: true + unit_contact_card: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml b/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..75c7fbd0 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml @@ -0,0 +1,22 @@ +uuid: 1a482b62-6785-47fa-a4d0-1806429edc25 +langcode: en +status: true +dependencies: + module: + - helfi_tpr + - paragraphs +_core: + default_config_hash: FLBlbWAOFQ3vURlgVJl8tNoscxkpu-55Zcvg-56WMW8 +id: paragraph.field_unit_accessibility_unit +field_name: field_unit_accessibility_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/field.storage.paragraph.field_unit_contact_title.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml new file mode 100644 index 00000000..a9937277 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml @@ -0,0 +1,23 @@ +uuid: 39f724a3-24c9-49ab-8655-61012ad699fc +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: __gD1etYKkpxWM60OG0-8kRfJSExluB7IPDw0Zw3pHY +id: paragraph.field_unit_contact_title +field_name: field_unit_contact_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/field.storage.paragraph.field_unit_contact_unit.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml new file mode 100644 index 00000000..d00170a5 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml @@ -0,0 +1,22 @@ +uuid: 8be6af4d-c1ce-457c-b378-435a95954baa +langcode: en +status: true +dependencies: + module: + - helfi_tpr + - paragraphs +_core: + default_config_hash: Z0W-YvWIH7qcJhQVWjc4p71lza1_Wxg6-YidXqgwTlE +id: paragraph.field_unit_contact_unit +field_name: field_unit_contact_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/field.storage.paragraph.field_unit_contact_use_address.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml new file mode 100644 index 00000000..fa7b34e0 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml @@ -0,0 +1,20 @@ +uuid: a14e07bf-5a30-4648-a522-e45181f9fdde +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: 1kY30D0bv455CcZ4b8UfYmGcJUpG53xYQLMGUow4tKk +id: paragraph.field_unit_contact_use_address +field_name: field_unit_contact_use_address +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_details.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml new file mode 100644 index 00000000..2f8cb702 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml @@ -0,0 +1,20 @@ +uuid: 38402030-1a02-4752-a67d-47ba3e4a5e6b +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: QbAK6AxVnG-CVWk-mgIFztvzAWUhTEhxnyDfWUBlTLs +id: paragraph.field_unit_contact_use_details +field_name: field_unit_contact_use_details +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_link.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml new file mode 100644 index 00000000..d9326d95 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml @@ -0,0 +1,20 @@ +uuid: 476eb339-3420-4b9c-958f-1315d5a25bfa +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: BYzeR71DrkBqeMjYVof2ZkTX2qwf9R3dHSQTmIMkrTs +id: paragraph.field_unit_contact_use_link +field_name: field_unit_contact_use_link +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_opening.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml new file mode 100644 index 00000000..6f28adb8 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml @@ -0,0 +1,20 @@ +uuid: 590d71c6-9fc0-46d8-93a4-6bfb5d15fe62 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: iRABYacXMrVsyWc-6NU76Wl1BSJc64qszZFMtSKNbBo +id: paragraph.field_unit_contact_use_opening +field_name: field_unit_contact_use_opening +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_override.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml new file mode 100644 index 00000000..78cbd717 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml @@ -0,0 +1,20 @@ +uuid: 9edd2ab9-6c84-41fb-8d86-6a9c499b0e8c +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: sB8QMehrRh0OCPzqZOkwLtal3-HS5HYKw5YYkyuvUyM +id: paragraph.field_unit_contact_use_override +field_name: field_unit_contact_use_override +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_phone.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml new file mode 100644 index 00000000..56cc05da --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml @@ -0,0 +1,20 @@ +uuid: fc4b5921-fa30-41fa-b3ab-3a06b9d5138d +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: BMng6GPfLZl_YBCvLZgvsH-12BXX1cuXWG5VUpvY8Ks +id: paragraph.field_unit_contact_use_phone +field_name: field_unit_contact_use_phone +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_picture.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml new file mode 100644 index 00000000..098deb52 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml @@ -0,0 +1,20 @@ +uuid: 4aa20321-c6d2-4ede-bc8b-5e5e24e1299c +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: l-tk7y3NxV3m7jfYlAfZ5If4zoSBAIAkYRbJQE3MOCc +id: paragraph.field_unit_contact_use_picture +field_name: field_unit_contact_use_picture +entity_type: paragraph +type: boolean +settings: { } +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_unit_contact_use_postal.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml new file mode 100644 index 00000000..d973de84 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml @@ -0,0 +1,20 @@ +uuid: c3272a94-2258-49f0-ac40-665e890aa8b5 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: Gs3SkSx3iSaGvyfCHZTfIbp4IW1Y2Y_3TU1VlErxvOw +id: paragraph.field_unit_contact_use_postal +field_name: field_unit_contact_use_postal +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index f8219dd9..22f884d8 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: r40X436d0Agm1ErbO2TcpT46WfZZpxxplT_X72ju3d4 + default_config_hash: scZe8VBZbfUiJt0xnoGrHbXgRhTOLA-d3g7Byy1lZ4c name: HTML format: full_html weight: 0 @@ -24,7 +24,7 @@ filters: status: true weight: -50 settings: - allowed_html: '