Add update service page for both claims and placements

.github/workflows/deploy.yml

@@ -30,16 +30,16 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 20.9.0
-          cache: 'npm'
+          cache: "npm"
       - name: Install dependencies
         run: |
           sudo apt-get update && sudo apt-get -yqq install libpq-dev
           bundle install --jobs 4 --retry 3
           bundle exec rails assets:precompile
         env:
-            DATABASE_URL: postgres://postgres:password@localhost:5432
-            GOVUK_NOTIFY_API_KEY: fake_key
-            SIGN_IN_METHOD: persona
+          DATABASE_URL: postgres://postgres:password@localhost:5432
+          GOVUK_NOTIFY_API_KEY: fake_key
+          SIGN_IN_METHOD: persona
       - name: ${{ matrix.tests }}
         run: ${{ env.COMMAND }}
         env:
@@ -52,16 +52,16 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     services:
-        postgres:
-          image: postgres:16
-          env:
-            POSTGRES_PASSWORD: password
-          ports: ['5432:5432']
-          options: >-
-            --health-cmd pg_isready
-            --health-interval 10s
-            --health-timeout 5s
-            --health-retries 5
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_PASSWORD: password
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     strategy:
       fail-fast: false
     steps:
@@ -77,16 +77,16 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 20.9.0
-          cache: 'npm'
+          cache: "npm"
       - name: Install dependencies
         run: |
           sudo apt-get update && sudo apt-get -yqq install libpq-dev
           bundle install --jobs 4 --retry 3
           bundle exec rails assets:precompile
         env:
-            DATABASE_URL: postgres://postgres:password@localhost:5432
-            GOVUK_NOTIFY_API_KEY: fake_key
-            SIGN_IN_METHOD: persona
+          DATABASE_URL: postgres://postgres:password@localhost:5432
+          GOVUK_NOTIFY_API_KEY: fake_key
+          SIGN_IN_METHOD: persona
       - name: Run Tests
         env:
           RAILS_ENV: test
@@ -98,4 +98,4 @@ jobs:
         run: |
           bundle exec rake db:create
           bundle exec rails db:schema:load
-          bundle exec rspec --format progress
+          bundle exec rspec --format progress

Gemfile

@@ -46,6 +46,7 @@ gem "bootsnap", require: false
 # gem 'image_processing', '~> 1.2'
 
 gem "flipflop"
+gem "redcarpet", "~> 3.6"
 
 gem "govuk-components"
 gem "govuk_design_system_formbuilder", "~> 5.0.0"

Gemfile.lock

@@ -79,7 +79,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     annotate (3.2.0)
@@ -165,16 +165,16 @@ GEM
       terminal-table (>= 1.8)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    govuk-components (4.1.2)
+    govuk-components (5.0.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (~> 6.0)
-      view_component (>= 3.3, < 3.7)
+      view_component (>= 3.3, < 3.8)
     govuk_design_system_formbuilder (5.0.0)
       actionview (>= 6.1)
       activemodel (>= 6.1)
       activesupport (>= 6.1)
       html-attributes-utils (~> 1)
-    haml (6.2.3)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -183,7 +183,7 @@ GEM
       activesupport (>= 6.1.4.4)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.0)
+    io-console (0.6.0)
     irb (1.10.1)
       rdoc
       reline (>= 0.3.8)
@@ -225,7 +225,7 @@ GEM
     minitest (5.20.0)
     msgpack (1.7.2)
     mutex_m (0.2.0)
-    net-imap (0.4.7)
+    net-imap (0.4.8)
       date
       net-protocol
     net-pop (0.1.2)
@@ -235,7 +235,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.15.5-arm64-darwin)
+    nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
@@ -290,7 +290,7 @@ GEM
     puma (6.4.0)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (3.0.8)
     rack-oauth2 (2.2.0)
       activesupport
       attr_required
@@ -300,13 +300,13 @@ GEM
       rack (>= 2.1.0)
     rack-protection (3.0.6)
       rack
-    rack-session (1.0.2)
-      rack (< 3)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.0)
-      rack (< 3)
-      webrick
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rails (7.1.2)
       actioncable (= 7.1.2)
       actionmailbox (= 7.1.2)
@@ -350,6 +350,7 @@ GEM
     rbs (2.8.4)
     rdoc (6.6.1)
       psych (>= 4.0.0)
+    redcarpet (3.6.0)
     regexp_parser (2.8.3)
     reline (0.4.1)
       io-console (~> 0.5)
@@ -475,7 +476,7 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    view_component (3.6.0)
+    view_component (3.7.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -501,6 +502,7 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -533,6 +535,7 @@ DEPENDENCIES
   rails (~> 7.1.2)
   rails-controller-testing
   rails-erd
+  redcarpet (~> 3.6)
   rladr
   rspec
   rspec-rails

app/assets/components/service_update/view.html.erb

@@ -0,0 +1,5 @@
+<section id="<%= service_update.id %>">
+  <%= title_element %>
+  <p class="govuk-body govuk-!-margin-bottom-2"><%= date_pretty %></p>
+  <div class="govuk-body"><%= content_html %></div>
+</section>

app/assets/components/service_update/view.rb

@@ -0,0 +1,31 @@
+class ServiceUpdate::View < GovukComponent::Base
+  attr_reader :service_update
+
+  delegate :title, :content, :date, to: :service_update
+
+  TITLE_CLASS = "govuk-heading-m govuk-!-margin-bottom-2"
+
+  def initialize(service_update:, title_tag: "h2")
+    @service_update = service_update
+    @title_tag = title_tag
+  end
+
+  def title_element
+    tag.h2(title, class: TITLE_CLASS)
+  end
+
+  def date_pretty
+    date.to_date.strftime("%e %B %Y")
+  end
+
+  def content_html
+    custom_render =
+      Redcarpet::Render::HTML.new(link_attributes: { class: "govuk-link" })
+    markdown = Redcarpet::Markdown.new(custom_render)
+    markdown.render(content).html_safe
+  end
+
+  private
+
+  attr_reader :title_tag
+end

app/controllers/service_updates_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ServiceUpdatesController < ApplicationController
+  include ApplicationHelper
+
+  def index
+    @service_updates = ServiceUpdate.where(service: current_service(request))
+  end
+end

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
-  def current_service
+  def current_service(request)
     case request.host
     when ENV["CLAIMS_HOST"]
       :claims
@@ -9,7 +9,7 @@ def current_service
   end
 
   def root_path
-    case current_service
+    case current_service(request)
     when :claims
       claims_root_path
     when :placements

app/models/service_update.rb

@@ -0,0 +1,30 @@
+class ServiceUpdate
+  CLAIMS_SERVICE_UPDATES_YAML_FILE =
+    Rails.root.join("db/claims_service_updates.yml").freeze
+  PLACEMENTS_SERVICE_UPDATES_YAML_FILE =
+    Rails.root.join("db/placements_service_updates.yml").freeze
+
+  include ActiveModel::Model
+
+  attr_accessor :date, :title, :content
+
+  def id
+    title.parameterize
+  end
+
+  def self.where(service:)
+    path = file_path(service:)
+    updates = YAML.load_file(path) || []
+
+    updates.map { |service_update| new(service_update) }
+  end
+
+  def self.file_path(service:)
+    case service
+    when :claims
+      CLAIMS_SERVICE_UPDATES_YAML_FILE
+    when :placements
+      PLACEMENTS_SERVICE_UPDATES_YAML_FILE
+    end
+  end
+end

app/views/layouts/application.html.erb

@@ -27,7 +27,7 @@
 
     <%= govuk_skip_link %>
 
-    <%= govuk_header(homepage_url: "https://www.gov.uk", service_name: t(".#{current_service}.header.service_name"), service_url: "/") %>
+    <%= govuk_header(homepage_url: "https://www.gov.uk", service_name: t(".#{current_service(request)}.header.service_name"), service_url: "/") %>
 
     <div class="govuk-width-container">
       <main class="govuk-main-wrapper" id="main-content" role="main">

app/views/service_updates/index.html.erb

@@ -0,0 +1,17 @@
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds-from-desktop">
+    <h1 class="govuk-heading-xl"><%= t("service_updates.#{current_service(request)}.heading") %></h1>
+
+    <h2 class="govuk-heading-m"><%= t("service_updates.contents") %></h2>
+    <ul class="govuk-list app-list--dash govuk-!-margin-bottom-8 govuk-!-margin-left-3">
+      <% @service_updates.each do |service_update| %>
+        <li><a class="govuk-link" href="#<%= service_update.id %>"><%= service_update.title %></a></li>
+      <% end %>
+    </ul>
+
+    <% @service_updates.each do |service_update| %>
+      <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
+      <%= render ServiceUpdate::View.new(service_update:) %>
+    <% end %>
+  </div>
+</div>

config/application.rb

@@ -35,6 +35,7 @@ class Application < Rails::Application
       "node_modules/govuk-frontend/govuk/assets"
     )
 
+    config.autoload_paths += %W[#{config.root}/app/assets/components]
     config.exceptions_app = routes
   end
 end

config/locales/en.yml

@@ -38,3 +38,9 @@ en:
       roles_include: "%{persona_name}’s role includes:"
       sign_in_as: "Sign In as %{persona_name}"
       title: Test users
+  service_updates:
+    claims:
+      heading: Claims news and updates
+    placements:
+      heading: Placements news and updates
+    contents: Contents

config/routes.rb

@@ -14,6 +14,8 @@
   get("/auth/developer/sign-out", to: "sessions#signout")
   post("/auth/developer/callback", to: "sessions#callback")
 
+  resources :service_updates, only: %i[index], path: "service-updates"
+
   draw :placements
   draw :claims
 end

config/routes/placements.rb

@@ -1,3 +1,7 @@
-scope module: :placements, as: :placements, constraints: { host: ENV["PLACEMENTS_HOST"] } do
+scope module: :placements,
+      as: :placements,
+      constraints: {
+        host: ENV["PLACEMENTS_HOST"]
+      } do
   root to: "pages#index"
 end

db/claims_service_updates.yml

@@ -0,0 +1,6 @@
+# Example structure for adding service updates
+
+# - date: '2023-11-29'
+#   title: claims
+#   content: |
+#     blah blah content

db/placements_service_updates.yml

@@ -0,0 +1,6 @@
+# Example structure for adding service updates
+
+# - date: '2023-11-29'
+#   title: placements
+#   content: |
+#     blah blah content