From 9d5bd9297d987ab394d555f55f7d9966adfed392 Mon Sep 17 00:00:00 2001 From: tuutti Date: Fri, 3 Feb 2023 09:47:47 +0200 Subject: [PATCH 1/2] Create release pr automatically --- .github/workflows/auto-release-pr.yml | 21 +++++++++++++++++++++ composer.lock | 8 ++++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/auto-release-pr.yml diff --git a/.github/workflows/auto-release-pr.yml b/.github/workflows/auto-release-pr.yml new file mode 100644 index 00000000..ace630fd --- /dev/null +++ b/.github/workflows/auto-release-pr.yml @@ -0,0 +1,21 @@ +on: + push: + branches: + - dev +name: Automatic release PR +jobs: + release-pr: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 1 + - name: Create pull request + run: | + gh pr create \ + --base main \ + --head dev \ + --title "Dev to main" \ + --body "Dev to main" || true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/composer.lock b/composer.lock index 79ae957b..5686a8fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4332,12 +4332,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "65e985d3ddd45683f92076353cde65fc315e2444" + "reference": "c765d56ad201307a2085978e5d6158622f44cdc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/65e985d3ddd45683f92076353cde65fc315e2444", - "reference": "65e985d3ddd45683f92076353cde65fc315e2444", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/c765d56ad201307a2085978e5d6158622f44cdc8", + "reference": "c765d56ad201307a2085978e5d6158622f44cdc8", "shasum": "" }, "default-branch": true, @@ -4350,7 +4350,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2022-12-13T08:08:10+00:00" + "time": "2023-02-03T07:01:52+00:00" }, { "name": "drupal/helfi_hauki", From ca1806488d84b49362397dbe0ff1b044cdf3f280 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 8 Feb 2023 13:10:40 +0000 Subject: [PATCH 2/2] Update configuration --- composer.lock | 143 +++++++++--------- ...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 - public/sites/default/settings.php | 3 + 24 files changed, 406 insertions(+), 87 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 diff --git a/composer.lock b/composer.lock index 5686a8fe..19c7a4bc 100644 --- a/composer.lock +++ b/composer.lock @@ -3292,17 +3292,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" @@ -3322,8 +3322,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." @@ -4110,16 +4110,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.16", + "version": "4.4.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "fbea10b0175d6b212c78ffa997e003926d7788f8" + "reference": "926a5c04b566161c55f9e81a19e8f2563c4e0a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/fbea10b0175d6b212c78ffa997e003926d7788f8", - "reference": "fbea10b0175d6b212c78ffa997e003926d7788f8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/926a5c04b566161c55f9e81a19e8f2563c4e0a44", + "reference": "926a5c04b566161c55f9e81a19e8f2563c4e0a44", "shasum": "" }, "require": { @@ -4134,10 +4134,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.16", + "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-02-01T13:27:28+00:00" + "time": "2023-02-08T13:07:42+00:00" }, { "name": "drupal/hdbt_admin", @@ -4489,16 +4489,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.16.9", + "version": "2.17.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "29eedf2f953fe52eda746b1971098d05ee1c8d7e" + "reference": "fec20fea5fc618d82663a1cf713205b2d52cdfc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/29eedf2f953fe52eda746b1971098d05ee1c8d7e", - "reference": "29eedf2f953fe52eda746b1971098d05ee1c8d7e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fec20fea5fc618d82663a1cf713205b2d52cdfc8", + "reference": "fec20fea5fc618d82663a1cf713205b2d52cdfc8", "shasum": "" }, "require": { @@ -4609,10 +4609,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.9", + "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-02-02T08:04:08+00:00" + "time": "2023-02-07T08:19:58+00:00" }, { "name": "drupal/helfi_proxy", @@ -5091,17 +5091,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" @@ -5109,8 +5109,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" @@ -9273,16 +9273,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": { @@ -9320,9 +9320,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", @@ -14979,30 +14979,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^11", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -15029,7 +15029,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -15045,7 +15045,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:15:36+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "drupal/coder", @@ -15800,20 +15800,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", @@ -15821,6 +15821,7 @@ }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", + "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", @@ -15861,9 +15862,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", @@ -16748,16 +16749,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": { @@ -16799,7 +16800,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": [ { @@ -16807,7 +16808,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -17121,16 +17122,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": { @@ -17169,10 +17170,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": [ { @@ -17180,7 +17181,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -17239,16 +17240,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -17283,7 +17284,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -17291,7 +17292,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", 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 4568bae3..c034ad11 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: a5c8253a-0306-4011-849d-c683d35b082c 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 d614dd79..0a6f09ca 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: eb2af14b-70cb-4024-ab10-50231754d71b 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 e591ea03..e5cfaf04 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -53,7 +53,6 @@ module: helfi_charts: 0 helfi_contact_cards: 0 helfi_content: 0 - helfi_events: 0 helfi_gdpr_compliance: 0 helfi_languages: 0 helfi_media: 0 @@ -64,6 +63,7 @@ module: helfi_news_item: 0 helfi_platform_config: 0 helfi_proxy: 0 + helfi_react_search: 0 helfi_siteimprove_config: 0 helfi_toc: 0 helfi_tpr: 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 ed84f7dc..8c3aa21c 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 00000000..2041e041 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml @@ -0,0 +1,25 @@ +uuid: 60d52669-4c63-4494-a723-e3bbec54aeb6 +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 00000000..63caffe9 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml @@ -0,0 +1,25 @@ +uuid: 6f999d19-e896-4e2a-8ede-fe4741172e5d +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 00000000..5872a234 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_event_time.yml @@ -0,0 +1,25 @@ +uuid: d7b6f6d4-4efa-462b-a024-2cad97ef9661 +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 00000000..a9d250a2 --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_free_events.yml @@ -0,0 +1,25 @@ +uuid: d119de57-4367-44af-bfb1-b2ed5815cf27 +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 00000000..9ae1579a --- /dev/null +++ b/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml @@ -0,0 +1,25 @@ +uuid: a1db611f-3756-4abb-9c44-231046ed94c7 +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 00000000..c9523b7f --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_event_count.yml @@ -0,0 +1,23 @@ +uuid: 85f5a1f7-0415-44c7-9e03-1ccca65b2a2c +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 00000000..8be6c5b8 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_event_location.yml @@ -0,0 +1,20 @@ +uuid: 72335eda-cd9b-4473-a1fc-cb50deb7603f +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 00000000..c7e4587d --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_event_time.yml @@ -0,0 +1,20 @@ +uuid: 7289bc82-f508-4651-82e5-105e93240e61 +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 00000000..36f23768 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_free_events.yml @@ -0,0 +1,20 @@ +uuid: 44dfbae7-24ad-4dc8-be03-48ac60416faf +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 00000000..f15cca47 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_remote_events.yml @@ -0,0 +1,20 @@ +uuid: 1523ef6c-7b90-467d-8ab5-0e3a8cd3d69a +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 84bd6531..00000000 --- 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 bda75a22..00000000 --- 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 503d1387..00000000 --- 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 00000000..9cc3d0cd --- /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 00000000..cadd9471 --- /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 00000000..d0e4ed97 --- /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 00000000..99f041ab --- /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 21bfff6c..00000000 --- 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/public/sites/default/settings.php b/public/sites/default/settings.php index 190b16c4..f2694937 100755 --- 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';