Add school and user tabs for claims by Kizr · Pull Request #1867 · DFE-Digital/itt-mentor-services

Kizr · 2026-02-20T12:05:22Z

Context

The user journey involves jumping through several navigation steps in the service to see basic information which should really be visible when viewing the claim.

Changes proposed in this pull request

Adds a tabular data view for claim details, allowing more information to be shown to the end user when they're making decisions about the claim.

Guidance to review

Log in as Colin
Navigate to the Claims tab
View any claim in the "All claims", "Payments", "Auditing", or "Clawbacks" secondary navigation

Link to Trello card

https://trello.com/c/mS6kwHTs/323-add-users-and-school-details-to-the-claim-screen-for-support-users

Screenshots

github-actions · 2026-02-20T12:13:35Z

Deployments

App	URL
Track & Pay	https://track-and-pay-pr-1867.test.teacherservices.cloud

Copilot

Pull request overview

Adds tabbed navigation to the support claim show pages so support users can view claim details, school details, associated school users, and history in one place without extra navigation steps.

Changes:

Introduces GOV.UK tabs on multiple support claim show views (claims, payments, auditing/samplings, clawbacks).
Adds new partials for “School details” and “School users” tab content and adjusts existing partials for tab usage.
Updates system specs and i18n strings to cover/align with the new tabbed UI.

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
spec/system/claims/support/claims/payments/view_a_claim_spec.rb	Updates the payments claim show system spec to exercise the new tabs and their content.
spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_show_page_spec.rb	Adjusts assertions to scope grant funding checks under `#grant_funding`; removes some history assertions.
spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_with_one_mentor_incorrect_spec.rb	Scopes “Grant funding” expectations within `#grant_funding`.
spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_with_all_mentors_incorrect_spec.rb	Scopes “Grant funding” expectations within `#grant_funding`.
spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_spec.rb	Scopes “Grant funding” expectations within `#grant_funding`.
config/locales/en/claims/support/claims/samplings.yml	Adds tab labels for auditing claim show.
config/locales/en/claims/support/claims/payments/claims.yml	Adds tab labels for payments claim show.
config/locales/en/claims/support/claims/clawbacks.yml	Adds tab labels for clawbacks claim show.
config/locales/en/claims/support/claims.yml	Adds shared tab labels plus copy for school users/details sections.
app/views/claims/support/claims/show.html.erb	Wraps the main support claim show page in tabs and renders new tab content.
app/views/claims/support/claims/samplings/show.html.erb	Adds tabs to auditing claim show page.
app/views/claims/support/claims/payments/claims/show.html.erb	Adds tabs to payments claim show page.
app/views/claims/support/claims/clawbacks/show.html.erb	Adds tabs to clawbacks claim show page.
app/views/claims/support/claims/_school_users.html.erb	New partial rendering a table of users for the claim’s school.
app/views/claims/support/claims/_school_details.html.erb	New partial rendering school details/grant conditions/funding/contact details.
app/views/claims/support/claims/_history.html.erb	Refactors history partial markup to suit tab rendering (heading level changed).
app/views/claims/support/claims/_details.html.erb	Removes link on the “School” summary row value.
app/views/claims/schools/_contact_details.html.erb	Refactors to use the passed `organisation` local (instead of `@school`).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-20T12:13:48Z

app/views/claims/support/claims/_history.html.erb

-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
-    <h2 class="govuk-heading-m"><%= t(".sub_heading") %></h2>
+<h1 class="govuk-heading-l"><%= t(".sub_heading") %></h1>


Changing the History heading to an
introduces an extra page-level heading when rendered inside the claim tabs. This leads to multiple
s (especially with JS disabled where all tab panels are shown). Recommend using an
/
here and reserving
for the claim title only.

Suggested change

<h1 class="govuk-heading-l"><%= t(".sub_heading") %></h1>

<h2 class="govuk-heading-l"><%= t(".sub_heading") %></h2>

Copilot · 2026-02-20T12:13:48Z

app/views/claims/support/claims/_details.html.erb

  <% summary_list.with_row do |row| %>
    <% row.with_key(text: Claims::Claim.human_attribute_name(:school)) %>
-    <% row.with_value(text: govuk_link_to(claim.school_name, claims_support_school_path(claim.school))) %>
+    <% row.with_value(text: claim.school_name) %>


This change removes the link from the School value in the claim summary list. If support users still need to navigate to the full school page, this is a functional regression. Consider keeping the school name as a link (or adding an explicit “View school” link elsewhere) while still providing the new School details tab.

Suggested change

<% row.with_value(text: claim.school_name) %>

<% row.with_value(text: govuk_link_to(claim.school_name, claim.school)) %>

Copilot · 2026-02-20T12:13:49Z

spec/system/claims/support/claims/payments/view_a_claim_spec.rb

+    expect(page).to have_table_row({
+      "Name" => "Sarah Smith",
+      "Email" => "sarah.smith@hogwarts.ac.uk",
+      "Last signed in" => 1.day.ago.strftime("%d %b %H:%M"),
+    })


This assertion formats 1.day.ago directly in the expectation, but the record was created with a separate 1.day.ago call earlier, so the formatted value can differ (and can also be sensitive to timezone/minute boundaries). To avoid flakiness, store the timestamp in a variable (or travel_to a fixed time) and format it using the same l(..., format: :short) as the view.

Copilot · 2026-02-20T12:13:49Z

spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_show_page_spec.rb

+    within "#grant_funding" do
+      expect(page).to have_h2("Grant funding")
+      expect(page).to have_summary_list_row("Original claim amount", @clawback_requested_claim.amount)
+    end


The History assertions for this claim state were removed, so the spec no longer verifies that claim activity is shown correctly on the show page. Since the UI now uses tabs, consider explicitly clicking the “History” tab and reintroducing assertions for the timeline items/links relevant to this scenario.

Suggested change

within "#grant_funding" do

expect(page).to have_h2("Grant funding")

expect(page).to have_summary_list_row("Original claim amount", @clawback_requested_claim.amount)

end

click_on "History"

expect(page).to have_content("History")

expect(page).to have_content("Claim 22222222")

Copilot · 2026-02-20T12:13:49Z

spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_show_page_spec.rb

@@ -167,8 +168,6 @@ def then_i_see_the_show_page_for_the_clawback_in_progress_claim
        expect(row).to have_css("ul.govuk-list li", text: mentor.full_name)
      end
    end


For this scenario the spec no longer asserts the History heading/timeline title, but still expects a “View details” link. If tabs are enhanced with JS (hiding inactive panels), this can become brittle unless the test navigates to the History tab first. Consider clicking “History” and asserting the expected timeline title as well, so the test exercises the intended UI.

Suggested change

end

end

click_on "History"

expect(page).to have_h2("History")

Copilot · 2026-02-20T12:13:49Z

app/views/claims/support/claims/_school_users.html.erb

@@ -0,0 +1,25 @@
+<h1 class="govuk-heading-l"><%= t(".heading") %></h1>


The tab panels introduce additional
headings (e.g., “School users”). With GOV.UK tabs, all panels are in the DOM (and without JS they’re all visible), so this results in multiple page-level
s, which is invalid heading structure and harms accessibility. Recommend keeping a single
for the page (the claim title) and using
/
headings (or relying on the tabs component’s panel titles) inside each tab panel.

Suggested change

<h1 class="govuk-heading-l"><%= t(".heading") %></h1>

<h2 class="govuk-heading-l"><%= t(".heading") %></h2>

Copilot · 2026-02-20T12:13:49Z

app/views/claims/support/claims/_school_users.html.erb

+      <% organisation.users.each do |user| %>
+        <% body.with_row do |row| %>
+          <% row.with_cell text: user.full_name %>
+          <% row.with_cell text: user.email %>
+          <% row.with_cell text: user.last_signed_in_at ? l(user.last_signed_in_at, format: :short) : t(".never_signed_in") %>


Table row order is currently based on organisation.users.each, which is not guaranteed to be stable unless the association has an order defined. For a predictable UI (and to avoid flaky tests when multiple users exist), consider ordering explicitly (e.g., by full name using the existing order_by_full_name scope).

Copilot · 2026-02-20T12:13:50Z

app/views/claims/support/claims/_school_details.html.erb

@@ -0,0 +1,9 @@
+<h1 class="govuk-heading-l"><%= t(".heading") %></h1>


This partial uses an
(“School details”) but the claim show page already has a page-level
in the first tab. When tabs are rendered without JS, multiple
s will be visible on the page. Recommend changing this to an
(or a smaller GOV.UK heading) so the overall page keeps a single
.

Suggested change

<h1 class="govuk-heading-l"><%= t(".heading") %></h1>

<h2 class="govuk-heading-l"><%= t(".heading") %></h2>

Kizr added 2 commits February 11, 2026 12:10

Update claims show page with new tab format

5b060ae

Add more detail to the claims support view

909c5e6

Kizr self-assigned this Feb 20, 2026

Kizr added the deploy A Review App will be created for PRs with this label label Feb 20, 2026

Kizr deployed to review February 20, 2026 12:07 — with GitHub Actions Active

Kizr requested a review from Copilot February 20, 2026 12:08

Kizr changed the title ~~Ba/add school and user tabs for claims~~ Add school and user tabs for claims Feb 20, 2026

Copilot started reviewing on behalf of Kizr February 20, 2026 12:08 View session

Copilot AI reviewed Feb 20, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Add school and user tabs for claims#1867

Add school and user tabs for claims#1867
Kizr wants to merge 2 commits intomainfrom
ba/add-school-and-user-tabs-for-claims

Kizr commented Feb 20, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Copilot AI Feb 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

	<h1 class="govuk-heading-l"><%= t(".sub_heading") %></h1>
	<h2 class="govuk-heading-l"><%= t(".sub_heading") %></h2>

	<% row.with_value(text: claim.school_name) %>
	<% row.with_value(text: govuk_link_to(claim.school_name, claim.school)) %>

-    end
+    end
+    click_on "History"
+    expect(page).to have_h2("History")

		@@ -0,0 +1,25 @@
		<h1 class="govuk-heading-l"><%= t(".heading") %></h1>

	<h1 class="govuk-heading-l"><%= t(".heading") %></h1>
	<h2 class="govuk-heading-l"><%= t(".heading") %></h2>

		@@ -0,0 +1,9 @@
		<h1 class="govuk-heading-l"><%= t(".heading") %></h1>

Comments

Conversation

Kizr commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Context

Changes proposed in this pull request

Guidance to review

Link to Trello card

Screenshots

Uh oh!

github-actions bot commented Feb 20, 2026

Deployments

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

introduces an extra page-level heading when rendered inside the claim tabs. This leads to multiple

s (especially with JS disabled where all tab panels are shown). Recommend using an

/

here and reserving

for the claim title only. Suggested change <h1 class="govuk-heading-l"><%= t(".sub_heading") %></h1> <h2 class="govuk-heading-l"><%= t(".sub_heading") %></h2>

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

headings (e.g., “School users”). With GOV.UK tabs, all panels are in the DOM (and without JS they’re all visible), so this results in multiple page-level

s, which is invalid heading structure and harms accessibility. Recommend keeping a single

for the page (the claim title) and using

/

headings (or relying on the tabs component’s panel titles) inside each tab panel. Suggested change <h1 class="govuk-heading-l"><%= t(".heading") %></h1> <h2 class="govuk-heading-l"><%= t(".heading") %></h2>

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

(“School details”) but the claim show page already has a page-level

in the first tab. When tabs are rendered without JS, multiple

s will be visible on the page. Recommend changing this to an

(or a smaller GOV.UK heading) so the overall page keeps a single

. Suggested change <h1 class="govuk-heading-l"><%= t(".heading") %></h1> <h2 class="govuk-heading-l"><%= t(".heading") %></h2>

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Kizr commented Feb 20, 2026 •

edited

Loading

for the claim title only.

Suggested change

<h1 class="govuk-heading-l"><%= t(".sub_heading") %></h1>

<h2 class="govuk-heading-l"><%= t(".sub_heading") %></h2>

headings (or relying on the tabs component’s panel titles) inside each tab panel.

Suggested change

<h1 class="govuk-heading-l"><%= t(".heading") %></h1>

<h2 class="govuk-heading-l"><%= t(".heading") %></h2>

.

Suggested change

<h1 class="govuk-heading-l"><%= t(".heading") %></h1>

<h2 class="govuk-heading-l"><%= t(".heading") %></h2>