Merge pull request #445 from UN-OCHA/feature/OPS-10398-add-seckit

chore: add and configure seckit
UN-OCHA · Aug 8, 2024 · 75eb48c · 75eb48c
2 parents 7493809 + 2803d8e
commit 75eb48c
Show file tree

Hide file tree

Showing 19 changed files with 341 additions and 712 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -103,10 +103,10 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            docker-compose -f tests/docker-compose.yml up -d
+            docker compose -f tests/docker-compose.yml up -d
             sleep 10
             docker ps -a
-            docker-compose -f tests/docker-compose.yml exec -w /srv/www -T drupal composer install
+            docker compose -f tests/docker-compose.yml exec -w /srv/www -T drupal composer install
         env:
           fail-fast: true
 
@@ -115,7 +115,7 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            docker-compose -f tests/docker-compose.yml exec -u appuser -w /srv/www -T drupal phpcs -p --report=full --standard=phpcs.xml ./html/modules/custom
+            docker compose -f tests/docker-compose.yml exec -u appuser -w /srv/www -T drupal phpcs -p --report=full --standard=phpcs.xml ./html/modules/custom
         env:
           fail-fast: true
 
@@ -124,7 +124,7 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            docker-compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config minimal install_configure_form.enable_update_status_emails=NULL
+            docker compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config minimal install_configure_form.enable_update_status_emails=NULL
         env:
           fail-fast: true
 
@@ -133,13 +133,13 @@ jobs:
         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 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
-            docker-compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/default/files/browser_output
-            docker-compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files/browser_output
-            docker-compose -f tests/docker-compose.yml exec -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 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
+            docker compose -f tests/docker-compose.yml exec -T drupal drush -y en dblog
+            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
+            docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/default/files/browser_output
+            docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files/browser_output
+            docker compose -f tests/docker-compose.yml exec -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 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
         env:
           fail-fast: true
 
@@ -148,7 +148,7 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            docker cp "$(docker-compose -f tests/docker-compose.yml ps -q drupal)":/srv/www/html/build/logs/clover.xml .
+            docker cp "$(docker compose -f tests/docker-compose.yml ps -q drupal)":/srv/www/html/build/logs/clover.xml .
 
       - name: Monitor coverage
         id: coveralls
@@ -168,7 +168,7 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-             docker-compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show --count=50 --extended
+             docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show --count=50 --extended
 
       - name: Find Comment
         uses: peter-evans/find-comment@v3

diff --git a/PATCHES/claro-node-edit-form.patch b/PATCHES/claro-node-edit-form.patch
@@ -0,0 +1,26 @@
+diff --git a/core/themes/claro/css/layout/form-two-columns.css b/core/themes/claro/css/layout/form-two-columns.css
+index 8364fcb7dfff9f7821b6efaffcda9636fe20e637..5d5590d4d86e10873908b98b85bb9ae1d9548ef9 100644
+--- a/core/themes/claro/css/layout/form-two-columns.css
++++ b/core/themes/claro/css/layout/form-two-columns.css
+@@ -20,7 +20,7 @@
+   .layout-form {
+     display: grid;
+     grid-template-rows: auto 1fr;
+-    grid-template-columns: 3fr minmax(22.5rem, 1fr);
++    grid-template-columns: minmax(0, 3fr) minmax(22.5rem, 1fr);
+     gap: var(--space-l);
+   }
+
+diff --git a/core/themes/claro/css/layout/form-two-columns.pcss.css b/core/themes/claro/css/layout/form-two-columns.pcss.css
+index 5cf44ff277fce8a5276d8f4c9c1914df84565cdd..daa579975bfc0b832b10772046098b7f1d399d4d 100644
+--- a/core/themes/claro/css/layout/form-two-columns.pcss.css
++++ b/core/themes/claro/css/layout/form-two-columns.pcss.css
+@@ -16,7 +16,7 @@
+   .layout-form {
+     display: grid;
+     grid-template-rows: auto 1fr;
+-    grid-template-columns: 3fr minmax(360px, 1fr);
++    grid-template-columns: minmax(0, 3fr) minmax(360px, 1fr);
+     gap: var(--space-l);
+   }
+
diff --git a/composer.json b/composer.json
@@ -78,19 +78,7 @@
                 }
             }
         },
-		{
-            "type": "package",
-            "package": {
-                "name": "unocha/common_design",
-                "version": "9.2.2",
-                "type": "drupal-theme",
-                "dist": {
-                    "url": "https://github.com/UN-OCHA/common_design/archive/refs/tags/v9.2.2.zip",
-                    "type": "zip"
-                }
-            }
-        },
-		{
+        {
             "type": "package",
             "package": {
                 "name": "drupaloverride/condition_query",
@@ -121,8 +109,6 @@
         "drupal/aws": "dev-2.0.x",
         "drupal/back_to_top": "^3.0",
         "drupal/block_class": "^2.0",
-        "drupal/bootstrap": "^3.23",
-        "drupal/bootstrap_barrio": "^5.5",
         "drupal/ckeditor_config": "^3.1",
         "drupal/ckeditor_font": "^1.2",
         "drupal/ckeditor_iframe": "^2.1",
@@ -141,7 +127,6 @@
         "drupal/csp": "^1.16",
         "drupal/ctools": "^4.0",
         "drupal/ds": "^3.13",
-        "drupal/dxpr_theme": "^1.2",
         "drupal/entity_browser": "^2.6",
         "drupal/environment_indicator": "^4.0",
         "drupal/features": "^3.12",
@@ -175,6 +160,7 @@
         "drupal/rdf": "^2.0",
         "drupal/redirect": "^1.6",
         "drupal/search_api": "^1.28",
+        "drupal/seckit": "^2.0",
         "drupal/semanticviews": "^3.0",
         "drupal/social_auth": "^3.0",
         "drupal/social_auth_hid": "^3.2",
@@ -197,7 +183,7 @@
         "drush/drush": "^12",
         "oomphinc/composer-installers-extender": "^2.0",
         "symfony/flex": "^1.17",
-        "unocha/common_design": "^9.2",
+        "unocha/common_design": "^9.4.3",
         "unocha/gtm_barebones": "^1.0",
         "unocha/ocha_monitoring": "^1.0",
         "unocha/ocha_snap": "^8.3.0",