diff --git a/.sonarcloud.properties b/.sonarcloud.properties new file mode 100644 index 00000000..ea01432f --- /dev/null +++ b/.sonarcloud.properties @@ -0,0 +1 @@ +sonar.exclusions=public/modules/custom/**/tests/** diff --git a/composer.json b/composer.json index a9348c02..3cda5436 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "drupal/helfi_proxy": "^2.0", "drupal/helfi_tpr": "^2.0", "drupal/helfi_tunnistamo": "^2.0", - "drupal/openid_connect": "2.0.0-alpha12", "drupal/raven": "^3.2", "drupal/redis": "^1.5", "drupal/stage_file_proxy": "^1.2", diff --git a/composer.lock b/composer.lock index f25e6efb..928c25b1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "408540e0aab17112b3a7b134b53574c5", + "content-hash": "3a2600ff3c9fb70c1673ccead543fb99", "packages": [ { "name": "asm89/stack-cors", @@ -3355,26 +3355,26 @@ }, { "name": "drupal/eu_cookie_compliance", - "version": "1.19.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/eu-cookie-compliance.git", - "reference": "8.x-1.19" + "reference": "8.x-1.24" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/eu_cookie_compliance-8.x-1.19.zip", - "reference": "8.x-1.19", - "shasum": "5a13cd53f87a58501cebd6e560c280ad7274035c" + "url": "https://ftp.drupal.org/files/projects/eu_cookie_compliance-8.x-1.24.zip", + "reference": "8.x-1.24", + "shasum": "ab8dcd866e5ad95cde6fdf9cbca509c7f399bd23" }, "require": { - "drupal/core": "^8.9 || ^9" + "drupal/core": "^8.9 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.19", - "datestamp": "1633775773", + "version": "8.x-1.24", + "datestamp": "1665158185", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3642,29 +3642,26 @@ }, { "name": "drupal/field_group", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_group.git", - "reference": "8.x-3.3" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.3.zip", - "reference": "8.x-3.3", - "shasum": "c7a423b1d7643ee40dd1543d72fa04e8ac1756e4" + "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "80b937e1a11f8b29c69d853fc4bf798c057c6f94" }, "require": { - "drupal/core": "^8.8 || ^9" - }, - "require-dev": { - "drupal/jquery_ui_accordion": "^1.0" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.3", - "datestamp": "1663516404", + "version": "8.x-3.4", + "datestamp": "1667241979", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4057,16 +4054,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.8", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "adf4d958ec7234a5aa5a8f02583d5992b8d8ee26" + "reference": "5678e07a1442a3327bb596a351e02de822b5aaf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/adf4d958ec7234a5aa5a8f02583d5992b8d8ee26", - "reference": "adf4d958ec7234a5aa5a8f02583d5992b8d8ee26", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5678e07a1442a3327bb596a351e02de822b5aaf9", + "reference": "5678e07a1442a3327bb596a351e02de822b5aaf9", "shasum": "" }, "require": { @@ -4081,23 +4078,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.8", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.2.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-21T13:32:01+00:00" + "time": "2022-11-08T10:18:33+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.7.1", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd" + "reference": "42d74e27de19bd9392bbdda1bf45c3d6724b603f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", - "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/42d74e27de19bd9392bbdda1bf45c3d6724b603f", + "reference": "42d74e27de19bd9392bbdda1bf45c3d6724b603f", "shasum": "" }, "require": { @@ -4113,10 +4110,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-10-14T06:09:35+00:00" + "time": "2022-11-08T07:53:25+00:00" }, { "name": "drupal/helfi_ahjo", @@ -4153,16 +4150,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.3", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "403c56e5dc436ba0c404c240546e59de944eae2e" + "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/403c56e5dc436ba0c404c240546e59de944eae2e", - "reference": "403c56e5dc436ba0c404c240546e59de944eae2e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f3560b56532df468b8f5433875a7dc79bab10c1f", + "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f", "shasum": "" }, "require": { @@ -4185,10 +4182,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-10-24T06:09:19+00:00" + "time": "2022-11-02T08:44:03+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4228,12 +4225,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "4e7e2bafd139b430dfe59d987f5caaeeff2c2bbc" + "reference": "b2eae5c3b4f12ef9ddaa40118fa8119be6705cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/4e7e2bafd139b430dfe59d987f5caaeeff2c2bbc", - "reference": "4e7e2bafd139b430dfe59d987f5caaeeff2c2bbc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/b2eae5c3b4f12ef9ddaa40118fa8119be6705cab", + "reference": "b2eae5c3b4f12ef9ddaa40118fa8119be6705cab", "shasum": "" }, "default-branch": true, @@ -4246,7 +4243,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2022-05-25T07:04:38+00:00" + "time": "2022-11-03T07:13:59+00:00" }, { "name": "drupal/helfi_hauki", @@ -4352,16 +4349,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "1.0.6", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945" + "reference": "63826cd16929888b7e517e4205faea2b8f342811" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/3003eb95f3c51800391009bdbdd58cb1092ed945", - "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/63826cd16929888b7e517e4205faea2b8f342811", + "reference": "63826cd16929888b7e517e4205faea2b8f342811", "shasum": "" }, "require": { @@ -4378,23 +4375,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2022-10-14T11:05:06+00:00" + "time": "2022-11-08T07:53:12+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "2.13.6", + "version": "2.13.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c8496487f8595dec1921d1e87b65650873fb7755" + "reference": "d13b2b7ab66eedbed5af5c5896b5eb1973c90973" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c8496487f8595dec1921d1e87b65650873fb7755", - "reference": "c8496487f8595dec1921d1e87b65650873fb7755", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d13b2b7ab66eedbed5af5c5896b5eb1973c90973", + "reference": "d13b2b7ab66eedbed5af5c5896b5eb1973c90973", "shasum": "" }, "require": { @@ -4414,7 +4411,7 @@ "drupal/elasticsearch_connector": "^7.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", - "drupal/eu_cookie_compliance": "1.19", + "drupal/eu_cookie_compliance": "^1.24", "drupal/external_entities": "^2.0@alpha", "drupal/features": "^3.12", "drupal/field_group": "^3.1", @@ -4475,8 +4472,7 @@ "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/d1a6866b2138f7d3597df79f395a5c1a9e19ee2e/patches/eu_cookie_compliance_block_8.x-1.19.patch", - "[#UHF-2956] Fix JavaScript error at cookie preference page": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/97683d32e57808a4c9a4f6a2d20757af7a0b8c37/patches/eu_cookie_compliance_js_error_8.x-1.19-patched.patch" + "[#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/features": { "https://www.drupal.org/project/features/issues/2869336": "https://www.drupal.org/files/issues/features_export-config-translation-2869336-2.patch" @@ -4504,34 +4500,36 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-19T07:23:46+00:00" + "time": "2022-11-08T13:18:34+00:00" }, { "name": "drupal/helfi_proxy", - "version": "2.2.8", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "e75e953316a551a2075ddb7edad8b09128b19723" + "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/e75e953316a551a2075ddb7edad8b09128b19723", - "reference": "e75e953316a551a2075ddb7edad8b09128b19723", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", + "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", "shasum": "" }, "require": { "drupal/helfi_api_base": "*", "drupal/purge": "^3.0", - "drupal/redirect": "^1.0", "drupal/varnish_purge": "^2.1", "ext-dom": "*", "ext-libxml": "*", "php": "^8.0" }, + "conflict": { + "drupal/helfi_tunnistamo": "<=2.2.1" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", @@ -4543,33 +4541,36 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-10-25T06:04:50+00:00" + "time": "2022-11-08T11:03:23+00:00" }, { "name": "drupal/helfi_tpr", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "da4349755942c53939b31e3fe0bca04f408ce851" + "reference": "5ed2a62fb51909446690421c0a89bcee38576b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/da4349755942c53939b31e3fe0bca04f408ce851", - "reference": "da4349755942c53939b31e3fe0bca04f408ce851", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/5ed2a62fb51909446690421c0a89bcee38576b63", + "reference": "5ed2a62fb51909446690421c0a89bcee38576b63", "shasum": "" }, "require": { "drupal/address": "~1.0", - "drupal/helfi_api_base": "^2.0 || dev-main", + "drupal/helfi_api_base": "*", "drupal/readonly_field_widget": "^1.0", "drupal/twig_tweak": "^2.0 || ^3.0", "drupal/views_infinite_scroll": "^2.0", "php": "^8.0" }, + "conflict": { + "drupal/helfi_api_base": "<2.0" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", @@ -4581,27 +4582,28 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2022-09-02T12:21:35+00:00" + "time": "2022-10-27T05:58:29+00:00" }, { "name": "drupal/helfi_tunnistamo", - "version": "2.1.0", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "c81fcf4d430c6ba63dc92a4d2598be777867c247" + "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/c81fcf4d430c6ba63dc92a4d2598be777867c247", - "reference": "c81fcf4d430c6ba63dc92a4d2598be777867c247", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/b5329b75572bc00b4995c02d717cf168d5ccfa3b", + "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b", "shasum": "" }, "require": { - "drupal/openid_connect": "^2.0" + "drupal/helfi_api_base": "*", + "drupal/openid_connect": "^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -4613,10 +4615,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.1.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2022-10-10T12:19:37+00:00" + "time": "2022-11-08T10:24:33+00:00" }, { "name": "drupal/image_style_quality", @@ -5278,20 +5280,20 @@ }, { "name": "drupal/openid_connect", - "version": "2.0.0-alpha12", + "version": "3.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "2.0.0-alpha12" + "reference": "3.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-2.0.0-alpha12.zip", - "reference": "2.0.0-alpha12", - "shasum": "6680cdd5875c80cb6e9f28bd0bea7d0278230931" + "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha2.zip", + "reference": "3.0.0-alpha2", + "shasum": "7fedeecb38edc1785f4de01240275a29035a60d0" }, "require": { - "drupal/core": "^8.8 || ^9", + "drupal/core": "^9.3 || ^10", "drupal/externalauth": "*", "ext-json": "*", "php": ">=7.1.0" @@ -5299,8 +5301,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-alpha12", - "datestamp": "1640197185", + "version": "3.0.0-alpha2", + "datestamp": "1666251361", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -5312,10 +5314,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "balintk", - "homepage": "https://www.drupal.org/user/613760" - }, { "name": "bojanz", "homepage": "https://www.drupal.org/user/86106" @@ -5324,10 +5322,6 @@ "name": "jcnventura", "homepage": "https://www.drupal.org/user/122464" }, - { - "name": "Mario Steinitz", - "homepage": "https://www.drupal.org/user/2536014" - }, { "name": "pfrilling", "homepage": "https://www.drupal.org/user/169695" @@ -5336,10 +5330,6 @@ "name": "pjcdawkins", "homepage": "https://www.drupal.org/user/1025236" }, - { - "name": "robertDouglass", - "homepage": "https://www.drupal.org/user/5449" - }, { "name": "sanduhrs", "homepage": "https://www.drupal.org/user/28074" @@ -6035,17 +6025,17 @@ }, { "name": "drupal/search_api", - "version": "1.27.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.27" + "reference": "8.x-1.28" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.27.zip", - "reference": "8.x-1.27", - "shasum": "b8c9a055fe43435c09231fd93d3e07c5d2863a46" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.28.zip", + "reference": "8.x-1.28", + "shasum": "d3ae0bb3cf17c986d5e0c6edb87aee6580b6fc1e" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -6066,8 +6056,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.27", - "datestamp": "1666211720", + "version": "8.x-1.28", + "datestamp": "1667814116", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7426,16 +7416,16 @@ }, { "name": "ezimuel/ringphp", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/ezimuel/ringphp.git", - "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74" + "reference": "8d00384f9e5c04713ef8448adf47824265791b50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/92b8161404ab1ad84059ebed41d9f757e897ce74", - "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74", + "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/8d00384f9e5c04713ef8448adf47824265791b50", + "reference": "8d00384f9e5c04713ef8448adf47824265791b50", "shasum": "" }, "require": { @@ -7477,9 +7467,9 @@ ], "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", "support": { - "source": "https://github.com/ezimuel/ringphp/tree/1.2.0" + "source": "https://github.com/ezimuel/ringphp/tree/1.2.1" }, - "time": "2021-11-16T11:51:30+00:00" + "time": "2022-10-25T12:54:22+00:00" }, { "name": "ezyang/htmlpurifier", @@ -10821,16 +10811,16 @@ }, { "name": "symfony/console", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", + "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", "shasum": "" }, "require": { @@ -10891,7 +10881,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.47" + "source": "https://github.com/symfony/console/tree/v4.4.48" }, "funding": [ { @@ -10907,7 +10897,7 @@ "type": "tidelift" } ], - "time": "2022-10-04T05:58:30+00:00" + "time": "2022-10-26T16:02:45+00:00" }, { "name": "symfony/debug", @@ -11489,16 +11479,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "8a3929c814cba77db93de61c22759e0dbeaa4c87" + "reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/8a3929c814cba77db93de61c22759e0dbeaa4c87", - "reference": "8a3929c814cba77db93de61c22759e0dbeaa4c87", + "url": "https://api.github.com/repos/symfony/http-client/zipball/8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b", + "reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b", "shasum": "" }, "require": { @@ -11556,7 +11546,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.14" + "source": "https://github.com/symfony/http-client/tree/v5.4.15" }, "funding": [ { @@ -11572,7 +11562,7 @@ "type": "tidelift" } ], - "time": "2022-10-11T15:16:01+00:00" + "time": "2022-10-25T16:22:13+00:00" }, { "name": "symfony/http-client-contracts", @@ -11654,16 +11644,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811" + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", "shasum": "" }, "require": { @@ -11702,7 +11692,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" }, "funding": [ { @@ -11718,20 +11708,20 @@ "type": "tidelift" } ], - "time": "2022-10-01T21:39:02+00:00" + "time": "2022-10-12T09:40:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", "shasum": "" }, "require": { @@ -11806,7 +11796,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.48" }, "funding": [ { @@ -11822,7 +11812,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:05:45+00:00" + "time": "2022-10-28T16:49:22+00:00" }, { "name": "symfony/mime", @@ -13216,16 +13206,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" + "reference": "54781a4c41efbd283b779110bf8ae7f263737775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", + "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", + "reference": "54781a4c41efbd283b779110bf8ae7f263737775", "shasum": "" }, "require": { @@ -13302,7 +13292,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.47" + "source": "https://github.com/symfony/validator/tree/v4.4.48" }, "funding": [ { @@ -13318,7 +13308,7 @@ "type": "tidelift" } ], - "time": "2022-10-01T17:13:09+00:00" + "time": "2022-10-25T13:54:11+00:00" }, { "name": "symfony/var-dumper", @@ -15560,16 +15550,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.17", + "version": "9.2.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "shasum": "" }, "require": { @@ -15625,7 +15615,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" }, "funding": [ { @@ -15633,7 +15623,7 @@ "type": "github" } ], - "time": "2022-08-30T12:24:04+00:00" + "time": "2022-10-27T13:35:33+00:00" }, { "name": "phpunit/php-file-iterator", @@ -15878,16 +15868,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.25", + "version": "9.5.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", "shasum": "" }, "require": { @@ -15960,7 +15950,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" }, "funding": [ { @@ -15976,7 +15966,7 @@ "type": "tidelift" } ], - "time": "2022-09-25T03:44:45+00:00" + "time": "2022-10-28T06:00:21+00:00" }, { "name": "sebastian/cli-parser", diff --git a/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml new file mode 100644 index 00000000..93192bc6 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml @@ -0,0 +1,78 @@ +uuid: 7df1901f-3c86-41a6-a63c-007d317f6c62 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.news_list.field_helfi_news_groups + - field.field.paragraph.news_list.field_helfi_news_neighbourhoods + - field.field.paragraph.news_list.field_helfi_news_tags + - field.field.paragraph.news_list.field_limit + - field.field.paragraph.news_list.field_news_list_description + - field.field.paragraph.news_list.field_news_list_title + - paragraphs.paragraphs_type.news_list + module: + - select2 + - text +_core: + default_config_hash: I_u6U4oQKvo0EjopuKoM3qEFFz3lzE8J-jWIN0OJqYg +id: paragraph.news_list.default +targetEntityType: paragraph +bundle: news_list +mode: default +content: + field_helfi_news_groups: + type: select2_entity_reference + weight: 4 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_helfi_news_neighbourhoods: + type: select2_entity_reference + weight: 5 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_helfi_news_tags: + type: select2_entity_reference + weight: 3 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_limit: + type: number + weight: 2 + region: content + settings: + placeholder: '' + third_party_settings: { } + field_news_list_description: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_news_list_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml index f9380c50..cc4a39d7 100644 --- a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml @@ -45,11 +45,7 @@ content: duplicate: duplicate third_party_settings: { } field_phasing_item_title_level: - type: options_select - weight: 4 region: content - settings: { } - third_party_settings: { } field_phasing_title_level: type: options_select weight: 0 diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml new file mode 100644 index 00000000..819cdd56 --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -0,0 +1,38 @@ +uuid: 329d2e65-7a59-488a-84b2-0ebb7b1bc7c0 +langcode: en +status: true +dependencies: + module: + - external_entities + - imagecache_external +_core: + default_config_hash: k-bIvgFdaVICd0s60Gng2zWabkpeZTQ53HF1Eff7zDk +id: helfi_news.helfi_news.default +targetEntityType: helfi_news +bundle: helfi_news +mode: default +content: + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: gallery_thumbnail + third_party_settings: { } + weight: 1 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + groups: true + neighbourhoods: true + node_url: true + published_at: true + short_title: true + tags: true diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml new file mode 100644 index 00000000..450043d1 --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -0,0 +1,40 @@ +uuid: 3b524002-16df-4f5b-87fd-ce8103a92cc3 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.helfi_news.medium_teaser + module: + - external_entities + - imagecache_external +_core: + default_config_hash: XArB74ImuiEIsNGh_ic_b4csmzDUre1hUeswj9kCiOc +id: helfi_news.helfi_news.medium_teaser +targetEntityType: helfi_news +bundle: helfi_news +mode: medium_teaser +content: + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: gallery_thumbnail + third_party_settings: { } + weight: 1 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + groups: true + neighbourhoods: true + node_url: true + published_at: true + short_title: true + tags: true diff --git a/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml new file mode 100644 index 00000000..8fece137 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml @@ -0,0 +1,70 @@ +uuid: ef83b857-16d7-4f2b-93d2-b4d9c1e1d5ab +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.news_list.field_helfi_news_groups + - field.field.paragraph.news_list.field_helfi_news_neighbourhoods + - field.field.paragraph.news_list.field_helfi_news_tags + - field.field.paragraph.news_list.field_limit + - field.field.paragraph.news_list.field_news_list_description + - field.field.paragraph.news_list.field_news_list_title + - paragraphs.paragraphs_type.news_list + module: + - text +_core: + default_config_hash: eCdT_XU1aIhxOLfurTn16KTFSsxHyWZu3HHm3q_5Mi8 +id: paragraph.news_list.default +targetEntityType: paragraph +bundle: news_list +mode: default +content: + field_helfi_news_groups: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 3 + region: content + field_helfi_news_neighbourhoods: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 5 + region: content + field_helfi_news_tags: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 4 + region: content + field_news_list_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_news_list_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + news_list: + settings: { } + third_party_settings: { } + weight: 2 + region: content +hidden: + field_limit: true diff --git a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml index b82f96d9..61a9b05a 100644 --- a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml @@ -35,13 +35,6 @@ content: third_party_settings: { } weight: 2 region: content - field_phasing_item_title_level: - type: list_default - label: hidden - settings: { } - third_party_settings: { } - weight: 3 - region: content field_phasing_title_level: type: list_key label: hidden @@ -67,4 +60,5 @@ content: third_party_settings: { } weight: 0 region: content -hidden: { } +hidden: + field_phasing_item_title_level: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index f9dffcf4..a5f6ac2f 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 @@ -155,8 +155,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 3 region: content 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 c5532712..1b48f503 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 @@ -46,8 +46,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content 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 f6533836..3be43e8a 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 @@ -47,8 +47,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content 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 15e099e0..6c34169a 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 @@ -60,8 +60,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml new file mode 100644 index 00000000..4b5c070c --- /dev/null +++ b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml @@ -0,0 +1,12 @@ +uuid: 7aae4199-2b1c-4d4f-8168-190a37a3c85e +langcode: en +status: true +dependencies: + module: + - external_entities +_core: + default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk +id: helfi_news.medium_teaser +label: 'Medium Teaser' +targetEntityType: helfi_news +cache: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 03b3d97c..bfb46c3a 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -28,11 +28,11 @@ module: entity: 0 entity_reference_revisions: 0 entity_usage: 0 + external_entities: 0 field: 0 field_group: 0 field_ui: 0 file: 0 - filelog: 0 filter: 0 flysystem: 0 flysystem_azure: 0 @@ -58,6 +58,7 @@ module: helfi_media_map: 0 helfi_media_map_config: 0 helfi_navigation: 0 + helfi_news_feed: 0 helfi_news_item: 0 helfi_platform_config: 0 helfi_proxy: 0 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index 6ffa0de9..a110ecce 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -74,3 +74,7 @@ cookie_value_disagreed: '0' cookie_value_agreed_show_thank_you: '1' cookie_value_agreed: '2' accessibility_focus: false +close_button_action: close_banner +reject_button_label: '' +reject_button_enabled: false +close_button_enabled: false diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml new file mode 100644 index 00000000..b7b1cba5 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -0,0 +1,42 @@ +uuid: a59907e9-8dfe-482c-a091-df1469e35bd4 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: BzWvGC8hEXxFUxhZtUxQ30sNFcsZNIAFC5JX9okISYY +id: helfi_news +label: 'Helfi: News' +label_plural: 'Helfi: News' +description: '' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes[''title'']' + main_image: + uri: '$.relationships[''main_image''][''data''][''relationships''][''media_image''][''data''][''attributes''][''uri''][''url'']' + title: '$.relationships[''main_image''][''data''][''relationships''][''media_image''][''data''][''meta''][''alt'']' + tags: + value: '$.relationships[''tags''][''data''][*][''attributes''][''name'']' + groups: + value: '$.relationships[''groups''][''data''][*][''attributes''][''name'']' + neighbourhoods: + value: '$.relationships[''neighbourhoods''][''data''][*][''attributes''][''name'']' + node_url: + value: '$.attributes[''path''][''alias'']' + published_at: + value: '$.attributes[''published_at'']' + short_title: + value: '$.attributes[''short_title'']' +storage_client_id: helfi_news +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml new file mode 100644 index 00000000..3d811999 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -0,0 +1,27 @@ +uuid: 56fd142f-ec0a-4fed-a7f0-1b9ceb68fa86 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: XSm-lbRmOWP_eJRFTo14HMiNtxsc5scm42lmq8Qjcy8 +id: helfi_news_groups +label: 'Helfi: News groups' +label_plural: 'Helfi: News groups' +description: 'Retrieves news groups taxonomy terms from Helfi' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["name"]' +storage_client_id: helfi_news_groups +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..bfe3b1e6 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -0,0 +1,27 @@ +uuid: 2b6debc8-d0d4-4619-9643-afced4bc4aa2 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: h4y6pjlsSfKM9cgEi9tWGsJ57_zj1b4CelECji9A1Y0 +id: helfi_news_neighbourhoods +label: 'Helfi: News neighbourhoods' +label_plural: 'Helfi: News neighbourhoods' +description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["name"]' +storage_client_id: helfi_news_neighbourhoods +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml new file mode 100644 index 00000000..648ac2ee --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -0,0 +1,27 @@ +uuid: 4e92ee4b-afff-46b0-87ad-b588041894cf +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: wkWXjXpGr6lPWM3nZ-8RqlBCt7nsAuHiP7EC1Vh4oMc +id: helfi_news_tags +label: 'Helfi: News tags' +label_plural: 'Helfi: News tags' +description: 'Retrieves news tags taxonomy terms from Helfi' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["name"]' +storage_client_id: helfi_news_tags +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index dfa7096d..86c24fe7 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -6,15 +6,21 @@ dependencies: - field.storage.node.field_content - node.type.landing_page - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.content_liftup + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map + - paragraphs.paragraphs_type.news_list + - paragraphs.paragraphs_type.phasing + - paragraphs.paragraphs_type.popular_services - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.service_list + - paragraphs.paragraphs_type.target_group_links - paragraphs.paragraphs_type.unit_search module: - entity_reference_revisions @@ -50,6 +56,7 @@ settings: phasing: phasing popular_services: popular_services target_group_links: target_group_links + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -103,6 +110,9 @@ settings: map: weight: -20 enabled: true + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 00b0f34f..29ec2327 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -7,16 +7,19 @@ dependencies: - node.type.page - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - - paragraphs.paragraphs_type.content_cards + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_liftup + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - - paragraphs.paragraphs_type.gallery - 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 - - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.unit_search module: - entity_reference_revisions @@ -51,6 +54,7 @@ settings: contact_card_listing: contact_card_listing event_list: event_list phasing: phasing + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -110,6 +114,9 @@ settings: map: weight: 31 enabled: true + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index e0a686be..51520e54 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -7,16 +7,20 @@ dependencies: - node.type.page - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.content_liftup + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - - paragraphs.paragraphs_type.gallery - 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 - - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.unit_search module: - entity_reference_revisions @@ -52,6 +56,7 @@ settings: contact_card_listing: contact_card_listing event_list: event_list phasing: phasing + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -111,6 +116,9 @@ settings: map: weight: 31 enabled: true + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml new file mode 100644 index 00000000..e050a845 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml @@ -0,0 +1,28 @@ +uuid: e75f3572-6ba6-4b0e-b360-9f08438503f6 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_helfi_news_groups + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: nmozVFbkBc-ubKtpWG_OgdeT4yNxsLcsbBYaGDHRnUQ +id: paragraph.news_list.field_helfi_news_groups +field_name: field_helfi_news_groups +entity_type: paragraph +bundle: news_list +label: 'Helfi groups' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:helfi_news_groups' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..f9ecf461 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml @@ -0,0 +1,28 @@ +uuid: f68896e2-fb6a-49a1-ac7f-c788c56e7669 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_helfi_news_neighbourhoods + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: If5nJKeaunQ7ITUWZ4daCyykb7mslZDLTVrLX7Gd1Qw +id: paragraph.news_list.field_helfi_news_neighbourhoods +field_name: field_helfi_news_neighbourhoods +entity_type: paragraph +bundle: news_list +label: 'Helfi neighbourhoods' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:helfi_news_neighbourhoods' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml new file mode 100644 index 00000000..00a69305 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml @@ -0,0 +1,28 @@ +uuid: ce711f5f-ebb2-4e3c-8282-adc687a9d2e4 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_helfi_news_tags + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: imhJdbO9eLYZPslj0VosAANrRZBizg4wyPgIYQ3SOXc +id: paragraph.news_list.field_helfi_news_tags +field_name: field_helfi_news_tags +entity_type: paragraph +bundle: news_list +label: 'Helfi tags' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:helfi_news_tags' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.news_list.field_limit.yml b/conf/cmi/field.field.paragraph.news_list.field_limit.yml new file mode 100644 index 00000000..da5655a3 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_limit.yml @@ -0,0 +1,27 @@ +uuid: 71dbcc9d-a632-49a3-ab84-e4172def707a +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_limit + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: U69lOLLSGh16cOtXvhZr3E_x2lmlZOfxD0CmQeIMb6U +id: paragraph.news_list.field_limit +field_name: field_limit +entity_type: paragraph +bundle: news_list +label: 'Number of items to show' +description: '' +required: true +translatable: false +default_value: + - + value: 10 +default_value_callback: '' +settings: + min: 1 + max: 50 + prefix: '' + suffix: '' +field_type: integer diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml new file mode 100644 index 00000000..c1b19b2a --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml @@ -0,0 +1,28 @@ +uuid: 7c70e82c-2a88-4ed9-b91c-23c839632106 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_news_list_description + - paragraphs.paragraphs_type.news_list + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - minimal +_core: + default_config_hash: EIpWpSFct6BBIBWOTpd87zJbnbSe0QLPeFLW9-LP1-o +id: paragraph.news_list.field_news_list_description +field_name: field_news_list_description +entity_type: paragraph +bundle: news_list +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml new file mode 100644 index 00000000..3a1be33c --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml @@ -0,0 +1,21 @@ +uuid: 00f2368b-5058-4eee-88da-fa8b59071bbf +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_news_list_title + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: BVbXiEVCf8X8ZJUYKyiiyevct1RogayM-YXEWiSnuDw +id: paragraph.news_list.field_news_list_title +field_name: field_news_list_title +entity_type: paragraph +bundle: news_list +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string 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 75c96b9c..f9812800 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 @@ -9,11 +9,13 @@ dependencies: - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.from_library - - paragraphs.paragraphs_type.gallery - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.news_list + - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.event_list module: - entity_reference_revisions - helfi_tpr @@ -43,6 +45,8 @@ settings: remote_video: remote_video liftup_with_image: liftup_with_image phasing: phasing + news_list: news_list + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -60,6 +64,9 @@ settings: content_cards: weight: -23 enabled: true + event_list: + weight: 44 + enabled: true from_library: weight: 21 enabled: true @@ -84,6 +91,9 @@ settings: list_of_links_item: weight: -17 enabled: false + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true 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 4b96a1d3..4a4c6dbc 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 @@ -7,13 +7,15 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.from_library - - paragraphs.paragraphs_type.gallery - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.event_list module: - entity_reference_revisions - helfi_tpr @@ -43,6 +45,8 @@ settings: remote_video: remote_video liftup_with_image: liftup_with_image contact_card_listing: contact_card_listing + news_list: news_list + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -66,6 +70,9 @@ settings: content_cards: weight: -23 enabled: true + event_list: + weight: 44 + enabled: true from_library: weight: 21 enabled: true @@ -90,6 +97,9 @@ settings: list_of_links_item: weight: -17 enabled: false + news_list: + weight: 30 + enabled: true remote_video: weight: 32 enabled: true diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml new file mode 100644 index 00000000..55be01d0 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml @@ -0,0 +1,22 @@ +uuid: d935ab2e-b5cd-4063-9a9a-b3c36d791c3a +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: _fM_KH15dd3VWM1oQkpfJUipPHD3pK-CiqLPcuj5ssQ +id: paragraph.field_helfi_news_groups +field_name: field_helfi_news_groups +entity_type: paragraph +type: entity_reference +settings: + target_type: helfi_news_groups +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..94fdf747 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml @@ -0,0 +1,22 @@ +uuid: 0166275b-b1c3-40a9-939c-a1ea00b8426a +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: VVgm-VdlvDCYm-mIewtHi0RZp_7pCoE94esxuAat4CE +id: paragraph.field_helfi_news_neighbourhoods +field_name: field_helfi_news_neighbourhoods +entity_type: paragraph +type: entity_reference +settings: + target_type: helfi_news_neighbourhoods +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml new file mode 100644 index 00000000..7ec66946 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml @@ -0,0 +1,22 @@ +uuid: 70e00479-6e14-46df-8f77-bccd5c85cf5e +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: nWHDiteOOAcjVLeo90MtcJBVL0ABYuABPztRIvhiv_0 +id: paragraph.field_helfi_news_tags +field_name: field_helfi_news_tags +entity_type: paragraph +type: entity_reference +settings: + target_type: helfi_news_tags +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_limit.yml b/conf/cmi/field.storage.paragraph.field_limit.yml new file mode 100644 index 00000000..019277eb --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_limit.yml @@ -0,0 +1,22 @@ +uuid: f3b429e9-b861-4d65-8d0c-4bcd005d7e0d +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: BN27jqBir0CqxJ0z1RtYc8WNNohSkDdtzv_9l-HRKhk +id: paragraph.field_limit +field_name: field_limit +entity_type: paragraph +type: integer +settings: + unsigned: false + size: normal +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_news_list_description.yml b/conf/cmi/field.storage.paragraph.field_news_list_description.yml new file mode 100644 index 00000000..f846cf21 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_news_list_description.yml @@ -0,0 +1,21 @@ +uuid: 3d0ae2d7-d68b-43c4-923f-3d3a792ee224 +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +_core: + default_config_hash: V_erLPi4c9bT-uhAlgcpJJX8LbR02Btsi8yzMVAIpo4 +id: paragraph.field_news_list_description +field_name: field_news_list_description +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_news_list_title.yml b/conf/cmi/field.storage.paragraph.field_news_list_title.yml new file mode 100644 index 00000000..8884fe0b --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_news_list_title.yml @@ -0,0 +1,23 @@ +uuid: 25f2b9e0-acc3-4f0b-9a1a-2d055214bd36 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: xapLq-jZodnhyWktgf76RTu9dEBAgWBq-ay41DJpsXQ +id: paragraph.field_news_list_title +field_name: field_news_list_title +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/filelog.settings.yml b/conf/cmi/filelog.settings.yml deleted file mode 100644 index a8eca49f..00000000 --- a/conf/cmi/filelog.settings.yml +++ /dev/null @@ -1,13 +0,0 @@ -_core: - default_config_hash: uVSFqX1MwFixVjXjlh72ukQ8LKPgMKNi2raycY9vt3w -enabled: true -location: 'public://logs' -rotation: - schedule: daily - delete: false - destination: 'archive/[date:custom:Y/m/d].log' - gzip: true -format: '[[log:created]] [[log:level]] [[log:channel]] [client: [log:ip], [log:user]] [log:message]' -level: 7 -channels_type: exclude -channels: { } diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index 3ad7c944..f1b09a5f 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -7,7 +7,3 @@ site_settings: koro: basic footer_settings: footer_color: dark - footer_top_title: 'Contact us' - footer_top_content: - value: "\r\n" - format: full_html diff --git a/conf/cmi/imagecache_external.settings.yml b/conf/cmi/imagecache_external.settings.yml index f2a4dff7..49a21c55 100644 --- a/conf/cmi/imagecache_external.settings.yml +++ b/conf/cmi/imagecache_external.settings.yml @@ -1,11 +1,12 @@ _core: default_config_hash: sYKKIgXKwriRVKA1-QEKqToS8jwnr-TasvZwHT0Asek imagecache_directory: externals +imagecache_subdirectories: false imagecache_default_extension: .jpg imagecache_external_batch_flush_limit: 1000 imagecache_external_hosts: '' imagecache_external_management: unmanaged -imagecache_external_use_whitelist: 1 +imagecache_external_use_whitelist: true imagecache_fallback_image: 0 imagecache_external_allowed_mimetypes: - image/jpg @@ -21,5 +22,6 @@ imagecache_external_allowed_mimetypes: - binary/octet-stream - image/webp - image/webp;charset=utf-8 + - image/webp + - image/webp;charset=utf-8 imagecache_external_cron_flush_frequency: 0 -imagecache_subdirectories: false diff --git a/conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml b/conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml new file mode 100644 index 00000000..47b7b1f8 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml @@ -0,0 +1 @@ +label: Kohderyhmät diff --git a/conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml b/conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml new file mode 100644 index 00000000..07ef95b4 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml @@ -0,0 +1 @@ +label: Kaupunginosat diff --git a/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.social_media_link.field_icon.yml b/conf/cmi/language/fi/field.field.paragraph.social_media_link.field_icon.yml new file mode 100644 index 00000000..745b2474 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.social_media_link.field_icon.yml @@ -0,0 +1 @@ +label: Ikoni diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml index cc820284..da2c6288 100644 --- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml @@ -1,7 +1,3 @@ site_settings: theme_color: gold default_icon: star-fill -footer_settings: - footer_top_content: - value: "\r\n" - footer_top_title: 'Ota yhteyttä' diff --git a/conf/cmi/language/fi/views.view.news.yml b/conf/cmi/language/fi/views.view.news.yml index efac704e..ecc43270 100644 --- a/conf/cmi/language/fi/views.view.news.yml +++ b/conf/cmi/language/fi/views.view.news.yml @@ -1,9 +1,20 @@ +label: 'Platform News' display: - latest_news: - display_title: 'Uusimmat uutiset' default: + display_title: Oletus display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti fields: + published_at: + separator: ', ' + field_main_image: + separator: ', ' view_node: text: näkymä title: 'Uusimmat uutiset' @@ -11,3 +22,5 @@ display: nid: exception: title: Kaikki + latest_news: + display_title: 'Uusimmat uutiset' diff --git a/conf/cmi/language/sv/block.block.views_block__news_latest_news.yml b/conf/cmi/language/sv/block.block.views_block__news_latest_news.yml index 0f44ef3d..49f95141 100644 --- a/conf/cmi/language/sv/block.block.views_block__news_latest_news.yml +++ b/conf/cmi/language/sv/block.block.views_block__news_latest_news.yml @@ -1,3 +1,3 @@ settings: - label: 'Senaste nyheter' - views_label: 'Senaste nyheter' + label: 'Senaste nyheterna' + views_label: 'Senaste nyheterna' diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.contact_card.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.contact_card.default.yml new file mode 100644 index 00000000..a6a50d20 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.contact_card.default.yml @@ -0,0 +1,5 @@ +content: + field_contact_social_media: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.contact_card_listing.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.contact_card_listing.default.yml new file mode 100644 index 00000000..2eaf4858 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.contact_card_listing.default.yml @@ -0,0 +1,5 @@ +content: + field_contact_card: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml new file mode 100644 index 00000000..f891adbb --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml @@ -0,0 +1,5 @@ +content: + field_service_items: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml new file mode 100644 index 00000000..2711e04d --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml @@ -0,0 +1 @@ +label: Titel diff --git a/conf/cmi/language/sv/field.field.paragraph.popular_service_item.field_service_links.yml b/conf/cmi/language/sv/field.field.paragraph.popular_service_item.field_service_links.yml index 63f41800..822b8532 100644 --- a/conf/cmi/language/sv/field.field.paragraph.popular_service_item.field_service_links.yml +++ b/conf/cmi/language/sv/field.field.paragraph.popular_service_item.field_service_links.yml @@ -1 +1 @@ -label: Links +label: Länkar diff --git a/conf/cmi/language/sv/field.field.paragraph.social_media_link.field_icon.yml b/conf/cmi/language/sv/field.field.paragraph.social_media_link.field_icon.yml new file mode 100644 index 00000000..b0310013 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.social_media_link.field_icon.yml @@ -0,0 +1 @@ +label: Ikon diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml index b9c994fd..da2c6288 100644 --- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml @@ -1,7 +1,3 @@ site_settings: theme_color: gold default_icon: star-fill -footer_settings: - footer_top_content: - value: "\r\n" - footer_top_title: 'Ta kontakt' diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml new file mode 100644 index 00000000..93bfcdce --- /dev/null +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml @@ -0,0 +1 @@ +label: Kontaktkort diff --git a/conf/cmi/language/sv/views.view.news.yml b/conf/cmi/language/sv/views.view.news.yml index 87afa438..6b71a5e2 100644 --- a/conf/cmi/language/sv/views.view.news.yml +++ b/conf/cmi/language/sv/views.view.news.yml @@ -1,7 +1,20 @@ +label: 'Platform News' display: default: + display_title: Förvald display_options: + exposed_form: + options: + submit_button: Apply + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande fields: + published_at: + separator: ', ' + field_main_image: + separator: ', ' view_node: text: visa title: 'Senaste nyheterna' diff --git a/conf/cmi/openid_connect.client.tunnistamo.yml b/conf/cmi/openid_connect.client.tunnistamo.yml index bf6c8fc3..6111e35f 100644 --- a/conf/cmi/openid_connect.client.tunnistamo.yml +++ b/conf/cmi/openid_connect.client.tunnistamo.yml @@ -10,6 +10,7 @@ plugin: tunnistamo settings: client_id: placeholder client_secret: placeholder + iss_allowed_domains: '' is_production: 0 auto_login: 0 environment_url: 'https://tunnistamo.test.hel.ninja' diff --git a/conf/cmi/openid_connect.settings.yml b/conf/cmi/openid_connect.settings.yml index 7ebee409..2bbbb0a9 100644 --- a/conf/cmi/openid_connect.settings.yml +++ b/conf/cmi/openid_connect.settings.yml @@ -3,6 +3,7 @@ _core: always_save_userinfo: true connect_existing_users: true override_registration_settings: true +end_session_enabled: true user_login_display: above userinfo_mappings: timezone: zoneinfo diff --git a/conf/cmi/paragraphs.paragraphs_type.news_list.yml b/conf/cmi/paragraphs.paragraphs_type.news_list.yml new file mode 100644 index 00000000..1e278ba5 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.news_list.yml @@ -0,0 +1,12 @@ +uuid: 8aa456d3-7bb6-4914-ac18-4383d3d44ebc +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: 4NG1c_DFfBfzUCPfnwS5Sneo_G7lU_0YRfarh-p749M +id: news_list +label: 'News list' +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } diff --git a/docker/openshift/crons/content-scheduler.sh b/docker/openshift/crons/content-scheduler.sh index f5b2eb52..e495c6e4 100644 --- a/docker/openshift/crons/content-scheduler.sh +++ b/docker/openshift/crons/content-scheduler.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "Running content-scheduler" - while true do drush scheduler:cron -q diff --git a/docker/openshift/crons/drupal.sh b/docker/openshift/crons/drupal.sh deleted file mode 100644 index e72929ef..00000000 --- a/docker/openshift/crons/drupal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -echo "Running Drupal cron" - -while true -do - drush cron - sleep 600 -done diff --git a/docker/openshift/crons/migrate-tpr.sh b/docker/openshift/crons/migrate-tpr.sh index e537503c..08006f13 100644 --- a/docker/openshift/crons/migrate-tpr.sh +++ b/docker/openshift/crons/migrate-tpr.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "Running TPR Migrations: $(date)" - function populate_variables { # Generate variables used to control which migrates needs # to be reset and which ones needs to be skipped based on @@ -46,19 +44,19 @@ do if run_migrate "tpr_unit"; then echo "Running TPR Unit migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_unit + PARTIAL_MIGRATE=1 drush migrate:import tpr_unit --no-progress fi if run_migrate "tpr_service"; then echo "Running TPR Service migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_service + PARTIAL_MIGRATE=1 drush migrate:import tpr_service --no-progress fi if run_migrate "tpr_errand_service"; then echo "Running TPR Errand Service migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service + PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service --no-progress fi if run_migrate "tpr_service_channel"; then echo "Running TPR Service Channel migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel + PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel --no-progress fi # Reset migrate status if migrate has been running for more # than 12 hours. diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh index 7c7bbc0f..d74ef3c4 100644 --- a/docker/openshift/crons/purge-queue.sh +++ b/docker/openshift/crons/purge-queue.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "Running purge queue: $(date)" - function has_items { NUM_ITEMS=$(drush p:queue-stats --format=json | jq .number_of_items) @@ -14,8 +12,7 @@ function has_items { while true do if has_items; then - echo "Flushing purge queue: $(date)" - drush p:queue-work --no-interaction -q --finish + drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}' fi # Sleep for 60 seconds. sleep 60 diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 7507c1c0..2b34ca81 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -221,8 +221,16 @@ include __DIR__ . '/' . $env . '.settings.php'; } - if (file_exists(__DIR__ . '/' . $env . '.services.yml')) { - $settings['container_yamls'][] = __DIR__ . '/' . $env . '.services.yml'; + $servicesFiles = [ + 'services.yml', + 'all.services.yml', + $env . '.services.yml', + ]; + + foreach ($servicesFiles as $fileName) { + if (file_exists(__DIR__ . '/' . $fileName)) { + $settings['container_yamls'][] = __DIR__ . '/' . $fileName; + } } if (getenv('OPENSHIFT_BUILD_NAMESPACE') && file_exists(__DIR__ . '/azure.settings.php')) { diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 7f148f2e..00000000 --- a/renovate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": [ - "config:base", - ":disableRateLimiting", - ":preserveSemverRanges", - "github>druidfi/renovate-config:drupal", - "github>druidfi/renovate-config:js" - ], - "dependencyDashboard": true, - "prConcurrentLimit": 10, - "packageRules": [ - { - "matchLanguages": ["php"], - "rangeStrategy": "update-lockfile" - } - ] -}