From c414eb0ab8396624650ca2204d33ad3b633ba776 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Mon, 23 Oct 2023 09:17:01 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 1 + composer.lock | 222 ++++++++++++------ ...form_display.tpr_unit.tpr_unit.default.yml | 88 ++++--- ...view_display.tpr_unit.tpr_unit.default.yml | 12 +- ...view_display.tpr_unit.tpr_unit.minimal.yml | 3 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 3 +- ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 3 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 3 +- ...ternal_entity_type.helfi_announcements.yml | 2 +- conf/cmi/user.role.admin.yml | 2 - .../cmi/views.view.editoria11y_dismissals.yml | 1 + conf/cmi/views.view.editoria11y_results.yml | 1 + docker-compose.yml | 4 +- tools/make/project/install.mk | 5 + 14 files changed, 230 insertions(+), 120 deletions(-) create mode 100644 .platform/schema diff --git a/.platform/schema b/.platform/schema new file mode 100644 index 000000000..d8263ee98 --- /dev/null +++ b/.platform/schema @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/composer.lock b/composer.lock index 57190bf38..0d7b216bd 100644 --- a/composer.lock +++ b/composer.lock @@ -760,16 +760,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.3.1", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "f65524e9ecd2bd0021c4b18710005caaa6dcbd86" + "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/f65524e9ecd2bd0021c4b18710005caaa6dcbd86", - "reference": "f65524e9ecd2bd0021c4b18710005caaa6dcbd86", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/06711568b4cd169700ff7e8075db0a9a341ceb58", + "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58", "shasum": "" }, "require": { @@ -808,9 +808,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.3.1" + "source": "https://github.com/consolidation/output-formatters/tree/4.3.2" }, - "time": "2023-05-20T03:23:06+00:00" + "time": "2023-07-06T04:45:41+00:00" }, { "name": "consolidation/robo", @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.17", + "version": "5.6.22", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "227d2cc22318ad706d4c75417478423ea6c35ce2" + "reference": "d28f8bf7135f1e0e59c4679c977fbafafbe3add5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/227d2cc22318ad706d4c75417478423ea6c35ce2", - "reference": "227d2cc22318ad706d4c75417478423ea6c35ce2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d28f8bf7135f1e0e59c4679c977fbafafbe3add5", + "reference": "d28f8bf7135f1e0e59c4679c977fbafafbe3add5", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.17", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.22", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-11T13:04:35+00:00" + "time": "2023-10-19T13:07:34+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3870,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.7", + "version": "2.5.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "8f39f1d33757ca36623b4e223138357e39d388c6" + "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/8f39f1d33757ca36623b4e223138357e39d388c6", - "reference": "8f39f1d33757ca36623b4e223138357e39d388c6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/c8ed69e045bae960fff5b71179d09f62ea53651a", + "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a", "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.5.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-10-05T13:06:46+00:00" + "time": "2023-10-18T05:44:50+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3955,16 +3955,41 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc" + "reference": "4b78f15679d99b14dec7a62e593c2c8001f15cfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/8dfd9dda99f0934070119547e7f950d3f90a9ebc", - "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/4b78f15679d99b14dec7a62e593c2c8001f15cfa", + "reference": "4b78f15679d99b14dec7a62e593c2c8001f15cfa", "shasum": "" }, + "require": { + "drush/drush": "^10 || ^11 || ^12" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "drupal/coder": "^8.3", + "phpspec/prophecy-phpunit": "^2", + "phpunit/phpunit": "^9.6" + }, "default-branch": true, "type": "drupal-drush", + "autoload": { + "psr-4": { + "DrupalTools\\": "src" + }, + "files": [ + "src/Update/migrations.php" + ] + }, + "autoload-dev": { + "psr-4": { + "DrupalToolsTest\\": "tests/fixtures" + }, + "files": [ + "tests/fixtures/migration_fixture.php" + ] + }, "license": [ "GPL-2.0-or-later" ], @@ -3973,7 +3998,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-09-26T09:45:28+00:00" + "time": "2023-10-16T07:36:56+00:00" }, { "name": "drupal/helfi_navigation", @@ -4011,16 +4036,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.25", + "version": "3.4.31", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "68e859125538f820eb264a21342ad1fddc094b11" + "reference": "6f7082c57b0a2df3c9896d8d4e58ec2e4069847c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/68e859125538f820eb264a21342ad1fddc094b11", - "reference": "68e859125538f820eb264a21342ad1fddc094b11", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6f7082c57b0a2df3c9896d8d4e58ec2e4069847c", + "reference": "6f7082c57b0a2df3c9896d8d4e58ec2e4069847c", "shasum": "" }, "require": { @@ -4029,6 +4054,7 @@ "drupal/config_ignore": "^2.3", "drupal/config_rewrite": "^1.4", "drupal/content_lock": "^2.2", + "drupal/core": "^9.5", "drupal/crop": "^2.1", "drupal/default_content": "^2.0.0-alpha2", "drupal/diff": "^1.0", @@ -4124,10 +4150,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.25", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.31", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-10-13T10:46:22+00:00" + "time": "2023-10-23T08:25:37+00:00" }, { "name": "drupal/helfi_proxy", @@ -5695,17 +5721,17 @@ }, { "name": "drupal/search_api", - "version": "1.29.0", + "version": "1.30.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.29" + "reference": "8.x-1.30" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.29.zip", - "reference": "8.x-1.29", - "shasum": "4663abbcfe5dfc159ee0886fc6c437e998fc0653" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip", + "reference": "8.x-1.30", + "shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -5726,8 +5752,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.29", - "datestamp": "1679910252", + "version": "8.x-1.30", + "datestamp": "1697366291", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5735,7 +5761,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -6143,50 +6169,92 @@ }, { "name": "drupal/stomp", - "version": "2.0.0-alpha1", + "version": "2.0.0-alpha3", "source": { "type": "git", - "url": "https://github.com/City-of-Helsinki/drupal-module-stomp.git", - "reference": "820e1f3aa23dfdce441ac827e03286528111f497" + "url": "https://git.drupalcode.org/project/stomp.git", + "reference": "2.0.0-alpha3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-stomp/zipball/820e1f3aa23dfdce441ac827e03286528111f497", - "reference": "820e1f3aa23dfdce441ac827e03286528111f497", - "shasum": "" + "url": "https://ftp.drupal.org/files/projects/stomp-2.0.0-alpha3.zip", + "reference": "2.0.0-alpha3", + "shasum": "47607b91f06437259e1b0a84b9a696340df8ce55" }, "require": { + "drupal/core": "^9 || ^10", "php": "^8.1", "stomp-php/stomp-php": "^5.0" }, + "conflict": { + "drush/drush": "<11.6" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "drupal/coder": "^8.3" + "drupal/coder": "^8.3", + "drush/drush": "^11.6 || ^12", + "jangregor/phpstan-prophecy": "dev-master", + "mglaman/phpstan-drupal": "^1.2", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "1.11.x-dev", + "phpstan/phpstan-deprecation-rules": "1.2.x-dev" }, "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-alpha3", + "datestamp": "1697289803", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0-or-later" ], + "authors": [ + { + "name": "alexpott", + "homepage": "https://www.drupal.org/user/157725" + }, + { + "name": "legovaer", + "homepage": "https://www.drupal.org/user/1327142" + }, + { + "name": "tayzlor", + "homepage": "https://www.drupal.org/user/274980" + }, + { + "name": "tsphethean", + "homepage": "https://www.drupal.org/user/881620" + }, + { + "name": "tuutti", + "homepage": "https://www.drupal.org/user/1114264" + } + ], "description": "Integrate Drupal with an external STOMP or AMQP message queue, such as ActiveMQ.", + "homepage": "https://www.drupal.org/project/stomp", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-stomp/tree/2.0.0-alpha1", - "issues": "https://github.com/City-of-Helsinki/drupal-module-stomp/issues" - }, - "time": "2023-10-06T08:19:03+00:00" + "source": "https://git.drupalcode.org/project/stomp" + } }, { "name": "drupal/token", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/token.git", - "reference": "8.x-1.12" + "reference": "8.x-1.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip", - "reference": "8.x-1.12", - "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763" + "url": "https://ftp.drupal.org/files/projects/token-8.x-1.13.zip", + "reference": "8.x-1.13", + "shasum": "f2a074b51726de3727c1d900237d6d471806a4d2" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6194,8 +6262,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.12", - "datestamp": "1688015262", + "version": "8.x-1.13", + "datestamp": "1697885927", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6203,7 +6271,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10" + "drush.services.yml": ">=9" } } }, @@ -8375,16 +8443,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { @@ -8415,7 +8483,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -8427,7 +8495,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T12:09:49+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "league/uri", @@ -8955,16 +9023,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -9005,9 +9073,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "nodespark/des-connector", @@ -10208,16 +10276,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.18", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", "shasum": "" }, "require": { @@ -10246,7 +10314,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.11.x-dev" + "dev-0.11": "0.11.x-dev" + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": false } }, "autoload": { @@ -10278,9 +10350,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" }, - "time": "2023-05-23T02:31:11+00:00" + "time": "2023-10-14T21:56:36+00:00" }, { "name": "ralouphie/getallheaders", @@ -17958,5 +18030,5 @@ "ext-libxml": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } 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 8e4acadde..a8cda2314 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 @@ -16,7 +16,7 @@ dependencies: - path - readonly_field_widget _core: - default_config_hash: eepmIYNv6ShHO0W2uVzuu18Gashz0oos8xMyfTluiMI + default_config_hash: C2Xc2BwYmiIL9SayNQLxaufcoqA5SLusFthQgnmb10A id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -24,7 +24,7 @@ mode: default content: accessibility_email: type: readonly_field_widget - weight: 9 + weight: 12 region: content settings: label: above @@ -34,7 +34,7 @@ content: third_party_settings: { } accessibility_phone: type: readonly_field_widget - weight: 8 + weight: 11 region: content settings: label: above @@ -44,7 +44,7 @@ content: third_party_settings: { } accessibility_www: type: readonly_field_widget - weight: 12 + weight: 17 region: content settings: label: above @@ -54,7 +54,7 @@ content: third_party_settings: { } address: type: readonly_field_widget - weight: 14 + weight: 19 region: content settings: label: above @@ -64,7 +64,7 @@ content: third_party_settings: { } address_postal: type: readonly_field_widget - weight: 16 + weight: 21 region: content settings: label: above @@ -74,7 +74,7 @@ content: third_party_settings: { } call_charge_info: type: readonly_field_widget - weight: 15 + weight: 20 region: content settings: label: above @@ -84,8 +84,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget + weight: 39 region: content - weight: 36 settings: label: above formatter_type: null @@ -94,7 +94,7 @@ content: third_party_settings: { } description: type: readonly_field_widget - weight: 13 + weight: 18 region: content settings: label: above @@ -104,7 +104,7 @@ content: third_party_settings: { } email: type: readonly_field_widget - weight: 7 + weight: 10 region: content settings: label: above @@ -114,7 +114,7 @@ content: third_party_settings: { } field_content: type: paragraphs - weight: 27 + weight: 28 region: content settings: title: Paragraph @@ -133,7 +133,7 @@ content: third_party_settings: { } field_lower_content: type: paragraphs - weight: 28 + weight: 29 region: content settings: title: Paragraph @@ -152,14 +152,15 @@ content: third_party_settings: { } field_metatags: type: metatag_firehose - weight: 26 + weight: 27 region: content settings: sidebar: false + use_details: true third_party_settings: { } field_unit_type: type: entity_reference_autocomplete - weight: 28 + weight: 30 region: content settings: match_operator: CONTAINS @@ -169,15 +170,15 @@ content: third_party_settings: { } hide_sidebar_navigation: type: boolean_checkbox - weight: 29 + weight: 31 region: content settings: display_label: true third_party_settings: { } highlights: type: readonly_field_widget + weight: 36 region: content - weight: 33 settings: label: above formatter_type: null @@ -193,7 +194,7 @@ content: third_party_settings: { } latitude: type: readonly_field_widget - weight: 17 + weight: 22 region: content settings: label: above @@ -203,8 +204,8 @@ content: third_party_settings: { } links: type: readonly_field_widget + weight: 33 region: content - weight: 31 settings: label: above formatter_type: null @@ -213,7 +214,7 @@ content: third_party_settings: { } longitude: type: readonly_field_widget - weight: 18 + weight: 23 region: content settings: label: above @@ -241,8 +242,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget + weight: 35 region: content - weight: 32 settings: label: above formatter_type: null @@ -251,8 +252,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget + weight: 37 region: content - weight: 34 settings: label: above formatter_type: null @@ -261,13 +262,13 @@ content: third_party_settings: { } path: type: path - weight: 11 + weight: 16 region: content settings: { } third_party_settings: { } phone: type: readonly_field_widget - weight: 6 + weight: 9 region: content settings: label: above @@ -277,7 +278,7 @@ content: third_party_settings: { } picture_url: type: readonly_field_widget - weight: 3 + weight: 5 region: content settings: label: above @@ -287,15 +288,15 @@ content: third_party_settings: { } picture_url_override: type: media_library_widget - weight: 4 + weight: 6 region: content settings: media_types: { } third_party_settings: { } price_info: type: readonly_field_widget + weight: 38 region: content - weight: 35 settings: label: above formatter_type: null @@ -304,7 +305,7 @@ content: third_party_settings: { } provided_languages: type: readonly_field_widget - weight: 30 + weight: 32 region: content settings: label: above @@ -314,7 +315,7 @@ content: third_party_settings: { } service_map_embed: type: readonly_field_widget - weight: 20 + weight: 25 region: content settings: label: above @@ -324,7 +325,7 @@ content: third_party_settings: { } services: type: readonly_field_widget - weight: 21 + weight: 26 region: content settings: label: above @@ -334,19 +335,19 @@ content: third_party_settings: { } show_www: type: boolean_checkbox - weight: 11 + weight: 15 region: content settings: display_label: true third_party_settings: { } simple_sitemap: - weight: 10 + weight: 14 region: content settings: { } third_party_settings: { } streetview_entrance_url: type: readonly_field_widget - weight: 19 + weight: 24 region: content settings: label: above @@ -354,10 +355,25 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + toc_enabled: + type: boolean_checkbox + weight: 3 + region: content + settings: + display_label: true + third_party_settings: { } + toc_title: + type: string_textfield + weight: 4 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } topical: type: readonly_field_widget + weight: 34 region: content - weight: 31 settings: label: above formatter_type: null @@ -365,13 +381,13 @@ content: show_description: false third_party_settings: { } translation: - weight: 5 + weight: 8 region: content settings: { } third_party_settings: { } unit_picture_caption: type: string_textarea - weight: 5 + weight: 7 region: content settings: rows: 5 @@ -379,7 +395,7 @@ content: third_party_settings: { } www: type: readonly_field_widget - weight: 10 + weight: 13 region: content settings: label: above 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 bbaf32758..136b7806b 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 @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: rsUs9_e1k9mgX9c276wA8WlLKzCLUoYk2npzo22UFh8 + default_config_hash: tfkOTFeDgVhyd9NcyUP7yambOlzTfsjNcKwlLHPsbhw id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -247,6 +247,16 @@ content: third_party_settings: { } weight: 16 region: content + toc_enabled: + type: boolean + label: hidden + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 2 + region: content topical: type: tpr_connection label: hidden 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 c7c3b9026..2ae63ba99 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 @@ -12,7 +12,7 @@ dependencies: - address - helfi_tpr _core: - default_config_hash: lnEuzT7rRncgL-KC-uIf6ZHGYQprRCEHpYN8WrnQUno + default_config_hash: PouCEjXDV9qruMvBHQAwEjr84IOJOn77scrXQSzvxds id: tpr_unit.tpr_unit.minimal targetEntityType: tpr_unit bundle: tpr_unit @@ -74,6 +74,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + toc_enabled: true topical: true unit_picture_caption: true 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 6ee02455b..2dbc3b990 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 @@ -14,7 +14,7 @@ dependencies: - helfi_tpr - imagecache_external _core: - default_config_hash: AoDOI9a3GINbOYGLRXgyPzlenlc4f7iHDdcaKsBT-HM + default_config_hash: 38N-rHkqJOOsX8_Ww-SmyCqRGIxVHf-0OngooKeYAVI id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -92,6 +92,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + toc_enabled: true topical: true unit_picture_caption: true 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 eb08980ec..9ffefa191 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 @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: 4Y6H4T5UpKZSpYZp9BRJvH-cgRpJ9kH2A7-uMC5cioU + default_config_hash: Ibwu6ghoi4cuIpb_xkzuwiOVxa2SoY6lX-BJnVPFSdE id: tpr_unit.tpr_unit.teaser_with_image targetEntityType: tpr_unit bundle: tpr_unit @@ -93,6 +93,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + toc_enabled: true topical: true unit_picture_caption: true 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 7b8796976..be2b0a2a2 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 @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: fg5HihHWCdwJOdmXVRbiQKj5e9jCOJd4f9lqh0xUZLM + default_config_hash: cbtj72q0WqHIiipxyV67zGXit9W_E8evc0_6J-CtIpA id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -106,6 +106,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + toc_enabled: true topical: true unit_picture_caption: true www: true diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index 566a54859..e45cfa62d 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -8,8 +8,8 @@ id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index 809087c0d..76c1d84d2 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -210,8 +210,6 @@ permissions: - 'update media' - 'update own tpr_service' - 'update own tpr_unit' - - 'update tpr_service' - - 'update tpr_unit' - 'use menu link attributes' - 'use siteimprove' - 'use siteimprove prepublish' diff --git a/conf/cmi/views.view.editoria11y_dismissals.yml b/conf/cmi/views.view.editoria11y_dismissals.yml index dcfbd24d6..5ebb58557 100644 --- a/conf/cmi/views.view.editoria11y_dismissals.yml +++ b/conf/cmi/views.view.editoria11y_dismissals.yml @@ -1,3 +1,4 @@ +uuid: 7cc712a4-ef90-44ac-b5c5-82765cd338a4 langcode: en status: true dependencies: diff --git a/conf/cmi/views.view.editoria11y_results.yml b/conf/cmi/views.view.editoria11y_results.yml index ce768f299..84276083a 100644 --- a/conf/cmi/views.view.editoria11y_results.yml +++ b/conf/cmi/views.view.editoria11y_results.yml @@ -1,3 +1,4 @@ +uuid: 3e031fae-4813-472f-b8d7-422c9c3184d7 langcode: en status: true dependencies: diff --git a/docker-compose.yml b/docker-compose.yml index c7dc6ba8b..941446d7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,8 @@ services: # Optionally, you can add this to your default environments variables to enable or disable # xdebug by default (like /etc/environments, ~/.bashrc, or ~/.zshrc). XDEBUG_ENABLE: "${XDEBUG_ENABLE:-false}" + XDEBUG_CONFIG: "${XDEBUG_CONFIG:-}" + PHP_IDE_CONFIG: "${PHP_IDE_CONFIG:-serverName=${DRUPAL_HOSTNAME}}" # DOCKERHOST: host.docker.internal # Use drush server to run functional tests, so we don't have to care about # permission or SSL issues. @@ -121,7 +123,7 @@ services: container_name: "${COMPOSE_PROJECT_NAME}-artemis" image: quay.io/artemiscloud/activemq-artemis-broker environment: - AMQ_EXTRA_ARGS: "--nio --user admin --password admin" + AMQ_EXTRA_ARGS: "--user admin --password admin" depends_on: - app networks: diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index c38be1433..03b477635 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -6,7 +6,12 @@ endif DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token') + +SYNC_TARGETS := drush-sync-db + +ifneq ($(DUMP_SQL_EXISTS),yes) SYNC_TARGETS := oc-login oc-sync +endif PHONY += oc-login oc-login: