Release 153

.node-version

@@ -1 +1 @@
-16.17.0
+22.11.0

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 [Full changelog][unreleased]
 
+## Release 153 - 2024-12-02
+
+[Full changelog][153]
+
+- Update Node to 22.11.0
+
 ## Release 152 - 2024-11-27
 
 [Full changelog][152]
@@ -1713,7 +1719,8 @@
 - Planned start and end dates are mandatory
 - Actual start and end dates must not be in the future
 
-[unreleased]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-152...HEAD
+[unreleased]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-153...HEAD
+[153]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-152...release-153
 [152]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-151...release-152
 [151]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-150...release-151
 [150]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-149...release-150

Dockerfile

@@ -9,7 +9,7 @@ ARG NODE_MAJOR
 ENV APP_HOME=/app
 ENV DEPS_HOME=/deps
 
-ENV NODE_MAJOR=${NODE_MAJOR:-16}
+ENV NODE_MAJOR=${NODE_MAJOR:-22}
 ENV RAILS_ENV=${RAILS_ENV:-production}
 ENV NODE_ENV=${RAILS_ENV:-production}
 

Gemfile

@@ -7,7 +7,7 @@ ruby File.read(".ruby-version").strip
 gem "acts_as_tree"
 gem "addressable"
 gem "audited", "~> 5.4"
-gem "aws-sdk-s3", "~> 1.173"
+gem "aws-sdk-s3", "~> 1.174"
 gem "bootsnap", ">= 1.1.0", require: false
 gem "cssbundling-rails", "~> 1.4"
 gem "csv-safe"
@@ -25,7 +25,7 @@ gem "nanoid"
 gem "notifications-ruby-client"
 gem "parser"
 gem "pry-rails"
-gem "puma", "~> 6.4"
+gem "puma", "~> 6.5"
 gem "pundit"
 gem "rollbar"
 gem "rails", "~> 6"

Gemfile.lock

@@ -71,16 +71,16 @@ GEM
       activerecord (>= 5.0, < 7.2)
       request_store (~> 1.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1012.0)
-    aws-sdk-core (3.213.0)
+    aws-partitions (1.1013.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.173.0)
+    aws-sdk-s3 (1.174.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -223,7 +223,8 @@ GEM
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
     json (2.6.3)
-    jwt (2.7.1)
+    jwt (2.9.3)
+      base64
     language_server-protocol (3.17.0.3)
     launchy (3.0.1)
       addressable (~> 2.8)
@@ -250,12 +251,12 @@ GEM
       net-imap
       net-pop
       net-smtp
-    mail-notify (1.2.0)
-      actionmailer (>= 5.2.4.6)
-      actionpack (>= 5.2.7.1)
-      actionview (>= 5.2.7.1)
-      activesupport (>= 5.2.4.6)
-      notifications-ruby-client (~> 5.1)
+    mail-notify (2.0.0)
+      actionmailer (>= 5.2.8.1)
+      actionpack (>= 5.2.8.1)
+      actionview (>= 5.2.8.1)
+      activesupport (>= 5.2.8.1)
+      notifications-ruby-client (~> 6.0)
       rack (>= 2.1.4.1)
     marcel (1.0.4)
     matrix (0.4.2)
@@ -293,7 +294,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    notifications-ruby-client (5.4.0)
+    notifications-ruby-client (6.2.0)
       jwt (>= 1.5, < 3)
     observer (0.1.2)
     orm_adapter (0.5.0)
@@ -311,7 +312,7 @@ GEM
     pry-rails (0.3.11)
       pry (>= 0.13.0)
     public_suffix (5.1.1)
-    puma (6.4.3)
+    puma (6.5.0)
       nio4r (~> 2.0)
     pundit (2.4.0)
       activesupport (>= 3.0.0)
@@ -443,7 +444,7 @@ GEM
     ruby_parser (3.19.1)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
-    selenium-webdriver (4.26.0)
+    selenium-webdriver (4.27.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -534,7 +535,7 @@ GEM
       railties (>= 3.0.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-21
@@ -546,7 +547,7 @@ DEPENDENCIES
   acts_as_tree
   addressable
   audited (~> 5.4)
-  aws-sdk-s3 (~> 1.173)
+  aws-sdk-s3 (~> 1.174)
   better_errors
   binding_of_caller
   bootsnap (>= 1.1.0)
@@ -587,7 +588,7 @@ DEPENDENCIES
   pg
   pry-byebug
   pry-rails
-  puma (~> 6.4)
+  puma (~> 6.5)
   pundit
   pundit-matchers (~> 3.1.2)
   rack-attack

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/workflows/CI/badge.svg?branch=develop)](https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/actions?query=branch%3Adevelop)
+[![CI Checks](https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/actions/workflows/ci_checks.yml/badge.svg?branch=develop)](https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/actions/workflows/ci_checks.yml)
 [![Coverage Status](https://coveralls.io/repos/github/UKGovernmentBEIS/beis-report-official-development-assistance/badge.svg?branch=develop)](https://coveralls.io/github/UKGovernmentBEIS/beis-report-official-development-assistance?branch=develop)
 
 # Report Official Development Assistance (RODA)
@@ -12,45 +12,28 @@ Technology (DSIT), which had a large impact on the application. You will
 see references to both organisations in both the code and the data, and this is
 worth keeping in mind as you work on the application.
 
-## Environments
-The app is currently hosted on AWS ECS clusters provided by DSIT. The
-deployments happen automatically through AWS CodePipeline pipelines, after a
-successful GitHub Action build on the target GitHub branch.
+## Environments and hosting
+All environments are hosting on AWS provided by DSIT, for more details see the
+[hosting documentation.](/doc/hosting.md)
 
-**NOTE**: The AWS pipelines are polling-based. If a pipeline has not run in over
-30 days, AWS will turn it off, and a developer will have to log in and restart
-deployments manually, by using "Release change".
+To access the environments you will need a `digital-paas-prodction-account`
+account and then [assume the correct role](/doc/hosting.md#assuming-roles) for
+each environment.
 
-### Dev
+### Environments
 
-[https://dev.report-official-development-assistance.service.gov.uk](https://dev.report-official-development-assistance.service.gov.uk)
-
-The `develop` branch is deployed to the dev environment.
-
-### Staging
-
-[https://staging.report-official-development-assistance.service.gov.uk](https://staging.report-official-development-assistance.service.gov.uk)
-
-The `develop` branch is deployed to the staging environment.
-
-### Training
-
-[http://training.report-official-development-assistance.service.gov.uk](https://training.report-official-development-assistance.service.gov.uk)
-
-The `main` branch is deployed to the training environment.
-
-### Production
-
-[https://www.report-official-development-assistance.service.gov.uk](https://www.report-official-development-assistance.service.gov.uk)
-
-The `main` branch is deployed to the production environment.
+- [Development](https://dev.report-official-development-assistance.service.gov.uk)
+- [Staging](https://staging.report-official-development-assistance.service.gov.uk)
+- [Training](https://training.report-official-development-assistance.service.gov.uk)
+- [Production](https://www.report-official-development-assistance.service.gov.uk)
 
 ## Getting started
 
 If this is your first time running the application, see the [getting started
 documentation](/doc/getting-started.md) for instructions.
 
-## Day to day development
+You will likely need access to the environments, see the [hosting
+documentation](/doc/hosting.md) on how to obtain this.
 
 ## Support documentation
 
@@ -67,7 +50,11 @@ documentation](/doc/getting-started.md) for instructions.
 ## In-depth documentation
 
 - [Glossary of business terms](/doc/glossary.md)
+- [Hosting](/doc/hosting.md)
+- [Deployment](/doc/deployment-process.md)
+- [Logging](/doc/logging.md)
 - [Environment variables](/doc/environment-variables.md)
+- [Feature flags](/doc/feature-flags.md)
 - [Sending email notifications](/doc/email-notifications.md)
 - [Use authentication](/doc/authentication.md)
 - [Importing new partner organisation
@@ -83,8 +70,6 @@ documentation](/doc/getting-started.md) for instructions.
 - [Identifying invalid activities](/doc/utilities.md)
 - [Background jobs](/doc/background-jobs.md)
 - [Console access](/doc/console-access.md)
-- [Logging](/doc/logging.md)
-- [Deployment](/doc/deployment-process.md)
 - [DNS](/doc/dns.md)
 - [Migrations](/doc/migrations.md)
 

app/views/shared/xml/_activity.xml.haml

@@ -23,6 +23,10 @@
         %narrative= organisation.name
   - if activity.previous_identifier?
     %other-identifier{"ref" => activity.previous_identifier, type: "A1"}
+  - if activity.hybrid_beis_dsit_activity?
+    %other-identifier{"ref" => "GB-GOV-13", type: "B1"}
+      %owner-org{"ref" => "GB-GOV-13"}
+        %narrative{"xml:lang" => activity.organisation.language_code}= "DSIT previous reporting-org identifier"
   %activity-status{"code" => activity.iati_status}/
   - if activity.planned_start_date?
     %activity-date{"iso-date" => activity.planned_start_date, type: "1"}/