Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: UN-OCHA/odsg8-site
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.2
Choose a base ref
...
head repository: UN-OCHA/odsg8-site
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jul 17, 2024

  1. Merge pull request #337 from UN-OCHA/main

    Merge main back into develop after a production deployment by Andy Footner 2024-07-17.0831.
    lazysoundsystem authored Jul 17, 2024
    Copy the full SHA
    32e6713 View commit details

Commits on Jul 18, 2024

  1. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d242325 View commit details
  2. Merge pull request #339 from UN-OCHA/update/patch-32e6713

    Automatic Composer Update
    lazysoundsystem authored Jul 18, 2024
    Copy the full SHA
    f037446 View commit details
  3. chore: remove csp and uninstall classy theme

    Refs: ODSG-47
    lazysoundsystem committed Jul 18, 2024
    Copy the full SHA
    56c84a5 View commit details
  4. Merge pull request #340 from UN-OCHA/ODSG-47-package-removal

    chore: remove csp and uninstall classy theme
    lazysoundsystem authored Jul 18, 2024
    Copy the full SHA
    c60d42c View commit details

Commits on Jul 25, 2024

  1. Copy the full SHA
    ef58458 View commit details
  2. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Jul 25, 2024
    Copy the full SHA
    012c64e View commit details
  3. Merge pull request #341 from UN-OCHA/update/patch-ef58458

    Automatic Composer Update
    lazysoundsystem authored Jul 25, 2024
    Copy the full SHA
    df92fb7 View commit details
  4. Merge pull request #342 from UN-OCHA/OPS-10638-weekly-updates

    chore: update patches and sfp module
    lazysoundsystem authored Jul 25, 2024
    Copy the full SHA
    b16bce6 View commit details

Commits on Aug 1, 2024

  1. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Aug 1, 2024
    Copy the full SHA
    8abf576 View commit details
  2. Merge pull request #343 from UN-OCHA/update/patch-b16bce6

    Automatic Composer Update
    lazysoundsystem authored Aug 1, 2024
    Copy the full SHA
    d3ce1b1 View commit details

Commits on Aug 8, 2024

  1. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Aug 8, 2024
    Copy the full SHA
    a901db9 View commit details
  2. feat: Grep PHP logs on failure

    cafuego authored Aug 8, 2024
    Copy the full SHA
    ff4d770 View commit details

Commits on Aug 12, 2024

  1. chore: update cd only

    Refs: OPS-10638
    lazysoundsystem committed Aug 12, 2024
    Copy the full SHA
    3bdae77 View commit details
  2. Merge pull request #347 from UN-OCHA/update/cd-only

    chore: update cd only
    lazysoundsystem authored Aug 12, 2024
    Copy the full SHA
    0ded350 View commit details
  3. chore: update contrib modules

    Refs: OPS-10638
    lazysoundsystem committed Aug 12, 2024
    Copy the full SHA
    cf11a12 View commit details
  4. Merge pull request #348 from UN-OCHA/update/other-modules

    chore: update contrib modules
    lazysoundsystem authored Aug 12, 2024
    Copy the full SHA
    43c01a4 View commit details

Commits on Aug 13, 2024

  1. Merge pull request #350 from UN-OCHA/develop

    Deploy 14-08-2024
    lazysoundsystem authored Aug 13, 2024
    Copy the full SHA
    85534c2 View commit details

Commits on Aug 14, 2024

  1. Merge branch 'develop' into update/patch-d3ce1b1

    lazysoundsystem authored Aug 14, 2024
    Copy the full SHA
    6b47e82 View commit details

Commits on Aug 15, 2024

  1. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Aug 15, 2024
    Copy the full SHA
    408aac0 View commit details

Commits on Aug 16, 2024

  1. Update PHPUnit

    attiks committed Aug 16, 2024
    Copy the full SHA
    9e89d41 View commit details
  2. chore: Split step

    attiks committed Aug 16, 2024
    Copy the full SHA
    e16c7fb View commit details
  3. chore: Do not fail on import

    attiks committed Aug 16, 2024
    Copy the full SHA
    53f964a View commit details
  4. chore: Do not fail on import

    attiks committed Aug 16, 2024
    Copy the full SHA
    6efda2b View commit details
  5. Merge pull request #352 from UN-OCHA/update/patch-43c01a4

    Automatic Composer Update
    attiks authored Aug 16, 2024
    Copy the full SHA
    74d1f76 View commit details
  6. chore(deps-dev): Bump axios

    Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.4.
    - [Release notes](https://github.com/axios/axios/releases)
    - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
    - [Commits](axios/axios@v1.6.7...v1.7.4)
    
    ---
    updated-dependencies:
    - dependency-name: axios
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 16, 2024
    Copy the full SHA
    909c143 View commit details

Commits on Aug 19, 2024

  1. Merge pull request #353 from UN-OCHA/dependabot/npm_and_yarn/html/the…

    …mes/custom/common_design_subtheme/axios-1.7.4
    
    chore(deps-dev): Bump axios from 1.6.7 to 1.7.4 in /html/themes/custom/common_design_subtheme
    lazysoundsystem authored Aug 19, 2024
    Copy the full SHA
    4726415 View commit details
  2. Merge branch 'develop' into update/patch-d3ce1b1

    lazysoundsystem authored Aug 19, 2024
    Copy the full SHA
    36c706b View commit details
  3. Merge pull request #345 from UN-OCHA/update/patch-d3ce1b1

    Automatic Composer Update
    lazysoundsystem authored Aug 19, 2024
    Copy the full SHA
    e5ecab3 View commit details
  4. chore: domains for google ads

    Refs: OPS-10638
    lazysoundsystem committed Aug 19, 2024
    Copy the full SHA
    f5d5317 View commit details
  5. Merge pull request #354 from UN-OCHA/OPS-10638-more-csp

    chore: domains for google ads
    lazysoundsystem authored Aug 19, 2024
    Copy the full SHA
    d7f1ac7 View commit details
  6. chore: straighten csp settings

    Refs: OPS-10638
    lazysoundsystem committed Aug 19, 2024
    Copy the full SHA
    369a114 View commit details
  7. Merge pull request #355 from UN-OCHA/OPS-10638-more-csp

    chore: straighten csp settings
    lazysoundsystem authored Aug 19, 2024
    Copy the full SHA
    38cd44d View commit details

Commits on Aug 22, 2024

  1. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Aug 22, 2024
    Copy the full SHA
    49c5fb2 View commit details
  2. Merge pull request #356 from UN-OCHA/update/patch-38cd44d

    Automatic Composer Update
    lazysoundsystem authored Aug 22, 2024
    Copy the full SHA
    45d198c View commit details

Commits on Aug 27, 2024

  1. Merge pull request #357 from UN-OCHA/develop

    Deploy 28-08-2024
    lazysoundsystem authored Aug 27, 2024
    Copy the full SHA
    abd3564 View commit details

Commits on Aug 28, 2024

  1. fix: js optimizer errors

    Refs: IASC-799
    lazysoundsystem committed Aug 28, 2024
    Copy the full SHA
    2413d9c View commit details
  2. Merge pull request #358 from UN-OCHA/main

    Merge main back into develop after a production deployment by Andy Footner 2024-08-28.0832.
    lazysoundsystem authored Aug 28, 2024
    Copy the full SHA
    bfc17c8 View commit details
  3. Merge pull request #359 from UN-OCHA/IASC-799-js-optimizer

    fix: js optimizer errors
    lazysoundsystem authored Aug 28, 2024
    Copy the full SHA
    7dfa1de View commit details
  4. Merge pull request #360 from UN-OCHA/develop

    Deploy 18-08-2024
    lazysoundsystem authored Aug 28, 2024
    Copy the full SHA
    49a18ff View commit details
  5. Merge pull request #361 from UN-OCHA/main

    Merge main back into develop after a production deployment by Andy Footner 2024-08-28.1045.
    lazysoundsystem authored Aug 28, 2024
    Copy the full SHA
    c192832 View commit details
  6. chore: remove unused classy theme

    Refs: ODSG-47
    lazysoundsystem committed Aug 28, 2024
    Copy the full SHA
    7b835a3 View commit details
  7. Merge branch 'develop' into ODSG-47-remove-classy

    lazysoundsystem authored Aug 28, 2024
    Copy the full SHA
    f422d08 View commit details
  8. Merge pull request #362 from UN-OCHA/ODSG-47-remove-classy

    chore: remove unused classy theme
    lazysoundsystem authored Aug 28, 2024
    Copy the full SHA
    2fe6a80 View commit details

Commits on Aug 29, 2024

  1. chore: Update all outdated drupal/* unocha/* drush/* packages.

    unocha-jenkins committed Aug 29, 2024
    Copy the full SHA
    5d311d6 View commit details
  2. Merge pull request #363 from UN-OCHA/update/patch-2fe6a80

    Automatic Composer Update
    lazysoundsystem authored Aug 29, 2024
    Copy the full SHA
    761ee75 View commit details
  3. fix: include core patch for aggregation error

    Refs: OPS-10532
    lazysoundsystem committed Aug 29, 2024
    Copy the full SHA
    694c1f9 View commit details
  4. Merge pull request #364 from UN-OCHA/OPS-10532-aggregation-fix

    fix: include core patch for aggregation error
    lazysoundsystem authored Aug 29, 2024
    Copy the full SHA
    281c1a1 View commit details

Commits on Sep 3, 2024

  1. chore: add iso3 codes to css to handle both formats

    Refs: ODSG-49
    lazysoundsystem committed Sep 3, 2024
    Copy the full SHA
    7e3b02c View commit details
  2. Merge pull request #365 from UN-OCHA/ODSG-49-iso3-codes

    chore: add iso3 codes to css to handle both formats
    lazysoundsystem authored Sep 3, 2024
    Copy the full SHA
    c067074 View commit details
Showing with 2,841 additions and 2,121 deletions.
  1. +11 −0 .changelog
  2. +3 −1 .github/workflows/composer-update.yml
  3. +28 −2 .github/workflows/run-tests.yml
  4. +448 −0 CHANGELOG.md
  5. +0 −18 PATCHES/amazon_ses-3417090-cron-queue-14.patch
  6. +23 −0 PATCHES/amazon_ses-cron-queue-3417090-8.patch
  7. +53 −0 PATCHES/core_js_optimizer.patch
  8. +0 −187 PATCHES/user_expire-customize-notification-email.patch
  9. +11 −11 PATCHES/user_expire-reset-expiration-on-reactivation.patch
  10. +15 −13 composer.json
  11. +1,734 −1,576 composer.lock
  12. +2 −5 composer.patches.json
  13. +1 −0 config/aws.profile.amazon_ses.yml
  14. +0 −1 config/config_split.config_split.config_dev.yml
  15. +1 −5 config/core.entity_form_display.node.announcement.default.yml
  16. +2 −9 config/core.entity_form_display.node.page.default.yml
  17. +1 −5 config/core.entity_form_display.node.public_page.default.yml
  18. +0 −2 config/core.extension.yml
  19. +3 −7 config/field.field.node.announcement.body.yml
  20. +3 −7 config/field.field.node.odsg_document.body.yml
  21. +3 −7 config/field.field.node.page.body.yml
  22. +3 −7 config/field.field.node.page.field_sidebar.yml
  23. +3 −7 config/field.field.node.public_page.body.yml
  24. +4 −4 config/seckit.settings.yml
  25. +9 −4 config/user_expire.settings.yml
  26. +470 −235 ...es/custom/common_design_subtheme/components/odsg-donor-ranking-table/odsg-donor-ranking-table.css
  27. +4 −4 html/themes/custom/common_design_subtheme/package-lock.json
  28. +1 −1 local/docker-compose.yml
  29. +2 −2 phpunit.xml
  30. +3 −1 tests/docker-compose.yml
11 changes: 11 additions & 0 deletions .changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

return [
'ignoreTypes' => ['build', 'ci', 'docs', 'refactor', 'revert', 'style', 'test'],
'tagPrefix' => 'v',
'tagSuffix' => '',
'commitUrlFormat' => '{{host}}/{{owner}}/{{repository}}/commit/{{hash}}',
'compareUrlFormat' => '{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}',
'issueUrlFormat' => 'https://humanitarian.atlassian.net/browse/{{id}}',
'hiddenVersionSeparator' => true,
];
4 changes: 3 additions & 1 deletion .github/workflows/composer-update.yml
Original file line number Diff line number Diff line change
@@ -13,8 +13,10 @@ jobs:
id: update-action
uses: UN-OCHA/actions/composer-update@main
with:
aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
github_access_token: ${{ secrets.PAT }}
patch_branch: 'develop'
patch_branch: ${{ github.head_ref || github.ref_name }}
patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
slack_channel_name: ${{ vars.SLACK_CHANNEL }}
30 changes: 28 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -129,14 +129,21 @@ jobs:
env:
fail-fast: true

- name: Run tests
id: tests
- name: Import test content
id: import
continue-on-error: true
uses: cafuego/command-output@main
with:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal drush -y en dblog
docker compose -f tests/docker-compose.yml exec -T drupal drush en yaml_content -y
docker compose -f tests/docker-compose.yml exec -T drupal drush yaml-content-import /srv/www/tests
- name: Make directories
id: dirs
uses: cafuego/command-output@main
with:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files /srv/www/html/sites/default/private
docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/build/logs
docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs
@@ -146,6 +153,14 @@ jobs:
docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/coverage
docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/simpletest
docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/simpletest
env:
fail-fast: true

- name: Run tests
id: tests
uses: cafuego/command-output@main
with:
run: |
docker compose -f tests/docker-compose.yml exec -u appuser -T -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e DTT_BASE_URL=http://127.0.0.1 -e SIMPLETEST_BASE_URL=http://127.0.0.1 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
env:
fail-fast: true
@@ -175,6 +190,14 @@ jobs:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show
- name: PHP Logs
id: phplog
if: failure()
uses: cafuego/command-output@main
with:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal grep -i fatal /var/log/php/error.log
- name: Find Comment
uses: peter-evans/find-comment@v3
if: ${{ !env.ACT }}
@@ -207,6 +230,9 @@ jobs:
<details><summary>Drupal Logs</summary>
<code>${{ steps.dblog.outputs.stdout }}</code>
</details>
<details><summary>PHP Logs</summary>
<code>${{ steps.phplog.outputs.stdout }}</code>
</details>
*Pusher: @${{ github.actor }}, Action: `${{ github.event_name }}`, Workflow: `${{ github.workflow }}`*
edit-mode: replace
448 changes: 448 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions PATCHES/amazon_ses-3417090-cron-queue-14.patch

This file was deleted.

23 changes: 23 additions & 0 deletions PATCHES/amazon_ses-cron-queue-3417090-8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/amazon_ses.module b/amazon_ses.module
new file mode 100644
index 0000000..b778644
--- /dev/null
+++ b/amazon_ses.module
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Hooks for the amazon_ses module.
+ */
+
+/**
+ * Implements hook_queue_info_alter().
+ */
+function amazon_ses_queue_info_alter(&$queues) {
+ $enabled = \Drupal::config('amazon_ses.settings')->get('queue');
+
+ if (!$enabled && isset($queues['amazon_ses_mail_queue']['cron'])) {
+ unset($queues['amazon_ses_mail_queue']['cron']);
+ }
+}
53 changes: 53 additions & 0 deletions PATCHES/core_js_optimizer.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php
index 647a2c36a017f890c0e43bbdb350084989b1a7f1..3912afe5a9feeaae235c640cd89816091c7e97be 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php
@@ -155,24 +155,32 @@ public function deleteAll() {
public function optimizeGroup(array $group): string {
$data = '';
$current_license = FALSE;
- foreach ($group['items'] as $js_asset) {
- // Ensure license information is available as a comment after
- // optimization.
- if ($js_asset['license'] !== $current_license) {
- $data .= "/* @license " . $js_asset['license']['name'] . " " . $js_asset['license']['url'] . " */\n";
- }
- $current_license = $js_asset['license'];
- // Optimize this JS file, but only if it's not yet minified.
- if (isset($js_asset['minified']) && $js_asset['minified']) {
- $data .= file_get_contents($js_asset['data']);
- }
- else {
- $data .= $this->optimizer->optimize($js_asset);
+
+ // No preprocessing, single JS asset: just use the existing URI.
+ if ($group['type'] === 'file' && !$group['preprocess']) {
+ $data = file_get_contents($group['items'][0]['data']);
+ }
+ else {
+ foreach ($group['items'] as $js_asset) {
+ // Ensure license information is available as a comment after
+ // optimization.
+ if ($js_asset['license'] !== $current_license) {
+ $data .= "/* @license " . $js_asset['license']['name'] . " " . $js_asset['license']['url'] . " */\n";
+ }
+ $current_license = $js_asset['license'];
+ // Optimize this JS file, but only if it's not yet minified.
+ if (isset($js_asset['minified']) && $js_asset['minified']) {
+ $data .= file_get_contents($js_asset['data']);
+ }
+ else {
+ $data .= $this->optimizer->optimize($js_asset);
+ }
+ // Append a ';' and a newline after each JS file to prevent them from
+ // running together.
+ $data .= ";\n";
}
- // Append a ';' and a newline after each JS file to prevent them from
- // running together.
- $data .= ";\n";
}
+
// Remove unwanted JS code that causes issues.
return $this->optimizer->clean($data);
}
187 changes: 0 additions & 187 deletions PATCHES/user_expire-customize-notification-email.patch

This file was deleted.

22 changes: 11 additions & 11 deletions PATCHES/user_expire-reset-expiration-on-reactivation.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/tests/src/Functional/UserExpireTest.php b/tests/src/Functional/UserExpireTest.php
index fb5180d8bc697603e46a4cf8debba8f07ef7552c..6bc1bb618ebfad3726fb0e0d5163f21aabbae3d1 100644
index c746350f47259d17d458e4cfdee81e541ea55062..b427dfee1793e26094154573375f66927b56e7be 100644
--- a/tests/src/Functional/UserExpireTest.php
+++ b/tests/src/Functional/UserExpireTest.php
@@ -161,6 +161,18 @@ class UserExpireTest extends BrowserTestBase {
@@ -167,6 +167,18 @@ class UserExpireTest extends BrowserTestBase {
// Ensure they are disabled.
$this->drupalGet("user/" . $new_basic_account->id() . "/edit");
$this->assertSession()->responseContains('type="radio" id="edit-status-0" name="status" value="0" checked="checked" class="form-radio"', $this->t('User account is currently disabled.'));
+
+ // Manually unblock the user.
+ $edit = [];
+ $edit['status'] = 1;
+ $this->drupalPostForm("user/" . $new_basic_account->id() . "/edit", $edit, $this->t('Save'));
+ $this->submitForm($edit, $this->t('Save'));
+
+ // Process it.
+ user_expire_expire_by_role();
@@ -22,18 +22,18 @@ index fb5180d8bc697603e46a4cf8debba8f07ef7552c..6bc1bb618ebfad3726fb0e0d5163f21a

}
diff --git a/user_expire.module b/user_expire.module
index cb2958708e8063270d4765ec999009ea51f81ee9..9d7e157fbd908763521551237a7e2cc8d9a4abad 100644
index d4dcd8ba28b51ee8f54a7626d8b10443244520d9..fae1de17d4bb1b0a1a3819446c65817daaccf424 100644
--- a/user_expire.module
+++ b/user_expire.module
@@ -9,6 +9,7 @@ use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Datetime\DrupalDateTime;
@@ -12,6 +12,7 @@ use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
+use Drupal\user\Entity\User;
use Drupal\user\RoleInterface;
use Drupal\Core\Url;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -462,3 +463,15 @@ function user_expire_mail($key, &$message, $params) {

/**
@@ -456,3 +457,15 @@ function user_expire_mail($key, &$message, $params): void {
$message['body'][] = t('Thanks, @site_name', ['@site_name' => $site_name]);
}
}
28 changes: 15 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
@@ -27,15 +27,12 @@
"drupal/allowed_formats": "^3",
"drupal/amazon_ses": "^3",
"drupal/aws": "dev-2.0.x",
"drupal/classy": "^1.0",
"drupal/components": "^3.0@beta",
"drupal/config_filter": "^2.4",
"drupal/config_split": "^2.0@rc",
"drupal/config_split": "^2.0",
"drupal/core-composer-scaffold": "^10",
"drupal/core-dev": "^10",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10",
"drupal/csp": "^1.20",
"drupal/ctools": "^4.0",
"drupal/editor_advanced_link": "^2.2",
"drupal/environment_indicator": "^4.0",
@@ -46,9 +43,8 @@
"drupal/redirect": "^1.8",
"drupal/seckit": "^2.0",
"drupal/social_auth_hid": "^3.2",
"drupal/stable": "^2.0",
"drupal/stage_file_proxy": "^2.1",
"drupal/user_expire": "^1.1",
"drupal/stage_file_proxy": "^3",
"drupal/user_expire": "^2",
"drupal/username_enumeration_prevention": "^1.3",
"drush/drush": "^12",
"oomphinc/composer-installers-extender": "^2.0",
@@ -58,6 +54,7 @@
"unocha/ocha_monitoring": "^1.0"
},
"require-dev": {
"davidrjonas/composer-lock-diff": "^1.7",
"drupal/coder": "^8.3",
"drupal/config_inspector": "^2.1",
"drupal/devel": "^5.0.2",
@@ -94,11 +91,15 @@
"drupal/core-project-message": true,
"oomphinc/composer-installers-extender": true,
"orakili/composer-drupal-info-file-patch-helper": true,
"php-http/discovery": true,
"phpstan/extension-installer": true,
"php-http/discovery": true
"tbachert/spi": true
},
"audit": {
"abandoned": "report"
"abandoned": "report",
"ignore": {
"GHSA-mg8j-w93w-xjgc": "OPS-10899 - we do not store the hash salt in a file"
}
}
},
"extra": {
@@ -154,7 +155,7 @@
},
"[web-root]/robots.txt": {
"append": "assets/robots.txt.append"
}
}
},
"locations": {
"web-root": "html/"
@@ -175,7 +176,7 @@
],
"post-create-project-cmd-message": [
"<bg=blue;fg=white> </>",
"<bg=blue;fg=white> Congratulations, you\u2019ve installed the Drupal codebase </>",
"<bg=blue;fg=white> Congratulations, you’ve installed the Drupal codebase </>",
"<bg=blue;fg=white> from the drupal/recommended-project template! </>",
"<bg=blue;fg=white> </>",
"",
@@ -226,5 +227,6 @@
"pre-pool-create": [
"scripts\\composer\\DrupalLenientRequirement::changeVersionConstraint"
]
}
}
},
"version": "2.1.12"
}
3,310 changes: 1,734 additions & 1,576 deletions composer.lock

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions composer.patches.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
{
"patches": {
"drupal/amazon_ses": {
"Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-3417090-cron-queue-14.patch"
"Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-cron-queue-3417090-8.patch"
},
"drupal/core": {
"Js optimize error https://www.drupal.org/project/drupal/issues/3416508": "PATCHES/core_js_optimizer.patch",
"Views PHP 8.2 compatibility": "PATCHES/core-views-php-82-compatibility.patch"
},
"drupal/csp": {
"Simplify log format": "PATCHES/csp-log-format.patch"
},
"drupal/stage_file_proxy": {
"Stage file proxy attempts to fetch aggregated JS/CSS": "PATCHES/stage_file_proxy_3372105.patch"
},
"drupal/user_expire": {
"Allow the notification email to be customised": "PATCHES/user_expire-customize-notification-email.patch",
"Reset expiration when user is reactivated": "PATCHES/user_expire-reset-expiration-on-reactivation.patch"
},
"drupal/username_enumeration_prevention": {
1 change: 1 addition & 0 deletions config/aws.profile.amazon_ses.yml
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ id: amazon_ses
name: 'Amazon SES'
default: 1
aws_role_arn: ''
aws_role_session_name: null
aws_access_key_id: ''
aws_secret_access_key: ''
region: us-east-1
1 change: 0 additions & 1 deletion config/config_split.config_split.config_dev.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ no_patching: false
storage: folder
folder: ../config_dev
module:
config_filter: 0
dblog: 0
environment_indicator_ui: 0
stage_file_proxy: 0
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ dependencies:
- field.field.node.announcement.body
- node.type.announcement
module:
- allowed_formats
- text
id: node.announcement.default
targetEntityType: node
@@ -22,10 +21,7 @@ content:
summary_rows: 3
placeholder: ''
show_summary: false
third_party_settings:
allowed_formats:
hide_help: '0'
hide_guidelines: '0'
third_party_settings: { }
status:
type: boolean_checkbox
weight: 2
11 changes: 2 additions & 9 deletions config/core.entity_form_display.node.page.default.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ dependencies:
- field.field.node.page.layout_builder__layout
- node.type.page
module:
- allowed_formats
- text
id: node.page.default
targetEntityType: node
@@ -24,21 +23,15 @@ content:
summary_rows: 3
placeholder: ''
show_summary: false
third_party_settings:
allowed_formats:
hide_help: '0'
hide_guidelines: '0'
third_party_settings: { }
field_sidebar:
type: text_textarea
weight: 2
region: content
settings:
rows: 20
placeholder: ''
third_party_settings:
allowed_formats:
hide_help: '0'
hide_guidelines: '0'
third_party_settings: { }
status:
type: boolean_checkbox
weight: 3
6 changes: 1 addition & 5 deletions config/core.entity_form_display.node.public_page.default.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ dependencies:
- field.field.node.public_page.layout_builder__layout
- node.type.public_page
module:
- allowed_formats
- path
- text
id: node.public_page.default
@@ -24,10 +23,7 @@ content:
summary_rows: 3
placeholder: ''
show_summary: false
third_party_settings:
allowed_formats:
hide_help: '0'
hide_guidelines: '0'
third_party_settings: { }
path:
type: path
weight: 3
2 changes: 0 additions & 2 deletions config/core.extension.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ _core:
default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
module:
admin_denied: 0
allowed_formats: 0
amazon_ses: 0
aws: 0
block: 0
@@ -68,7 +67,6 @@ module:
minimal: 1000
theme:
stable: 0
classy: 0
claro: 0
common_design: 0
common_design_subtheme: 0
10 changes: 3 additions & 7 deletions config/field.field.node.announcement.body.yml
Original file line number Diff line number Diff line change
@@ -4,15 +4,10 @@ status: true
dependencies:
config:
- field.storage.node.body
- filter.format.filtered_html
- node.type.announcement
module:
- allowed_formats
- text
third_party_settings:
allowed_formats:
filtered_html: filtered_html
plain_text: '0'
full_html: '0'
id: node.announcement.body
field_name: body
entity_type: node
@@ -26,5 +21,6 @@ default_value_callback: ''
settings:
display_summary: false
required_summary: false
allowed_formats: { }
allowed_formats:
- filtered_html
field_type: text_with_summary
10 changes: 3 additions & 7 deletions config/field.field.node.odsg_document.body.yml
Original file line number Diff line number Diff line change
@@ -4,15 +4,10 @@ status: true
dependencies:
config:
- field.storage.node.body
- filter.format.plain_text
- node.type.odsg_document
module:
- allowed_formats
- text
third_party_settings:
allowed_formats:
plain_text: plain_text
full_html: '0'
filtered_html: '0'
id: node.odsg_document.body
field_name: body
entity_type: node
@@ -26,5 +21,6 @@ default_value_callback: ''
settings:
display_summary: false
required_summary: false
allowed_formats: { }
allowed_formats:
- plain_text
field_type: text_with_summary
10 changes: 3 additions & 7 deletions config/field.field.node.page.body.yml
Original file line number Diff line number Diff line change
@@ -4,15 +4,10 @@ status: true
dependencies:
config:
- field.storage.node.body
- filter.format.filtered_html
- node.type.page
module:
- allowed_formats
- text
third_party_settings:
allowed_formats:
filtered_html: filtered_html
plain_text: '0'
full_html: '0'
id: node.page.body
field_name: body
entity_type: node
@@ -26,5 +21,6 @@ default_value_callback: ''
settings:
display_summary: false
required_summary: false
allowed_formats: { }
allowed_formats:
- filtered_html
field_type: text_with_summary
10 changes: 3 additions & 7 deletions config/field.field.node.page.field_sidebar.yml
Original file line number Diff line number Diff line change
@@ -4,15 +4,10 @@ status: true
dependencies:
config:
- field.storage.node.field_sidebar
- filter.format.filtered_html
- node.type.page
module:
- allowed_formats
- text
third_party_settings:
allowed_formats:
filtered_html: filtered_html
plain_text: '0'
full_html: '0'
id: node.page.field_sidebar
field_name: field_sidebar
entity_type: node
@@ -24,5 +19,6 @@ translatable: false
default_value: { }
default_value_callback: ''
settings:
allowed_formats: { }
allowed_formats:
- filtered_html
field_type: text_long
10 changes: 3 additions & 7 deletions config/field.field.node.public_page.body.yml
Original file line number Diff line number Diff line change
@@ -4,15 +4,10 @@ status: true
dependencies:
config:
- field.storage.node.body
- filter.format.filtered_html
- node.type.public_page
module:
- allowed_formats
- text
third_party_settings:
allowed_formats:
filtered_html: filtered_html
plain_text: '0'
full_html: '0'
id: node.public_page.body
field_name: body
entity_type: node
@@ -26,5 +21,6 @@ default_value_callback: ''
settings:
display_summary: false
required_summary: false
allowed_formats: { }
allowed_formats:
- filtered_html
field_type: text_with_summary
8 changes: 4 additions & 4 deletions config/seckit.settings.yml
Original file line number Diff line number Diff line change
@@ -8,16 +8,16 @@ seckit_xss:
webkit: false
report-only: false
default-src: "'self'"
script-src: "'self' 'unsafe-inline' fonts.googleapis.com www.gstatic.com https://*.google.com https://*.googletagmanager.com *.google-analytics.com https://tagmanager.google.com"
script-src: "'self' 'unsafe-inline' fonts.googleapis.com www.gstatic.com https://*.google.com https://*.googletagmanager.com *.google-analytics.com https://tagmanager.google.com https://www.googleadservices.com https://googleads.g.doubleclick.net"
object-src: "'none'"
style-src: "'self' 'unsafe-inline' https://googletagmanager.com https://tagmanager.google.com fonts.googleapis.com"
img-src: "'self' data: https://*.google-analytics.com https://*.googletagmanager.com gstatic.com https://www.google.com https://google.com unocha.org"
img-src: "'self' data: https://*"
media-src: "'none'"
frame-src: "'self' https://www.googletagmanager.com"
frame-src: "'self' https://www.googletagmanager.com https://bid.g.doubleclick.net https://td.doubleclick.net *.un.org https://cdnapisec.kaltura.com https://vimeo.com https://player.vimeo.com"
frame-ancestors: "'self'"
child-src: "'self'"
font-src: "'self' data: fonts.gstatic.com"
connect-src: "'self' https://*.google-analytics.com https://analytics.google.com https://*.analytics.google.com https://*.googletagmanager.com"
connect-src: "'self' https://*"
report-uri: /report-csp-violation
upgrade-req: false
policy-uri: ''
13 changes: 9 additions & 4 deletions config/user_expire.settings.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
_core:
default_config_hash: PeDvVH4C3IZ7QFkvC1BUv3BZJVc7jLwQmJAEttVuVOw
frequency: 432000
mail:
subject: '[site:name]: Account expiration warning'
body: "Hello [user:display-name]\r\n\r\nBecause you have not logged in recently, your account at [site:name] will be de-activated in the near future. If you still use this site, please log in [site:login-url] to avoid having your account de-activated.\r\n\r\nThanks, [site:name]"
offset: 604800
send_mail: 1
user_expire_roles:
authenticated: 15552000
send_expiration_warnings: true
expiration_warning_mail:
subject: "[site:name]: Account expiration warning"
body: |-
Hello [user:display-name]
Because you have not logged in recently, your account at [site:name] will be blocked in the near future. If you still use this site, log in now [site:login-url] to prevent your account being blocked.
-- [site:name] team

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions html/themes/custom/common_design_subtheme/package-lock.json
2 changes: 1 addition & 1 deletion local/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ services:
proxy:

mysql:
image: public.ecr.aws/unocha/mysql:10.11
image: public.ecr.aws/unocha/mysql:11.4
hostname: $PROJECT_NAME-mysql
container_name: $PROJECT_NAME-mysql
environment:
4 changes: 2 additions & 2 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@
<!-- Do not limit the amount of memory tests take to run. -->
<ini name="memory_limit" value="-1"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
<env name="DTT_BASE_URL" value="http://odsg-site.docksal.site/"/>
<env name="DTT_BASE_URL" value="http://odsg8-site.docksal.site/"/>
<env name="DTT_API_URL" value="http://localhost:9222"/>
<!-- Example SIMPLETEST_BASE_URL value: http://localhost -->
<env name="SIMPLETEST_BASE_URL" value="http://odsg-site.docksal.site/"/>
<env name="SIMPLETEST_BASE_URL" value="http://odsg8-site.docksal.site/"/>
<!-- Example SIMPLETEST_DB value: mysql://username:password@localhost/databasename#table_prefix -->
<env name="SIMPLETEST_DB" value="mysql://user:user@db/test"/>
<!-- Example BROWSERTEST_OUTPUT_DIRECTORY value: /path/to/webroot/sites/simpletest/browser_output -->
4 changes: 3 additions & 1 deletion tests/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ volumes:

services:
mysql:
image: public.ecr.aws/unocha/mysql:10.11
image: public.ecr.aws/unocha/mysql:11.4
hostname: odsg-test-mysql
container_name: odsg-test-mysql
environment:
@@ -48,6 +48,8 @@ services:
- ENVIRONMENT=dev
- NGINX_SERVERNAME=odsg-test-site,localhost,127.0.0.1
- NGINX_OVERRIDE_PROTOCOL=HTTP,odsg-test-site,localhost,127.0.0.1
- NGINX_LIMIT_BOTS=64r/s
- NGINX_BURST_BOTS=256 nodelay
- DRUSH_OPTIONS_URI=http://odsg-test-site
- DRUPAL_DB_DATABASE=odsg
- DRUPAL_DB_USERNAME=odsg