diff --git a/compose.yaml b/compose.yaml index e2bc345c..56202025 100644 --- a/compose.yaml +++ b/compose.yaml @@ -87,6 +87,28 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true" - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081" - "traefik.docker.network=stonehenge-network" + elastic-proxy: + container_name: "${COMPOSE_PROJECT_NAME}-elastic-proxy" + image: nginxinc/nginx-unprivileged:alpine-perl + environment: + ELASTICSEARCH_URL: "http://elastic:9200" + volumes: + - ./docker/elastic-proxy/nginx.conf:/etc/nginx/nginx.conf + - ./docker/elastic-proxy/elastic.conf:/etc/nginx/templates/default.conf.template + networks: + - stonehenge-network + - internal + labels: + - "traefik.enable=true" + - "traefik.http.routers.nginx.entrypoints=https" + - "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)" + - "traefik.http.services.nginx.loadbalancer.server.port=8080" + - "traefik.http.routers.nginx.tls=true" + - "traefik.docker.network=stonehenge-network" + depends_on: + - elastic + profiles: + - search elastic: image: docker.elastic.co/elasticsearch/elasticsearch:8.4.0 container_name: "${COMPOSE_PROJECT_NAME}-elastic" diff --git a/composer.lock b/composer.lock index 0511b31c..2182e1b4 100644 --- a/composer.lock +++ b/composer.lock @@ -125,16 +125,16 @@ }, { "name": "chi-teck/drupal-code-generator", - "version": "3.5.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/Chi-teck/drupal-code-generator.git", - "reference": "74c2dc687e124bfc4001e73e9346b33067e2ec2b" + "reference": "7794c268309a6fd7aeecfd1246a01238c14384c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/74c2dc687e124bfc4001e73e9346b33067e2ec2b", - "reference": "74c2dc687e124bfc4001e73e9346b33067e2ec2b", + "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/7794c268309a6fd7aeecfd1246a01238c14384c4", + "reference": "7794c268309a6fd7aeecfd1246a01238c14384c4", "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.5.0" + "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.6.0" }, - "time": "2024-04-11T11:23:44+00:00" + "time": "2024-05-20T12:50:42+00:00" }, { "name": "commerceguys/addressing", @@ -1745,75 +1745,6 @@ "source": "https://git.drupalcode.org/project/ckeditor5_paste_filter" } }, - { - "name": "drupal/config_filter", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/config_filter.git", - "reference": "8.x-2.6" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.6.zip", - "reference": "8.x-2.6", - "shasum": "fd1a057a402436fc906c63bf0a74722f73b9b155" - }, - "require": { - "drupal/core": "^8.8 || ^9 || ^10" - }, - "conflict": { - "drush/drush": "<10" - }, - "suggest": { - "drupal/config_split": "Split site configuration for different environments." - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-2.6", - "datestamp": "1698308577", - "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": "Fabian Bircher", - "homepage": "https://www.drupal.org/u/bircher", - "email": "opensource@fabianbircher.com", - "role": "Maintainer" - }, - { - "name": "Nuvole Web", - "homepage": "http://nuvole.org", - "email": "info@nuvole.org", - "role": "Maintainer" - }, - { - "name": "pescetti", - "homepage": "https://www.drupal.org/user/436244" - } - ], - "description": "Config Filter allows other modules to interact with a ConfigStorage through filter plugins.", - "homepage": "https://www.drupal.org/project/config_filter", - "keywords": [ - "Drupal", - "configuration", - "configuration management" - ], - "support": { - "source": "https://git.drupalcode.org/project/config_filter", - "issues": "https://www.drupal.org/project/issues/config_filter", - "slack": "https://drupal.slack.com/archives/C45342CDD" - } - }, { "name": "drupal/config_ignore", "version": "3.3.0", @@ -1916,6 +1847,14 @@ { "name": "saltednut", "homepage": "https://www.drupal.org/user/252788" + }, + { + "name": "vipin.mittal18", + "homepage": "https://www.drupal.org/user/319716" + }, + { + "name": "vishalkhode", + "homepage": "https://www.drupal.org/user/2439156" } ], "description": "Rewrites existing configuration on module installation via using a 'rewrite' folder in the config directory.", @@ -1927,17 +1866,17 @@ }, { "name": "drupal/content_lock", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/content_lock.git", - "reference": "8.x-2.3" + "reference": "8.x-2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/content_lock-8.x-2.3.zip", - "reference": "8.x-2.3", - "shasum": "0e8343f82330899baef65aa85d9994154e29506f" + "url": "https://ftp.drupal.org/files/projects/content_lock-8.x-2.4.zip", + "reference": "8.x-2.4", + "shasum": "99d149e530555aae12b44292efe5887d373e862e" }, "require": { "drupal/core": "^9.0 || ^10.0" @@ -1945,8 +1884,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.3", - "datestamp": "1668427342", + "version": "8.x-2.4", + "datestamp": "1715783058", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2629,20 +2568,20 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.12", + "version": "2.1.17", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.12" + "reference": "2.1.17" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.12.zip", - "reference": "2.1.12", - "shasum": "2a3e32c25eebdcdb3c64144b01d7dd4ce2945fec" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.17.zip", + "reference": "2.1.17", + "shasum": "7c9af73ebfe342d988abf2a89e41d324bfc31766" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9 || ^10 || ^11" }, "conflict": { "drupal/csp": "<1.24" @@ -2650,8 +2589,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.12", - "datestamp": "1713880633", + "version": "2.1.17", + "datestamp": "1715783435", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3137,17 +3076,17 @@ }, { "name": "drupal/external_entities", - "version": "2.0.0-alpha6", + "version": "2.0.0-beta1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/external_entities.git", - "reference": "8.x-2.0-alpha6" + "reference": "8.x-2.0-beta1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-alpha6.zip", - "reference": "8.x-2.0-alpha6", - "shasum": "3c11cc7ac7a4130131a188f6c6fba33937ca5244" + "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-beta1.zip", + "reference": "8.x-2.0-beta1", + "shasum": "6aea914a6037e354e422d44955eebca878e27059" }, "require": { "drupal/core": "^8.8 || ^9 || ^10", @@ -3159,11 +3098,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-alpha6", - "datestamp": "1684406076", + "version": "8.x-2.0-beta1", + "datestamp": "1706886572", "security-coverage": { "status": "not-covered", - "message": "Alpha releases are not covered by Drupal security advisories." + "message": "Beta releases are not covered by Drupal security advisories." } } }, @@ -3756,16 +3695,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.10", + "version": "6.5.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "a1158717f670b8ff61243af8cefb51f557722edf" + "reference": "1bceace4bc51d2a6ebfc368434485cbea20c1d52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/a1158717f670b8ff61243af8cefb51f557722edf", - "reference": "a1158717f670b8ff61243af8cefb51f557722edf", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1bceace4bc51d2a6ebfc368434485cbea20c1d52", + "reference": "1bceace4bc51d2a6ebfc368434485cbea20c1d52", "shasum": "" }, "require": { @@ -3783,23 +3722,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-05-07T08:17:22+00:00" + "time": "2024-05-20T09:37:47+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.1.6", + "version": "3.1.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "96f29332a57540bda695cd53e5b288bc96960076" + "reference": "33a217058068330c90b049e539e91b19d24d933d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/96f29332a57540bda695cd53e5b288bc96960076", - "reference": "96f29332a57540bda695cd53e5b288bc96960076", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/33a217058068330c90b049e539e91b19d24d933d", + "reference": "33a217058068330c90b049e539e91b19d24d933d", "shasum": "" }, "require": { @@ -3818,10 +3757,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.7", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-04-11T13:46:53+00:00" + "time": "2024-05-20T09:40:02+00:00" }, { "name": "drupal/health_check", @@ -3965,12 +3904,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "08fe754581afe4ba8d1d7324b193108f476dd548" + "reference": "9b33c808570b6e8daea537fd96885f9fe7246274" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/08fe754581afe4ba8d1d7324b193108f476dd548", - "reference": "08fe754581afe4ba8d1d7324b193108f476dd548", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/9b33c808570b6e8daea537fd96885f9fe7246274", + "reference": "9b33c808570b6e8daea537fd96885f9fe7246274", "shasum": "" }, "require": { @@ -4042,7 +3981,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-03-20T07:54:25+00:00" + "time": "2024-05-21T06:26:52+00:00" }, { "name": "drupal/helfi_navigation", @@ -4080,16 +4019,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.52", + "version": "4.3.57", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "18406aaefc6b9a32342d1ca6fb17b7f84a2f738e" + "reference": "9ebb3f106cf8e2835cce6f789abb127234af9aab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/18406aaefc6b9a32342d1ca6fb17b7f84a2f738e", - "reference": "18406aaefc6b9a32342d1ca6fb17b7f84a2f738e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9ebb3f106cf8e2835cce6f789abb127234af9aab", + "reference": "9ebb3f106cf8e2835cce6f789abb127234af9aab", "shasum": "" }, "require": { @@ -4097,7 +4036,6 @@ "drupal/allowed_formats": "^2.0", "drupal/ckeditor": "^1.0", "drupal/ckeditor5_paste_filter": "^1.0", - "drupal/config_filter": "^2.6", "drupal/config_ignore": "^3.0", "drupal/config_rewrite": "^1.4", "drupal/content_lock": "^2.2", @@ -4111,7 +4049,7 @@ "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", "drupal/eu_cookie_compliance": "^1.24", - "drupal/external_entities": "2.0.0-alpha6", + "drupal/external_entities": "^2.0@beta", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", "drupal/gin_toolbar": "^1.0@rc", @@ -4164,8 +4102,7 @@ "extra": { "patches": { "drupal/content_lock": { - "[#UHF-4553] Fix unlock content button redirect": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/82081691e4a6d05b3716052d5fff46a04027bdc3/patches/content-lock-uhf-4553.patch", - "https://www.drupal.org/project/content_lock/issues/3343964": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch" + "[#UHF-4553] Fix unlock content button redirect": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/82081691e4a6d05b3716052d5fff46a04027bdc3/patches/content-lock-uhf-4553.patch" }, "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", @@ -4176,7 +4113,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 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-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] Convert line breaks into HTML filter generates duplicate br tags after a line ending (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-02-29/3083786-br-generates-duplicate-tags.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" }, "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" @@ -4192,10 +4129,6 @@ "https://www.drupal.org/project/paragraphs/issues/2904705#comment-13836790": "https://www.drupal.org/files/issues/2020-09-25/2904705-115.patch", "[#UHF-2059] Enhancements for the Admin UI": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fdccb32397cc6fa19b4d0077b21a2b18aa6be297/patches/helfi_customizations_for_paragraphs_widget_8.x-1.12.patch" }, - "drupal/publication_date": { - "[#UHF-7721] Fixed node preview when publication date is not set. (https://www.drupal.org/i/3074373)": "https://www.drupal.org/files/issues/2022-12-20/publication_date_is_required_for_completing_the_form-3074373-11.patch", - "[#UHF-9113] Fix PHP 8.2 deprecation issue with PublishedAtOrNowComputed class. (https://www.drupal.org/i/3328575)": "https://www.drupal.org/files/issues/2023-05-31/3328575-5-fix-bux-publicate-date.patch" - }, "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" } @@ -4206,10 +4139,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.52", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.57", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-04-25T07:37:52+00:00" + "time": "2024-05-22T06:30:57+00:00" }, { "name": "drupal/helfi_proxy", @@ -4688,17 +4621,17 @@ }, { "name": "drupal/linkit", - "version": "6.1.3", + "version": "6.1.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.3" + "reference": "6.1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.3.zip", - "reference": "6.1.3", - "shasum": "469a5e38269ed5e707998000ee4701ab4922e561" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.4.zip", + "reference": "6.1.4", + "shasum": "f5544a39d691af5efd1532bd5403862a7153f60b" }, "require": { "drupal/core": "^10.1" @@ -4710,8 +4643,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.3", - "datestamp": "1710519126", + "version": "6.1.4", + "datestamp": "1715203830", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5375,17 +5308,17 @@ }, { "name": "drupal/publication_date", - "version": "2.0.0-beta7", + "version": "2.0.0-beta8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/publication_date.git", - "reference": "8.x-2.0-beta7" + "reference": "8.x-2.0-beta8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta7.zip", - "reference": "8.x-2.0-beta7", - "shasum": "699232945890528f97b83f49a31ea7c7831c3ca8" + "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta8.zip", + "reference": "8.x-2.0-beta8", + "shasum": "1e40fc97a4582c364a8971e16448775c30441fe7" }, "require": { "drupal/core": "^9.1 || ^10" @@ -5393,8 +5326,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta7", - "datestamp": "1669679282", + "version": "8.x-2.0-beta8", + "datestamp": "1715850299", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -5499,33 +5432,33 @@ }, { "name": "drupal/raven", - "version": "5.0.11", + "version": "5.0.14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.11" + "reference": "5.0.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.11.zip", - "reference": "5.0.11", - "shasum": "ef441bbeb2f58e2efe57cc0fc3343e14c4944b4b" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.14.zip", + "reference": "5.0.14", + "shasum": "b6487db5f6be84aa06ccf48e878021c30a8511ba" }, "require": { - "drupal/core": "^10.1", + "drupal/core": "^10.1 || ^11", "sentry/sentry": "^4.4" }, "require-dev": { "drupal/csp": "^1.17", "drupal/monitoring": "^1.13", "drupal/seckit": "^2.0", - "drush/drush": "^11.0 || ^12.0" + "drush/drush": "^11.0 || ^12.0 || ^13.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.11", - "datestamp": "1713227351", + "version": "5.0.14", + "datestamp": "1716361931", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7478,16 +7411,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4" + "reference": "7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4", - "reference": "4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce", + "reference": "7992d33502de8a82065fd9fe2d2e2b1f7f33d1ce", "shasum": "" }, "require": { @@ -7530,9 +7463,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.1.0" + "source": "https://github.com/FileEye/MimeMap/tree/2.1.1" }, - "time": "2024-04-06T13:00:52+00:00" + "time": "2024-05-17T19:22:06+00:00" }, { "name": "fileeye/pel", @@ -7597,26 +7530,26 @@ }, { "name": "firebase/php-jwt", - "version": "v6.10.0", + "version": "v6.10.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "a49db6f0a5033aef5143295342f1c95521b075ff" + "reference": "500501c2ce893c824c801da135d02661199f60c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff", - "reference": "a49db6f0a5033aef5143295342f1c95521b075ff", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5", + "reference": "500501c2ce893c824c801da135d02661199f60c5", "shasum": "" }, "require": { - "php": "^7.4||^8.0" + "php": "^8.0" }, "require-dev": { - "guzzlehttp/guzzle": "^6.5||^7.4", + "guzzlehttp/guzzle": "^7.4", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "psr/cache": "^1.0||^2.0", + "psr/cache": "^2.0||^3.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0" }, @@ -7654,9 +7587,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.10.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.10.1" }, - "time": "2023-12-01T16:26:39+00:00" + "time": "2024-05-18T18:05:11+00:00" }, { "name": "galbar/jsonpath", @@ -9977,20 +9910,20 @@ }, { "name": "psr/http-factory", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "e616d01114759c4c489f93b099585439f795fe35" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", + "php": ">=7.1", "psr/http-message": "^1.0 || ^2.0" }, "type": "library", @@ -10014,7 +9947,7 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -10026,9 +9959,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2023-04-10T20:10:41+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", @@ -13515,16 +13448,16 @@ }, { "name": "twig/twig", - "version": "v3.9.3", + "version": "v3.10.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58" + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", "shasum": "" }, "require": { @@ -13578,7 +13511,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.9.3" + "source": "https://github.com/twigphp/Twig/tree/v3.10.3" }, "funding": [ { @@ -13590,7 +13523,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T11:59:33+00:00" + "time": "2024-05-16T10:04:27+00:00" }, { "name": "twistor/flysystem-stream-wrapper", @@ -13681,30 +13614,31 @@ }, { "name": "webflo/drupal-finder", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webflo/drupal-finder.git", - "reference": "c8e5dbe65caef285fec8057a4c718a0d4138d1ee" + "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/c8e5dbe65caef285fec8057a4c718a0d4138d1ee", - "reference": "c8e5dbe65caef285fec8057a4c718a0d4138d1ee", + "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", + "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", "shasum": "" }, "require": { - "ext-json": "*" + "composer-runtime-api": "^2.2", + "php": ">=8.1" }, "require-dev": { "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^10.4" }, "type": "library", "autoload": { - "classmap": [ - "src/DrupalFinder.php" - ] + "psr-4": { + "DrupalFinder\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -13716,12 +13650,12 @@ "email": "florian@webflo.org" } ], - "description": "Helper class to locate a Drupal installation from a given path.", + "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.2.2" + "source": "https://github.com/webflo/drupal-finder/tree/1.3.0" }, - "time": "2020-10-27T09:42:17+00:00" + "time": "2024-05-08T21:22:39+00:00" }, { "name": "webmozart/assert", @@ -16261,16 +16195,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { @@ -16319,9 +16253,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2024-04-09T21:13:58+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", diff --git a/conf/cmi/block.block.claro_help.yml b/conf/cmi/block.block.claro_help.yml new file mode 100644 index 00000000..e75b1bc5 --- /dev/null +++ b/conf/cmi/block.block.claro_help.yml @@ -0,0 +1,22 @@ +uuid: d7572062-232b-44d4-9859-38c31b932ee9 +langcode: en +status: true +dependencies: + module: + - help + theme: + - claro +_core: + default_config_hash: jccFSSVqV0WCDb6NtML1VWAWTtDbZ-zn5YgTRMgMrIM +id: claro_help +theme: claro +region: help +weight: 0 +provider: null +plugin: help_block +settings: + id: help_block + label: Help + label_display: '0' + provider: help +visibility: { } diff --git a/conf/cmi/block.block.gin_help.yml b/conf/cmi/block.block.gin_help.yml new file mode 100644 index 00000000..61bc857a --- /dev/null +++ b/conf/cmi/block.block.gin_help.yml @@ -0,0 +1,22 @@ +uuid: 9b9f3047-a6df-4f35-8542-ead96c35a1c7 +langcode: en +status: true +dependencies: + module: + - help + theme: + - gin +_core: + default_config_hash: 8nOAry2oKqJOr0zbrlJ3sZHDFJLIO6j-0vT0K_TYca4 +id: gin_help +theme: gin +region: help +weight: 0 +provider: null +plugin: help_block +settings: + id: help_block + label: Help + label_display: '0' + provider: help +visibility: { } diff --git a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml index 5e5aec15..054e98a1 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml @@ -2,8 +2,6 @@ uuid: b95230b8-fb95-4373-b877-6117cf4d0f46 langcode: en status: true dependencies: - config: - - field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id module: - external_entities _core: @@ -13,14 +11,6 @@ targetEntityType: helfi_news_groups bundle: helfi_news_groups mode: default content: - field_frontpage_term_id: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } title: type: string_textfield weight: -5 @@ -29,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index fb3d0442..87f00b83 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -2,8 +2,6 @@ uuid: d13089ef-9704-4770-90a9-fd9fedc50405 langcode: en status: true dependencies: - config: - - field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id module: - external_entities _core: @@ -13,14 +11,6 @@ targetEntityType: helfi_news_neighbourhoods bundle: helfi_news_neighbourhoods mode: default content: - field_frontpage_term_id: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } title: type: string_textfield weight: -5 @@ -29,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml index b958c404..eed8c213 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml @@ -2,8 +2,6 @@ uuid: 972acdae-8e71-4d12-a335-bc91828f4851 langcode: en status: true dependencies: - config: - - field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id module: - external_entities _core: @@ -13,14 +11,6 @@ targetEntityType: helfi_news_tags bundle: helfi_news_tags mode: default content: - field_frontpage_term_id: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } title: type: string_textfield weight: -5 @@ -29,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml index 7c71202d..bf9771d0 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml @@ -2,8 +2,6 @@ uuid: 045f335b-7059-4d6a-9240-43909f3c1704 langcode: en status: true dependencies: - config: - - field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id module: - external_entities _core: @@ -22,5 +20,5 @@ content: weight: 0 region: content hidden: - field_frontpage_term_id: true search_api_excerpt: true + tid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index 91cbb10b..911deca1 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -2,8 +2,6 @@ uuid: f8d0f0da-4aff-436c-a4b8-4df8c6ee82f8 langcode: en status: true dependencies: - config: - - field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id module: - external_entities _core: @@ -22,5 +20,5 @@ content: weight: 0 region: content hidden: - field_frontpage_term_id: true search_api_excerpt: true + tid: true diff --git a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml index 9fc40811..af9d45f2 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml @@ -2,8 +2,6 @@ uuid: 7060dc64-5f95-4fa5-8046-bf0ad5e265c4 langcode: en status: true dependencies: - config: - - field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id module: - external_entities _core: @@ -22,5 +20,5 @@ content: weight: 0 region: content hidden: - field_frontpage_term_id: true search_api_excerpt: true + tid: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 44f86045..79c088ea 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -11,7 +11,6 @@ module: ckeditor5: 0 ckeditor5_paste_filter: 0 config: 0 - config_filter: 0 config_ignore: 0 config_rewrite: 0 config_translation: 0 @@ -83,6 +82,7 @@ module: helfi_tpr_config: 0 helfi_tunnistamo: 0 helfi_user_roles: 0 + help: 0 image: 0 image_style_quality: 0 imagecache_external: 0 diff --git a/conf/cmi/editoria11y.configuration.yml b/conf/cmi/editoria11y.configuration.yml deleted file mode 100644 index 5e278f6d..00000000 --- a/conf/cmi/editoria11y.configuration.yml +++ /dev/null @@ -1,3 +0,0 @@ -ed11y_theme: lightTheme -disable_sync: false -preserve_params: 'search,keys,page,language,language_content_entity' diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index 21ab788a..139ce530 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -3,37 +3,40 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: 3cezkDpNnpY89NCorCj-4mBIeItsVAEG803y-phaZTM + default_config_hash: daIUGTR2nijXztOFPGoKZP9hdqNwUXU1g1Iksa29Rxo id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' +generate_aliases: false read_only: true -generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: "$.attributes['title']" - main_image: - uri: "$.relationships['main_image']['data']['relationships']['media_image']['data']['attributes']['uri']['url']" - title: "$.relationships['main_image']['data']['relationships']['media_image']['data']['meta']['alt']" + value: '$._source.title[0]' + tags_uuid: + value: '$._source.news_tags_uuid[*]' tags: - value: "$.relationships['tags']['data'][*]['attributes']['name']" + value: '$._source.field_news_item_tags[*]' groups: - value: "$.relationships['groups']['data'][*]['attributes']['name']" + value: '$._source.field_news_groups[*]' + groups_uuid: + value: '$._source.news_groups_uuid[*]' neighbourhoods: - value: "$.relationships['neighbourhoods']['data'][*]['attributes']['name']" + value: '$._source.field_news_neighbourhoods[*]' + neighbourhoods_uuid: + value: '$._source.neighbourhoods_uuid[*]' node_url: - value: "$.attributes['path']['alias']" + value: '$._source.url[0]' published_at: - value: "$.attributes['published_at']" + value: '$._source.published_at[0]' short_title: - value: "$.attributes['short_title']" + value: '$._source.short_title[0]' storage_client_id: helfi_news storage_client_config: { } persistent_cache_max_age: 1800 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index a5e96c1f..db83d336 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -3,24 +3,24 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: U7yZGEsFvk5UxcRUripTm4JXrM9_gU_UV1aMQ8986a4 + default_config_hash: 1KCEz52lFemwPMfVitwlGcbzmkcAJPGSSe6loUbVJc8 id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: '$.attributes["name"]' - field_frontpage_term_id: - value: '$.attributes["drupal_internal__tid"]' + value: '$._source.name[0]' + tid: + value: '$._source.tid[0]' storage_client_id: helfi_news_groups storage_client_config: { } persistent_cache_max_age: 86400 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 40197578..2f99e033 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -3,24 +3,24 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: tM9Z1SfXjTcoCvjFIESPPl2sya7IyIQ9kZ-zQFFNppU + default_config_hash: 5s8g-adBsUuIIMte5BCEwSFlQjxwFJ_Gq2Do7EEwq2E id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: '$.attributes["name"]' - field_frontpage_term_id: - value: '$.attributes["drupal_internal__tid"]' + value: '$._source.name[0]' + tid: + value: '$._source.tid[0]' storage_client_id: helfi_news_neighbourhoods storage_client_config: { } persistent_cache_max_age: 86400 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 573d5c52..ee5a23ee 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -3,24 +3,24 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: LOL9fkfvgT6MB8SjNXI0WXRQqedWBH2oV7g4gfQjkuc + default_config_hash: vs16WpCdsWseKb-U81zRJbzykB25mE69iOEXv4ZhxCM id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: id: - value: $.id + value: '$._source.uuid_langcode[0]' uuid: - value: $.id + value: '$._source.uuid[0]' title: - value: '$.attributes["name"]' - field_frontpage_term_id: - value: '$.attributes["drupal_internal__tid"]' + value: '$._source.name[0]' + tid: + value: '$._source.tid[0]' storage_client_id: helfi_news_tags storage_client_config: { } persistent_cache_max_age: 86400 diff --git a/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml deleted file mode 100644 index a51e18ab..00000000 --- a/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 42a81125-44b7-45d8-b676-46a27a7dbc07 -langcode: en -status: true -dependencies: - config: - - field.storage.helfi_news_groups.field_frontpage_term_id - module: - - external_entities -_core: - default_config_hash: HB3lPK7ZdS9DZrpuk_0u_uxhvGdVwBQufeLISCVeyG4 -id: helfi_news_groups.helfi_news_groups.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_groups -bundle: helfi_news_groups -label: 'Frontpage term id' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml deleted file mode 100644 index a91a4319..00000000 --- a/conf/cmi/field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: eff4aa71-c0d3-470c-aa37-86ff0b3ef5b7 -langcode: en -status: true -dependencies: - config: - - field.storage.helfi_news_neighbourhoods.field_frontpage_term_id - module: - - external_entities -_core: - default_config_hash: M1Kwl-JPBcmBgWPZoM0n3LL-U4tsgeRVigror_ggJ6k -id: helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_neighbourhoods -bundle: helfi_news_neighbourhoods -label: 'Frontpage term id' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml deleted file mode 100644 index 219199f8..00000000 --- a/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: f6923133-8d94-49ec-a95c-48fadc1391ab -langcode: en -status: true -dependencies: - config: - - field.storage.helfi_news_tags.field_frontpage_term_id - module: - - external_entities -_core: - default_config_hash: yL10FWYxH4QZnzsm1DGdoh0-TQTErUeZukz_M_S1Gz4 -id: helfi_news_tags.helfi_news_tags.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_tags -bundle: helfi_news_tags -label: 'Frontpage term id' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml index 44ecdcf7..84d41250 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_helfi_news_groups - paragraphs.paragraphs_type.news_list _core: - default_config_hash: nmozVFbkBc-ubKtpWG_OgdeT4yNxsLcsbBYaGDHRnUQ + default_config_hash: r2rQghOD9sgt6njK6kYTkRi6vHRKoshKBhS6eXAj2_0 id: paragraph.news_list.field_helfi_news_groups field_name: field_helfi_news_groups entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml index b7d19477..7b7dea04 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_helfi_news_neighbourhoods - paragraphs.paragraphs_type.news_list _core: - default_config_hash: If5nJKeaunQ7ITUWZ4daCyykb7mslZDLTVrLX7Gd1Qw + default_config_hash: ZyD4oFSt-0k-wITi8xejPiJQM_pMGPGBgtyMkd4yzYI id: paragraph.news_list.field_helfi_news_neighbourhoods field_name: field_helfi_news_neighbourhoods entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml index 020596a8..20a5e967 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_helfi_news_tags - paragraphs.paragraphs_type.news_list _core: - default_config_hash: imhJdbO9eLYZPslj0VosAANrRZBizg4wyPgIYQ3SOXc + default_config_hash: tfWJCTuuqYCedZj4qD0LfgjK99kSKhDbEuW8ziVcwnM id: paragraph.news_list.field_helfi_news_tags field_name: field_helfi_news_tags entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_limit.yml b/conf/cmi/field.field.paragraph.news_list.field_limit.yml index 8c61fd38..e583bfaf 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_limit.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_limit.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_limit - paragraphs.paragraphs_type.news_list _core: - default_config_hash: U69lOLLSGh16cOtXvhZr3E_x2lmlZOfxD0CmQeIMb6U + default_config_hash: 4kAYV9U8y3qkYQKOzN40EOym0oqgr0IqaNJeaLgTwSs id: paragraph.news_list.field_limit field_name: field_limit entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml index c4149fc2..1d4a38e1 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml @@ -13,7 +13,7 @@ third_party_settings: allowed_formats: - minimal _core: - default_config_hash: 7yDWmbqqH_qTaQ4iyJ6QTLaEcqUnL0oVp-t1huDnK_g + default_config_hash: Ba7omOgoQ1RguPjBSpjtpx8YqwE5BXBoNRVs_eQzNRQ id: paragraph.news_list.field_news_list_description field_name: field_news_list_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml index ed8556f6..d9dc2b5e 100644 --- a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_news_list_title - paragraphs.paragraphs_type.news_list _core: - default_config_hash: BVbXiEVCf8X8ZJUYKyiiyevct1RogayM-YXEWiSnuDw + default_config_hash: RDGC7tc3EzJDFQyJSUHpJc8vP__9Q6BJ27icD5o4APY id: paragraph.news_list.field_news_list_title field_name: field_news_list_title entity_type: paragraph diff --git a/conf/cmi/field.storage.helfi_news_groups.field_frontpage_term_id.yml b/conf/cmi/field.storage.helfi_news_groups.field_frontpage_term_id.yml deleted file mode 100644 index c5bc8c1c..00000000 --- a/conf/cmi/field.storage.helfi_news_groups.field_frontpage_term_id.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: c62ebe15-2cb6-4553-b00d-3c21a0c1033b -langcode: en -status: true -dependencies: - module: - - external_entities -_core: - default_config_hash: b992_ctKi8x2uXo88S2tFAxA93ZE0BXLdaTCeEictWk -id: helfi_news_groups.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_groups -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/field.storage.helfi_news_neighbourhoods.field_frontpage_term_id.yml b/conf/cmi/field.storage.helfi_news_neighbourhoods.field_frontpage_term_id.yml deleted file mode 100644 index 1561ccda..00000000 --- a/conf/cmi/field.storage.helfi_news_neighbourhoods.field_frontpage_term_id.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: aee9a7c0-c5e1-40eb-a2a6-f89250953161 -langcode: en -status: true -dependencies: - module: - - external_entities -_core: - default_config_hash: X6qvfKybqnwfeHyr_f5PzxdXg9ihP8D-ryRes0_wh7Q -id: helfi_news_neighbourhoods.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_neighbourhoods -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/field.storage.helfi_news_tags.field_frontpage_term_id.yml b/conf/cmi/field.storage.helfi_news_tags.field_frontpage_term_id.yml deleted file mode 100644 index f8cfad43..00000000 --- a/conf/cmi/field.storage.helfi_news_tags.field_frontpage_term_id.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 636d25cf-d069-4660-bce2-10059bb6c5fe -langcode: en -status: true -dependencies: - module: - - external_entities -_core: - default_config_hash: PkhrfcRaL2lqTDnoXDNoge-nlPEfXT6WGBZyKIFahqs -id: helfi_news_tags.field_frontpage_term_id -field_name: field_frontpage_term_id -entity_type: helfi_news_tags -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml index e1663f98..60781dff 100644 --- a/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml @@ -6,7 +6,7 @@ dependencies: - external_entities - paragraphs _core: - default_config_hash: _fM_KH15dd3VWM1oQkpfJUipPHD3pK-CiqLPcuj5ssQ + default_config_hash: wq65JaPUw7t2ky47ukc-A2jTYVFxzQYWTyIMKvVWqy4 id: paragraph.field_helfi_news_groups field_name: field_helfi_news_groups entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml index ece20346..a5371ace 100644 --- a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml @@ -6,7 +6,7 @@ dependencies: - external_entities - paragraphs _core: - default_config_hash: VVgm-VdlvDCYm-mIewtHi0RZp_7pCoE94esxuAat4CE + default_config_hash: hy1Tpmlf5WcTYBFp3oNoXSb5W-PJnpZGdxFL3PBi_b8 id: paragraph.field_helfi_news_neighbourhoods field_name: field_helfi_news_neighbourhoods entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml index da56a0a5..ef592546 100644 --- a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml @@ -6,7 +6,7 @@ dependencies: - external_entities - paragraphs _core: - default_config_hash: nWHDiteOOAcjVLeo90MtcJBVL0ABYuABPztRIvhiv_0 + default_config_hash: V9NNGo5t1lmcXJDwJC4J7KKMQ_xFClm35zZNiIcgjDg id: paragraph.field_helfi_news_tags field_name: field_helfi_news_tags entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_limit.yml b/conf/cmi/field.storage.paragraph.field_limit.yml index fa4c1ec2..a22e8bc0 100644 --- a/conf/cmi/field.storage.paragraph.field_limit.yml +++ b/conf/cmi/field.storage.paragraph.field_limit.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: BN27jqBir0CqxJ0z1RtYc8WNNohSkDdtzv_9l-HRKhk + default_config_hash: UY9Qakkj3TBaF4CVQe9dOaOcUHeggIBAwDWE1nNRROk id: paragraph.field_limit field_name: field_limit entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_news_list_description.yml b/conf/cmi/field.storage.paragraph.field_news_list_description.yml index 1fb411d3..c7afee77 100644 --- a/conf/cmi/field.storage.paragraph.field_news_list_description.yml +++ b/conf/cmi/field.storage.paragraph.field_news_list_description.yml @@ -6,7 +6,7 @@ dependencies: - paragraphs - text _core: - default_config_hash: V_erLPi4c9bT-uhAlgcpJJX8LbR02Btsi8yzMVAIpo4 + default_config_hash: BA64kRk5MQLN_q3GY18R5uWkGRpH6NUZuEBGh4WfWdc id: paragraph.field_news_list_description field_name: field_news_list_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_news_list_title.yml b/conf/cmi/field.storage.paragraph.field_news_list_title.yml index 60321231..99faaa12 100644 --- a/conf/cmi/field.storage.paragraph.field_news_list_title.yml +++ b/conf/cmi/field.storage.paragraph.field_news_list_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: xapLq-jZodnhyWktgf76RTu9dEBAgWBq-ay41DJpsXQ + default_config_hash: 9nFZzI_rcVVomJTSrdrbAkvTkwFwTcwMjUpMP0fafMo id: paragraph.field_news_list_title field_name: field_news_list_title entity_type: paragraph diff --git a/conf/cmi/language/fi/block.block.claro_help.yml b/conf/cmi/language/fi/block.block.claro_help.yml new file mode 100644 index 00000000..3eee39c5 --- /dev/null +++ b/conf/cmi/language/fi/block.block.claro_help.yml @@ -0,0 +1,2 @@ +settings: + label: Ohje diff --git a/conf/cmi/language/fi/block.block.gin_help.yml b/conf/cmi/language/fi/block.block.gin_help.yml new file mode 100644 index 00000000..3eee39c5 --- /dev/null +++ b/conf/cmi/language/fi/block.block.gin_help.yml @@ -0,0 +1,2 @@ +settings: + label: Ohje diff --git a/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_groups.yml new file mode 100644 index 00000000..c804c15e --- /dev/null +++ b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_groups.yml @@ -0,0 +1,2 @@ +label: 'Uutisten kohderyhmät' +label_plural: 'Uutisten kohderyhmät' diff --git a/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..13ece827 --- /dev/null +++ b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -0,0 +1,2 @@ +label: 'Uutisten kaupunginosat' +label_plural: 'Uutisten kaupunginosat' diff --git a/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_tags.yml new file mode 100644 index 00000000..3a0e5707 --- /dev/null +++ b/conf/cmi/language/fi/external_entities.external_entity_type.helfi_news_tags.yml @@ -0,0 +1,2 @@ +label: 'Uutisten tagit' +label_plural: 'Uutisten tagit' diff --git a/conf/cmi/language/sv/block.block.claro_help.yml b/conf/cmi/language/sv/block.block.claro_help.yml new file mode 100644 index 00000000..ac934b00 --- /dev/null +++ b/conf/cmi/language/sv/block.block.claro_help.yml @@ -0,0 +1,2 @@ +settings: + label: Hjälp diff --git a/conf/cmi/language/sv/block.block.gin_help.yml b/conf/cmi/language/sv/block.block.gin_help.yml new file mode 100644 index 00000000..ac934b00 --- /dev/null +++ b/conf/cmi/language/sv/block.block.gin_help.yml @@ -0,0 +1,2 @@ +settings: + label: Hjälp diff --git a/conf/cmi/paragraphs.paragraphs_type.news_list.yml b/conf/cmi/paragraphs.paragraphs_type.news_list.yml index 50779f43..715a5ffe 100644 --- a/conf/cmi/paragraphs.paragraphs_type.news_list.yml +++ b/conf/cmi/paragraphs.paragraphs_type.news_list.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: 4NG1c_DFfBfzUCPfnwS5Sneo_G7lU_0YRfarh-p749M + default_config_hash: GqSJkJJNFYj7_Yrzletng06pW-sS9r0nS5BeDi8Q69w id: news_list label: 'News list' icon_uuid: null diff --git a/docker/elastic-proxy/elastic.conf b/docker/elastic-proxy/elastic.conf new file mode 100644 index 00000000..89203d0c --- /dev/null +++ b/docker/elastic-proxy/elastic.conf @@ -0,0 +1,26 @@ +server { + listen 8080 default_server; + server_name _; + client_max_body_size 50m; + + location /ping { + add_header Content-Type application/json; + return 200 '{"status":"success","result":"Proxy alive"}'; + } + + location ~ ^/([a-z][a-z_-]*)/(_search|_msearch)$ { + limit_except GET POST { + deny all; + } + proxy_pass ${ELASTICSEARCH_URL}; + proxy_redirect off; + proxy_set_header Authorization $elastic_authorization; + proxy_pass_header Authorization; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_pass_header Access-Control-Allow-Origin; + proxy_pass_header Access-Control-Allow-Methods; + proxy_hide_header Access-Control-Allow-Headers; + } +} diff --git a/docker/elastic-proxy/nginx.conf b/docker/elastic-proxy/nginx.conf new file mode 100644 index 00000000..b3eb4c1d --- /dev/null +++ b/docker/elastic-proxy/nginx.conf @@ -0,0 +1,60 @@ +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /tmp/nginx.pid; + +env ELASTICSEARCH_URL; +env ELASTIC_PASSWORD; +env ELASTIC_USER; + +load_module modules/ngx_http_perl_module.so; + +events { + worker_connections 1024; +} + +http { + proxy_temp_path /tmp/proxy_temp; + client_body_temp_path /tmp/client_temp; + fastcgi_temp_path /tmp/fastcgi_temp; + uwsgi_temp_path /tmp/uwsgi_temp; + scgi_temp_path /tmp/scgi_temp; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + perl_set $elastic_authorization ' + sub { + use MIME::Base64; + if (exists($ENV{"ELASTIC_USER"}) && exists($ENV{"ELASTIC_PASSWORD"})) { + return encode_base64($ENV{"ELASTIC_USER"} . ":" . $ENV{"ELASTIC_PASSWORD"}); + } + return ""; + } + '; + + # Log in JSON Format + log_format nginxlog_json escape=json '{ "timestamp": "$time_iso8601", ' + '"remote_addr": "$remote_addr", ' + '"body_bytes_sent": $body_bytes_sent, ' + '"request_time": $request_time, ' + '"response_status": $status, ' + '"request": "$request", ' + '"request_method": "$request_method", ' + '"host": "$host",' + '"upstream_addr": "$upstream_addr",' + '"http_x_forwarded_for": "$http_x_forwarded_for",' + '"http_referrer": "$http_referer", ' + '"http_user_agent": "$http_user_agent", ' + '"http_version": "$server_protocol", ' + '"nginx_access": true }'; + access_log /dev/stdout nginxlog_json; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh index 6a098241..4c02d6f1 100644 --- a/docker/openshift/entrypoints/20-deploy.sh +++ b/docker/openshift/entrypoints/20-deploy.sh @@ -1,5 +1,11 @@ #!/bin/bash +# Skip deployment script if ENV var is true +if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then + echo "SKIP_DEPLOY_SCRIPTS is true. Skipping the steps." + return +fi + source /init.sh function rollback_deployment { @@ -36,10 +42,9 @@ if [ "$CURRENT_DEPLOY_ID" != "$OPENSHIFT_BUILD_NAME" ]; then # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md drush helfi:pre-deploy || true # Run maintenance tasks (config import, database updates etc) - drush deploy - + OUTPUT=$(sh -c '(drush deploy); exit $?' 2>&1) if [ $? -ne 0 ]; then - rollback_deployment "drush deploy failed with {$?} exit code. See logs for more information." $CURRENT_DEPLOY_ID + rollback_deployment "drush deploy failed with {$?} exit code. ${OUTPUT}" $CURRENT_DEPLOY_ID exit 1 fi # Run post-deploy tasks. diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 00000000..cff028e4 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,12 @@ + + + + *.css + *.js + + + + + + +