From e94bf15293cd469a0ff80c6bca5a5490694bea1a Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 4 Apr 2023 07:03:10 +0000 Subject: [PATCH 1/2] Update configuration --- composer.lock | 149 +++++++++--------- ...display.paragraph.service_list.default.yml | 2 + ....paragraph.service_list_search.default.yml | 2 + ..._display.paragraph.unit_search.default.yml | 2 +- ...isplay.tpr_service.tpr_service.default.yml | 2 +- ...form_display.tpr_unit.tpr_unit.default.yml | 2 +- ...display.paragraph.service_list.default.yml | 2 + ....paragraph.service_list_search.default.yml | 2 + ..._display.paragraph.unit_search.default.yml | 2 +- ...and_service.tpr_errand_service.default.yml | 2 + ...isplay.tpr_service.tpr_service.default.yml | 2 +- ...display.tpr_service.tpr_service.teaser.yml | 2 +- ...rvice.tpr_service.teaser_search_result.yml | 16 +- ...ce_channel.tpr_service_channel.default.yml | 2 + ...view_display.tpr_unit.tpr_unit.default.yml | 3 +- ...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 + ..._mode.tpr_service.teaser_search_result.yml | 2 + ...core.entity_view_mode.tpr_unit.minimal.yml | 2 + .../core.entity_view_mode.tpr_unit.token.yml | 2 + ....entity_view_mode.tpr_unit.wide_teaser.yml | 2 + .../field.field.node.page.field_content.yml | 5 + ...ce_list.field_service_list_description.yml | 2 + ...rvice_list.field_service_list_services.yml | 2 + ....service_list.field_service_list_title.yml | 2 + ..._search.field_service_list_description.yml | 2 + ..._search.field_service_list_service_ids.yml | 2 + ...ist_search.field_service_list_services.yml | 2 + ...e_list_search.field_service_list_title.yml | 2 + ....tpr_service.tpr_service.field_content.yml | 2 + ...ervice.tpr_service.field_lower_content.yml | 2 +- ...vice.tpr_service.field_sidebar_content.yml | 2 + ....field.tpr_unit.tpr_unit.field_content.yml | 2 +- ...ield.tpr_unit.tpr_unit.field_districts.yml | 2 + ....tpr_unit.tpr_unit.field_lower_content.yml | 2 +- ...ield.tpr_unit.tpr_unit.field_unit_type.yml | 2 + ...ragraph.field_service_list_description.yml | 2 + ...ragraph.field_service_list_service_ids.yml | 2 + ....paragraph.field_service_list_services.yml | 2 + ...age.paragraph.field_service_list_title.yml | 4 +- ...aragraph.field_unit_search_meta_button.yml | 2 +- ...paragraph.field_unit_search_meta_label.yml | 2 +- ...graph.field_unit_search_meta_placehold.yml | 2 +- ...rage.paragraph.field_unit_search_title.yml | 2 +- ...rage.tpr_service.field_sidebar_content.yml | 2 + ...field.storage.tpr_unit.field_districts.yml | 2 + ...field.storage.tpr_unit.field_unit_type.yml | 2 + ...ntent_settings.taxonomy_term.unit_type.yml | 2 + ..._display.paragraph.unit_search.default.yml | 4 + .../metatag.metatag_defaults.tpr_service.yml | 3 +- .../cmi/metatag.metatag_defaults.tpr_unit.yml | 2 +- ...aragraphs.paragraphs_type.service_list.yml | 2 + ...hs.paragraphs_type.service_list_search.yml | 2 + ...ttings.default.tpr_service.tpr_service.yml | 2 + ...dle_settings.default.tpr_unit.tpr_unit.yml | 2 + conf/cmi/taxonomy.vocabulary.unit_type.yml | 2 + conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 + conf/cmi/views.view.locked_units.yml | 2 + conf/cmi/views.view.service_list.yml | 4 + conf/cmi/views.view.service_units.yml | 2 + .../views.view.tpr_errand_service_list.yml | 15 +- .../views.view.tpr_service_channel_list.yml | 15 +- conf/cmi/views.view.tpr_service_list.yml | 12 ++ conf/cmi/views.view.tpr_unit_list.yml | 51 +++++- conf/cmi/views.view.unit_search.yml | 2 + conf/cmi/views.view.unit_services.yml | 2 + docker-compose.yml | 2 +- 70 files changed, 289 insertions(+), 112 deletions(-) create mode 100644 conf/cmi/language/sv/core.entity_form_display.paragraph.unit_search.default.yml diff --git a/composer.lock b/composer.lock index f35327ae..dfdf10b3 100644 --- a/composer.lock +++ b/composer.lock @@ -2649,17 +2649,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.0.10", + "version": "2.0.12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.0.10" + "reference": "2.0.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.10.zip", - "reference": "2.0.10", - "shasum": "58dd5d8d16ffb8f46c844f8b5a89e62e51a69f95" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.12.zip", + "reference": "2.0.12", + "shasum": "e0e584a2f409709f4547dfe9cc7376a80f8fa317" }, "require": { "drupal/core": "^9 || ^10" @@ -2667,8 +2667,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.10", - "datestamp": "1678221078", + "version": "2.0.12", + "datestamp": "1680556093", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3619,30 +3619,30 @@ }, { "name": "drupal/gin", - "version": "3.0.0-beta5", + "version": "3.0.0-rc2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-beta5" + "reference": "8.x-3.0-rc2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-beta5.zip", - "reference": "8.x-3.0-beta5", - "shasum": "651b2047990067e26158368e3aab7f27366a81e9" + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc2.zip", + "reference": "8.x-3.0-rc2", + "shasum": "0c3c664690680af6c3920c8877af431c29e38e00" }, "require": { - "drupal/core": "^8.9 || ^9 || ^10", + "drupal/core": "^9 || ^10", "drupal/gin_toolbar": "^1.0@beta" }, "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-beta5", - "datestamp": "1656071885", + "version": "8.x-3.0-rc2", + "datestamp": "1678733202", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "RC releases are not covered by Drupal security advisories." } } }, @@ -3740,16 +3740,16 @@ }, { "name": "drupal/hdbt", - "version": "5.0.7", + "version": "5.0.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "f78e62a136bbe472cacc168ed8ea1f21c878a43c" + "reference": "2b1f8a2b83e5863105681b341f06f87d8ffb00ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/f78e62a136bbe472cacc168ed8ea1f21c878a43c", - "reference": "f78e62a136bbe472cacc168ed8ea1f21c878a43c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2b1f8a2b83e5863105681b341f06f87d8ffb00ca", + "reference": "2b1f8a2b83e5863105681b341f06f87d8ffb00ca", "shasum": "" }, "require": { @@ -3767,27 +3767,27 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.0.7", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.0.13", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-03-27T07:25:48+00:00" + "time": "2023-04-04T05:46:31+00:00" }, { "name": "drupal/hdbt_admin", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "7804dee9c95afbeeffa3031af89a95773d329cb8" + "reference": "2904d828fe819be9f404f9d2cf8613631897d05b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/7804dee9c95afbeeffa3031af89a95773d329cb8", - "reference": "7804dee9c95afbeeffa3031af89a95773d329cb8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2904d828fe819be9f404f9d2cf8613631897d05b", + "reference": "2904d828fe819be9f404f9d2cf8613631897d05b", "shasum": "" }, "require": { - "drupal/gin": "3.0.0-beta5" + "drupal/gin": "3.0.0-rc2" }, "conflict": { "drupal/helfi_platform_config": "<3.0" @@ -3801,10 +3801,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-03-21T10:00:05+00:00" + "time": "2023-04-04T06:26:32+00:00" }, { "name": "drupal/health_check", @@ -3898,16 +3898,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "17e7208e9e08ce015f80d7daf283355d467b0d02" + "reference": "64f25bd440989af6c7d5bfa93a6d4788203acbdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/17e7208e9e08ce015f80d7daf283355d467b0d02", - "reference": "17e7208e9e08ce015f80d7daf283355d467b0d02", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/64f25bd440989af6c7d5bfa93a6d4788203acbdc", + "reference": "64f25bd440989af6c7d5bfa93a6d4788203acbdc", "shasum": "" }, "require": { @@ -3923,10 +3923,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-03-11T05:51:21+00:00" + "time": "2023-04-03T09:18:06+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -3990,16 +3990,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.0.14", + "version": "3.0.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "2c31766567e77d16d22d6ffc7ae7a78e5e91d6a3" + "reference": "adee6ff048849a42f01f78d539264b6e160482ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2c31766567e77d16d22d6ffc7ae7a78e5e91d6a3", - "reference": "2c31766567e77d16d22d6ffc7ae7a78e5e91d6a3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/adee6ff048849a42f01f78d539264b6e160482ac", + "reference": "adee6ff048849a42f01f78d539264b6e160482ac", "shasum": "" }, "require": { @@ -4068,7 +4068,7 @@ "drupal/core": { "[#UHF-181] Hide untranslated menu links": "https://www.drupal.org/files/issues/2021-03-05/3091246-allow-menu-tree-manipulators-alter-12-1.patch", "[#UHF-920] Token for base URL (https://www.drupal.org/project/drupal/issues/1088112). @todo This can be removed in D10": "https://www.drupal.org/files/issues/2020-10-06/1088112-63.patch", - "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299)": "https://www.drupal.org/files/issues/2023-01-13/3163299-82-9.5.x.patch", + "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299)": "https://git.drupalcode.org/project/drupal/-/merge_requests/3687/diffs.diff?diff_id=433455", "[#UHF-3087] Non-published menu links as parent (https://www.drupal.org/project/drupal/issues/2807629). @todo This can be removed in D10": "https://www.drupal.org/files/issues/2022-12-16/2807629-75.patch", "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.x.patch", "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", @@ -4081,9 +4081,6 @@ "drupal/eu_cookie_compliance": { "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch" }, - "drupal/field_group": { - "[#UHF-3268] Support for field group translations (https://www.drupal.org/node/3111107)": "https://www.drupal.org/files/issues/2022-09-27/3111107-39.patch" - }, "drupal/linkit": { "[#UHF-1872] Linkit support for link field (https://www.drupal.org/i/2712951)": "https://www.drupal.org/files/issues/2023-03-07/2712951_329.6.x.diff" }, @@ -4104,10 +4101,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.14", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.20", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-03-22T12:43:03+00:00" + "time": "2023-04-04T07:00:17+00:00" }, { "name": "drupal/helfi_proxy", @@ -4153,16 +4150,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.10", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "378724923a506a8f340542283242bf5f22d6c6a4" + "reference": "6da48c90fa41ce3d1eef1f1ba63f597d06a0041e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/378724923a506a8f340542283242bf5f22d6c6a4", - "reference": "378724923a506a8f340542283242bf5f22d6c6a4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/6da48c90fa41ce3d1eef1f1ba63f597d06a0041e", + "reference": "6da48c90fa41ce3d1eef1f1ba63f597d06a0041e", "shasum": "" }, "require": { @@ -4188,10 +4185,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.10", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-03-02T07:17:52+00:00" + "time": "2023-03-31T08:29:50+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5491,17 +5488,17 @@ }, { "name": "drupal/search_api", - "version": "1.28.0", + "version": "1.29.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.28" + "reference": "8.x-1.29" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.28.zip", - "reference": "8.x-1.28", - "shasum": "d3ae0bb3cf17c986d5e0c6edb87aee6580b6fc1e" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.29.zip", + "reference": "8.x-1.29", + "shasum": "4663abbcfe5dfc159ee0886fc6c437e998fc0653" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -5522,8 +5519,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.28", - "datestamp": "1667814116", + "version": "8.x-1.29", + "datestamp": "1679910252", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12719,16 +12716,16 @@ }, { "name": "symfony/string", - "version": "v6.2.7", + "version": "v6.2.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "67b8c1eec78296b85dc1c7d9743830160218993d" + "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d", - "reference": "67b8c1eec78296b85dc1c7d9743830160218993d", + "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef", + "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef", "shasum": "" }, "require": { @@ -12785,7 +12782,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.7" + "source": "https://github.com/symfony/string/tree/v6.2.8" }, "funding": [ { @@ -12801,7 +12798,7 @@ "type": "tidelift" } ], - "time": "2023-02-24T10:42:00+00:00" + "time": "2023-03-20T16:06:02+00:00" }, { "name": "symfony/translation", @@ -13078,16 +13075,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74" + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", - "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", "shasum": "" }, "require": { @@ -13147,7 +13144,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.21" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" }, "funding": [ { @@ -13163,7 +13160,7 @@ "type": "tidelift" } ], - "time": "2023-02-23T10:00:28+00:00" + "time": "2023-03-25T09:27:28+00:00" }, { "name": "symfony/yaml", @@ -15199,16 +15196,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5" + "reference": "dfc078e8af9c99210337325ff5aa152872c98714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5", - "reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714", + "reference": "dfc078e8af9c99210337325ff5aa152872c98714", "shasum": "" }, "require": { @@ -15251,9 +15248,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1" }, - "time": "2023-03-12T10:13:29+00:00" + "time": "2023-03-27T19:02:04+00:00" }, { "name": "phpspec/prophecy", diff --git a/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml index 1a930092..ad96f431 100644 --- a/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml @@ -10,6 +10,8 @@ dependencies: module: - select2 - text +_core: + default_config_hash: HRJthBxvAGUBr6dtFdoppGlWcpwgHitZVOPkvRHm5sY id: paragraph.service_list.default targetEntityType: paragraph bundle: service_list diff --git a/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml index 2189f6f6..616217cb 100644 --- a/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml @@ -11,6 +11,8 @@ dependencies: module: - select2 - text +_core: + default_config_hash: ogViA6v_uJJcVnEC4WODDNOEoa7kRMpTgOVsUl_JD-g id: paragraph.service_list_search.default targetEntityType: paragraph bundle: service_list_search diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml index bff98205..5a946cad 100644 --- a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml @@ -33,7 +33,7 @@ third_party_settings: description: '' required_fields: true _core: - default_config_hash: qf1KLGPPrP7EP5sDnNxNfe9U91dKzpemSCOGVPcbg4E + default_config_hash: z42RJh-JCLjD7_9W4B9_irn3nWHvqfSJ9foobt51Wg4 id: paragraph.unit_search.default targetEntityType: paragraph bundle: unit_search diff --git a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml index 0b12a301..7a950011 100644 --- a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml @@ -15,7 +15,7 @@ dependencies: - path - readonly_field_widget _core: - default_config_hash: dZVMKeHuPoeYF9UOdH6d1OHUHFng_SpZEMWsg_cr_mc + default_config_hash: fBGDQ46DbT3UoCm-GrCSgq6Fd6pARcmF3BNBKxO-qaE id: tpr_service.tpr_service.default targetEntityType: tpr_service bundle: tpr_service 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 4e1e883b..45675f2d 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 @@ -18,7 +18,7 @@ dependencies: - readonly_field_widget - select2 _core: - default_config_hash: g-ZdiLH0rHr8Mv6vni5A3v5v2UQGRdwiwPxs88WA93E + default_config_hash: YWnRrqJSaeQZEwAqgArp65Mhok9h6tEU1KTO5KzRl80 id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml index 069f2fa8..d008b579 100644 --- a/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml @@ -9,6 +9,8 @@ dependencies: - paragraphs.paragraphs_type.service_list module: - text +_core: + default_config_hash: kW70crB1EX1jLksh-hgRFpNJ1-PSnTUlofrFYeanHkQ id: paragraph.service_list.default targetEntityType: paragraph bundle: service_list diff --git a/conf/cmi/core.entity_view_display.paragraph.service_list_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.service_list_search.default.yml index d4344196..de8d1c9c 100644 --- a/conf/cmi/core.entity_view_display.paragraph.service_list_search.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.service_list_search.default.yml @@ -10,6 +10,8 @@ dependencies: - paragraphs.paragraphs_type.service_list_search module: - text +_core: + default_config_hash: 4XcLG72bt62muHNaqaomX1kaqTOb8uT6heFE83q3ld0 id: paragraph.service_list_search.default targetEntityType: paragraph bundle: service_list_search diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml index 1c054b70..282bb90a 100644 --- a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml @@ -13,7 +13,7 @@ dependencies: module: - text _core: - default_config_hash: AhvDZp4iBinv5b_7Vw8ZZ1IUnf2UjFm4wg12mvHITeU + default_config_hash: eO2_M7ETTzd3irRYYwjAo3rKU54wDMxFzvHS3v6hKuQ id: paragraph.unit_search.default targetEntityType: paragraph bundle: unit_search diff --git a/conf/cmi/core.entity_view_display.tpr_errand_service.tpr_errand_service.default.yml b/conf/cmi/core.entity_view_display.tpr_errand_service.tpr_errand_service.default.yml index 6c92afb7..8cdc0b64 100644 --- a/conf/cmi/core.entity_view_display.tpr_errand_service.tpr_errand_service.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_errand_service.tpr_errand_service.default.yml @@ -6,6 +6,8 @@ dependencies: - helfi_tpr - link - text +_core: + default_config_hash: meHtG3XT9u_TTzIJMXY2wn_dg1i-8K53Z2pAGaEsEb4 id: tpr_errand_service.tpr_errand_service.default targetEntityType: tpr_errand_service bundle: tpr_errand_service diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml index 0daeb073..901aafbd 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml @@ -14,7 +14,7 @@ dependencies: - metatag - text _core: - default_config_hash: xI-QgKUvsjLc0SRc8bpDE336uJXT5rVP6K8TirZUzw8 + default_config_hash: 26lfekZ94e-EhgSzEv_7KLsDbUr7VnPlFuJk0GdpVtc id: tpr_service.tpr_service.default targetEntityType: tpr_service bundle: tpr_service diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml index 160b327b..77288342 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml @@ -12,7 +12,7 @@ dependencies: - helfi_tpr - text _core: - default_config_hash: iX1n7R2opBVSjXmJ-aELkTyFJ2_hJ2Q4fGU0ue950KA + default_config_hash: arzHjXolWlH8pmxrz3B8CZjJ9zTVIIXnLNyZD3EK6uw id: tpr_service.tpr_service.teaser targetEntityType: tpr_service bundle: tpr_service diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml index ae920978..4b4abdc0 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml @@ -12,7 +12,7 @@ dependencies: - helfi_tpr - text _core: - default_config_hash: xI-QgKUvsjLc0SRc8bpDE336uJXT5rVP6K8TirZUzw8 + default_config_hash: ujJDnxXZHiN-DByQZHw7_ftiBEHe7NVqg8JElL2XkCw id: tpr_service.tpr_service.teaser_search_result targetEntityType: tpr_service bundle: tpr_service @@ -33,8 +33,8 @@ content: sort_order: ESERVICE: label: E-service - show: false weight: 0 + show: false CHAT: label: Chat show: true @@ -53,28 +53,28 @@ content: weight: 4 LOCAL: label: 'Local service' - show: false weight: 5 + show: false SMS: label: SMS - show: false weight: 6 + show: false WEBPAGE: label: Webpage - show: false weight: 7 + show: false MAIL: label: 'Postal mail' - show: false weight: 8 + show: false TELEFAX: label: Telefax - show: false weight: 9 + show: false OFFICE: label: 'Service point' - show: false weight: 99 + show: false third_party_settings: { } weight: 2 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml b/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml index e6b52c34..5ccbb7fa 100644 --- a/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml @@ -8,6 +8,8 @@ dependencies: - link - telephone - text +_core: + default_config_hash: i0i5Sy5UJYyKJqoc7NKFbAMaMlXpC53GoO7Z3mahaBE id: tpr_service_channel.tpr_service_channel.default targetEntityType: tpr_service_channel bundle: tpr_service_channel 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 ea476c6c..00bb90de 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 @@ -8,6 +8,7 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_lower_content - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type + - responsive_image.styles.image__3_2 module: - address - entity_reference_revisions @@ -18,7 +19,7 @@ dependencies: - telephone - text _core: - default_config_hash: G8Bvony-XKW0TFSdeAXtMPPhTpC5-Nvla95EuTA-e5s + default_config_hash: hE7e67UYGx1YHjoKPWu1fY3mmmgMH6cF6P3JK5kWyWs id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit 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 6ecd204a..58f78f64 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 @@ -5,12 +5,15 @@ dependencies: config: - core.entity_view_mode.tpr_unit.minimal - field.field.tpr_unit.tpr_unit.field_content + - field.field.tpr_unit.tpr_unit.field_districts - field.field.tpr_unit.tpr_unit.field_lower_content - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type module: - address - helfi_tpr +_core: + default_config_hash: '-PlL5PW4ox5Omj4LpofJ5LrLgrYahOxcc1Cku386V-o' id: tpr_unit.tpr_unit.minimal targetEntityType: tpr_unit bundle: tpr_unit 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 66231666..9bb58d8d 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 @@ -9,12 +9,13 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_lower_content - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type + - responsive_image.styles.image__3_2 module: - address - helfi_tpr - imagecache_external _core: - default_config_hash: AXRbU5CCilR4nQTh02P8e4XLOUGudpM30w32hrODeSU + default_config_hash: CSGZthOWS5PNgCpEcOhdUYSQvJyYAJhDMvhkD2RotHU id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit 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 0443be40..1408ede1 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 @@ -9,13 +9,14 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_lower_content - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type + - responsive_image.styles.image__3_2 module: - address - helfi_tpr - imagecache_external - telephone _core: - default_config_hash: 9seJXDTSgRhpxOuoOCXPTrbvXiwREpzz0CrsfDsgBk8 + default_config_hash: VNYTo5CntTn6nX5XMd8B4xqHRx0QiKEw4hPFz6MahI8 id: tpr_unit.tpr_unit.teaser_with_image targetEntityType: tpr_unit bundle: tpr_unit 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 80cc536f..38b035ba 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 @@ -9,11 +9,14 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_lower_content - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type + - responsive_image.styles.image__3_2 module: - address - helfi_tpr - imagecache_external - telephone +_core: + default_config_hash: FcgNfzTLT58CIquKCO2pxW7C9uzpL7SCZH-9Irm_QT8 id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml index be5a1001..7e8a3ea1 100644 --- a/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml +++ b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - helfi_tpr +_core: + default_config_hash: YJXddqfHzgzWlN_oVmr77-vQmOPw1kMx9ZaqJQntc08 id: tpr_service.teaser_search_result label: 'Teaser search result' targetEntityType: tpr_service diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml index b0f9e36c..8de64291 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - helfi_tpr +_core: + default_config_hash: QxDZ3nNixknhXrBxU6rSC1M5rvm5PeKB1Pj9ildFp-Q id: tpr_unit.minimal label: Minimal targetEntityType: tpr_unit diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.token.yml b/conf/cmi/core.entity_view_mode.tpr_unit.token.yml index 75526114..c70ec210 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.token.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.token.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - helfi_tpr +_core: + default_config_hash: kzVXngjEGNpJsdD08ZS2eH18frDmMTMm5-s03cB3SMU id: tpr_unit.token label: Token targetEntityType: tpr_unit diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml index abcffd20..b2b72236 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - helfi_tpr +_core: + default_config_hash: VOBfmZpf5VqHhiew2jSr2DSTritFtZ3ubPh9FaU9UIE id: tpr_unit.wide_teaser label: 'Wide Teaser' targetEntityType: tpr_unit diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index b0cea61a..01a87914 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -17,6 +17,7 @@ dependencies: - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map + - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text @@ -49,6 +50,7 @@ settings: content_liftup: content_liftup banner: banner event_list: event_list + news_list: news_list from_library: from_library phasing: phasing chart: chart @@ -93,6 +95,9 @@ settings: map: weight: 0 enabled: true + news_list: + weight: 0 + enabled: true phasing: weight: 0 enabled: true diff --git a/conf/cmi/field.field.paragraph.service_list.field_service_list_description.yml b/conf/cmi/field.field.paragraph.service_list.field_service_list_description.yml index a4b1528e..056bd0b6 100644 --- a/conf/cmi/field.field.paragraph.service_list.field_service_list_description.yml +++ b/conf/cmi/field.field.paragraph.service_list.field_service_list_description.yml @@ -7,6 +7,8 @@ dependencies: - paragraphs.paragraphs_type.service_list module: - text +_core: + default_config_hash: F7V4AQx0zWAdd6NyulXLp4K2s6PBezGsl_ecYU16FNI id: paragraph.service_list.field_service_list_description field_name: field_service_list_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.service_list.field_service_list_services.yml b/conf/cmi/field.field.paragraph.service_list.field_service_list_services.yml index be4db6ac..99f4e96c 100644 --- a/conf/cmi/field.field.paragraph.service_list.field_service_list_services.yml +++ b/conf/cmi/field.field.paragraph.service_list.field_service_list_services.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_service_list_services - paragraphs.paragraphs_type.service_list +_core: + default_config_hash: XwZrOmb0A1YNyW05mKirfMztU2UQan3_Pcrs8VmooR0 id: paragraph.service_list.field_service_list_services field_name: field_service_list_services entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.service_list.field_service_list_title.yml b/conf/cmi/field.field.paragraph.service_list.field_service_list_title.yml index ae38718a..89f436a1 100644 --- a/conf/cmi/field.field.paragraph.service_list.field_service_list_title.yml +++ b/conf/cmi/field.field.paragraph.service_list.field_service_list_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_service_list_title - paragraphs.paragraphs_type.service_list +_core: + default_config_hash: oBzVKXOGVyK1Hf2Ndjf41frBNagrtCe9_a15bzOSPDs id: paragraph.service_list.field_service_list_title field_name: field_service_list_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml index 5d85e5ed..66bffe43 100644 --- a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml @@ -11,6 +11,8 @@ dependencies: third_party_settings: allowed_formats: allowed_formats: { } +_core: + default_config_hash: yeqBqggQyiFRO9uAQLAdhfLG0WuHCnqkOKMGQmJHwRE id: paragraph.service_list_search.field_service_list_description field_name: field_service_list_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml index d295a0e0..527e1f49 100644 --- a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_service_list_service_ids - paragraphs.paragraphs_type.service_list_search +_core: + default_config_hash: pkOQqZ0G4ORl5Azr8Re8gwetouG59hOQt5JxVd8kpwU id: paragraph.service_list_search.field_service_list_service_ids field_name: field_service_list_service_ids entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml index 28f9541b..fde65ecb 100644 --- a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_service_list_services - paragraphs.paragraphs_type.service_list_search +_core: + default_config_hash: RscGeFdyxsYK1PVhK3dBNHlSyub_bE8t096GS-8eEhU id: paragraph.service_list_search.field_service_list_services field_name: field_service_list_services entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml index b0aee983..2f1849ec 100644 --- a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_service_list_title - paragraphs.paragraphs_type.service_list_search +_core: + default_config_hash: NtEMPnv-Of-pK6EwR3ru5V2sUExN1SNjUQuS3H589Bo id: paragraph.service_list_search.field_service_list_title field_name: field_service_list_title entity_type: paragraph diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml index 78a5004b..fd729657 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml @@ -17,6 +17,8 @@ dependencies: module: - entity_reference_revisions - helfi_tpr +_core: + default_config_hash: xwV8V9oqgwBpuEwFQk0laZrlgnyTvyKUPjFd9p1mMOY id: tpr_service.tpr_service.field_content field_name: field_content entity_type: tpr_service diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index 5aaf9b47..4a94dde2 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -20,7 +20,7 @@ dependencies: - entity_reference_revisions - helfi_tpr _core: - default_config_hash: fsKy5NL4nAIecIOHBppp2S_ck3R0vsc6ce4bV7TdItM + default_config_hash: 0w6TAkgLk9On5XOviDXTpRRHVp8nbu2p0XIiehLioLs id: tpr_service.tpr_service.field_lower_content field_name: field_lower_content entity_type: tpr_service diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_sidebar_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_sidebar_content.yml index 6ebdbd7d..5d9093a1 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_sidebar_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_sidebar_content.yml @@ -9,6 +9,8 @@ dependencies: module: - entity_reference_revisions - helfi_tpr +_core: + default_config_hash: 2Cnwe0fNZpuNDGlHzy54i1Qhrc7QLtTUkRRnvfrDObo id: tpr_service.tpr_service.field_sidebar_content field_name: field_sidebar_content entity_type: tpr_service diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml index 3277ad69..7430ad8f 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml @@ -18,7 +18,7 @@ dependencies: - entity_reference_revisions - helfi_tpr _core: - default_config_hash: xbPw2SLMLFR69DI3vufOQweoazdT54riV3Sjm7p8ybk + default_config_hash: 7mu1uOGOAtNGBSsMGRGHZ7E2-6BYzH1Giv6pIn5tgHY id: tpr_unit.tpr_unit.field_content field_name: field_content entity_type: tpr_unit diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml index a98d9f4a..b43d3003 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml @@ -6,6 +6,8 @@ dependencies: - field.storage.tpr_unit.field_districts module: - helfi_tpr +_core: + default_config_hash: WsEFQNF3dixVbsvntdPxzsV4Ig0bWaOitwuM93Sg9JY id: tpr_unit.tpr_unit.field_districts field_name: field_districts entity_type: tpr_unit diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml index a7fac820..8ebc0486 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml @@ -20,7 +20,7 @@ dependencies: - entity_reference_revisions - helfi_tpr _core: - default_config_hash: a98XY7Blgzudd5smfYINOCfpxxeJ286QNd8a5tUwZUU + default_config_hash: LqUdG1L3Wvh90fVFHW34j32jhlAr4IEVX4tUGiqP5to id: tpr_unit.tpr_unit.field_lower_content field_name: field_lower_content entity_type: tpr_unit diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_unit_type.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_unit_type.yml index 70bf896c..334bc8ee 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_unit_type.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_unit_type.yml @@ -7,6 +7,8 @@ dependencies: - taxonomy.vocabulary.unit_type module: - helfi_tpr +_core: + default_config_hash: BLNb3yKJPpMSTKm84mRGtnq7lJfH4kk7mhERHfI02KE id: tpr_unit.tpr_unit.field_unit_type field_name: field_unit_type entity_type: tpr_unit diff --git a/conf/cmi/field.storage.paragraph.field_service_list_description.yml b/conf/cmi/field.storage.paragraph.field_service_list_description.yml index c8d4c503..0142908d 100644 --- a/conf/cmi/field.storage.paragraph.field_service_list_description.yml +++ b/conf/cmi/field.storage.paragraph.field_service_list_description.yml @@ -5,6 +5,8 @@ dependencies: module: - paragraphs - text +_core: + default_config_hash: ASz1V3kpVyrT6werQTTFzFE6jW8s6gFHUmmNczZEbcI id: paragraph.field_service_list_description field_name: field_service_list_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml b/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml index 52fdae6a..6ab8a9a8 100644 --- a/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml +++ b/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - paragraphs +_core: + default_config_hash: W8FU8L5p00rESNWD5DbEI24AHZDyeiF7ry_S061SToo id: paragraph.field_service_list_service_ids field_name: field_service_list_service_ids entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_service_list_services.yml b/conf/cmi/field.storage.paragraph.field_service_list_services.yml index 8dab9741..25a3bb96 100644 --- a/conf/cmi/field.storage.paragraph.field_service_list_services.yml +++ b/conf/cmi/field.storage.paragraph.field_service_list_services.yml @@ -5,6 +5,8 @@ dependencies: module: - helfi_tpr - paragraphs +_core: + default_config_hash: qZWk4gKj0Il6m_R3LLu6MXsuqbrbifyhrNV-F8PV0wo id: paragraph.field_service_list_services field_name: field_service_list_services entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_service_list_title.yml b/conf/cmi/field.storage.paragraph.field_service_list_title.yml index a69b2bd9..0b79b4b7 100644 --- a/conf/cmi/field.storage.paragraph.field_service_list_title.yml +++ b/conf/cmi/field.storage.paragraph.field_service_list_title.yml @@ -4,14 +4,16 @@ status: true dependencies: module: - paragraphs +_core: + default_config_hash: '-U-fI1ZKNYIqf3MamunZcYDd_NUf_Phse4D_HdHaSwo' id: paragraph.field_service_list_title field_name: field_service_list_title entity_type: paragraph type: string settings: max_length: 255 - case_sensitive: false is_ascii: false + case_sensitive: false module: core locked: false cardinality: 1 diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_meta_button.yml b/conf/cmi/field.storage.paragraph.field_unit_search_meta_button.yml index 94355297..027efb52 100644 --- a/conf/cmi/field.storage.paragraph.field_unit_search_meta_button.yml +++ b/conf/cmi/field.storage.paragraph.field_unit_search_meta_button.yml @@ -12,8 +12,8 @@ entity_type: paragraph type: string settings: max_length: 255 - case_sensitive: false is_ascii: false + case_sensitive: false module: core locked: false cardinality: 1 diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_meta_label.yml b/conf/cmi/field.storage.paragraph.field_unit_search_meta_label.yml index d8d81e23..aed0980e 100644 --- a/conf/cmi/field.storage.paragraph.field_unit_search_meta_label.yml +++ b/conf/cmi/field.storage.paragraph.field_unit_search_meta_label.yml @@ -12,8 +12,8 @@ entity_type: paragraph type: string settings: max_length: 255 - case_sensitive: false is_ascii: false + case_sensitive: false module: core locked: false cardinality: 1 diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_meta_placehold.yml b/conf/cmi/field.storage.paragraph.field_unit_search_meta_placehold.yml index e0d94c70..b162c5d6 100644 --- a/conf/cmi/field.storage.paragraph.field_unit_search_meta_placehold.yml +++ b/conf/cmi/field.storage.paragraph.field_unit_search_meta_placehold.yml @@ -12,8 +12,8 @@ entity_type: paragraph type: string settings: max_length: 255 - case_sensitive: false is_ascii: false + case_sensitive: false module: core locked: false cardinality: 1 diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_title.yml b/conf/cmi/field.storage.paragraph.field_unit_search_title.yml index 5cd43e89..bfcd767e 100644 --- a/conf/cmi/field.storage.paragraph.field_unit_search_title.yml +++ b/conf/cmi/field.storage.paragraph.field_unit_search_title.yml @@ -12,8 +12,8 @@ entity_type: paragraph type: string settings: max_length: 255 - case_sensitive: false is_ascii: false + case_sensitive: false module: core locked: false cardinality: 1 diff --git a/conf/cmi/field.storage.tpr_service.field_sidebar_content.yml b/conf/cmi/field.storage.tpr_service.field_sidebar_content.yml index cf39e9b7..5912d400 100644 --- a/conf/cmi/field.storage.tpr_service.field_sidebar_content.yml +++ b/conf/cmi/field.storage.tpr_service.field_sidebar_content.yml @@ -6,6 +6,8 @@ dependencies: - entity_reference_revisions - helfi_tpr - paragraphs +_core: + default_config_hash: ji61hsFzfC33rzmJ1hMvrWE2vfG_L_p4mCJ8EH2s3pQ id: tpr_service.field_sidebar_content field_name: field_sidebar_content entity_type: tpr_service diff --git a/conf/cmi/field.storage.tpr_unit.field_districts.yml b/conf/cmi/field.storage.tpr_unit.field_districts.yml index 923b302a..dfff62a2 100644 --- a/conf/cmi/field.storage.tpr_unit.field_districts.yml +++ b/conf/cmi/field.storage.tpr_unit.field_districts.yml @@ -5,6 +5,8 @@ dependencies: module: - helfi_tpr - taxonomy +_core: + default_config_hash: oLZ1fyeES9ZOu_ulj3xCYRfo7VZ17yKyW9rmHoAB58Q id: tpr_unit.field_districts field_name: field_districts entity_type: tpr_unit diff --git a/conf/cmi/field.storage.tpr_unit.field_unit_type.yml b/conf/cmi/field.storage.tpr_unit.field_unit_type.yml index b4204578..801d322a 100644 --- a/conf/cmi/field.storage.tpr_unit.field_unit_type.yml +++ b/conf/cmi/field.storage.tpr_unit.field_unit_type.yml @@ -5,6 +5,8 @@ dependencies: module: - helfi_tpr - taxonomy +_core: + default_config_hash: xyvme0fCn-ECtK4qUuTW5X8aOK9GXLQYty8u03HRNMs id: tpr_unit.field_unit_type field_name: field_unit_type entity_type: tpr_unit diff --git a/conf/cmi/language.content_settings.taxonomy_term.unit_type.yml b/conf/cmi/language.content_settings.taxonomy_term.unit_type.yml index 53dae642..f7754357 100644 --- a/conf/cmi/language.content_settings.taxonomy_term.unit_type.yml +++ b/conf/cmi/language.content_settings.taxonomy_term.unit_type.yml @@ -9,6 +9,8 @@ dependencies: third_party_settings: content_translation: enabled: true +_core: + default_config_hash: hTFo4ZpzrzuHf8ywQsTlVJR1SaoFeZnkn8DKIcwbgQA id: taxonomy_term.unit_type target_entity_type_id: taxonomy_term target_bundle: unit_type diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.unit_search.default.yml new file mode 100644 index 00000000..48c28321 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.unit_search.default.yml @@ -0,0 +1,4 @@ +third_party_settings: + field_group: + group_unit_search_metadata: + label: Metadata diff --git a/conf/cmi/metatag.metatag_defaults.tpr_service.yml b/conf/cmi/metatag.metatag_defaults.tpr_service.yml index 225a72ab..6d692e24 100644 --- a/conf/cmi/metatag.metatag_defaults.tpr_service.yml +++ b/conf/cmi/metatag.metatag_defaults.tpr_service.yml @@ -3,10 +3,11 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: AirS2279F4JcJXH0PNP3DqJRUqBx5VRTXaQ2O206zbQ + default_config_hash: GvppOlIwJAJVJOOtLnjrHf_A44MVZ5DTgJ8bsDmcELI id: tpr_service label: 'TPR - Service' tags: + canonical_url: '[tpr_service:url]' content_language: '[tpr_service:langcode]' description: '[tpr_service:description:summary]' title: '[tpr_service:label] | [site:page-title-suffix]' diff --git a/conf/cmi/metatag.metatag_defaults.tpr_unit.yml b/conf/cmi/metatag.metatag_defaults.tpr_unit.yml index 97c83ee9..8f3535c1 100644 --- a/conf/cmi/metatag.metatag_defaults.tpr_unit.yml +++ b/conf/cmi/metatag.metatag_defaults.tpr_unit.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: hlB4K_jSciuNMggcZfWmo6qD87ik3cw_3gM_SHzQNpM + default_config_hash: uQHYkeDAlKDP9QzcRcKciZc5r2PVOzL_jXwfU2ac4iY id: tpr_unit label: 'TPR - Unit' tags: diff --git a/conf/cmi/paragraphs.paragraphs_type.service_list.yml b/conf/cmi/paragraphs.paragraphs_type.service_list.yml index 3c0d8337..d8d5aaeb 100644 --- a/conf/cmi/paragraphs.paragraphs_type.service_list.yml +++ b/conf/cmi/paragraphs.paragraphs_type.service_list.yml @@ -7,6 +7,8 @@ dependencies: third_party_settings: paragraphs_library: allow_library_conversion: true +_core: + default_config_hash: ptQqDhmX4Hk3ed3DV1XE2T2JKOEt1uXA4vHlH-gHjWM id: service_list label: 'Service list' icon_uuid: null diff --git a/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml b/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml index a424265b..8db6079c 100644 --- a/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml +++ b/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml @@ -7,6 +7,8 @@ dependencies: third_party_settings: paragraphs_library: allow_library_conversion: true +_core: + default_config_hash: Q7vvz59nPU2U9WqokL0vgWxrbw_xGBGPAcUx2L5tMU0 id: service_list_search label: 'Service List Search' icon_uuid: null diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml index 8e55877d..6c02b483 100644 --- a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml +++ b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: sNJC886eqZSClcuJhMgp-HCspBv4ZIDX6aouwqS7a9E index: true priority: '0.5' changefreq: '' diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml index 8e55877d..6c02b483 100644 --- a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml +++ b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: sNJC886eqZSClcuJhMgp-HCspBv4ZIDX6aouwqS7a9E index: true priority: '0.5' changefreq: '' diff --git a/conf/cmi/taxonomy.vocabulary.unit_type.yml b/conf/cmi/taxonomy.vocabulary.unit_type.yml index d5d14547..b5bef2a6 100644 --- a/conf/cmi/taxonomy.vocabulary.unit_type.yml +++ b/conf/cmi/taxonomy.vocabulary.unit_type.yml @@ -2,6 +2,8 @@ uuid: 5d96d6a1-350a-4ff9-85b7-9d1639d7a026 langcode: en status: true dependencies: { } +_core: + default_config_hash: wEkf5i2opWdEXS0s4609Q6ha1e5IYMWuR_DohY-v4-M name: 'Unit type' vid: unit_type description: 'You can use this vocabulary to categorise TPR-units so that they can be used in listings for example listing of daycare units.' diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index 650d5946..690f25f9 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -6,7 +6,7 @@ dependencies: - helfi_tpr - user _core: - default_config_hash: zQ42nbFfpEozSJ5KKZAtnpZJWTBMAQeUgGa0DiN9NDE + default_config_hash: gx8yXH8TeErT_h2-G2YR6KM0mJzy0VUjVWug4J4nfwo id: er_tpr_unit label: 'Entity reference - TPR Unit' module: views diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index c7342e3d..65ec1504 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -6,6 +6,8 @@ dependencies: - content_lock - helfi_tpr - user +_core: + default_config_hash: FDZcRw67DkxROxzgM6JstwpDXjlOOPt3eoaBSh-n5NA id: locked_services label: 'Locked services' module: views diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 55e54f33..28471934 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -6,6 +6,8 @@ dependencies: - content_lock - helfi_tpr - user +_core: + default_config_hash: ttPnpXga7YMo7jK1EJ5SySavpSnXjjMpqPAVZdX0mZI id: locked_units label: 'Locked units' module: views diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 8131faad..f83a6b92 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -4,9 +4,13 @@ status: true dependencies: config: - core.entity_view_mode.tpr_service.teaser + - core.entity_view_mode.tpr_service.teaser_search_result module: - helfi_tpr + - text - user +_core: + default_config_hash: o65N5aD4o6raf611I_qEHSWgIW8JO4-b5CLd95oAwcM id: service_list label: 'Service list' module: views diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index dbbb0eef..452e505b 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -7,6 +7,8 @@ dependencies: module: - helfi_tpr - user +_core: + default_config_hash: bkWE1A5ORmS_Vr0jlWLqlO3ERyoLNtrCkkKtxT2-Rxs id: service_units label: 'Service units' module: views diff --git a/conf/cmi/views.view.tpr_errand_service_list.yml b/conf/cmi/views.view.tpr_errand_service_list.yml index d8c48e9e..330653f5 100644 --- a/conf/cmi/views.view.tpr_errand_service_list.yml +++ b/conf/cmi/views.view.tpr_errand_service_list.yml @@ -5,6 +5,8 @@ dependencies: module: - helfi_tpr - user + - helfi_tpr + - user _core: default_config_hash: 0wDqZhJn8tnNhEq6QJNITXspmRbtFffjYqD82wc3myE id: tpr_errand_service_list @@ -623,7 +625,8 @@ display: filter_groups: operator: AND groups: - 1: AND + - AND + - AND style: type: table options: @@ -717,6 +720,11 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } page_1: id: page_1 @@ -734,4 +742,9 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } diff --git a/conf/cmi/views.view.tpr_service_channel_list.yml b/conf/cmi/views.view.tpr_service_channel_list.yml index 18fd17e3..ab7267cf 100644 --- a/conf/cmi/views.view.tpr_service_channel_list.yml +++ b/conf/cmi/views.view.tpr_service_channel_list.yml @@ -5,6 +5,8 @@ dependencies: module: - helfi_tpr - user + - helfi_tpr + - user _core: default_config_hash: ZliIw3MTabPVgN2saPq0LQcrFhHsWf-Or6qd_aA7tZk id: tpr_service_channel_list @@ -623,7 +625,8 @@ display: filter_groups: operator: AND groups: - 1: AND + - AND + - AND style: type: table options: @@ -717,6 +720,11 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } page_1: id: page_1 @@ -734,4 +742,9 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } diff --git a/conf/cmi/views.view.tpr_service_list.yml b/conf/cmi/views.view.tpr_service_list.yml index eb3c6098..71bee4ad 100644 --- a/conf/cmi/views.view.tpr_service_list.yml +++ b/conf/cmi/views.view.tpr_service_list.yml @@ -5,6 +5,8 @@ dependencies: module: - helfi_tpr - user + - helfi_tpr + - user id: tpr_service_list label: 'TPR service list' module: views @@ -716,6 +718,11 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } page_1: id: page_1 @@ -734,4 +741,9 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index 0f5cdcf7..d6d9d483 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -8,6 +8,11 @@ dependencies: - views_bulk_operations - views_bulk_edit - content_lock + - helfi_tpr + - user + - views_bulk_operations + - views_bulk_edit + - content_lock id: tpr_unit_list label: 'TPR unit list' module: views @@ -81,28 +86,54 @@ display: clear_on_exposed: true force_selection_info: false selected_actions: - 0: + - + action_id: 'entity:break_lock:tpr_unit' + preconfiguration: + add_confirmation: false + label_override: 'Break lock' + - + action_id: 'remote_entity:migration_update:tpr_unit' + preconfiguration: + add_confirmation: false + label_override: Update + - + action_id: views_bulk_edit + preconfiguration: + add_confirmation: false + label_override: 'Modify values' + get_bundles_from_results: true + - + action_id: 'entity:unpublish_action:tpr_unit' + preconfiguration: + add_confirmation: false + label_override: 'Unpublish unit' + - + action_id: 'entity:publish_action:tpr_unit' + preconfiguration: + add_confirmation: false + label_override: 'Publish unit' + - action_id: 'entity:break_lock:tpr_unit' preconfiguration: add_confirmation: false label_override: 'Break lock' - 1: + - action_id: 'remote_entity:migration_update:tpr_unit' preconfiguration: add_confirmation: false label_override: Update - 2: + - action_id: views_bulk_edit preconfiguration: add_confirmation: false label_override: 'Modify values' get_bundles_from_results: true - 4: + - action_id: 'entity:unpublish_action:tpr_unit' preconfiguration: add_confirmation: false label_override: 'Unpublish unit' - 5: + - action_id: 'entity:publish_action:tpr_unit' preconfiguration: add_confirmation: false @@ -749,6 +780,11 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } page_1: id: page_1 @@ -767,4 +803,9 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions tags: { } diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 4fe41260..37349209 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -8,6 +8,8 @@ dependencies: - address - helfi_tpr - user +_core: + default_config_hash: mwuTSnSRTePqNG6WFWBI9ajFxnho8CH-6sfyfJnDr0E id: unit_search label: 'Unit search' module: views diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml index 8e7227ee..b581006a 100644 --- a/conf/cmi/views.view.unit_services.yml +++ b/conf/cmi/views.view.unit_services.yml @@ -7,6 +7,8 @@ dependencies: module: - helfi_tpr - user +_core: + default_config_hash: p2-eFByxEufDKbwg2OEwg8Lnve4kABW3HhK0ZmNrCyg id: unit_services label: 'Unit services' module: views diff --git a/docker-compose.yml b/docker-compose.yml index e259cad6..633aca30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: - internal db: container_name: "${COMPOSE_PROJECT_NAME}-db" - image: druidfi/mariadb:10.9-drupal + image: druidfi/mariadb:10.11-drupal environment: MARIADB_AUTO_UPGRADE: "1" MARIADB_INITDB_SKIP_TZINFO: "1" From 527277240b7cf63bcef29004b8771de74ec214b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 4 Apr 2023 10:52:54 +0300 Subject: [PATCH 2/2] Removed duplicated keyless values from views configurations. --- .../views.view.tpr_errand_service_list.yml | 13 ------ .../views.view.tpr_service_channel_list.yml | 13 ------ conf/cmi/views.view.tpr_service_list.yml | 14 +----- conf/cmi/views.view.tpr_unit_list.yml | 43 +------------------ .../hdbt_subtheme/hdbt_subtheme.info.yml | 2 +- 5 files changed, 5 insertions(+), 80 deletions(-) diff --git a/conf/cmi/views.view.tpr_errand_service_list.yml b/conf/cmi/views.view.tpr_errand_service_list.yml index 330653f5..fe43d94b 100644 --- a/conf/cmi/views.view.tpr_errand_service_list.yml +++ b/conf/cmi/views.view.tpr_errand_service_list.yml @@ -5,8 +5,6 @@ dependencies: module: - helfi_tpr - user - - helfi_tpr - - user _core: default_config_hash: 0wDqZhJn8tnNhEq6QJNITXspmRbtFffjYqD82wc3myE id: tpr_errand_service_list @@ -626,7 +624,6 @@ display: operator: AND groups: - AND - - AND style: type: table options: @@ -720,11 +717,6 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } page_1: id: page_1 @@ -742,9 +734,4 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } diff --git a/conf/cmi/views.view.tpr_service_channel_list.yml b/conf/cmi/views.view.tpr_service_channel_list.yml index ab7267cf..e93fbe18 100644 --- a/conf/cmi/views.view.tpr_service_channel_list.yml +++ b/conf/cmi/views.view.tpr_service_channel_list.yml @@ -5,8 +5,6 @@ dependencies: module: - helfi_tpr - user - - helfi_tpr - - user _core: default_config_hash: ZliIw3MTabPVgN2saPq0LQcrFhHsWf-Or6qd_aA7tZk id: tpr_service_channel_list @@ -626,7 +624,6 @@ display: operator: AND groups: - AND - - AND style: type: table options: @@ -720,11 +717,6 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } page_1: id: page_1 @@ -742,9 +734,4 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } diff --git a/conf/cmi/views.view.tpr_service_list.yml b/conf/cmi/views.view.tpr_service_list.yml index 71bee4ad..ce0d0d9a 100644 --- a/conf/cmi/views.view.tpr_service_list.yml +++ b/conf/cmi/views.view.tpr_service_list.yml @@ -5,8 +5,8 @@ dependencies: module: - helfi_tpr - user - - helfi_tpr - - user +_core: + default_config_hash: rO8m-2SU4UjJoGRHWn5CfFPKwy59J2U_J0xJq6MZpjA id: tpr_service_list label: 'TPR service list' module: views @@ -718,11 +718,6 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } page_1: id: page_1 @@ -741,9 +736,4 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index d6d9d483..5f08ca7a 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -8,11 +8,8 @@ dependencies: - views_bulk_operations - views_bulk_edit - content_lock - - helfi_tpr - - user - - views_bulk_operations - - views_bulk_edit - - content_lock +_core: + default_config_hash: 0Q9MnLuLAYwltkBeCL-al8z-gc3-M2SFIWM50exDgxg id: tpr_unit_list label: 'TPR unit list' module: views @@ -112,32 +109,6 @@ display: preconfiguration: add_confirmation: false label_override: 'Publish unit' - - - action_id: 'entity:break_lock:tpr_unit' - preconfiguration: - add_confirmation: false - label_override: 'Break lock' - - - action_id: 'remote_entity:migration_update:tpr_unit' - preconfiguration: - add_confirmation: false - label_override: Update - - - action_id: views_bulk_edit - preconfiguration: - add_confirmation: false - label_override: 'Modify values' - get_bundles_from_results: true - - - action_id: 'entity:unpublish_action:tpr_unit' - preconfiguration: - add_confirmation: false - label_override: 'Unpublish unit' - - - action_id: 'entity:publish_action:tpr_unit' - preconfiguration: - add_confirmation: false - label_override: 'Publish unit' id: id: id table: tpr_unit_field_data @@ -780,11 +751,6 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } page_1: id: page_1 @@ -803,9 +769,4 @@ display: - url - url.query_args - user.permissions - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions tags: { } diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.info.yml b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.info.yml index 14409f0b..a8b61a83 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.info.yml +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.info.yml @@ -3,7 +3,7 @@ description: Subtheme for Helsinki Drupal instances. type: theme base theme: hdbt tags: sub-theme -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 screenshot: hdbt_subtheme.png 'interface translation project': hdbt_subtheme 'interface translation server pattern': themes/custom/hdbt_subtheme/translations/%language.po