Merge pull request #2307 from NCCE/2970-feature-branch---april-1st-removals

Feature branch - April 1st 2025 contract changes

Lots of changes but main highlights are
Removal of Hubs and Clusters
Changes to search to remove hubs, date and course type filters
Copy changes to remove references to face to face or remote course, subsidies, funding, hubs, clusters
Creation of new replaced by system, that handles redirecting to new courses (requires the old course to be turned off in Dynamics)

Author: msquance-stem

Dockerfile

@@ -1,6 +1,6 @@
 FROM ruby:3.3.6-alpine
 RUN apk update
-RUN apk --no-cache add curl build-base postgresql-dev tzdata nodejs chromium chromium-chromedriver python3 python3-dev py3-pip yarn procps bash bash-completion sudo openssh docker git less graphviz yaml-dev
+RUN apk --no-cache add curl build-base postgresql-dev tzdata nodejs chromium chromium-chromedriver python3 python3-dev py3-pip yarn procps bash bash-completion sudo openssh docker git less graphviz yaml-dev libffi-dev
 RUN pip install --upgrade pip --break-system-packages
 RUN pip3 install -U selenium --break-system-packages
 RUN curl https://cli-assets.heroku.com/install.sh | sh

Gemfile.lock

@@ -90,14 +90,14 @@ GEM
       kaminari (~> 1.2.2)
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
-    administrate-field-active_storage (0.3.8)
+    administrate-field-active_storage (1.0.5)
       administrate (>= 0.2.2)
-      rails (>= 6.0)
+      rails (>= 7.0)
     administrate-field-jsonb (0.4.6)
       administrate (< 1.0.0)
       rails (>= 4.2)
-    administrate-field-nested_has_many (1.3.0)
-      administrate (> 0.8, < 1)
+    administrate-field-nested_has_many (2.1.0)
+      administrate (>= 0.19, < 1)
       cocoon (~> 1.2, >= 1.2.11)
     ast (2.4.2)
     attr_encrypted (4.2.0)
@@ -260,7 +260,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.15.5)
+    ffi (1.17.1)
     fiber-storage (1.0.0)
     fog-aws (3.30.0)
       base64 (~> 0.2.0)
@@ -384,7 +384,7 @@ GEM
       rake
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.4)
+    minitest (5.25.5)
     msgpack (1.8.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -695,12 +695,12 @@ GEM
       lint_roller (~> 1.0)
       rubocop-rails (~> 2.20.2)
     statesman (10.0.0)
-    stringio (3.1.3)
+    stringio (3.1.5)
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.2.0)
+    tilt (2.6.0)
     timecop (0.9.8)
     timeout (0.4.3)
     ttfunk (1.7.0)
@@ -751,7 +751,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   ruby

app/assets/config/manifest.js

@@ -2,5 +2,6 @@
 //= link administrate/application.js
 //= link administrate-field-nested_has_many/application.css
 //= link administrate-field-nested_has_many/application.js
+//= link administrate-field-active_storage/application.css
 //= link administrate-field-jsonb/application.css
 //= link administrate-field-jsonb/application.js

app/components/bursary_component.rb

@@ -8,9 +8,11 @@
     <% end %>
     <div class="cms-card-wrapper__grid" style="<%= cards_per_row %>">
       <% @cards_block.each do |card| %>
-        <div class="cms-card-wrapper__card">
-          <%= render card.render %>
-        </div>
+        <% if card.render.render? %>
+          <div class="cms-card-wrapper__card">
+            <%= render card.render %>
+          </div>
+        <% end %>
       <% end %>
     </div>
   <% end %>

app/components/bursary_component/bursary_component.html.erb

@@ -6,9 +6,9 @@ class Cms::CourseCardComponent < ViewComponent::Base
     to: :helpers
 
   def initialize(title:, banner_text:, course:, description:, image:)
-    @title = title
     @banner_text = banner_text
     @course = course
+    @title = title.presence || @course&.title
     @description = description
     @image = image
   end

app/components/bursary_component/bursary_component.scss

@@ -11,9 +11,9 @@
 
   <%= link_to @title, course_path(id: @course.activity_code, name: @course.title.parameterize), class: 'govuk-!-font-weight-bold govuk-body ncce-link' %>
   <div class="courses-cms-card__details">
-    <p class="govuk-body">
-      <%= render @description.render %>
-    </p>
+    <div class="courses-cms-card__details-content">
+      <%= render @description.render if @description %>
+    </div>
     <div class="courses-cms-card__icons">
       <div>
         <span class="govuk-body-s <%= course_meta_icon_class(@course) %> courses-cms-card__type">