From 6e03d485bab5893c7af10c2c8bc90bbbbb9e6a27 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 8 Feb 2023 13:10:47 +0000 Subject: [PATCH] Update configuration --- composer.lock | 163 +++++++++--------- ...m_display.paragraph.event_list.default.yml | 41 ++++- ...w_display.paragraph.event_list.default.yml | 57 +++++- conf/cmi/core.extension.yml | 2 +- ...eld.paragraph.event_list.field_api_url.yml | 4 +- ...paragraph.event_list.field_event_count.yml | 25 +++ ...agraph.event_list.field_event_location.yml | 25 +++ ....paragraph.event_list.field_event_time.yml | 25 +++ ...paragraph.event_list.field_free_events.yml | 25 +++ ...ragraph.event_list.field_remote_events.yml | 25 +++ ...ld.storage.paragraph.field_event_count.yml | 23 +++ ...storage.paragraph.field_event_location.yml | 20 +++ ...eld.storage.paragraph.field_event_time.yml | 20 +++ ...ld.storage.paragraph.field_free_events.yml | 20 +++ ....storage.paragraph.field_remote_events.yml | 20 +++ ...eld.paragraph.event_list.field_api_url.yml | 1 - ...vent_list.field_event_list_description.yml | 2 - ...raph.event_list.field_event_list_title.yml | 2 - ...agraph.event_list.field_event_location.yml | 2 + ....paragraph.event_list.field_event_time.yml | 2 + ...paragraph.event_list.field_free_events.yml | 2 + ...ragraph.event_list.field_remote_events.yml | 2 + .../paragraphs.paragraphs_type.event_list.yml | 2 - ...vent_list.field_event_list_description.yml | 1 - ...raph.event_list.field_event_list_title.yml | 1 - docker/openshift/Dockerfile | 10 -- public/sites/default/settings.php | 3 + 27 files changed, 418 insertions(+), 107 deletions(-) create mode 100644 conf/cmi/field.field.paragraph.event_list.field_event_count.yml create mode 100644 conf/cmi/field.field.paragraph.event_list.field_event_location.yml create mode 100644 conf/cmi/field.field.paragraph.event_list.field_event_time.yml create mode 100644 conf/cmi/field.field.paragraph.event_list.field_free_events.yml create mode 100644 conf/cmi/field.field.paragraph.event_list.field_remote_events.yml create mode 100644 conf/cmi/field.storage.paragraph.field_event_count.yml create mode 100644 conf/cmi/field.storage.paragraph.field_event_location.yml create mode 100644 conf/cmi/field.storage.paragraph.field_event_time.yml create mode 100644 conf/cmi/field.storage.paragraph.field_free_events.yml create mode 100644 conf/cmi/field.storage.paragraph.field_remote_events.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_description.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml delete mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.event_list.yml delete mode 100644 conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml delete mode 100644 conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml diff --git a/composer.lock b/composer.lock index d40623cf4..b2d6b6074 100644 --- a/composer.lock +++ b/composer.lock @@ -2776,16 +2776,16 @@ }, { "name": "drupal/core", - "version": "9.5.2", + "version": "9.5.3", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6" + "reference": "67e34a5e8f48cafdd5c26e778a9570860e2d44a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6", - "reference": "2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6", + "url": "https://api.github.com/repos/drupal/core/zipball/67e34a5e8f48cafdd5c26e778a9570860e2d44a5", + "reference": "67e34a5e8f48cafdd5c26e778a9570860e2d44a5", "shasum": "" }, "require": { @@ -2937,9 +2937,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.2" + "source": "https://github.com/drupal/core/tree/9.5.3" }, - "time": "2023-01-18T12:48:20+00:00" + "time": "2023-02-01T19:47:31+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2993,16 +2993,16 @@ }, { "name": "drupal/core-recommended", - "version": "9.5.2", + "version": "9.5.3", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "eab84e96280017f11e0dfba7f9995facaa803d13" + "reference": "3dc8d9757c6c4a0457d32dd58a755532504ad959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/eab84e96280017f11e0dfba7f9995facaa803d13", - "reference": "eab84e96280017f11e0dfba7f9995facaa803d13", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3dc8d9757c6c4a0457d32dd58a755532504ad959", + "reference": "3dc8d9757c6c4a0457d32dd58a755532504ad959", "shasum": "" }, "require": { @@ -3011,7 +3011,7 @@ "doctrine/annotations": "~1.13.3", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.5.2", + "drupal/core": "9.5.3", "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.2", @@ -3042,7 +3042,7 @@ "symfony/event-dispatcher-contracts": "~v1.1.13", "symfony/http-client-contracts": "~v2.5.2", "symfony/http-foundation": "~v4.4.49", - "symfony/http-kernel": "~v4.4.49", + "symfony/http-kernel": "~v4.4.50", "symfony/mime": "~v5.4.13", "symfony/polyfill-ctype": "~v1.27.0", "symfony/polyfill-iconv": "~v1.27.0", @@ -3058,7 +3058,7 @@ "symfony/translation": "~v4.4.47", "symfony/translation-contracts": "~v2.5.2", "symfony/validator": "~v4.4.48", - "symfony/var-dumper": "~v5.4.14", + "symfony/var-dumper": "~v5.4.19", "symfony/yaml": "~v4.4.45", "twig/twig": "~v2.15.4", "typo3/phar-stream-wrapper": "~v3.1.7" @@ -3073,9 +3073,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.5.2" + "source": "https://github.com/drupal/core-recommended/tree/9.5.3" }, - "time": "2023-01-18T12:48:20+00:00" + "time": "2023-02-01T19:47:31+00:00" }, { "name": "drupal/crop", @@ -3968,17 +3968,17 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta8", + "version": "2.0.0-beta10", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta8" + "reference": "8.x-2.0-beta10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta8.zip", - "reference": "8.x-2.0-beta8", - "shasum": "02985c643f5283793e753f8cbdeaa0ec40250cf3" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta10.zip", + "reference": "8.x-2.0-beta10", + "shasum": "4f92b703ee9e8e75e74a11e6623de258fedd025c" }, "require": { "drupal/core": "^9.1 || ^10" @@ -3998,8 +3998,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta8", - "datestamp": "1674236921", + "version": "8.x-2.0-beta10", + "datestamp": "1675792917", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4786,16 +4786,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.15", + "version": "4.4.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "7164a22af2de5c5326286a5ae85328ed408515dd" + "reference": "926a5c04b566161c55f9e81a19e8f2563c4e0a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7164a22af2de5c5326286a5ae85328ed408515dd", - "reference": "7164a22af2de5c5326286a5ae85328ed408515dd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/926a5c04b566161c55f9e81a19e8f2563c4e0a44", + "reference": "926a5c04b566161c55f9e81a19e8f2563c4e0a44", "shasum": "" }, "require": { @@ -4810,10 +4810,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.15", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-01-20T07:15:06+00:00" + "time": "2023-02-08T13:07:42+00:00" }, { "name": "drupal/hdbt_admin", @@ -5097,16 +5097,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.16.7", + "version": "2.17.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "05ca0d86904a21403d610012f239f362ccb5ca42" + "reference": "fec20fea5fc618d82663a1cf713205b2d52cdfc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/05ca0d86904a21403d610012f239f362ccb5ca42", - "reference": "05ca0d86904a21403d610012f239f362ccb5ca42", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fec20fea5fc618d82663a1cf713205b2d52cdfc8", + "reference": "fec20fea5fc618d82663a1cf713205b2d52cdfc8", "shasum": "" }, "require": { @@ -5217,10 +5217,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-01-27T07:26:28+00:00" + "time": "2023-02-07T08:19:58+00:00" }, { "name": "drupal/helfi_proxy", @@ -5952,17 +5952,17 @@ }, { "name": "drupal/matomo_reports", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/matomo_reports.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/matomo_reports-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "b1bda0972c499867eef84acc753eff496c49ae1f" + "url": "https://ftp.drupal.org/files/projects/matomo_reports-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "570c08c12e3265e416a6d3d6af8df658520436de" }, "require": { "drupal/core": "^9 || ^10" @@ -5970,8 +5970,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1660363700", + "version": "8.x-1.3", + "datestamp": "1675437285", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8194,6 +8194,10 @@ { "name": "jsobiecki", "homepage": "https://www.drupal.org/user/112744" + }, + { + "name": "wiktorb", + "homepage": "https://www.drupal.org/user/762836" } ], "description": "This module enables support for translation of link field in menu_link_content entity.", @@ -10911,16 +10915,16 @@ }, { "name": "makinacorpus/php-lucene", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/makinacorpus/php-lucene-query.git", - "reference": "9ed20290de24cd7af05b4d465813be5541422067" + "reference": "87d606b1e475d105eac5e409f84ba2d2ee1358c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/makinacorpus/php-lucene-query/zipball/9ed20290de24cd7af05b4d465813be5541422067", - "reference": "9ed20290de24cd7af05b4d465813be5541422067", + "url": "https://api.github.com/repos/makinacorpus/php-lucene-query/zipball/87d606b1e475d105eac5e409f84ba2d2ee1358c4", + "reference": "87d606b1e475d105eac5e409f84ba2d2ee1358c4", "shasum": "" }, "require": { @@ -10958,9 +10962,9 @@ "homepage": "http://github.com/makinacorpus/php-lucene", "support": { "issues": "https://github.com/makinacorpus/php-lucene-query/issues", - "source": "https://github.com/makinacorpus/php-lucene-query/tree/1.2.0" + "source": "https://github.com/makinacorpus/php-lucene-query/tree/1.2.1" }, - "time": "2022-09-06T13:39:15+00:00" + "time": "2023-02-02T16:28:25+00:00" }, { "name": "masterminds/html5", @@ -13673,16 +13677,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.19", + "version": "v5.4.20", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "0c22562d0601e19bd01c4480893f5438e6b12db5" + "reference": "b4d936b657c7952a41e89efd0ddcea51f8c90f34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/0c22562d0601e19bd01c4480893f5438e6b12db5", - "reference": "0c22562d0601e19bd01c4480893f5438e6b12db5", + "url": "https://api.github.com/repos/symfony/http-client/zipball/b4d936b657c7952a41e89efd0ddcea51f8c90f34", + "reference": "b4d936b657c7952a41e89efd0ddcea51f8c90f34", "shasum": "" }, "require": { @@ -13740,7 +13744,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.19" + "source": "https://github.com/symfony/http-client/tree/v5.4.20" }, "funding": [ { @@ -13756,7 +13760,7 @@ "type": "tidelift" } ], - "time": "2023-01-12T15:47:53+00:00" + "time": "2023-01-25T18:32:18+00:00" }, { "name": "symfony/http-client-contracts", @@ -13906,16 +13910,16 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.49", + "version": "v4.4.50", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4" + "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4e36db8103062c62b3882b1bd297b02de6b021c4", - "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa6df6c045f034aa13ac752fc234bb300b9488ef", + "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef", "shasum": "" }, "require": { @@ -13990,7 +13994,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.49" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.50" }, "funding": [ { @@ -14006,7 +14010,7 @@ "type": "tidelift" } ], - "time": "2022-11-28T17:58:43+00:00" + "time": "2023-02-01T08:01:31+00:00" }, { "name": "symfony/mime", @@ -17781,20 +17785,20 @@ }, { "name": "phpspec/prophecy", - "version": "v1.16.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359" + "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be8cac52a0827776ff9ccda8c381ac5b71aeb359", - "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/15873c65b207b07765dbc3c95d20fdf4a320cbe2", + "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.2", + "doctrine/instantiator": "^1.2 || ^2.0", "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", @@ -17802,6 +17806,7 @@ }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", + "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", @@ -17842,9 +17847,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.16.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.17.0" }, - "time": "2022-11-29T15:06:56+00:00" + "time": "2023-02-02T15:41:36+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -18884,16 +18889,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -18935,7 +18940,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -18943,7 +18948,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -19257,16 +19262,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -19305,10 +19310,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -19316,7 +19321,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", diff --git a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml index 4568bae3e..2ba42591a 100644 --- a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml @@ -1,18 +1,23 @@ -uuid: e478d84e-0e63-4c35-ba22-4db0f1f2fe54 +uuid: 4c5d5765-e436-4d83-91d8-928e5e0362a0 langcode: en status: true dependencies: config: - field.field.paragraph.event_list.field_api_url + - field.field.paragraph.event_list.field_event_count - field.field.paragraph.event_list.field_event_list_description - field.field.paragraph.event_list.field_event_list_title + - field.field.paragraph.event_list.field_event_location + - field.field.paragraph.event_list.field_event_time + - field.field.paragraph.event_list.field_free_events - field.field.paragraph.event_list.field_load_more + - field.field.paragraph.event_list.field_remote_events - paragraphs.paragraphs_type.event_list module: - link - text _core: - default_config_hash: Tyi9wGAv2OWtaU056U3LSPa3HhdiWSFnd1nZqhZNC8k + default_config_hash: bGb0ZQ38-NxHtZ1rrdqclYHeStlwA5q3ucy5Wpnb0ng id: paragraph.event_list.default targetEntityType: paragraph bundle: event_list @@ -26,6 +31,12 @@ content: placeholder_url: '' placeholder_title: '' third_party_settings: { } + field_event_count: + type: options_select + weight: 4 + region: content + settings: { } + third_party_settings: { } field_event_list_description: type: text_textarea weight: 1 @@ -42,13 +53,35 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_load_more: + field_event_location: + type: boolean_checkbox + weight: 4 + region: content + settings: + display_label: true + third_party_settings: { } + field_event_time: + type: boolean_checkbox + weight: 5 + region: content + settings: + display_label: true + third_party_settings: { } + field_free_events: + type: boolean_checkbox + weight: 7 + region: content + settings: + display_label: true + third_party_settings: { } + field_remote_events: type: boolean_checkbox - weight: 3 + weight: 6 region: content settings: display_label: true third_party_settings: { } hidden: created: true + field_load_more: true status: true diff --git a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml index 82202cd4c..4a8f6bbac 100644 --- a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml @@ -1,22 +1,35 @@ -uuid: f4d6607c-e8dd-4c31-b4c7-1309356cdbf2 +uuid: 591c90c8-42a5-4760-9a8c-b4bc6a309138 langcode: en status: true dependencies: config: - field.field.paragraph.event_list.field_api_url + - field.field.paragraph.event_list.field_event_count - field.field.paragraph.event_list.field_event_list_description - field.field.paragraph.event_list.field_event_list_title + - field.field.paragraph.event_list.field_event_location + - field.field.paragraph.event_list.field_event_time + - field.field.paragraph.event_list.field_free_events - field.field.paragraph.event_list.field_load_more + - field.field.paragraph.event_list.field_remote_events - paragraphs.paragraphs_type.event_list module: + - options - text _core: - default_config_hash: 9xAT4OL9SGihyabuUdNlviQpCUdo09jo96OyzIZe-v8 + default_config_hash: dMZ_8jKpOaA7CkuxlB2baa1apQcQ_vFlXM04jq4bqQY id: paragraph.event_list.default targetEntityType: paragraph bundle: event_list mode: default content: + field_event_count: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content field_event_list_description: type: text_default label: hidden @@ -32,6 +45,46 @@ content: third_party_settings: { } weight: 0 region: content + field_event_location: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 2 + region: content + field_event_time: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 3 + region: content + field_free_events: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 5 + region: content + field_remote_events: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 4 + region: content hidden: field_api_url: true field_load_more: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index d5fd30b93..4e0deb983 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -55,7 +55,6 @@ module: helfi_contact_cards: 0 helfi_content: 0 helfi_etusivu: 0 - helfi_events: 0 helfi_gdpr_compliance: 0 helfi_global_navigation: 0 helfi_languages: 0 @@ -67,6 +66,7 @@ module: helfi_news_item: 0 helfi_platform_config: 0 helfi_proxy: 0 + helfi_react_search: 0 helfi_toc: 0 helfi_tunnistamo: 0 image: 0 diff --git a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml index ed84f7dcb..8c3aa21c7 100644 --- a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml +++ b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml @@ -8,13 +8,13 @@ dependencies: module: - link _core: - default_config_hash: nkKsGw0gRWVU1GwZugGKaiSe3OoNrBjDpoUXkkt457Y + default_config_hash: lGeClo15Zf7kvOo9oZobBROAy8-TnAFRtIwnSvDIArY id: paragraph.event_list.field_api_url field_name: field_api_url entity_type: paragraph bundle: event_list label: 'Api URL' -description: 'Add URL from tapahtumat.hel.fi to form a list of events' +description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum' required: false translatable: false default_value: { } diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_count.yml b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml new file mode 100644 index 000000000..f57f8fe40 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml @@ -0,0 +1,25 @@ +uuid: 83fedf86-21c3-4989-84c1-190fdfeb69a4 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_event_count + - paragraphs.paragraphs_type.event_list + module: + - options +_core: + default_config_hash: 6AMaHxUxptC9tDiCGTiCpFWXBHfR4tUUSdMY9Q5BD6Q +id: paragraph.event_list.field_event_count +field_name: field_event_count +entity_type: paragraph +bundle: event_list +label: 'Event count' +description: '' +required: false +translatable: false +default_value: + - + value: 3 +default_value_callback: '' +settings: { } +field_type: list_integer diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml new file mode 100644 index 000000000..6afaf27e6 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml @@ -0,0 +1,25 @@ +uuid: c4796781-d6eb-4376-a26f-76b8ad5ac48f +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_event_location + - paragraphs.paragraphs_type.event_list +_core: + default_config_hash: qn_ofDevCfu_ZKP8n6kRAQFTmy0cRAXNJUvxS6mU-6Q +id: paragraph.event_list.field_event_location +field_name: field_event_location +entity_type: paragraph +bundle: event_list +label: 'Event location' +description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter.' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'Yes' + off_label: 'No' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_time.yml b/conf/cmi/field.field.paragraph.event_list.field_event_time.yml new file mode 100644 index 000000000..7bf11d426 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_event_time.yml @@ -0,0 +1,25 @@ +uuid: 32ef825d-f843-4741-996c-1ed4ce703f05 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_event_time + - paragraphs.paragraphs_type.event_list +_core: + default_config_hash: w4dBFRcLBALwVLbGirmkj4Hjs08twZZqv8I9E7aVBtc +id: paragraph.event_list.field_event_time +field_name: field_event_time +entity_type: paragraph +bundle: event_list +label: 'Event time' +description: 'Show "event time" filter.' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'Yes' + off_label: 'No' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.event_list.field_free_events.yml b/conf/cmi/field.field.paragraph.event_list.field_free_events.yml new file mode 100644 index 000000000..6e4a44a28 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_free_events.yml @@ -0,0 +1,25 @@ +uuid: 1be8a054-1cbe-47b3-b0f7-68c7846c628f +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_free_events + - paragraphs.paragraphs_type.event_list +_core: + default_config_hash: 43RWM8pRAJy3tpuEGjFEy4ghMhQoCznir0O2015s_hc +id: paragraph.event_list.field_free_events +field_name: field_free_events +entity_type: paragraph +bundle: event_list +label: 'Free events' +description: 'Show "list only free events" filter.' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'Yes' + off_label: 'No' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml b/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml new file mode 100644 index 000000000..1ac2fea14 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml @@ -0,0 +1,25 @@ +uuid: 80d56c2f-875a-4f13-921f-3fb0ed40f5e7 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_remote_events + - paragraphs.paragraphs_type.event_list +_core: + default_config_hash: FDxBxbAJWFx6CgcYVHtJc0CDYvMvy04Xqib_pWDlUhA +id: paragraph.event_list.field_remote_events +field_name: field_remote_events +entity_type: paragraph +bundle: event_list +label: 'Remote events' +description: 'Show "list only remote events" filter. Do not use at the same time with the "Event location" filter.' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'Yes' + off_label: 'No' +field_type: boolean diff --git a/conf/cmi/field.storage.paragraph.field_event_count.yml b/conf/cmi/field.storage.paragraph.field_event_count.yml new file mode 100644 index 000000000..ac836daed --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_event_count.yml @@ -0,0 +1,23 @@ +uuid: 9fc48990-ccae-4fd4-af39-324b44e916f4 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +_core: + default_config_hash: hBBiCFVuAo4fqyN3hPC1a3bTN4NTlur6kQQWxerTJWo +id: paragraph.field_event_count +field_name: field_event_count +entity_type: paragraph +type: list_integer +settings: + allowed_values: { } + allowed_values_function: helfi_react_search_event_list_allowed_values_function +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_event_location.yml b/conf/cmi/field.storage.paragraph.field_event_location.yml new file mode 100644 index 000000000..b44eab094 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_event_location.yml @@ -0,0 +1,20 @@ +uuid: cbab7408-8b6d-4a43-8f49-d2da702768cc +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: 9QFvQBbGdxgnHfEbMcWzk_rKsyyO1Ru3Z-rbibJxXyc +id: paragraph.field_event_location +field_name: field_event_location +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_event_time.yml b/conf/cmi/field.storage.paragraph.field_event_time.yml new file mode 100644 index 000000000..305501303 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_event_time.yml @@ -0,0 +1,20 @@ +uuid: 0f3e5e56-42f5-4efa-938b-556f180c2753 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: 9uolLTKIUim2fFfw-TdKiTsGrbGqMm39Hm6Th550A8Y +id: paragraph.field_event_time +field_name: field_event_time +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_free_events.yml b/conf/cmi/field.storage.paragraph.field_free_events.yml new file mode 100644 index 000000000..f01332a0e --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_free_events.yml @@ -0,0 +1,20 @@ +uuid: c374c066-d19b-439f-ad75-27da9bb50759 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: hPJQzln2lCxDafr1ScV1qrmPk0VLFLWnpa3D6OE_Ic4 +id: paragraph.field_free_events +field_name: field_free_events +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_remote_events.yml b/conf/cmi/field.storage.paragraph.field_remote_events.yml new file mode 100644 index 000000000..47a752301 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_remote_events.yml @@ -0,0 +1,20 @@ +uuid: 794189fd-1d54-40ca-a0ed-38758fbffd72 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: 6cFoYiYWY2E057QJBuHDjkuiifNRl-Bqkt9Zr9c1Zvc +id: paragraph.field_remote_events +field_name: field_remote_events +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/language/fi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml deleted file mode 100644 index 84bd65316..000000000 --- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml +++ /dev/null @@ -1 +0,0 @@ -description: 'Tapahtumat.hel.fi-osoite, jonka perusteella listaus muodostetaan.' diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_description.yml deleted file mode 100644 index bda75a226..000000000 --- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_description.yml +++ /dev/null @@ -1,2 +0,0 @@ -label: Kuvaus -description: 'Lyhyt kuvaus listauksessa esiintyvistä tapahtumista.' diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_title.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_title.yml deleted file mode 100644 index 503d13870..000000000 --- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_list_title.yml +++ /dev/null @@ -1,2 +0,0 @@ -label: Otsikko -description: 'Listauksen otsikko' diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml new file mode 100644 index 000000000..9cc3d0cd2 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml @@ -0,0 +1,2 @@ +label: Tapahtumapaikka +description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa.' diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml new file mode 100644 index 000000000..cadd9471e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml @@ -0,0 +1,2 @@ +label: Ajankohta +description: 'Näytä "ajankohta" -suodatin.' diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml new file mode 100644 index 000000000..d0e4ed973 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml @@ -0,0 +1,2 @@ +label: 'Maksuttomat tapahtumat' +description: 'Näytä "näytä vain maksuttomat tapahtumat" -suodatin.' diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml new file mode 100644 index 000000000..99f041ab5 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml @@ -0,0 +1,2 @@ +label: Etätapahtumat +description: 'Näytä "näytä vain etätapahtumat" -suodatin. Älä käytä yhtä aikaa "Tapahtumapaikka" -suodattimen kanssa.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.event_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.event_list.yml deleted file mode 100644 index 21bfff6c2..000000000 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.event_list.yml +++ /dev/null @@ -1,2 +0,0 @@ -label: Tapahtumat -description: 'Luo listaus tapahtumista LinkedEvents-datan perusteella.' diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml deleted file mode 100644 index 45893182c..000000000 --- a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml +++ /dev/null @@ -1 +0,0 @@ -label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml deleted file mode 100644 index 2711e04da..000000000 --- a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml +++ /dev/null @@ -1 +0,0 @@ -label: Titel diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index 45498ebb0..16e12dea9 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -1,16 +1,6 @@ ARG DRUPAL_DOCKER_TAG=8.1 FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG} -RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ - && architecture=$(uname -m) \ - && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/alpine/$architecture/$version \ - && mkdir -p /tmp/blackfire \ - && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \ - && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \ - && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://127.0.0.1:8307\n" > /etc/php81/conf.d/blackfire.ini \ - && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz - - COPY / /var/www/html/ WORKDIR /var/www/html RUN composer install --no-progress --profile --prefer-dist --no-interaction --no-dev --optimize-autoloader diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 190b16c41..f26949376 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -25,6 +25,9 @@ 'driver' => 'mysql', 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_swedish_ci', + 'init_commands' => [ + 'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED', + ], ]; $settings['hash_salt'] = getenv('DRUPAL_HASH_SALT') ?: '000';