Merge pull request #5503 from nhsuk/next

Version 6.6.0

Author: thomasleese

.github/workflows/test.yml

@@ -79,6 +79,10 @@ jobs:
           bin/rails parallel:load_schema
       - name: Run tests
         run: bin/rails parallel:spec
+      - name: Run tests tagged for local_users
+        run: bundle exec rspec -t local_users
+        env:
+          MAVIS__CIS2__ENABLED: false
 
   seeds:
     name: Seeds

Gemfile.lock

@@ -115,7 +115,7 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1190.0)
+    aws-partitions (1.1191.0)
     aws-sdk-accessanalyzer (1.82.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
@@ -127,19 +127,19 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.583.0)
+    aws-sdk-ec2 (1.584.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.115.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.136.0)
+    aws-sdk-iam (1.137.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-kms (1.118.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.301.0)
+    aws-sdk-rds (1.302.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.206.0)
@@ -319,7 +319,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.16.0)
+    json (2.17.1)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -410,7 +410,7 @@ GEM
       logger
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (2.0.0)
+    omniauth-rails_csrf_protection (2.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth_openid_connect (0.8.0)
@@ -487,7 +487,7 @@ GEM
     rack_session_access (0.2.0)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rackup (2.2.1)
+    rackup (2.3.1)
       rack (>= 3)
     rails (8.1.1)
       actioncable (= 8.1.1)
@@ -510,7 +510,7 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails_semantic_logger (4.18.0)
+    rails_semantic_logger (4.19.0)
       rack
       railties (>= 5.1)
       semantic_logger (~> 4.16)
@@ -530,7 +530,7 @@ GEM
       ffi (~> 1.0)
     rbs (3.9.5)
       logger
-    rdoc (6.16.0)
+    rdoc (6.17.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -692,7 +692,7 @@ GEM
       solargraph (>= 0.48.0, <= 0.57)
     splunk-sdk-ruby (1.0.5)
     stackprof (0.2.27)
-    stringio (3.1.8)
+    stringio (3.1.9)
     swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)

app/assets/stylesheets/components/_header.scss

@@ -1,5 +1,9 @@
 @use "../vendor/nhsuk-frontend" as *;
 
+.nhsuk-header__navigation-item {
+  padding-right: nhsuk-spacing(2);
+}
+
 .app-header__navigation-item--with-count {
   .app-count {
     min-width: nhsuk-spacing(4);

app/assets/stylesheets/components/_index.scss

@@ -12,8 +12,9 @@
 @forward "panel";
 @forward "search-input";
 @forward "secondary-navigation";
-@forward "sticky-navigation";
+@forward "session-banner";
 @forward "status";
+@forward "sticky-navigation";
 @forward "summary-list";
 @forward "tables";
 @forward "tag";

app/assets/stylesheets/components/_secondary-navigation.scss

@@ -87,3 +87,31 @@
 .app-secondary-navigation__list-item {
   margin-bottom: 0;
 }
+
+.app-secondary-navigation--reverse {
+  color: $nhsuk-reverse-text-colour;
+
+  .app-secondary-navigation__link {
+    @include nhsuk-link-style-white;
+
+    &[aria-current] {
+      box-shadow: inset $nhsuk-border-width 0 $nhsuk-reverse-text-colour;
+
+      // stylelint-disable-next-line max-nesting-depth
+      @include nhsuk-media-query($from: tablet) {
+        box-shadow: inset 0 ($nhsuk-border-width * -1)
+          $nhsuk-reverse-text-colour;
+      }
+    }
+
+    &:link,
+    &:visited,
+    &:hover,
+    &:visited:hover,
+    &:active {
+      .nhsuk-icon--alert {
+        fill: nhsuk-colour("yellow");
+      }
+    }
+  }
+}

app/assets/stylesheets/components/_session-banner.scss

@@ -0,0 +1,37 @@
+@use "../vendor/nhsuk-frontend" as *;
+
+.app-session-banner {
+  box-sizing: border-box;
+  color: $nhsuk-reverse-text-colour;
+  background-color: nhsuk-shade($nhsuk-brand-colour, 20%);
+
+  @include nhsuk-print-colour;
+
+  .nhsuk-caption-l {
+    color: nhsuk-colour("grey-5");
+  }
+
+  .nhsuk-notification-banner {
+    border-color: nhsuk-colour("white");
+  }
+
+  .nhsuk-notification-banner__header {
+    background-color: nhsuk-colour("white");
+  }
+
+  .nhsuk-notification-banner__title {
+    color: $nhsuk-brand-colour;
+  }
+
+  .nhsuk-notification-banner__link {
+    @include nhsuk-link-style-white;
+  }
+
+  .nhsuk-notification-banner__heading {
+    color: $nhsuk-reverse-text-colour;
+  }
+
+  .app-secondary-navigation__list {
+    box-shadow: 0 -1px 0 0 $nhsuk-secondary-border-colour;
+  }
+}

app/components/app_import_format_details_component.rb

@@ -230,7 +230,7 @@ def programme
   end
 
   def vaccine_and_batch
-    vaccines = team.vaccines.pluck(:nivs_name).map { tag.i(it) }
+    vaccines = team.vaccines.pluck(:upload_name).map { tag.i(it) }
 
     vaccines_sentence =
       vaccines.to_sentence(

app/components/app_location_card_component.rb

@@ -57,7 +57,7 @@ def urn_row
         text: "URN"
       },
       value: {
-        text: tag.span(location.urn_and_site, class: "app-u-monospace")
+        text: tag.span(location.urn_and_site, class: "app-u-code")
       }
     }
   end

app/components/app_patient_search_form_component.html.erb

@@ -21,28 +21,17 @@
       <% end %>
     <% end %>
 
-    <% if !Flipper.enabled?(:programme_status, current_team) && (show_still_to_vaccinate || show_eligible_children) %>
+    <% if show_eligible_children %>
       <%= f.govuk_check_boxes_fieldset :show_only,
                                        multiple: true,
                                        legend: { text: "Show only", size: "s" },
                                        small: true do %>
-        <% if show_still_to_vaccinate %>
-          <%= f.govuk_check_box :still_to_vaccinate,
-                                1, 0,
-                                checked: form.still_to_vaccinate,
-                                multiple: false,
-                                link_errors: true,
-                                label: { text: "Still to vaccinate" },
-                                hint: { text: "With consent, not refused vaccine, not vaccinated yet" } %>
-        <% end %>
-        <% if show_eligible_children %>
-          <%= f.govuk_check_box :eligible_children,
-                                1, 0,
-                                checked: form.eligible_children,
-                                multiple: false,
-                                link_errors: true,
-                                label: { text: "Eligible this academic year and not vaccinated elsewhere" } %>
-        <% end %>
+        <%= f.govuk_check_box :eligible_children,
+                              1, 0,
+                              checked: form.eligible_children,
+                              multiple: false,
+                              link_errors: true,
+                              label: { text: "Eligible this academic year and not vaccinated elsewhere" } %>
       <% end %>
     <% end %>
 

app/components/app_patient_search_form_component.rb

@@ -16,7 +16,6 @@ def initialize(
     heading_level: 3,
     show_aged_out_of_programmes: false,
     show_eligible_children: false,
-    show_still_to_vaccinate: false,
     show_vaccine_criteria: false
   )
     @form = form
@@ -34,7 +33,6 @@ def initialize(
     @heading_level = heading_level
     @show_aged_out_of_programmes = show_aged_out_of_programmes
     @show_eligible_children = show_eligible_children
-    @show_still_to_vaccinate = show_still_to_vaccinate
     @show_vaccine_criteria = show_vaccine_criteria
   end
 
@@ -54,7 +52,6 @@ def initialize(
               :year_groups,
               :heading_level,
               :show_aged_out_of_programmes,
-              :show_still_to_vaccinate,
               :show_eligible_children,
               :show_vaccine_criteria