<%= govuk_table(classes: 'app-performance-table') do |table|
- table.caption(size: 'm', text: "How quickly did users get their TRN (today and the previous 7 days)")
-
- table.head do |head|
- head.row do |row|
- row.cell(header: true, text: 'Date')
- row.cell(header: true) { '90% of users
got their TRN within'.html_safe }
- row.cell(header: true) { '75% of users
got their TRN within'.html_safe }
- row.cell(header: true) { '50% of users
got their TRN within'.html_safe }
-
- end; end; table.body do |body|
- @duration_usage.each do |data_row|
- body.row do |row|
- row.cell { data_row[0] }
- row.cell { data_row[1] }
- row.cell { data_row[2] }
- row.cell { data_row[3] }
- end
+ table.with_caption(size: 'm', text: "How quickly did users get their TRN (today and the previous 7 days)")
+
+ table.head do |head|
+ head.with_row do |row|
+ row.with_cell(header: true, text: 'Date')
+ row.with_cell(header: true) { '90% of users
got their TRN within'.html_safe }
+ row.with_cell(header: true) { '75% of users
got their TRN within'.html_safe }
+ row.with_cell(header: true) { '50% of users
got their TRN within'.html_safe }
+
+ end;
+ end;
+
+ table.with_body do |body|
+ @duration_usage.each do |data_row|
+ body.with_row do |row|
+ row.with_cell { data_row[0] }
+ row.with_cell { data_row[1] }
+ row.with_cell { data_row[2] }
+ row.with_cell { data_row[3] }
end
- body.row(classes: 'app-performance-table-total-row') do |row|
- row.cell(header: true) { 'Average (today and the last 7 days)' }
- row.cell { @duration_averages[0] }
- row.cell { @duration_averages[1] }
- row.cell { @duration_averages[2] }
- end
- end; end %>
+ end
+
+ body.with_row(classes: 'app-performance-table-total-row') do |row|
+ row.with_cell(header: true) { 'Average (today and the last 7 days)' }
+ row.with_cell { @duration_averages[0] }
+ row.with_cell { @duration_averages[1] }
+ row.with_cell { @duration_averages[2] }
+ end
+ end;
+ end %>
diff --git a/app/views/support_interface/staff/index.html.erb b/app/views/support_interface/staff/index.html.erb
index fb87b8093..f509629f2 100644
--- a/app/views/support_interface/staff/index.html.erb
+++ b/app/views/support_interface/staff/index.html.erb
@@ -10,16 +10,16 @@
<%= staff.email %>
<%= govuk_summary_list do |summary_list|
- summary_list.row do |row|
- row.key { 'Created at' }
- row.value { staff.created_at.to_s }
+ summary_list.with_row do |row|
+ row.with_key { 'Created at' }
+ row.with_value { staff.created_at.to_s }
end
if staff.created_by_invite?
- summary_list.row do |row|
- row.key { 'Invitation status' }
+ summary_list.with_row do |row|
+ row.with_key { 'Invitation status' }
- row.value do
+ row.with_value do
if staff.invitation_accepted?
govuk_tag(text: "Accepted", colour: "green")
else
@@ -28,15 +28,15 @@
end
end
- summary_list.row do |row|
- row.key { 'Invited at' }
- row.value { staff.invitation_sent_at.to_s }
+ summary_list.with_row do |row|
+ row.with_key { 'Invited at' }
+ row.with_value { staff.invitation_sent_at.to_s }
end
end
- summary_list.row do |row|
- row.key { 'Last signed in at' }
- row.value { staff.last_sign_in_at.to_s }
+ summary_list.with_row do |row|
+ row.with_key { 'Last signed in at' }
+ row.with_value { staff.last_sign_in_at.to_s }
end
end %>
<% end %>
diff --git a/app/views/support_interface/trn_requests/index.html.erb b/app/views/support_interface/trn_requests/index.html.erb
index 479312f1c..bd1974bfa 100644
--- a/app/views/support_interface/trn_requests/index.html.erb
+++ b/app/views/support_interface/trn_requests/index.html.erb
@@ -13,19 +13,19 @@
<% @trn_requests.each do |trn_request| %>
TRN Request #<%= trn_request.id %>
<%= govuk_summary_list do |summary_list|
- summary_list.row do |row|
- row.key(text: 'Created at')
- row.value(text: trn_request.created_at)
+ summary_list.with_row do |row|
+ row.with_key(text: 'Created at')
+ row.with_value(text: trn_request.created_at)
end
- summary_list.row do |row|
- row.key(text: 'Updated at')
- row.value(text: trn_request.updated_at)
+ summary_list.with_row do |row|
+ row.with_key(text: 'Updated at')
+ row.with_value(text: trn_request.updated_at)
end
- summary_list.row do |row|
- row.key(text: 'Submitted at')
- row.value do
+ summary_list.with_row do |row|
+ row.with_key(text: 'Submitted at')
+ row.with_value do
if trn_request.checked_at
trn_request.checked_at.to_s
else
@@ -35,9 +35,9 @@
end
if trn_request.checked_at
- summary_list.row do |row|
- row.key(text: 'TRN')
- row.value do
+ summary_list.with_row do |row|
+ row.with_key(text: 'TRN')
+ row.with_value do
if trn_request.trn
govuk_tag(colour: 'green', text: 'Found 🎉')
else
@@ -47,26 +47,26 @@
end
if !trn_request.zendesk_ticket_id && !trn_request.trn
- summary_list.row do |row|
- row.key(text: 'Zendesk ticket')
- row.value do
+ summary_list.with_row do |row|
+ row.with_key(text: 'Zendesk ticket')
+ row.with_value do
govuk_tag(colour: 'grey', text: 'Not submitted')
end
end
end
if trn_request.zendesk_ticket_id
- summary_list.row do |row|
- row.key(text: 'Zendesk ticket')
- row.value do
+ summary_list.with_row do |row|
+ row.with_key(text: 'Zendesk ticket')
+ row.with_value do
tag.a "Ticket #{trn_request.zendesk_ticket_id}", class: 'govuk-link', href: "#{ENV["ZENDESK_URL"]}/agent/tickets/#{trn_request.zendesk_ticket_id}"
end
end
unless trn_request.trn
- summary_list.row do |row|
- row.key(text: 'Actions')
- row.value do
+ summary_list.with_row do |row|
+ row.with_key(text: 'Actions')
+ row.with_value do
govuk_button_to("Sync from Zendesk", [:support_interface, trn_request, :zendesk_sync], secondary: true, class: 'govuk-!-margin-bottom-0')
end
end
diff --git a/app/views/support_interface/users/index.html.erb b/app/views/support_interface/users/index.html.erb
index 9a4f8ea4c..22581bc91 100644
--- a/app/views/support_interface/users/index.html.erb
+++ b/app/views/support_interface/users/index.html.erb
@@ -16,36 +16,36 @@
No users.
<% else %>
<%= govuk_table do |table|
- table.head do |head|
- head.row do |row|
- row.cell(header: true, width: 'one-quarter') do
+ table.with_head do |head|
+ head.with_row do |row|
+ row.with_cell(header: true, width: 'one-quarter') do
tag.span("Name")
end
- row.cell(header: true, width: 'one-quarter') do
+ row.with_cell(header: true, width: 'one-quarter') do
tag.span("Email")
end
- row.cell(header: true, width: 'one-quarter') do
+ row.with_cell(header: true, width: 'one-quarter') do
tag.span("DQT record")
end
- row.cell(header: true, width: 'one-quarter') do
+ row.with_cell(header: true, width: 'one-quarter') do
tag.span("TRN")
end
end
end
- table.body do |body|
+ table.with_body do |body|
@users.each do |user|
- body.row do |row|
- row.cell do
+ body.with_row do |row|
+ row.with_cell do
user_info_link(user)
end
- row.cell do
+ row.with_cell do
user.email
end
- row.cell do
+ row.with_cell do
user_dqt_record_status(user)
end
- row.cell do
+ row.with_cell do
tag.span(user.trn)
end
end
diff --git a/app/views/support_interface/validation_errors/index.html.erb b/app/views/support_interface/validation_errors/index.html.erb
index db8543959..eebe9e38a 100644
--- a/app/views/support_interface/validation_errors/index.html.erb
+++ b/app/views/support_interface/validation_errors/index.html.erb
@@ -11,18 +11,18 @@
<%= govuk_table do |table|
- table.head do |head|
- head.row do |row|
- row.cell(header: true, text: 'Form')
- row.cell(header: true, text: 'Error count')
+ table.with_head do |head|
+ head.with_row do |row|
+ row.with_cell(header: true, text: 'Form')
+ row.with_cell(header: true, text: 'Error count')
end
end
- table.body do |body|
+ table.with_body do |body|
@validation_errors.each do |form_name, count|
- body.row do |row|
- row.cell(text: link_to(form_name, support_interface_validation_error_path(form_name)))
- row.cell(text: count)
+ body.with_row do |row|
+ row.with_cell(text: link_to(form_name, support_interface_validation_error_path(form_name)))
+ row.with_cell(text: count)
end
end
end
diff --git a/app/views/support_interface/validation_errors/show.html.erb b/app/views/support_interface/validation_errors/show.html.erb
index 8b0b6e70c..0d00c607a 100644
--- a/app/views/support_interface/validation_errors/show.html.erb
+++ b/app/views/support_interface/validation_errors/show.html.erb
@@ -9,35 +9,35 @@
<%= govuk_table do |table|
- table.head do |head|
- head.row do |row|
- row.cell(header: true, text: 'Time', width: 'one-quarter')
- row.cell(header: true, text: 'TRN Request ID')
- row.cell(header: true, text: 'Errors')
+ table.with_head do |head|
+ head.with_row do |row|
+ row.with_cell(header: true, text: 'Time', width: 'one-quarter')
+ row.with_cell(header: true, text: 'TRN Request ID')
+ row.with_cell(header: true, text: 'Errors')
end
end
- table.body do |body|
+ table.with_body do |body|
@validation_errors.each do |validation_error|
- body.row do |row|
- row.cell(text: validation_error.created_at.to_fs(:long_ordinal_uk))
- row.cell(text: validation_error.trn_request.id)
- row.cell(classes: ['app-p0']) do
+ body.with_row do |row|
+ row.with_cell(text: validation_error.created_at.to_fs(:long_ordinal_uk))
+ row.with_cell(text: validation_error.trn_request.id)
+ row.with_cell(classes: ['app-p0']) do
validation_error.messages.map do |error, details|
govuk_summary_list(actions: false) do |summary_list|
- summary_list.row do |row|
- row.key { 'Attribute' }
- row.value { error }
+ summary_list.with_row do |row|
+ row.with_key { 'Attribute' }
+ row.with_value { error }
end
- summary_list.row do |row|
- row.key { 'Value' }
- row.value { details['value'].inspect }
+ summary_list.with_row do |row|
+ row.with_key { 'Value' }
+ row.with_value { details['value'].inspect }
end
- summary_list.row do |row|
- row.key { 'Errors' }
- row.value { details['messages'].map { |s| ERB::Util.html_escape(s) }.join('
').html_safe }
+ summary_list.with_row do |row|
+ row.with_key { 'Errors' }
+ row.with_value { details['messages'].map { |s| ERB::Util.html_escape(s) }.join('
').html_safe }
end
end
end.join.html_safe
diff --git a/app/views/support_interface/zendesk/index.html.erb b/app/views/support_interface/zendesk/index.html.erb
index baff7437e..5ba5c42ed 100644
--- a/app/views/support_interface/zendesk/index.html.erb
+++ b/app/views/support_interface/zendesk/index.html.erb
@@ -41,37 +41,37 @@
No tickets need to be deleted.
<% else %>
<%= govuk_table do |table|
- table.head do |head|
- head.row do |row|
- row.cell(header: true, width: 'one-quarter') do
+ table.with_head do |head|
+ head.with_row do |row|
+ row.with_cell(header: true, width: 'one-quarter') do
tag.span("Ticket link") +
tag.span("Group name", class: 'govuk-caption-m')
end
- row.cell(header: true, width: 'one-third') do
+ row.with_cell(header: true, width: 'one-third') do
tag.span("Closed at") +
tag.span("Received at", class: 'govuk-caption-m')
end
- row.cell(header: true) do
+ row.with_cell(header: true) do
tag.span("Tag: Enquiry type") +
tag.span("Tag: No action required", class: 'govuk-caption-m')
end
end
end
- table.body do |body|
+ table.with_body do |body|
@zendesk_tickets.each do |ticket|
- body.row do |row|
- row.cell do
+ body.with_row do |row|
+ row.with_cell do
tag.a("Ticket #{ticket.ticket_id}",
class: 'govuk-link',
href: "#{ENV["ZENDESK_URL"]}/agent/tickets/#{ticket.ticket_id}") +
tag.span(ticket.group_name, class: 'govuk-caption-m')
end
- row.cell do
+ row.with_cell do
tag.span(ticket.closed_at, class: 'app-!-font-tabular') +
tag.span(ticket.received_at, class: 'app-!-font-tabular govuk-caption-m')
end
- row.cell do
+ row.with_cell do
tag.code(ticket.enquiry_type, class: 'app-!-word-break-all') +
tag.span(ticket.no_action_required, class: 'govuk-caption-m')
end
@@ -101,37 +101,37 @@
<%= govuk_pagination(pagy: @pagy) %>
<%= govuk_table do |table|
- table.head do |head|
- head.row do |row|
- row.cell(header: true, width: 'one-quarter') do
+ table.with_head do |head|
+ head.with_row do |row|
+ row.with_cell(header: true, width: 'one-quarter') do
tag.span("Ticket link") +
tag.span("Group name", class: 'govuk-caption-m')
end
- row.cell(header: true, width: 'one-third') do
+ row.with_cell(header: true, width: 'one-third') do
tag.span("Closed at") +
tag.span("Received at", class: 'govuk-caption-m')
end
- row.cell(header: true) do
+ row.with_cell(header: true) do
tag.span("Tag: Enquiry type") +
tag.span("Tag: No action required", class: 'govuk-caption-m')
end
end
end
- table.body do |body|
+ table.with_body do |body|
@zendesk_delete_requests.each do |ticket|
- body.row do |row|
- row.cell do
+ body.with_row do |row|
+ row.with_cell do
tag.a("Ticket #{ticket.ticket_id}",
class: 'govuk-link',
href: "#{ENV["ZENDESK_URL"]}/agent/tickets/#{ticket.ticket_id}") +
tag.span(ticket.group_name, class: 'govuk-caption-m')
end
- row.cell do
+ row.with_cell do
tag.span(ticket.closed_at, class: 'app-!-font-tabular') +
tag.span(ticket.received_at, class: 'app-!-font-tabular govuk-caption-m')
end
- row.cell do
+ row.with_cell do
tag.code(ticket.enquiry_type, class: 'app-!-word-break-all') +
tag.span(ticket.no_action_required, class: 'govuk-caption-m')
end
diff --git a/spec/components/trn_requests_performance_table_component_spec.rb b/spec/components/trn_requests_performance_table_component_spec.rb
index 9ca113e21..9520976e4 100644
--- a/spec/components/trn_requests_performance_table_component_spec.rb
+++ b/spec/components/trn_requests_performance_table_component_spec.rb
@@ -27,16 +27,17 @@
it "renders a row per period" do
expect(rendered_result_text).to include(
- "2 June\n 1 (33%) \n 1 (33%) \n 1 (33%) \n 3 requests",
+ "2 June1 (33%) 1 (33%) 1 (33%) 3 requests"
)
expect(rendered_result_text).to include(
- "1 June\n 1 (33%) \n 1 (33%) \n 1 (33%) \n 3 requests",
+ "1 June1 (33%) 1 (33%) 1 (33%) 3 requests"
)
+
end
it "renders the totals row" do
expect(rendered_result_text).to include(
- "Total (last 7 days)\n 2 (33%) \n 2 (33%) \n 2 (33%) \n 6 requests",
+ "Total (last 7 days)2 (33%) 2 (33%) 2 (33%) 6 requests"
)
end