Merge branch 'develop' of bitbucket.org:quoin/primero into r2-3005-re…

…quired_fields

.ruby-version

@@ -1 +1 @@
-ruby-3.3.4
+ruby-3.3.5

Gemfile

@@ -3,7 +3,7 @@
 # Copyright (c) 2014 - 2023 UNICEF. All rights reserved.
 
 source 'https://rubygems.org'
-ruby '3.3.4'
+ruby '3.3.5'
 
 gem 'activerecord-nulldb-adapter'      # Running Rake tasks at build time before DB is set up. TODO: Still needed?
 gem 'aws-sdk-s3',          '~> 1.130', # Access and manage Amazon S3 storage (with ActiveStorage).

Gemfile.lock

@@ -301,7 +301,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.4)
+    rexml (3.3.6)
       strscan
     roo (2.10.0)
       nokogiri (~> 1)
@@ -494,7 +494,7 @@ DEPENDENCIES
   write_xlsx (~> 1.11)
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.3.5p100
 
 BUNDLED WITH
    2.4.18

app/models/managed_reports/sql_report_indicator.rb

@@ -154,7 +154,8 @@ def group_id_alias(params_grouped_by)
     end
 
     def table_name_for_query(params)
-      return 'violations' if params['ctfmr_verified_date'].present?
+      return 'violations' if params['ctfmr_verified_date'].present? ||
+                             params&.[]('ghn_date_filter')&.field_name == 'ctfmr_verified_date'
 
       'incidents'
     end

azure-pipelines.yml

@@ -41,7 +41,7 @@ jobs:
         displayName: 'Install dependencies'
       - bash: |
           . ~/.bash_env
-          rbenv global 3.3.4
+          rbenv global 3.3.5
           bundle install --without production --path=${BUNDLE_PATH:-vendor/bundle}
         displayName: 'Bundle install'
         env:

bitbucket-pipelines.yml

@@ -4,7 +4,7 @@ definitions:
   steps:
     - step: &server-test
         name: Server tests
-        image: ruby:3.3.4-bookworm
+        image: ruby:3.3.5-bookworm
         script:
           - ./bin/install_local_test_solr.sh
           - ./bin/run_server_tests.sh

config/locales/dates/cmn.yml

@@ -19,6 +19,7 @@ cmn:
       - 星期五
       - 星期六
     abbr_month_names:
+      - ~
       - 一月
       - 二月
       - 三月
@@ -40,6 +41,7 @@ cmn:
       - 星期五
       - 星期六
     month_names:
+      - ~
       - 一月
       - 二月
       - 三月

doc/getting_started_development.md

@@ -111,17 +111,17 @@ In the Primero top-level directory, there is a file `.ruby-version`, which conta
 
 ```bash
 cat .ruby-version
-# This will print something like: ruby-3.3.4
+# This will print something like: ruby-3.3.5
 # rbenv needs the version number, but not the ruby- prefix.
-rbenv install 3.3.4 # replace 3.3.4 with whatever version is in .ruby-version
+rbenv install 3.3.5 # replace 3.3.5 with whatever version is in .ruby-version
 ```
 
 It will take several minutes to build and install ruby, depending on the speed of your machine.
 Once you have succeeded in installing ruby, it is worth checking that you are now using the right version.
 
 ```bash
 ruby --version
-# This should print something like: ruby 3.3.4 (or whatever the current version in the .ruby-version is)
+# This should print something like: ruby 3.3.5 (or whatever the current version in the .ruby-version is)
 ```
 
 ## Installing node using `nvm`

docker/application/Dockerfile

@@ -2,7 +2,7 @@
 
 # -------------------------------------------------------------------- BUILD STAGE
 ARG BUILD_REGISTRY
-ARG RUBY_VERSION=3.3.4
+ARG RUBY_VERSION=3.3.5
 FROM ${BUILD_REGISTRY}ruby:${RUBY_VERSION}-alpine3.20 AS build-env
 
 ENV BUILD_PACKAGES="bash curl wget curl-dev build-base git"

docker/nginx/Dockerfile

@@ -3,9 +3,9 @@
 # ------------------------------------------------------------------ BUILD STAGE
 
 ARG BUILD_REGISTRY
-ARG version=1.27.0
+ARG version=1.27.1
 # TODO: Although the rest of Primero uses Alpine 3.20 base images, Nginx doesn't have one.
-ARG ALPINE_VERSION=3.19
+ARG ALPINE_VERSION=3.20
 
 FROM ${BUILD_REGISTRY}nginx:${version}-alpine${ALPINE_VERSION} AS builder
 ARG version
@@ -43,7 +43,7 @@ ENV GROUP_ID=${NGINX_GID}
 # If you are updating `version` or `ALPINE_VERSION`,
 # run: `docker scout cves primero/nginx:my-tag` to verify whether the versions of the security packages
 # listed in SECURITY_UPDATED_PACKAGES are still necessary.
-ENV SECURITY_UPDATED_PACKAGES="curl=8.9.0-r0"
+ENV SECURITY_UPDATED_PACKAGES="libexpat=2.6.3-r0 curl=8.9.1-r1"
 
 COPY [ "nginx/root/", "/" ]
 

spec/models/managed_reports/indicators/multiple_violations_spec.rb

@@ -141,6 +141,10 @@
           field_name: 'ghn_date_filter',
           from: '2021-04-01',
           to: '2022-06-10'
+        ),
+        'type' => SearchFilters::Value.new(
+          field_name: 'type',
+          value: 'ghn_report'
         )
       }
     ).data