diff --git a/.github/workflows/npm-audit.yml b/.github/workflows/npm-audit.yml new file mode 100644 index 00000000..3f695bcf --- /dev/null +++ b/.github/workflows/npm-audit.yml @@ -0,0 +1,69 @@ +name: Npm audit + +on: + workflow_dispatch: + schedule: + - cron: '0 12 * * 0' # Run every fortnight on Sunday at 12 + +jobs: + npm_audit: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Run npm audit + id: npm_audit + run: | + find public/modules/custom public/themes/custom -type f -name ".nvmrc" -exec sh -c ' + dir=$(dirname "$1") + node_version=$(cat "$1") + echo "Using Node.js version $node_version in $dir" + cd "$dir" + export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + nvm install $node_version + nvm use $node_version + set +e + npm audit --package-lock-only --loglevel=error; + # The npm audit command will exit with a 0 exit code if no vulnerabilities were found. + if [ $? -gt 0 ]; then + npm audit fix --package-lock-only --loglevel=error; + if [ $? -gt 0 ]; then + echo "BC_BREAK=:exclamation: NPM Audit fix could not fix all vulnerabilities. Fix them manually by running \`npm audit fix --force\` and test the functionalities thoroughly as there might be breaking changes. :exclamation:" >> $GITHUB_ENV; + fi; + echo "CREATE_PR=true" >> $GITHUB_OUTPUT; + fi; + set -e + ' sh {} \; + + + - name: Create Pull Request + if: steps.npm_audit.outputs.CREATE_PR == 'true' + uses: peter-evans/create-pull-request@v4 + with: + committer: GitHub + author: actions-bot + commit-message: Updated node modules based on npm audit fix + title: Automatic npm audit fix + labels: auto-update + body: | + # Npm audit + + ${{ env.BC_BREAK }} + + ## How to install + + * Update the HDBT theme + * `git fetch --all` + * `git checkout automation/npm-audit` + * `git pull origin automation/npm-audit` + * In the custom module or custom theme folder, run `nvm use && npm i && npm run build` + + ## How to test + Run `npm audit` + + * [ ] Check that the `npm audit` prints `found 0 vulnerabilities` + * [ ] Check that the changes for distributed files are sensible + + branch: automation/npm-audit diff --git a/composer.lock b/composer.lock index e5d1f1c6..e9fd70a0 100644 --- a/composer.lock +++ b/composer.lock @@ -2017,16 +2017,16 @@ }, { "name": "drupal/core", - "version": "10.2.1", + "version": "10.2.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db" + "reference": "fc9abad1ab687635a5eddec00aa1a5f2a29a23bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/0050280087b8ed1fb145fcf22e01ad53c85931db", - "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db", + "url": "https://api.github.com/repos/drupal/core/zipball/fc9abad1ab687635a5eddec00aa1a5f2a29a23bd", + "reference": "fc9abad1ab687635a5eddec00aa1a5f2a29a23bd", "shasum": "" }, "require": { @@ -2174,9 +2174,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.1" + "source": "https://github.com/drupal/core/tree/10.2.2" }, - "time": "2024-01-05T09:27:16+00:00" + "time": "2024-01-16T21:10:58+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2655,10 +2655,6 @@ "homepage": "https://www.drupal.org/u/greg-boggs", "role": "Maintainer" }, - { - "name": "Greg Boggs", - "homepage": "https://www.drupal.org/user/153069" - }, { "name": "hmartens", "homepage": "https://www.drupal.org/user/622826" @@ -3815,16 +3811,16 @@ }, { "name": "drupal/hdbt", - "version": "6.3.6", + "version": "6.4.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "a9512428a025e6675a46fe2bf06ff28b1257b2ee" + "reference": "d6ffca148dad1f451cb8f8c78e98b09a285776d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/a9512428a025e6675a46fe2bf06ff28b1257b2ee", - "reference": "a9512428a025e6675a46fe2bf06ff28b1257b2ee", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d6ffca148dad1f451cb8f8c78e98b09a285776d9", + "reference": "d6ffca148dad1f451cb8f8c78e98b09a285776d9", "shasum": "" }, "require": { @@ -3842,10 +3838,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.7", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-01-16T08:07:42+00:00" + "time": "2024-01-30T09:21:40+00:00" }, { "name": "drupal/hdbt_admin", @@ -4108,16 +4104,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.2", + "version": "4.3.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9ac506631980648a339d9658e02f2ab00e307ef3" + "reference": "9c6632b8f485f9bd6f4f0200360df78935ea08d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9ac506631980648a339d9658e02f2ab00e307ef3", - "reference": "9ac506631980648a339d9658e02f2ab00e307ef3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9c6632b8f485f9bd6f4f0200360df78935ea08d2", + "reference": "9c6632b8f485f9bd6f4f0200360df78935ea08d2", "shasum": "" }, "require": { @@ -4138,7 +4134,7 @@ "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", "drupal/eu_cookie_compliance": "^1.24", - "drupal/external_entities": "^2.0@alpha", + "drupal/external_entities": "2.0.0-alpha6", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", "drupal/gin_toolbar": "^1.0@rc", @@ -4231,10 +4227,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.2", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-01-16T08:07:32+00:00" + "time": "2024-01-30T07:58:25+00:00" }, { "name": "drupal/helfi_proxy", @@ -4290,16 +4286,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.3", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "cf8fd5d9b66d629845c44c4d8a901e81e9caef11" + "reference": "c14c8634c913125faf96d217d11bac4a456049a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/cf8fd5d9b66d629845c44c4d8a901e81e9caef11", - "reference": "cf8fd5d9b66d629845c44c4d8a901e81e9caef11", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/c14c8634c913125faf96d217d11bac4a456049a8", + "reference": "c14c8634c913125faf96d217d11bac4a456049a8", "shasum": "" }, "require": { @@ -4325,23 +4321,23 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-12-19T10:01:23+00:00" + "time": "2024-01-26T07:55:57+00:00" }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "95844e13d22af91f3ae4d69f9e55edb63215943a" + "reference": "07c25d907de18d26f203463203129bd67608526d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/95844e13d22af91f3ae4d69f9e55edb63215943a", - "reference": "95844e13d22af91f3ae4d69f9e55edb63215943a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/07c25d907de18d26f203463203129bd67608526d", + "reference": "07c25d907de18d26f203463203129bd67608526d", "shasum": "" }, "require": { @@ -4358,10 +4354,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-01-09T07:24:18+00:00" + "time": "2024-01-25T07:06:50+00:00" }, { "name": "drupal/image_style_quality", @@ -4478,17 +4474,17 @@ }, { "name": "drupal/imagemagick", - "version": "3.6.0", + "version": "3.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/imagemagick.git", - "reference": "8.x-3.6" + "reference": "8.x-3.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.6.zip", - "reference": "8.x-3.6", - "shasum": "b4efc5ff6ab5469475f0ef7242eba0c7eda1c75c" + "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.7.zip", + "reference": "8.x-3.7", + "shasum": "2698db0ccc4a76d44ebbbfcabe9e70d25ae3db9b" }, "require": { "drupal/core": "^10.1", @@ -4498,8 +4494,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.6", - "datestamp": "1703241142", + "version": "8.x-3.7", + "datestamp": "1706096705", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4992,17 +4988,17 @@ }, { "name": "drupal/migrate_plus", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/migrate_plus.git", - "reference": "6.0.1" + "reference": "6.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/migrate_plus-6.0.1.zip", - "reference": "6.0.1", - "shasum": "154e5c627c8b32648cb4b4034a196a289b0626fa" + "url": "https://ftp.drupal.org/files/projects/migrate_plus-6.0.2.zip", + "reference": "6.0.2", + "shasum": "4315bc293aa75ea9247582d5d1925b075865e467" }, "require": { "drupal/core": ">=9.1", @@ -5019,8 +5015,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.1", - "datestamp": "1672428002", + "version": "6.0.2", + "datestamp": "1705424638", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8519,16 +8515,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.14.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", "shasum": "" }, "require": { @@ -8559,7 +8555,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" }, "funding": [ { @@ -8571,7 +8567,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T14:13:20+00:00" + "time": "2024-01-28T23:22:08+00:00" }, { "name": "league/uri", diff --git a/conf/cmi/core.entity_form_display.paragraph.chart.default.yml b/conf/cmi/core.entity_form_display.paragraph.chart.default.yml index 4bf13cda..ccee9d7d 100644 --- a/conf/cmi/core.entity_form_display.paragraph.chart.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.chart.default.yml @@ -12,7 +12,7 @@ dependencies: - media_library - text _core: - default_config_hash: ZzwlJ2SwF1RVqS2C99xcFRBm5QTF6HqHjtgtQTBxAq8 + default_config_hash: JfX1NDmZllc_fHMeOSFBgWspFRoEEmivcXOUu014O-k id: paragraph.chart.default targetEntityType: paragraph bundle: chart diff --git a/conf/cmi/core.entity_form_display.paragraph.map.default.yml b/conf/cmi/core.entity_form_display.paragraph.map.default.yml index 59df9b9c..fc7d1ed2 100644 --- a/conf/cmi/core.entity_form_display.paragraph.map.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.map.default.yml @@ -12,7 +12,7 @@ dependencies: - media_library - text _core: - default_config_hash: 8PkD28wd76Uxb7Lxrd8Js9613dKfCawFNWaoOv5PhF0 + default_config_hash: 7crENIwhGW6tRoex4OmKX32kDMRWvLBJ-YjDSBifPak id: paragraph.map.default targetEntityType: paragraph bundle: map diff --git a/conf/cmi/core.entity_view_display.paragraph.chart.default.yml b/conf/cmi/core.entity_view_display.paragraph.chart.default.yml index 60b5053b..9764c825 100644 --- a/conf/cmi/core.entity_view_display.paragraph.chart.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.chart.default.yml @@ -11,7 +11,7 @@ dependencies: module: - text _core: - default_config_hash: z5HcA-kCryhCEDDUh3GMvbVm_xuff7CohDimxV11670 + default_config_hash: BOw_UiW-L7EQ8Y6D4E0CAMkB8XxXao5rBZzbq-DNbBI id: paragraph.chart.default targetEntityType: paragraph bundle: chart diff --git a/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml b/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml index 613d2045..553beec2 100644 --- a/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml @@ -38,8 +38,6 @@ content: settings: image_link: '' image_style: 1_1_l - image_loading: - attribute: lazy third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_display.paragraph.map.default.yml b/conf/cmi/core.entity_view_display.paragraph.map.default.yml index 570300d6..3cab57db 100644 --- a/conf/cmi/core.entity_view_display.paragraph.map.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.map.default.yml @@ -11,7 +11,7 @@ dependencies: module: - text _core: - default_config_hash: wmFqvJHZ4YBgQf6tWjN2zwr6sXyqoWGcv441cwJoQR0 + default_config_hash: 9Mw4AexMhGVXoajYwrdAHrw7-66rs0sg3l0P7BVEaWo id: paragraph.map.default targetEntityType: paragraph bundle: map 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 65aec905..19173257 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: imFLQtHenUWCDEXySYBm0H7gJ55i3_AF8zALft8uiqo + default_config_hash: 3cezkDpNnpY89NCorCj-4mBIeItsVAEG803y-phaZTM id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' 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 index aab9f265..a51e18ab 100644 --- 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 @@ -7,7 +7,7 @@ dependencies: module: - external_entities _core: - default_config_hash: 38in48tocOx9v-nSF9V-HWMB-vCPJlKujFtCd1rR8mg + 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 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 index 10d88760..a91a4319 100644 --- 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 @@ -7,7 +7,7 @@ dependencies: module: - external_entities _core: - default_config_hash: K3Zc1mBaVR4_2jaNQripGWR7yF50Bcxx8i9rbQ9-LIo + 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 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 index 891ec0b5..219199f8 100644 --- 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 @@ -7,7 +7,7 @@ dependencies: module: - external_entities _core: - default_config_hash: NZkWGgdPPxh2JXp9me3hdQjoytnsgA7IIynbZyefrTk + 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 diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 8d38b0b8..f7064841 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -60,54 +60,54 @@ settings: negate: 0 target_bundles_drag_drop: banner: - weight: 0 + weight: 2 enabled: true chart: - weight: 0 + weight: 10 enabled: true columns: - weight: 0 + weight: 6 enabled: true content_cards: - weight: 0 + weight: 1 enabled: true content_liftup: - weight: 0 + weight: 11 enabled: true event_list: - weight: 0 + weight: 13 enabled: true from_library: - weight: 0 + weight: 5 enabled: true hearings: - weight: 0 + weight: 14 enabled: true job_search: - weight: 0 + weight: 15 enabled: true liftup_with_image: - weight: 0 + weight: 3 enabled: true list_of_links: weight: 0 enabled: true map: - weight: 0 + weight: 8 enabled: true news_list: - weight: 0 + weight: 14 enabled: true phasing: - weight: 0 + weight: 7 enabled: true popular_services: - weight: 0 + weight: 4 enabled: true remote_video: - weight: 0 + weight: 9 enabled: true target_group_links: - weight: 0 + weight: 12 enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 199cc39d..1f90aa2c 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -58,49 +58,49 @@ settings: negate: 0 target_bundles_drag_drop: accordion: - weight: 0 + weight: 1 enabled: true banner: - weight: 0 + weight: 2 enabled: true chart: - weight: 0 + weight: 11 enabled: true columns: - weight: 0 + weight: 6 enabled: true contact_card_listing: - weight: 0 + weight: 14 enabled: true content_cards: - weight: 0 + weight: 5 enabled: true content_liftup: - weight: 0 + weight: 12 enabled: true event_list: - weight: 0 + weight: 13 enabled: true from_library: - weight: 0 + weight: 8 enabled: true image: - weight: 0 + weight: 3 enabled: true list_of_links: - weight: 0 + weight: 4 enabled: true map: - weight: 0 + weight: 9 enabled: true news_list: - weight: 0 + weight: 15 enabled: true phasing: - weight: 0 + weight: 7 enabled: true remote_video: - weight: 0 + weight: 10 enabled: true text: weight: 0 diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index a5ec0b44..2d9917f2 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -58,51 +58,51 @@ settings: negate: 0 target_bundles_drag_drop: accordion: - weight: 0 + weight: 3 enabled: true banner: - weight: 0 + weight: 4 enabled: true chart: - weight: 0 + weight: 11 enabled: true columns: - weight: 0 + weight: 6 enabled: true contact_card_listing: - weight: 0 + weight: 14 enabled: true content_cards: - weight: 0 + weight: 1 enabled: true content_liftup: - weight: 0 + weight: 12 enabled: true event_list: - weight: 0 + weight: 13 enabled: true from_library: - weight: 0 + weight: 8 enabled: true image: - weight: 0 + weight: 5 enabled: true list_of_links: weight: 0 enabled: true map: - weight: 0 + weight: 9 enabled: true news_list: - weight: 0 + weight: 15 enabled: true phasing: - weight: 0 + weight: 7 enabled: true remote_video: - weight: 0 + weight: 10 enabled: true text: - weight: 0 + weight: 2 enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml index f82b1d22..25a6bdaf 100644 --- a/conf/cmi/field.field.node.page.field_sidebar_content.yml +++ b/conf/cmi/field.field.node.page.field_sidebar_content.yml @@ -33,6 +33,6 @@ settings: weight: 0 enabled: true sidebar_text: - weight: 0 + weight: 1 enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.field.paragraph.chart.field_chart_description.yml b/conf/cmi/field.field.paragraph.chart.field_chart_description.yml index 36f70298..28cf6041 100644 --- a/conf/cmi/field.field.paragraph.chart.field_chart_description.yml +++ b/conf/cmi/field.field.paragraph.chart.field_chart_description.yml @@ -8,7 +8,7 @@ dependencies: module: - text _core: - default_config_hash: PXnqhbLHQJ6PHAymiCOs_AYjh648zX8C9mcKa_wultw + default_config_hash: 5FkgHc-lAStUaUrFbDo9stcgp7iBPrp_cEOB3hWwo9k id: paragraph.chart.field_chart_description field_name: field_chart_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.chart.field_iframe_title.yml b/conf/cmi/field.field.paragraph.chart.field_iframe_title.yml index 6f8a3b45..27f69a5e 100644 --- a/conf/cmi/field.field.paragraph.chart.field_iframe_title.yml +++ b/conf/cmi/field.field.paragraph.chart.field_iframe_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_iframe_title - paragraphs.paragraphs_type.chart +_core: + default_config_hash: nYfpEQitKsLpzekfKKwHqH9_rMnmGPCyWh1Jhy64gdw id: paragraph.chart.field_iframe_title field_name: field_iframe_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml b/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml index ec5b786f..554c18d0 100644 --- a/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml +++ b/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml @@ -9,7 +9,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: _iSBK3sYqVn5QyzC_C451nR3IF0EGhan4bEp1liTbiU + default_config_hash: ZqgrD2xFyv-VKitZqJ7VFPkatRSGyeyOgLwnW-C1Hss id: paragraph.contact_card.field_contact_social_media field_name: field_contact_social_media entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml index 580598ec..19c74b78 100644 --- a/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml +++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml @@ -9,7 +9,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: zR-r30I0kOV247OcU6yxNT2re2IFSq7pUjNogusJVxw + default_config_hash: KQMfZ0H61OpPP_Mbzo50RsVfQYhVst3vpN-IDT7mQeo id: paragraph.contact_card_listing.field_contact_card field_name: field_contact_card entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml index 28ea513d..77f75c42 100644 --- a/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml +++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml @@ -13,7 +13,7 @@ third_party_settings: allowed_formats: - minimal _core: - default_config_hash: T4FKKnMlsjO12QnaULU5Y6vJq8WnLhEJ3s22N4DO68U + default_config_hash: 54apkr-SUH-gN-iSmegZXnw0vux_R9kbXcZ30h0m3r4 id: paragraph.contact_card_listing.field_description field_name: field_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.map.field_iframe_title.yml b/conf/cmi/field.field.paragraph.map.field_iframe_title.yml index 51229054..c3a4f525 100644 --- a/conf/cmi/field.field.paragraph.map.field_iframe_title.yml +++ b/conf/cmi/field.field.paragraph.map.field_iframe_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_iframe_title - paragraphs.paragraphs_type.map +_core: + default_config_hash: vSBjm6bujo5d-FXNIVjIKjtkt189Fe5SJEQQ3qEFvD8 id: paragraph.map.field_iframe_title field_name: field_iframe_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.map.field_map_description.yml b/conf/cmi/field.field.paragraph.map.field_map_description.yml index 3f83f20d..c4117eb8 100644 --- a/conf/cmi/field.field.paragraph.map.field_map_description.yml +++ b/conf/cmi/field.field.paragraph.map.field_map_description.yml @@ -8,7 +8,7 @@ dependencies: module: - text _core: - default_config_hash: rqd6X8jCKPW9YN_jsj8nDaSuHC1UzUteKtnGBWGA2lA + default_config_hash: GTqHeaGGxBnLDqjumoVhE_XvyR69mb5i9OZZhVfvxdA id: paragraph.map.field_map_description field_name: field_map_description 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 ffed3bbc..1b76cfe4 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: EIpWpSFct6BBIBWOTpd87zJbnbSe0QLPeFLW9-LP1-o + default_config_hash: 7yDWmbqqH_qTaQ4iyJ6QTLaEcqUnL0oVp-t1huDnK_g id: paragraph.news_list.field_news_list_description field_name: field_news_list_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_chart_title.yml b/conf/cmi/field.storage.paragraph.field_chart_title.yml index 1a991382..a7bcfa81 100644 --- a/conf/cmi/field.storage.paragraph.field_chart_title.yml +++ b/conf/cmi/field.storage.paragraph.field_chart_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: 4wdjjmwWiYU5VvtxkfKJ9LRCXs61j6I7KKl3cN6Iacw + default_config_hash: bnesQ373pmVommuz08ZGmVcfl-QvVZ7cauT9powrsss id: paragraph.field_chart_title field_name: field_chart_title entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_map_title.yml b/conf/cmi/field.storage.paragraph.field_map_title.yml index 90c98f5d..0befe14e 100644 --- a/conf/cmi/field.storage.paragraph.field_map_title.yml +++ b/conf/cmi/field.storage.paragraph.field_map_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: PxDNjh_OyvdRHndYyoNqCOeDj0qrefLvn1GWZHRdjBw + default_config_hash: wFLS1XAaKuaq33dv-kKaYyuNCEZrOptjc6zLEP7-L9g id: paragraph.field_map_title field_name: field_map_title entity_type: paragraph diff --git a/conf/cmi/imagemagick.settings.yml b/conf/cmi/imagemagick.settings.yml index 37333701..6c8cb305 100644 --- a/conf/cmi/imagemagick.settings.yml +++ b/conf/cmi/imagemagick.settings.yml @@ -6,12 +6,6 @@ path_to_binaries: '' prepend: '' log_warnings: true debug: false -locale: en_US.UTF-8 -advanced: - density: 0 - colorspace: '0' - profile: '' - coalesce: false image_formats: PNG: mime_type: image/png @@ -59,3 +53,8 @@ image_formats: ICO: mime_type: image/vnd.microsoft.icon enabled: false +advanced: + density: 0 + colorspace: '0' + profile: '' + coalesce: false diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml index 8fc402f9..5c21c099 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml @@ -1,2 +1,2 @@ -label: Kaavio +label: Kaavioupotus description: 'Kaavio lohkolla voit lisätä upotettavan kaavion Power BI -palveluista.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml index 6a577a66..5888ac28 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml @@ -1,2 +1,2 @@ -label: Yhteystietokorttilistaus -description: 'Yhteystietokorttilistausparagraafi, johon voi lisätä henkilöiden yhteystietoja.' +label: Henkilöt +description: 'Paragraafi, johon voi lisätä henkilöiden yhteystietoja.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml index 1489cfe4..3cf63a6b 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml @@ -1,2 +1 @@ -label: Sisältönosto -description: 'Sisältönostolla voit nostaa yksittäisen sisällön tämän sivuston sisältä. Sisällön tiedot haetaan automaattisesti viitteen kautta ja sisältö esitetään korttinäkymässä.' +label: Toimipistekortti diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.job_search.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.job_search.yml new file mode 100644 index 00000000..c717e680 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.job_search.yml @@ -0,0 +1 @@ +label: Työpaikkahaku diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml index caebbfb3..a8863f3f 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml @@ -1,2 +1,2 @@ -label: Kartta +label: Karttaupotus description: 'Kartta lohkolla voit lisätä upotettavan kartan https://kartta.hel.fi tai https://palvelukartta.hel.fi -palveluista.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml index 27591fb1..21b5c1c3 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml @@ -1 +1 @@ -label: Uutislistaus +label: Uutiset diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml index 3f05477b..671a07f0 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml @@ -1,2 +1,2 @@ -label: 'Suositut palvelut' -description: 'Esittele suosittuja palveluita.' +label: 'Suositut sisällöt' +description: 'Esittele suosittuja sisältöjä.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml index 4359e926..33d4703c 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml @@ -1,2 +1,2 @@ -label: 'Video ulkoisesta palvelusta' +label: Videoupotus description: 'Tällä lohkolla voit upottaa videon ulkoisesta palvelusta. Tukee tällä hetkellä vain YouTubea.' diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card_listing.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card_listing.yml index ea0748ff..f14db273 100644 --- a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card_listing.yml +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card_listing.yml @@ -1,2 +1 @@ label: Kontaktkortlista -description: '' diff --git a/public/modules/custom/helfi_rekry_content/helfi_rekry_content.module b/public/modules/custom/helfi_rekry_content/helfi_rekry_content.module index a07e1988..1e463619 100644 --- a/public/modules/custom/helfi_rekry_content/helfi_rekry_content.module +++ b/public/modules/custom/helfi_rekry_content/helfi_rekry_content.module @@ -647,11 +647,21 @@ function helfi_rekry_content_page_attachments_alter(array &$attachments) { * Implements hook_helfi_paragraph_types(). */ function helfi_rekry_content_helfi_paragraph_types() : array { + // @todo UHF-9511 Remove the content liftup paragraph type. $entities = [ 'node' => [ 'landing_page' => [ 'field_content' => [ - 'job_search', + 'content_liftup' => 11, + 'job_search' => 15, + ], + ], + 'page' => [ + 'field_content' => [ + 'content_liftup' => 12, + ], + 'field_lower_content' => [ + 'content_liftup' => 12, ], ], ], @@ -661,8 +671,8 @@ function helfi_rekry_content_helfi_paragraph_types() : array { foreach ($entities as $entityTypeId => $bundles) { foreach ($bundles as $bundle => $fields) { foreach ($fields as $field => $paragraphTypes) { - foreach ($paragraphTypes as $paragraphType) { - $enabled[] = new ParagraphTypeCollection($entityTypeId, $bundle, $field, $paragraphType); + foreach ($paragraphTypes as $paragraphType => $weight) { + $enabled[] = new ParagraphTypeCollection($entityTypeId, $bundle, $field, $paragraphType, $weight); } } } diff --git a/tools/make/docker.mk b/tools/make/docker.mk index d7271e80..d48e4f0e 100644 --- a/tools/make/docker.mk +++ b/tools/make/docker.mk @@ -1,5 +1,6 @@ CLI_SERVICE := app CLI_SHELL := sh +# Note: specification says this file would be compose.yaml DOCKER_COMPOSE_YML_PATH ?= docker-compose.yml DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no) DOCKER_PROJECT_ROOT ?= /app @@ -75,7 +76,7 @@ endif ifeq ($(RUN_ON),docker) define docker_compose - @docker compose$(if $(filter docker-compose.yml,$(DOCKER_COMPOSE_YML_PATH)),, -f $(DOCKER_COMPOSE_YML_PATH)) $(1) + @docker compose$(if $(filter $(DOCKER_COMPOSE_YML_PATH),$(DOCKER_COMPOSE_YML_PATH)),, -f $(DOCKER_COMPOSE_YML_PATH)) $(1) endef else define docker_compose