build(deps): bump rails from 7.0.6 to 7.0.8

.rubocop_todo.yml

@@ -119,3 +119,6 @@ Style/DateTime:
     - 'lib/microsoft_graph/transformer/attachment.rb'
     - 'lib/microsoft_graph/transformer/message.rb'
     - 'lib/microsoft_graph/transformer/update_message.rb'
+
+Rails/UniqueValidationWithoutIndex:
+  Enabled: false

Gemfile

@@ -38,11 +38,12 @@ gem "omniauth"
 gem "omniauth_openid_connect"
 gem "omniauth-rails_csrf_protection"
 gem "pandoc-ruby"
+gem "paper_trail"
 gem "pg"
 gem "pg_search"
 gem "puma", "~> 6"
 gem "pundit"
-gem "rails", "~> 7.0.6"
+gem "rails", "~> 7.0.8"
 gem "rails_semantic_logger"
 gem "redis", "~> 4.8"
 gem "redis-namespace"
@@ -51,6 +52,7 @@ gem "rollbar"
 gem "scenic"
 gem "sidekiq", "~> 6.4"
 gem "sidekiq-cron", "~> 1.10"
+gem "simple_xlsx_reader"
 gem "slack-notifier"
 gem "sprockets-rails"
 gem "stimulus-rails"

Gemfile.lock

@@ -18,67 +18,67 @@ GEM
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    actioncable (7.0.6)
-      actionpack (= 7.0.6)
-      activesupport (= 7.0.6)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.6)
-      actionpack (= 7.0.6)
-      activejob (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.6)
-      actionpack (= 7.0.6)
-      actionview (= 7.0.6)
-      activejob (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.6)
-      actionview (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.6)
-      actionpack (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.6)
-      activesupport (= 7.0.6)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.6)
-      activesupport (= 7.0.6)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (7.0.6)
-      activesupport (= 7.0.6)
-    activerecord (7.0.6)
-      activemodel (= 7.0.6)
-      activesupport (= 7.0.6)
-    activestorage (7.0.6)
-      actionpack (= 7.0.6)
-      activejob (= 7.0.6)
-      activerecord (= 7.0.6)
-      activesupport (= 7.0.6)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.6)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -256,8 +256,8 @@ GEM
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     govuk_design_system_formbuilder (4.1.1)
       actionview (>= 6.1)
       activemodel (>= 6.1)
@@ -341,7 +341,7 @@ GEM
     mini_mime (1.1.5)
     mini_racer (0.8.0)
       libv8-node (~> 18.16.0.0)
-    minitest (5.19.0)
+    minitest (5.20.0)
     mock_redis (0.37.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -358,11 +358,11 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.3-arm64-darwin)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-darwin)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     notifications-ruby-client (5.4.0)
       jwt (>= 1.5, < 3)
@@ -390,6 +390,9 @@ GEM
       validate_url
       webfinger (~> 2.0)
     pandoc-ruby (2.1.7)
+    paper_trail (15.0.0)
+      activerecord (>= 6.1)
+      request_store (~> 1.4)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -426,20 +429,20 @@ GEM
       rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.6)
-      actioncable (= 7.0.6)
-      actionmailbox (= 7.0.6)
-      actionmailer (= 7.0.6)
-      actionpack (= 7.0.6)
-      actiontext (= 7.0.6)
-      actionview (= 7.0.6)
-      activejob (= 7.0.6)
-      activemodel (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 7.0.6)
+      railties (= 7.0.8)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -459,9 +462,9 @@ GEM
       rack
       railties (>= 5.1)
       semantic_logger (~> 4.13)
-    railties (7.0.6)
-      actionpack (= 7.0.6)
-      activesupport (= 7.0.6)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -491,6 +494,8 @@ GEM
     redis-store (1.9.2)
       redis (>= 4, < 6)
     regexp_parser (2.8.1)
+    request_store (1.5.1)
+      rack (>= 1.4)
     rexml (3.2.6)
     rollbar (3.4.0)
     rouge (4.1.3)
@@ -572,6 +577,9 @@ GEM
       fugit (~> 1.8)
       globalid (>= 1.0.1)
       sidekiq (>= 6)
+    simple_xlsx_reader (5.0.0)
+      nokogiri
+      rubyzip
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -705,13 +713,14 @@ DEPENDENCIES
   omniauth-rails_csrf_protection
   omniauth_openid_connect
   pandoc-ruby
+  paper_trail
   pg
   pg_search
   pry-byebug
   pry-rails
   puma (~> 6)
   pundit
-  rails (~> 7.0.6)
+  rails (~> 7.0.8)
   rails-controller-testing
   rails_layout
   rails_semantic_logger
@@ -727,6 +736,7 @@ DEPENDENCIES
   shoulda-matchers
   sidekiq (~> 6.4)
   sidekiq-cron (~> 1.10)
+  simple_xlsx_reader
   simplecov
   slack-notifier
   spring

app/assets/stylesheets/application.sass.scss

@@ -2,6 +2,7 @@
 
 @import "./base/frontend";
 @import "./base/misc";
+@import "./components/activity-log";
 @import "./components/supported/procurement-stage-colours";
 @import "./components/govuk-radios-small";
 @import "./components/autocomplete";
@@ -47,12 +48,11 @@
   &.wide-container {
     max-width: 2000px;
   }
-   
+
   @media (min-width: 1020px) {
     &.wide-container {
       margin-left: 30px;
       margin-right: 30px;
     }
   }
  }
-

app/assets/stylesheets/base/_misc.scss

@@ -3,6 +3,10 @@
   align-items: center;
 }
 
+.pull-up-10 {
+  margin-top: -10px;
+}
+
 .spread-out {
   display: flex;
   align-items: center;

app/assets/stylesheets/components/_activity-log.scss

@@ -0,0 +1,20 @@
+.activity-log-table {
+  @extend .govuk-\!-font-size-16;
+
+  table {
+    @extend .govuk-\!-font-size-16;
+  }
+
+  .activity-log-date {
+    width: 180px;
+  }
+  .activity-log-person {
+    width: 180px;
+  }
+
+  .activity-log-change-arrow {
+    color: #a2a2a2;
+    margin-left: 5px;
+    margin-right: 5px;
+  }
+}

app/controllers/application_controller.rb

@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
   default_form_builder GOVUKDesignSystemFormBuilder::FormBuilder
 
   before_action :authenticate_user!, except: %i[health_check maintenance]
+  before_action :set_current_request_id
 
   protect_from_forgery
 
@@ -24,7 +25,7 @@ def maintenance
 
 protected
 
-  helper_method :current_user, :cookie_policy, :record_ga?, :engagement_portal?, :support_portal?, :frameworks_portal?
+  helper_method :current_user, :cookie_policy, :record_ga?, :engagement_portal?, :support_portal?, :frameworks_portal?, :current_url_b64
 
   # @return [User, Guest]
   #
@@ -86,9 +87,17 @@ def cookie_policy
     CookiePolicy.new(cookies)
   end
 
-  def current_url_b64
-    Base64.encode64(request.fullpath)
+  def current_url_b64(tab = nil)
+    Base64.encode64("#{request.fullpath}#{"##{tab.to_s.dasherize}" if tab.present?}")
+  end
+
+  def back_link_param(back_to = params[:back_to])
+    return if back_to.blank?
+
+    Base64.decode64(back_to)
   end
 
   def tracking_base_properties = { user_id: current_user.id }
+
+  def set_current_request_id = Current.request_id = request.request_id
 end

app/controllers/engagement/application_controller.rb

@@ -2,20 +2,6 @@ module Engagement
   class ApplicationController < ::ApplicationController
     include SupportAgents
 
-    helper_method :current_url_b64
-
-  protected
-
-    def back_link_param(back_to = params[:back_to])
-      return if back_to.blank?
-
-      Base64.decode64(back_to)
-    end
-
-    def current_url_b64(tab = "")
-      Base64.encode64("#{request.fullpath}##{tab.to_s.dasherize}")
-    end
-
   private
 
     def portal_namespace = :engagement

app/controllers/frameworks/application_controller.rb

@@ -1,5 +1,6 @@
 class Frameworks::ApplicationController < ApplicationController
   include SupportAgents
+  before_action { Current.actor = current_agent }
 
 private