Feature/law report

.docker/nginx.conf

@@ -7,7 +7,6 @@ events {
     worker_connections  1024;
 }
 
-
 http {
     proxy_temp_path /tmp/proxy_temp;
     client_body_temp_path /tmp/client_temp;
@@ -18,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/8;
+    set_real_ip_from 172.16.0.0/16;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

.docker/templates/default.conf.template

@@ -6,6 +6,11 @@ server {
 
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
+    # This also needs to be set in the single server tag and not only in http.
+    set_real_ip_from 172.16.0.0/16;
+    real_ip_recursive on;
+    real_ip_header X-Forwarded-For;
+
     location = /favicon.ico {
         log_not_found off;
         access_log off;

.github/workflows/pr.yml

@@ -1,6 +1,9 @@
 on: pull_request
 name: Review
 
+env:
+  COMPOSE_USER: runner
+
 jobs:
   changelog:
     runs-on: ubuntu-latest
@@ -43,8 +46,8 @@ jobs:
       - uses: actions/checkout@v4
       - run: |
           docker network create frontend
-          docker compose run --user root --rm phpfpm composer install
-          docker compose run --user root --rm phpfpm composer normalize --dry-run
+          docker compose run --rm phpfpm composer install
+          docker compose run --rm phpfpm composer normalize --dry-run
 
   coding-standards-phpcs:
     name: coding-standards-check/phpcs
@@ -57,8 +60,8 @@ jobs:
       - uses: actions/checkout@v4
       - run: |
           docker network create frontend
-          docker compose run --user root --rm phpfpm composer install
-          docker compose run --user root --rm phpfpm composer coding-standards-check/phpcs
+          docker compose run --rm phpfpm composer install
+          docker compose run --rm phpfpm composer coding-standards-check/phpcs
 
   coding-standards-twig-cs-fixer:
     name: coding-standards-check/twig-cs-fixer
@@ -71,8 +74,8 @@ jobs:
       - uses: actions/checkout@v4
       - run: |
           docker network create frontend
-          docker compose run --user root --rm phpfpm composer install
-          docker compose run --user root --rm phpfpm composer coding-standards-check/twig-cs-fixer
+          docker compose run --rm phpfpm composer install
+          docker compose run --rm phpfpm composer coding-standards-check/twig-cs-fixer
 
   install-site:
     name: Check that site can be installed
@@ -87,19 +90,19 @@ jobs:
           docker compose up --detach
 
           # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
-          docker compose exec --user root phpfpm composer install --no-interaction
+          docker compose exec phpfpm composer install --no-interaction
 
       - name: Install site
         if: ${{ (hashFiles('config/sync/core.extension.yml') == '') && (hashFiles('web/sites/default/settings.local.php') != '') }}
         run: |
           # Install the site
-          docker compose exec --user root phpfpm vendor/bin/drush site:install minimal
+          docker compose exec phpfpm vendor/bin/drush site:install minimal
 
       - name: Install site from config
         if: ${{ hashFiles('config/sync/core.extension.yml') != '' }}
         run: |
           # Install the site from config
-          docker compose exec --user root phpfpm vendor/bin/drush site:install --existing-config --yes
+          docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
 
       - name: Apply fixtures
         run: |
@@ -124,14 +127,14 @@ jobs:
           docker compose up --detach
 
           # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
-          docker compose exec --user root phpfpm composer install --no-interaction
+          docker compose exec phpfpm composer install --no-interaction
 
           # Install the site
-          docker compose exec --user root phpfpm vendor/bin/drush site:install --existing-config --yes
+          docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
 
       - name: Export config
         if: ${{ (hashFiles('config/sync/core.extension.yml') != '') && (hashFiles('web/sites/default/settings.local.php') != '') }}
-        run: docker compose exec --user root phpfpm vendor/bin/drush config:export --yes
+        run: docker compose exec phpfpm vendor/bin/drush config:export --yes
       - name: Check for changes in config
         if: ${{ (hashFiles('config/sync/core.extension.yml') != '') && (hashFiles('web/sites/default/settings.local.php') != '') }}
         run: git diff --diff-filter=ACMRT --exit-code config/
@@ -157,7 +160,7 @@ jobs:
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -193,11 +196,11 @@ jobs:
         run: |
           docker network create frontend
           docker compose up --detach
-          docker compose exec --user root phpfpm composer install
+          docker compose exec phpfpm composer install
 
       - name: Run module tests
         run: |
-          docker compose exec --user root phpfpm bash -c 'cd web && ../vendor/bin/phpunit --configuration ../phpunit.xml modules/custom'
+          docker compose exec phpfpm bash -c 'cd web && ../vendor/bin/phpunit --configuration ../phpunit.xml modules/custom'
 
   update-site:
     name: Check that site can be updated
@@ -215,16 +218,16 @@ jobs:
           docker compose up --detach
 
           # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
-          docker compose exec --user root phpfpm composer install --no-interaction
+          docker compose exec phpfpm composer install --no-interaction
 
       - name: Install site
         run: |
           # Install the site from config
-          docker compose exec --user root phpfpm vendor/bin/drush site:install --existing-config --yes
+          docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
 
       - name: Clean up root stuff
         run: |
-          sudo chown -Rv $USER:$USER vendor/ web/ || true
+          # sudo chown -Rv $USER:$USER . || true
           sudo chmod -Rv a+w web/sites/default || true
 
       # Install site with our current ref
@@ -240,11 +243,11 @@ jobs:
           docker compose up --detach
 
           # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
-          docker compose exec --user root phpfpm composer install --no-interaction
+          docker compose exec phpfpm composer install --no-interaction
 
       - name: Update site
         run: |
-          docker compose exec --user root phpfpm vendor/bin/drush deploy --yes
+          docker compose exec phpfpm vendor/bin/drush deploy --yes
 
   composer-audit:
     name: Check that required packages are up to date
@@ -259,8 +262,8 @@ jobs:
           docker compose up --detach
 
           # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
-          docker compose exec --user root phpfpm composer install --no-interaction
+          docker compose exec phpfpm composer install --no-interaction
 
       - name: Run audit
         run: |
-          docker compose exec --user root phpfpm composer audit
+          docker compose exec phpfpm composer audit

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+- [PR-88](https://github.com/itk-dev/ai-screening/pull/88)
+  - Update report for law track
+  - Update maa_vi webform
 - [PR-87](https://github.com/itk-dev/ai-screening/pull/87)
   - Security updates
 - [PR-85](https://github.com/itk-dev/ai-screening/pull/85)

config/sync/editor.editor.simple_editor.yml

@@ -12,22 +12,53 @@ settings:
   toolbar:
     items:
       - heading
+      - style
       - bold
       - italic
       - bulletedList
       - numberedList
       - link
       - blockQuote
+      - sourceEditing
+      - alignment
   plugins:
+    ckeditor5_alignment:
+      enabled_alignments:
+        - justify
+        - left
     ckeditor5_heading:
       enabled_headings:
         - heading2
         - heading3
         - heading4
+        - heading5
     ckeditor5_list:
       properties:
         reversed: true
         startIndex: true
       multiBlock: true
+    ckeditor5_sourceEditing:
+      allowed_tags:
+        - '<div>'
+    ckeditor5_style:
+      styles:
+        -
+          label: Task
+          element: '<div class="task">'
+        -
+          label: Consideration
+          element: '<div class="consideration">'
+        -
+          label: Rule
+          element: '<div class="rule">'
+        -
+          label: 'Always show'
+          element: '<div class="always_show">'
+        -
+          label: 'Always hide'
+          element: '<div class="always_hide">'
+        -
+          label: Stop
+          element: '<div class="stop">'
 image_upload:
   status: false

config/sync/field.storage.taxonomy_term.field_report_type.yml

@@ -14,6 +14,9 @@ settings:
     -
       value: bubble_chart
       label: 'Bubble chart'
+    -
+      value: webform_submission
+      label: 'Webform submission'
   allowed_values_function: ''
 module: options
 locked: false

config/sync/filter.format.simple_editor.yml

@@ -18,7 +18,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p> <h2> <h3> <h4> <strong> <em> <blockquote> <a href> <ul> <ol reversed start> <li>'
+      allowed_html: '<br> <p class="text-align-left text-align-justify"> <h2 class="text-align-left text-align-justify"> <h3 class="text-align-left text-align-justify"> <h4 class="text-align-left text-align-justify"> <h5 class="text-align-left text-align-justify"> <div class="task consideration rule stop always_show always_hide text-align-left text-align-justify"> <strong> <em> <blockquote> <a href> <ul> <ol reversed start> <li>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

config/sync/user.role.authenticated.yml

@@ -10,6 +10,7 @@ dependencies:
     - filter
     - node
     - system
+    - webform
 _core:
   default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
 id: authenticated
@@ -24,3 +25,4 @@ permissions:
   - 'use text format webform_default'
   - 'view own unpublished content'
   - 'view user email addresses'
+  - 'view any webform submission'

config/sync/webform.settings.yml

@@ -238,7 +238,7 @@ element:
     webform_video_file: webform_video_file
 html_editor:
   disabled: false
-  element_format: webform_default
+  element_format: simple_editor
   mail_format: webform_default
   tidy: true
   make_unused_managed_files_temporary: true

config/sync/webform.webform.complexity_uncertainty_default.yml

@@ -195,7 +195,7 @@ settings:
   wizard_progress_states: false
   wizard_start_label: ''
   wizard_preview_link: false
-  wizard_confirmation: true
+  wizard_confirmation: false
   wizard_confirmation_label: ''
   wizard_auto_forward: true
   wizard_auto_forward_hide_next_button: false