From 6f66a53aa4c3b1e43bd15d14229142f17c0d30e6 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 16 Jun 2024 12:02:38 +0000 Subject: [PATCH 01/25] Updated node modules based on npm audit fix --- .../custom/hdbt_subtheme/package-lock.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index fcd4c6dc..5b8fff6f 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3232,11 +3232,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -4896,9 +4896,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -13125,11 +13125,11 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "breakpoint-sass": { @@ -14325,9 +14325,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "requires": { "to-regex-range": "^5.0.1" } From 771606a7b08b2086d92dccb41a826c8e5ec1b87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 20 Jun 2024 08:53:59 +0300 Subject: [PATCH 02/25] Updated browserslist command. --- public/themes/custom/hdbt_subtheme/package-lock.json | 12 ++++++------ public/themes/custom/hdbt_subtheme/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 5b8fff6f..7b5a6344 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3343,9 +3343,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001615", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz", - "integrity": "sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==", + "version": "1.0.30001636", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", + "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", "funding": [ { "type": "opencollective", @@ -13196,9 +13196,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001615", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz", - "integrity": "sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==" + "version": "1.0.30001636", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", + "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/package.json b/public/themes/custom/hdbt_subtheme/package.json index b7b9afe9..7d9b0f7c 100644 --- a/public/themes/custom/hdbt_subtheme/package.json +++ b/public/themes/custom/hdbt_subtheme/package.json @@ -8,7 +8,7 @@ "scripts": { "dev": "webpack --progress --mode=development --config webpack.config.js --watch", "build": "webpack --progress --mode=production --config webpack.config.js", - "preinstall": "npx browserslist@latest --update-db", + "preinstall": "npx update-browserslist-db@latest", "lint": "lint-staged", "lint:js": "eslint --fix src/" }, From 04497ec2a173bc4087d7279c80f4717a2c25328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 20 Jun 2024 09:31:26 +0300 Subject: [PATCH 03/25] Loosen up the restriction for the node versions. --- public/themes/custom/hdbt_subtheme/.nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/custom/hdbt_subtheme/.nvmrc b/public/themes/custom/hdbt_subtheme/.nvmrc index d5a15960..209e3ef4 100644 --- a/public/themes/custom/hdbt_subtheme/.nvmrc +++ b/public/themes/custom/hdbt_subtheme/.nvmrc @@ -1 +1 @@ -20.10.0 +20 From 83467e53067d47e5457092da21de4e0dfe1fed5a Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 20 Jun 2024 10:47:54 +0000 Subject: [PATCH 04/25] Update configuration --- composer.lock | 171 +++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/composer.lock b/composer.lock index 6f215e4f..6f0dc52f 100644 --- a/composer.lock +++ b/composer.lock @@ -125,16 +125,16 @@ }, { "name": "chi-teck/drupal-code-generator", - "version": "3.6.0", + "version": "3.6.1", "source": { "type": "git", "url": "https://github.com/Chi-teck/drupal-code-generator.git", - "reference": "7794c268309a6fd7aeecfd1246a01238c14384c4" + "reference": "2dbd8d231945681a398862a3282ade3cf0ea23ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/7794c268309a6fd7aeecfd1246a01238c14384c4", - "reference": "7794c268309a6fd7aeecfd1246a01238c14384c4", + "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/2dbd8d231945681a398862a3282ade3cf0ea23ab", + "reference": "2dbd8d231945681a398862a3282ade3cf0ea23ab", "shasum": "" }, "require": { @@ -179,9 +179,9 @@ "description": "Drupal code generator", "support": { "issues": "https://github.com/Chi-teck/drupal-code-generator/issues", - "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.6.0" + "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.6.1" }, - "time": "2024-05-20T12:50:42+00:00" + "time": "2024-06-06T17:36:37+00:00" }, { "name": "commerceguys/addressing", @@ -3883,16 +3883,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.25", + "version": "6.5.26", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "6886c53bbfbec86faa70ed02af3849ec5bf35f65" + "reference": "6c084a3626b871827555ec76a8ba9a536e78c0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6886c53bbfbec86faa70ed02af3849ec5bf35f65", - "reference": "6886c53bbfbec86faa70ed02af3849ec5bf35f65", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6c084a3626b871827555ec76a8ba9a536e78c0f7", + "reference": "6c084a3626b871827555ec76a8ba9a536e78c0f7", "shasum": "" }, "require": { @@ -3910,23 +3910,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.25", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.26", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-06-19T06:40:55+00:00" + "time": "2024-06-19T12:35:11+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.1.9", + "version": "3.1.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "cf42941ff22dd9163d0591b4564fb28ab0c3bd0b" + "reference": "a13f6926bf7026c3de68587fd8f904aa08978a53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/cf42941ff22dd9163d0591b4564fb28ab0c3bd0b", - "reference": "cf42941ff22dd9163d0591b4564fb28ab0c3bd0b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/a13f6926bf7026c3de68587fd8f904aa08978a53", + "reference": "a13f6926bf7026c3de68587fd8f904aa08978a53", "shasum": "" }, "require": { @@ -3946,10 +3946,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-06-19T09:51:57+00:00" + "time": "2024-06-20T10:43:16+00:00" }, { "name": "drupal/health_check", @@ -12095,16 +12095,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -12154,7 +12154,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -12170,20 +12170,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f" + "reference": "c027e6a3c6aee334663ec21f5852e89738abc805" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", - "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c027e6a3c6aee334663ec21f5852e89738abc805", + "reference": "c027e6a3c6aee334663ec21f5852e89738abc805", "shasum": "" }, "require": { @@ -12234,7 +12234,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.30.0" }, "funding": [ { @@ -12250,20 +12250,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", "shasum": "" }, "require": { @@ -12312,7 +12312,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" }, "funding": [ { @@ -12328,20 +12328,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a287ed7475f85bf6f61890146edbc932c0fff919" + "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919", - "reference": "a287ed7475f85bf6f61890146edbc932c0fff919", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", "shasum": "" }, "require": { @@ -12396,7 +12396,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" }, "funding": [ { @@ -12412,20 +12412,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", "shasum": "" }, "require": { @@ -12477,7 +12477,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" }, "funding": [ { @@ -12493,20 +12493,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -12557,7 +12557,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -12573,20 +12573,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" + "reference": "10112722600777e02d2745716b70c5db4ca70442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", + "reference": "10112722600777e02d2745716b70c5db4ca70442", "shasum": "" }, "require": { @@ -12630,7 +12630,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" }, "funding": [ { @@ -12646,20 +12646,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/ec444d3f3f6505bb28d11afa41e75faadebc10a1", + "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1", "shasum": "" }, "require": { @@ -12706,7 +12706,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.30.0" }, "funding": [ { @@ -12722,20 +12722,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", "shasum": "" }, "require": { @@ -12786,7 +12786,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" }, "funding": [ { @@ -12802,20 +12802,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", "shasum": "" }, "require": { @@ -12862,7 +12862,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" }, "funding": [ { @@ -12878,25 +12878,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" + "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-php80": "^1.14" + "php": ">=7.1" }, "type": "library", "extra": { @@ -12939,7 +12938,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0" }, "funding": [ { @@ -12955,7 +12954,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:35:24+00:00" }, { "name": "symfony/process", From 087aa4167dc00b7f26f664d65920ca7ead4318c2 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Thu, 20 Jun 2024 19:28:29 +0300 Subject: [PATCH 05/25] UHF-10169: Disable role mapping for eduad users. --- public/sites/default/all.settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index 559ad078..af29c5a0 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -26,6 +26,7 @@ // Sentry DSN for React. $config['react_search.settings']['sentry_dsn_react'] = getenv('SENTRY_DSN_REACT'); +$config['openid_connect.client.tunnistamo']['settings']['ad_roles_disabled_amr'] = ['eduad']; $config['openid_connect.client.tunnistamo']['settings']['ad_roles'] = [ [ 'ad_role' => 'Drupal_Helfi_kaupunkitaso_paakayttajat', From 9eb80cfd796f4342d9d46b0b08dcfdc17f7136e1 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 24 Jun 2024 08:08:46 +0300 Subject: [PATCH 06/25] UHF-10169: Use helfi_tunnistamo:dev-UHF-10169-eduad --- composer.json | 2 +- composer.lock | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 60df3a90..a871b2c9 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/helfi_platform_config": "^4.0", "drupal/helfi_proxy": "^3.0", "drupal/helfi_tpr": "^2.0", - "drupal/helfi_tunnistamo": "^3.0", + "drupal/helfi_tunnistamo": "dev-UHF-10169-eduad", "drupal/override_node_options": "^2.6", "drupal/raven": "^5.0", "drupal/redis": "^1.5", diff --git a/composer.lock b/composer.lock index 6f0dc52f..a0495885 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": "b9f6cf1d1a8b3f8e49896ebcdb7f8d81", + "content-hash": "0b213b0e87ed5622fea59bb8f708bbe8", "packages": [ { "name": "asm89/stack-cors", @@ -4433,16 +4433,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.7", + "version": "dev-UHF-10169-eduad", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "881201f804fd6350c8c4705a677619b25fd49c72" + "reference": "9e9340ad5e91c4600095f57a4df7352cbb84ef10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/881201f804fd6350c8c4705a677619b25fd49c72", - "reference": "881201f804fd6350c8c4705a677619b25fd49c72", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/9e9340ad5e91c4600095f57a4df7352cbb84ef10", + "reference": "9e9340ad5e91c4600095f57a4df7352cbb84ef10", "shasum": "" }, "require": { @@ -4459,10 +4459,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/UHF-10169-eduad", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-06-18T07:56:54+00:00" + "time": "2024-06-20T16:26:47+00:00" }, { "name": "drupal/image_style_quality", @@ -19363,7 +19363,8 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/helfi_drupal_tools": 20 + "drupal/helfi_drupal_tools": 20, + "drupal/helfi_tunnistamo": 20 }, "prefer-stable": true, "prefer-lowest": false, From 5dbca320f8b7b61df363c3232e79c69f2d0259e0 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:27:36 +0000 Subject: [PATCH 07/25] Update configuration --- composer.lock | 347 +++++++++--------- .../block.block.language_switcher_admin.yml | 2 +- conf/cmi/diff.settings.yml | 1 + conf/cmi/easy_breadcrumb.settings.yml | 1 + conf/cmi/editor.editor.full_html.yml | 6 - conf/cmi/editor.editor.minimal.yml | 6 - ...cookie_compliance.cookie_consent_intro.yml | 1 + conf/cmi/helfi_proxy.settings.yml | 1 - conf/cmi/language/fi/views.view.content.yml | 1 + conf/cmi/node.type.announcement.yml | 2 +- conf/cmi/node.type.landing_page.yml | 3 +- conf/cmi/node.type.news_item.yml | 3 +- conf/cmi/node.type.page.yml | 2 +- conf/cmi/system.cron.yml | 2 +- conf/cmi/system.date.yml | 2 +- conf/cmi/system.site.yml | 1 + conf/cmi/taxonomy.vocabulary.keywords.yml | 3 +- ...nomy.vocabulary.linked_events_keywords.yml | 1 + conf/cmi/taxonomy.vocabulary.news_group.yml | 3 +- ...axonomy.vocabulary.news_neighbourhoods.yml | 3 +- conf/cmi/taxonomy.vocabulary.news_tags.yml | 3 +- conf/cmi/taxonomy.vocabulary.unit_type.yml | 1 + ...taxonomy.vocabulary.vocational_studies.yml | 1 + ...iews.view.after_school_activity_search.yml | 1 + conf/cmi/views.view.archive.yml | 1 + conf/cmi/views.view.authmap.yml | 1 + ...views.view.comprehensive_school_search.yml | 1 + conf/cmi/views.view.content.yml | 1 + conf/cmi/views.view.daycare_search.yml | 1 + .../cmi/views.view.editoria11y_dismissals.yml | 1 + conf/cmi/views.view.editoria11y_results.yml | 5 + conf/cmi/views.view.er_tpr_unit.yml | 1 + conf/cmi/views.view.files.yml | 2 + conf/cmi/views.view.glossary.yml | 1 + conf/cmi/views.view.group_members.yml | 1 + conf/cmi/views.view.group_news_archive.yml | 1 + conf/cmi/views.view.group_nodes.yml | 1 + conf/cmi/views.view.group_tpr_units.yml | 1 + conf/cmi/views.view.locked_content.yml | 1 + conf/cmi/views.view.locked_services.yml | 1 + conf/cmi/views.view.locked_units.yml | 1 + conf/cmi/views.view.media.yml | 1 + conf/cmi/views.view.media_library.yml | 2 + conf/cmi/views.view.paragraphs_library.yml | 1 + conf/cmi/views.view.paragraphs_selection.yml | 1 + conf/cmi/views.view.playground_search.yml | 1 + conf/cmi/views.view.redirect.yml | 1 + ...views.view.scheduler_scheduled_content.yml | 4 +- conf/cmi/views.view.service_list.yml | 2 + conf/cmi/views.view.service_units.yml | 1 + conf/cmi/views.view.taxonomy_term.yml | 1 + .../views.view.tpr_errand_service_list.yml | 1 + .../views.view.tpr_service_channel_list.yml | 1 + conf/cmi/views.view.tpr_service_list.yml | 1 + conf/cmi/views.view.tpr_unit_list.yml | 1 + conf/cmi/views.view.unit_search.yml | 1 + conf/cmi/views.view.user_admin_people.yml | 2 + 57 files changed, 236 insertions(+), 205 deletions(-) diff --git a/composer.lock b/composer.lock index a0495885..3d27f97d 100644 --- a/composer.lock +++ b/composer.lock @@ -1399,6 +1399,51 @@ ], "time": "2024-02-05T11:35:39+00:00" }, + { + "name": "dompdf/php-font-lib", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/dompdf/php-font-lib.git", + "reference": "991d6a954f6bbd7e41022198f00586b230731441" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/991d6a954f6bbd7e41022198f00586b230731441", + "reference": "991d6a954f6bbd7e41022198f00586b230731441", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3 || ^4 || ^5 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "FontLib\\": "src/FontLib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1-or-later" + ], + "authors": [ + { + "name": "The FontLib Community", + "homepage": "https://github.com/dompdf/php-font-lib/blob/master/AUTHORS.md" + } + ], + "description": "A library to read, parse, export and make subsets of different types of font files.", + "homepage": "https://github.com/dompdf/php-font-lib", + "support": { + "issues": "https://github.com/dompdf/php-font-lib/issues", + "source": "https://github.com/dompdf/php-font-lib/tree/1.0.0" + }, + "time": "2024-04-29T13:40:38+00:00" + }, { "name": "drupal/address", "version": "1.12.0", @@ -2011,16 +2056,16 @@ }, { "name": "drupal/core", - "version": "10.2.7", + "version": "10.3.0", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "4416c8a86e5b57b5acc595e4855ce50fdb6a542d" + "reference": "6f1af3070110d7d0f2a6671bea26add34667f765" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/4416c8a86e5b57b5acc595e4855ce50fdb6a542d", - "reference": "4416c8a86e5b57b5acc595e4855ce50fdb6a542d", + "url": "https://api.github.com/repos/drupal/core/zipball/6f1af3070110d7d0f2a6671bea26add34667f765", + "reference": "6f1af3070110d7d0f2a6671bea26add34667f765", "shasum": "" }, "require": { @@ -2066,7 +2111,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.5.0" + "twig/twig": "^3.9.3" }, "conflict": { "drush/drush": "<12.4.3" @@ -2159,7 +2204,8 @@ "lib/Drupal/Core/DrupalKernel.php", "lib/Drupal/Core/DrupalKernelInterface.php", "lib/Drupal/Core/Installer/InstallerRedirectTrait.php", - "lib/Drupal/Core/Site/Settings.php" + "lib/Drupal/Core/Site/Settings.php", + "lib/Drupal/Component/Datetime/Time.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2168,22 +2214,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.7" + "source": "https://github.com/drupal/core/tree/10.3.0" }, - "time": "2024-06-06T07:25:42+00:00" + "time": "2024-06-20T18:58:42+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.1.6", + "version": "10.3.0", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51" + "reference": "a1a186caeb89899143e0c6912ccee9d3d7181dbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51", - "reference": "1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/a1a186caeb89899143e0c6912ccee9d3d7181dbe", + "reference": "a1a186caeb89899143e0c6912ccee9d3d7181dbe", "shasum": "" }, "require": { @@ -2218,9 +2264,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.6" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.0" }, - "time": "2023-04-30T16:15:32+00:00" + "time": "2024-05-11T08:21:39+00:00" }, { "name": "drupal/crop", @@ -2710,17 +2756,17 @@ }, { "name": "drupal/elasticsearch_connector", - "version": "7.0.0-alpha4", + "version": "7.0.0-alpha5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/elasticsearch_connector.git", - "reference": "8.x-7.0-alpha4" + "reference": "8.x-7.0-alpha5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.x-7.0-alpha4.zip", - "reference": "8.x-7.0-alpha4", - "shasum": "2e0922d831a781555970a787c9ec98dc9891f565" + "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.x-7.0-alpha5.zip", + "reference": "8.x-7.0-alpha5", + "shasum": "75456c31f48d76b176d81f258aa589987cd16b87" }, "require": { "drupal/core": "^9.2 || ^10", @@ -2740,8 +2786,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-7.0-alpha4", - "datestamp": "1673006177", + "version": "8.x-7.0-alpha5", + "datestamp": "1718962853", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3358,32 +3404,32 @@ }, { "name": "drupal/file_mdm", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_mdm.git", - "reference": "3.0.0" + "reference": "3.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_mdm-3.0.0.zip", - "reference": "3.0.0", - "shasum": "d6ea077882777619c25b217301dc3d1c10218502" + "url": "https://ftp.drupal.org/files/projects/file_mdm-3.1.0.zip", + "reference": "3.1.0", + "shasum": "fa7709137705a693c4d5329035612473045a19d3" }, "require": { - "drupal/core": "^10.1", - "fileeye/pel": "^0.9.20", - "phenx/php-font-lib": "^0.5.4" + "dompdf/php-font-lib": "^1", + "drupal/core": "^10.3 | ^11", + "fileeye/pel": "^0.10.0" }, "require-dev": { - "drupal/vendor_stream_wrapper": "^2.0.2", + "drupal/vendor_stream_wrapper": "^2.0.4", "fileeye/linuxlibertine-fonts": "^5.3" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0", - "datestamp": "1691421181", + "version": "3.1.0", + "datestamp": "1718086268", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3599,27 +3645,27 @@ }, { "name": "drupal/gin", - "version": "3.0.0-rc10", + "version": "3.0.0-rc11", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-rc10" + "reference": "8.x-3.0-rc11" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc10.zip", - "reference": "8.x-3.0-rc10", - "shasum": "f79fd895dd1f16c3af457bfaed5527f5b5bc752c" + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc11.zip", + "reference": "8.x-3.0-rc11", + "shasum": "532000cb8497412fb4b26efc362c7fc9efc44546" }, "require": { - "drupal/core": "^9 || ^10", + "drupal/core": "^9 || ^10 || ^11", "drupal/gin_toolbar": "^1.0@beta" }, "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-rc10", - "datestamp": "1712686345", + "version": "8.x-3.0-rc11", + "datestamp": "1718354743", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3661,26 +3707,26 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc5", + "version": "1.0.0-rc6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc5" + "reference": "8.x-1.0-rc6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc5.zip", - "reference": "8.x-1.0-rc5", - "shasum": "523b565244440a16fa447065a98841770992bd2e" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc6.zip", + "reference": "8.x-1.0-rc6", + "shasum": "542def14b9a5435efb4e021d384fa3f7b0fc6e78" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc5", - "datestamp": "1702727588", + "version": "8.x-1.0-rc6", + "datestamp": "1718368950", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3883,16 +3929,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.26", + "version": "6.5.27", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "6c084a3626b871827555ec76a8ba9a536e78c0f7" + "reference": "6ea70e083d02bec8fb622d686d47943c819f3fa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6c084a3626b871827555ec76a8ba9a536e78c0f7", - "reference": "6c084a3626b871827555ec76a8ba9a536e78c0f7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6ea70e083d02bec8fb622d686d47943c819f3fa1", + "reference": "6ea70e083d02bec8fb622d686d47943c819f3fa1", "shasum": "" }, "require": { @@ -3910,23 +3956,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.26", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.27", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-06-19T12:35:11+00:00" + "time": "2024-06-20T12:41:39+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.1.10", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "a13f6926bf7026c3de68587fd8f904aa08978a53" + "reference": "df985dcac8c9bd268fed6736c49190a6e71f8bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/a13f6926bf7026c3de68587fd8f904aa08978a53", - "reference": "a13f6926bf7026c3de68587fd8f904aa08978a53", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/df985dcac8c9bd268fed6736c49190a6e71f8bb0", + "reference": "df985dcac8c9bd268fed6736c49190a6e71f8bb0", "shasum": "" }, "require": { @@ -3934,7 +3980,7 @@ "drupal/gin": "^3.0@rc" }, "conflict": { - "drupal/gin": ">3.0.0-rc10", + "drupal/gin": ">3.0.0-rc11", "drupal/helfi_platform_config": "<4.3" }, "type": "drupal-theme", @@ -3946,10 +3992,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-06-20T10:43:16+00:00" + "time": "2024-06-26T11:21:13+00:00" }, { "name": "drupal/health_check", @@ -4003,16 +4049,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.4", + "version": "2.7.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "bb8b9a188b5b0fa7a1bbf332609949223cb1b2c3" + "reference": "4165398e51c1657ffffb077d756d49db68b75832" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bb8b9a188b5b0fa7a1bbf332609949223cb1b2c3", - "reference": "bb8b9a188b5b0fa7a1bbf332609949223cb1b2c3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4165398e51c1657ffffb077d756d49db68b75832", + "reference": "4165398e51c1657ffffb077d756d49db68b75832", "shasum": "" }, "require": { @@ -4042,10 +4088,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-05-08T07:00:11+00:00" + "time": "2024-06-25T09:02:27+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4174,16 +4220,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.2.4", + "version": "2.2.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "7c1048ea3f3b3a14ee11ac40b60fddeb50df2b4d" + "reference": "56c470769a261b8a19213e92d7b17e1c8cfda794" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/7c1048ea3f3b3a14ee11ac40b60fddeb50df2b4d", - "reference": "7c1048ea3f3b3a14ee11ac40b60fddeb50df2b4d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/56c470769a261b8a19213e92d7b17e1c8cfda794", + "reference": "56c470769a261b8a19213e92d7b17e1c8cfda794", "shasum": "" }, "require": { @@ -4201,23 +4247,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.2.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.2.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2024-06-04T07:30:53+00:00" + "time": "2024-06-25T09:02:55+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "4.3.65", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "2097cf3369cea052a33fa6dc3aa5aeb34ba6980b" + "reference": "682707108c1afbbba8f6d91667d5c209f8b6ef2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2097cf3369cea052a33fa6dc3aa5aeb34ba6980b", - "reference": "2097cf3369cea052a33fa6dc3aa5aeb34ba6980b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/682707108c1afbbba8f6d91667d5c209f8b6ef2a", + "reference": "682707108c1afbbba8f6d91667d5c209f8b6ef2a", "shasum": "" }, "require": { @@ -4229,6 +4275,7 @@ "drupal/config_rewrite": "^1.4", "drupal/content_lock": "^2.2", "drupal/core": "^10.1.5", + "drupal/core-composer-scaffold": "^10.0", "drupal/crop": "^2.1", "drupal/default_content": "^2.0.0-alpha2", "drupal/diff": "^1.0", @@ -4281,9 +4328,10 @@ "php": "^8.1" }, "conflict": { - "drupal/core": "<10.2", + "drupal/core": "<10.3", + "drupal/core-composer-scaffold": "<10.3", "drupal/ctools": "<3.11 || ^4.0.1", - "drupal/gin_toolbar": ">1.0.0-rc5", + "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", "drupal/simple_sitemap": ">4.1.7", "drush/drush": "<12" @@ -4297,11 +4345,11 @@ "drupal/core": { "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-12-18/3091246--allow-menu-tree-manipulators-alter--24.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-05-07/3163299-104-D10.patch", - "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/b628bc051d82a1883768364050aa833824bd48c8/patches/drupal_core_strip_debug_mode_whitespaces_10.1.x.patch", + "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/ebee28c484e86152970b3f5534b7080831322316/patches/drupal_core_strip_debug_mode_whitespaces_10.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", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", - "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch", + "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-05-14/3083786-duplicate-br-tags-2024-05-14-no-tests.patch" }, @@ -4321,9 +4369,6 @@ }, "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" - }, - "drupal/elasticsearch_connector": { - "https://www.drupal.org/project/elasticsearch_connector/issues/3454977": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/959fd61553c8827b7350e53de4f66b2f6b8c97a1/patches/issue-3454977.patch" } } }, @@ -4332,23 +4377,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.65", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-06-19T10:04:46+00:00" + "time": "2024-06-26T11:20:54+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.2.2", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "20dda60b28e43508d06fd08e4bfa705538f483bf" + "reference": "efdf8d46f8b0f0114ab079f61661d1909b2a870e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/20dda60b28e43508d06fd08e4bfa705538f483bf", - "reference": "20dda60b28e43508d06fd08e4bfa705538f483bf", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/efdf8d46f8b0f0114ab079f61661d1909b2a870e", + "reference": "efdf8d46f8b0f0114ab079f61661d1909b2a870e", "shasum": "" }, "require": { @@ -4360,7 +4405,7 @@ "php": "^8.0" }, "conflict": { - "drupal/core": "<10.1", + "drupal/core": "<10.3", "drupal/helfi_tunnistamo": "<=2.2.1" }, "require-dev": { @@ -4372,22 +4417,15 @@ "phpspec/prophecy-phpunit": "^2" }, "type": "drupal-module", - "extra": { - "patches": { - "drupal/core": { - "[#3385550] Language negotiation breaks updating Drupal 9 to 10": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-proxy/ffbde3654e0011e237a17ea1cb3a7291685e0c30/patches/3385550.patch" - } - } - }, "license": [ "GPL-2.0-or-later" ], "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/3.2.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2024-02-23T10:27:26+00:00" + "time": "2024-06-26T05:50:50+00:00" }, { "name": "drupal/helfi_tpr", @@ -4437,12 +4475,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "9e9340ad5e91c4600095f57a4df7352cbb84ef10" + "reference": "0a9ea2e404eccfde6d1e3e462799d9041da0cb87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/9e9340ad5e91c4600095f57a4df7352cbb84ef10", - "reference": "9e9340ad5e91c4600095f57a4df7352cbb84ef10", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/0a9ea2e404eccfde6d1e3e462799d9041da0cb87", + "reference": "0a9ea2e404eccfde6d1e3e462799d9041da0cb87", "shasum": "" }, "require": { @@ -4462,7 +4500,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/UHF-10169-eduad", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-06-20T16:26:47+00:00" + "time": "2024-06-24T06:58:14+00:00" }, { "name": "drupal/image_style_quality", @@ -5275,17 +5313,17 @@ }, { "name": "drupal/monolog", - "version": "3.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/monolog.git", - "reference": "3.0.2" + "reference": "3.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/monolog-3.0.2.zip", - "reference": "3.0.2", - "shasum": "a88e8249028e56a21c4472891381412b9733f768" + "url": "https://ftp.drupal.org/files/projects/monolog-3.0.3.zip", + "reference": "3.0.3", + "shasum": "99a8d46376f158da841f3fd524a535e37f9c84ad" }, "require": { "drupal/core": "^10", @@ -5303,19 +5341,14 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.2", - "datestamp": "1707845433", + "version": "3.0.3", + "datestamp": "1718981516", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } } }, - "autoload": { - "psr-0": { - "Drupal\\Monolog": "src/" - } - }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0" @@ -5852,17 +5885,17 @@ }, { "name": "drupal/raven", - "version": "5.0.14", + "version": "5.0.15", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.14" + "reference": "5.0.15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.14.zip", - "reference": "5.0.14", - "shasum": "b6487db5f6be84aa06ccf48e878021c30a8511ba" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.15.zip", + "reference": "5.0.15", + "shasum": "ef3472e1ed7436ac4d453fb371065e8e3f5ed7d5" }, "require": { "drupal/core": "^10.1 || ^11", @@ -5877,8 +5910,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.14", - "datestamp": "1716361931", + "version": "5.0.15", + "datestamp": "1719102344", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7940,28 +7973,30 @@ }, { "name": "fileeye/pel", - "version": "0.9.20", + "version": "0.10.0", "source": { "type": "git", "url": "https://github.com/FileEye/pel.git", - "reference": "1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede" + "reference": "5da1e6ab73508056f0abb79f560d20a315d1aefe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/pel/zipball/1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede", - "reference": "1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede", + "url": "https://api.github.com/repos/FileEye/pel/zipball/5da1e6ab73508056f0abb79f560d20a315d1aefe", + "reference": "5da1e6ab73508056f0abb79f560d20a315d1aefe", "shasum": "" }, "require": { - "php": ">=7.1.0" + "php": ">=7.4" }, "require-dev": { "ext-exif": "*", "ext-gd": "*", - "php-coveralls/php-coveralls": ">2.4", - "phpstan/phpstan": "^1.4", - "squizlabs/php_codesniffer": ">3.5", - "symfony/phpunit-bridge": "^4 || ^5 || ^6" + "php-coveralls/php-coveralls": ">=2.7", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3.11", + "phpunit/phpunit": "^8 || ^9", + "squizlabs/php_codesniffer": ">=3.8" }, "type": "library", "autoload": { @@ -7995,9 +8030,9 @@ ], "support": { "issues": "https://github.com/FileEye/pel/issues", - "source": "https://github.com/FileEye/pel/tree/0.9.20" + "source": "https://github.com/FileEye/pel/tree/0.10.0" }, - "time": "2023-06-20T07:10:35+00:00" + "time": "2024-01-11T19:11:58+00:00" }, { "name": "firebase/php-jwt", @@ -9869,50 +9904,6 @@ }, "time": "2021-03-21T15:43:46+00:00" }, - { - "name": "phenx/php-font-lib", - "version": "0.5.6", - "source": { - "type": "git", - "url": "https://github.com/dompdf/php-font-lib.git", - "reference": "a1681e9793040740a405ac5b189275059e2a9863" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863", - "reference": "a1681e9793040740a405ac5b189275059e2a9863", - "shasum": "" - }, - "require": { - "ext-mbstring": "*" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3 || ^4 || ^5 || ^6" - }, - "type": "library", - "autoload": { - "psr-4": { - "FontLib\\": "src/FontLib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1-or-later" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - } - ], - "description": "A library to read, parse, export and make subsets of different types of font files.", - "homepage": "https://github.com/PhenX/php-font-lib", - "support": { - "issues": "https://github.com/dompdf/php-font-lib/issues", - "source": "https://github.com/dompdf/php-font-lib/tree/0.5.6" - }, - "time": "2024-01-29T14:45:26+00:00" - }, { "name": "phootwork/collection", "version": "v3.2.2", diff --git a/conf/cmi/block.block.language_switcher_admin.yml b/conf/cmi/block.block.language_switcher_admin.yml index 8018d150..21985e1c 100644 --- a/conf/cmi/block.block.language_switcher_admin.yml +++ b/conf/cmi/block.block.language_switcher_admin.yml @@ -24,4 +24,4 @@ visibility: request_path: id: request_path negate: true - pages: "/node/*\r\n/admin/content/integrations/tpr-unit/*/edit\r\n/admin/content/integrations/tpr-service/*/edit\r\n/group/*/content/create/*" + pages: "/node/*\r\n/admin/content/integrations/*/edit\r\n/group/*/content/create/*" diff --git a/conf/cmi/diff.settings.yml b/conf/cmi/diff.settings.yml index bc3a3c29..e43b0233 100644 --- a/conf/cmi/diff.settings.yml +++ b/conf/cmi/diff.settings.yml @@ -1,5 +1,6 @@ _core: default_config_hash: oXwX3NzLv9QK_LbNEvpQ9OPwH9tqtMSJzq5y8t63Q8w +langcode: en general_settings: radio_behavior: simple context_lines_leading: 1 diff --git a/conf/cmi/easy_breadcrumb.settings.yml b/conf/cmi/easy_breadcrumb.settings.yml index 6096d8aa..b36f432b 100644 --- a/conf/cmi/easy_breadcrumb.settings.yml +++ b/conf/cmi/easy_breadcrumb.settings.yml @@ -1,5 +1,6 @@ _core: default_config_hash: azWBxQFowXKyqUvvROIrMBXpwGaxz4JxhL6xz420P3Q +langcode: en applies_admin_routes: false include_invalid_paths: false excluded_paths: '' diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index b558ba86..b0dfd168 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -143,9 +143,3 @@ settings: linkit_profile: helfi image_upload: status: false - scheme: public - directory: inline-images - max_size: '' - max_dimensions: - width: 0 - height: 0 diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index 9799bb93..993a91de 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -123,9 +123,3 @@ settings: linkit_profile: helfi image_upload: status: false - scheme: public - directory: inline-images - max_size: '' - max_dimensions: - width: null - height: null diff --git a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml index 368a0db9..30412ad8 100644 --- a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml @@ -1,5 +1,6 @@ _core: default_config_hash: eVNvfbEgjm25gLyG5DH8zDbCi17xs8djPZt0XHD_Q9s +langcode: en cc: title: 'Cookie settings' content: diff --git a/conf/cmi/helfi_proxy.settings.yml b/conf/cmi/helfi_proxy.settings.yml index c620bd78..c7b68781 100644 --- a/conf/cmi/helfi_proxy.settings.yml +++ b/conf/cmi/helfi_proxy.settings.yml @@ -1,4 +1,3 @@ -langcode: en front_page_title: 'Childhood and education' asset_path: kasko-assets prefixes: diff --git a/conf/cmi/language/fi/views.view.content.yml b/conf/cmi/language/fi/views.view.content.yml index d4948611..fb036d95 100644 --- a/conf/cmi/language/fi/views.view.content.yml +++ b/conf/cmi/language/fi/views.view.content.yml @@ -4,6 +4,7 @@ display: fields: langcode: label: Kieli + separator: ', ' title: label: Otsikko type: diff --git a/conf/cmi/node.type.announcement.yml b/conf/cmi/node.type.announcement.yml index d4432ff8..e9770c3c 100644 --- a/conf/cmi/node.type.announcement.yml +++ b/conf/cmi/node.type.announcement.yml @@ -27,7 +27,7 @@ _core: name: Announcement type: announcement description: 'Content type for announcements that can be used to show notifications, attentions and alerts on different pages.' -help: '' +help: null new_revision: true preview_mode: 1 display_submitted: false diff --git a/conf/cmi/node.type.landing_page.yml b/conf/cmi/node.type.landing_page.yml index bbd577d7..1c811533 100644 --- a/conf/cmi/node.type.landing_page.yml +++ b/conf/cmi/node.type.landing_page.yml @@ -4,7 +4,6 @@ status: true dependencies: module: - menu_ui - - override_node_options - scheduler third_party_settings: menu_ui: @@ -29,7 +28,7 @@ _core: name: 'Landing page' type: landing_page description: 'Content type for the front page of a section or theme. A landing page consists of highlight areas, content listings and links.' -help: '' +help: null new_revision: true preview_mode: 1 display_submitted: false diff --git a/conf/cmi/node.type.news_item.yml b/conf/cmi/node.type.news_item.yml index 5222ab3b..181c6b53 100644 --- a/conf/cmi/node.type.news_item.yml +++ b/conf/cmi/node.type.news_item.yml @@ -4,7 +4,6 @@ status: true dependencies: module: - menu_ui - - override_node_options - scheduler third_party_settings: menu_ui: @@ -28,7 +27,7 @@ _core: name: 'News item' type: news_item description: 'Content type for news items.' -help: '' +help: null new_revision: true preview_mode: 1 display_submitted: false diff --git a/conf/cmi/node.type.page.yml b/conf/cmi/node.type.page.yml index 56c55aba..5e5eb1dc 100644 --- a/conf/cmi/node.type.page.yml +++ b/conf/cmi/node.type.page.yml @@ -28,7 +28,7 @@ _core: name: 'Standard page' type: page description: 'Content type for standard web content.' -help: '' +help: null new_revision: true preview_mode: 1 display_submitted: false diff --git a/conf/cmi/system.cron.yml b/conf/cmi/system.cron.yml index 49e58a00..6d1cca2f 100644 --- a/conf/cmi/system.cron.yml +++ b/conf/cmi/system.cron.yml @@ -3,4 +3,4 @@ _core: threshold: requirements_warning: 172800 requirements_error: 1209600 -logging: 1 +logging: true diff --git a/conf/cmi/system.date.yml b/conf/cmi/system.date.yml index c0e7cdaf..31b399d9 100644 --- a/conf/cmi/system.date.yml +++ b/conf/cmi/system.date.yml @@ -2,7 +2,7 @@ _core: default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo first_day: 0 country: - default: '' + default: null timezone: default: Europe/Helsinki user: diff --git a/conf/cmi/system.site.yml b/conf/cmi/system.site.yml index ba9164dd..17af01f7 100644 --- a/conf/cmi/system.site.yml +++ b/conf/cmi/system.site.yml @@ -12,3 +12,4 @@ page: admin_compact_mode: false weight_select_max: 100 default_langcode: en +mail_notification: null diff --git a/conf/cmi/taxonomy.vocabulary.keywords.yml b/conf/cmi/taxonomy.vocabulary.keywords.yml index 36f9530a..73b2309a 100644 --- a/conf/cmi/taxonomy.vocabulary.keywords.yml +++ b/conf/cmi/taxonomy.vocabulary.keywords.yml @@ -6,5 +6,6 @@ _core: default_config_hash: d5rETFNsjsIV5l3mRop-SdWxiSRJFUvK2YnOGFn4pUw name: Keywords vid: keywords -description: '' +description: null weight: 0 +new_revision: false diff --git a/conf/cmi/taxonomy.vocabulary.linked_events_keywords.yml b/conf/cmi/taxonomy.vocabulary.linked_events_keywords.yml index 6b0b8609..75cabc4a 100644 --- a/conf/cmi/taxonomy.vocabulary.linked_events_keywords.yml +++ b/conf/cmi/taxonomy.vocabulary.linked_events_keywords.yml @@ -8,3 +8,4 @@ name: 'Linked Events Keywords' vid: linked_events_keywords description: 'Keywords from yso dataset.' weight: 0 +new_revision: false diff --git a/conf/cmi/taxonomy.vocabulary.news_group.yml b/conf/cmi/taxonomy.vocabulary.news_group.yml index 1a6bbde0..f43240f5 100644 --- a/conf/cmi/taxonomy.vocabulary.news_group.yml +++ b/conf/cmi/taxonomy.vocabulary.news_group.yml @@ -6,5 +6,6 @@ _core: default_config_hash: WZlqmVE7IG7NlPwHTf-2r9OKJxNlmb7H-WuoBvyheCE name: 'News group' vid: news_group -description: '' +description: null weight: 0 +new_revision: false diff --git a/conf/cmi/taxonomy.vocabulary.news_neighbourhoods.yml b/conf/cmi/taxonomy.vocabulary.news_neighbourhoods.yml index aa8eb027..94e5bd00 100644 --- a/conf/cmi/taxonomy.vocabulary.news_neighbourhoods.yml +++ b/conf/cmi/taxonomy.vocabulary.news_neighbourhoods.yml @@ -6,5 +6,6 @@ _core: default_config_hash: GoIlOzRzGavETL3qUS5oEFib8u9802Ej77EIqmRgBZI name: 'News neighbourhoods' vid: news_neighbourhoods -description: '' +description: null weight: 0 +new_revision: false diff --git a/conf/cmi/taxonomy.vocabulary.news_tags.yml b/conf/cmi/taxonomy.vocabulary.news_tags.yml index 160e30a2..5e46db50 100644 --- a/conf/cmi/taxonomy.vocabulary.news_tags.yml +++ b/conf/cmi/taxonomy.vocabulary.news_tags.yml @@ -6,5 +6,6 @@ _core: default_config_hash: vwgTruq_bxZ5J1FxeUioSBiPtqh6Zx2fFBVYErHZnKI name: 'News tags' vid: news_tags -description: '' +description: null weight: 0 +new_revision: false diff --git a/conf/cmi/taxonomy.vocabulary.unit_type.yml b/conf/cmi/taxonomy.vocabulary.unit_type.yml index f37db766..bf8cca53 100644 --- a/conf/cmi/taxonomy.vocabulary.unit_type.yml +++ b/conf/cmi/taxonomy.vocabulary.unit_type.yml @@ -8,3 +8,4 @@ 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.' weight: 0 +new_revision: false diff --git a/conf/cmi/taxonomy.vocabulary.vocational_studies.yml b/conf/cmi/taxonomy.vocabulary.vocational_studies.yml index 107ce278..fd0e3e7b 100644 --- a/conf/cmi/taxonomy.vocabulary.vocational_studies.yml +++ b/conf/cmi/taxonomy.vocabulary.vocational_studies.yml @@ -6,3 +6,4 @@ name: 'Vocational studies' vid: vocational_studies description: 'Lists vocational study fields.' weight: 0 +new_revision: false diff --git a/conf/cmi/views.view.after_school_activity_search.yml b/conf/cmi/views.view.after_school_activity_search.yml index 500d1edc..d1f3d23b 100644 --- a/conf/cmi/views.view.after_school_activity_search.yml +++ b/conf/cmi/views.view.after_school_activity_search.yml @@ -148,6 +148,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: bef options: diff --git a/conf/cmi/views.view.archive.yml b/conf/cmi/views.view.archive.yml index ceebe699..93e69e71 100644 --- a/conf/cmi/views.view.archive.yml +++ b/conf/cmi/views.view.archive.yml @@ -43,6 +43,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.authmap.yml b/conf/cmi/views.view.authmap.yml index 07ef7491..b5c6d3cf 100644 --- a/conf/cmi/views.view.authmap.yml +++ b/conf/cmi/views.view.authmap.yml @@ -311,6 +311,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.comprehensive_school_search.yml b/conf/cmi/views.view.comprehensive_school_search.yml index ccbe6d28..4c139bfb 100644 --- a/conf/cmi/views.view.comprehensive_school_search.yml +++ b/conf/cmi/views.view.comprehensive_school_search.yml @@ -95,6 +95,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.content.yml b/conf/cmi/views.view.content.yml index a57d3616..f70e8328 100644 --- a/conf/cmi/views.view.content.yml +++ b/conf/cmi/views.view.content.yml @@ -321,6 +321,7 @@ display: previous: '‹ Previous' first: '« First' last: 'Last »' + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.daycare_search.yml b/conf/cmi/views.view.daycare_search.yml index 90c438aa..ca36c0aa 100644 --- a/conf/cmi/views.view.daycare_search.yml +++ b/conf/cmi/views.view.daycare_search.yml @@ -148,6 +148,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: bef options: diff --git a/conf/cmi/views.view.editoria11y_dismissals.yml b/conf/cmi/views.view.editoria11y_dismissals.yml index edbfe4ed..3f1bc21a 100644 --- a/conf/cmi/views.view.editoria11y_dismissals.yml +++ b/conf/cmi/views.view.editoria11y_dismissals.yml @@ -721,6 +721,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 sorts: created: id: created diff --git a/conf/cmi/views.view.editoria11y_results.yml b/conf/cmi/views.view.editoria11y_results.yml index b8031592..adf8c294 100644 --- a/conf/cmi/views.view.editoria11y_results.yml +++ b/conf/cmi/views.view.editoria11y_results.yml @@ -1089,6 +1089,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -1469,6 +1470,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -1951,6 +1953,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 sorts: page_result_count: id: page_result_count @@ -2462,6 +2465,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -3004,6 +3008,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 sorts: created: id: created diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index 30b7796d..4e54a190 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -105,6 +105,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.files.yml b/conf/cmi/views.view.files.yml index d19c34be..bd6b12f8 100644 --- a/conf/cmi/views.view.files.yml +++ b/conf/cmi/views.view.files.yml @@ -484,6 +484,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: @@ -1019,6 +1020,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 empty: { } arguments: fid: diff --git a/conf/cmi/views.view.glossary.yml b/conf/cmi/views.view.glossary.yml index 92b393fa..e5243f13 100644 --- a/conf/cmi/views.view.glossary.yml +++ b/conf/cmi/views.view.glossary.yml @@ -210,6 +210,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_members.yml b/conf/cmi/views.view.group_members.yml index 6df9fd7c..8a46180d 100644 --- a/conf/cmi/views.view.group_members.yml +++ b/conf/cmi/views.view.group_members.yml @@ -537,6 +537,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_news_archive.yml b/conf/cmi/views.view.group_news_archive.yml index 2c8e9a83..555602d2 100644 --- a/conf/cmi/views.view.group_news_archive.yml +++ b/conf/cmi/views.view.group_news_archive.yml @@ -93,6 +93,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_nodes.yml b/conf/cmi/views.view.group_nodes.yml index 9cb18268..013325da 100644 --- a/conf/cmi/views.view.group_nodes.yml +++ b/conf/cmi/views.view.group_nodes.yml @@ -480,6 +480,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_tpr_units.yml b/conf/cmi/views.view.group_tpr_units.yml index c7dc5e0b..0159de6f 100644 --- a/conf/cmi/views.view.group_tpr_units.yml +++ b/conf/cmi/views.view.group_tpr_units.yml @@ -547,6 +547,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_content.yml b/conf/cmi/views.view.locked_content.yml index 509a78f3..077fbf5a 100644 --- a/conf/cmi/views.view.locked_content.yml +++ b/conf/cmi/views.view.locked_content.yml @@ -445,6 +445,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 25fccccb..65c6d42a 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -398,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 44ef3aeb..ca6f6924 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -398,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.media.yml b/conf/cmi/views.view.media.yml index 01acf258..51bcf419 100644 --- a/conf/cmi/views.view.media.yml +++ b/conf/cmi/views.view.media.yml @@ -539,6 +539,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml index 3366c2d2..7ec0f4c5 100644 --- a/conf/cmi/views.view.media_library.yml +++ b/conf/cmi/views.view.media_library.yml @@ -153,6 +153,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: @@ -1094,6 +1095,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 access: type: perm options: diff --git a/conf/cmi/views.view.paragraphs_library.yml b/conf/cmi/views.view.paragraphs_library.yml index 7d7b42c9..f39ca35b 100644 --- a/conf/cmi/views.view.paragraphs_library.yml +++ b/conf/cmi/views.view.paragraphs_library.yml @@ -555,6 +555,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.paragraphs_selection.yml b/conf/cmi/views.view.paragraphs_selection.yml index 420653f2..b7e3365d 100644 --- a/conf/cmi/views.view.paragraphs_selection.yml +++ b/conf/cmi/views.view.paragraphs_selection.yml @@ -171,6 +171,7 @@ display: items_per_page_options_all_label: '- Kaikki -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.playground_search.yml b/conf/cmi/views.view.playground_search.yml index 0da77ff3..fdb4309f 100644 --- a/conf/cmi/views.view.playground_search.yml +++ b/conf/cmi/views.view.playground_search.yml @@ -148,6 +148,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: bef options: diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 24060ef8..0865d229 100644 --- a/conf/cmi/views.view.redirect.yml +++ b/conf/cmi/views.view.redirect.yml @@ -243,6 +243,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.scheduler_scheduled_content.yml b/conf/cmi/views.view.scheduler_scheduled_content.yml index 9bc2a741..1bc45980 100644 --- a/conf/cmi/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/views.view.scheduler_scheduled_content.yml @@ -538,6 +538,7 @@ display: previous: '‹ previous' first: '« first' last: 'last »' + pagination_heading_level: h4 exposed_form: type: basic options: @@ -1075,7 +1076,7 @@ display: admin_label: '' entity_type: node entity_field: uid - plugin_id: numeric + plugin_id: entity_target_id default_action: empty exception: value: all @@ -1107,6 +1108,7 @@ display: roles: { } break_phrase: false not: false + target_entity_type_id: user defaults: empty: false access: true diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 2d8318d1..106e85a6 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -126,6 +126,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: @@ -662,6 +663,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index b77597bf..3684c3d6 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -110,6 +110,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.taxonomy_term.yml b/conf/cmi/views.view.taxonomy_term.yml index 4d011ff7..43abe398 100644 --- a/conf/cmi/views.view.taxonomy_term.yml +++ b/conf/cmi/views.view.taxonomy_term.yml @@ -43,6 +43,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_errand_service_list.yml b/conf/cmi/views.view.tpr_errand_service_list.yml index cff2e642..90e811ba 100644 --- a/conf/cmi/views.view.tpr_errand_service_list.yml +++ b/conf/cmi/views.view.tpr_errand_service_list.yml @@ -487,6 +487,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_service_channel_list.yml b/conf/cmi/views.view.tpr_service_channel_list.yml index 5dd89352..4af28488 100644 --- a/conf/cmi/views.view.tpr_service_channel_list.yml +++ b/conf/cmi/views.view.tpr_service_channel_list.yml @@ -487,6 +487,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_service_list.yml b/conf/cmi/views.view.tpr_service_list.yml index 79fadeef..94b381a8 100644 --- a/conf/cmi/views.view.tpr_service_list.yml +++ b/conf/cmi/views.view.tpr_service_list.yml @@ -487,6 +487,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index e4606712..c70451a9 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -519,6 +519,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index c49cb9eb..e5367958 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -303,6 +303,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.user_admin_people.yml b/conf/cmi/views.view.user_admin_people.yml index 919e43a2..d46df1cb 100644 --- a/conf/cmi/views.view.user_admin_people.yml +++ b/conf/cmi/views.view.user_admin_people.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: module: + - role_delegation - user _core: default_config_hash: GbPVHdpSCucZ1MunS3Lai6FtyVVfmP9rJHk1GZ73JY0 @@ -479,6 +480,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: From b8edbfe9b5acd3126e88c50c0d83de4234bc52c5 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Thu, 27 Jun 2024 15:25:29 +0300 Subject: [PATCH 08/25] UHF-10169: disable ad role mapping --- public/sites/default/all.settings.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index af29c5a0..39994a27 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -26,25 +26,6 @@ // Sentry DSN for React. $config['react_search.settings']['sentry_dsn_react'] = getenv('SENTRY_DSN_REACT'); -$config['openid_connect.client.tunnistamo']['settings']['ad_roles_disabled_amr'] = ['eduad']; -$config['openid_connect.client.tunnistamo']['settings']['ad_roles'] = [ - [ - 'ad_role' => 'Drupal_Helfi_kaupunkitaso_paakayttajat', - 'roles' => ['admin'], - ], - [ - 'ad_role' => 'Drupal_Helfi_Kasvatus_ja_koulutus_sisallontuottajat_laaja', - 'roles' => ['editor'], - ], - [ - 'ad_role' => 'Drupal_Helfi_Kasvatus_ja_koulutus_sisallontuottajat_suppea', - 'roles' => ['content_producer'], - ], - [ - 'ad_role' => '947058f4-697e-41bb-baf5-f69b49e5579a', - 'roles' => ['super_administrator'], - ], -]; $additionalEnvVars = [ 'AZURE_BLOB_STORAGE_SAS_TOKEN|BLOBSTORAGE_SAS_TOKEN', From 6e763d04beda36215a33b132ad380d53b7a93bbb Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 8 Jul 2024 08:34:27 +0300 Subject: [PATCH 09/25] UHF-10311: updated settings.php --- public/sites/default/settings.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9006eeff..38cfb196 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -229,24 +229,30 @@ function drupal_get_env(string|array $variables) : mixed { } } } +$stage_file_proxy_origin = getenv('STAGE_FILE_PROXY_ORIGIN'); +$stage_file_proxy_dir = getenv('STAGE_FILE_PROXY_ORIGIN_DIR'); -if ($stage_file_proxy_origin = getenv('STAGE_FILE_PROXY_ORIGIN')) { - $config['stage_file_proxy.settings']['origin'] = $stage_file_proxy_origin; - $config['stage_file_proxy.settings']['origin_dir'] = getenv('STAGE_FILE_PROXY_ORIGIN_DIR') ?: 'test'; +if ($stage_file_proxy_origin || $stage_file_proxy_dir) { + $config['stage_file_proxy.settings']['origin'] = $stage_file_proxy_origin ?: 'https://stplattaprod.blob.core.windows.net'; + $config['stage_file_proxy.settings']['origin_dir'] = $stage_file_proxy_dir; $config['stage_file_proxy.settings']['hotlink'] = FALSE; $config['stage_file_proxy.settings']['use_imagecache_root'] = FALSE; } -// Map API accounts. The value should be a base64 encoded JSON string. -// @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/api-accounts.md. -if ($api_accounts = getenv('DRUPAL_API_ACCOUNTS')) { - $config['helfi_api_base.api_accounts']['accounts'] = json_decode(base64_decode($api_accounts), TRUE); +if ($drupal_pubsub_vault = getenv('DRUPAL_PUBSUB_VAULT')) { + $config['helfi_api_base.api_accounts']['vault'][] = [ + 'id' => 'pubsub', + 'plugin' => 'json', + 'data' => trim($drupal_pubsub_vault), + ]; } -// Map vault accounts. The value should be a base64 encoded JSON string. -// @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/api-accounts.md. -if ($vault_accounts = getenv('DRUPAL_VAULT_ACCOUNTS')) { - $config['helfi_api_base.api_accounts']['vault'] = json_decode(base64_decode($vault_accounts), TRUE); +if ($drupal_navigation_vault = getenv('DRUPAL_NAVIGATION_VAULT')) { + $config['helfi_api_base.api_accounts']['vault'][] = [ + 'id' => 'helfi_navigation', + 'plugin' => 'authorization_token', + 'data' => trim($drupal_navigation_vault), + ]; } // Override session suffix when present. @@ -382,4 +388,3 @@ function drupal_get_env(string|array $variables) : mixed { if (empty($settings['deployment_identifier'])) { $settings['deployment_identifier'] = filemtime(__DIR__ . '/../../../composer.lock'); } - From d8fbbcfb875097c87dd1ec0e01a16f7f13abd2e1 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 17 Jul 2024 15:14:52 +0300 Subject: [PATCH 10/25] UHF-9659: Add main headers for instance specific feature documentation --- README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/README.md b/README.md index 90b07815..c3436217 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,39 @@ This will log you inside the app container: ``` $ make shell ``` + +## Instance specific features + +### Custom paragraphs + +#### After-school activity search (after_school_activity_search) + +#### Daycare search (daycare_search) + +#### Group news (group_news) + +#### Group news archive (group_news_archive) + +#### High school search (high_school_search) + +#### Playground search (playground_search) + +#### School search (school_search) + +#### Vocational School Search (vocational_school_search) + +### Custom roles + +#### Daycare editor + +#### Playground editor + +#### Comprehensive school editor + +#### Upper secondary school editor + +### Groups + +### Group news + +### Group menus From b57b86f8709e2684ebf3d3dee26b29b09711b15c Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 17 Jul 2024 16:01:35 +0300 Subject: [PATCH 11/25] UHF-9659: Add documentation about instance customizations to readme --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index c3436217..49183b20 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,9 @@ $ make shell ## Instance specific features +The KASKO instance has multiple React searches and features provided by the Group module that other instances don’t +have. + ### Custom paragraphs #### After-school activity search (after_school_activity_search) @@ -59,18 +62,37 @@ $ make shell #### Vocational School Search (vocational_school_search) + ### Custom roles #### Daycare editor +This user role grants administrative access to _daycare_ TPR units on the site. Permissions are provided by the +`helfi_kasko_content` module. Users can enrich TPR unit content categorized under `daycare`. The category assignment is +based on the `ontologyword_ids` associated with the TPR units. Read more about TPR unit categorization [here](#tpr-unit-categorization). + #### Playground editor +This user role grants administrative access to _playground_ TPR units on the site. Permissions are provided by the +`helfi_kasko_content` module. Users can enrich TPR unit content categorized under `playground`. The category assignment +is based on the `ontologyword_ids` associated with the TPR units. Read more about TPR unit categorization [here](#tpr-unit-categorization). + #### Comprehensive school editor +This user role grants administrative access to _comprehensive school_ TPR units on the site. Permissions are provided by the +`helfi_kasko_content` module. Users can enrich TPR unit content categorized under `comprehensive school`. The category assignment +is based on the `ontologyword_ids` associated with the TPR units. Read more about TPR unit categorization [here](#tpr-unit-categorization). + #### Upper secondary school editor + ### Groups ### Group news ### Group menus + +## Customizations + +### TPR unit categorization + From 5253116fc84a49eb41e8c05dbec09b9f8b2d12a4 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 18 Jul 2024 16:18:02 +0300 Subject: [PATCH 12/25] UHF-9659: Add documentation about instance customizations to readme --- README.md | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 102 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 49183b20..2412acb3 100644 --- a/README.md +++ b/README.md @@ -48,19 +48,35 @@ have. #### After-school activity search (after_school_activity_search) +TBD + #### Daycare search (daycare_search) +TBD + #### Group news (group_news) +TBD + #### Group news archive (group_news_archive) -#### High school search (high_school_search) +TBD + +#### High school search (high_school_search) + +TBD #### Playground search (playground_search) +TBD + #### School search (school_search) -#### Vocational School Search (vocational_school_search) +TBD + +#### Vocational School Search (vocational_school_search) + +TBD ### Custom roles @@ -79,20 +95,100 @@ is based on the `ontologyword_ids` associated with the TPR units. Read more abou #### Comprehensive school editor -This user role grants administrative access to _comprehensive school_ TPR units on the site. Permissions are provided by the -`helfi_kasko_content` module. Users can enrich TPR unit content categorized under `comprehensive school`. The category assignment -is based on the `ontologyword_ids` associated with the TPR units. Read more about TPR unit categorization [here](#tpr-unit-categorization). +This user role grants administrative access to _comprehensive school_ TPR units on the site. Permissions are provided +by the `helfi_kasko_content` module. Users can enrich TPR unit content categorized under `comprehensive school`. The +category assignment is based on the `ontologyword_ids` associated with the TPR units. Read more about TPR unit +categorization [here](#tpr-unit-categorization). #### Upper secondary school editor +This user role is designated for the _upper secondary school editor_. However, it does not provide direct permissions to +edit nodes. To gain these permissions, users must be assigned to an upper secondary school group, which grants the +necessary editing rights for nodes within the group. This group grants other required permissions such as to use media +entities and access to TPR units and services entities. More information about groups can be found [here](#groups). -### Groups +### Groups + +Unlike other instances, KASKO has the Group contrib module enabled. This module restricts upper secondary school +editors’ access to a specific set of nodes and allows them to create dedicated website for their school within the KASKO +instance. Groups are used only for upper secondary schools and the groups can have standard pages, landing pages, +news items and announcements inside the group content. + +There is also a custom module called `helfi_group` that modifies group menus, alters the standard translation features +for nodes under group control, and allows TPR unit entities to be managed within the group. + +Since groups can have their own news items, the news feature is enabled in the KASKO instance but is limited to upper +secondary schools. Each school can publish its own news, which is displayed within the school’s specific area. Other +KASKO-related news is created in the Etusivu instance in the same manner as other news, and the enabled news feature +does not affect this process. + +- The custom module `helfi_group` can be found from [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/tree/dev/public/modules/custom/helfi_group). + +#### Common issues + +The list of all groups (/admin/group) is empty even there is multiple groups in the database: + +Only users with _Administrator role_ (not even Super administrators currently) are able to see all groups and assign +members to groups that they are not members themselves. If you are a member of a certain group, but you don't have the +Administrator role, you can see the group that you belong to on the listing. ### Group news +TBD + ### Group menus +TBD + ## Customizations ### TPR unit categorization +TBD + +### TPR unit custom fields + +Unlike other instances, KASKO has some additional fields on TPR units. + +#### Categories (field_categories) + +Field categories is used to save the TPR unit categorization that is done based on the `ontologyword_ids`. Read more +about it in the [TPR unit categorization section](#tpr-unit-categorization). + +#### [DEPRECATED] High school front page (field_hs_front_page) + +Reference field where the upper secondary school (high school) front page used to be added. Appears to be unused and +possibly **deprecated** field. + +#### Ontologyword details (field_ontologyword_details) + +This field is used to save _language program and weighted curriculum education_ information for TPR units. If the +information is present it is shown on the TPR unit entity page. This field is also used in filtering the +[High school search](#high-school-search) results. The field rendering is done in the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). + +#### Study field (field_study_field) + +Taxonomy term reference field that is used to categorize the vocational schools. The field is used in filtering the +[Vocational school search](#vocational-school-search). + +### TPR unit fields that are not use elsewhere + +There are also fields that are available globally for all the instances to use, but are used only in KASKO. This can +however change if some of the other instances would for some reason need to functionality. + +#### Hide description (hide_description) + +This is a simple boolean field that determines if _Description_ field is shown on the TPR unit page. The field is used +in the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). + +#### Contact details of daycare centre groups (subgroup) + +As the human-readable name suggests, this field includes _contact details of daycare centre groups_. The information is +displayed on the TPR unit page if there is data in the field and the unit is of type _daycare_. The field rendering is +done in the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). + +### News item pattern + +The news item pattern in KASKO is customized compared to the standard format. In KASKO, news items are always related to +an upper secondary school and are displayed within the school’s designated area. The pattern is designed to accommodate +this setup. The customization is done in custom module called `helfi_kasko_config`. You can check the code in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/tree/dev/public/modules/custom/helfi_kasko_config). From cb0cf6273ca7d5bbabefaaf79f0abe9b3aa765b2 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 18 Jul 2024 19:03:54 +0300 Subject: [PATCH 13/25] UHF-9659: Add documentation about instance customizations to readme --- README.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2412acb3..82174ccd 100644 --- a/README.md +++ b/README.md @@ -46,38 +46,79 @@ have. ### Custom paragraphs -#### After-school activity search (after_school_activity_search) +#### After-school activity search (after_school_activity_search) -TBD +This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _After-school activity_. -#### Daycare search (daycare_search) +- The filter search is a _view_ (`after_school_activity_search`) with exposed filters. +- No React front. +- The paragraph has editable title and description fields +- Can be added to landing pages and the lower content region of standard pages. -TBD +#### Daycare search (daycare_search) + +This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Daycare_. -#### Group news (group_news) +- The filter search is a _view_ (`daycare_search`) with exposed filters. +- No React front. +- The paragraph has editable title and description fields +- Can be added to landing pages and the lower content region of standard pages. + +#### Group news (group_news) TBD -#### Group news archive (group_news_archive) +#### Group news archive (group_news_archive) TBD #### High school search (high_school_search) -TBD +The _High school search_ lists high schools, also referred to as upper secondary schools in this instance. This search +was one of the first implementations of the unit searches, and it has a slightly different structure compared to the +[After-school activity search](#after-school-search), [Daycare search](#daycare-search), and [Playground search](#playground-search). -#### Playground search (playground_search) +The units are selected manually in the paragraph field `field_hs_search_units`, and the view filters the TPR units to +display based on the field's content. It is also possible to change the form's submit button text by writing the desired +text in the `field_hs_search_meta_button` field. The results are displayed in two tabs, allowing users to either list +schools or display them on a map. -TBD +The exposed form has additional functionality provided by `high-school-search.js`, which makes it possible to select a +value only for the _Emphasis_ or _Mission_ drop-down. This helps avoid searches that yield no results. + +- The filter search is a _view_ (`high_school_search`) with exposed filters. +- The results can be displayed as a list or on a map. +- No React front. +- The paragraph has editable title, description, units and search button fields. +- Can be added to landing pages and the lower content region of standard pages. +- The javascript `high-school-search.js` can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js). + +#### Playground search (playground_search) + +This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Playground_. + +- The filter search is a _view_ (`playground_search`) with exposed filters. +- No React front. +- The paragraph has editable title and description fields +- Can be added to landing pages and the higher and lower content regions of standard pages. #### School search (school_search) -TBD + #### Vocational School Search (vocational_school_search) -TBD +The _Vocational school search_ was created based on the [High school search](#high-school-search), so it has +similarities in the implementation details. + +The units are selected manually in the paragraph field `field_vs_search_units`, and the view filters the TPR units to +display based on the field's content. It is also possible to change the form's submit button text by writing the desired +text in the `field_vs_search_meta_button` field. +- The filter search is a _view_ (`vocational_school_search`) with exposed filter. +- No React front. +- The paragraph has editable title, description, units and search button fields. +- Can be added to landing pages and the higher and lower content regions of standard pages. ### Custom roles @@ -134,23 +175,48 @@ Administrator role, you can see the group that you belong to on the listing. ### Group news -TBD +Each of the upper secondary school groups can have news specific to their school. The news items are functionally the +same as those used in the Etusivu instance, but they are limited to the school's designated area. News is displayed in +two different paragraphs: [Group News](#group-news) and [Group News Archive](#group-news-archive). + +News items also have the _Override Node Options_ feature enabled, which is not part of the standard installation. This +allows _upper secondary school editors_ to override the _News Item Published_ option without needing permissions to +create news items outside the group they belong to. The override node options functionality is provided by the +`override_node_options` contrib module. ### Group menus -TBD +Each upper secondary school (high school) has their own group menu. This group menu is used on subpages of the school, +and it can be edited by the group members under the group configuration. The basic functionality of the Group modules +group menu has been customized in the `helfi_group` custom module. The group menu is displayed using a block that is +assigned to the _First sidebar_ region and has been restricted to _Group type Upper secondary school_. + +- Read more about the customizations [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/tree/dev/public/modules/custom/helfi_group). ## Customizations +### TPR unit template overrides + +The basic TPR unit template is overridden in `hdbt_subtheme` so that different kinds of school cards are rendered in +a specific way. You can check the template in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/templates/module/helfi_tpr/tpr-unit.html.twig). + +Also the TPR unit ontology word details template is overridden in `hdbt_subtheme` in a more detailed way. Check out the +template [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/templates/module/helfi_tpr/tpr-unit-ontologyword-details.html.twig). + ### TPR unit categorization -TBD +In KASKO instance the TPR units are categorized based on some of the ontology IDs they have in the TPR API. The +categories are then saved to a field called [Categories](#categories) in the `helfi_kasko_content` custom module in +[this file](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/modules/custom/helfi_kasko_content/src/UnitCategoryUtility.php). +The categories are then used on role assignment based on unit category and as search filters. + +- Read more about the implementation from the `helfi_kasko_content` custom module [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/tree/dev/public/modules/custom/helfi_kasko_content). ### TPR unit custom fields Unlike other instances, KASKO has some additional fields on TPR units. -#### Categories (field_categories) +#### Categories (field_categories) Field categories is used to save the TPR unit categorization that is done based on the `ontologyword_ids`. Read more about it in the [TPR unit categorization section](#tpr-unit-categorization). From a250936cc6693bea861634f6c3e4e518af192ceb Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 19 Jul 2024 13:07:08 +0300 Subject: [PATCH 14/25] UHF-9659: Add documentation about instance customizations to readme --- README.md | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 82174ccd..5c1f3a1e 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,8 @@ have. This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _After-school activity_. -- The filter search is a _view_ (`after_school_activity_search`) with exposed filters. +- The filter search is a _view_ (`after_school_activity_search`) with exposed filters. The view configuration can be +found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.after_school_activity_search.yml). - No React front. - The paragraph has editable title and description fields - Can be added to landing pages and the lower content region of standard pages. @@ -59,18 +60,32 @@ This search paragraph lists TPR units that are tagged with the `unit_type` vocab This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Daycare_. -- The filter search is a _view_ (`daycare_search`) with exposed filters. +- The filter search is a _view_ (`daycare_search`) with exposed filters. The view configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.daycare_search.yml). - No React front. - The paragraph has editable title and description fields - Can be added to landing pages and the lower content region of standard pages. #### Group news (group_news) -TBD +The _Group news_ paragraph lists latest news of a selected group. The block uses a view called `latest_group_news` that +has two displays for different amount of news listed. + +The number of news items to be displayed can be selected from the paragraph field `field_group_news_number_of_news`. +This selection determines the view display to be used. The related logic can be found in the `hdbt_subtheme` under the +group news paragraph template [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--group-news.html.twig). + +Additionally, the paragraph has a field called `field_group_news_group_id` that is used to identify the group whose +news should be displayed, and a field called `field_group_news_archive` where you can define the landing page to which +the paragraph should link. The paragraph also includes editable fields for the title and description. + +You can add the paragraph to landing pages and the higher and lower content regions of standard pages. #### Group news archive (group_news_archive) -TBD +The _Group news archive_ is simple paged list of all news the selected group has. The paragraph includes only one field +called `field_group_news_group_id` that is used to identify the group whose news should be displayed. The list is +a view called `group_news_archive` and its configuration can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.group_news_archive.yml). +You can add the paragraph to landing pages. #### High school search (high_school_search) @@ -86,11 +101,12 @@ schools or display them on a map. The exposed form has additional functionality provided by `high-school-search.js`, which makes it possible to select a value only for the _Emphasis_ or _Mission_ drop-down. This helps avoid searches that yield no results. -- The filter search is a _view_ (`high_school_search`) with exposed filters. +- The filter search is a _view_ (`high_school_search`) with exposed filters. The view configuration can be found in +[here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.high_school_search.yml). - The results can be displayed as a list or on a map. - No React front. - The paragraph has editable title, description, units and search button fields. -- Can be added to landing pages and the lower content region of standard pages. +- Can be added to landing pages and the higher and lower content regions of standard pages. - The javascript `high-school-search.js` can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js). #### Playground search (playground_search) @@ -100,11 +116,23 @@ This search paragraph lists TPR units that are tagged with the `unit_type` vocab - The filter search is a _view_ (`playground_search`) with exposed filters. - No React front. - The paragraph has editable title and description fields -- Can be added to landing pages and the higher and lower content regions of standard pages. +- Can be added to landing pages and lower content regions of standard pages. #### School search (school_search) +The _School search_ paragraph provides a tabbed interface that allows users to either find the nearest school by +entering a street address or find any school by filtering through the school's information. The search results are +displayed in a tabbed format, offering both a list view and a map view. + +This search functionality is built with React and utilizes a views listing (`comprehensive_school_search`) as a +fallback when JavaScript is disabled. All React-based searches are located in the `hdbt` theme, where most of the +related logic is implemented. +- The fallback listing is a _view_ called (`comprehensive_school_search`) and it doesn't have any filters. The fallback +view configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.comprehensive_school_search.yml). +- The search has a React front and the code can be found [here](https://github.com/City-of-Helsinki/drupal-hdbt/tree/main/src/js/react/apps/school-search). +- The paragraph has editable title and description fields. +- Can be added to landing pages. #### Vocational School Search (vocational_school_search) @@ -115,7 +143,8 @@ The units are selected manually in the paragraph field `field_vs_search_units`, display based on the field's content. It is also possible to change the form's submit button text by writing the desired text in the `field_vs_search_meta_button` field. -- The filter search is a _view_ (`vocational_school_search`) with exposed filter. +- The filter search is a _view_ (`vocational_school_search`) with exposed filter. The view configuration can be found in +[here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.vocational_school_search.yml). - No React front. - The paragraph has editable title, description, units and search button fields. - Can be added to landing pages and the higher and lower content regions of standard pages. From 1dec1fcf56fe03b4998ad2980db36eaa28e45068 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 19 Jul 2024 13:20:06 +0300 Subject: [PATCH 15/25] UHF-9659: Add short description of the project and adjust documentation a bit more --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5c1f3a1e..d1600605 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# City of Helsinki - KASKO Drupal 9 project +# City of Helsinki - KASKO Drupal project + +KASKO, short for kasvatus ja koulutus, is the site for the department responsible for childhood and education in the +city of Helsinki. The site includes multiple unit searches and a bit complex system built using the Group contrib module +for upper secondary schools. Additionally, it is the only core instance, aside from the Etusivu instance, that has the +News feature enabled. ## Environments @@ -187,13 +192,15 @@ news items and announcements inside the group content. There is also a custom module called `helfi_group` that modifies group menus, alters the standard translation features for nodes under group control, and allows TPR unit entities to be managed within the group. -Since groups can have their own news items, the news feature is enabled in the KASKO instance but is limited to upper -secondary schools. Each school can publish its own news, which is displayed within the school’s specific area. Other -KASKO-related news is created in the Etusivu instance in the same manner as other news, and the enabled news feature -does not affect this process. - - The custom module `helfi_group` can be found from [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/tree/dev/public/modules/custom/helfi_group). +### News feature + +Since [groups](#groups) can have their own news items, the news feature is enabled in the KASKO instance, but it is +limited to upper secondary schools. Each school can publish its own news, which is displayed within the school’s +specific area. Other KASKO-related news is created in the Etusivu instance in the same manner as other news, and the +enabled news feature does not affect this process. + #### Common issues The list of all groups (/admin/group) is empty even there is multiple groups in the database: From 02df63b00ce5dd9514857894a0872bf60d6310a0 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 19 Jul 2024 15:10:23 +0300 Subject: [PATCH 16/25] UHF-9659: Remove manual anchors from readme --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index d1600605..0e65929b 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ have. ### Custom paragraphs -#### After-school activity search (after_school_activity_search) +#### After-school activity search (after_school_activity_search) This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _After-school activity_. @@ -61,7 +61,7 @@ found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulut - The paragraph has editable title and description fields - Can be added to landing pages and the lower content region of standard pages. -#### Daycare search (daycare_search) +#### Daycare search (daycare_search) This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Daycare_. @@ -70,7 +70,7 @@ This search paragraph lists TPR units that are tagged with the `unit_type` vocab - The paragraph has editable title and description fields - Can be added to landing pages and the lower content region of standard pages. -#### Group news (group_news) +#### Group news (group_news) The _Group news_ paragraph lists latest news of a selected group. The block uses a view called `latest_group_news` that has two displays for different amount of news listed. @@ -85,14 +85,14 @@ the paragraph should link. The paragraph also includes editable fields for the t You can add the paragraph to landing pages and the higher and lower content regions of standard pages. -#### Group news archive (group_news_archive) +#### Group news archive (group_news_archive) The _Group news archive_ is simple paged list of all news the selected group has. The paragraph includes only one field called `field_group_news_group_id` that is used to identify the group whose news should be displayed. The list is a view called `group_news_archive` and its configuration can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.group_news_archive.yml). You can add the paragraph to landing pages. -#### High school search (high_school_search) +#### High school search (high_school_search) The _High school search_ lists high schools, also referred to as upper secondary schools in this instance. This search was one of the first implementations of the unit searches, and it has a slightly different structure compared to the @@ -114,7 +114,7 @@ value only for the _Emphasis_ or _Mission_ drop-down. This helps avoid searches - Can be added to landing pages and the higher and lower content regions of standard pages. - The javascript `high-school-search.js` can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js). -#### Playground search (playground_search) +#### Playground search (playground_search) This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Playground_. @@ -139,9 +139,9 @@ view configuration can be found in [here](https://github.com/City-of-Helsinki/dr - The paragraph has editable title and description fields. - Can be added to landing pages. -#### Vocational School Search (vocational_school_search) +#### Vocational School Search (vocational_school_search) -The _Vocational school search_ was created based on the [High school search](#high-school-search), so it has +The _Vocational school search_ was created based on the [High school search](#high-school-search-high_school_search), so it has similarities in the implementation details. The units are selected manually in the paragraph field `field_vs_search_units`, and the view filters the TPR units to @@ -182,7 +182,7 @@ edit nodes. To gain these permissions, users must be assigned to an upper second necessary editing rights for nodes within the group. This group grants other required permissions such as to use media entities and access to TPR units and services entities. More information about groups can be found [here](#groups). -### Groups +### Groups Unlike other instances, KASKO has the Group contrib module enabled. This module restricts upper secondary school editors’ access to a specific set of nodes and allows them to create dedicated website for their school within the KASKO @@ -213,7 +213,7 @@ Administrator role, you can see the group that you belong to on the listing. Each of the upper secondary school groups can have news specific to their school. The news items are functionally the same as those used in the Etusivu instance, but they are limited to the school's designated area. News is displayed in -two different paragraphs: [Group News](#group-news) and [Group News Archive](#group-news-archive). +two different paragraphs: [Group News](#group-news-group_news) and [Group News Archive](#group-news-archive-group_news_archive). News items also have the _Override Node Options_ feature enabled, which is not part of the standard installation. This allows _upper secondary school editors_ to override the _News Item Published_ option without needing permissions to @@ -239,10 +239,10 @@ a specific way. You can check the template in [here](https://github.com/City-of- Also the TPR unit ontology word details template is overridden in `hdbt_subtheme` in a more detailed way. Check out the template [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/templates/module/helfi_tpr/tpr-unit-ontologyword-details.html.twig). -### TPR unit categorization +### TPR unit categorization In KASKO instance the TPR units are categorized based on some of the ontology IDs they have in the TPR API. The -categories are then saved to a field called [Categories](#categories) in the `helfi_kasko_content` custom module in +categories are then saved to a field called [Categories](#categories-field_categories) in the `helfi_kasko_content` custom module in [this file](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/modules/custom/helfi_kasko_content/src/UnitCategoryUtility.php). The categories are then used on role assignment based on unit category and as search filters. @@ -252,7 +252,7 @@ The categories are then used on role assignment based on unit category and as se Unlike other instances, KASKO has some additional fields on TPR units. -#### Categories (field_categories) +#### Categories (field_categories) Field categories is used to save the TPR unit categorization that is done based on the `ontologyword_ids`. Read more about it in the [TPR unit categorization section](#tpr-unit-categorization). @@ -266,12 +266,12 @@ possibly **deprecated** field. This field is used to save _language program and weighted curriculum education_ information for TPR units. If the information is present it is shown on the TPR unit entity page. This field is also used in filtering the -[High school search](#high-school-search) results. The field rendering is done in the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). +[High school search](#high-school-search-high_school_search) results. The field rendering is done in the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). #### Study field (field_study_field) Taxonomy term reference field that is used to categorize the vocational schools. The field is used in filtering the -[Vocational school search](#vocational-school-search). +[Vocational school search](#vocational-school-search-vocational_school_search). ### TPR unit fields that are not use elsewhere From 8adcbbfd333d195b8ade3f2ea7f7966329e76e12 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 19 Jul 2024 16:03:25 +0300 Subject: [PATCH 17/25] UHF-9659: Modified documentation based on feedback --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e65929b..4d474580 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ KASKO, short for kasvatus ja koulutus, is the site for the department responsible for childhood and education in the city of Helsinki. The site includes multiple unit searches and a bit complex system built using the Group contrib module -for upper secondary schools. Additionally, it is the only core instance, aside from the Etusivu instance, that has the -News feature enabled. +for upper secondary schools. Additionally, this instance has the News feature enabled and used for upper secondary +schools. ## Environments From 89402826738c559c209e2baf3b87692cc2d899aa Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 19 Jul 2024 16:20:16 +0300 Subject: [PATCH 18/25] UHF-9659: Modified documentation based on feedback --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d474580..b08639f5 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ KASKO, short for kasvatus ja koulutus, is the site for the department responsible for childhood and education in the city of Helsinki. The site includes multiple unit searches and a bit complex system built using the Group contrib module -for upper secondary schools. Additionally, this instance has the News feature enabled and used for upper secondary -schools. +for upper secondary schools. ## Environments From 9f3f3d0a0bfd6da422885e6669008fc1d318aa60 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 19 Jul 2024 16:22:07 +0300 Subject: [PATCH 19/25] UHF-9659: Modified documentation based on feedback --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index b08639f5..b7c7e095 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,7 @@ $ make shell ## Instance specific features -The KASKO instance has multiple React searches and features provided by the Group module that other instances don’t -have. +The KASKO instance has multiple React searches and features provided by the Group module. ### Custom paragraphs From a748770eab04c6da569ae893f091acf23f466ed5 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 22 Jul 2024 11:21:34 +0300 Subject: [PATCH 20/25] UHF-9659: Modified documentation based on feedback --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b7c7e095..320231d4 100644 --- a/README.md +++ b/README.md @@ -182,10 +182,10 @@ entities and access to TPR units and services entities. More information about g ### Groups -Unlike other instances, KASKO has the Group contrib module enabled. This module restricts upper secondary school -editors’ access to a specific set of nodes and allows them to create dedicated website for their school within the KASKO -instance. Groups are used only for upper secondary schools and the groups can have standard pages, landing pages, -news items and announcements inside the group content. +KASKO has the Group contrib module enabled. This module restricts upper secondary school editors’ access to a specific +set of nodes and allows them to create dedicated website for their school within the KASKO instance. Groups are used +only for upper secondary schools and the groups can have standard pages, landing pages, news items and announcements +inside the group content. There is also a custom module called `helfi_group` that modifies group menus, alters the standard translation features for nodes under group control, and allows TPR unit entities to be managed within the group. @@ -248,7 +248,7 @@ The categories are then used on role assignment based on unit category and as se ### TPR unit custom fields -Unlike other instances, KASKO has some additional fields on TPR units. +KASKO has some additional fields on TPR units. #### Categories (field_categories) @@ -264,17 +264,18 @@ possibly **deprecated** field. This field is used to save _language program and weighted curriculum education_ information for TPR units. If the information is present it is shown on the TPR unit entity page. This field is also used in filtering the -[High school search](#high-school-search-high_school_search) results. The field rendering is done in the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). +[High school search](#high-school-search-high_school_search) results. The field rendering is done in the `hdbt` theme +[here](https://github.com/City-of-Helsinki/drupal-hdbt/blob/main/templates/module/helfi_tpr/tpr-unit.html.twig). #### Study field (field_study_field) Taxonomy term reference field that is used to categorize the vocational schools. The field is used in filtering the [Vocational school search](#vocational-school-search-vocational_school_search). -### TPR unit fields that are not use elsewhere +### Globally available TPR unit fields with customizations -There are also fields that are available globally for all the instances to use, but are used only in KASKO. This can -however change if some of the other instances would for some reason need to functionality. +The following fields are available globally for all instances to use, but in KASKO, they are customized compared to the +standard format. #### Hide description (hide_description) From 724d0b5f63f9fd153a11963cfa1a4623524f639e Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 22 Jul 2024 11:30:03 +0300 Subject: [PATCH 21/25] UHF-9659: Emphasize the Views module with capitalization when talking about it --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 320231d4..055ca1f6 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ The KASKO instance has multiple React searches and features provided by the Grou This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _After-school activity_. -- The filter search is a _view_ (`after_school_activity_search`) with exposed filters. The view configuration can be +- The filter search is a _View_ (`after_school_activity_search`) with exposed filters. The View configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.after_school_activity_search.yml). - No React front. - The paragraph has editable title and description fields @@ -63,18 +63,18 @@ found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulut This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Daycare_. -- The filter search is a _view_ (`daycare_search`) with exposed filters. The view configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.daycare_search.yml). +- The filter search is a _View_ (`daycare_search`) with exposed filters. The View configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.daycare_search.yml). - No React front. - The paragraph has editable title and description fields - Can be added to landing pages and the lower content region of standard pages. #### Group news (group_news) -The _Group news_ paragraph lists latest news of a selected group. The block uses a view called `latest_group_news` that -has two displays for different amount of news listed. +The _Group news_ paragraph lists latest news of a selected group. The block uses a _View_ called `latest_group_news` +that has two displays for different amount of news listed. The number of news items to be displayed can be selected from the paragraph field `field_group_news_number_of_news`. -This selection determines the view display to be used. The related logic can be found in the `hdbt_subtheme` under the +This selection determines the _View_ display to be used. The related logic can be found in the `hdbt_subtheme` under the group news paragraph template [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--group-news.html.twig). Additionally, the paragraph has a field called `field_group_news_group_id` that is used to identify the group whose @@ -87,7 +87,7 @@ You can add the paragraph to landing pages and the higher and lower content regi The _Group news archive_ is simple paged list of all news the selected group has. The paragraph includes only one field called `field_group_news_group_id` that is used to identify the group whose news should be displayed. The list is -a view called `group_news_archive` and its configuration can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.group_news_archive.yml). +a _View_ called `group_news_archive` and its configuration can be found [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.group_news_archive.yml). You can add the paragraph to landing pages. #### High school search (high_school_search) @@ -96,7 +96,7 @@ The _High school search_ lists high schools, also referred to as upper secondary was one of the first implementations of the unit searches, and it has a slightly different structure compared to the [After-school activity search](#after-school-search), [Daycare search](#daycare-search), and [Playground search](#playground-search). -The units are selected manually in the paragraph field `field_hs_search_units`, and the view filters the TPR units to +The units are selected manually in the paragraph field `field_hs_search_units`, and the _View_ filters the TPR units to display based on the field's content. It is also possible to change the form's submit button text by writing the desired text in the `field_hs_search_meta_button` field. The results are displayed in two tabs, allowing users to either list schools or display them on a map. @@ -104,7 +104,7 @@ schools or display them on a map. The exposed form has additional functionality provided by `high-school-search.js`, which makes it possible to select a value only for the _Emphasis_ or _Mission_ drop-down. This helps avoid searches that yield no results. -- The filter search is a _view_ (`high_school_search`) with exposed filters. The view configuration can be found in +- The filter search is a _View_ (`high_school_search`) with exposed filters. The View configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.high_school_search.yml). - The results can be displayed as a list or on a map. - No React front. @@ -116,7 +116,7 @@ value only for the _Emphasis_ or _Mission_ drop-down. This helps avoid searches This search paragraph lists TPR units that are tagged with the `unit_type` vocabulary term _Playground_. -- The filter search is a _view_ (`playground_search`) with exposed filters. +- The filter search is a _View_ (`playground_search`) with exposed filters. - No React front. - The paragraph has editable title and description fields - Can be added to landing pages and lower content regions of standard pages. @@ -127,12 +127,12 @@ The _School search_ paragraph provides a tabbed interface that allows users to e entering a street address or find any school by filtering through the school's information. The search results are displayed in a tabbed format, offering both a list view and a map view. -This search functionality is built with React and utilizes a views listing (`comprehensive_school_search`) as a +This search functionality is built with React and utilizes a _Views_ listing (`comprehensive_school_search`) as a fallback when JavaScript is disabled. All React-based searches are located in the `hdbt` theme, where most of the related logic is implemented. -- The fallback listing is a _view_ called (`comprehensive_school_search`) and it doesn't have any filters. The fallback -view configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.comprehensive_school_search.yml). +- The fallback listing is a _View_ called (`comprehensive_school_search`) and it doesn't have any filters. The fallback +View configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.comprehensive_school_search.yml). - The search has a React front and the code can be found [here](https://github.com/City-of-Helsinki/drupal-hdbt/tree/main/src/js/react/apps/school-search). - The paragraph has editable title and description fields. - Can be added to landing pages. @@ -142,11 +142,11 @@ view configuration can be found in [here](https://github.com/City-of-Helsinki/dr The _Vocational school search_ was created based on the [High school search](#high-school-search-high_school_search), so it has similarities in the implementation details. -The units are selected manually in the paragraph field `field_vs_search_units`, and the view filters the TPR units to +The units are selected manually in the paragraph field `field_vs_search_units`, and the _View_ filters the TPR units to display based on the field's content. It is also possible to change the form's submit button text by writing the desired text in the `field_vs_search_meta_button` field. -- The filter search is a _view_ (`vocational_school_search`) with exposed filter. The view configuration can be found in +- The filter search is a _View_ (`vocational_school_search`) with exposed filter. The View configuration can be found in [here](https://github.com/City-of-Helsinki/drupal-helfi-kasvatus-koulutus/blob/dev/conf/cmi/views.view.vocational_school_search.yml). - No React front. - The paragraph has editable title, description, units and search button fields. From 5efd4dd2d1051a2f522909ae8fb17a587c544abc Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 6 Aug 2024 05:06:52 +0000 Subject: [PATCH 22/25] Update configuration --- composer.lock | 1495 +++++++++++++---- conf/cmi/easy_breadcrumb.settings.yml | 1 + ...cookie_compliance.cookie_category.chat.yml | 4 +- ...e_compliance.cookie_category.essential.yml | 4 +- ..._compliance.cookie_category.preference.yml | 4 +- ..._compliance.cookie_category.statistics.yml | 4 +- conf/cmi/eu_cookie_compliance.settings.yml | 2 +- ...cookie_compliance.cookie_consent_intro.yml | 1 - ...cookie_compliance.cookie_category.chat.yml | 2 +- ...e_compliance.cookie_category.essential.yml | 2 +- ..._compliance.cookie_category.preference.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 2 +- ...cookie_compliance.cookie_category.chat.yml | 2 +- ...e_compliance.cookie_category.essential.yml | 2 +- ..._compliance.cookie_category.preference.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 2 +- ...iews.view.after_school_activity_search.yml | 2 +- conf/cmi/views.view.archive.yml | 2 +- conf/cmi/views.view.authmap.yml | 2 +- ...views.view.comprehensive_school_search.yml | 2 +- conf/cmi/views.view.content.yml | 2 +- conf/cmi/views.view.daycare_search.yml | 2 +- .../cmi/views.view.editoria11y_dismissals.yml | 2 +- conf/cmi/views.view.editoria11y_results.yml | 10 +- conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.files.yml | 4 +- conf/cmi/views.view.glossary.yml | 2 +- conf/cmi/views.view.group_members.yml | 2 +- conf/cmi/views.view.group_news_archive.yml | 2 +- conf/cmi/views.view.group_nodes.yml | 2 +- conf/cmi/views.view.group_tpr_units.yml | 2 +- conf/cmi/views.view.locked_content.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.media.yml | 2 +- conf/cmi/views.view.media_library.yml | 4 +- conf/cmi/views.view.paragraphs_library.yml | 2 +- conf/cmi/views.view.paragraphs_selection.yml | 2 +- conf/cmi/views.view.playground_search.yml | 2 +- conf/cmi/views.view.redirect.yml | 2 +- ...views.view.scheduler_scheduled_content.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.taxonomy_term.yml | 2 +- .../views.view.tpr_errand_service_list.yml | 2 +- .../views.view.tpr_service_channel_list.yml | 2 +- conf/cmi/views.view.tpr_service_list.yml | 2 +- conf/cmi/views.view.tpr_unit_list.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- conf/cmi/views.view.user_admin_people.yml | 2 +- docker/elastic-proxy/nginx.conf | 2 +- public/sites/default/settings.php | 5 + 52 files changed, 1198 insertions(+), 422 deletions(-) diff --git a/composer.lock b/composer.lock index 3d27f97d..1f1daae0 100644 --- a/composer.lock +++ b/composer.lock @@ -183,6 +183,215 @@ }, "time": "2024-06-06T17:36:37+00:00" }, + { + "name": "chillerlan/php-qrcode", + "version": "4.4.1", + "source": { + "type": "git", + "url": "https://github.com/chillerlan/php-qrcode.git", + "reference": "f5e243f3b61a60934780579430a951460f40888d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/f5e243f3b61a60934780579430a951460f40888d", + "reference": "f5e243f3b61a60934780579430a951460f40888d", + "shasum": "" + }, + "require": { + "chillerlan/php-settings-container": "^2.1.4 || ^3.1", + "ext-mbstring": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phan/phan": "^5.4", + "phpmd/phpmd": "^2.15", + "phpunit/phpunit": "^9.6", + "setasign/fpdf": "^1.8.2", + "squizlabs/php_codesniffer": "^3.8" + }, + "suggest": { + "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", + "setasign/fpdf": "Required to use the QR FPDF output.", + "simple-icons/simple-icons": "SVG icons that you can use to embed as logos in the QR Code" + }, + "type": "library", + "autoload": { + "psr-4": { + "chillerlan\\QRCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kazuhiko Arase", + "homepage": "https://github.com/kazuhikoarase" + }, + { + "name": "Smiley", + "email": "smiley@chillerlan.net", + "homepage": "https://github.com/codemasher" + }, + { + "name": "Contributors", + "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" + } + ], + "description": "A QR code generator with a user friendly API. PHP 7.4+", + "homepage": "https://github.com/chillerlan/php-qrcode", + "keywords": [ + "phpqrcode", + "qr", + "qr code", + "qrcode", + "qrcode-generator" + ], + "support": { + "issues": "https://github.com/chillerlan/php-qrcode/issues", + "source": "https://github.com/chillerlan/php-qrcode/tree/4.4.1" + }, + "funding": [ + { + "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", + "type": "custom" + }, + { + "url": "https://ko-fi.com/codemasher", + "type": "ko_fi" + } + ], + "time": "2024-01-06T16:56:58+00:00" + }, + { + "name": "chillerlan/php-settings-container", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/chillerlan/php-settings-container.git", + "reference": "95ed3e9676a1d47cab2e3174d19b43f5dbf52681" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/95ed3e9676a1d47cab2e3174d19b43f5dbf52681", + "reference": "95ed3e9676a1d47cab2e3174d19b43f5dbf52681", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^8.1" + }, + "require-dev": { + "phpmd/phpmd": "^2.15", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-deprecation-rules": "^1.2", + "phpunit/phpunit": "^10.5", + "squizlabs/php_codesniffer": "^3.10" + }, + "type": "library", + "autoload": { + "psr-4": { + "chillerlan\\Settings\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Smiley", + "email": "smiley@chillerlan.net", + "homepage": "https://github.com/codemasher" + } + ], + "description": "A container class for immutable settings objects. Not a DI container.", + "homepage": "https://github.com/chillerlan/php-settings-container", + "keywords": [ + "Settings", + "configuration", + "container", + "helper" + ], + "support": { + "issues": "https://github.com/chillerlan/php-settings-container/issues", + "source": "https://github.com/chillerlan/php-settings-container" + }, + "funding": [ + { + "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", + "type": "custom" + }, + { + "url": "https://ko-fi.com/codemasher", + "type": "ko_fi" + } + ], + "time": "2024-07-16T11:13:48+00:00" + }, + { + "name": "christian-riesen/otp", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/ChristianRiesen/otp.git", + "reference": "aab865ae6d356993ad9d51f8a7e8f32b8a54730a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ChristianRiesen/otp/zipball/aab865ae6d356993ad9d51f8a7e8f32b8a54730a", + "reference": "aab865ae6d356993ad9d51f8a7e8f32b8a54730a", + "shasum": "" + }, + "require": { + "paragonie/constant_time_encoding": "^1|^2", + "paragonie/random_compat": ">=1", + "php": ">=5.6.0", + "symfony/polyfill-php56": "^1" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.11 || ^6.0.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Otp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Riesen", + "email": "chris.riesen@gmail.com", + "homepage": "http://christianriesen.com", + "role": "Developer" + } + ], + "description": "One Time Passwords, hotp and totp according to RFC4226 and RFC6238", + "homepage": "https://github.com/ChristianRiesen/otp", + "keywords": [ + "googleauthenticator", + "hotp", + "otp", + "rfc4226", + "rfc6238", + "totp" + ], + "support": { + "issues": "https://github.com/ChristianRiesen/otp/issues", + "source": "https://github.com/ChristianRiesen/otp/tree/2.7.0" + }, + "time": "2021-02-23T20:13:30+00:00" + }, { "name": "commerceguys/addressing", "version": "v1.4.2", @@ -394,16 +603,16 @@ }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", "shasum": "" }, "require": { @@ -455,7 +664,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.2" }, "funding": [ { @@ -471,7 +680,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-07-12T11:35:52+00:00" }, { "name": "consolidation/annotated-command", @@ -1037,18 +1246,85 @@ }, "time": "2022-12-20T22:53:13+00:00" }, + { + "name": "defuse/php-encryption", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/defuse/php-encryption.git", + "reference": "f53396c2d34225064647a05ca76c1da9d99e5828" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828", + "reference": "f53396c2d34225064647a05ca76c1da9d99e5828", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "paragonie/random_compat": ">= 2", + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "^5|^6|^7|^8|^9|^10", + "yoast/phpunit-polyfills": "^2.0.0" + }, + "bin": [ + "bin/generate-defuse-key" + ], + "type": "library", + "autoload": { + "psr-4": { + "Defuse\\Crypto\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Hornby", + "email": "taylor@defuse.ca", + "homepage": "https://defuse.ca/" + }, + { + "name": "Scott Arciszewski", + "email": "info@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "Secure PHP Encryption Library", + "keywords": [ + "aes", + "authenticated encryption", + "cipher", + "crypto", + "cryptography", + "encrypt", + "encryption", + "openssl", + "security", + "symmetric key cryptography" + ], + "support": { + "issues": "https://github.com/defuse/php-encryption/issues", + "source": "https://github.com/defuse/php-encryption/tree/v2.4.0" + }, + "time": "2023-06-19T06:10:36+00:00" + }, { "name": "dflydev/dot-access-data", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/dflydev/dflydev-dot-access-data.git", - "reference": "f41715465d65213d644d3141a6a93081be5d3549" + "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549", - "reference": "f41715465d65213d644d3141a6a93081be5d3549", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f", + "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f", "shasum": "" }, "require": { @@ -1108,9 +1384,9 @@ ], "support": { "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2" + "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3" }, - "time": "2022-10-27T11:44:00+00:00" + "time": "2024-07-08T12:26:09+00:00" }, { "name": "doctrine/annotations", @@ -1511,20 +1787,20 @@ }, { "name": "drupal/admin_toolbar", - "version": "3.4.2", + "version": "3.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_toolbar.git", - "reference": "3.4.2" + "reference": "3.5.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip", - "reference": "3.4.2", - "shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.5.0.zip", + "reference": "3.5.0", + "shasum": "099e8d4dc98e1d551b4f9cffdc39599eb8ad04e8" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.5 || ^10 || ^11" }, "require-dev": { "drupal/admin_toolbar_tools": "*" @@ -1532,8 +1808,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.4.2", - "datestamp": "1696006195", + "version": "3.5.0", + "datestamp": "1722639094", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1566,6 +1842,10 @@ "homepage": "https://www.drupal.org/u/matio89", "role": "Maintainer" }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640" + }, { "name": "matio89", "homepage": "https://www.drupal.org/user/2320090" @@ -1925,27 +2205,27 @@ }, { "name": "drupal/config_rewrite", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_rewrite.git", - "reference": "8.x-1.5" + "reference": "8.x-1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_rewrite-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "c4740c74fc6e48069cada1fab4c809f1b99d31ac" + "url": "https://ftp.drupal.org/files/projects/config_rewrite-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "caa66f28c03e680ce5163c2924733f75913231ad" }, "require": { - "drupal/core": "^8.6 || ^9 || ^10", + "drupal/core": "^8.6 || ^9 || ^10 || ^11", "php": ">=7.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.5", - "datestamp": "1659538494", + "version": "8.x-1.6", + "datestamp": "1719490162", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1958,9 +2238,9 @@ ], "authors": [ { - "name": "Brant Wynn (brantwynn)", - "homepage": "https://www.drupal.org/u/brantwynn", - "role": "Maintainer" + "name": "Diana Wynn (saltednut)", + "homepage": "https://www.drupal.org/u/saltednut", + "role": "Co-Maintainer" }, { "name": "saltednut", @@ -2056,16 +2336,16 @@ }, { "name": "drupal/core", - "version": "10.3.0", + "version": "10.3.1", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "6f1af3070110d7d0f2a6671bea26add34667f765" + "reference": "d137403a30d4154404e473785f48dfc889d77e23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/6f1af3070110d7d0f2a6671bea26add34667f765", - "reference": "6f1af3070110d7d0f2a6671bea26add34667f765", + "url": "https://api.github.com/repos/drupal/core/zipball/d137403a30d4154404e473785f48dfc889d77e23", + "reference": "d137403a30d4154404e473785f48dfc889d77e23", "shasum": "" }, "require": { @@ -2214,13 +2494,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.0" + "source": "https://github.com/drupal/core/tree/10.3.1" }, - "time": "2024-06-20T18:58:42+00:00" + "time": "2024-07-04T11:33:45+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.0", + "version": "10.3.1", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2264,32 +2544,32 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.0" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.1" }, "time": "2024-05-11T08:21:39+00:00" }, { "name": "drupal/crop", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/crop.git", - "reference": "8.x-2.3" + "reference": "8.x-2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/crop-8.x-2.3.zip", - "reference": "8.x-2.3", - "shasum": "8e109cf60077f4c605c4d1f895cb3dc28613a23a" + "url": "https://ftp.drupal.org/files/projects/crop-8.x-2.4.zip", + "reference": "8.x-2.4", + "shasum": "be11fad0abf1d53544d35cb4ca6cedd8e91d2542" }, "require": { - "drupal/core": "^9.3 || ^10" + "drupal/core": "^9.3 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.3", - "datestamp": "1665437894", + "version": "8.x-2.4", + "datestamp": "1720455738", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2605,26 +2885,26 @@ }, { "name": "drupal/easy_breadcrumb", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/easy_breadcrumb.git", - "reference": "2.0.6" + "reference": "2.0.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.6.zip", - "reference": "2.0.6", - "shasum": "622f31fb071dea25735cfc4eaab4cf96bde917ab" + "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.7.zip", + "reference": "2.0.7", + "shasum": "a17524ffc2c76bc0aedb04116c3647dc2025e762" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.2 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.6", - "datestamp": "1707084295", + "version": "2.0.7", + "datestamp": "1719427042", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2670,6 +2950,10 @@ "name": "NickDickinsonWilde", "homepage": "https://www.drupal.org/user/3094661" }, + { + "name": "rakesh.gectcr", + "homepage": "https://www.drupal.org/user/1177822" + }, { "name": "renatog", "homepage": "https://www.drupal.org/user/3326031" @@ -2678,6 +2962,10 @@ "name": "sonemonu", "homepage": "https://www.drupal.org/user/1667988" }, + { + "name": "spuky", + "homepage": "https://www.drupal.org/user/209353" + }, { "name": "tatarbj", "homepage": "https://www.drupal.org/user/649590" @@ -2829,6 +3117,76 @@ "issues": "https://www.drupal.org/project/issues/elasticsearch_connector" } }, + { + "name": "drupal/encrypt", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/encrypt.git", + "reference": "8.x-3.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/encrypt-8.x-3.1.zip", + "reference": "8.x-3.1", + "shasum": "357ca7fcf9879af66b5d0c5593da080f19664f17" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10", + "drupal/key": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-3.1", + "datestamp": "1669655248", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10 || ^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "alexpott", + "homepage": "https://www.drupal.org/user/157725" + }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + }, + { + "name": "nerdstein", + "homepage": "https://www.drupal.org/user/1557710" + }, + { + "name": "rlhawk", + "homepage": "https://www.drupal.org/user/352283" + }, + { + "name": "theunraveler", + "homepage": "https://www.drupal.org/user/71548" + }, + { + "name": "zzolo", + "homepage": "https://www.drupal.org/user/147331" + } + ], + "description": "Provides an API for two-way encryption.", + "homepage": "https://www.drupal.org/project/encrypt", + "support": { + "source": "https://git.drupalcode.org/project/encrypt" + } + }, { "name": "drupal/entity", "version": "1.4.0", @@ -2994,29 +3352,29 @@ }, { "name": "drupal/entity_reference_revisions", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_reference_revisions.git", - "reference": "8.x-1.11" + "reference": "8.x-1.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.11.zip", - "reference": "8.x-1.11", - "shasum": "de21cbb0d8a0344dc3496addcad4ed536747cec5" + "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.12.zip", + "reference": "8.x-1.12", + "shasum": "2a2ff8617c7ce01b56df1caaf0a563da04948e26" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9 || ^10 || ^11" }, "require-dev": { - "drupal/diff": "1.x-dev" + "drupal/diff": "^1 || ^2" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.11", - "datestamp": "1705140721", + "version": "8.x-1.12", + "datestamp": "1722804497", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3058,20 +3416,20 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta12", + "version": "2.0.0-beta13", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta12" + "reference": "8.x-2.0-beta13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta12.zip", - "reference": "8.x-2.0-beta12", - "shasum": "cdd31e6c413cad6fbdb1bd0aac9ad8a0331eb429" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta13.zip", + "reference": "8.x-2.0-beta13", + "shasum": "3b07a629ed6c94ee23656556b0d1a1c7ba58a77f" }, "require": { - "drupal/core": "^9.1 || ^10" + "drupal/core": "^10.1 || ^11" }, "require-dev": { "drupal/block_field": "~1.0", @@ -3088,8 +3446,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta12", - "datestamp": "1684309054", + "version": "8.x-2.0-beta13", + "datestamp": "1721834455", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -3106,6 +3464,10 @@ "GPL-2.0+" ], "authors": [ + { + "name": "Lullabot", + "homepage": "https://www.drupal.org/user/3815489" + }, { "name": "marcoscano", "homepage": "https://www.drupal.org/user/1288796" @@ -3285,26 +3647,26 @@ }, { "name": "drupal/externalauth", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/externalauth.git", - "reference": "2.0.5" + "reference": "2.0.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/externalauth-2.0.5.zip", - "reference": "2.0.5", - "shasum": "7c262c7ca20d26aae45896daee4249e47b637abc" + "url": "https://ftp.drupal.org/files/projects/externalauth-2.0.6.zip", + "reference": "2.0.6", + "shasum": "0dbc9fbab0901e940d52b239e08f031797f6bd2a" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9.5 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.5", - "datestamp": "1708329378", + "version": "2.0.6", + "datestamp": "1720689758", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3339,26 +3701,29 @@ }, { "name": "drupal/field_group", - "version": "3.4.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_group.git", - "reference": "8.x-3.4" + "reference": "8.x-3.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.4.zip", - "reference": "8.x-3.4", - "shasum": "80b937e1a11f8b29c69d853fc4bf798c057c6f94" + "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.6.zip", + "reference": "8.x-3.6", + "shasum": "427c0a65dc1936e69e60c120776056cfe5b43e86" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.2 || ^10 || ^11" + }, + "require-dev": { + "drupal/jquery_ui_accordion": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.4", - "datestamp": "1667241979", + "version": "8.x-3.6", + "datestamp": "1722672510", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3590,20 +3955,20 @@ }, { "name": "drupal/focal_point", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.1.0" + "reference": "2.1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.1.0.zip", - "reference": "2.1.0", - "shasum": "f5be307039e226953598932d30a4eb6b2e9ac7d9" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.1.1.zip", + "reference": "2.1.1", + "shasum": "f8c24bb4257f784176e79ec6f2b4c11ed46391e0" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^9.3 || ^10 || ^11", "drupal/crop": "^2.3" }, "require-dev": { @@ -3612,8 +3977,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0", - "datestamp": "1715085292", + "version": "2.1.1", + "datestamp": "1721126807", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3665,7 +4030,7 @@ "extra": { "drupal": { "version": "8.x-3.0-rc11", - "datestamp": "1718354743", + "datestamp": "1719568502", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3876,31 +4241,32 @@ }, { "name": "drupal/hal", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hal.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hal-2.0.2.zip", - "reference": "2.0.2", - "shasum": "9ec3ad376678941bae2e0eae0c980c42cddfc8b2" + "url": "https://ftp.drupal.org/files/projects/hal-2.0.3.zip", + "reference": "2.0.3", + "shasum": "81bc4b0bfdc6c3b7c2ec50f5eb4739451ff5c2ae" }, "require": { - "drupal/core": "^10" + "drupal/core": "^10 || ^11" }, "require-dev": { "drupal/aggregator": "2.x-dev", "drupal/entity_reference_revisions": "1.x-dev", - "drupal/rdf": "2.x-dev" + "drupal/rdf": "^2.1 || 3.0.x-dev", + "drupal/tour": "^1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1700523711", + "version": "2.0.3", + "datestamp": "1721252595", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3929,16 +4295,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.27", + "version": "6.5.34", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "6ea70e083d02bec8fb622d686d47943c819f3fa1" + "reference": "519362d9435f1b86da3d432d3bd88bc9f6aeca6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6ea70e083d02bec8fb622d686d47943c819f3fa1", - "reference": "6ea70e083d02bec8fb622d686d47943c819f3fa1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/519362d9435f1b86da3d432d3bd88bc9f6aeca6c", + "reference": "519362d9435f1b86da3d432d3bd88bc9f6aeca6c", "shasum": "" }, "require": { @@ -3956,10 +4322,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.27", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.34", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-06-20T12:41:39+00:00" + "time": "2024-07-19T12:30:27+00:00" }, { "name": "drupal/hdbt_admin", @@ -4049,16 +4415,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.5", + "version": "2.7.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "4165398e51c1657ffffb077d756d49db68b75832" + "reference": "a4bf1a64ccbcd3582e6d63cf2bcbc725146ae465" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4165398e51c1657ffffb077d756d49db68b75832", - "reference": "4165398e51c1657ffffb077d756d49db68b75832", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/a4bf1a64ccbcd3582e6d63cf2bcbc725146ae465", + "reference": "a4bf1a64ccbcd3582e6d63cf2bcbc725146ae465", "shasum": "" }, "require": { @@ -4088,10 +4454,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-06-25T09:02:27+00:00" + "time": "2024-07-30T06:54:52+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4254,16 +4620,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.1", + "version": "4.4.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "682707108c1afbbba8f6d91667d5c209f8b6ef2a" + "reference": "fe7cd00be9a4df3d849d1ebb13ed7246ea520fde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/682707108c1afbbba8f6d91667d5c209f8b6ef2a", - "reference": "682707108c1afbbba8f6d91667d5c209f8b6ef2a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fe7cd00be9a4df3d849d1ebb13ed7246ea520fde", + "reference": "fe7cd00be9a4df3d849d1ebb13ed7246ea520fde", "shasum": "" }, "require": { @@ -4274,8 +4640,8 @@ "drupal/config_ignore": "^3.0", "drupal/config_rewrite": "^1.4", "drupal/content_lock": "^2.2", - "drupal/core": "^10.1.5", - "drupal/core-composer-scaffold": "^10.0", + "drupal/core": "^10", + "drupal/core-composer-scaffold": "^10", "drupal/crop": "^2.1", "drupal/default_content": "^2.0.0-alpha2", "drupal/diff": "^1.0", @@ -4309,6 +4675,7 @@ "drupal/publication_date": "^2.0@beta", "drupal/rdf": "^2.0", "drupal/readonly_field_widget": "^1.0", + "drupal/real_aes": "^2.6", "drupal/redirect": "^1.6", "drupal/role_delegation": "^1.1", "drupal/scheduler": "^1.3", @@ -4318,6 +4685,7 @@ "drupal/siteimprove": "^2.0", "drupal/social_media": "^2.0", "drupal/stomp": "^2.0", + "drupal/tfa": "^1.7", "drupal/token": "^1.9", "drupal/translatable_menu_link_uri": "^2.0", "drupal/view_unpublished": "^1.0", @@ -4333,7 +4701,6 @@ "drupal/ctools": "<3.11 || ^4.0.1", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", - "drupal/simple_sitemap": ">4.1.7", "drush/drush": "<12" }, "type": "drupal-module", @@ -4377,10 +4744,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-06-26T11:20:54+00:00" + "time": "2024-08-06T05:03:16+00:00" }, { "name": "drupal/helfi_proxy", @@ -4565,26 +4932,26 @@ }, { "name": "drupal/imagecache_external", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/imagecache_external.git", - "reference": "3.0.3" + "reference": "3.0.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.3.zip", - "reference": "3.0.3", - "shasum": "83f5282a1854cc981fe19cea92f9b2b9d8167dd8" + "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.4.zip", + "reference": "3.0.4", + "shasum": "0a6fc7f66f6ab39beb787ae0a5923009911de55d" }, "require": { - "drupal/core": "^9.3 || ^10" + "drupal/core": "^10.1 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.3", - "datestamp": "1711900821", + "version": "3.0.4", + "datestamp": "1722719303", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5024,6 +5391,77 @@ "issues": "https://www.drupal.org/project/issues/jquery_ui_touch_punch" } }, + { + "name": "drupal/key", + "version": "1.19.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/key.git", + "reference": "8.x-1.19" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/key-8.x-1.19.zip", + "reference": "8.x-1.19", + "shasum": "ee8f7b8f8babd381f1e4423dccede94b4eb5985c" + }, + "require": { + "drupal/core": ">=8.9 <12" + }, + "require-dev": { + "drush/drush": ">=9" + }, + "suggest": { + "drush/drush": ">=11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.19", + "datestamp": "1720053341", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": ">=9" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Cellar Door", + "homepage": "https://www.drupal.org/user/658076" + }, + { + "name": "crashtest_", + "homepage": "https://www.drupal.org/user/261457" + }, + { + "name": "nerdstein", + "homepage": "https://www.drupal.org/user/1557710" + }, + { + "name": "rlhawk", + "homepage": "https://www.drupal.org/user/352283" + } + ], + "description": "Provides the ability to manage site-wide keys", + "homepage": "http://drupal.org/project/key", + "keywords": [ + "Drupal" + ], + "support": { + "source": "https://git.drupalcode.org/project/key", + "issues": "http://drupal.org/project/key" + } + }, { "name": "drupal/linkit", "version": "6.1.4", @@ -5693,31 +6131,34 @@ }, { "name": "drupal/pathauto", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/pathauto.git", - "reference": "8.x-1.12" + "reference": "8.x-1.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.12.zip", - "reference": "8.x-1.12", - "shasum": "b7b6432e315e38e59a7c6cc117134326c580de4c" + "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.13.zip", + "reference": "8.x-1.13", + "shasum": "e64b5a82cf1b8ab48bce400b21ae6fc99c8078fd" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^9.4 || ^10 || ^11", "drupal/ctools": "*", "drupal/token": "*" }, + "require-dev": { + "drupal/forum": "*" + }, "suggest": { "drupal/redirect": "When installed Pathauto will provide a new \"Update Action\" in case your URLs change. This is the recommended update action and is considered the best practice for SEO and usability." }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.12", - "datestamp": "1712319355", + "version": "8.x-1.13", + "datestamp": "1722507672", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5825,26 +6266,26 @@ }, { "name": "drupal/purge", - "version": "3.5.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/purge.git", - "reference": "8.x-3.5" + "reference": "8.x-3.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/purge-8.x-3.5.zip", - "reference": "8.x-3.5", - "shasum": "3772c156be0a2fc1df179710d23b9d7bf645b112" + "url": "https://ftp.drupal.org/files/projects/purge-8.x-3.6.zip", + "reference": "8.x-3.6", + "shasum": "f01d53c5a1d34301e86371c70a1d237a517b2897" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.5 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.5", - "datestamp": "1697142035", + "version": "8.x-3.6", + "datestamp": "1719557519", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5855,7 +6296,7 @@ }, "drush": { "services": { - "drush.services.yml": ">=9" + "drush.services.yml": ">=10" } } }, @@ -6024,27 +6465,73 @@ } }, { - "name": "drupal/readonly_field_widget", - "version": "1.5.0", + "name": "drupal/readonly_field_widget", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/readonly_field_widget.git", + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/readonly_field_widget-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "936bfb182d2c406501fb279dd3977d4c29113c3f" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.5", + "datestamp": "1660464949", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "thtas", + "homepage": "https://www.drupal.org/user/287467" + } + ], + "description": "Provides a field widget which can display the field formatter version of a field on the edit form", + "homepage": "https://www.drupal.org/project/readonly_field_widget", + "support": { + "source": "https://git.drupalcode.org/project/readonly_field_widget" + } + }, + { + "name": "drupal/real_aes", + "version": "2.6.0", "source": { "type": "git", - "url": "https://git.drupalcode.org/project/readonly_field_widget.git", - "reference": "8.x-1.5" + "url": "https://git.drupalcode.org/project/real_aes.git", + "reference": "8.x-2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/readonly_field_widget-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "936bfb182d2c406501fb279dd3977d4c29113c3f" + "url": "https://ftp.drupal.org/files/projects/real_aes-8.x-2.6.zip", + "reference": "8.x-2.6", + "shasum": "c18f40c69beadac60836032a127e53d5c0cd0a57" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "defuse/php-encryption": "^2.0", + "drupal/core": "^8 || ^9 || ^10 || ^11", + "drupal/encrypt": "^3.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.5", - "datestamp": "1660464949", + "version": "8.x-2.6", + "datestamp": "1719066076", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6057,14 +6544,22 @@ ], "authors": [ { - "name": "thtas", - "homepage": "https://www.drupal.org/user/287467" + "name": "Heine", + "homepage": "https://www.drupal.org/user/17943" + }, + { + "name": "nerdstein", + "homepage": "https://www.drupal.org/user/1557710" + }, + { + "name": "rlhawk", + "homepage": "https://www.drupal.org/user/352283" } ], - "description": "Provides a field widget which can display the field formatter version of a field on the edit form", - "homepage": "https://www.drupal.org/project/readonly_field_widget", + "description": "Provides an Authenticated AES encryption method for Encrypt through the Defuse PHP Encryption library.", + "homepage": "https://www.drupal.org/project/real_aes", "support": { - "source": "https://git.drupalcode.org/project/readonly_field_widget" + "source": "https://git.drupalcode.org/project/real_aes" } }, { @@ -6438,17 +6933,17 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.7", + "version": "4.1.9", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.7" + "reference": "4.1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.7.zip", - "reference": "4.1.7", - "shasum": "3d55ee386b0ebb81ed4c3461451a9e32a15d93d7" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.9.zip", + "reference": "4.1.9", + "shasum": "d86d90408b334cd7470ea631e3be5acca2103377" }, "require": { "drupal/core": "^9.3 || ^10", @@ -6457,8 +6952,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.7", - "datestamp": "1698936269", + "version": "4.1.9", + "datestamp": "1712441608", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6850,28 +7345,119 @@ "source": "https://git.drupalcode.org/project/stomp" } }, + { + "name": "drupal/tfa", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/tfa.git", + "reference": "8.x-1.7" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/tfa-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "a5e70d146da5bc44f97bfe6fbbda61cc8310fa87" + }, + "require": { + "chillerlan/php-qrcode": "^1.0.9 || ^2.0 || ^3.2 || ^4.0", + "christian-riesen/otp": "^2.1", + "drupal/core": "^8 || ^9 || ^10", + "drupal/encrypt": "~3.0", + "php": ">=7.0" + }, + "require-dev": { + "drupal/encrypt": "*", + "drupal/key": "*", + "drupal/services": "^4 || ^5", + "drush/drush": "^10 || ^11 || ^12", + "mglaman/phpstan-drupal": "^1.1", + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.1", + "phpstan/phpstan-phpunit": "^1.3" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.7", + "datestamp": "1713484490", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10 || ^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "cmlara", + "homepage": "https://www.drupal.org/user/1790054" + }, + { + "name": "coltrane", + "homepage": "https://www.drupal.org/user/91990" + }, + { + "name": "daggerhart", + "homepage": "https://www.drupal.org/user/167806" + }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + }, + { + "name": "jcnventura", + "homepage": "https://www.drupal.org/user/122464" + }, + { + "name": "nerdstein", + "homepage": "https://www.drupal.org/user/1557710" + }, + { + "name": "poker10", + "homepage": "https://www.drupal.org/user/272316" + } + ], + "description": "Pluggable provider of two factor authentication for Drupal", + "homepage": "https://www.drupal.org/project/tfa", + "support": { + "source": "https://git.drupalcode.org/project/tfa" + } + }, { "name": "drupal/token", - "version": "1.14.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/token.git", - "reference": "8.x-1.14" + "reference": "8.x-1.15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/token-8.x-1.14.zip", - "reference": "8.x-1.14", - "shasum": "df3cae709fcc1a99ac1111ce67a0d6af56d287d7" + "url": "https://ftp.drupal.org/files/projects/token-8.x-1.15.zip", + "reference": "8.x-1.15", + "shasum": "5916fbccc86458a5f51e71f832ac70ff4c84ebdf" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.2 || ^10 || ^11" + }, + "require-dev": { + "drupal/book": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.14", - "datestamp": "1713009399", + "version": "8.x-1.15", + "datestamp": "1722206211", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6969,24 +7555,23 @@ }, { "name": "drupal/twig_tweak", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/twig_tweak.git", - "reference": "3.3.0" + "reference": "3.4.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/twig_tweak-3.3.0.zip", - "reference": "3.3.0", - "shasum": "a029ab1775b62f08e573e5ad1ab27bc833e7f5b9" + "url": "https://ftp.drupal.org/files/projects/twig_tweak-3.4.0.zip", + "reference": "3.4.0", + "shasum": "1f47f71b4cfbad97fff11db1adc72c311bb1645e" }, "require": { - "drupal/core": "^9.3 || ^10.0", + "drupal/core": "^10.3 || ^11.0", "ext-json": "*", - "php": ">=7.3", - "symfony/polyfill-php80": "^1.17", - "twig/twig": "^2.15.3 || ^3.4.3" + "php": ">=8.1", + "twig/twig": "^3.10.3" }, "suggest": { "symfony/var-dumper": "Better dump() function for debugging Twig variables" @@ -6994,8 +7579,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.3.0", - "datestamp": "1708670116", + "version": "3.4.0", + "datestamp": "1721562308", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7003,7 +7588,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10 || ^11" + "drush.services.yml": "^10 || ^11" } } }, @@ -7391,16 +7976,16 @@ }, { "name": "drush/drush", - "version": "12.5.2", + "version": "12.5.3", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "4aebed85dc818ff762f2e24a85b023d2a52050df" + "reference": "7fe0a492d5126c457c5fb184c4668a132b0aaac6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/4aebed85dc818ff762f2e24a85b023d2a52050df", - "reference": "4aebed85dc818ff762f2e24a85b023d2a52050df", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/7fe0a492d5126c457c5fb184c4668a132b0aaac6", + "reference": "7fe0a492d5126c457c5fb184c4668a132b0aaac6", "shasum": "" }, "require": { @@ -7523,7 +8108,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.5.2" + "source": "https://github.com/drush-ops/drush/tree/12.5.3" }, "funding": [ { @@ -7531,7 +8116,7 @@ "type": "github" } ], - "time": "2024-05-02T17:20:48+00:00" + "time": "2024-08-02T11:57:29+00:00" }, { "name": "easyrdf/easyrdf", @@ -7915,16 +8500,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce" + "reference": "2cb60da59d5c6fb881a78b481d513c4c68a1a93c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce", - "reference": "7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/2cb60da59d5c6fb881a78b481d513c4c68a1a93c", + "reference": "2cb60da59d5c6fb881a78b481d513c4c68a1a93c", "shasum": "" }, "require": { @@ -7967,9 +8552,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.1.1" + "source": "https://github.com/FileEye/MimeMap/tree/2.1.2" }, - "time": "2024-05-17T19:22:06+00:00" + "time": "2024-06-29T16:52:07+00:00" }, { "name": "fileeye/pel", @@ -8258,22 +8843,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.1", + "version": "7.9.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + "reference": "d281ed313b989f213357e3be1a179f02196ac99b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", + "reference": "d281ed313b989f213357e3be1a179f02196ac99b", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^2.7.0", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -8284,9 +8869,9 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "guzzle/client-integration-tests": "3.0.2", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -8364,7 +8949,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + "source": "https://github.com/guzzle/guzzle/tree/7.9.2" }, "funding": [ { @@ -8380,20 +8965,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:35:24+00:00" + "time": "2024-07-24T11:22:20+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", "shasum": "" }, "require": { @@ -8401,7 +8986,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "type": "library", "extra": { @@ -8447,7 +9032,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" + "source": "https://github.com/guzzle/promises/tree/2.0.3" }, "funding": [ { @@ -8463,20 +9048,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:19:20+00:00" + "time": "2024-07-18T10:29:17+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.6.2", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "shasum": "" }, "require": { @@ -8491,8 +9076,8 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -8563,7 +9148,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.2" + "source": "https://github.com/guzzle/psr7/tree/2.7.0" }, "funding": [ { @@ -8579,7 +9164,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:05:35+00:00" + "time": "2024-07-18T11:15:46+00:00" }, { "name": "jean85/pretty-package-versions", @@ -9215,16 +9800,16 @@ }, { "name": "mck89/peast", - "version": "v1.16.2", + "version": "v1.16.3", "source": { "type": "git", "url": "https://github.com/mck89/peast.git", - "reference": "2791b08ffcc1862fe18eef85675da3aa58c406fe" + "reference": "645ec21b650bc2aced18285c85f220d22afc1430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mck89/peast/zipball/2791b08ffcc1862fe18eef85675da3aa58c406fe", - "reference": "2791b08ffcc1862fe18eef85675da3aa58c406fe", + "url": "https://api.github.com/repos/mck89/peast/zipball/645ec21b650bc2aced18285c85f220d22afc1430", + "reference": "645ec21b650bc2aced18285c85f220d22afc1430", "shasum": "" }, "require": { @@ -9237,7 +9822,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16.2-dev" + "dev-master": "1.16.3-dev" } }, "autoload": { @@ -9258,9 +9843,9 @@ "description": "Peast is PHP library that generates AST for JavaScript code", "support": { "issues": "https://github.com/mck89/peast/issues", - "source": "https://github.com/mck89/peast/tree/v1.16.2" + "source": "https://github.com/mck89/peast/tree/v1.16.3" }, - "time": "2024-03-05T09:16:03+00:00" + "time": "2024-07-23T14:00:32+00:00" }, { "name": "microsoft/azure-storage-blob", @@ -9401,16 +9986,16 @@ }, { "name": "monolog/monolog", - "version": "3.6.0", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654" + "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654", - "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", + "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", "shasum": "" }, "require": { @@ -9486,7 +10071,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.6.0" + "source": "https://github.com/Seldaek/monolog/tree/3.7.0" }, "funding": [ { @@ -9498,20 +10083,20 @@ "type": "tidelift" } ], - "time": "2024-04-12T21:02:21+00:00" + "time": "2024-06-28T09:40:51+00:00" }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", "shasum": "" }, "require": { @@ -9522,7 +10107,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -9554,9 +10139,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-07-01T20:03:41+00:00" }, { "name": "nodespark/des-connector", @@ -9675,6 +10260,123 @@ ], "time": "2021-11-18T09:23:29+00:00" }, + { + "name": "paragonie/constant_time_encoding", + "version": "v2.7.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105", + "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105", + "shasum": "" + }, + "require": { + "php": "^7|^8" + }, + "require-dev": { + "phpunit/phpunit": "^6|^7|^8|^9", + "vimeo/psalm": "^1|^2|^3|^4" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/constant_time_encoding/issues", + "source": "https://github.com/paragonie/constant_time_encoding" + }, + "time": "2024-05-08T12:18:48+00:00" + }, + { + "name": "paragonie/random_compat", + "version": "v9.99.100", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", + "shasum": "" + }, + "require": { + "php": ">= 7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, + "time": "2020-10-15T08:29:30+00:00" + }, { "name": "pear/archive_tar", "version": "1.5.0", @@ -10898,16 +11600,16 @@ }, { "name": "sentry/sentry", - "version": "4.8.0", + "version": "4.8.1", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163" + "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/3cf5778ff425a23f2d22ed41b423691d36f47163", - "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/61770efd8b7888e0bdd7d234f0ba67b066e47d04", + "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04", "shasum": "" }, "require": { @@ -10971,7 +11673,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.8.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.8.1" }, "funding": [ { @@ -10983,7 +11685,7 @@ "type": "custom" } ], - "time": "2024-06-05T13:18:43+00:00" + "time": "2024-07-16T13:45:27+00:00" }, { "name": "stomp-php/stomp-php", @@ -11060,16 +11762,16 @@ }, { "name": "symfony/console", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91" + "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91", - "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91", + "url": "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc", + "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc", "shasum": "" }, "require": { @@ -11134,7 +11836,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.8" + "source": "https://github.com/symfony/console/tree/v6.4.10" }, "funding": [ { @@ -11150,20 +11852,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c" + "reference": "5caf9c5f6085f13b27d70a236b776c07e4a1c3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3b618176e8c3a9e5772151c51eba0c52a0c771c", - "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5caf9c5f6085f13b27d70a236b776c07e4a1c3eb", + "reference": "5caf9c5f6085f13b27d70a236b776c07e4a1c3eb", "shasum": "" }, "require": { @@ -11215,7 +11917,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.8" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.10" }, "funding": [ { @@ -11231,7 +11933,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T07:32:07+00:00" }, { "name": "symfony/deprecation-contracts", @@ -11302,16 +12004,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc" + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc", - "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0", + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0", "shasum": "" }, "require": { @@ -11357,7 +12059,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.8" + "source": "https://github.com/symfony/error-handler/tree/v6.4.10" }, "funding": [ { @@ -11373,7 +12075,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/event-dispatcher", @@ -11533,16 +12235,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.8", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3" + "reference": "b51ef8059159330b74a4d52f68e671033c0fe463" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3", - "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b51ef8059159330b74a4d52f68e671033c0fe463", + "reference": "b51ef8059159330b74a4d52f68e671033c0fe463", "shasum": "" }, "require": { @@ -11579,7 +12281,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.8" + "source": "https://github.com/symfony/filesystem/tree/v6.4.9" }, "funding": [ { @@ -11595,20 +12297,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/finder", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c" + "reference": "af29198d87112bebdd397bd7735fbd115997824c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c", + "url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c", + "reference": "af29198d87112bebdd397bd7735fbd115997824c", "shasum": "" }, "require": { @@ -11643,7 +12345,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.8" + "source": "https://github.com/symfony/finder/tree/v6.4.10" }, "funding": [ { @@ -11659,20 +12361,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-24T07:06:38+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947" + "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b", + "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b", "shasum": "" }, "require": { @@ -11720,7 +12422,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.10" }, "funding": [ { @@ -11736,20 +12438,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:36:27+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1" + "reference": "147e0daf618d7575b5007055340d09aece5cf068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1", - "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068", + "reference": "147e0daf618d7575b5007055340d09aece5cf068", "shasum": "" }, "require": { @@ -11834,7 +12536,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/v6.4.8" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.10" }, "funding": [ { @@ -11850,20 +12552,20 @@ "type": "tidelift" } ], - "time": "2024-06-02T16:06:25+00:00" + "time": "2024-07-26T14:52:04+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.8", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "76326421d44c07f7824b19487cfbf87870b37efc" + "reference": "e2d56f180f5b8c5e7c0fbea872bb1f529b6d6d45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/76326421d44c07f7824b19487cfbf87870b37efc", - "reference": "76326421d44c07f7824b19487cfbf87870b37efc", + "url": "https://api.github.com/repos/symfony/mailer/zipball/e2d56f180f5b8c5e7c0fbea872bb1f529b6d6d45", + "reference": "e2d56f180f5b8c5e7c0fbea872bb1f529b6d6d45", "shasum": "" }, "require": { @@ -11914,7 +12616,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.8" + "source": "https://github.com/symfony/mailer/tree/v6.4.9" }, "funding": [ { @@ -11930,20 +12632,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-06-28T07:59:05+00:00" }, { "name": "symfony/mime", - "version": "v6.4.8", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33" + "reference": "7d048964877324debdcb4e0549becfa064a20d43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33", - "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33", + "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43", + "reference": "7d048964877324debdcb4e0549becfa064a20d43", "shasum": "" }, "require": { @@ -11957,7 +12659,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<5.4", - "symfony/serializer": "<6.3.2" + "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", @@ -11967,7 +12669,7 @@ "symfony/process": "^5.4|^6.4|^7.0", "symfony/property-access": "^5.4|^6.0|^7.0", "symfony/property-info": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.3.2|^7.0" + "symfony/serializer": "^6.4.3|^7.0.3" }, "type": "library", "autoload": { @@ -11999,7 +12701,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.8" + "source": "https://github.com/symfony/mime/tree/v6.4.9" }, "funding": [ { @@ -12015,7 +12717,7 @@ "type": "tidelift" } ], - "time": "2024-06-01T07:50:16+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/options-resolver", @@ -12566,6 +13268,74 @@ ], "time": "2024-06-19T12:30:46+00:00" }, + { + "name": "symfony/polyfill-php56", + "version": "v1.20.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php56/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-23T14:02:19+00:00" + }, { "name": "symfony/polyfill-php72", "version": "v1.30.0", @@ -13010,16 +13780,16 @@ }, { "name": "symfony/psr-http-message-bridge", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "23a162bd446b93948a2c2f6909d80ad06195be10" + "reference": "89a24648d73e4eee30893b0da16abc454a65c53b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/23a162bd446b93948a2c2f6909d80ad06195be10", - "reference": "23a162bd446b93948a2c2f6909d80ad06195be10", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/89a24648d73e4eee30893b0da16abc454a65c53b", + "reference": "89a24648d73e4eee30893b0da16abc454a65c53b", "shasum": "" }, "require": { @@ -13073,7 +13843,7 @@ "psr-7" ], "support": { - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.8" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.10" }, "funding": [ { @@ -13089,20 +13859,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:51:39+00:00" + "time": "2024-07-15T09:36:38+00:00" }, { "name": "symfony/routing", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58" + "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", - "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", + "url": "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87", + "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87", "shasum": "" }, "require": { @@ -13156,7 +13926,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.8" + "source": "https://github.com/symfony/routing/tree/v6.4.10" }, "funding": [ { @@ -13172,20 +13942,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-15T09:26:24+00:00" }, { "name": "symfony/serializer", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "d6eda9966a3e5d1823c1cedf41bf98f8ed969d7c" + "reference": "9a67fcf320561e96f94d62bbe0e169ac534a5718" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/d6eda9966a3e5d1823c1cedf41bf98f8ed969d7c", - "reference": "d6eda9966a3e5d1823c1cedf41bf98f8ed969d7c", + "url": "https://api.github.com/repos/symfony/serializer/zipball/9a67fcf320561e96f94d62bbe0e169ac534a5718", + "reference": "9a67fcf320561e96f94d62bbe0e169ac534a5718", "shasum": "" }, "require": { @@ -13254,7 +14024,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.4.8" + "source": "https://github.com/symfony/serializer/tree/v6.4.10" }, "funding": [ { @@ -13270,7 +14040,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T13:13:26+00:00" }, { "name": "symfony/service-contracts", @@ -13357,16 +14127,16 @@ }, { "name": "symfony/string", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d" + "reference": "ccf9b30251719567bfd46494138327522b9a9446" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d", - "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d", + "url": "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446", + "reference": "ccf9b30251719567bfd46494138327522b9a9446", "shasum": "" }, "require": { @@ -13423,7 +14193,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.8" + "source": "https://github.com/symfony/string/tree/v6.4.10" }, "funding": [ { @@ -13439,7 +14209,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-22T10:21:14+00:00" }, { "name": "symfony/translation-contracts", @@ -13521,16 +14291,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "dab2781371d54c86f6b25623ab16abb2dde2870c" + "reference": "bcf939a9d1acd7d2912e9474c0c3d7840a03cbcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/dab2781371d54c86f6b25623ab16abb2dde2870c", - "reference": "dab2781371d54c86f6b25623ab16abb2dde2870c", + "url": "https://api.github.com/repos/symfony/validator/zipball/bcf939a9d1acd7d2912e9474c0c3d7840a03cbcd", + "reference": "bcf939a9d1acd7d2912e9474c0c3d7840a03cbcd", "shasum": "" }, "require": { @@ -13598,7 +14368,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.8" + "source": "https://github.com/symfony/validator/tree/v6.4.10" }, "funding": [ { @@ -13614,20 +14384,20 @@ "type": "tidelift" } ], - "time": "2024-06-02T15:48:50+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25" + "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25", - "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4", + "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4", "shasum": "" }, "require": { @@ -13683,7 +14453,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.8" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.10" }, "funding": [ { @@ -13699,20 +14469,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "db82c2b73b88734557cfc30e3270d83fa651b712" + "reference": "b80a669a2264609f07f1667f891dbfca25eba44c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db82c2b73b88734557cfc30e3270d83fa651b712", - "reference": "db82c2b73b88734557cfc30e3270d83fa651b712", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c", + "reference": "b80a669a2264609f07f1667f891dbfca25eba44c", "shasum": "" }, "require": { @@ -13759,7 +14529,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.1.1" + "source": "https://github.com/symfony/var-exporter/tree/v7.1.2" }, "funding": [ { @@ -13775,7 +14545,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T08:00:31+00:00" }, { "name": "symfony/yaml", @@ -14116,16 +14886,16 @@ }, { "name": "webflo/drupal-finder", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/webflo/drupal-finder.git", - "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a" + "reference": "73045060b0894c77962a10cff047f72872d8810c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", - "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", + "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/73045060b0894c77962a10cff047f72872d8810c", + "reference": "73045060b0894c77962a10cff047f72872d8810c", "shasum": "" }, "require": { @@ -14134,7 +14904,8 @@ }, "require-dev": { "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^10.4" + "phpunit/phpunit": "^10.4", + "symfony/process": "^6.4" }, "type": "library", "autoload": { @@ -14155,9 +14926,9 @@ "description": "Helper class to locate a Drupal installation.", "support": { "issues": "https://github.com/webflo/drupal-finder/issues", - "source": "https://github.com/webflo/drupal-finder/tree/1.3.0" + "source": "https://github.com/webflo/drupal-finder/tree/1.3.1" }, - "time": "2024-05-08T21:22:39+00:00" + "time": "2024-06-28T13:45:36+00:00" }, { "name": "webmozart/assert", diff --git a/conf/cmi/easy_breadcrumb.settings.yml b/conf/cmi/easy_breadcrumb.settings.yml index b36f432b..2e5abdc3 100644 --- a/conf/cmi/easy_breadcrumb.settings.yml +++ b/conf/cmi/easy_breadcrumb.settings.yml @@ -33,3 +33,4 @@ segment_display_limit: null truncator_mode: false truncator_length: 100 truncator_dots: true +segment_display_minimum: 1 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml index 6d95d0d0..2ae82d9b 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml @@ -3,11 +3,11 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: MtcUnaHor36G5nT42_iCaKuQEma5ifvUuS83W8ieHPo + default_config_hash: Fo0xGa_NGmRHechfzeoRkN1cxRB2-z_P0gHmfGny4E8 id: chat label: 'Functional chat cookies' description: - value: '

The chats on the hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

NameProviderPurpose of the cookieValidityType
_genesys.widgets.*hel.fiUsed for storing data required by the chat functionality.Session 
leijuke.*hel.fiUsed for storing data required by the chat functionality.Session 
aiap-wbc-chat-app-button-statehel.fiUsed for chat app functionality. Stores chat app button settings and configuration data.Session 
aiap-chat-app-v1-statehel.fiUsed for chat app functionality. Stores chat app settings and configuration data.Session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Stores chat app conversation token for authentication and data access purposes.SessionThird party
' + value: '

The chats on the www.hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

NameProviderPurpose of the cookieValidityType
_genesys.widgets.*www.hel.fiUsed for storing data required by the chat functionality.Session 
leijuke.*www.hel.fiUsed for storing data required by the chat functionality.Session 
aiap-wbc-chat-app-button-statewww.hel.fiUsed for chat app functionality. Stores chat app button settings and configuration data.Session 
aiap-chat-app-v1-statewww.hel.fiUsed for chat app functionality. Stores chat app settings and configuration data.Session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Stores chat app conversation token for authentication and data access purposes.SessionThird party
CallGuide.languagewww.hel.fiACE Chat: The language used in the ACE Web SDK is derived from the browsers' preferred language setting and ACE Web SDK settings.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Configuring customer service integrations on a web page. Reduces web traffic when loading and navigating a page-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: The unique identity of this browser window. Is used if the browser has more than one open window for a website-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Only one window at a time can display video. This information tracks which of them (if any).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: A list of all windows that are likely to display the video-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: A website can have more than one chat client. This item tracks which customer the current chat belongs to.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Name of the chat entrance to the system-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Chat session ID when communicating with ACE-Local storage
humany-*www.hel.fiACE Chat: Preserves widget status when page reloads-Local storage
ARRAffinity.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
ARRAffinitySameSite.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
' format: full_html checkbox_default_state: unchecked weight: -5 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml index 33637ad3..7c18a07b 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml @@ -3,11 +3,11 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: oVn5Apol-q10_G1LoTbTJNj-k-1eYvCbO4vGiUF09t4 + default_config_hash: kfnLYqpxtvBYopdnyeB0TYzlfLynAY6hIegpzFNdDKw id: essential label: 'Essential cookies' description: - value: '

Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.

NameProviderPurpose of the cookieValidityType
cookiehubcookiehub.comUsed by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the hel.fi site.365 days 
cookie-agreedhel.fiUsed by hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the hel.fi site.100 days 
cookie-agreed-versionhel.fiUsed by hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categorieshel.fiUsed by hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
cookie-agreedavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.100 days 
cookie-agreed-versionavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categoriesavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
SSESS*hel.fiA cookie related to the operation of the content management system.23 days 
SSESS*avustukset.hel.fiA cookie related to the operation of the content management system.23 days 
AWSELBCORSsiteimproveanalytics.ioThe cookie is related to a load distribution function used to direct requests to servers with the least traffic.SessionThird party
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 days 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

The cookie is an obligatory cookie that facilitates visiting the website.SessionThird party
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Its value is used to access session data on server of the application.SessionThird party
COOKIE_SUPPORThelsinkikanava.fiThe cookie facilitates managing cookies on the website.365 daysThird party
GUEST_LANGUAGE_IDhelsinkikanava.fiThis cookie is generated by the Liferay, its function is to store the language preferences.365 daysThird party
helfi-settingshel.fiUsed by hel.fi Drupal to store information about closed announcements and accordions'' state.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiUsed by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.365 days 
' + value: '

Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.

NameProviderPurpose of the cookieValidityType
cookiehubcookiehub.comUsed by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.365 days 
cookie-agreedwww.hel.fiUsed by www.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.100 days 
cookie-agreed-versionwww.hel.fiUsed by www.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categorieswww.hel.fiUsed by www.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
cookie-agreedavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.100 days 
cookie-agreed-versionavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categoriesavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
SSESS*www.hel.fiA cookie related to the operation of the content management system.23 days 
SSESS*avustukset.hel.fiA cookie related to the operation of the content management system.23 days 
AWSELBCORSsiteimproveanalytics.ioThe cookie is related to a load distribution function used to direct requests to servers with the least traffic.SessionThird party
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 days 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

The cookie is an obligatory cookie that facilitates visiting the website.SessionThird party
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Its value is used to access session data on server of the application.SessionThird party
COOKIE_SUPPORThelsinkikanava.fiThe cookie facilitates managing cookies on the website.365 daysThird party
GUEST_LANGUAGE_IDhelsinkikanava.fiThis cookie is generated by the Liferay, its function is to store the language preferences.365 daysThird party
helfi-settingswww.hel.fiUsed by www.hel.fi Drupal to store information about closed announcements and accordions'' state.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiUsed by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.365 days 
' format: full_html checkbox_default_state: required weight: -9 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml index 0724b5d7..b7525e94 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml @@ -3,11 +3,11 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: wwt5AyVnGkL_AxTa10uXAzOVI_a51Rhkc7LZtHkYTFE + default_config_hash: 2nukTq0GW1ah8MZEHNDaOJ0Ygil0hTpw48HeCYekkZY id: preference label: Preference description: - value: '

Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.

NameProviderPurpose of the cookieValidityType
httpskartta.hel.fi.SWCulturekartta.hel.fiThe City''s map service cookie saves the language in which the service is used.1826 days 
icareus-devicehelsinkikanava.fiThe Helsinki Channel video server cookie facilitates including videos as part of the website''s content.365 daysThird party
VISITOR_INFO1_LIVEyoutube.comThe YouTube cookie selects the old or new video player depending on the connection speed.180 daysThird party
CONSENTyoutube.comUsed by Google to store user consent preferences5947 days, 15 hoursThird party
activeTabhel.fiUsed for storing active tab data when user is using high school search.Session 
activeContenthel.fiUsed for storing active content data when user is using high school search.Session 
' + value: '

Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.

NameProviderPurpose of the cookieValidityType
httpskartta.hel.fi.SWCulturekartta.hel.fiThe City''s map service cookie saves the language in which the service is used.1826 days 
icareus-devicehelsinkikanava.fiThe Helsinki Channel video server cookie facilitates including videos as part of the website''s content.365 daysThird party
VISITOR_INFO1_LIVEyoutube.comThe YouTube cookie selects the old or new video player depending on the connection speed.180 daysThird party
CONSENTyoutube.comUsed by Google to store user consent preferences5947 days, 15 hoursThird party
activeTabwww.hel.fiUsed for storing active tab data when user is using high school search.Session 
activeContentwww.hel.fiUsed for storing active content data when user is using high school search.Session 
' format: full_html checkbox_default_state: unchecked weight: -8 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml index 15837fd0..2321951b 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml @@ -3,11 +3,11 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: vfx2dT2Gn9ght_4rgTxtoMRgtOrfQ1zaMfLrnOOdoWs + default_config_hash: DocxmYG5rysx8IQZ_Mu2ZhNcPnpkNpXJAYeRDWSRMds id: statistics label: Statistics description: - value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstathel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*avustukset.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*avustukset.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
' + value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstatwww.hel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*www.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6www.hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*avustukset.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*avustukset.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
' format: full_html checkbox_default_state: unchecked weight: -7 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index 9af81af2..519e31d7 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -71,7 +71,7 @@ enable_save_preferences_button: true domain_all_sites: true settings_tab_enabled: false containing_element: body -cookie_policy_version: 1.2.4 +cookie_policy_version: 1.2.5 cookie_value_disagreed: '0' cookie_value_agreed_show_thank_you: '1' cookie_value_agreed: '2' diff --git a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml index 30412ad8..368a0db9 100644 --- a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml @@ -1,6 +1,5 @@ _core: default_config_hash: eVNvfbEgjm25gLyG5DH8zDbCi17xs8djPZt0XHD_Q9s -langcode: en cc: title: 'Cookie settings' content: diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml index 3ba97b22..e384bffd 100644 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml @@ -1,4 +1,4 @@ description: - value: '

Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti.  Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.

NimiTarjoajaTarkoitusVoimassaTyyppi
_genesys.widgets.*hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
leijuke.*hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
aiap-wbc-chat-app-button-statehel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen painikkeen asetukset ja kokoonpanotiedot.Istunto 
aiap-chat-app-v1-statehel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen asetukset ja kokoonpanotiedot.Istunto 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen keskustelutunnisteen istunnnon tunnistamista ja tietojen hakemista varten.IstuntoKolmas osapuoli
' + value: '

Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti.  Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.

NimiTarjoajaTarkoitusVoimassaTyyppi
_genesys.widgets.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
leijuke.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
aiap-wbc-chat-app-button-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen painikkeen asetukset ja kokoonpanotiedot.Istunto 
aiap-chat-app-v1-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen asetukset ja kokoonpanotiedot.Istunto 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen keskustelutunnisteen istunnnon tunnistamista ja tietojen hakemista varten.IstuntoKolmas osapuoli
CallGuide.languagewww.hel.fiACE Chat: ACE Web SDK:ssa käytettävä kieli, joka on johdettu selainten ensisijaisesta kieliasetuksesta ja ACE Web SDK - asetuksista.-Paikallinen muisti
CallGuide.config_services_*www.hel.fiACE Chat: Asiakaspalveluintegraatioiden määritys verkkosivulla. Vähentää verkkoliikennettä sivun lataamisen ja navigoinnin yhteydessä.-Paikallinen muisti
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: Tämän selainikkunan yksilöllinen identiteetti. Käytetään, jos selaimessa on useampi kuin yksi avoin ikkuna verkkosivustolle.-Paikallinen muisti
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Vain yksi ikkuna kerrallaan voi näyttää videota. Nämä tiedot seuraavat, mikä niistä (jos sellainen on).-Paikallinen muisti
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: Luettelo kaikista ikkunoista, jotka ovat todennäköisiä videon näyttämiseen.-Paikallinen muisti
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: Verkkosivustolla voi olla useampi kuin yksi chat-asiakasohjelma. Tämä kohde seuraa, mihin asiakkaaseen nykyinen chat kuuluu.-Paikallinen muisti
*_chatEntrancewds.ace.teliacompany.comACE Chat: Järjestelmän chat-sisäänkäynnin nimi-Paikallinen muisti
*_chatUIDwds.ace.teliacompany.comACE Chat: Keskustelun istuntotunnus kommunikoitaessa ACE:n kanssa-Paikallinen muisti
humany-*www.hel.fiACE Chat: Säilyttää widgetin tilan, kun sivu ladataan uudelleen -Paikallinen muisti
ARRAffinity.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
ARRAffinitySameSite.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
' format: full_html label: 'Toiminnalliset chat-evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml index 7bdeb019..f66aa525 100644 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml @@ -1,4 +1,4 @@ description: - value: '

Välttämättömät evästeet auttavat tekemään verkkosivustosta käyttökelpoisen sallimalla perustoimintoja, kuten sivulla siirtymisen ja sivuston suojattujen alueiden käytön. Verkkosivusto ei toimi kunnolla ilman näitä evästeitä eikä niihin tarvita suostumusta.

NimiTarjoajaTarkoitusVoimassaTyyppi
cookiehubCookiehubMahdollistaa evästehallinnan hel.fi sivuilla.365 päivää 
cookie-agreedhel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionhel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categorieshel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
cookie-agreedavustukset.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionavustukset.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categoriesavustukset.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
SSESS*hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
SSESS*avustukset.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
AWSELBCORSsiteimproveanalytics.ioEväste liittyy palvelinten kuormanjakotoiminnallisuuteen, jolla ohjataan pyynnöt vähimmällä käytöllä olevalle palvelimille.IstuntoKolmas osapuoli
mtm_cookie_consentkartta.hel.fiTekninen eväste johon talletetaan tieto valinnastasi evästeiden käytöstä kertovan bannerin kohdalla10950 päivää 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.IstuntoKolmas osapuoli
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Evästettä käytetään sovelluksen palvelimella olevan istuntotiedon hakemiseen.IstuntoKolmas osapuoli
COOKIE_SUPPORThelsinkikanava.fiMahdollistaa evästeiden hallinnan sivustolla.365 päivääKolmas osapuoli
GUEST_LANGUAGE_IDhelsinkikanava.fiTämän evästeen on luonut Liferay, se tallentaa kieliasetukset.365 päivääKolmas osapuoli
helfi-settingshel.fiSivusto käyttää tätä tietuetta tietojen tallentamiseen siitä, mitä poikkeusilmoituksia on suljettu ja mikä on avattavien sisältöalueiden tila.-Paikallinen muisti
Drupal.visitor.autologout_loginavustukset.hel.fiKäytetään käyttäjän automaattiseen uloskirjautumiseen.365 päivää 
' + value: '

Välttämättömät evästeet auttavat tekemään verkkosivustosta käyttökelpoisen sallimalla perustoimintoja, kuten sivulla siirtymisen ja sivuston suojattujen alueiden käytön. Verkkosivusto ei toimi kunnolla ilman näitä evästeitä eikä niihin tarvita suostumusta.

NimiTarjoajaTarkoitusVoimassaTyyppi
cookiehubCookiehubMahdollistaa evästehallinnan www.hel.fi sivuilla.365 päivää 
cookie-agreedwww.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionwww.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categorieswww.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
cookie-agreedavustukset.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionavustukset.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categoriesavustukset.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
SSESS*www.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
SSESS*avustukset.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
AWSELBCORSsiteimproveanalytics.ioEväste liittyy palvelinten kuormanjakotoiminnallisuuteen, jolla ohjataan pyynnöt vähimmällä käytöllä olevalle palvelimille.IstuntoKolmas osapuoli
mtm_cookie_consentkartta.hel.fiTekninen eväste johon talletetaan tieto valinnastasi evästeiden käytöstä kertovan bannerin kohdalla10950 päivää 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.IstuntoKolmas osapuoli
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Evästettä käytetään sovelluksen palvelimella olevan istuntotiedon hakemiseen.IstuntoKolmas osapuoli
COOKIE_SUPPORThelsinkikanava.fiMahdollistaa evästeiden hallinnan sivustolla.365 päivääKolmas osapuoli
GUEST_LANGUAGE_IDhelsinkikanava.fiTämän evästeen on luonut Liferay, se tallentaa kieliasetukset.365 päivääKolmas osapuoli
helfi-settingswww.hel.fiSivusto käyttää tätä tietuetta tietojen tallentamiseen siitä, mitä poikkeusilmoituksia on suljettu ja mikä on avattavien sisältöalueiden tila.-Paikallinen muisti
Drupal.visitor.autologout_loginavustukset.hel.fiKäytetään käyttäjän automaattiseen uloskirjautumiseen.365 päivää 
' format: full_html label: 'Välttämättömät toiminnalliset evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml index 58bceff4..93f9ff7d 100644 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml @@ -1,4 +1,4 @@ label: Personointi description: - value: '

Mieltymysevästeet mukauttavat sivuston ulkoasua ja toimintaa käyttäjän aiemman käytön perusteella.

NimiTarjoajaTarkoitusVoimassaTyyppi
httpskartta.hel.fi.SWCulturekartta.hel.fiKaupungin karttapalvelun evästeeseen tallennetaan kieli, jolla palvelua käytetään.1826 päivää 
icareus-devicehelsinkikanava.fiHelsinki-kanavan videopalvelimen eväste.365 päivääKolmas osapuoli
VISITOR_INFO1_LIVEyoutube.comYouTuben eväste valitsee yhteyden nopeuden mukaan, joko vanhan tai uuden videosoittimen.180 päivääKolmas osapuoli
CONSENTyoutube.comGooglen eväste tallentaa kävijän evästehyväskynnän.5947 päivää, 15 tuntiaKolmas osapuoli
activeTabhel.fiKäytetään aktiivisten välilehtien tietojen tallentamiseen, kun käyttäjä käyttää lukioiden suodatushakua.Istunto 
activeContenthel.fiKäytetään aktiivisen sisältötietojen tallentamiseen, kun käyttäjä käyttää lukioiden hakua.Istunto 
' + value: '

Mieltymysevästeet mukauttavat sivuston ulkoasua ja toimintaa käyttäjän aiemman käytön perusteella.

NimiTarjoajaTarkoitusVoimassaTyyppi
httpskartta.hel.fi.SWCulturekartta.hel.fiKaupungin karttapalvelun evästeeseen tallennetaan kieli, jolla palvelua käytetään.1826 päivää 
icareus-devicehelsinkikanava.fiHelsinki-kanavan videopalvelimen eväste.365 päivääKolmas osapuoli
VISITOR_INFO1_LIVEyoutube.comYouTuben eväste valitsee yhteyden nopeuden mukaan, joko vanhan tai uuden videosoittimen.180 päivääKolmas osapuoli
CONSENTyoutube.comGooglen eväste tallentaa kävijän evästehyväskynnän.5947 päivää, 15 tuntiaKolmas osapuoli
activeTabwww.hel.fiKäytetään aktiivisten välilehtien tietojen tallentamiseen, kun käyttäjä käyttää lukioiden suodatushakua.Istunto 
activeContentwww.hel.fiKäytetään aktiivisen sisältötietojen tallentamiseen, kun käyttäjä käyttää lukioiden hakua.Istunto 
' format: full_html diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml index 6b5487f5..4d0e745e 100644 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml @@ -1,4 +1,4 @@ description: - value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstathel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
' + value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstatwww.hel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*www.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6www.hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
' format: full_html label: Tilastointi diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml index d94d887d..6464a1fe 100644 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml @@ -1,4 +1,4 @@ description: - value: '

Chattarna på webbplatsen hel.fi  fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.  Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.

NamnTjänsteleverantörCookie syfteGiltighetTyp
_genesys.widgets.*hel.fiAnvänds för att lagra data som behövs för chatten.session 
leijuke.*hel.fiAnvänds för att lagra data som behövs för chatten.session 
aiap-wbc-chat-app-button-statehel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationens knapp.session 
aiap-chat-app-v1-statehel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationen.session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Lagrar konversationstoken för autentisering och åtkomst till dataändamål.sessionTredje part
' + value: '

Chattarna på webbplatsen www.hel.fi  fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.  Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.

NamnTjänsteleverantörCookie syfteGiltighetTyp
_genesys.widgets.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
leijuke.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
aiap-wbc-chat-app-button-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationens knapp.session 
aiap-chat-app-v1-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationen.session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Lagrar konversationstoken för autentisering och åtkomst till dataändamål.sessionTredje part
CallGuide.languagewww.hel.fiACE Chat: Språket som används i ACE Web SDK härleds från webbläsarnas föredragna språkinställning och ACE Web SDK-inställningar.-Lokalt minne
CallGuide.config_services_*www.hel.fiACE Chatt: Konfigurera kundtjänstintegrationer på en webbsida. Minskar webbtrafiken när du läser in och navigerar på en sida.-Lokalt minne
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chatt: Den unika identiteten för det här webbläsarfönstret. Används om webbläsaren har mer än ett öppet fönster för en webbplats.-Lokalt minne
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chatt: Endast ett fönster i taget kan visa video. Den här informationen spårar vilka av dem (om några).-Lokalt minne
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chatt: En lista över alla fönster som sannolikt kommer att visa videon.-Lokalt minne
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chatt: En webbplats kan ha mer än en chattklient. Det här objektet spårar vilken kund den aktuella chatten tillhör.-Lokalt minne
*_chatEntrancewds.ace.teliacompany.comACE Chatt: Namnet på chattingången till systemet-Lokalt minne
*_chatUIDwds.ace.teliacompany.comACE Chatt: Chattsessions-ID vid kommunikation med ACE-Lokalt minne
humany-*www.hel.fiACE Chatt: Bevarar widgetstatus när sidan laddas om-Lokalt minne
ARRAffinity.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
ARRAffinitySameSite.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
' format: full_html label: 'Funktionella chattkakor' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml index 87ac818c..d86d1934 100644 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml @@ -1,4 +1,4 @@ description: - value: '

Nödvändiga cookies hjälper till att göra webbplatsen användbar genom att tillåta grundläggande funktioner som att navigera på sidan och använda de skyddade områdena på webbplatsen. Webbplatsen fungerar inte korrekt utan dessa cookies och kräver inte samtycke.

NamnTjänsteleverantörCookie syfteGiltighetTyp
cookiehubcookiehub.comCookie möjliggör hantering av cookies på hel.fi webbplatsen.365 dagar 
cookie-agreedhel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionhel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categorieshel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
cookie-agreedavustukset.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionavustukset.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categoriesavustukset.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
SSESS*hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
SSESS*avustukset.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
AWSELBCORSsiteimproveanalytics.ioCookie är kopplad till funktionen för lastfördelning som styr begäran till en server med mindre belastning.sessionTredje part
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 dagar 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.sessionTredje part
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Dess värde används för att få tillgång till sessiondata på applikationens server.sessionTredje part
COOKIE_SUPPORThelsinkikanava.fiKakan möjliggör hanteringen av kakor på webbplatsen.365 dagarTredje part
GUEST_LANGUAGE_IDhelsinkikanava.fiDenna cookie genereras av Liferay, dess funktion är att lagra språkinställningarna.365 dagarTredje part
helfi-settingshel.fiAnvänds av hel.fi Drupal för att lagra information om stängda meddelanden och accordions'' tillstånd.-Lokalt minne
Drupal.visitor.autologout_loginavustukset.hel.fiAnvänds av avustukset.hel.fi Drupal för att automatiskt logga ut användare efter en period av inaktivitet.365 dagar 
' + value: '

Nödvändiga cookies hjälper till att göra webbplatsen användbar genom att tillåta grundläggande funktioner som att navigera på sidan och använda de skyddade områdena på webbplatsen. Webbplatsen fungerar inte korrekt utan dessa cookies och kräver inte samtycke.

NamnTjänsteleverantörCookie syfteGiltighetTyp
cookiehubcookiehub.comCookie möjliggör hantering av cookies på www.hel.fi webbplatsen.365 dagar 
cookie-agreedwww.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionwww.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categorieswww.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
cookie-agreedavustukset.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionavustukset.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categoriesavustukset.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
SSESS*www.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
SSESS*avustukset.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
AWSELBCORSsiteimproveanalytics.ioCookie är kopplad till funktionen för lastfördelning som styr begäran till en server med mindre belastning.sessionTredje part
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 dagar 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.sessionTredje part
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Dess värde används för att få tillgång till sessiondata på applikationens server.sessionTredje part
COOKIE_SUPPORThelsinkikanava.fiKakan möjliggör hanteringen av kakor på webbplatsen.365 dagarTredje part
GUEST_LANGUAGE_IDhelsinkikanava.fiDenna cookie genereras av Liferay, dess funktion är att lagra språkinställningarna.365 dagarTredje part
helfi-settingswww.hel.fiAnvänds av www.hel.fi Drupal för att lagra information om stängda meddelanden och accordions'' tillstånd.-Lokalt minne
Drupal.visitor.autologout_loginavustukset.hel.fiAnvänds av avustukset.hel.fi Drupal för att automatiskt logga ut användare efter en period av inaktivitet.365 dagar 
' format: full_html label: 'Nödvändiga funktionella cookies' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml index de0ec699..cef60a8e 100644 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml @@ -1,4 +1,4 @@ label: Preferens description: - value: '

Preferenscookies ändrar webbplatsens utseende och funktioner enligt användarens tidigare användning.

NamnTjänsteleverantörCookie syfteGiltighetTyp
httpskartta.hel.fi.SWCulturekartta.hel.fiI kakan på stadens kaktjänst sparas det språk som användaren använder i tjänsten.1826 dagar 
icareus-devicehelsinkikanava.fiHelsinki-kanavas kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.365 dagarTredje part
VISITOR_INFO1_LIVEyoutube.comYouTubes kaka väljer antingen den nya eller gamla videospelaren enligt förbindelsens hastighet.180 dagarTredje part
CONSENTyoutube.comAnvänds av Google för att lagra inställningar för användarens samtycke.5947 dagar, 15 timmarTredje part
activeTabhel.fiAnvänds för att lagra aktiv flikdata när användaren använder gymnasiesökning.Session 
activeContenthel.fiAnvänds för att lagra aktivt innehållsdata när användaren använder gymnasiesökning.Session 

 

' + value: '

Preferenscookies ändrar webbplatsens utseende och funktioner enligt användarens tidigare användning.

NamnTjänsteleverantörCookie syfteGiltighetTyp
httpskartta.hel.fi.SWCulturekartta.hel.fiI kakan på stadens kaktjänst sparas det språk som användaren använder i tjänsten.1826 dagar 
icareus-devicehelsinkikanava.fiHelsinki-kanavas kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.365 dagarTredje part
VISITOR_INFO1_LIVEyoutube.comYouTubes kaka väljer antingen den nya eller gamla videospelaren enligt förbindelsens hastighet.180 dagarTredje part
CONSENTyoutube.comAnvänds av Google för att lagra inställningar för användarens samtycke.5947 dagar, 15 timmarTredje part
activeTabwww.hel.fiAnvänds för att lagra aktiv flikdata när användaren använder gymnasiesökning.Session 
activeContentwww.hel.fiAnvänds för att lagra aktivt innehållsdata när användaren använder gymnasiesökning.Session 

 

' format: full_html diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml index a6ad5344..18a542a9 100644 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml @@ -1,4 +1,4 @@ description: - value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstathel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part

 

' + value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstatwww.hel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*www.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6www.hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part

 

' format: full_html label: Statistik diff --git a/conf/cmi/views.view.after_school_activity_search.yml b/conf/cmi/views.view.after_school_activity_search.yml index d1f3d23b..dfc7b465 100644 --- a/conf/cmi/views.view.after_school_activity_search.yml +++ b/conf/cmi/views.view.after_school_activity_search.yml @@ -131,6 +131,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -148,7 +149,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: bef options: diff --git a/conf/cmi/views.view.archive.yml b/conf/cmi/views.view.archive.yml index 93e69e71..28fa3681 100644 --- a/conf/cmi/views.view.archive.yml +++ b/conf/cmi/views.view.archive.yml @@ -29,6 +29,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: 0 id: 0 @@ -43,7 +44,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.authmap.yml b/conf/cmi/views.view.authmap.yml index b5c6d3cf..aa13c792 100644 --- a/conf/cmi/views.view.authmap.yml +++ b/conf/cmi/views.view.authmap.yml @@ -297,6 +297,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -311,7 +312,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.comprehensive_school_search.yml b/conf/cmi/views.view.comprehensive_school_search.yml index 4c139bfb..74f90ba4 100644 --- a/conf/cmi/views.view.comprehensive_school_search.yml +++ b/conf/cmi/views.view.comprehensive_school_search.yml @@ -78,6 +78,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -95,7 +96,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.content.yml b/conf/cmi/views.view.content.yml index f70e8328..0cbddb24 100644 --- a/conf/cmi/views.view.content.yml +++ b/conf/cmi/views.view.content.yml @@ -315,13 +315,13 @@ display: pager: type: full options: + pagination_heading_level: h4 items_per_page: 50 tags: next: 'Next ›' previous: '‹ Previous' first: '« First' last: 'Last »' - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.daycare_search.yml b/conf/cmi/views.view.daycare_search.yml index ca36c0aa..9f0c4797 100644 --- a/conf/cmi/views.view.daycare_search.yml +++ b/conf/cmi/views.view.daycare_search.yml @@ -131,6 +131,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -148,7 +149,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: bef options: diff --git a/conf/cmi/views.view.editoria11y_dismissals.yml b/conf/cmi/views.view.editoria11y_dismissals.yml index 3f1bc21a..99f769c4 100644 --- a/conf/cmi/views.view.editoria11y_dismissals.yml +++ b/conf/cmi/views.view.editoria11y_dismissals.yml @@ -704,6 +704,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -721,7 +722,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 sorts: created: id: created diff --git a/conf/cmi/views.view.editoria11y_results.yml b/conf/cmi/views.view.editoria11y_results.yml index adf8c294..79e5e261 100644 --- a/conf/cmi/views.view.editoria11y_results.yml +++ b/conf/cmi/views.view.editoria11y_results.yml @@ -1072,6 +1072,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -1089,7 +1090,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -1453,6 +1453,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -1470,7 +1471,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -1939,6 +1939,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -1953,7 +1954,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 sorts: page_result_count: id: page_result_count @@ -2451,6 +2451,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -2465,7 +2466,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -2994,6 +2994,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -3008,7 +3009,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 sorts: created: id: created diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index 4e54a190..5bdfdb2a 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,6 +91,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -105,7 +106,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.files.yml b/conf/cmi/views.view.files.yml index bd6b12f8..6e94de7c 100644 --- a/conf/cmi/views.view.files.yml +++ b/conf/cmi/views.view.files.yml @@ -470,6 +470,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: 0 id: 0 @@ -484,7 +485,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: @@ -1006,6 +1006,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: 0 id: 0 @@ -1020,7 +1021,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 empty: { } arguments: fid: diff --git a/conf/cmi/views.view.glossary.yml b/conf/cmi/views.view.glossary.yml index e5243f13..b2d07e5f 100644 --- a/conf/cmi/views.view.glossary.yml +++ b/conf/cmi/views.view.glossary.yml @@ -196,6 +196,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 36 total_pages: 0 id: 0 @@ -210,7 +211,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_members.yml b/conf/cmi/views.view.group_members.yml index 8a46180d..cb746c84 100644 --- a/conf/cmi/views.view.group_members.yml +++ b/conf/cmi/views.view.group_members.yml @@ -520,6 +520,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -537,7 +538,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_news_archive.yml b/conf/cmi/views.view.group_news_archive.yml index 555602d2..9a84e228 100644 --- a/conf/cmi/views.view.group_news_archive.yml +++ b/conf/cmi/views.view.group_news_archive.yml @@ -76,6 +76,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -93,7 +94,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_nodes.yml b/conf/cmi/views.view.group_nodes.yml index 013325da..284b9088 100644 --- a/conf/cmi/views.view.group_nodes.yml +++ b/conf/cmi/views.view.group_nodes.yml @@ -463,6 +463,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -480,7 +481,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.group_tpr_units.yml b/conf/cmi/views.view.group_tpr_units.yml index 0159de6f..e20f824a 100644 --- a/conf/cmi/views.view.group_tpr_units.yml +++ b/conf/cmi/views.view.group_tpr_units.yml @@ -530,6 +530,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -547,7 +548,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_content.yml b/conf/cmi/views.view.locked_content.yml index 077fbf5a..9dbdc82d 100644 --- a/conf/cmi/views.view.locked_content.yml +++ b/conf/cmi/views.view.locked_content.yml @@ -428,6 +428,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -445,7 +446,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 65c6d42a..aacb060e 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index ca6f6924..962da4e4 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.media.yml b/conf/cmi/views.view.media.yml index 51bcf419..352adcc2 100644 --- a/conf/cmi/views.view.media.yml +++ b/conf/cmi/views.view.media.yml @@ -522,6 +522,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -539,7 +540,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml index 7ec0f4c5..f49ec157 100644 --- a/conf/cmi/views.view.media_library.yml +++ b/conf/cmi/views.view.media_library.yml @@ -139,6 +139,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 24 total_pages: null id: 0 @@ -153,7 +154,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: @@ -1078,6 +1078,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 24 total_pages: null id: 0 @@ -1095,7 +1096,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 access: type: perm options: diff --git a/conf/cmi/views.view.paragraphs_library.yml b/conf/cmi/views.view.paragraphs_library.yml index f39ca35b..044180ba 100644 --- a/conf/cmi/views.view.paragraphs_library.yml +++ b/conf/cmi/views.view.paragraphs_library.yml @@ -541,6 +541,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -555,7 +556,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.paragraphs_selection.yml b/conf/cmi/views.view.paragraphs_selection.yml index b7e3365d..0e2a5732 100644 --- a/conf/cmi/views.view.paragraphs_selection.yml +++ b/conf/cmi/views.view.paragraphs_selection.yml @@ -157,6 +157,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -171,7 +172,6 @@ display: items_per_page_options_all_label: '- Kaikki -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.playground_search.yml b/conf/cmi/views.view.playground_search.yml index fdb4309f..d1a04b95 100644 --- a/conf/cmi/views.view.playground_search.yml +++ b/conf/cmi/views.view.playground_search.yml @@ -131,6 +131,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -148,7 +149,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: bef options: diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 0865d229..d2ff8aa3 100644 --- a/conf/cmi/views.view.redirect.yml +++ b/conf/cmi/views.view.redirect.yml @@ -226,6 +226,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -243,7 +244,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.scheduler_scheduled_content.yml b/conf/cmi/views.view.scheduler_scheduled_content.yml index 1bc45980..2e18ca9b 100644 --- a/conf/cmi/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/views.view.scheduler_scheduled_content.yml @@ -530,6 +530,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -538,7 +539,6 @@ display: previous: '‹ previous' first: '« first' last: 'last »' - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 106e85a6..ad00a470 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,6 +109,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -126,7 +127,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,6 +646,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -663,7 +664,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index 3684c3d6..1acf4be6 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,6 +93,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -110,7 +111,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.taxonomy_term.yml b/conf/cmi/views.view.taxonomy_term.yml index 43abe398..8eaa6111 100644 --- a/conf/cmi/views.view.taxonomy_term.yml +++ b/conf/cmi/views.view.taxonomy_term.yml @@ -29,6 +29,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: 0 id: 0 @@ -43,7 +44,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_errand_service_list.yml b/conf/cmi/views.view.tpr_errand_service_list.yml index 90e811ba..be8197fe 100644 --- a/conf/cmi/views.view.tpr_errand_service_list.yml +++ b/conf/cmi/views.view.tpr_errand_service_list.yml @@ -470,6 +470,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -487,7 +488,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_service_channel_list.yml b/conf/cmi/views.view.tpr_service_channel_list.yml index 4af28488..5d4ee23f 100644 --- a/conf/cmi/views.view.tpr_service_channel_list.yml +++ b/conf/cmi/views.view.tpr_service_channel_list.yml @@ -470,6 +470,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -487,7 +488,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_service_list.yml b/conf/cmi/views.view.tpr_service_list.yml index 94b381a8..39e13b6d 100644 --- a/conf/cmi/views.view.tpr_service_list.yml +++ b/conf/cmi/views.view.tpr_service_list.yml @@ -470,6 +470,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -487,7 +488,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index c70451a9..edec8729 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -502,6 +502,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -519,7 +520,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index e5367958..949623f5 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,6 +286,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -303,7 +304,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.user_admin_people.yml b/conf/cmi/views.view.user_admin_people.yml index d46df1cb..4d897aa8 100644 --- a/conf/cmi/views.view.user_admin_people.yml +++ b/conf/cmi/views.view.user_admin_people.yml @@ -463,6 +463,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: 0 id: 0 @@ -480,7 +481,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/docker/elastic-proxy/nginx.conf b/docker/elastic-proxy/nginx.conf index b3eb4c1d..5d9f2232 100644 --- a/docker/elastic-proxy/nginx.conf +++ b/docker/elastic-proxy/nginx.conf @@ -26,7 +26,7 @@ http { sub { use MIME::Base64; if (exists($ENV{"ELASTIC_USER"}) && exists($ENV{"ELASTIC_PASSWORD"})) { - return encode_base64($ENV{"ELASTIC_USER"} . ":" . $ENV{"ELASTIC_PASSWORD"}); + return encode_base64($ENV{"ELASTIC_USER"} . ":" . $ENV{"ELASTIC_PASSWORD"}, ""); } return ""; } diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 38cfb196..9e6f7a6b 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -334,6 +334,11 @@ function drupal_get_env(string|array $variables) : mixed { $settings['is_azure'] = FALSE; +if ($tfa_key = getenv('TFA_ENCRYPTION_KEY')) { + $config['key.key.tfa']['key_provider_settings']['key_value'] = $tfa_key; + $config['key.key.tfa']['key_provider_settings']['base64_encoded'] = TRUE; +} + /** * Deployment preflight checks. * From ede7ae651c2871a0553124663d1209d1c109b704 Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 8 Aug 2024 10:29:46 +0300 Subject: [PATCH 23/25] UHF-10395: TFA settings --- conf/cmi/core.extension.yml | 5 ++ conf/cmi/encrypt.profile.real_aes.yml | 15 ++++++ conf/cmi/encrypt.settings.yml | 4 ++ conf/cmi/key.key.tfa.yml | 19 +++++++ conf/cmi/tfa.settings.yml | 51 +++++++++++++++++++ conf/cmi/user.role.admin.yml | 3 ++ conf/cmi/user.role.authenticated.yml | 3 ++ .../user.role.comprehensive_school_editor.yml | 3 ++ conf/cmi/user.role.content_producer.yml | 3 ++ conf/cmi/user.role.daycare_editor.yml | 3 ++ conf/cmi/user.role.editor.yml | 3 ++ conf/cmi/user.role.playground_editor.yml | 3 ++ conf/cmi/user.role.read_only.yml | 3 ++ conf/cmi/user.role.school_editor.yml | 5 ++ 14 files changed, 123 insertions(+) create mode 100644 conf/cmi/encrypt.profile.real_aes.yml create mode 100644 conf/cmi/encrypt.settings.yml create mode 100644 conf/cmi/key.key.tfa.yml create mode 100644 conf/cmi/tfa.settings.yml diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index f7ca0a64..b610dea9 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -25,6 +25,7 @@ module: editor: 0 editoria11y: 0 elasticsearch_connector: 0 + encrypt: 0 entity: 0 entity_reference_revisions: 0 entity_usage: 0 @@ -88,6 +89,7 @@ module: helfi_platform_config_base: 0 helfi_proxy: 0 helfi_react_search: 0 + helfi_tfa: 0 helfi_toc: 0 helfi_tpr: 0 helfi_tpr_config: 0 @@ -103,6 +105,7 @@ module: jquery_ui_draggable: 0 jquery_ui_slider: 0 jquery_ui_touch_punch: 0 + key: 0 language: 0 link: 0 linkit: 0 @@ -138,6 +141,7 @@ module: purge_tokens: 0 raven: 0 readonly_field_widget: 0 + real_aes: 0 redirect: 0 redis: 0 responsive_image: 0 @@ -156,6 +160,7 @@ module: taxonomy: 0 telephone: 0 text: 0 + tfa: 0 token: 0 toolbar: 0 translatable_menu_link_uri: 0 diff --git a/conf/cmi/encrypt.profile.real_aes.yml b/conf/cmi/encrypt.profile.real_aes.yml new file mode 100644 index 00000000..94b4ba51 --- /dev/null +++ b/conf/cmi/encrypt.profile.real_aes.yml @@ -0,0 +1,15 @@ +uuid: 90d7b880-aa02-4cff-aeb9-69e03db7a21b +langcode: en +status: true +dependencies: + config: + - key.key.tfa + module: + - real_aes +_core: + default_config_hash: lDV_LbRGbNBnnVa6X72NK7xH7A1T9tasNNgP2hOhHKs +id: real_aes +label: 'Real AES' +encryption_method: real_aes +encryption_key: tfa +encryption_method_configuration: { } diff --git a/conf/cmi/encrypt.settings.yml b/conf/cmi/encrypt.settings.yml new file mode 100644 index 00000000..dbd39266 --- /dev/null +++ b/conf/cmi/encrypt.settings.yml @@ -0,0 +1,4 @@ +_core: + default_config_hash: CMyccvAuba2yH-HYmcEL0pq1Seyxzq9VHhKbQKwAWY4 +check_profile_status: true +allow_deprecated_plugins: false diff --git a/conf/cmi/key.key.tfa.yml b/conf/cmi/key.key.tfa.yml new file mode 100644 index 00000000..f241a8d1 --- /dev/null +++ b/conf/cmi/key.key.tfa.yml @@ -0,0 +1,19 @@ +uuid: 05f354f6-4d19-4cb0-9d95-0d16a1573e58 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: ARfRhKTJUSFXqKkDFwUncBUg8-5v7z_we3DETbYMYB0 +id: tfa +label: TFA +description: '' +key_type: encryption +key_type_settings: + key_size: 256 +key_provider: config +key_provider_settings: + key_value: thisvaluewillbeoverridden1234567 + base64_encoded: true +key_input: text_field +key_input_settings: + base64_encoded: false diff --git a/conf/cmi/tfa.settings.yml b/conf/cmi/tfa.settings.yml new file mode 100644 index 00000000..491e60ba --- /dev/null +++ b/conf/cmi/tfa.settings.yml @@ -0,0 +1,51 @@ +_core: + default_config_hash: JyIkFj38h-aTLsrCfejAfP277qBJ61tlaLEBH44IHhg +langcode: en +enabled: true +required_roles: + daycare_editor: daycare_editor + playground_editor: playground_editor + comprehensive_school_editor: comprehensive_school_editor + school_editor: school_editor + content_producer: content_producer + editor: editor + admin: admin + super_administrator: super_administrator +send_plugins: { } +login_plugins: { } +login_plugin_settings: + tfa_trusted_browser: + cookie_allow_subdomains: true + cookie_expiration: 30 + cookie_name: tfa-trusted-browser +allowed_validation_plugins: + tfa_totp: tfa_totp +default_validation_plugin: tfa_totp +validation_plugin_settings: + tfa_recovery_code: + recovery_codes_amount: 10 + tfa_hotp: + counter_window: 10 + site_name_prefix: 1 + name_prefix: TFA + issuer: Drupal + tfa_totp: + time_skew: 2 + site_name_prefix: 1 + name_prefix: TFA + issuer: Hel.fi +validation_skip: 3 +users_without_tfa_redirect: false +reset_pass_skip_enabled: true +encryption: real_aes +tfa_flood_uid_only: 1 +tfa_flood_window: 300 +tfa_flood_threshold: 6 +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + subject: 'Your [site:name] account now has two-factor authentication' + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + subject: 'Your [site:name] account no longer has two-factor authentication' + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index bd5f9c7c..7fb9945d 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -50,6 +50,7 @@ dependencies: - simple_sitemap - system - taxonomy + - tfa - toolbar - view_unpublished - views_bulk_edit @@ -155,6 +156,7 @@ permissions: - 'delete terms in news_neighbourhoods' - 'delete terms in news_tags' - 'delete terms in vocational_studies' + - 'disable own tfa' - 'edit any announcement content' - 'edit any file media' - 'edit any hel_map media' @@ -193,6 +195,7 @@ permissions: - 'set landing_page published on date' - 'set news_item published on date' - 'set page published on date' + - 'setup own tfa' - 'translate announcement node' - 'translate any entity' - 'translate configuration' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 0d9e09d7..46894f18 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -14,6 +14,7 @@ dependencies: - paragraphs - rest - system + - tfa - toolbar _core: default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI @@ -25,8 +26,10 @@ permissions: - 'access content' - 'access toolbar' - 'delete own files' + - 'disable own tfa' - 'display eu cookie compliance popup' - 'restful get helfi_global_mobile_menu' + - 'setup own tfa' - 'view helfi_announcements external entity' - 'view helfi_news external entity' - 'view helfi_news_groups external entity' diff --git a/conf/cmi/user.role.comprehensive_school_editor.yml b/conf/cmi/user.role.comprehensive_school_editor.yml index b06f61d5..6fed90d0 100644 --- a/conf/cmi/user.role.comprehensive_school_editor.yml +++ b/conf/cmi/user.role.comprehensive_school_editor.yml @@ -22,6 +22,7 @@ dependencies: - node - scheduler - system + - tfa id: comprehensive_school_editor label: 'Comprehensive school editor' weight: -5 @@ -50,6 +51,7 @@ permissions: - 'delete own helfi_chart media' - 'delete own image media' - 'delete own remote_video media' + - 'disable own tfa' - 'edit own file media' - 'edit own hel_map media' - 'edit own helfi_chart media' @@ -57,6 +59,7 @@ permissions: - 'edit own remote_video media' - 'mark as hidden in editoria11y' - 'schedule publishing of nodes' + - 'setup own tfa' - 'translate editable entities' - 'update any tpr_unit' - 'update media' diff --git a/conf/cmi/user.role.content_producer.yml b/conf/cmi/user.role.content_producer.yml index fd0a75c6..c4979722 100644 --- a/conf/cmi/user.role.content_producer.yml +++ b/conf/cmi/user.role.content_producer.yml @@ -33,6 +33,7 @@ dependencies: - scheduler - system - taxonomy + - tfa - toolbar - view_unpublished _core: @@ -79,6 +80,7 @@ permissions: - 'delete own landing_page content' - 'delete own page content' - 'delete own remote_video media' + - 'disable own tfa' - 'edit any announcement content' - 'edit any file media' - 'edit any hel_map media' @@ -105,6 +107,7 @@ permissions: - 'set announcement published on date' - 'set landing_page published on date' - 'set page published on date' + - 'setup own tfa' - 'translate editable entities' - 'translate file media' - 'translate image media' diff --git a/conf/cmi/user.role.daycare_editor.yml b/conf/cmi/user.role.daycare_editor.yml index 6f78277a..e1dc72fe 100644 --- a/conf/cmi/user.role.daycare_editor.yml +++ b/conf/cmi/user.role.daycare_editor.yml @@ -22,6 +22,7 @@ dependencies: - node - scheduler - system + - tfa id: daycare_editor label: 'Daycare editor' weight: -7 @@ -50,6 +51,7 @@ permissions: - 'delete own helfi_chart media' - 'delete own image media' - 'delete own remote_video media' + - 'disable own tfa' - 'edit own file media' - 'edit own hel_map media' - 'edit own helfi_chart media' @@ -57,6 +59,7 @@ permissions: - 'edit own remote_video media' - 'mark as hidden in editoria11y' - 'schedule publishing of nodes' + - 'setup own tfa' - 'translate editable entities' - 'update media' - 'use text format full_html' diff --git a/conf/cmi/user.role.editor.yml b/conf/cmi/user.role.editor.yml index 3e930dee..f9061a94 100644 --- a/conf/cmi/user.role.editor.yml +++ b/conf/cmi/user.role.editor.yml @@ -42,6 +42,7 @@ dependencies: - scheduler - system - taxonomy + - tfa - toolbar - view_unpublished id: editor @@ -115,6 +116,7 @@ permissions: - 'delete remote entities' - 'delete terms in keywords' - 'delete terms in vocational_studies' + - 'disable own tfa' - 'edit any announcement content' - 'edit any file media' - 'edit any hel_map media' @@ -149,6 +151,7 @@ permissions: - 'set landing_page published on date' - 'set news_item published on date' - 'set page published on date' + - 'setup own tfa' - 'translate announcement node' - 'translate any entity' - 'translate editable entities' diff --git a/conf/cmi/user.role.playground_editor.yml b/conf/cmi/user.role.playground_editor.yml index 975c5de4..bd36f002 100644 --- a/conf/cmi/user.role.playground_editor.yml +++ b/conf/cmi/user.role.playground_editor.yml @@ -22,6 +22,7 @@ dependencies: - node - scheduler - system + - tfa id: playground_editor label: 'Playground editor' weight: -6 @@ -50,6 +51,7 @@ permissions: - 'delete own helfi_chart media' - 'delete own image media' - 'delete own remote_video media' + - 'disable own tfa' - 'edit own file media' - 'edit own hel_map media' - 'edit own helfi_chart media' @@ -57,6 +59,7 @@ permissions: - 'edit own remote_video media' - 'mark as hidden in editoria11y' - 'schedule publishing of nodes' + - 'setup own tfa' - 'translate editable entities' - 'update media' - 'use text format full_html' diff --git a/conf/cmi/user.role.read_only.yml b/conf/cmi/user.role.read_only.yml index 6d7c90af..69f6ca19 100644 --- a/conf/cmi/user.role.read_only.yml +++ b/conf/cmi/user.role.read_only.yml @@ -12,6 +12,7 @@ dependencies: - helfi_tpr - node - paragraphs + - tfa - toolbar - view_unpublished id: read_only @@ -21,6 +22,8 @@ is_admin: null permissions: - 'access toolbar' - 'delete own files' + - 'disable own tfa' + - 'setup own tfa' - 'view any unpublished announcement content' - 'view any unpublished landing_page content' - 'view any unpublished news_item content' diff --git a/conf/cmi/user.role.school_editor.yml b/conf/cmi/user.role.school_editor.yml index 2e8a6281..744d0adb 100644 --- a/conf/cmi/user.role.school_editor.yml +++ b/conf/cmi/user.role.school_editor.yml @@ -10,7 +10,9 @@ dependencies: - media.type.helfi_chart - media.type.image - media.type.remote_video + - node.type.landing_page - node.type.news_item + - node.type.page module: - content_translation - editoria11y @@ -24,6 +26,7 @@ dependencies: - publication_date - scheduler - system + - tfa - toolbar - view_unpublished id: school_editor @@ -52,6 +55,7 @@ permissions: - 'delete own helfi_chart media' - 'delete own image media' - 'delete own remote_video media' + - 'disable own tfa' - 'edit own file media' - 'edit own hel_map media' - 'edit own helfi_chart media' @@ -63,6 +67,7 @@ permissions: - 'override page published option' - 'schedule publishing of nodes' - 'set news_item published on date' + - 'setup own tfa' - 'translate editable entities' - 'update media' - 'use text format full_html' From 446522a73e2044f32e65c73d049cea494fae23a8 Mon Sep 17 00:00:00 2001 From: hyrsky <732227+hyrsky@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:01:47 +0000 Subject: [PATCH 24/25] Update configuration --- composer.lock | 195 +++++++++--------- conf/cmi/block.block.globalannouncement.yml | 18 -- conf/cmi/block.block.surveys.yml | 21 ++ ...ase_field_override.node.survey.promote.yml | 24 +++ ...base_field_override.node.survey.status.yml | 24 +++ ....base_field_override.node.survey.title.yml | 20 ++ ...ntity_form_display.node.survey.default.yml | 134 ++++++++++++ ...ntity_view_display.node.survey.default.yml | 50 +++++ ...entity_view_display.node.survey.teaser.yml | 40 ++++ conf/cmi/core.extension.yml | 3 +- conf/cmi/encrypt.profile.real_aes.yml | 2 +- ...ternal_entity_type.helfi_announcements.yml | 6 +- ...ies.external_entity_type.helfi_surveys.yml | 42 ++++ conf/cmi/field.field.node.survey.body.yml | 31 +++ ...node.survey.field_survey_content_pages.yml | 33 +++ ...ld.field.node.survey.field_survey_link.yml | 25 +++ ...torage.node.field_survey_content_pages.yml | 21 ++ .../field.storage.node.field_survey_link.yml | 21 ++ .../language.content_settings.node.survey.yml | 18 ++ ...ase_field_override.node.survey.promote.yml | 4 + ...base_field_override.node.survey.status.yml | 4 + ....base_field_override.node.survey.title.yml | 1 + ....announcement.field_publish_externally.yml | 4 + .../fi/field.field.node.survey.body.yml | 1 + ...node.survey.field_survey_content_pages.yml | 2 + ...ld.field.node.survey.field_survey_link.yml | 1 + conf/cmi/language/fi/key.key.tfa.yml | 1 + conf/cmi/language/fi/node.type.survey.yml | 2 + conf/cmi/language/fi/tfa.settings.yml | 6 + ...ase_field_override.node.survey.promote.yml | 4 + ...base_field_override.node.survey.status.yml | 4 + ....announcement.field_publish_externally.yml | 3 + .../sv/field.field.node.survey.body.yml | 1 + ...ld.field.node.survey.field_survey_link.yml | 1 + conf/cmi/language/sv/tfa.settings.yml | 8 + conf/cmi/node.type.survey.yml | 33 +++ ...aragraphs.paragraphs_type.from_library.yml | 5 +- ...ion.user_add_role_action.survey_editor.yml | 14 ++ ....user_remove_role_action.survey_editor.yml | 14 ++ conf/cmi/user.role.anonymous.yml | 1 + conf/cmi/user.role.authenticated.yml | 1 + conf/cmi/user.role.survey_editor.yml | 27 +++ docker/openshift/Dockerfile | 3 +- docker/openshift/cron-entrypoint.sh | 42 ++++ docker/openshift/crons/cron.sh | 9 + docker/openshift/crons/linked-events.sh | 6 + docker/openshift/crons/migrate-tpr.sh | 6 + docker/openshift/crons/pubsub.sh | 13 +- docker/openshift/init.sh | 8 + tools/make/drupal.mk | 3 +- 50 files changed, 829 insertions(+), 131 deletions(-) delete mode 100644 conf/cmi/block.block.globalannouncement.yml create mode 100644 conf/cmi/block.block.surveys.yml create mode 100644 conf/cmi/core.base_field_override.node.survey.promote.yml create mode 100644 conf/cmi/core.base_field_override.node.survey.status.yml create mode 100644 conf/cmi/core.base_field_override.node.survey.title.yml create mode 100644 conf/cmi/core.entity_form_display.node.survey.default.yml create mode 100644 conf/cmi/core.entity_view_display.node.survey.default.yml create mode 100644 conf/cmi/core.entity_view_display.node.survey.teaser.yml create mode 100644 conf/cmi/external_entities.external_entity_type.helfi_surveys.yml create mode 100644 conf/cmi/field.field.node.survey.body.yml create mode 100644 conf/cmi/field.field.node.survey.field_survey_content_pages.yml create mode 100644 conf/cmi/field.field.node.survey.field_survey_link.yml create mode 100644 conf/cmi/field.storage.node.field_survey_content_pages.yml create mode 100644 conf/cmi/field.storage.node.field_survey_link.yml create mode 100644 conf/cmi/language.content_settings.node.survey.yml create mode 100644 conf/cmi/language/fi/core.base_field_override.node.survey.promote.yml create mode 100644 conf/cmi/language/fi/core.base_field_override.node.survey.status.yml create mode 100644 conf/cmi/language/fi/core.base_field_override.node.survey.title.yml create mode 100644 conf/cmi/language/fi/field.field.node.announcement.field_publish_externally.yml create mode 100644 conf/cmi/language/fi/field.field.node.survey.body.yml create mode 100644 conf/cmi/language/fi/field.field.node.survey.field_survey_content_pages.yml create mode 100644 conf/cmi/language/fi/field.field.node.survey.field_survey_link.yml create mode 100644 conf/cmi/language/fi/key.key.tfa.yml create mode 100644 conf/cmi/language/fi/node.type.survey.yml create mode 100644 conf/cmi/language/fi/tfa.settings.yml create mode 100644 conf/cmi/language/sv/core.base_field_override.node.survey.promote.yml create mode 100644 conf/cmi/language/sv/core.base_field_override.node.survey.status.yml create mode 100644 conf/cmi/language/sv/field.field.node.announcement.field_publish_externally.yml create mode 100644 conf/cmi/language/sv/field.field.node.survey.body.yml create mode 100644 conf/cmi/language/sv/field.field.node.survey.field_survey_link.yml create mode 100644 conf/cmi/language/sv/tfa.settings.yml create mode 100644 conf/cmi/node.type.survey.yml create mode 100644 conf/cmi/system.action.user_add_role_action.survey_editor.yml create mode 100644 conf/cmi/system.action.user_remove_role_action.survey_editor.yml create mode 100644 conf/cmi/user.role.survey_editor.yml create mode 100644 docker/openshift/cron-entrypoint.sh create mode 100644 docker/openshift/crons/cron.sh diff --git a/composer.lock b/composer.lock index 1f1daae0..e2edc301 100644 --- a/composer.lock +++ b/composer.lock @@ -2336,16 +2336,16 @@ }, { "name": "drupal/core", - "version": "10.3.1", + "version": "10.3.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "d137403a30d4154404e473785f48dfc889d77e23" + "reference": "10e79c67a903844bef02a5cf10475d9a8b623e7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/d137403a30d4154404e473785f48dfc889d77e23", - "reference": "d137403a30d4154404e473785f48dfc889d77e23", + "url": "https://api.github.com/repos/drupal/core/zipball/10e79c67a903844bef02a5cf10475d9a8b623e7a", + "reference": "10e79c67a903844bef02a5cf10475d9a8b623e7a", "shasum": "" }, "require": { @@ -2494,13 +2494,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.1" + "source": "https://github.com/drupal/core/tree/10.3.2" }, - "time": "2024-07-04T11:33:45+00:00" + "time": "2024-08-08T09:23:57+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.1", + "version": "10.3.2", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2544,7 +2544,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.1" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.2" }, "time": "2024-05-11T08:21:39+00:00" }, @@ -2885,17 +2885,17 @@ }, { "name": "drupal/easy_breadcrumb", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/easy_breadcrumb.git", - "reference": "2.0.7" + "reference": "2.0.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.7.zip", - "reference": "2.0.7", - "shasum": "a17524ffc2c76bc0aedb04116c3647dc2025e762" + "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.8.zip", + "reference": "2.0.8", + "shasum": "49bfd9b8b0ec664963d05e360449876745cf2868" }, "require": { "drupal/core": "^9.2 || ^10 || ^11" @@ -2903,8 +2903,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.7", - "datestamp": "1719427042", + "version": "2.0.8", + "datestamp": "1723545040", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3189,26 +3189,26 @@ }, { "name": "drupal/entity", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity.git", - "reference": "8.x-1.4" + "reference": "8.x-1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "1cf7712318fad144eab106a8fcfcd396aeb5676f" + "url": "https://ftp.drupal.org/files/projects/entity-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "86c0b75c173144aaedde3e3258dc0d3ce11d1a22" }, "require": { - "drupal/core": "^9.2|^10.0" + "drupal/core": "^10.1 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1661898023", + "version": "8.x-1.5", + "datestamp": "1723380062", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3221,7 +3221,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -3258,20 +3258,20 @@ }, { "name": "drupal/entity_browser", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_browser.git", - "reference": "8.x-2.10" + "reference": "8.x-2.11" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.10.zip", - "reference": "8.x-2.10", - "shasum": "d52548ea66dc56108c2e211aeaff6e1cc0522e85" + "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.11.zip", + "reference": "8.x-2.11", + "shasum": "4ead3d3f9f6365fbc25cfbd0edcc5e0a9cc52e02" }, "require": { - "drupal/core": "^9.5 || ^10" + "drupal/core": "^10.2 || ^11" }, "conflict": { "drupal/media_entity": "1.*" @@ -3284,13 +3284,14 @@ "drupal/entityqueue": "^1.0", "drupal/inline_entity_form": "^1.0@rc", "drupal/paragraphs": "^1.0", + "drupal/search_api": "^1.0", "drupal/token": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.10", - "datestamp": "1702325310", + "version": "8.x-2.11", + "datestamp": "1723378138", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3996,7 +3997,7 @@ "role": "Maintainer" }, { - "name": "Rajeshreeputra", + "name": "rajeshreeputra", "homepage": "https://www.drupal.org/user/3418561" } ], @@ -4295,16 +4296,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.34", + "version": "6.6.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "519362d9435f1b86da3d432d3bd88bc9f6aeca6c" + "reference": "260ed89837be3b1ae9a19248a0e21717b9597885" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/519362d9435f1b86da3d432d3bd88bc9f6aeca6c", - "reference": "519362d9435f1b86da3d432d3bd88bc9f6aeca6c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/260ed89837be3b1ae9a19248a0e21717b9597885", + "reference": "260ed89837be3b1ae9a19248a0e21717b9597885", "shasum": "" }, "require": { @@ -4322,10 +4323,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.34", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-07-19T12:30:27+00:00" + "time": "2024-08-14T08:40:02+00:00" }, { "name": "drupal/hdbt_admin", @@ -4505,12 +4506,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "cea692973b01424a3c3ffde13b9db48edbcbf6c9" + "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/cea692973b01424a3c3ffde13b9db48edbcbf6c9", - "reference": "cea692973b01424a3c3ffde13b9db48edbcbf6c9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/eadca37ff757c3de0b1a309d37ddd2c6d4910740", + "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740", "shasum": "" }, "require": { @@ -4582,7 +4583,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-06-12T09:40:19+00:00" + "time": "2024-08-12T09:17:00+00:00" }, { "name": "drupal/helfi_navigation", @@ -4620,16 +4621,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.7", + "version": "4.4.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "fe7cd00be9a4df3d849d1ebb13ed7246ea520fde" + "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fe7cd00be9a4df3d849d1ebb13ed7246ea520fde", - "reference": "fe7cd00be9a4df3d849d1ebb13ed7246ea520fde", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/10ca013c3e13c112eb9827fd1b91ed52833b2712", + "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712", "shasum": "" }, "require": { @@ -4718,7 +4719,7 @@ "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-05-14/3083786-duplicate-br-tags-2024-05-14-no-tests.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch" }, "drupal/default_content": { "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" @@ -4744,10 +4745,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-06T05:03:16+00:00" + "time": "2024-08-12T09:33:04+00:00" }, { "name": "drupal/helfi_proxy", @@ -5751,20 +5752,20 @@ }, { "name": "drupal/monolog", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/monolog.git", - "reference": "3.0.3" + "reference": "3.0.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/monolog-3.0.3.zip", - "reference": "3.0.3", - "shasum": "99a8d46376f158da841f3fd524a535e37f9c84ad" + "url": "https://ftp.drupal.org/files/projects/monolog-3.0.4.zip", + "reference": "3.0.4", + "shasum": "5e86b3598b826dca767c52bc7e63cb2c049212d3" }, "require": { - "drupal/core": "^10", + "drupal/core": "^10 || ^11", "monolog/monolog": "^3.2.0", "php": "^8.1.0" }, @@ -5779,8 +5780,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.3", - "datestamp": "1718981516", + "version": "3.0.4", + "datestamp": "1723450250", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5980,20 +5981,20 @@ }, { "name": "drupal/paragraphs", - "version": "1.17.0", + "version": "1.18.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs.git", - "reference": "8.x-1.17" + "reference": "8.x-1.18" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.17.zip", - "reference": "8.x-1.17", - "shasum": "81c05f6a1eb59ab957c9ac97b2e79d6c9837bd72" + "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.18.zip", + "reference": "8.x-1.18", + "shasum": "594e2937ea5c95fc88b60420590c4d83f5cd71ee" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^10.2 || ^11", "drupal/entity_reference_revisions": "~1.3" }, "require-dev": { @@ -6001,6 +6002,7 @@ "drupal/diff": "1.x-dev", "drupal/entity_browser": "2.x-dev", "drupal/entity_usage": "2.x-dev", + "drupal/feeds": "^3", "drupal/field_group": "3.x-dev", "drupal/inline_entity_form": "1.x-dev", "drupal/paragraphs-paragraphs_library": "*", @@ -6014,8 +6016,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.17", - "datestamp": "1709804220", + "version": "8.x-1.18", + "datestamp": "1723029144", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6326,24 +6328,24 @@ }, { "name": "drupal/raven", - "version": "5.0.15", + "version": "5.0.16", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.15" + "reference": "5.0.16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.15.zip", - "reference": "5.0.15", - "shasum": "ef3472e1ed7436ac4d453fb371065e8e3f5ed7d5" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.16.zip", + "reference": "5.0.16", + "shasum": "cd4d545b74ad7d22691dd06177a164bc12074201" }, "require": { "drupal/core": "^10.1 || ^11", "sentry/sentry": "^4.4" }, "require-dev": { - "drupal/csp": "^1.17", + "drupal/csp": "^1.17 || ^2.0", "drupal/monitoring": "^1.13", "drupal/seckit": "^2.0", "drush/drush": "^11.0 || ^12.0 || ^13.0" @@ -6351,8 +6353,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.15", - "datestamp": "1719102344", + "version": "5.0.16", + "datestamp": "1723001088", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6564,26 +6566,26 @@ }, { "name": "drupal/redirect", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.9" + "reference": "8.x-1.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.9.zip", - "reference": "8.x-1.9", - "shasum": "2987de20f509e9f7cec8a0f81d3a6774f9b0ba3e" + "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.10.zip", + "reference": "8.x-1.10", + "shasum": "9d72d7e0717dbdea3ab3306c5d6840da5bd3024c" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.2 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.9", - "datestamp": "1693393506", + "version": "8.x-1.10", + "datestamp": "1723277641", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6600,7 +6602,7 @@ "homepage": "https://www.drupal.org/user/214652" }, { - "name": "Dave Reid", + "name": "dave reid", "homepage": "https://www.drupal.org/user/53892" }, { @@ -11600,16 +11602,16 @@ }, { "name": "sentry/sentry", - "version": "4.8.1", + "version": "4.9.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04" + "reference": "788ec170f51ebb22f2809a1e3f78b19ccd39b70d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/61770efd8b7888e0bdd7d234f0ba67b066e47d04", - "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/788ec170f51ebb22f2809a1e3f78b19ccd39b70d", + "reference": "788ec170f51ebb22f2809a1e3f78b19ccd39b70d", "shasum": "" }, "require": { @@ -11673,7 +11675,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.8.1" + "source": "https://github.com/getsentry/sentry-php/tree/4.9.0" }, "funding": [ { @@ -11685,7 +11687,7 @@ "type": "custom" } ], - "time": "2024-07-16T13:45:27+00:00" + "time": "2024-08-08T14:40:50+00:00" }, { "name": "stomp-php/stomp-php", @@ -14720,16 +14722,16 @@ }, { "name": "twig/twig", - "version": "v3.10.3", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", "shasum": "" }, "require": { @@ -14737,7 +14739,8 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" + "symfony/polyfill-php80": "^1.22", + "symfony/polyfill-php81": "^1.29" }, "require-dev": { "psr/container": "^1.0|^2.0", @@ -14783,7 +14786,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.10.3" + "source": "https://github.com/twigphp/Twig/tree/v3.11.0" }, "funding": [ { @@ -14795,7 +14798,7 @@ "type": "tidelift" } ], - "time": "2024-05-16T10:04:27+00:00" + "time": "2024-08-08T16:15:16+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/block.block.globalannouncement.yml b/conf/cmi/block.block.globalannouncement.yml deleted file mode 100644 index f63213f9..00000000 --- a/conf/cmi/block.block.globalannouncement.yml +++ /dev/null @@ -1,18 +0,0 @@ -uuid: cf2d93ef-77be-4a20-a178-cd7e802223ff -langcode: en -status: true -dependencies: - theme: - - hdbt_subtheme -id: globalannouncement -theme: hdbt_subtheme -region: before_content -weight: -14 -provider: helfi_global_announcement -plugin: global_announcements -settings: - id: global_announcements - label: 'Global announcement' - label_display: '' - provider: helfi_global_announcement -visibility: { } diff --git a/conf/cmi/block.block.surveys.yml b/conf/cmi/block.block.surveys.yml new file mode 100644 index 00000000..526f9d42 --- /dev/null +++ b/conf/cmi/block.block.surveys.yml @@ -0,0 +1,21 @@ +uuid: 707c2c2e-3628-471a-b848-4413231c7976 +langcode: en +status: true +dependencies: + module: + - helfi_etusivu_entities + theme: + - hdbt_subtheme +id: surveys +theme: hdbt_subtheme +region: before_content +weight: -15 +provider: helfi_node_survey +plugin: surveys +settings: + id: surveys + label: Surveys + label_display: '' + provider: helfi_node_survey + use_remote_entities: true +visibility: { } diff --git a/conf/cmi/core.base_field_override.node.survey.promote.yml b/conf/cmi/core.base_field_override.node.survey.promote.yml new file mode 100644 index 00000000..a53be779 --- /dev/null +++ b/conf/cmi/core.base_field_override.node.survey.promote.yml @@ -0,0 +1,24 @@ +uuid: 0f67ac70-571e-43da-ae3f-eca271ee541a +langcode: en +status: true +dependencies: + config: + - node.type.survey +_core: + default_config_hash: jLPewbi-29Z_ekJ8NNa2EQwOjxhSBxFnXYwtX-8jx68 +id: node.survey.promote +field_name: promote +entity_type: node +bundle: survey +label: 'Promoted to front page' +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/core.base_field_override.node.survey.status.yml b/conf/cmi/core.base_field_override.node.survey.status.yml new file mode 100644 index 00000000..81672353 --- /dev/null +++ b/conf/cmi/core.base_field_override.node.survey.status.yml @@ -0,0 +1,24 @@ +uuid: 66c7c3ae-fd35-4cd8-a4c2-54bc24cf5895 +langcode: en +status: true +dependencies: + config: + - node.type.survey +_core: + default_config_hash: G0OKH2o0P5SCpFGpXz9jp9Yuxkm746qvgyc0FbBteRA +id: node.survey.status +field_name: status +entity_type: node +bundle: survey +label: Published +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/core.base_field_override.node.survey.title.yml b/conf/cmi/core.base_field_override.node.survey.title.yml new file mode 100644 index 00000000..95196bcd --- /dev/null +++ b/conf/cmi/core.base_field_override.node.survey.title.yml @@ -0,0 +1,20 @@ +uuid: 12bf02be-360b-498c-9891-fe06f94408b8 +langcode: en +status: true +dependencies: + config: + - node.type.survey +_core: + default_config_hash: Opcalm7vjcrzzKeswLKzQkVtm9qRopCjMHYKtVTXBE4 +id: node.survey.title +field_name: title +entity_type: node +bundle: survey +label: 'Survey title' +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/core.entity_form_display.node.survey.default.yml b/conf/cmi/core.entity_form_display.node.survey.default.yml new file mode 100644 index 00000000..e30e4576 --- /dev/null +++ b/conf/cmi/core.entity_form_display.node.survey.default.yml @@ -0,0 +1,134 @@ +uuid: 2dea284e-6cc0-4e34-9d2f-37baa7317502 +langcode: en +status: true +dependencies: + config: + - field.field.node.survey.body + - field.field.node.survey.field_survey_content_pages + - field.field.node.survey.field_survey_link + - node.type.survey + module: + - hdbt_admin_tools + - link + - path + - publication_date + - scheduler + - select2 + - text +_core: + default_config_hash: SpA7JjzzI-4nAK5XY8JDkYoTn3X7NpV6TqEAFpFP5tY +id: node.survey.default +targetEntityType: node +bundle: survey +mode: default +content: + body: + type: text_textarea_with_summary + weight: 18 + region: content + settings: + rows: 9 + summary_rows: 3 + placeholder: '' + show_summary: false + third_party_settings: { } + created: + type: datetime_timestamp + weight: 3 + region: content + settings: { } + third_party_settings: { } + field_survey_content_pages: + type: select2_entity_reference + weight: 14 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 20 + third_party_settings: { } + field_survey_link: + type: link_default + weight: 19 + region: content + settings: + placeholder_url: '' + placeholder_title: '' + third_party_settings: { } + langcode: + type: language_select + weight: 1 + region: content + settings: + include_locked: false + third_party_settings: { } + path: + type: path + weight: 6 + region: content + settings: { } + third_party_settings: { } + publish_on: + type: datetime_timestamp_no_default + weight: 7 + region: content + settings: { } + third_party_settings: { } + published_at: + type: publication_date_timestamp + weight: 10 + region: content + settings: { } + third_party_settings: { } + scheduler_settings: + weight: 5 + region: content + settings: { } + third_party_settings: { } + simple_sitemap: + weight: 12 + region: content + settings: { } + third_party_settings: { } + status: + type: boolean_checkbox + weight: 9 + region: content + settings: + display_label: true + third_party_settings: { } + title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + translation: + weight: 4 + region: content + settings: { } + third_party_settings: { } + uid: + type: entity_reference_autocomplete + weight: 2 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + unpublish_on: + type: datetime_timestamp_no_default + weight: 8 + region: content + settings: { } + third_party_settings: { } +hidden: + hide_sidebar_navigation: true + promote: true + sticky: true + url_redirects: true diff --git a/conf/cmi/core.entity_view_display.node.survey.default.yml b/conf/cmi/core.entity_view_display.node.survey.default.yml new file mode 100644 index 00000000..aa556471 --- /dev/null +++ b/conf/cmi/core.entity_view_display.node.survey.default.yml @@ -0,0 +1,50 @@ +uuid: 1dab22c0-e5e8-487c-9050-9ba480532d07 +langcode: en +status: true +dependencies: + config: + - field.field.node.survey.body + - field.field.node.survey.field_survey_content_pages + - field.field.node.survey.field_survey_link + - node.type.survey + module: + - link + - text + - user +_core: + default_config_hash: VYCHZ7byxSgOpSFDqb2ad2yb3M5fWI43qAJbGREtaSQ +id: node.survey.default +targetEntityType: node +bundle: survey +mode: default +content: + body: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 2 + region: content + field_survey_link: + type: link + label: hidden + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 3 + region: content + links: + settings: { } + third_party_settings: { } + weight: 0 + region: content +hidden: + field_survey_content_pages: true + langcode: true + published_at: true + search_api_excerpt: true + toc_enabled: true diff --git a/conf/cmi/core.entity_view_display.node.survey.teaser.yml b/conf/cmi/core.entity_view_display.node.survey.teaser.yml new file mode 100644 index 00000000..1aba7e1e --- /dev/null +++ b/conf/cmi/core.entity_view_display.node.survey.teaser.yml @@ -0,0 +1,40 @@ +uuid: 394e2865-baf3-4603-9d97-57f59e49f5a6 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.teaser + - field.field.node.survey.body + - field.field.node.survey.field_survey_content_pages + - field.field.node.survey.field_survey_link + - node.type.survey + module: + - text + - user +_core: + default_config_hash: RFZBuDFa3w1RzcoB4xT4zbJFvgZSCmJDaIfZUOpYzXI +id: node.survey.teaser +targetEntityType: node +bundle: survey +mode: teaser +content: + body: + type: text_summary_or_trimmed + label: hidden + settings: + trim_length: 600 + third_party_settings: { } + weight: 101 + region: content + links: + settings: { } + third_party_settings: { } + weight: 100 + region: content +hidden: + field_survey_content_pages: true + field_survey_link: true + langcode: true + published_at: true + search_api_excerpt: true + toc_enabled: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index b610dea9..5bbc6d31 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -51,8 +51,8 @@ module: helfi_base_content: 0 helfi_calculator: 0 helfi_ckeditor: 0 + helfi_etusivu_entities: 0 helfi_eu_cookie_compliance: 0 - helfi_global_announcement: 0 helfi_group: 0 helfi_image_styles: 0 helfi_kasko_config: 0 @@ -65,6 +65,7 @@ module: helfi_node_landing_page: 0 helfi_node_news_item: 0 helfi_node_page: 0 + helfi_node_survey: 0 helfi_paragraphs_accordion: 0 helfi_paragraphs_banner: 0 helfi_paragraphs_chart: 0 diff --git a/conf/cmi/encrypt.profile.real_aes.yml b/conf/cmi/encrypt.profile.real_aes.yml index 94b4ba51..c9887b01 100644 --- a/conf/cmi/encrypt.profile.real_aes.yml +++ b/conf/cmi/encrypt.profile.real_aes.yml @@ -11,5 +11,5 @@ _core: id: real_aes label: 'Real AES' encryption_method: real_aes -encryption_key: tfa encryption_method_configuration: { } +encryption_key: tfa diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index a27cc29a..8bd8bfb7 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -1,15 +1,15 @@ -uuid: 653fa4a6-5a9e-48de-a6f1-08557be303bb +uuid: 072df4c4-3de5-44f9-bd4f-c1d09006ce88 langcode: en status: true dependencies: { } _core: - default_config_hash: znut8SNGQRsGO4_fUxjvl_SIZqbb0T7hsv98bRKxcM8 + default_config_hash: klULx3zqlYgz7OOfeGsjBYHQmFp8V6_aMlFUYaOQRmA id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml new file mode 100644 index 00000000..2a9fc569 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml @@ -0,0 +1,42 @@ +uuid: be631905-d77b-418a-890e-b04fa3ed3e22 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: _EBh68cyUNEhZdqfsN5IEH5ieC-ND8JOMk5t_uhXdJc +id: helfi_surveys +label: 'Helfi: Survey' +label_plural: 'Helfi: Surveys' +description: '' +generate_aliases: null +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["title"]' + published_at: + value: '$.attributes["published_at"]' + unpublish_on: + value: '$.attributes["unpublish_on"]' + langcode: + value: '$.attributes["langcode"]' + body: + value: '$.attributes["body"]["value"]' + status: + value: '$.attributes["status"]' + survey_link_text: + value: '$.attributes["field_survey_link"]["title"]' + survey_link_url: + value: '$.attributes["field_survey_link"]["uri"]' +storage_client_id: helfi_surveys +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.survey.body.yml b/conf/cmi/field.field.node.survey.body.yml new file mode 100644 index 00000000..b2aa1d75 --- /dev/null +++ b/conf/cmi/field.field.node.survey.body.yml @@ -0,0 +1,31 @@ +uuid: d1b45349-7c63-4ac3-b7b3-563eeb88f38c +langcode: en +status: true +dependencies: + config: + - field.storage.node.body + - node.type.survey + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - minimal +_core: + default_config_hash: Xb4eSRbowaisX2qbRnKXbJKAH74H8t2-NtJaJ0Kz7hk +id: node.survey.body +field_name: body +entity_type: node +bundle: survey +label: Body +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: + display_summary: false + required_summary: false + allowed_formats: { } +field_type: text_with_summary diff --git a/conf/cmi/field.field.node.survey.field_survey_content_pages.yml b/conf/cmi/field.field.node.survey.field_survey_content_pages.yml new file mode 100644 index 00000000..f97fd106 --- /dev/null +++ b/conf/cmi/field.field.node.survey.field_survey_content_pages.yml @@ -0,0 +1,33 @@ +uuid: 9cb9a071-2d67-43d0-a8e3-6e2b7142ee17 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_survey_content_pages + - node.type.landing_page + - node.type.page + - node.type.survey +_core: + default_config_hash: c72PoW8HQ-owmgvYD0syJeWNuTfkdhC88uY2a49GZSk +id: node.survey.field_survey_content_pages +field_name: field_survey_content_pages +entity_type: node +bundle: survey +label: 'Show on content pages' +description: 'Shown on all pages if left empty.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:node' + handler_settings: + target_bundles: + page: page + landing_page: landing_page + sort: + field: title + direction: ASC + auto_create: false + auto_create_bundle: page +field_type: entity_reference diff --git a/conf/cmi/field.field.node.survey.field_survey_link.yml b/conf/cmi/field.field.node.survey.field_survey_link.yml new file mode 100644 index 00000000..b48a1f27 --- /dev/null +++ b/conf/cmi/field.field.node.survey.field_survey_link.yml @@ -0,0 +1,25 @@ +uuid: 21a43a79-869a-4758-b64a-b665aec0561a +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_survey_link + - node.type.survey + module: + - link +_core: + default_config_hash: UaxdyCI0GV4wNetzWNnSTLZy7bnNtgHjMypvOl28HYo +id: node.survey.field_survey_link +field_name: field_survey_link +entity_type: node +bundle: survey +label: Link +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: + title: 0 + link_type: 17 +field_type: link diff --git a/conf/cmi/field.storage.node.field_survey_content_pages.yml b/conf/cmi/field.storage.node.field_survey_content_pages.yml new file mode 100644 index 00000000..83208819 --- /dev/null +++ b/conf/cmi/field.storage.node.field_survey_content_pages.yml @@ -0,0 +1,21 @@ +uuid: 3a26e002-c1e2-4840-bb59-f29aea3489ea +langcode: en +status: true +dependencies: + module: + - node +_core: + default_config_hash: 4bzZX7tPEXAGP71HWAPeByOaqILWZoXmtBCjFWjrm2s +id: node.field_survey_content_pages +field_name: field_survey_content_pages +entity_type: node +type: entity_reference +settings: + target_type: node +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.node.field_survey_link.yml b/conf/cmi/field.storage.node.field_survey_link.yml new file mode 100644 index 00000000..2a642231 --- /dev/null +++ b/conf/cmi/field.storage.node.field_survey_link.yml @@ -0,0 +1,21 @@ +uuid: e9b298a6-f958-41b6-9c26-5fd7868e4120 +langcode: en +status: true +dependencies: + module: + - link + - node +_core: + default_config_hash: xr7_yR6YfdO7eML9XROtXbIDgHPw-h3zTdK2Ln6iz7g +id: node.field_survey_link +field_name: field_survey_link +entity_type: node +type: link +settings: { } +module: link +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/language.content_settings.node.survey.yml b/conf/cmi/language.content_settings.node.survey.yml new file mode 100644 index 00000000..58cd44e5 --- /dev/null +++ b/conf/cmi/language.content_settings.node.survey.yml @@ -0,0 +1,18 @@ +uuid: c10c6c36-eccd-4664-bf08-bc58654eac6d +langcode: en +status: true +dependencies: + config: + - node.type.survey + module: + - content_translation +third_party_settings: + content_translation: + enabled: true +_core: + default_config_hash: k-YN8N-ocbCYxMId9l0JressnpIaJXCvHbUY265HLpU +id: node.survey +target_entity_type_id: node +target_bundle: survey +default_langcode: fi +language_alterable: true diff --git a/conf/cmi/language/fi/core.base_field_override.node.survey.promote.yml b/conf/cmi/language/fi/core.base_field_override.node.survey.promote.yml new file mode 100644 index 00000000..a29359aa --- /dev/null +++ b/conf/cmi/language/fi/core.base_field_override.node.survey.promote.yml @@ -0,0 +1,4 @@ +label: 'Näytetään etusivulla' +settings: + on_label: Kyllä + off_label: Ei diff --git a/conf/cmi/language/fi/core.base_field_override.node.survey.status.yml b/conf/cmi/language/fi/core.base_field_override.node.survey.status.yml new file mode 100644 index 00000000..b939375b --- /dev/null +++ b/conf/cmi/language/fi/core.base_field_override.node.survey.status.yml @@ -0,0 +1,4 @@ +label: Julkaistu +settings: + on_label: Kyllä + off_label: Ei diff --git a/conf/cmi/language/fi/core.base_field_override.node.survey.title.yml b/conf/cmi/language/fi/core.base_field_override.node.survey.title.yml new file mode 100644 index 00000000..93342164 --- /dev/null +++ b/conf/cmi/language/fi/core.base_field_override.node.survey.title.yml @@ -0,0 +1 @@ +label: 'Kyselyn otsikko' diff --git a/conf/cmi/language/fi/field.field.node.announcement.field_publish_externally.yml b/conf/cmi/language/fi/field.field.node.announcement.field_publish_externally.yml new file mode 100644 index 00000000..050d38a5 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.announcement.field_publish_externally.yml @@ -0,0 +1,4 @@ +label: 'Julkaise ulkoisella sivustolla ' +settings: + on_label: Päällä + off_label: 'Pois päältä' diff --git a/conf/cmi/language/fi/field.field.node.survey.body.yml b/conf/cmi/language/fi/field.field.node.survey.body.yml new file mode 100644 index 00000000..9d61cbc9 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.survey.body.yml @@ -0,0 +1 @@ +label: Sisältö diff --git a/conf/cmi/language/fi/field.field.node.survey.field_survey_content_pages.yml b/conf/cmi/language/fi/field.field.node.survey.field_survey_content_pages.yml new file mode 100644 index 00000000..6b1adffa --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.survey.field_survey_content_pages.yml @@ -0,0 +1,2 @@ +label: 'Näytä sisältösivuilla' +description: 'Näytetään kaikilla sivuilla jos jätetään tyhjäksi.' diff --git a/conf/cmi/language/fi/field.field.node.survey.field_survey_link.yml b/conf/cmi/language/fi/field.field.node.survey.field_survey_link.yml new file mode 100644 index 00000000..d060ac6b --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.survey.field_survey_link.yml @@ -0,0 +1 @@ +label: Linkki diff --git a/conf/cmi/language/fi/key.key.tfa.yml b/conf/cmi/language/fi/key.key.tfa.yml new file mode 100644 index 00000000..8875cd6b --- /dev/null +++ b/conf/cmi/language/fi/key.key.tfa.yml @@ -0,0 +1 @@ +label: TFA diff --git a/conf/cmi/language/fi/node.type.survey.yml b/conf/cmi/language/fi/node.type.survey.yml new file mode 100644 index 00000000..d9e4a950 --- /dev/null +++ b/conf/cmi/language/fi/node.type.survey.yml @@ -0,0 +1,2 @@ +name: Kysely +description: 'Tämän sisältötyypin avulla voidaan näyttää kyselyitä eri sivuilla.' diff --git a/conf/cmi/language/fi/tfa.settings.yml b/conf/cmi/language/fi/tfa.settings.yml new file mode 100644 index 00000000..01a1f48f --- /dev/null +++ b/conf/cmi/language/fi/tfa.settings.yml @@ -0,0 +1,6 @@ +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/conf/cmi/language/sv/core.base_field_override.node.survey.promote.yml b/conf/cmi/language/sv/core.base_field_override.node.survey.promote.yml new file mode 100644 index 00000000..1c731d26 --- /dev/null +++ b/conf/cmi/language/sv/core.base_field_override.node.survey.promote.yml @@ -0,0 +1,4 @@ +label: 'Visas på startsidan' +settings: + on_label: Ja + off_label: Nej diff --git a/conf/cmi/language/sv/core.base_field_override.node.survey.status.yml b/conf/cmi/language/sv/core.base_field_override.node.survey.status.yml new file mode 100644 index 00000000..97ac71a7 --- /dev/null +++ b/conf/cmi/language/sv/core.base_field_override.node.survey.status.yml @@ -0,0 +1,4 @@ +label: Publicerad +settings: + on_label: Ja + off_label: Nej diff --git a/conf/cmi/language/sv/field.field.node.announcement.field_publish_externally.yml b/conf/cmi/language/sv/field.field.node.announcement.field_publish_externally.yml new file mode 100644 index 00000000..83c1e838 --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.announcement.field_publish_externally.yml @@ -0,0 +1,3 @@ +settings: + on_label: Ja + off_label: Nej diff --git a/conf/cmi/language/sv/field.field.node.survey.body.yml b/conf/cmi/language/sv/field.field.node.survey.body.yml new file mode 100644 index 00000000..7e34baf6 --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.survey.body.yml @@ -0,0 +1 @@ +label: Body diff --git a/conf/cmi/language/sv/field.field.node.survey.field_survey_link.yml b/conf/cmi/language/sv/field.field.node.survey.field_survey_link.yml new file mode 100644 index 00000000..cb5c2337 --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.survey.field_survey_link.yml @@ -0,0 +1 @@ +label: Länk diff --git a/conf/cmi/language/sv/tfa.settings.yml b/conf/cmi/language/sv/tfa.settings.yml new file mode 100644 index 00000000..67899d55 --- /dev/null +++ b/conf/cmi/language/sv/tfa.settings.yml @@ -0,0 +1,8 @@ +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + subject: 'Your [site:name] account now has two-factor authentication' + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + subject: 'Your [site:name] account no longer has two-factor authentication' + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/conf/cmi/node.type.survey.yml b/conf/cmi/node.type.survey.yml new file mode 100644 index 00000000..1a55a53a --- /dev/null +++ b/conf/cmi/node.type.survey.yml @@ -0,0 +1,33 @@ +uuid: 1dc12a96-80cd-44c3-a566-f10debad1c49 +langcode: en +status: true +dependencies: + module: + - menu_ui + - scheduler +third_party_settings: + menu_ui: + available_menus: { } + parent: '' + scheduler: + expand_fieldset: when_required + fields_display_mode: vertical_tab + publish_enable: true + publish_past_date: error + publish_past_date_created: false + publish_required: false + publish_revision: false + publish_touch: true + show_message_after_update: true + unpublish_enable: true + unpublish_required: false + unpublish_revision: false +_core: + default_config_hash: pbMUCq9D1CxNNcFQ2S0S76xWDOgKC4WOgnFyazcRW3Y +name: Survey +type: survey +description: 'Content type for surveys that can be shown on different pages.' +help: null +new_revision: true +preview_mode: 1 +display_submitted: false diff --git a/conf/cmi/paragraphs.paragraphs_type.from_library.yml b/conf/cmi/paragraphs.paragraphs_type.from_library.yml index 610217ce..a02d363f 100644 --- a/conf/cmi/paragraphs.paragraphs_type.from_library.yml +++ b/conf/cmi/paragraphs.paragraphs_type.from_library.yml @@ -1,7 +1,10 @@ uuid: 97aa89b0-d232-4898-89a9-7f9b317b3293 langcode: en status: true -dependencies: { } +dependencies: + enforced: + module: + - paragraphs_library _core: default_config_hash: OJUwL6xTTiHbXZy10swc5Fckkr7qhSm4b0nK3326LO8 id: from_library diff --git a/conf/cmi/system.action.user_add_role_action.survey_editor.yml b/conf/cmi/system.action.user_add_role_action.survey_editor.yml new file mode 100644 index 00000000..97031929 --- /dev/null +++ b/conf/cmi/system.action.user_add_role_action.survey_editor.yml @@ -0,0 +1,14 @@ +uuid: eb46557e-1196-4728-a11d-d495b056cd27 +langcode: en +status: true +dependencies: + config: + - user.role.survey_editor + module: + - user +id: user_add_role_action.survey_editor +label: 'Add the Survey editor role to the selected user(s)' +type: user +plugin: user_add_role_action +configuration: + rid: survey_editor diff --git a/conf/cmi/system.action.user_remove_role_action.survey_editor.yml b/conf/cmi/system.action.user_remove_role_action.survey_editor.yml new file mode 100644 index 00000000..82939d24 --- /dev/null +++ b/conf/cmi/system.action.user_remove_role_action.survey_editor.yml @@ -0,0 +1,14 @@ +uuid: 60b4c3fe-7578-4107-b018-ce7beda0fc9b +langcode: en +status: true +dependencies: + config: + - user.role.survey_editor + module: + - user +id: user_remove_role_action.survey_editor +label: 'Remove the Survey editor role from the selected user(s)' +type: user +plugin: user_remove_role_action +configuration: + rid: survey_editor diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index b2794a0a..92c29069 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -28,6 +28,7 @@ permissions: - 'view helfi_news_groups external entity' - 'view helfi_news_neighbourhoods external entity' - 'view helfi_news_tags external entity' + - 'view helfi_surveys external entity' - 'view media' - 'view remote entities' - 'view tpr_service' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 46894f18..66c7a24e 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -35,6 +35,7 @@ permissions: - 'view helfi_news_groups external entity' - 'view helfi_news_neighbourhoods external entity' - 'view helfi_news_tags external entity' + - 'view helfi_surveys external entity' - 'view media' - 'view remote entities' - 'view tpr_service' diff --git a/conf/cmi/user.role.survey_editor.yml b/conf/cmi/user.role.survey_editor.yml new file mode 100644 index 00000000..7ba1bc81 --- /dev/null +++ b/conf/cmi/user.role.survey_editor.yml @@ -0,0 +1,27 @@ +uuid: 9ec2282e-0675-4746-9892-cd37d2b6fc8a +langcode: en +status: true +dependencies: + config: + - node.type.survey + module: + - content_translation + - node + - publication_date +_core: + default_config_hash: CliaTgzCQcvNF9ot3u_EbHnydymXh8bvNgNFlSffj9s +id: survey_editor +label: 'Survey editor' +weight: 8 +is_admin: null +permissions: + - 'create survey content' + - 'delete any survey content' + - 'delete own survey content' + - 'delete survey revisions' + - 'edit any survey content' + - 'edit own survey content' + - 'revert survey revisions' + - 'set survey published on date' + - 'translate survey node' + - 'view survey revisions' diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index 3d009e9b..32d4a3a2 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -14,7 +14,8 @@ COPY docker/openshift/init.sh / # Copy cron scripts RUN mkdir /crons COPY docker/openshift/crons/ /crons -RUN chmod +x /crons/* +COPY docker/openshift/cron-entrypoint.sh /usr/local/bin/cron-entrypoint +RUN chmod +x /crons/* /usr/local/bin/cron-entrypoint # Copy nginx overrides. COPY docker/openshift/custom.locations /etc/nginx/conf.d/custom.locations diff --git a/docker/openshift/cron-entrypoint.sh b/docker/openshift/cron-entrypoint.sh new file mode 100644 index 00000000..b9f55232 --- /dev/null +++ b/docker/openshift/cron-entrypoint.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +source /init.sh + +echo "Starting cron: $(date)" + +# You can add any additional cron "daemons" to docker/openshift/crons/ folder. +# +# Example: +# @code +# #!/bin/bash +# while true +# do +# drush some-command +# sleep 600 +# done +# @endcode + +for cron in /crons/*.sh; do + # Skip legacy base.sh script if it exists. + # Skip Kubernetes hooks that are stored in crons directory. + if [[ "${cron##*/}" == "base.sh" ]] || [[ "${cron##*/}" == *-hook.sh ]]; then + continue + elif [[ -r "$cron" ]]; then + echo "Starting $cron" + exec "$cron" & + fi +done + +while true +do + # Rudimentary process supervisor: + # Waits for the next process to terminate. The parent + # process is killed if any subprocess exists with failure. + # OpenShift should then restart the cron pod. + wait -n + exit_code=$? + if [[ "$exit_code" -ne 0 ]]; then + output_error_message "Cron subprocess failed with exit code $exit_code" + exit 1 + fi +done diff --git a/docker/openshift/crons/cron.sh b/docker/openshift/crons/cron.sh new file mode 100644 index 00000000..3af5b6ea --- /dev/null +++ b/docker/openshift/crons/cron.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +while true +do + echo "Running cron: $(date +'%Y-%m-%dT%H:%M:%S%:z')\n" + drush cron + # Sleep for 10 minutes. + sleep 600 +done diff --git a/docker/openshift/crons/linked-events.sh b/docker/openshift/crons/linked-events.sh index 4eecbdfb..a698f10a 100644 --- a/docker/openshift/crons/linked-events.sh +++ b/docker/openshift/crons/linked-events.sh @@ -1,5 +1,11 @@ #!/bin/bash +source /init.sh + +if ! is_drupal_module_enabled "helfi_react_search"; then + exit 0 +fi + while true do # Allow migrations to be run every 3 hours and reset stuck migrations every 12 hours. diff --git a/docker/openshift/crons/migrate-tpr.sh b/docker/openshift/crons/migrate-tpr.sh index 780bcbbf..637d1434 100644 --- a/docker/openshift/crons/migrate-tpr.sh +++ b/docker/openshift/crons/migrate-tpr.sh @@ -1,5 +1,11 @@ #!/bin/bash +source /init.sh + +if ! is_drupal_module_enabled "helfi_tpr"; then + exit 0 +fi + while true do # Allow migrations to be run every 3 hours and reset stuck migrations every 12 hours. diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh index d5d0fc16..be359b9f 100644 --- a/docker/openshift/crons/pubsub.sh +++ b/docker/openshift/crons/pubsub.sh @@ -2,14 +2,9 @@ echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" -i=0 -# Attempt to start this service five times. -until [ $i -gt 5 ] +while true do - drush helfi:azure:pubsub-listen - - if [[ "$?" -ne 0 ]]; then - ((i=i+1)) - sleep 10 - fi + # PubSub process exists with success return code after + # certain number of messages and should then be restarted. + drush helfi:azure:pubsub-listen || exit 1 done diff --git a/docker/openshift/init.sh b/docker/openshift/init.sh index 8bef1380..22ccb583 100644 --- a/docker/openshift/init.sh +++ b/docker/openshift/init.sh @@ -30,6 +30,14 @@ function deployment_in_progress { return 1 } +function is_drupal_module_enabled { + if drush pm-list --status=Enabled --filter=${1} --format=json | jq --exit-status '. == []' > /dev/null; then + return 1 + fi + + return 0 +} + if [ ! -d "sites/default/files" ]; then output_error_message "Container start error: Public file folder does not exist. Exiting early." exit 1 diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk index 5f81548c..e8c9a4a2 100644 --- a/tools/make/drupal.mk +++ b/tools/make/drupal.mk @@ -7,6 +7,7 @@ CLEAN_EXCLUDE += $(WEBROOT)/sites/default/files DRUPAL_DISABLE_MODULES ?= no DRUPAL_ENABLE_MODULES ?= no DRUPAL_PROFILE ?= minimal +DRUPAL_SITE_EMAIL ?= maintenance@druid.fi DRUPAL_SYNC_FILES ?= yes DRUPAL_SYNC_SOURCE ?= main DRUSH_RSYNC_MODE ?= Pakzu @@ -87,7 +88,7 @@ else endif drush-si: ## Site install $(call step,Do Drush site:install...\n) - $(call drush,si ${DRUSH_SI}) + $(call drush,si ${DRUSH_SI} --site-mail=$(DRUPAL_SITE_EMAIL)) PHONY += drush-deploy drush-deploy: ## Run Drush deploy From 1934837cebfabe46d4d1351d74eeaa305397291f Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Wed, 14 Aug 2024 13:50:29 +0300 Subject: [PATCH 25/25] Require tunnistamo ^3 (remove eduad-transition hacks) --- composer.json | 2 +- composer.lock | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index a871b2c9..fb7f47c0 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/helfi_platform_config": "^4.0", "drupal/helfi_proxy": "^3.0", "drupal/helfi_tpr": "^2.0", - "drupal/helfi_tunnistamo": "dev-UHF-10169-eduad", + "drupal/helfi_tunnistamo": "^3", "drupal/override_node_options": "^2.6", "drupal/raven": "^5.0", "drupal/redis": "^1.5", diff --git a/composer.lock b/composer.lock index e2edc301..a8a75e25 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": "0b213b0e87ed5622fea59bb8f708bbe8", + "content-hash": "fd276f5fcf62d0f5e9f4347301b234e7", "packages": [ { "name": "asm89/stack-cors", @@ -4839,16 +4839,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "dev-UHF-10169-eduad", + "version": "3.0.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "0a9ea2e404eccfde6d1e3e462799d9041da0cb87" + "reference": "a7e4709c0b6407df0a68df87b113f06a1613d0fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/0a9ea2e404eccfde6d1e3e462799d9041da0cb87", - "reference": "0a9ea2e404eccfde6d1e3e462799d9041da0cb87", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/a7e4709c0b6407df0a68df87b113f06a1613d0fe", + "reference": "a7e4709c0b6407df0a68df87b113f06a1613d0fe", "shasum": "" }, "require": { @@ -4865,10 +4865,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/UHF-10169-eduad", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-06-24T06:58:14+00:00" + "time": "2024-08-05T07:39:24+00:00" }, { "name": "drupal/image_style_quality", @@ -20128,8 +20128,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/helfi_drupal_tools": 20, - "drupal/helfi_tunnistamo": 20 + "drupal/helfi_drupal_tools": 20 }, "prefer-stable": true, "prefer-lowest": false,