From 2d4d060ee123c2cdaa9c27df541f9ca99075046d Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 15 Dec 2024 12:07:00 +0000 Subject: [PATCH 1/9] Updated node modules based on npm audit fix --- .../themes/custom/hdbt_subtheme/package-lock.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index aaf9cba1..1ca1f732 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -6849,15 +6849,16 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -15655,9 +15656,9 @@ "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==" }, "nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==" }, "natural-compare": { "version": "1.4.0", From 7f550e11dcb3191af51b9f1b457812daf3b6063a Mon Sep 17 00:00:00 2001 From: tuutti Date: Fri, 20 Dec 2024 10:00:09 +0200 Subject: [PATCH 2/9] UHF-11137: Reusable workflows --- .github/workflows/artifact.yml | 35 +--------- .github/workflows/test.yml | 76 +------------------- .github/workflows/update-config.yml | 104 +--------------------------- 3 files changed, 5 insertions(+), 210 deletions(-) diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index 969bfa81..c964e0b2 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -7,37 +7,4 @@ on: name: Build artifacts jobs: build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Install and start Stonehenge - run: | - git clone -b 5.x https://github.com/druidfi/stonehenge.git ~/stonehenge - cd ~/stonehenge && make up - - # This must be done after we start Stonehenge. - - name: Setup Docker compose environment variables - run: | - echo "COMPOSE_FILE=compose.yaml:compose.ci.yaml" >> $GITHUB_ENV - - - name: Start project - run: make up - - - name: Build project - run: docker compose exec app bash -c "composer install --no-interaction" - - - name: Setup drupal and save database dump - run: | - docker compose exec app bash -c "drush si -y && drush cr" - docker compose exec app bash -c "drush si --existing-config -y" - docker compose exec app bash -c "drush cr" - docker compose exec app bash -c "drush cim -y" - docker compose exec app bash -c "drush sql-dump --result-file=/app/latest.sql" - - - name: Upload latest database dump - uses: actions/upload-artifact@v4 - with: - name: latest.sql - path: latest.sql - retention-days: 10 + uses: city-of-helsinki/drupal-gh-actions/.github/workflows/build-artifact.yml@main diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 232aff57..33177f0a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,78 +5,4 @@ on: name: CI jobs: tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Make sure configuration was exported in correct language (en or und) - run: | - OUTPUT=$(grep -oP '^langcode: \b(?!(?:en|und)\b)\w+' conf -R || true) - - if [ ! -z "$OUTPUT" ]; then - echo "Found configuration that does not match the pattern 'langcode: (en|und)':" >> $GITHUB_STEP_SUMMARY - echo "$OUTPUT" >> $GITHUB_STEP_SUMMARY - exit 1 - fi - - - name: Install and start Stonehenge - run: | - git clone -b 5.x https://github.com/druidfi/stonehenge.git ~/stonehenge - cd ~/stonehenge && make up - - # This must be done after we start Stonehenge. - - name: Setup Docker compose environment variables - run: | - echo "COMPOSE_FILE=compose.yaml:compose.ci.yaml" >> $GITHUB_ENV - echo "COMPOSE_PROFILES=" >> $GITHUB_ENV - - - name: Start project - run: make up - - - name: Build project - run: docker compose exec app bash -c "composer install --no-interaction" - - - name: Scan security updates - run: docker compose exec app bash -c "composer audit" - - - name: Check that subtheme is not built with dev mode - run: docker compose exec app bash -c "if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi" - - - name: Run PHPCS - run: | - docker compose exec app bash -c "vendor/bin/phpcs public/modules/custom/" - docker compose exec app bash -c "vendor/bin/phpcs public/themes/custom/" - - - name: Run phpstan - run: docker compose exec app bash -c "vendor/bin/phpstan analyze" - - - name: Download latest dump - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: gh run download -n latest.sql - - - name: Install Drupal - run: | - docker compose exec app bash -c "mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql" - docker compose exec app bash -c "drush deploy" - - - name: Run PHPUnit tests - run: | - docker compose exec app bash -c "mkdir -p /app/results" - - if [ -d "tests/" ]; then - docker compose exec app bash -c "composer test-php tests/" - fi - docker compose exec app bash -c "composer test-php public/modules/custom" - - - name: Export logs - if: always() - run: docker compose logs app > results/service.log - - - name: Create an artifact from test report - uses: actions/upload-artifact@v4 - if: always() - with: - name: results - path: results/ - retention-days: 1 + uses: city-of-helsinki/drupal-gh-actions/.github/workflows/project-tests.yml@main diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 64af8562..f8e0cf0a 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -3,106 +3,8 @@ on: repository_dispatch: types: [config_change] name: Update config -env: - GH_TOKEN: ${{ github.token }} jobs: update-config: - runs-on: ubuntu-latest - container: - image: ghcr.io/city-of-helsinki/drupal-web:8.3 - options: --hostname app --user 1001 - services: - db: - image: mysql:8 - env: - MYSQL_USER: drupal - MYSQL_PASSWORD: drupal - MYSQL_DATABASE: drupal - MYSQL_ROOT_PASSWORD: drupal - ports: - - 3306:3306 - - steps: - - uses: actions/checkout@v4 - - - name: Check if required secrets are set - env: - AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }} - if: env.AUTOMATIC_UPDATE_TOKEN == '' - run: exit 1 - - - name: Download latest dump - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh run download -n latest.sql - - - name: Prepare setup - run: | - # We install Drupal from existing dump, so locale_install() hook - # is never fired. Make sure the translations folder exists. - mkdir -p public/sites/default/files/translations -p - - - name: Build project - run: | - composer install --no-interaction - $(drush sql:connect) < latest.sql - drush cim -y && drush updb -y && drush cr - composer update drupal/helfi_* drupal/hdbt* -W --no-interaction - drush cr - - # Update translations from localize.drupal.org and helfi-modules - # before running update hooks to reduce clutter in configuration files. - drush locale:check && drush locale:update - drush updb -y - - # Update translations from helfi_platform_config. These translations - # consists of overrides for non customised translations and will - # override current translation with a non customised translation. - drush helfi:locale-import helfi_platform_config - drush cex -y - - # Update platform - drush helfi:tools:update-platform - - - name: Check module versions - id: module-status - run: | - MODE="delete" - drush helfi:tools:check-composer-versions $GITHUB_WORKSPACE/composer.lock --format=markdown_table >> $GITHUB_STEP_SUMMARY && EXIT_CODE=$? || EXIT_CODE=$? - if [ "$EXIT_CODE" -eq 3 ]; then - MODE="upsert" - echo " " >> $GITHUB_STEP_SUMMARY - echo ":warning: Failed to install the latest version of the packages listed above" >> $GITHUB_STEP_SUMMARY - echo " " >> $GITHUB_STEP_SUMMARY - echo "Please run \`composer why-not drupal/package_name package_version\` to see why." >> $GITHUB_STEP_SUMMARY - fi - echo "MODE=$MODE" >> $GITHUB_OUTPUT - cat $GITHUB_STEP_SUMMARY > /tmp/pr-message.txt - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 - with: - commit-message: Update configuration - token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }} - title: Automatic update - labels: auto-update - body: | - - Updated active configuration. - - Updated platform - branch: update-configuration - - - name: Attempt to find PR - env: - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - id: find-pr - run: echo "number=$(gh pr list --base ${BRANCH_NAME} --head update-configuration --json number --jq '.[].number')" >> $GITHUB_OUTPUT - - - name: Comment PR - uses: thollander/actions-comment-pull-request@v2 - if: ${{ steps.find-pr.outputs.number != '' }} - with: - comment_tag: status - mode: ${{ steps.module-status.outputs.MODE }} - filePath: /tmp/pr-message.txt - pr_number: ${{ steps.find-pr.outputs.number }} + uses: city-of-helsinki/drupal-gh-actions/.github/workflows/update-config.yml@main + secrets: + automatic_update_token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }} From 6e8d783eecdc378e4e9f5c7e62eeffc1634aa56f Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:54:27 +0000 Subject: [PATCH 3/9] Update configuration --- composer.lock | 88 ++++++++++++++-------------- conf/cmi/openid_connect.settings.yml | 6 +- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/composer.lock b/composer.lock index 876cf0b1..3e0f9322 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": "0ac0a7f7864438bc25605df626ac0ebc", + "content-hash": "09e15ba9edfe49fcaf51635c559ef7ef", "packages": [ { "name": "asm89/stack-cors", @@ -2257,16 +2257,16 @@ }, { "name": "drupal/core", - "version": "10.3.10", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" + "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", - "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", + "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", "shasum": "" }, "require": { @@ -2312,7 +2312,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.14.2" + "twig/twig": "^3.15.0" }, "conflict": { "drush/drush": "<12.4.3" @@ -2415,22 +2415,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.3.10" + "source": "https://github.com/drupal/core/tree/10.4.0" }, - "time": "2024-11-22T12:51:33+00:00" + "time": "2024-12-17T22:18:01+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.10", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc" + "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/f58ab5c0d02d275c5aa226c4505b457e41b161cc", - "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/db17b59620ce1c142a34dc017d9e696ce4771e55", + "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55", "shasum": "" }, "require": { @@ -2465,9 +2465,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" }, - "time": "2024-08-22T14:31:34+00:00" + "time": "2024-08-22T14:31:30+00:00" }, { "name": "drupal/crop", @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.23", + "version": "6.8.26", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511" + "reference": "2b18785a8ed788b658240efe7d38b5ec2a98ab6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b14bd481f81a0be27eaf3ab2a1db0c2a86c66511", - "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2b18785a8ed788b658240efe7d38b5ec2a98ab6c", + "reference": "2b18785a8ed788b658240efe7d38b5ec2a98ab6c", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.23", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.26", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-17T07:20:53+00:00" + "time": "2024-12-20T11:24:30+00:00" }, { "name": "drupal/hdbt_admin", @@ -4418,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.5", + "version": "4.11.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "7c52e541f43948f3ad5603a07690f946c6604241" + "reference": "73e3050ba224d40ce93e8eb4752e7af4a6bc6a72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7c52e541f43948f3ad5603a07690f946c6604241", - "reference": "7c52e541f43948f3ad5603a07690f946c6604241", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/73e3050ba224d40ce93e8eb4752e7af4a6bc6a72", + "reference": "73e3050ba224d40ce93e8eb4752e7af4a6bc6a72", "shasum": "" }, "require": { @@ -4496,9 +4496,8 @@ "ruflin/elastica": "^8.0" }, "conflict": { - "drupal/core": ">=10.4.0", - "drupal/core-composer-scaffold": ">=10.4.0", - "drupal/core-dev": ">=10.4.0", + "drupal/core": "<10.4", + "drupal/core-composer-scaffold": "<10.4", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/default_content": ">2.0.0-alpha2", "drupal/gin_toolbar": ">1.0.0-rc6", @@ -4524,8 +4523,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-08-08/3083786--mr-8066--10-3-backport.patch", - "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.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" @@ -4554,10 +4552,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.11.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-18T08:08:55+00:00" + "time": "2024-12-19T09:33:02+00:00" }, { "name": "drupal/helfi_proxy", @@ -4648,16 +4646,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.9", + "version": "3.0.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "8a489629636fef00d5fab73009b37a4b6fb7a266" + "reference": "13b645c119dc15b4707b31cde55baeb4a41dd29b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/8a489629636fef00d5fab73009b37a4b6fb7a266", - "reference": "8a489629636fef00d5fab73009b37a4b6fb7a266", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/13b645c119dc15b4707b31cde55baeb4a41dd29b", + "reference": "13b645c119dc15b4707b31cde55baeb4a41dd29b", "shasum": "" }, "require": { @@ -4674,10 +4672,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-09-03T07:23:36+00:00" + "time": "2024-12-20T10:35:33+00:00" }, { "name": "drupal/image_style_quality", @@ -7885,16 +7883,16 @@ }, { "name": "elasticsearch/elasticsearch", - "version": "v8.16.0", + "version": "v8.17.0", "source": { "type": "git", "url": "https://github.com/elastic/elasticsearch-php.git", - "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85" + "reference": "6cd0fe6a95fdb7198a2795624927b094813b3d8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85", - "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/6cd0fe6a95fdb7198a2795624927b094813b3d8b", + "reference": "6cd0fe6a95fdb7198a2795624927b094813b3d8b", "shasum": "" }, "require": { @@ -7937,9 +7935,9 @@ ], "support": { "issues": "https://github.com/elastic/elasticsearch-php/issues", - "source": "https://github.com/elastic/elasticsearch-php/tree/v8.16.0" + "source": "https://github.com/elastic/elasticsearch-php/tree/v8.17.0" }, - "time": "2024-11-14T22:23:33+00:00" + "time": "2024-12-18T11:00:27+00:00" }, { "name": "ezyang/htmlpurifier", @@ -12481,8 +12479,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { diff --git a/conf/cmi/openid_connect.settings.yml b/conf/cmi/openid_connect.settings.yml index 6dd0f01a..aa0b430c 100644 --- a/conf/cmi/openid_connect.settings.yml +++ b/conf/cmi/openid_connect.settings.yml @@ -9,8 +9,4 @@ redirect_login: user redirect_logout: '' userinfo_mappings: timezone: zoneinfo -role_mappings: - read_only: { } - content_producer: { } - editor: { } - admin: { } +role_mappings: { } From 45d91fc4e844d906378038f2f797c559a1aae258 Mon Sep 17 00:00:00 2001 From: teroelonen <2276077+teroelonen@users.noreply.github.com> Date: Wed, 8 Jan 2025 08:11:35 +0000 Subject: [PATCH 4/9] Update configuration --- composer.lock | 255 +++++++++--------- ...ay.paragraph.unit_contact_card.default.yml | 12 +- ...ay.paragraph.unit_contact_card.default.yml | 13 +- conf/cmi/editoria11y.settings.yml | 10 +- ...ontact_card.field_unit_contact_heading.yml | 25 ++ ..._contact_card.field_unit_contact_title.yml | 21 -- ...e.paragraph.field_unit_contact_heading.yml | 29 ++ ...age.paragraph.field_unit_contact_title.yml | 23 -- conf/cmi/file.settings.yml | 2 +- ...ontact_card.field_unit_contact_heading.yml | 2 + ...e.paragraph.field_unit_contact_heading.yml | 6 + ...ontact_card.field_unit_contact_heading.yml | 1 + ..._contact_card.field_unit_contact_title.yml | 1 - conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- 19 files changed, 213 insertions(+), 201 deletions(-) create mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml delete mode 100644 conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml create mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_heading.yml delete mode 100644 conf/cmi/field.storage.paragraph.field_unit_contact_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml create mode 100644 conf/cmi/language/fi/field.storage.paragraph.field_unit_contact_heading.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml delete mode 100644 conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml diff --git a/composer.lock b/composer.lock index 3e0f9322..806d4aee 100644 --- a/composer.lock +++ b/composer.lock @@ -1757,7 +1757,7 @@ "homepage": "https://www.drupal.org/user/86106" }, { - "name": "Centarro", + "name": "centarro", "homepage": "https://www.drupal.org/user/3661446" }, { @@ -2257,16 +2257,16 @@ }, { "name": "drupal/core", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" + "reference": "0aeb6303b33d813a68ea78c40466715d9fcfac46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "url": "https://api.github.com/repos/drupal/core/zipball/0aeb6303b33d813a68ea78c40466715d9fcfac46", + "reference": "0aeb6303b33d813a68ea78c40466715d9fcfac46", "shasum": "" }, "require": { @@ -2415,13 +2415,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.4.0" + "source": "https://github.com/drupal/core/tree/10.4.1" }, - "time": "2024-12-17T22:18:01+00:00" + "time": "2025-01-06T23:26:38+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2465,7 +2465,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.1" }, "time": "2024-08-22T14:31:30+00:00" }, @@ -2901,17 +2901,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.21", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.21" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.21.zip", - "reference": "2.1.21", - "shasum": "6ec1bb5cfa15408e3372d7e0d0a1355030a9f20b" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.2.0.zip", + "reference": "2.2.0", + "shasum": "fc06c2b27be7432f4692e37c787fa935e9d4f9f7" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -2922,8 +2922,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.21", - "datestamp": "1731602531", + "version": "2.2.0", + "datestamp": "1736189388", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3571,17 +3571,17 @@ }, { "name": "drupal/externalauth", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/externalauth.git", - "reference": "2.0.6" + "reference": "2.0.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/externalauth-2.0.6.zip", - "reference": "2.0.6", - "shasum": "0dbc9fbab0901e940d52b239e08f031797f6bd2a" + "url": "https://ftp.drupal.org/files/projects/externalauth-2.0.7.zip", + "reference": "2.0.7", + "shasum": "93c2b15f21172f931bb81cc365c828c12be377c3" }, "require": { "drupal/core": "^9.5 || ^10 || ^11" @@ -3589,8 +3589,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.6", - "datestamp": "1720689758", + "version": "2.0.7", + "datestamp": "1735897906", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.26", + "version": "6.8.27", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "2b18785a8ed788b658240efe7d38b5ec2a98ab6c" + "reference": "1ef57ad318689239f471c77d4bdc3f48d5733043" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2b18785a8ed788b658240efe7d38b5ec2a98ab6c", - "reference": "2b18785a8ed788b658240efe7d38b5ec2a98ab6c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1ef57ad318689239f471c77d4bdc3f48d5733043", + "reference": "1ef57ad318689239f471c77d4bdc3f48d5733043", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.26", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.27", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-20T11:24:30+00:00" + "time": "2025-01-07T12:40:31+00:00" }, { "name": "drupal/hdbt_admin", @@ -4250,16 +4250,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.9", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "88aedf8ae9ba1216069fdb2e69366dd6b87c0a38" + "reference": "f8715d98b7db4a0c5ab671256fbda8e0c3316e31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/88aedf8ae9ba1216069fdb2e69366dd6b87c0a38", - "reference": "88aedf8ae9ba1216069fdb2e69366dd6b87c0a38", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/f8715d98b7db4a0c5ab671256fbda8e0c3316e31", + "reference": "f8715d98b7db4a0c5ab671256fbda8e0c3316e31", "shasum": "" }, "require": { @@ -4289,10 +4289,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2024-10-28T13:45:59+00:00" + "time": "2025-01-07T07:19:06+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4418,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.11.1", + "version": "4.11.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "73e3050ba224d40ce93e8eb4752e7af4a6bc6a72" + "reference": "79f26752989777536e479093681939f6d634db2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/73e3050ba224d40ce93e8eb4752e7af4a6bc6a72", - "reference": "73e3050ba224d40ce93e8eb4752e7af4a6bc6a72", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/79f26752989777536e479093681939f6d634db2f", + "reference": "79f26752989777536e479093681939f6d634db2f", "shasum": "" }, "require": { @@ -4552,10 +4552,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.11.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.11.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-19T09:33:02+00:00" + "time": "2025-01-07T12:40:34+00:00" }, { "name": "drupal/helfi_proxy", @@ -5506,17 +5506,17 @@ }, { "name": "drupal/openid_connect", - "version": "3.0.0-alpha4", + "version": "3.0.0-alpha5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "3.0.0-alpha4" + "reference": "3.0.0-alpha5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha4.zip", - "reference": "3.0.0-alpha4", - "shasum": "3239f8a2e5fc98de1be7561309cb12153ef5b7c9" + "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha5.zip", + "reference": "3.0.0-alpha5", + "shasum": "6bca4f7ac0f675370008a0631095722347379b04" }, "require": { "drupal/core": "^9.5 || ^10.2 || ^11", @@ -5527,8 +5527,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0-alpha4", - "datestamp": "1734043889", + "version": "3.0.0-alpha5", + "datestamp": "1735590945", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -5928,17 +5928,17 @@ }, { "name": "drupal/raven", - "version": "6.0.13", + "version": "6.0.14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "6.0.13" + "reference": "6.0.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-6.0.13.zip", - "reference": "6.0.13", - "shasum": "7b92e693dae63859457ba734c57382511b91af86" + "url": "https://ftp.drupal.org/files/projects/raven-6.0.14.zip", + "reference": "6.0.14", + "shasum": "4533faf65caad0068c6bb818f29b3151645a9686" }, "require": { "drupal/core": "^10.2 || ^11", @@ -5946,14 +5946,15 @@ }, "require-dev": { "drupal/csp": "^1.17 || ^2.0", + "drupal/monitoring": "^1.13", "drupal/seckit": "^2.0", "drush/drush": "^11.0 || ^12.0 || ^13.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.13", - "datestamp": "1734389510", + "version": "6.0.14", + "datestamp": "1735930900", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6202,7 +6203,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -6210,7 +6211,7 @@ "homepage": "https://www.drupal.org/user/53892" }, { - "name": "Kristen Pol", + "name": "kristen pol", "homepage": "https://www.drupal.org/user/8389" }, { @@ -7758,16 +7759,16 @@ }, { "name": "egulias/email-validator", - "version": "4.0.2", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" + "reference": "b115554301161fa21467629f1e1391c1936de517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", - "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b115554301161fa21467629f1e1391c1936de517", + "reference": "b115554301161fa21467629f1e1391c1936de517", "shasum": "" }, "require": { @@ -7813,7 +7814,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" + "source": "https://github.com/egulias/EmailValidator/tree/4.0.3" }, "funding": [ { @@ -7821,7 +7822,7 @@ "type": "github" } ], - "time": "2023-10-06T06:47:41+00:00" + "time": "2024-12-27T00:36:43+00:00" }, { "name": "elastic/transport", @@ -9591,16 +9592,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { @@ -9643,9 +9644,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "open-telemetry/api", @@ -11350,16 +11351,16 @@ }, { "name": "symfony/console", - "version": "v6.4.15", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" + "reference": "799445db3f15768ecc382ac5699e6da0520a0a04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", - "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04", + "reference": "799445db3f15768ecc382ac5699e6da0520a0a04", "shasum": "" }, "require": { @@ -11424,7 +11425,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.15" + "source": "https://github.com/symfony/console/tree/v6.4.17" }, "funding": [ { @@ -11440,7 +11441,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T14:19:14+00:00" + "time": "2024-12-07T12:07:30+00:00" }, { "name": "symfony/dependency-injection", @@ -11542,12 +11543,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -11592,16 +11593,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.14", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" + "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", - "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/37ad2380e8c1a8cf62a1200a5c10080b679b446c", + "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c", "shasum": "" }, "require": { @@ -11647,7 +11648,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.14" + "source": "https://github.com/symfony/error-handler/tree/v6.4.17" }, "funding": [ { @@ -11663,7 +11664,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-12-06T13:30:51+00:00" }, { "name": "symfony/event-dispatcher", @@ -11765,12 +11766,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -11889,16 +11890,16 @@ }, { "name": "symfony/finder", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" + "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", - "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", + "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", "shasum": "" }, "require": { @@ -11933,7 +11934,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.13" + "source": "https://github.com/symfony/finder/tree/v6.4.17" }, "funding": [ { @@ -11949,7 +11950,7 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:30:56+00:00" + "time": "2024-12-29T13:51:37+00:00" }, { "name": "symfony/http-foundation", @@ -12030,16 +12031,16 @@ }, { "name": "symfony/http-kernel", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710", + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710", "shasum": "" }, "require": { @@ -12124,7 +12125,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.16" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.17" }, "funding": [ { @@ -12140,7 +12141,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T12:49:36+00:00" + "time": "2024-12-31T14:49:31+00:00" }, { "name": "symfony/mailer", @@ -12224,16 +12225,16 @@ }, { "name": "symfony/mime", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855" + "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855", - "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855", + "url": "https://api.github.com/repos/symfony/mime/zipball/ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", + "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", "shasum": "" }, "require": { @@ -12289,7 +12290,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.13" + "source": "https://github.com/symfony/mime/tree/v6.4.17" }, "funding": [ { @@ -12305,7 +12306,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-12-02T11:09:41+00:00" }, { "name": "symfony/options-resolver", @@ -13500,12 +13501,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -13664,12 +13665,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -13725,16 +13726,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d" + "reference": "a3c19a0e542d427c207e22242043ef35b5b99a2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/9b0d1988b56511706bc91d96ead39acd77aaf34d", - "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d", + "url": "https://api.github.com/repos/symfony/validator/zipball/a3c19a0e542d427c207e22242043ef35b5b99a2c", + "reference": "a3c19a0e542d427c207e22242043ef35b5b99a2c", "shasum": "" }, "require": { @@ -13802,7 +13803,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.16" + "source": "https://github.com/symfony/validator/tree/v6.4.17" }, "funding": [ { @@ -13818,7 +13819,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T09:48:51+00:00" + "time": "2024-12-29T12:50:19+00:00" }, { "name": "symfony/var-dumper", @@ -14154,16 +14155,16 @@ }, { "name": "twig/twig", - "version": "v3.17.1", + "version": "v3.18.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", "shasum": "" }, "require": { @@ -14218,7 +14219,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.17.1" + "source": "https://github.com/twigphp/Twig/tree/v3.18.0" }, "funding": [ { @@ -14230,7 +14231,7 @@ "type": "tidelift" } ], - "time": "2024-12-12T09:58:10+00:00" + "time": "2024-12-29T10:51:50+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml index 4ca9c042..db7e611d 100644 --- a/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: config: - - field.field.paragraph.unit_contact_card.field_unit_contact_title + - field.field.paragraph.unit_contact_card.field_unit_contact_heading - field.field.paragraph.unit_contact_card.field_unit_contact_unit - field.field.paragraph.unit_contact_card.field_unit_contact_use_address - field.field.paragraph.unit_contact_card.field_unit_contact_use_details @@ -15,19 +15,17 @@ dependencies: - field.field.paragraph.unit_contact_card.field_unit_contact_use_postal - paragraphs.paragraphs_type.unit_contact_card _core: - default_config_hash: XnijiEfDptaMmJSLOaRAbmsG5jdy70ENYFsDRp7dXck + default_config_hash: uT8aniMS1fevBhNfcyGCd5OiS2-wx4uQFzYyzEWxHX8 id: paragraph.unit_contact_card.default targetEntityType: paragraph bundle: unit_contact_card mode: default content: - field_unit_contact_title: - type: string_textfield + field_unit_contact_heading: + type: options_buttons weight: 0 region: content - settings: - size: 60 - placeholder: '' + settings: { } third_party_settings: { } field_unit_contact_unit: type: entity_reference_autocomplete diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml index ce1f2cd2..d25bb3e4 100644 --- a/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: config: - - field.field.paragraph.unit_contact_card.field_unit_contact_title + - field.field.paragraph.unit_contact_card.field_unit_contact_heading - field.field.paragraph.unit_contact_card.field_unit_contact_unit - field.field.paragraph.unit_contact_card.field_unit_contact_use_address - field.field.paragraph.unit_contact_card.field_unit_contact_use_details @@ -15,20 +15,12 @@ dependencies: - field.field.paragraph.unit_contact_card.field_unit_contact_use_postal - paragraphs.paragraphs_type.unit_contact_card _core: - default_config_hash: DvEDTYQYY2bJ_PzPZtlMEowZm2o5MrLaCa3p9T-NTAs + default_config_hash: ueLmUIlWmD3niFjRRANYBSf1QCFcMlnGSGdCZ34IcNw id: paragraph.unit_contact_card.default targetEntityType: paragraph bundle: unit_contact_card mode: default content: - field_unit_contact_title: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: 0 - region: content field_unit_contact_unit: type: entity_reference_label label: hidden @@ -38,6 +30,7 @@ content: weight: 1 region: content hidden: + field_unit_contact_heading: true field_unit_contact_use_address: true field_unit_contact_use_details: true field_unit_contact_use_link: true diff --git a/conf/cmi/editoria11y.settings.yml b/conf/cmi/editoria11y.settings.yml index 26bafa37..35671244 100644 --- a/conf/cmi/editoria11y.settings.yml +++ b/conf/cmi/editoria11y.settings.yml @@ -1,12 +1,14 @@ _core: default_config_hash: NGxFi-xycxrzrGVZtCUl7MACi0jVRk130tNabvIN6ng content_root: '' +assertiveness: smart no_load: '' -ignore_containers: '' embedded_content_warning: '' -allow_overflow: '' -assertiveness: smart download_links: '' ignore_link_strings: '' -hidden_handlers: '' link_ignore_selector: 'svg.ext, svg.mailto, .link-purpose-text' +hidden_handlers: '' +disable_live: false +live_h2: 'form[id^="node-"] #edit-body-wrapper .ck-content' +ignore_containers: '' +allow_overflow: '' diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml new file mode 100644 index 00000000..f1126b00 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml @@ -0,0 +1,25 @@ +uuid: 6c99f53c-3860-4a4f-adde-0e465d98e131 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_heading + - paragraphs.paragraphs_type.unit_contact_card + module: + - options +_core: + default_config_hash: KBZVQJ1FH_oGM0pSbEkGL2tPmvpQZl6RgRSoXV4lf5M +id: paragraph.unit_contact_card.field_unit_contact_heading +field_name: field_unit_contact_heading +entity_type: paragraph +bundle: unit_contact_card +label: Heading +description: " The default heading for the component is “Contact information”. Choose the unit name as the heading if it is not clear which unit's contact information is being referred to." +required: true +translatable: false +default_value: + - + value: default +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml deleted file mode 100644 index a4cd8e87..00000000 --- a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: edab7ce4-1805-45aa-a37c-2d8c0ea4e06a -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_unit_contact_title - - paragraphs.paragraphs_type.unit_contact_card -_core: - default_config_hash: naZYC-AB_hI23uWltMtB5_GCy_d25LIFTQqZkDlqb6s -id: paragraph.unit_contact_card.field_unit_contact_title -field_name: field_unit_contact_title -entity_type: paragraph -bundle: unit_contact_card -label: Title -description: '' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_heading.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_heading.yml new file mode 100644 index 00000000..ea2f4714 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_heading.yml @@ -0,0 +1,29 @@ +uuid: 5e3d0bce-6114-40f1-b778-8fece473c972 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +_core: + default_config_hash: T_fDAEmZ5YJF1SdA3tmqPumG-8gNtlxzPxBL92A3XmM +id: paragraph.field_unit_contact_heading +field_name: field_unit_contact_heading +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: default + label: 'Contact information' + - + value: unit_name + label: 'The unit name' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml deleted file mode 100644 index e2aad5d6..00000000 --- a/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: cd6c66b5-1c2c-44c1-a834-dd4042d47411 -langcode: en -status: true -dependencies: - module: - - paragraphs -_core: - default_config_hash: sV3mnI_z0Q-WpJm2S9A9H8D-yqYMpu1iASxC4_eACN8 -id: paragraph.field_unit_contact_title -field_name: field_unit_contact_title -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/file.settings.yml b/conf/cmi/file.settings.yml index 089565dd..14a3bd7e 100644 --- a/conf/cmi/file.settings.yml +++ b/conf/cmi/file.settings.yml @@ -5,7 +5,7 @@ description: length: 128 icon: directory: core/modules/file/icons -make_unused_managed_files_temporary: false +make_unused_managed_files_temporary: true filename_sanitization: transliterate: true replace_whitespace: true diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml new file mode 100644 index 00000000..f7f4611b --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml @@ -0,0 +1,2 @@ +label: Otsikko +description: 'Komponentin oletusotsikko on ”Yhteystiedot”. Valitse otsikoksi kyseisen toimipisteen nimi, jos ei ole ilmeistä, minkä toimipisteen yhteystiedoista on kyse.' diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_unit_contact_heading.yml b/conf/cmi/language/fi/field.storage.paragraph.field_unit_contact_heading.yml new file mode 100644 index 00000000..382e1fa9 --- /dev/null +++ b/conf/cmi/language/fi/field.storage.paragraph.field_unit_contact_heading.yml @@ -0,0 +1,6 @@ +settings: + allowed_values: + - + label: Yhteystiedot + - + label: 'Kyseisen toimipisteen nimi' diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml b/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml new file mode 100644 index 00000000..a7335eb2 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_heading.yml @@ -0,0 +1 @@ +label: Rubrik diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml deleted file mode 100644 index 2711e04d..00000000 --- a/conf/cmi/language/sv/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml +++ /dev/null @@ -1 +0,0 @@ -label: Titel diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index cbd32963..dd75506a 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,7 +91,6 @@ display: type: mini options: offset: 0 - pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -106,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.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 50feaca1..1151b560 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,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 d296c793..11b83fa8 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,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.service_list.yml b/conf/cmi/views.view.service_list.yml index 7e190ab5..e2ccbdeb 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,7 +109,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -127,6 +126,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,7 +646,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -664,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 631f7dee..ce78017e 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,7 +93,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -111,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.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 101b4532..72a7edf1 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,7 +286,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -304,6 +303,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: From b28045a6017b307da8e0bbe6814f09470dd68f1d Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:20:04 +0000 Subject: [PATCH 5/9] Update configuration --- composer.lock | 77 +++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 43 deletions(-) diff --git a/composer.lock b/composer.lock index 806d4aee..f73a2822 100644 --- a/composer.lock +++ b/composer.lock @@ -3890,30 +3890,30 @@ }, { "name": "drupal/gin", - "version": "3.0.0-rc11", + "version": "4.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-rc11" + "reference": "4.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc11.zip", - "reference": "8.x-3.0-rc11", - "shasum": "532000cb8497412fb4b26efc362c7fc9efc44546" + "url": "https://ftp.drupal.org/files/projects/gin-4.0.2.zip", + "reference": "4.0.2", + "shasum": "501f167bd7009cffa29848a918b3982cb0a8245b" }, "require": { - "drupal/core": "^9 || ^10 || ^11", - "drupal/gin_toolbar": "^1.0@beta" + "drupal/core": "^10 || ^11", + "drupal/gin_toolbar": "^2.0" }, "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-rc11", - "datestamp": "1719568502", + "version": "4.0.2", + "datestamp": "1735405135", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -3956,17 +3956,17 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc6", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc6" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc6.zip", - "reference": "8.x-1.0-rc6", - "shasum": "542def14b9a5435efb4e021d384fa3f7b0fc6e78" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-2.0.0.zip", + "reference": "2.0.0", + "shasum": "2befeab2de9f7953b76b1a36c9bfb6a7e3987b11" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -3974,11 +3974,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc6", - "datestamp": "1718368950", + "version": "2.0.0", + "datestamp": "1734698921", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -4108,35 +4108,27 @@ }, { "name": "drupal/hdbt_admin", - "version": "3.2.11", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "a0d89ce0318306edac0cde747367217ed53b2196" + "reference": "5a8a9fdb5e390a30d7224e1c336874c080f11f96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/a0d89ce0318306edac0cde747367217ed53b2196", - "reference": "a0d89ce0318306edac0cde747367217ed53b2196", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/5a8a9fdb5e390a30d7224e1c336874c080f11f96", + "reference": "5a8a9fdb5e390a30d7224e1c336874c080f11f96", "shasum": "" }, "require": { "drupal/admin_toolbar": "^3.0", - "drupal/gin": "^3.0@rc" + "drupal/gin": "^4.0" }, "conflict": { - "drupal/gin": ">3.0.0-rc11", "drupal/helfi_api_base": "<2.7.6", "drupal/helfi_platform_config": "<4.3" }, "type": "drupal-theme", - "extra": { - "patches": { - "drupal/gin": { - "[#UHF-10892] Gin sidebar nextsibling issue. (https://www.drupal.org/i/3460390)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-hdbt-admin/d3e6cb08315b8df38696489d2c8f406a67f224b8/patches/gin-3460390-sidebar-nextsibling-innerhtml-rc11.patch" - } - } - }, "license": [ "GPL-2.0+" ], @@ -4145,10 +4137,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.11", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-12-17T08:36:44+00:00" + "time": "2025-01-08T11:54:15+00:00" }, { "name": "drupal/health_check", @@ -4418,16 +4410,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.11.3", + "version": "4.12.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "79f26752989777536e479093681939f6d634db2f" + "reference": "983a87e51ffdce5886bd9607fc0694c1d04ca91c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/79f26752989777536e479093681939f6d634db2f", - "reference": "79f26752989777536e479093681939f6d634db2f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/983a87e51ffdce5886bd9607fc0694c1d04ca91c", + "reference": "983a87e51ffdce5886bd9607fc0694c1d04ca91c", "shasum": "" }, "require": { @@ -4452,7 +4444,7 @@ "drupal/external_entities": "^2.0@beta", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", - "drupal/gin_toolbar": "^1.0@rc", + "drupal/gin_toolbar": "^2.0", "drupal/hal": "^2.0", "drupal/helfi_api_base": "*", "drupal/helfi_tpr": "*", @@ -4500,7 +4492,6 @@ "drupal/core-composer-scaffold": "<10.4", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/default_content": ">2.0.0-alpha2", - "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", "drupal/stage_file_proxy": "<2.1.5", "drush/drush": "<12" @@ -4552,10 +4543,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.11.3", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-01-07T12:40:34+00:00" + "time": "2025-01-08T12:14:37+00:00" }, { "name": "drupal/helfi_proxy", From b2a0ceec02a8d54d7949e1ad9ae19c8d047475cf Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 9 Jan 2025 12:29:10 +0200 Subject: [PATCH 6/9] Change postcss processing so that css logical properties are preserved --- .../themes/custom/hdbt_subtheme/package-lock.json | 15 ++++++++------- .../themes/custom/hdbt_subtheme/postcss.config.js | 10 +++++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 1ca1f732..a70fac55 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3346,9 +3346,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001659", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz", - "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==", + "version": "1.0.30001692", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", + "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", "funding": [ { "type": "opencollective", @@ -3362,7 +3362,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "2.4.2", @@ -13196,9 +13197,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001659", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz", - "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==" + "version": "1.0.30001692", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", + "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/postcss.config.js b/public/themes/custom/hdbt_subtheme/postcss.config.js index a63f4e47..ac82679f 100644 --- a/public/themes/custom/hdbt_subtheme/postcss.config.js +++ b/public/themes/custom/hdbt_subtheme/postcss.config.js @@ -5,7 +5,15 @@ module.exports = { plugins: [ // Plugins for PostCSS ['autoprefixer', { sourceMap: isDev }], // Parses CSS and adds vendor prefixes. - 'postcss-preset-env', // Convert modern CSS into something most browsers can understand. + [ + 'postcss-preset-env', // Convert modern CSS into something most browsers can understand. + { + stage: 2, // Use stage 2 CSS features. + features: { + 'logical-properties-and-values': false // Disable the conversion of css logical properties such as padding-inline. + }, + }, + ], 'postcss-nested', // Unwrap nested rules like how Sass does it. 'postcss-nesting', // Nest style rules inside each other, following the CSS Nesting specification. require('./postcss.plugins'), // Strip inline comments. From c837e89a71e493799f39118d458e2a1803be6883 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:42:02 +0000 Subject: [PATCH 7/9] Update configuration --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index f73a2822..6ea9a317 100644 --- a/composer.lock +++ b/composer.lock @@ -3168,7 +3168,7 @@ "homepage": "https://www.drupal.org/user/2416470" }, { - "name": "TR", + "name": "tr", "homepage": "https://www.drupal.org/user/202830" } ], @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.27", + "version": "6.8.29", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "1ef57ad318689239f471c77d4bdc3f48d5733043" + "reference": "46c6f98c115bd2b1cc130655cdd9c1253451427b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1ef57ad318689239f471c77d4bdc3f48d5733043", - "reference": "1ef57ad318689239f471c77d4bdc3f48d5733043", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/46c6f98c115bd2b1cc130655cdd9c1253451427b", + "reference": "46c6f98c115bd2b1cc130655cdd9c1253451427b", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.27", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.29", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-07T12:40:31+00:00" + "time": "2025-01-09T12:37:24+00:00" }, { "name": "drupal/hdbt_admin", @@ -9641,16 +9641,16 @@ }, { "name": "open-telemetry/api", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "04c85a1e41a3d59fa9bdc801a5de1df6624b95ed" + "reference": "351a30baa79699de3de3a814c8ccc7b52ccdfb1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/04c85a1e41a3d59fa9bdc801a5de1df6624b95ed", - "reference": "04c85a1e41a3d59fa9bdc801a5de1df6624b95ed", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/351a30baa79699de3de3a814c8ccc7b52ccdfb1d", + "reference": "351a30baa79699de3de3a814c8ccc7b52ccdfb1d", "shasum": "" }, "require": { @@ -9707,7 +9707,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-11-16T04:32:30+00:00" + "time": "2025-01-08T23:50:34+00:00" }, { "name": "open-telemetry/context", From 626734c86b3a5459458f547929aa48068b71a7e5 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Mon, 13 Jan 2025 09:16:02 +0000 Subject: [PATCH 8/9] Update configuration --- composer.lock | 40 +++++++++---------- ...core.entity_view_mode.tpr_unit.minimal.yml | 2 +- .../cmi/language/fi/filter.format.minimal.yml | 2 +- conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 6ea9a317..7098c727 100644 --- a/composer.lock +++ b/composer.lock @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.29", + "version": "6.8.33", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "46c6f98c115bd2b1cc130655cdd9c1253451427b" + "reference": "153cc3d82e2f7193c0a00df5762000f4d8fd6c21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/46c6f98c115bd2b1cc130655cdd9c1253451427b", - "reference": "46c6f98c115bd2b1cc130655cdd9c1253451427b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/153cc3d82e2f7193c0a00df5762000f4d8fd6c21", + "reference": "153cc3d82e2f7193c0a00df5762000f4d8fd6c21", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.29", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.33", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-09T12:37:24+00:00" + "time": "2025-01-13T09:12:05+00:00" }, { "name": "drupal/hdbt_admin", @@ -4410,16 +4410,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.12.0", + "version": "4.12.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "983a87e51ffdce5886bd9607fc0694c1d04ca91c" + "reference": "fb0ab912a4fe38d695cbfeb84ee623ea644dd6a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/983a87e51ffdce5886bd9607fc0694c1d04ca91c", - "reference": "983a87e51ffdce5886bd9607fc0694c1d04ca91c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fb0ab912a4fe38d695cbfeb84ee623ea644dd6a2", + "reference": "fb0ab912a4fe38d695cbfeb84ee623ea644dd6a2", "shasum": "" }, "require": { @@ -4543,10 +4543,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-01-08T12:14:37+00:00" + "time": "2025-01-13T06:44:52+00:00" }, { "name": "drupal/helfi_proxy", @@ -4595,16 +4595,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.10", + "version": "2.3.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c" + "reference": "f7c04cdf1c4bfed2d075457429b66906828ffefa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d98687373b1cb4647ad576403e470f049c7a4d3c", - "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f7c04cdf1c4bfed2d075457429b66906828ffefa", + "reference": "f7c04cdf1c4bfed2d075457429b66906828ffefa", "shasum": "" }, "require": { @@ -4630,10 +4630,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.10", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.11", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2024-11-29T09:43:38+00:00" + "time": "2025-01-10T08:30:42+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5765,11 +5765,11 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { - "name": "Dave Reid", + "name": "dave reid", "homepage": "https://www.drupal.org/user/53892" }, { diff --git a/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml index 06660f47..d11ac5ab 100644 --- a/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml +++ b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml @@ -1 +1 @@ -label: Minimal +label: Minimaalinen diff --git a/conf/cmi/language/fi/filter.format.minimal.yml b/conf/cmi/language/fi/filter.format.minimal.yml index 39e62d04..c83fc57e 100644 --- a/conf/cmi/language/fi/filter.format.minimal.yml +++ b/conf/cmi/language/fi/filter.format.minimal.yml @@ -1 +1 @@ -name: Minimal +name: Minimaalinen diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index dd75506a..cbd32963 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.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 1151b560..50feaca1 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 11b83fa8..d296c793 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.service_list.yml b/conf/cmi/views.view.service_list.yml index e2ccbdeb..7e190ab5 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 ce78017e..631f7dee 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.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 72a7edf1..101b4532 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: From a9fbf08f5b5ea70fcd37c61cffdab79376cdd317 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:30:21 +0000 Subject: [PATCH 9/9] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 7098c727..fe10bbfc 100644 --- a/composer.lock +++ b/composer.lock @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.33", + "version": "6.8.34", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "153cc3d82e2f7193c0a00df5762000f4d8fd6c21" + "reference": "9216d2943483e75e9f5d9ed11eba03e836c93f98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/153cc3d82e2f7193c0a00df5762000f4d8fd6c21", - "reference": "153cc3d82e2f7193c0a00df5762000f4d8fd6c21", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9216d2943483e75e9f5d9ed11eba03e836c93f98", + "reference": "9216d2943483e75e9f5d9ed11eba03e836c93f98", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.33", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.34", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-13T09:12:05+00:00" + "time": "2025-01-14T10:26:39+00:00" }, { "name": "drupal/hdbt_admin",