Skip to content

Commit

Permalink
Merge branch '11.6.4-release' of github.com:SU-HSDO/suhumsci into shs…
Browse files Browse the repository at this point in the history
…-5963-fe-performance-refactor-theme-javascript
  • Loading branch information
cienvaras committed Jan 27, 2025
2 parents d232b31 + 6bf1ce4 commit b6253ee
Show file tree
Hide file tree
Showing 264 changed files with 2,428 additions and 8,173 deletions.
30 changes: 22 additions & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# READY FOR REVIEW

## Summary
_[briefly summarize the changes here]_
# Summary
_[briefly summarize the changes here. TL;DR - what's this PR for?]_

## Need Review By (Date)
_['10/30', 'asap', etc.]_
_[When does this need to be reviewed by? '10/30', 'asap', etc.]_

## Urgency
_['low', 'medium', 'high', etc.]_
Expand All @@ -13,6 +11,22 @@ _['low', 'medium', 'high', etc.]_
1. _[First testing step]_
2. ...

## PR Checklist
- [PR Checklist](https://gist.github.com/sherakama/0ba17601381e3adbe0cad566ad4d80a5)
- [Humsci Basic PR Checklist](https://github.com/SU-HSDO/suhumsci/blob/develop/docs/HumsciBasicPRChecklist.md)
# Review Tasks

## Backend / Functional Validation
### Code
- [ ] Are the naming conventions following our standards?
- [ ] Are PHP functions and variables in `snake_case` and not `camelCase`?
- [ ] Does Drupal code follow [Drupal Coding Standards](https://www.drupal.org/docs/develop/standards/php/php-coding-standards)?
- [ ] Does the code have sufficient inline comments?
- [ ] Is there anything in this code that would be hidden or hard to discover through the UI?
- [ ] Are there any [code smells](https://blog.codinghorror.com/code-smells/)?
- [ ] Are tests provided?

### Code security
- [ ] Is all [user input properly sanitized when rendered](https://www.drupal.org/docs/8/security/drupal-8-sanitizing-output)?
- [ ] Any obvious [security flaws or new areas for attack](https://www.drupal.org/docs/8/security)?

### General
- [ ] Is there anything included in this PR that is not related to the problem it is trying to solve?
- [ ] Is the approach to the problem appropriate?
46 changes: 18 additions & 28 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,30 @@
github:
prebuilds:
master: true
branches: false
pullRequests: true
pullRequestsFromForks: false
addCheck: false
addComment: false
addBadge: false
ports:
- port: 3306
onOpen: ignore
visibility: private
- port: 33060
onOpen: ignore
visibility: private
- port: 8001
- port: 8001-8999
onOpen: ignore
visibility: public
image: pookmish/drupal8ci:gitpod
tasks:
- before: >
eval $(command gp env -e) &&
mkdir -p ~/.ssh &&
[[ ! -z $SSH_PUBLIC_KEY ]] &&
echo $SSH_PUBLIC_KEY | base64 -d > ~/.ssh/id_rsa.pub &&
chmod 644 ~/.ssh/id_rsa.pub &&
[[ ! -z $SSH_PRIVATE_KEY ]] &&
echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa &&
chmod 600 ~/.ssh/id_rsa &&
[[ ! -z $GITCONFIG ]] &&
echo $GITCONFIG | base64 -d > ~/.gitconfig &&
chmod 644 ~/.gitconfig
- name: SSH Keys
before: |
mkdir -p ~/.ssh
if [[ ! -z $SSH_PRIVATE_KEY ]]; then
echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa &&
git remote set-url origin [email protected]:SU-HSDO/suhumsci.git
fi
if [[ ! -z $GITCONFIG ]]; then
echo $GITCONFIG | base64 -d > ~/.gitconfig && chmod 644 ~/.gitconfig
fi
init: >
export PREVIEW_FULL_URL=`gp url 8001` &&
export PREVIEW_URL=${PREVIEW_FULL_URL#"https://"} &&
cp .gitpod/blt.yml blt/local.blt.yml &&
cp .gitpod/sites.php docroot/sites/local.sites.php &&
composer install --no-interaction &&
rm -rf docroot/*/custom/* &&
composer install --prefer-source --no-interaction &&
Expand All @@ -43,15 +33,15 @@ tasks:
blt settings &&
mysql -u root -e 'CREATE DATABASE IF NOT EXISTS drupal_default; CREATE DATABASE IF NOT EXISTS drupal' &&
blt sws:keys &&
blt source:build:simplesamlphp-config &&
mysql -e 'SET GLOBAL max_allowed_packet=67108864;' &&
blt drupal:sync --site=hs_colorful -n &&
drush sql-sync @hs_colorful.local @self -y
if [[ ! -z $SSH_PRIVATE_KEY ]]; then
blt drupal:sync --site=hs_colorful -n &&
drush sql-sync @hs_colorful.local @self -y
else
blt drupal:install --no-interaction
fi
command: >
git config core.fileMode false &&
blt blt:telemetry:disable --no-interaction &&
git remote set-url origin [email protected]:SU-HSDO/suhumsci.git &&
apache2ctl restart &&
gp ports await 8001 &&
drush uli &&
Expand Down
10 changes: 10 additions & 0 deletions .gitpod/gitpod.settings.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<?php

error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);

$config['samlauth.authentication']['sp_x509_certificate'] = 'file:' . DRUPAL_ROOT . '/../keys/saml/cert/saml.crt';
$config['samlauth.authentication']['sp_private_key'] = 'file:' . DRUPAL_ROOT . '/../keys/saml/cert/saml.pem';
$config['samlauth.authentication']['idp_certs'] = [
'file:' . DRUPAL_ROOT . '/../keys/saml/cert/signing.crt',
];
$config['stanford_samlauth.settings']['role_mapping']['workgroup_api'] = [
'cert' => DRUPAL_ROOT . '/../keys/saml/workgroup_api.cert',
'key' => DRUPAL_ROOT . '/../keys/saml/workgroup_api.key',
];
19 changes: 19 additions & 0 deletions .gitpod/sites.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

$settings = glob(__DIR__ . '/*/settings.php');

$workspace_url = getenv('GITPOD_WORKSPACE_URL');
$workspace_domain = preg_replace('/^.*?\/\//', '', $workspace_url);

$port = 8002;
foreach ($settings as $settings_file) {
$site_dir = str_replace(__DIR__ . '/', '', $settings_file);
$site_dir = str_replace('/settings.php', '', $site_dir);

if ($site_dir == 'default') {
$site_dir = 'swshumsci';
}

$sites["$port-$workspace_domain"] = $site_dir;
$port++;
}
6 changes: 3 additions & 3 deletions .tugboat/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ services:
update:
- rm -rf vendor
- composer install --no-ansi
- mysql -h mysql -P 3306 -u tugboat -ptugboat -e 'SET GLOBAL max_allowed_packet=67108864;'
- mysql -h mysql -P 3306 -u tugboat -ptugboat -e 'SET GLOBAL max_allowed_packet=536870912;'
# Sync to hs_colorful, hs_colorful database & files and create user.
- blt drupal:sync:files --site=hs_colorful
- drush @hs_colorful.local user:create tugboat --password=pushcar || true
Expand All @@ -66,7 +66,7 @@ services:
build:
- rm -rf vendor
- composer install --no-ansi
- mysql -h mysql -P 3306 -u tugboat -ptugboat -e 'SET GLOBAL max_allowed_packet=67108864;'
- mysql -h mysql -P 3306 -u tugboat -ptugboat -e 'SET GLOBAL max_allowed_packet=536870912;'

- drush @hs_colorful.local cr
- drush @hs_colorful.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();'
Expand Down Expand Up @@ -105,7 +105,7 @@ services:
image: tugboatqa/mysql:5
commands:
update:
- mysql -e 'SET GLOBAL max_allowed_packet=67108864;'
- mysql -e 'SET GLOBAL max_allowed_packet=536870912;'
# Delete and recreate the database for each site.
- mysql -e "DROP DATABASE IF EXISTS hs_colorful; CREATE DATABASE hs_colorful;"
- mysql -e "DROP DATABASE IF EXISTS hs_traditional; CREATE DATABASE hs_traditional;"
Expand Down
1 change: 0 additions & 1 deletion blt/blt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ multisites:
- lowe
- mathematics
- mcs
- mediterraneanstudies
- memorylab
- middleeast
- morrisoninstitute
Expand Down
21 changes: 10 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"drupal/auto_entitylabel": "^3.0@beta",
"drupal/better_exposed_filters": "^7.0",
"drupal/better_normalizers": "^2.0",
"drupal/block_class": "^2.0",
"drupal/block_class": "^4.0",
"drupal/block_content_permissions": "^1.10",
"drupal/cancel_button": "^1.1",
"drupal/chosen": "^4.0",
Expand Down Expand Up @@ -229,11 +229,8 @@
"extra": {
"enable-patching": true,
"patches": {
"drupal/autologout": {
"https://www.drupal.org/project/autologout/issues/3372010": "https://www.drupal.org/files/issues/2024-05-28/autologout_3372010-25.patch"
},
"drupal/conditional_fields": {
"https://www.drupal.org/project/conditional_fields/issues/2902164": "https://www.drupal.org/files/issues/2023-09-28/2902164-149.patch"
"drupal/block_class": {
"Click JavaScript to close details causes modals to scroll unnecessarily https://www.drupal.org/project/block_class/issues/3497768": "patches/contrib/block_class/60.patch"
},
"drupal/config_ignore": {
"https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2020-01-11/support-for-export-2857247-44.patch",
Expand All @@ -247,8 +244,7 @@
"Allow hs group blocks in layout_builder": "patches/layout_builder-allow-hs-blocks.patch",
"Allow media items to be edited in a modal when using the field widget https://www.drupal.org/project/drupal/issues/2985168": "https://www.drupal.org/files/issues/2023-12-18/2985168-172.patch",
"Cannot read properties of undefined (reading 'settings') with dialog.position.js https://www.drupal.org/project/drupal/issues/3356667": "patches/core/core-mr-8892.patch",
"https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch",
"https://www.drupal.org/project/drupal/issues/3487031: Twig 13.4.2 performance degradation": "patches/core/core-mr-10177.patch"
"https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch"
},
"drupal/entity_reference_exposed_filters": {
"https://www.drupal.org/project/entity_reference_exposed_filters/issues/3189025": "https://www.drupal.org/files/issues/2023-10-17/entity_reference_exposed_filters-empty_target-3189025-4.patch"
Expand All @@ -257,9 +253,6 @@
"https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2024-09-13/2969051-166.patch",
"https://www.drupal.org/project/field_group/issues/2787179": "https://www.drupal.org/files/issues/2024-08-05/2787179-highlight-html5-validation-101.patch"
},
"drupal/google_analytics": {
"https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
},
"drupal/hook_event_dispatcher": {
"https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://git.drupalcode.org/project/hook_event_dispatcher/-/merge_requests/133.patch"
},
Expand All @@ -286,10 +279,16 @@
"https://www.drupal.org/project/paragraphs_browser/issues/3381981": "https://www.drupal.org/files/issues/2023-08-22/3381981-sort-by-weight-4.patch",
"https://www.drupal.org/project/paragraphs_browser/issues/3064852": "https://www.drupal.org/files/issues/2023-11-07/3064852-allow-hiding-browser-12.patch"
},
"drupal/paragraphs_features": {
"Add-in only works if active theme is claro or gin https://www.drupal.org/project/paragraphs_features/issues/3353704": "https://www.drupal.org/files/issues/2024-03-22/3353704-mr12-18.patch"
},
"drupal/redirect": {
"https://www.drupal.org/project/redirect/issues/3057250": "https://www.drupal.org/files/issues/2024-08-11/redirect--2024-08-11--3057250-79.patch",
"https://www.drupal.org/project/redirect/issues/3018897": "https://www.drupal.org/files/issues/2024-08-12/redirect-3018897-28.patch"
},
"drupal/shield": {
"https://www.drupal.org/project/shield/issues/3479117": "patches/shield-undefined_array_key_explode-3479117.patch"
},
"drupal/ui_patterns": {
"Ui Patterns Views Preview": "patches/contrib/ui_patterns_views-preview.patch"
},
Expand Down
Loading

0 comments on commit b6253ee

Please sign in to comment.