From 0069c3d8c1afa3a9155b9a4b1164c6862e00d88a Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Sat, 14 Oct 2023 14:59:29 +0100 Subject: [PATCH 01/14] fix: add missing image_loading attribute to config --- .../optional/core.entity_view_display.media.image.default.yml | 2 ++ .../optional/core.entity_view_display.media.image.freestyle.yml | 2 ++ ....entity_view_display.media.image.localgov_featured_large.yml | 2 ++ .../core.entity_view_display.media.image.responsive_3x2.yml | 2 ++ .../core.entity_view_display.media.image.responsive_banner.yml | 2 ++ .../optional/core.entity_view_display.media.image.square.yml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml index 411c5a3..e776a49 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml @@ -18,6 +18,8 @@ content: settings: responsive_image_style: 3_2_image image_link: '' + image_loading: + attribute: lazy third_party_settings: {} weight: 1 region: content diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml index 13e7d07..cc1e96e 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: freestyle_responsive image_link: '' + image_loading: + attribute: lazy third_party_settings: { } weight: 1 region: content diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml index 89b6258..cba4a89 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: localgov_newsroom_featured image_link: '' + image_loading: + attribute: lazy third_party_settings: {} weight: 1 region: content diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml index 1f797a7..7beee29 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: 3_2_image image_link: '' + image_loading: + attribute: lazy third_party_settings: {} weight: 1 region: content diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml index 1345a3e..5e23d94 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: banner_28_9 image_link: '' + image_loading: + attribute: lazy third_party_settings: {} weight: 1 region: content diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml index 84315ed..05036bc 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: square image_link: '' + image_loading: + attribute: lazy third_party_settings: {} weight: 1 region: content From 4b2eb823700902faf0b99c1ff80c991d0bcf2b21 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Sat, 14 Oct 2023 15:25:36 +0100 Subject: [PATCH 02/14] ci: bump tests to Drupal 9.5 --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30b3e68..2806c02 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: matrix: include: - localgov-version: '2.x' - drupal-version: '~9.4' + drupal-version: '~9.5' php-version: '8.1' - localgov-version: '3.x' drupal-version: '~10.0' @@ -107,7 +107,7 @@ jobs: matrix: include: - localgov-version: '2.x' - drupal-version: '~9.4' + drupal-version: '~9.5' php-version: '8.1' - localgov-version: '3.x' drupal-version: '~10.0' @@ -143,7 +143,7 @@ jobs: matrix: include: - localgov-version: '2.x' - drupal-version: '~9.4' + drupal-version: '~9.5' php-version: '8.1' - localgov-version: '3.x' drupal-version: '~10.0' @@ -178,7 +178,7 @@ jobs: matrix: include: - localgov-version: '2.x' - drupal-version: '~9.4' + drupal-version: '~9.5' php-version: '8.1' - localgov-version: '3.x' drupal-version: '~10.0' From fcfe38cbb540b3e73fe0bb3d431d1d5e2c54a65e Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:47:05 +0100 Subject: [PATCH 03/14] feat: set to Drupal core to 10.1 minimum --- localgov_core.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_core.info.yml b/localgov_core.info.yml index 81659e9..bcd4f69 100644 --- a/localgov_core.info.yml +++ b/localgov_core.info.yml @@ -2,7 +2,7 @@ name: LocalGov Core description: LocalGov Drupal helper functions and core dependencies. package: LocalGov Drupal type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10.1 dependencies: - drupal:block From 1b9e8212447d8b05078097ae546acd28fb337aeb Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:47:20 +0100 Subject: [PATCH 04/14] ci: update workflow to use 3.x branch and 10.1 only --- .github/workflows/test.yml | 40 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2806c02..0529706 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,10 +3,10 @@ name: Test localgovdrupal/localgov_core drupal-module on: push: branches: - - '2.x' + - '3.x' pull_request: branches: - - '2.x' + - '3.x' env: LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_core @@ -22,12 +22,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '2.x' - drupal-version: '~9.5' - php-version: '8.1' - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: '8.1' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -106,12 +105,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '2.x' - drupal-version: '~9.5' - php-version: '8.1' - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: '8.1' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -142,12 +140,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '2.x' - drupal-version: '~9.5' - php-version: '8.1' - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: '8.1' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -177,12 +174,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '2.x' - drupal-version: '~9.5' - php-version: '8.1' - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: '8.1' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: From d5d449c8ed2be7304ceadce68b032f0a42ea34d5 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:50:31 +0100 Subject: [PATCH 05/14] ci: fix matrix --- .github/workflows/test.yml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0529706..5031ce7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,11 +22,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + localgov-version: '3.x' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -105,11 +105,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + localgov-version: '3.x' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -140,11 +140,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + localgov-version: '3.x' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -174,11 +174,11 @@ jobs: fail-fast: false matrix: include: - - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + localgov-version: '3.x' + drupal-version: '~10.1' + php-version: + - '8.1' + - '8.2' steps: From a4f75d4c5625769ce96f7ab02ca2efab8babf2b3 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:52:30 +0100 Subject: [PATCH 06/14] ci: fix matrix --- .github/workflows/test.yml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5031ce7..99222af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,11 +22,11 @@ jobs: fail-fast: false matrix: include: - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: + - '8.1' + - '8.2' steps: @@ -105,11 +105,11 @@ jobs: fail-fast: false matrix: include: - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: + - '8.1' + - '8.2' steps: @@ -140,11 +140,11 @@ jobs: fail-fast: false matrix: include: - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: + - '8.1' + - '8.2' steps: @@ -174,11 +174,11 @@ jobs: fail-fast: false matrix: include: - localgov-version: '3.x' - drupal-version: '~10.1' - php-version: - - '8.1' - - '8.2' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: + - '8.1' + - '8.2' steps: From 3bf1fa7f92a581716a2996aa71bfdea3d34b893d Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:57:05 +0100 Subject: [PATCH 07/14] ci: fix matrix --- .github/workflows/test.yml | 52 ++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99222af..7b08076 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,12 +21,13 @@ jobs: strategy: fail-fast: false matrix: - include: - - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: - - '8.1' - - '8.2' + localgov-version: + - '3.x' + drupal-version: + - '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -104,12 +105,13 @@ jobs: strategy: fail-fast: false matrix: - include: - - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: - - '8.1' - - '8.2' + localgov-version: + - '3.x' + drupal-version: + - '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -139,12 +141,13 @@ jobs: strategy: fail-fast: false matrix: - include: - - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: - - '8.1' - - '8.2' + localgov-version: + - '3.x' + drupal-version: + - '~10.1' + php-version: + - '8.1' + - '8.2' steps: @@ -173,12 +176,13 @@ jobs: strategy: fail-fast: false matrix: - include: - - localgov-version: '3.x' - drupal-version: '~10.0' - php-version: - - '8.1' - - '8.2' + localgov-version: + - '3.x' + drupal-version: + - '~10.1' + php-version: + - '8.1' + - '8.2' steps: From 8220c368a7e2addbadb02b65d5819174cf622b14 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 10 Jan 2024 16:00:42 +0000 Subject: [PATCH 08/14] Fix tests using Paratest in Github Actions --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30b3e68..7e949a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -208,4 +208,4 @@ jobs: mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html' - docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}" + docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}" From 8f3d01471fec7d3be415b8bd58fa06d93572e3c9 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Wed, 17 Jan 2024 10:19:22 +0100 Subject: [PATCH 09/14] allows CSV files to be uploaded for media document --- .../field.field.media.document.field_media_document.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml b/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml index 80a3646..b8cf02c 100644 --- a/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml +++ b/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml @@ -21,7 +21,7 @@ default_value: { } default_value_callback: '' settings: file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages' + file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages csv' max_filesize: '' handler: 'default:file' handler_settings: { } From 7d5b1e24f223cb28faa8193defb6a8ee506bbcac Mon Sep 17 00:00:00 2001 From: Andy Broomfield Date: Mon, 19 Feb 2024 11:54:23 +0000 Subject: [PATCH 10/14] Define a constant for the user manager role Fix #203 For completeness, define user manager role constant in RolesHelper for modules that use hook_localgov_roles_default to also assign roles to the user manager. --- modules/localgov_roles/src/RolesHelper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/localgov_roles/src/RolesHelper.php b/modules/localgov_roles/src/RolesHelper.php index 8f39a89..459d913 100644 --- a/modules/localgov_roles/src/RolesHelper.php +++ b/modules/localgov_roles/src/RolesHelper.php @@ -22,6 +22,11 @@ class RolesHelper { */ const CONTRIBUTOR_ROLE = 'localgov_contributor'; + /** + * User manager role machine name. + */ + const USER_MANAGER_ROLE = 'localgov_user_manager'; + /** * Assign permissions to roles if module has defaults. */ From 004ad6db8a9371152ff32311acc629f1c9a0d714 Mon Sep 17 00:00:00 2001 From: Andy Broomfield Date: Mon, 19 Feb 2024 12:06:15 +0000 Subject: [PATCH 11/14] cs: fix strict types in media setup test Fix #205 --- modules/localgov_media/tests/src/Functional/MediaSetupTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localgov_media/tests/src/Functional/MediaSetupTest.php b/modules/localgov_media/tests/src/Functional/MediaSetupTest.php index ea226cf..3bcd8ff 100644 --- a/modules/localgov_media/tests/src/Functional/MediaSetupTest.php +++ b/modules/localgov_media/tests/src/Functional/MediaSetupTest.php @@ -1,6 +1,6 @@ Date: Wed, 13 Mar 2024 15:39:56 +0000 Subject: [PATCH 12/14] Fixed coding standards #207 --- modules/localgov_media/tests/src/Functional/MediaSetupTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localgov_media/tests/src/Functional/MediaSetupTest.php b/modules/localgov_media/tests/src/Functional/MediaSetupTest.php index ea226cf..3bcd8ff 100644 --- a/modules/localgov_media/tests/src/Functional/MediaSetupTest.php +++ b/modules/localgov_media/tests/src/Functional/MediaSetupTest.php @@ -1,6 +1,6 @@ Date: Thu, 14 Mar 2024 13:17:58 +0000 Subject: [PATCH 13/14] Add workflow_dispatch to allow us to trigger the workflow without a commit in the Github UI. --- .github/workflows/test.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b08076..60fe315 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - '3.x' + workflow_dispatch: env: LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_core @@ -21,11 +22,11 @@ jobs: strategy: fail-fast: false matrix: - localgov-version: + localgov-version: - '3.x' drupal-version: - '~10.1' - php-version: + php-version: - '8.1' - '8.2' @@ -105,11 +106,11 @@ jobs: strategy: fail-fast: false matrix: - localgov-version: + localgov-version: - '3.x' drupal-version: - '~10.1' - php-version: + php-version: - '8.1' - '8.2' @@ -141,11 +142,11 @@ jobs: strategy: fail-fast: false matrix: - localgov-version: + localgov-version: - '3.x' drupal-version: - '~10.1' - php-version: + php-version: - '8.1' - '8.2' @@ -176,11 +177,11 @@ jobs: strategy: fail-fast: false matrix: - localgov-version: + localgov-version: - '3.x' drupal-version: - '~10.1' - php-version: + php-version: - '8.1' - '8.2' From 23c5581d330d6c28cedfd754cc93ee574b4342da Mon Sep 17 00:00:00 2001 From: Finn Lewis Date: Thu, 14 Mar 2024 15:46:47 +0000 Subject: [PATCH 14/14] Update test.yml to target 2.x branch of this repo for testing. --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9166152..6cef1e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,10 +3,10 @@ name: Test localgovdrupal/localgov_core drupal-module on: push: branches: - - '3.x' + - '2.x' pull_request: branches: - - '3.x' + - '2.x' workflow_dispatch: env: