-
+ <%= govuk_footer(meta_items_title: "Support links", meta_items: { "Accessibility" => "/accessibility", "Contact Parliamentary Branch" => "mailto:pqs@justice.gov.uk?Subject=PQ%20Tracker" }) %>
- <%= javascript_include_tag "govuk-template.js", integrity: true, crossorigin: "anonymous" %>
-
<%= yield :body_end %>
-
- <%# if no GOVUK-namespaced module has loaded we can assume JS has failed and remove the class %>
-
diff --git a/app/views/members/_by_name.html.slim b/app/views/members/_by_name.html.slim
deleted file mode 100644
index d676b27bb..000000000
--- a/app/views/members/_by_name.html.slim
+++ /dev/null
@@ -1,7 +0,0 @@
-#members_result
- .field
- select#members_result_select
- - @members.each do |member|
- option data-name=member.display_as value=member.member_id
- | #{member['Member_Id']} - #{member['DisplayAs']}
- = link_to 'Select', {remote: true}, {id: 'members_result_select_link'}
diff --git a/app/views/minister_contacts/create.html.slim b/app/views/minister_contacts/create.html.slim
index 2afb3a6f2..9468b3625 100644
--- a/app/views/minister_contacts/create.html.slim
+++ b/app/views/minister_contacts/create.html.slim
@@ -1,2 +1,2 @@
-h1
+h1.govuk-heading-l
| Add contact to #{@minister.name}
diff --git a/app/views/minister_contacts/edit.html.slim b/app/views/minister_contacts/edit.html.slim
index b23ed9947..69490e804 100644
--- a/app/views/minister_contacts/edit.html.slim
+++ b/app/views/minister_contacts/edit.html.slim
@@ -1,4 +1,4 @@
-h1
+h1.govuk-heading-l
| Edit minister contact
= render 'form'
= link_to 'Back', minister_path(@minister)
diff --git a/app/views/minister_contacts/new.html.slim b/app/views/minister_contacts/new.html.slim
index 3c41b1cb6..5c7a431c7 100644
--- a/app/views/minister_contacts/new.html.slim
+++ b/app/views/minister_contacts/new.html.slim
@@ -1,4 +1,4 @@
-h1
+h1.govuk-heading-l
| New contact for #{@minister.name}
= render 'form'
= link_to 'Back', minister_path(@minister)
diff --git a/app/views/ministers/_form.html.slim b/app/views/ministers/_form.html.slim
index 3566fb47b..1b065e591 100644
--- a/app/views/ministers/_form.html.slim
+++ b/app/views/ministers/_form.html.slim
@@ -19,12 +19,12 @@
label.form-label for="minister_minister_contacts_attributes_0_phone" Phone
= ff.text_field :phone, {class: 'form-control'}
.form-group
- p Contact status
+ p.govuk-body Contact status
label.block-label for="minister_minister_contacts_attributes_0_deleted"
= ff.check_box :deleted
| Inactive
.form-group
- p style="" Minister status
+ p.govuk-body style="" Minister status
label.block-label for="minister_deleted"
= f.check_box :deleted
= ' Inactive'
diff --git a/app/views/ministers/edit.html.slim b/app/views/ministers/edit.html.slim
index 579f80799..5c6d6e788 100644
--- a/app/views/ministers/edit.html.slim
+++ b/app/views/ministers/edit.html.slim
@@ -1,3 +1,3 @@
-h1 Edit minister
+h1.govuk-heading-l Edit minister
= render 'form'
= link_to 'Return to Minister list', ministers_path, {class: 'admin-link'}
diff --git a/app/views/ministers/index.html.slim b/app/views/ministers/index.html.slim
index 3db1fbbd7..b74180b24 100644
--- a/app/views/ministers/index.html.slim
+++ b/app/views/ministers/index.html.slim
@@ -1,6 +1,6 @@
-h1 Ministers
+h1.govuk-heading-l Ministers
#admin-ministers-list
- .row
+ div
ul#admin-button-bar
li= link_to ('Add minister'), new_minister_path, {class: 'button-secondary'}
table.table aria-label="ministers"
diff --git a/app/views/ministers/new.html.slim b/app/views/ministers/new.html.slim
index ce712c85b..7b078b9fb 100644
--- a/app/views/ministers/new.html.slim
+++ b/app/views/ministers/new.html.slim
@@ -1,3 +1,3 @@
-h1 Add minister
+h1.govuk-heading-l Add minister
= render 'form'
= link_to 'Return to minister list', ministers_path, {class: 'admin-link'}
diff --git a/app/views/ministers/show.html.slim b/app/views/ministers/show.html.slim
index c4a0a6752..5625cccb8 100644
--- a/app/views/ministers/show.html.slim
+++ b/app/views/ministers/show.html.slim
@@ -1,13 +1,13 @@
#admin-ministers-details
- h1 Minister details
+ h1.govuk-heading-l Minister details
= render partial: "shared/flash_messages", flash: flash
- h2 Name
- p= @minister.name
- h2 Title
- p= @minister.title
- h2 Status
+ h2.govuk-heading-m Name
+ p.govuk-body= @minister.name
+ h2.govuk-heading-m Title
+ p.govuk-body= @minister.title
+ h2.govuk-heading-m Status
= render partial: 'shared/status', object: @minister
- h2 Contacts
+ h2.govuk-heading-m Contacts
div class="row"
ul#admin-button-bar
li= link_to ('Add new contact'), new_minister_contact_withid_path(@minister), {class: 'button-secondary'}
diff --git a/app/views/ogds/_form.html.slim b/app/views/ogds/_form.html.slim
index 3e3663ff3..1e4c09ec4 100644
--- a/app/views/ogds/_form.html.slim
+++ b/app/views/ogds/_form.html.slim
@@ -9,7 +9,7 @@
label.form-label for="ogd_acronym" Acronym (required)
= f.text_field :acronym, {class: 'form-control'}
.form-group
- p Status
+ p.govuk-body Status
label.block-label for="ogd_deleted"
= f.check_box :deleted
| Inactive
diff --git a/app/views/ogds/edit.html.slim b/app/views/ogds/edit.html.slim
index 8bc909aef..99bb73d2d 100644
--- a/app/views/ogds/edit.html.slim
+++ b/app/views/ogds/edit.html.slim
@@ -1,3 +1,3 @@
-h1 Edit Government Department
+h1.govuk-heading-l Edit Government Department
= render 'form'
= link_to 'Return to Other Government Department list', ogds_path, {class: 'admin-link'}
diff --git a/app/views/ogds/index.html.slim b/app/views/ogds/index.html.slim
index e7de8d52b..a9b5b9249 100644
--- a/app/views/ogds/index.html.slim
+++ b/app/views/ogds/index.html.slim
@@ -1,4 +1,4 @@
-h1 Other Government Departments
+h1.govuk-heading-l Other Government Departments
#admin-odg-list
div class="row"
ul#admin-button-bar
diff --git a/app/views/ogds/new.html.slim b/app/views/ogds/new.html.slim
index 0d3bc6984..6249bf97d 100644
--- a/app/views/ogds/new.html.slim
+++ b/app/views/ogds/new.html.slim
@@ -1,3 +1,3 @@
-h1 Add Government Department
+h1.govuk-heading-l Add Government Department
= render 'form'
= link_to 'Return to Other Government Department list', ogds_path, {class: 'admin-link'}
diff --git a/app/views/ogds/show.html.slim b/app/views/ogds/show.html.slim
index 63e8d4b17..e5f34c556 100644
--- a/app/views/ogds/show.html.slim
+++ b/app/views/ogds/show.html.slim
@@ -1,14 +1,14 @@
-h1 Government Department details
+h1.govuk-heading-l Government Department details
#admin-ogd-details
= render partial: "shared/flash_messages", flash: flash
- h2 Name
- p= @ogd.name
- h2 Acronym
- p= @ogd.acronym
- h2 Status
+ h2.govuk-heading-m Name
+ p.govuk-body= @ogd.name
+ h2.govuk-heading-m Acronym
+ p.govuk-body= @ogd.acronym
+ h2.govuk-heading-m Status
= render partial: 'shared/status', object: @ogd
- p
+ p.govuk-body
= link_to 'Edit', edit_ogd_path(@ogd), {class: 'admin-link'}
- span.visually-hidden
+ span.govuk-visually-hidden
= ' | '
= link_to 'Return to Other Government Department list', ogds_path, {class: 'admin-link'}
diff --git a/app/views/pages/accessibility.html.slim b/app/views/pages/accessibility.html.slim
index f46156df3..01655bd62 100644
--- a/app/views/pages/accessibility.html.slim
+++ b/app/views/pages/accessibility.html.slim
@@ -1,48 +1,49 @@
-h1.heading-large Accessibility statement
+h1.govuk-heading-l.govuk-main-wrapper--auto-spacing Accessibility statement
-p This website is run by the Ministry of Justice Digital & Technology team. We want as many people as possible to be able to use this website. For example, that means you should be able to:
+p.govuk-body This website is run by the Ministry of Justice Digital & Technology team. We want as many people as possible to be able to use this website. For example, that means you should be able to:
-ul.list.list-bullet
- li change colours, contrast levels and fonts
- li zoom in up to 200% without the text spilling off the screen
- li navigate most of the web form using just a keyboard
- li navigate most of the web form using speech recognition software
- li listen to most of the web form using a screen reader (including the most recent versions of JAWS, NVDA and VoiceOver)
+= govuk_list ["change colours, contrast levels and fonts", "zoom in up to 200% without the text spilling off the screen", "navigate most of the web form using just a keyboard", "navigate most of the web form using speech recognition software", "listen to most of the web form using a screen reader (including the most recent versions of JAWS, NVDA and VoiceOver)"], type: :bullet
-p We’ve also made the website text as simple as possible to understand.
-p AbilityNet has advice on making your device easier to use if you have a disability.
+p.govuk-body We've also made the website text as simple as possible to understand.
+p.govuk-body AbilityNet has advice on making your device easier to use if you have a disability.
-h2.heading-medium How accessible this website is
+h2.govuk-heading-m How accessible this website is
-p This website is not fully accessible.
-p We have completed a WCAG 2.1 review internally and externally and are currently in the process of remediation.
+p.govuk-body This website is not fully accessible.
+p.govuk-body We have completed a WCAG 2.1 review internally and externally and are currently in the process of remediation.
-h2.heading-medium What to do if you cannot access parts of this website
-p If you need information on this website in a different format like accessible PDF, large print, easy read, audio recording or braille:
-ul.list.list-bullet
- li email: pqsupport@digital.justice.gov.uk
-p We’ll consider your request and get back to you within 7 days.
+h2.govuk-heading-m What to do if you cannot access parts of this website
+p.govuk-body If you need information on this website in a different format like accessible PDF, large print, easy read, audio recording or braille:
+= govuk_list [link_to("pqsupport@digital.justice.gov.uk", "mailto:pqsupport@digital.justice.gov.uk")], type: :bullet
+p.govuk-body We'll consider your request and get back to you within 7 days.
-h2.heading-medium Reporting accessibility problems with this website
-p We’re always looking to improve the accessibility of this website. If you find any problems or think we’re not meeting accessibility requirements:
-ul.list.list-bullet
- li email: pqsupport@digital.justice.gov.uk
+h2.govuk-heading-m Reporting accessibility problems with this website
+p.govuk-body We're always looking to improve the accessibility of this website. If you find any problems or think we're not meeting accessibility requirements:
+= govuk_list [link_to("pqsupport@digital.justice.gov.uk", "mailto:pqsupport@digital.justice.gov.uk")], type: :bullet
-h2.heading-medium Enforcement procedure
-p The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint, contact the Equality Advisory and Support Service (EASS).
+h2.govuk-heading-m Enforcement procedure
+p.govuk-body
+ = "The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the 'accessibility regulations'). If you're not happy with how we respond to your complaint, contact the "
+ = link_to("Equality Advisory and Support Service", "https://www.equalityadvisoryservice.com/")
+ = " (EASS)."
-h2.heading-medium Technical information about this website’s accessibility
-p The Ministry of Justice Digital & Technology is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.
+h2.govuk-heading-m Technical information about this website's accessibility
+p.govuk-body The Ministry of Justice Digital & Technology is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.
-h2.heading-medium Compliance status
-p This website is fully compliant with the Web Content Accessibility Guidelines version 2.1 AA standard.
+h2.govuk-heading-m Compliance status
+p.govuk-body
+ = "This website is fully compliant with the "
+ = link_to("Web Content Accessibility Guidelines version 2.1", "https://www.w3.org/TR/WCAG21/")
+ = " AA standard."
-h2.heading-medium How this website has been tested for accessibility
-p We tested the website using tools such as Wave as well as manual testing against WCAG 2.1 guidelines and no accessibility issues were identified.
+h2.govuk-heading-m How this website has been tested for accessibility
+p.govuk-body We tested the website using tools such as Wave as well as manual testing against WCAG 2.1 guidelines and no accessibility issues were identified.
-p Our main website is available at https://trackparliamentaryquestions.service.gov.uk/.
-
-h2.heading-medium Preparation of this accessibility statement
-p This website was last tested on 27th June 2022. The test was carried out internally by the application’s support team with help from the MOJ Accessibility team.
-p This statement was prepared on 22nd July 2022. It was last updated on 25th July 2022.
+p.govuk-body
+ = "Our main website is available at "
+ = link_to("https://trackparliamentaryquestions.service.gov.uk", "https://trackparliamentaryquestions.service.gov.uk")
+ = "."
+h2.govuk-heading-m Preparation of this accessibility statement
+p.govuk-body This website was last tested on 27th June 2022. The test was carried out internally by the application's support team with help from the MOJ Accessibility team.
+p.govuk-body This statement was prepared on 22nd July 2022. It was last updated on 25th July 2022.
diff --git a/app/views/pqs/_answer.html.slim b/app/views/pqs/_answer.html.slim
index 2871c843f..b0cfc4c97 100644
--- a/app/views/pqs/_answer.html.slim
+++ b/app/views/pqs/_answer.html.slim
@@ -1,4 +1,4 @@
-h2 Answer
+h2.govuk-heading-m Answer
.form-group
label.form-label for="answer_submitted" Date answer submitted
.datetimepicker
diff --git a/app/views/pqs/_com_data.html.slim b/app/views/pqs/_com_data.html.slim
index 77fd5dde7..ca793b973 100644
--- a/app/views/pqs/_com_data.html.slim
+++ b/app/views/pqs/_com_data.html.slim
@@ -1,4 +1,4 @@
-h2 PQ commission
+h2.govuk-heading-m PQ commission
.form-group
label.form-label for="pq_internal_deadline"
| Internal deadline#{render partial: 'shared/deadline_time', locals: {internal_deadline: @pq.internal_deadline, is_closed: @pq.closed?, draft_reply: @pq.draft_answer_received }}
@@ -7,7 +7,7 @@ h2 PQ commission
span.fa.fa-calendar title="select a date"
hr/
.question-allocation
- h3 Action officer(s)
+ h3.govuk-heading-s Action officer(s)
p
- if @pq.action_officers.not_rejected.size > 0
- @pq.action_officers_pqs.not_rejected.order(updated_at: :desc).each_with_index do |ao_pq, ind|
@@ -17,37 +17,37 @@ hr/
- @pq.action_officers_pqs.order(updated_at: :desc).each do |ao_pq|
- if ao_pq.accepted?
- reminder_draft_count = ao_pq.reminder_draft > 0 ? " (#{ao_pq.reminder_draft} already sent)" : ''
- p.space-before= link_to raw(" Send a draft reminder to #{ao_pq.action_officer.name} #{reminder_draft_count}"), {controller: 'action_officer_reminder', action: 'send_draft', id: ao_pq.id, remote: true}, {class: 'ao-reminder-link'}
- p.space-before= link_to "Manually reject #{ao_pq.action_officer.name}", {controller: 'manual_reject_commission', action: 'reject_manual', id: ao_pq.id}, {class: 'button-secondary', title: 'Reject the question manually'}
+ p.govuk-body.space-before= link_to raw(" Send a draft reminder to #{ao_pq.action_officer.name} #{reminder_draft_count}"), {controller: 'action_officer_reminder', action: 'send_draft', id: ao_pq.id, remote: true}, {class: 'ao-reminder-link'}
+ p.govuk-body.space-before= link_to "Manually reject #{ao_pq.action_officer.name}", {controller: 'manual_reject_commission', action: 'reject_manual', id: ao_pq.id}, {class: 'button-secondary', title: 'Reject the question manually'}
- h3 Email of Action Officer
- p= mail_to ao_pq.action_officer.email
- h3 Phone of Action Officer
- p= ao_pq.action_officer.phone
- h3 Division of Action Officer
- p= ao_pq.action_officer.deputy_director.division.name
- h3 Directorate of Action Officer
- p= ao_pq.action_officer.deputy_director.division.directorate.name
- h3 Deputy director
- p= ao_pq.action_officer.deputy_director.name
- h3 Press Desk
- p= ao_pq.action_officer.press_desk.name
- p
+ h3.govuk-heading-s Email of Action Officer
+ p.govuk-body= mail_to ao_pq.action_officer.email
+ h3.govuk-heading-s Phone of Action Officer
+ p.govuk-body= ao_pq.action_officer.phone
+ h3.govuk-heading-s Division of Action Officer
+ p.govuk-body= ao_pq.action_officer.deputy_director.division.name
+ h3.govuk-heading-s Directorate of Action Officer
+ p.govuk-body= ao_pq.action_officer.deputy_director.division.directorate.name
+ h3.govuk-heading-s Deputy director
+ p.govuk-body= ao_pq.action_officer.deputy_director.name
+ h3.govuk-heading-s Press Desk
+ p.govuk-body= ao_pq.action_officer.press_desk.name
+ p.govuk-body
- ao_pq.action_officer.press_desk.press_officers.reject(&:deleted?).each_with_index do |po,ind|
- if ind > 0
= ', '
= link_to po.name, press_officer_path(po)
hr
- if ao_pq.awaiting_response?
- p.space-before-20
+ p.govuk-body.space-before-20
- reminder_accept_count = ao_pq.reminder_accept > 0 ? " (#{ao_pq.reminder_accept} already sent)" : ''
= link_to raw(" Send reminder to #{ao_pq.action_officer.name} #{reminder_accept_count}"), {controller: 'action_officer_reminder', action: 'accept_reject', id: ao_pq.id, remote: true}, {class: 'ao-reminder-link', title: 'Send an accept/reject reminder email'}
- p.space-before= link_to "Manually reject #{ao_pq.action_officer.name}", {controller: 'manual_reject_commission', action: 'reject_manual', id: ao_pq.id}, {class: 'button-secondary', title: 'Reject the question manually'}
+ p.govuk-body.space-before= link_to "Manually reject #{ao_pq.action_officer.name}", {controller: 'manual_reject_commission', action: 'reject_manual', id: ao_pq.id}, {class: 'button-secondary', title: 'Reject the question manually'}
- unless @pq.is_new?
= render partial: 'shared/action_officer_selection', locals: {action_officers: action_officers, question: @pq, form: f, reassign: true}
- else
- p Not allocated
+ p.govuk-body Not allocated
= render partial:'shared/rejected_reasons', locals: {question: @pq}
hr/
= render partial: 'shared/minister_selection', locals: {question: @pq, form: f}
diff --git a/app/views/pqs/_minister_check.html.slim b/app/views/pqs/_minister_check.html.slim
index a08e78a22..5f80e3460 100644
--- a/app/views/pqs/_minister_check.html.slim
+++ b/app/views/pqs/_minister_check.html.slim
@@ -1,4 +1,4 @@
-h2 Minister check
+h2.govuk-heading-m Minister check
#answeringminister
.form-group
label.form-label for="sent_to_answering_minister" Date sent to answering minister
diff --git a/app/views/pqs/_pod_check.html.slim b/app/views/pqs/_pod_check.html.slim
index e913b21f2..7bc8f7406 100644
--- a/app/views/pqs/_pod_check.html.slim
+++ b/app/views/pqs/_pod_check.html.slim
@@ -1,13 +1,13 @@
-h2
+h2.govuk-heading-m
abbr title="Private Office Directorate" POD
'check
-h3
+h3.govuk-heading-s
' Date sent to
abbr title="Private Office Directorate" POD
- if @pq.pod_waiting.to_s != ''
- p= @pq.pod_waiting.to_s
+ p.govuk-body= @pq.pod_waiting.to_s
- else
- p
+ p.govuk-body
abbr title="To Be Decided" TBD
br
.form-group
diff --git a/app/views/pqs/_pq_data.html.slim b/app/views/pqs/_pq_data.html.slim
index 3b64e319e..576e28893 100644
--- a/app/views/pqs/_pq_data.html.slim
+++ b/app/views/pqs/_pq_data.html.slim
@@ -1,9 +1,9 @@
-h2 PQ Details
-h3
+h2.govuk-heading-m PQ Details
+h3.govuk-heading-s
abbr title="Unique Identification Number" UIN
-p = @pq.uin
-h3 House
-p= @pq.house_name
+p.govuk-body= @pq.uin
+h3.govuk-heading-s House
+p.govuk-body= @pq.house_name
.form-group
label.form-label for="date_for_answer" Date for answer back to Parliament
@@ -11,22 +11,22 @@ p= @pq.house_name
input#date_for_answer.form-control name="pq[date_for_answer]" type="text" value=(@pq.date_for_answer.try(:to_formatted_s, :date)) /
span.fa.fa-calendar title="select a date"
-h3 Tabling member
-p= @pq.member_name
+h3.govuk-heading-s Tabling member
+p.govuk-body= @pq.member_name
-h3 Question type
-p= @pq.question_type
+h3.govuk-heading-s Question type
+p.govuk-body= @pq.question_type
-h3 Question tabled date
+h3.govuk-heading-s Question tabled date
- if @pq.tabled_date
- p= @pq.tabled_date.try(:to_formatted_s, :date)
+ p.govuk-body= @pq.tabled_date.try(:to_formatted_s, :date)
- if @pq.registered_interest
- p
+ p.govuk-body
| * Member has registered an interest in the Question.
- if @pq.transfer_in_ogd_id
- p
+ p.govuk-body
| Transferred in from #{@pq.transfer_in_ogd.name} on #{@pq.transfer_in_date.try(:to_formatted_s, :date)}
hr/
-h3 Question
-p = @pq.question
+h3.govuk-heading-s Question
+p.govuk-body= @pq.question
diff --git a/app/views/pqs/_pq_draft.html.slim b/app/views/pqs/_pq_draft.html.slim
index 4218795ee..936a45357 100644
--- a/app/views/pqs/_pq_draft.html.slim
+++ b/app/views/pqs/_pq_draft.html.slim
@@ -1,9 +1,9 @@
-h2 PQ draft
+h2.govuk-heading-m PQ draft
- if @pq.action_officers.size > 0
- @pq.action_officers_pqs.each do |ao_pq|
- if ao_pq.accepted?
- h3 Date PQ accepted by action officer
- p= ao_pq.updated_at.to_s
+ h3.govuk-heading-s Date PQ accepted by action officer
+ p.govuk-body= ao_pq.updated_at.to_s
.form-group
label.form-label for="draft_answer_received" Date PQ returned by action officer
.datetimepicker
diff --git a/app/views/pqs/_pq_header.html.slim b/app/views/pqs/_pq_header.html.slim
index 83dc76ebc..c23a99a0b 100644
--- a/app/views/pqs/_pq_header.html.slim
+++ b/app/views/pqs/_pq_header.html.slim
@@ -1,5 +1,5 @@
#pq-details-header
- h1= @pq.uin
+ h1.govuk-heading-l= @pq.uin
- if @pq.question_type == 'NamedDay'
span.question-type Named day
- if @pq.transferred
diff --git a/app/views/pqs/show.html.slim b/app/views/pqs/show.html.slim
index 1df9c17a8..4599574c3 100644
--- a/app/views/pqs/show.html.slim
+++ b/app/views/pqs/show.html.slim
@@ -2,9 +2,9 @@
= render partial: "shared/flash_messages", flash: flash
= render partial: 'shared/errors', object: @pq
= render 'pq_header'
- #pq-detail-area.row
+ #pq-detail-area
nav.col-md-3
- p.visually-hidden Jump to a section...
+ p.govuk-body.govuk-visually-hidden Jump to a section...
ul.nav.nav-stacked data-tabs="tabs" role="tablist"
li.active
a#progress-menu-pq href="#progress-menu-pq-data" data-toggle="tab" role="tab" PQ Details
diff --git a/app/views/press_desks/_form.html.slim b/app/views/press_desks/_form.html.slim
index 1b24d7359..7f65a415a 100644
--- a/app/views/press_desks/_form.html.slim
+++ b/app/views/press_desks/_form.html.slim
@@ -6,7 +6,7 @@
label.form-label for="press_desk_name" Name (required)
= f.text_field :name, {class: 'form-control'}
.form-group
- p Status
+ p.govuk-body Status
label.block-label for="press_desk_deleted"
= f.check_box :deleted
| Inactive
diff --git a/app/views/press_desks/edit.html.slim b/app/views/press_desks/edit.html.slim
index 011133b36..6d25bacc7 100644
--- a/app/views/press_desks/edit.html.slim
+++ b/app/views/press_desks/edit.html.slim
@@ -1,3 +1,3 @@
-h1 Edit press desk
+h1.govuk-heading-l Edit press desk
= render 'form'
= link_to 'Return to press desk list', press_desks_path, {class: 'admin-link'}
diff --git a/app/views/press_desks/index.html.slim b/app/views/press_desks/index.html.slim
index 92c190af2..3c0e87c73 100644
--- a/app/views/press_desks/index.html.slim
+++ b/app/views/press_desks/index.html.slim
@@ -1,4 +1,4 @@
-h1 Press desks
+h1.govuk-heading-l Press desks
#admin-pd-list
div class="row"
ul#admin-button-bar
diff --git a/app/views/press_desks/new.html.slim b/app/views/press_desks/new.html.slim
index 27b521000..69596618d 100644
--- a/app/views/press_desks/new.html.slim
+++ b/app/views/press_desks/new.html.slim
@@ -1,3 +1,3 @@
-h1 Add press desk
+h1.govuk-heading-l Add press desk
= render 'form'
= link_to 'Return to press desk list', press_desks_path, {class: 'admin-link'}
diff --git a/app/views/press_desks/show.html.slim b/app/views/press_desks/show.html.slim
index 483c357a0..1c2376aa1 100644
--- a/app/views/press_desks/show.html.slim
+++ b/app/views/press_desks/show.html.slim
@@ -1,16 +1,16 @@
#admin-pd-details
- h1 Press desk details
+ h1.govuk-heading-l Press desk details
= render partial: "shared/flash_messages", flash: flash
- h2 Name
- p= @press_desk.name
- h2 Status
+ h2.govuk-heading-m Name
+ p.govuk-body= @press_desk.name
+ h2.govuk-heading-m Status
= render partial: 'shared/status', object: @press_desk
- h2 Press officers
+ h2.govuk-heading-m Press officers
ul
- @press_desk.press_officers.each do |po|
li= link_to(po.name, controller: 'press_officers', action: 'show', id: po.id )
- p
+ p.govuk-body
= link_to 'Edit', edit_press_desk_path(@press_desk), {class: 'admin-link'}
- span.visually-hidden
+ span.govuk-visually-hidden
= ' | '
= link_to 'Return to press desk list', press_desks_path, {class: 'admin-link'}
diff --git a/app/views/press_officers/_form.html.slim b/app/views/press_officers/_form.html.slim
index f6bd5c947..bd1ce54db 100644
--- a/app/views/press_officers/_form.html.slim
+++ b/app/views/press_officers/_form.html.slim
@@ -12,7 +12,7 @@
label.form-label for="press_officer_press_desk_id" Press Desk (required)
= f.collection_select(:press_desk_id, @press_offices, :id, :name, :include_blank => "Please select")
.form-group
- p Status
+ p.govuk-body Status
label.block-label for="press_officer_deleted"
= f.check_box :deleted
| Inactive
diff --git a/app/views/press_officers/edit.html.slim b/app/views/press_officers/edit.html.slim
index efed6861e..71e8cf4ec 100644
--- a/app/views/press_officers/edit.html.slim
+++ b/app/views/press_officers/edit.html.slim
@@ -1,3 +1,3 @@
-h1 Edit press officer
+h1.govuk-heading-l Edit press officer
= render 'form'
= link_to 'Return to press officer list', press_officers_path, {class: 'admin-link'}
diff --git a/app/views/press_officers/index.html.slim b/app/views/press_officers/index.html.slim
index 0930dd8a1..f88b24d73 100644
--- a/app/views/press_officers/index.html.slim
+++ b/app/views/press_officers/index.html.slim
@@ -1,6 +1,6 @@
-h1 Press officers
+h1.govuk-heading-l Press officers
#admin-po-list
- .row
+ div
ul#admin-button-bar
li= link_to ('Add press officer'), new_press_officer_path, {class: 'button-secondary'}
table.table aria-label="press officers"
diff --git a/app/views/press_officers/new.html.slim b/app/views/press_officers/new.html.slim
index 526612686..be5a88a3f 100644
--- a/app/views/press_officers/new.html.slim
+++ b/app/views/press_officers/new.html.slim
@@ -1,3 +1,3 @@
-h1 Add press officer
+h1.govuk-heading-l Add press officer
= render 'form'
= link_to 'Return to press officer list', press_officers_path, {class: 'admin-link'}
diff --git a/app/views/press_officers/show.html.slim b/app/views/press_officers/show.html.slim
index cbe4b949a..caa657852 100644
--- a/app/views/press_officers/show.html.slim
+++ b/app/views/press_officers/show.html.slim
@@ -1,14 +1,14 @@
-h1 Press officer details
+h1.govuk-heading-l Press officer details
#admin-po-details
= render partial: "shared/flash_messages", flash: flash
- h2 Name
- p= @press_officer.name
- h2 Email
- p= @press_officer.email
- h2 Status
+ h2.govuk-heading-m Name
+ p.govuk-body= @press_officer.name
+ h2.govuk-heading-m Email
+ p.govuk-body= @press_officer.email
+ h2.govuk-heading-m Status
= render partial: 'shared/status', object: @press_officer
- p
+ p.govuk-body
= link_to 'Edit', edit_press_officer_path(@press_officer), {class: 'admin-link'}
- span.visually-hidden
+ span.govuk-visually-hidden
= ' | '
= link_to 'Return to press officer list', press_officers_path, {class: 'admin-link'}
diff --git a/app/views/proposals/new.html.slim b/app/views/proposals/new.html.slim
index b10bd344f..5d72bc966 100644
--- a/app/views/proposals/new.html.slim
+++ b/app/views/proposals/new.html.slim
@@ -1,4 +1,4 @@
-h1 Propose a Deputy Director
+h1.govuk-heading-l Propose a Deputy Director
= render partial: 'shared/flash_messages'
- if @pq.commissioned?
diff --git a/app/views/reports/filter_all.html.slim b/app/views/reports/filter_all.html.slim
deleted file mode 100644
index 6fe96a5a7..000000000
--- a/app/views/reports/filter_all.html.slim
+++ /dev/null
@@ -1,38 +0,0 @@
-- content_for :page_title do
- = 'PQ filter - '
-
-div#filter-report
- h1 PQ filter
- = render partial: 'shared/flash_messages'
- .row
- .col-md-3.col-md-push-9
- = form_tag({controller: 'reports', action: 'filter_all'}, {:method => :get}) do
- .form-group
- label.form-label for="minister_id" Minister
- = select_tag 'minister_id', content_tag(:option,'Select a minister',:value=>'') + options_from_collection_for_select(@ministers, 'id', 'name', params[:minister_id] )
- .form-group
- label.form-label for="press_desk_id" Press Desk
- = select_tag 'press_desk_id', content_tag(:option,'Select a press desk',:value=>'') + options_from_collection_for_select(@press_desks, 'id', 'name', params[:press_desk_id] )
- .form-group
- label.form-label for="state" Status
- = select_tag 'state', content_tag(:option,'Select status', :value=>'') + options_for_select(@states, params[:state] )
- .form-group
- = submit_tag 'Filter' , class: 'button' , :onclick=> "ga('send', 'event', 'reports', 'view', 'pq filter')"
- = link_to 'Show all', filter_all_path, class: 'button-secondary'
- .col-md-9.col-md-pull-3
- - if @questions.empty?
- h2 Please select a filter option
- - else
- #count
- strong
- = @questions.total_entries
- span
- = @questions.total_entries > 1 ? ' questions' : ' question'
- = ' found'
- ul.questions-list
- - @questions.each do |question|
- li id="pq-frame-#{question.id}"
- = render partial: 'dashboard/question_data', locals: {question: question, action_officers: @action_officers}
- - if @questions.any?
- #pages.row
- = will_paginate @questions, {class: 'col-md-9'}
diff --git a/app/views/reports/report.html.slim b/app/views/reports/report.html.slim
deleted file mode 100644
index 81cb0aa55..000000000
--- a/app/views/reports/report.html.slim
+++ /dev/null
@@ -1,20 +0,0 @@
-div#minister-report
- h1= @report.title
- table.table.table-hover aria-label="#{@report.title}"
- thead
- tr
- th scope="col" Progress
- - @report.header_cells.each do |c|
- th.table-cell-centered scope="col"
- = link_to(c.label, c.path, aria: { label: "Click to view questions for #{c.label}" })
- tbody
- - @report.rows.each do |r|
- tr data="report-state-#{r.state}"
- th scope="row"
- span class=("flag #{state_classname r.state}") = r.label
- - r.cells.each do |c|
- td.table-cell-centered
- - unless c.zero?
- = link_to(c.count, c.path, aria: { label: "Click to view questions with a status of #{r.label}" })
- - else
- | 0
diff --git a/app/views/shared/_allocation_list.html.slim b/app/views/shared/_allocation_list.html.slim
index 3f14d93d6..c8b70030f 100644
--- a/app/views/shared/_allocation_list.html.slim
+++ b/app/views/shared/_allocation_list.html.slim
@@ -1,17 +1,17 @@
- if ao_pq.accepted?
= ao_pq.action_officer.name
- | (#{ao_pq.action_officer.deputy_director.division.name})
+ | (#{ao_pq.action_officer.deputy_director.division.name})
span.flag.accepted Accepted
- elsif ao_pq.rejected?
details
summary
= ao_pq.action_officer.name
- = "(#{ao_pq.action_officer.deputy_director.division.name})"
+ = "(#{ao_pq.action_officer.deputy_director.division.name})"
span.flag.rejected Rejected
.panel-indent
- p.strong= ao_pq.reason_option
- p= ao_pq.reason
+ p.govuk-body.strong= ao_pq.reason_option
+ p.govuk-body= ao_pq.reason
- else
= ao_pq.action_officer.name
- | (#{ao_pq.action_officer.deputy_director.division.name})
+ | (#{ao_pq.action_officer.deputy_director.division.name})
span.flag.no-response No response
diff --git a/app/views/shared/_navigation.html.slim b/app/views/shared/_navigation.html.slim
index 513590cfa..e76d9d7ff 100644
--- a/app/views/shared/_navigation.html.slim
+++ b/app/views/shared/_navigation.html.slim
@@ -1,47 +1,16 @@
-- if user_signed_in?
- nav.navbar.navbar-default role="navigation"
- .container-fluid
- .navbar-header
-
- button.navbar-toggle data-target=".navbar-collapse" data-toggle="collapse" type="button"
- span.sr-only Toggle navigation
- span.icon-bar
- span.icon-bar
- span.icon-bar
-
- .collapse.navbar-collapse
- - if current_user.pq_user?
-
- ul.nav.navbar-nav
- li class=('active' if @dashboard_state == 'New')
- = link_to 'New', dashboard_path, action: 'index', aria: { label: "Click to view new questions"}
-
- li class=('active' if @dashboard_state == 'In progress')
- = link_to 'In progress', dashboard_in_progress_path, action: 'in_progress', aria: { label: "Click to view in progress questions"}
-
- li class=('active' if @dashboard_state == 'Backlog')
- = link_to 'Backlog', dashboard_backlog_path, action: 'backlog', aria: { label: "Click to view backlog questions"}
-
- li.dropdown class=('active' if @page_title == 'Minister report - Parliamentary Questions - Ministry of Justice' || @page_title == 'Press desk report - Parliamentary Questions - Ministry of Justice')
- a.dropdown-toggle data-toggle="dropdown" data-target="#-" href="#" aria-haspopup="true" role="button"
- | Reports
- span.caret
- ul.dropdown-menu role="menu"
- li
- = link_to 'Minister report', reports_ministers_by_progress_path , :onclick=> "ga('send', 'event', 'reports', 'view', 'Minister Report')", aria: { label: "Click to view minister reports"}
- li
- = link_to 'Press desk report', reports_press_desk_by_progress_path , :onclick=> "ga('send', 'event', 'reports', 'view', 'Press Desk Report')", aria: { label: "Click to view press desk reports"}
-
- li#settings class=('active' if @page_title == 'Settings - Parliamentary Questions - Ministry of Justice')
- = link_to 'Settings', admin_path
-
- li= link_to 'Sign out', destroy_user_session_path
-
- = form_tag(search_path, { :method => 'get', :id => 'search_form', :class => 'navbar-form navbar-right', :role => 'search'}) do
- .form-group.search
- label for="search_field" Search by UIN
- div.search-box
- = text_field_tag :search, params[:search], { :id => 'search_field', :class => 'form-control' }
- = button_tag(:type => 'submit', :id => 'search_button', :class => 'btn btn-default') do
- span.fa.fa-search
- span.visually-hidden Search
+- if current_user&.pq_user?
+ = govuk_service_navigation(current_path: request.env['PATH_INFO'], navigation_id: 'nav', classes: ["navbar", "navbar-default"]) do |sn|
+ = sn.with_navigation_item(text: "New", href: dashboard_path)
+ = sn.with_navigation_item(text: "In progress", href: dashboard_in_progress_path)
+ = sn.with_navigation_item(text: "Backlog", href: dashboard_backlog_path)
+ = sn.with_navigation_item(text: "Settings", href: admin_path)
+ = sn.with_navigation_item(text: "Sign out", href: destroy_user_session_path)
+ = sn.with_end_slot do
+ = form_tag(search_path, { :method => 'get', :id => 'search_form', :class => 'navbar-form navbar-right', :role => 'search'}) do
+ .form-group.search
+ label for="search_field" Search by UIN
+ div.search-box
+ = text_field_tag :search, params[:search], { :id => 'search_field', :class => 'form-control' }
+ = button_tag(:type => 'submit', :id => 'search_button', :class => 'btn btn-default') do
+ span.fa.fa-search
+ span.govuk-visually-hidden Search
diff --git a/app/views/shared/_question_assigned.html.slim b/app/views/shared/_question_assigned.html.slim
index d20bcb6ea..118670644 100644
--- a/app/views/shared/_question_assigned.html.slim
+++ b/app/views/shared/_question_assigned.html.slim
@@ -1,7 +1,7 @@
= render partial: "shared/flash_messages", flash: flash
- if question.action_officers_pqs.size > 0
.question-allocation
- h4 Allocation:
+ h4.govuk-heading-s Allocation:
ul.question-allocation-list data-pqid=question.id
- question.action_officers_pqs.each do |ao_pq|
li
@@ -16,8 +16,8 @@
| Display Reason
span.caret
.collapse id="rejection-#{ao_pq.id}-#{ao_pq.action_officer.id}"
- p
+ p.govuk-body
strong= ao_pq.reason_option
- p= ao_pq.reason
+ p.govuk-body= ao_pq.reason
- else
span.flag.no-response No response
diff --git a/app/views/shared/_rejected_reasons.html.slim b/app/views/shared/_rejected_reasons.html.slim
index 7f13008f8..f9f612b40 100644
--- a/app/views/shared/_rejected_reasons.html.slim
+++ b/app/views/shared/_rejected_reasons.html.slim
@@ -2,7 +2,7 @@ ul
- question.action_officers_pqs.rejected.each do |r|
- if !r.action_officer.nil?
li
- p.pq-msg-warning
+ p.govuk-body.pq-msg-warning
= link_to r.action_officer.name, action_officer_path(r.action_officer)
| rejected at: #{r.updated_at.to_s}
br/
diff --git a/app/views/shared/mailer/_email_signature.html.slim b/app/views/shared/mailer/_email_signature.html.slim
deleted file mode 100644
index c9590b678..000000000
--- a/app/views/shared/mailer/_email_signature.html.slim
+++ /dev/null
@@ -1,18 +0,0 @@
-p
-div style="font-size: 12pt;"
- | The PQ Team
-p
-div style="font-size: 10pt;"
- | Parliamentary Branch
- br/
- | 9.25, Ministry of Justice, 102 Petty France, SW1H 9AJ
- br/
- | E:
- a href="mailto:#{Settings.mail_reply_to}" = Settings.mail_reply_to
-p
-div style="font-size: 12pt;"
- | The content is best viewed in Firefox browser.
-p
- small
- | For any technical issues, e.g. broken links,
- a<> href="mailto:pqsupport@digital.justice.gov.uk" contact PQ technical support.
diff --git a/app/views/shared/mailer/_email_signature_plain.text.slim b/app/views/shared/mailer/_email_signature_plain.text.slim
deleted file mode 100644
index 2474c921f..000000000
--- a/app/views/shared/mailer/_email_signature_plain.text.slim
+++ /dev/null
@@ -1,8 +0,0 @@
-| The PQ Team
-
- --
- Parliamentary Branch
- 9.25, Ministry of Justice, 102 Petty France, SW1H 9AJ
- E: #{Settings.mail_reply_to}
-
- For any technical issues, e.g. broken links, contact PQ technical support at pqsupport@digital.justice.gov.uk
diff --git a/app/views/shared/token_expired.html.slim b/app/views/shared/token_expired.html.slim
index 58665b85f..7c1227f20 100644
--- a/app/views/shared/token_expired.html.slim
+++ b/app/views/shared/token_expired.html.slim
@@ -1,8 +1,7 @@
-p.br.space-before-20
+p.govuk-body.br.space-before-20
strong Link expired
-p.br.space-before
- | The time allocated for you to accept or reject this question has expired. Please
+p.govuk-body.br.space-before
+ | The time allocated for you to accept or reject this question has expired. Please
a href="mailto:#{Settings.mail_reply_to}" contact the PQ team
| to get the question reassigned.
-
diff --git a/app/views/shared/token_invalid.html.slim b/app/views/shared/token_invalid.html.slim
index 8707c46e8..f11ec28ed 100644
--- a/app/views/shared/token_invalid.html.slim
+++ b/app/views/shared/token_invalid.html.slim
@@ -1,6 +1,5 @@
-p.br.space-before-20
+p.govuk-body.br.space-before-20
strong Invalid Link
-p.br.space-before
+p.govuk-body.br.space-before
| This link is invalid. Please check the original email and ensure you have copied and pasted the link correctly.
-
diff --git a/app/views/transferred/_form.html.slim b/app/views/transferred/_form.html.slim
index 8a8503adc..249fcceaa 100644
--- a/app/views/transferred/_form.html.slim
+++ b/app/views/transferred/_form.html.slim
@@ -17,7 +17,7 @@
.datetimepicker
input#pq_dateforanswer.form-control.pq_dateforanswer name="pq[date_for_answer]" type="text" value=(@pq.date_for_answer.to_s) /
span.fa.fa-calendar title="select a date"
- p House
+ p.govuk-body House
.form-group.inline aria-label="selection for house type"
label.block-label for="pq_house_name_house_of_commons"
= f.radio_button :house_name, 'House Of Commons'
@@ -31,7 +31,7 @@
.form-group
label.form-label for="pq_member_constituency" Member constituency
= f.text_field :member_constituency, class:'form-control'
- p Member has registered an interest in the question
+ p.govuk-body Member has registered an interest in the question
.form-group.inline aria-label="selection for member has registered interest in the question"
label.inline.block-label for="pq_registered_interest_false"
= f.radio_button :registered_interest, 'false'
@@ -39,7 +39,7 @@
label.inline.block-label for="pq_registered_interest_true"
= f.radio_button :registered_interest, 'true'
| Yes
- p Question type
+ p.govuk-body Question type
.form-group.inline aria-label="selection for question type"
label.block-label for="pq_question_type_ordinary"
= f.radio_button :question_type, 'Ordinary'
diff --git a/app/views/transferred/new.html.slim b/app/views/transferred/new.html.slim
index 006734569..ad67bd5a0 100644
--- a/app/views/transferred/new.html.slim
+++ b/app/views/transferred/new.html.slim
@@ -1,3 +1,3 @@
-h1 Create a transferred PQ
+h1.govuk-heading-l Create a transferred PQ
= render partial: "shared/flash_messages", flash: flash
= render 'form'
diff --git a/app/views/users/edit.html.slim b/app/views/users/edit.html.slim
index 4a960fed6..dfadbc5f2 100644
--- a/app/views/users/edit.html.slim
+++ b/app/views/users/edit.html.slim
@@ -1,4 +1,4 @@
-h1
+h1.govuk-heading-l
| Edit user: #{@user.name}
#admin-user-form
= form_for @user do |f|
@@ -12,7 +12,7 @@ h1
= f.label(:roles, "Role:")
= f.select(:roles, [ User::ROLE_PQ_USER ])
- unless @user.new_record?
- p Status:
+ p.govuk-body Status:
.form-group
label.block-label for="user_deleted"
= f.check_box :deleted
diff --git a/app/views/users/index.html.slim b/app/views/users/index.html.slim
index 5d441bbf7..1bb1de238 100644
--- a/app/views/users/index.html.slim
+++ b/app/views/users/index.html.slim
@@ -1,7 +1,7 @@
-h1 Users
+h1.govuk-heading-l Users
= render partial: "shared/flash_messages", flash: flash
#admin-users-list
- .row
+ div
ul#admin-button-bar
li= link_to 'Invite new user', new_user_invitation_path, {class: 'button-secondary'}
table.table aria-label="users"
diff --git a/app/views/users/invitations/edit.html.slim b/app/views/users/invitations/edit.html.slim
index d9496ab98..9201504c7 100644
--- a/app/views/users/invitations/edit.html.slim
+++ b/app/views/users/invitations/edit.html.slim
@@ -1,4 +1,4 @@
-h1= t 'devise.invitations.edit.header'
+h1.govuk-heading-l= t 'devise.invitations.edit.header'
= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f|
= devise_error_messages!
.form-group
diff --git a/app/views/users/invitations/new.html.slim b/app/views/users/invitations/new.html.slim
index 3bd9fa7f4..a34c7d8c8 100644
--- a/app/views/users/invitations/new.html.slim
+++ b/app/views/users/invitations/new.html.slim
@@ -1,4 +1,4 @@
-h1= t "devise.invitations.new.header"
+h1.govuk-heading-l= t "devise.invitations.new.header"
= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f|
= devise_error_messages!
- resource.class.invite_key_fields.each do |field|
diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim
index 6ab468c53..1308f4292 100644
--- a/app/views/users/show.html.slim
+++ b/app/views/users/show.html.slim
@@ -1,17 +1,17 @@
-h1 User details
+h1.govuk-heading-l User details
#admin-user-details
- h2 Name
- = @user.name
- h2 Email
- = @user.email
- h2 Role
- = @user.roles
- h2 Last active
- = time_ago_in_words(@user.last_sign_in_at) unless @user.last_sign_in_at.nil?
- h2 Invited by
- = @user.invited_by_user
- p
+ h2.govuk-heading-m Name
+ p.govuk-body= @user.name
+ h2.govuk-heading-m Email
+ p.govuk-body= @user.email
+ h2.govuk-heading-m Role
+ p.govuk-body= @user.roles
+ h2.govuk-heading-m Last active
+ p.govuk-body= time_ago_in_words(@user.last_sign_in_at) unless @user.last_sign_in_at.nil?
+ h2.govuk-heading-m Invited by
+ p.govuk-body= @user.invited_by_user
+ p.govuk-body
= link_to 'Edit', edit_user_path(@user), {class: 'admin-link'}
- span.visually-hidden
+ span.govuk-visually-hidden
= ' | '
= link_to 'Return to user list', users_path, {class: 'admin-link'}
diff --git a/bin/brakeman b/bin/brakeman
new file mode 100755
index 000000000..ace1c9ba0
--- /dev/null
+++ b/bin/brakeman
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+ARGV.unshift("--ensure-latest")
+
+load Gem.bin_path("brakeman", "brakeman")
diff --git a/bin/dev b/bin/dev
new file mode 100755
index 000000000..d80a02dbc
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+if gem list --no-installed --exact --silent foreman; then
+ echo "Installing foreman..."
+ gem install foreman
+fi
+
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
+exec foreman start -f Procfile.dev --env /dev/null "$@"
diff --git a/bin/rubocop b/bin/rubocop
new file mode 100755
index 000000000..40330c0ff
--- /dev/null
+++ b/bin/rubocop
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+# explicit rubocop config increases performance slightly while avoiding config confusion.
+ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/bin/setup b/bin/setup
index 3cd5a9d78..fba4c956b 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
require "fileutils"
-# path to your application root.
APP_ROOT = File.expand_path("..", __dir__)
+APP_NAME = "parliamentary-questions"
def system!(*args)
system(*args, exception: true)
@@ -30,4 +30,8 @@ FileUtils.chdir APP_ROOT do
puts "\n== Restarting application server =="
system! "bin/rails restart"
+
+ # puts "\n== Configuring puma-dev =="
+ # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
+ # system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
end
diff --git a/config/application.rb b/config/application.rb
index dd9742ff5..084323f5c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,15 +6,19 @@
require "pq_state/state_machine"
require "csv"
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
require "active_record/railtie"
-# require "active_storage/engine"
+require "active_storage/engine"
require "action_controller/railtie"
-require "action_view/railtie"
require "action_mailer/railtie"
-require "active_job/railtie"
# require "action_cable/engine"
# require "action_mailbox/engine"
require "action_text/engine"
+require "action_view/railtie"
+# require "action_cable/engine"
# require "rails/test_unit/railtie"
# Require the gems listed in Gemfile, including any gems
@@ -24,7 +28,7 @@
module ParliamentaryQuestions
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- # config.load_defaults 6.1
+ config.load_defaults 7.2
# Please, add to the `ignore` list any other `lib` subdirectories that do
# not contain `.rb` files, or that should not be reloaded or eager loaded.
@@ -36,6 +40,8 @@ class Application < Rails::Application
# These settings can be overridden in specific environments using the files
# in config/environments, which are processed later.
#
+ # config.time_zone = "Central Time (US & Canada)"
+ # config.eager_load_paths << Rails.root.join("extras")
# Application Title (Populates )
config.app_title = "Parliamentary Questions"
@@ -78,15 +84,17 @@ class Application < Rails::Application
config.exceptions_app = routes
- # Statsd
- $statsd = Statsd.new "localhost", 8125 # rubocop:disable Style/GlobalVars
-
# By default associations can be empty
config.active_record.belongs_to_required_by_default = false
config.active_support.cache_format_version = 7.1
config.govuk_time_zone = "UTC"
+
+ # Don't generate system test files.
+ config.generators.system_tests = nil
+
+ config.exceptions_app = routes
end
end
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 3605abe81..227a88d55 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -23,16 +23,36 @@
],
"note": ""
},
+ {
+ "warning_type": "Remote Code Execution",
+ "warning_code": 110,
+ "fingerprint": "9ae68e59cfee3e5256c0540dadfeb74e6b72c91997fdb60411063a6e8518144a",
+ "check_name": "CookieSerialization",
+ "message": "Use of unsafe cookie serialization strategy `:hybrid` might lead to remote code execution",
+ "file": "config/initializers/cookies_serializer.rb",
+ "line": 5,
+ "link": "https://brakemanscanner.org/docs/warning_types/unsafe_deserialization",
+ "code": "Rails.application.config.action_dispatch.cookies_serializer = :hybrid",
+ "render_path": null,
+ "location": null,
+ "user_input": null,
+ "confidence": "Medium",
+ "cwe_id": [
+ 565,
+ 502
+ ],
+ "note": ""
+ },
{
"warning_type": "Command Injection",
"warning_code": 14,
- "fingerprint": "4c8abd2e60c229fa01041f3a6f4e90d3ca4a81c577cb6f44948e244652249a6f",
+ "fingerprint": "e52aded74a7009e1b98c10c18c97cdc0435538ae2ccace4dc7e07ba1ed2672e3",
"check_name": "Execute",
"message": "Possible command injection",
"file": "lib/pqa/mock_api_server_runner.rb",
"line": 20,
"link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
- "code": "Process.spawn(\"rackup -p #{\"8888\"} -P #{\"/tmp/mock_api_server.pid\"} #{RACK_CONFIG_PATH} &> #{LOG_FILEPATH}\", :chdir => (CWD))",
+ "code": "Process.spawn(\"bundle exec rackup -p #{\"8888\"} -P #{\"/tmp/mock_api_server.pid\"} #{RACK_CONFIG_PATH} &> #{LOG_FILEPATH}\", :chdir => (CWD))",
"render_path": null,
"location": {
"type": "method",
@@ -45,28 +65,8 @@
77
],
"note": ""
- },
- {
- "warning_type": "Remote Code Execution",
- "warning_code": 110,
- "fingerprint": "9ae68e59cfee3e5256c0540dadfeb74e6b72c91997fdb60411063a6e8518144a",
- "check_name": "CookieSerialization",
- "message": "Use of unsafe cookie serialization strategy `:hybrid` might lead to remote code execution",
- "file": "config/initializers/cookies_serializer.rb",
- "line": 5,
- "link": "https://brakemanscanner.org/docs/warning_types/unsafe_deserialization",
- "code": "Rails.application.config.action_dispatch.cookies_serializer = :hybrid",
- "render_path": null,
- "location": null,
- "user_input": null,
- "confidence": "Medium",
- "cwe_id": [
- 565,
- 502
- ],
- "note": ""
}
],
- "updated": "2024-06-27 14:19:13 +0100",
- "brakeman_version": "6.1.2"
+ "updated": "2024-10-28 14:05:21 +0000",
+ "brakeman_version": "6.2.2"
}
diff --git a/config/environments/development.rb b/config/environments/development.rb
index fe2deefb2..5a053d4ad 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -5,30 +5,44 @@
# In the development environment your application's code is reloaded any time
# it changes. This slows down response time but is perfect for development
-
- # Rails 6 blocks hosts unless allowed here
- config.hosts << /[a-z0-9]+\.trackparliamentaryquestions\.service\.gov\.uk/
-
# since you don't have to restart the web server when you make code changes.
- config.cache_classes = false
+ config.enable_reloading = true
# Do not eager load code on boot.
config.eager_load = false
# Show full error reports.
- config.consider_all_requests_local = true
-
- config.action_controller.perform_caching = false
+ config.consider_all_requests_local = false
- # Enable server timing
+ # Enable server timing.
config.server_timing = true
- config.cache_store = :null_store
+ # Enable/disable caching. By default caching is disabled.
+ # Run rails dev:cache to toggle caching.
+ if Rails.root.join("tmp/caching-dev.txt").exist?
+ config.action_controller.perform_caching = true
+ config.action_controller.enable_fragment_cache_logging = true
+
+ config.cache_store = :memory_store
+ config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{2.days.to_i}" }
+ else
+ config.action_controller.perform_caching = false
+
+ config.cache_store = :null_store
+ end
+
+ # Store uploaded files on the local file system (see config/storage.yml for options).
+ config.active_storage.service = :local
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
+
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
+ config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
@@ -44,24 +58,21 @@
# Highlight code that triggered database queries in logs.
config.active_record.verbose_query_logs = true
+ # Highlight code that enqueued background job in logs.
+ config.active_job.verbose_enqueue_logs = true
+
# Suppress logger output for asset requests.
config.assets.quiet = true
- config.log_formatter = ::Logger::Formatter.new
# Raises error for missing translations.
# config.i18n.raise_on_missing_translations = true
# Annotate rendered view with file names.
- # config.action_view.annotate_rendered_view_with_filenames = true
+ config.action_view.annotate_rendered_view_with_filenames = true
- # Uncomment if you wish to allow Action Cable access from any origin.
- # config.action_cable.disable_request_forgery_protection = true
+ # Raise error when a before_action's only/except options reference missing actions.
+ config.action_controller.raise_on_missing_callback_actions = true
- config.after_initialize do
- sending_host = ENV["SENDING_HOST"] || "localhost"
- ActionMailer::Base.delivery_method = :sendmail
- ActionMailer::Base.default from: Settings.mail_from
- ActionMailer::Base.default reply_to: Settings.mail_reply_to
- ActionMailer::Base.default_url_options = { host: sending_host, protocol: "https" }
- end
+ # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
+ # config.generators.apply_rubocop_autocorrect_after_generate!
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8c3309063..76df18337 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,7 +4,7 @@
# Settings specified here will take precedence over those in config/application.rb.
# Code is not reloaded between requests.
- config.cache_classes = true
+ config.enable_reloading = false
# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both threaded web servers
@@ -13,19 +13,22 @@
config.eager_load = true
# Full error reports are disabled and caching is turned on.
- config.consider_all_requests_local = false
+ config.consider_all_requests_local = false
config.action_controller.perform_caching = true
- # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
- # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+ # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
+ # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
# config.require_master_key = true
# Compress JavaScripts and CSS.
- config.assets.js_compressor = :terser
+ # config.assets.js_compressor = :terser
+
+ # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+ # config.public_file_server.enabled = false
# Compress CSS using a preprocessor.
# config.assets.css_compressor = :sass
- # Do not fallback to assets pipeline if a precompiled asset is missed.
+ # Do not fall back to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
@@ -40,8 +43,15 @@
# config.action_cable.url = "wss://example.com/cable"
# config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
+ # Assume all access to the app is happening through a SSL-terminating reverse proxy.
+ # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
+ # config.assume_ssl = true
+
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
+ config.force_ssl = true
+
+ # Skip http-to-https redirect for the default health check endpoint.
+ # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
# Include generic and useful information about system operation, but avoid logging too much
# information to avoid inadvertent exposure of personally identifiable information (PII).
@@ -50,13 +60,17 @@
# Prepend all log lines with the following tags.
config.log_tags = [:request_id]
+ # "info" includes generic and useful information about system operation, but avoids logging too much
+ # information to avoid inadvertent exposure of personally identifiable information (PII). If you
+ # want to log everything, set the level to "debug".
+ config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
+
# Use a different cache store in production.
# config.cache_store = :mem_cache_store
# Use a real queuing backend for Active Job (and separate queues per environment).
- # config.active_job.queue_adapter = :resque
+ # config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "parliamentary_questions_production"
- config.action_mailer.perform_caching = false
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
config.action_controller.asset_host = ENV["ASSET_HOST"] if ENV["ASSET_HOST"]
@@ -65,6 +79,9 @@
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# config.assets.precompile += %w( search.js )
config.assets.precompile += %w(.svg .eot .woff .ttf *.js ^[^_]*.css ^[^_]*.scss)
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
+ config.action_mailer.perform_caching = false
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -75,7 +92,6 @@
config.i18n.fallbacks = true
# Don't log any deprecations.
- config.active_support.deprecation = :notify
config.active_support.report_deprecations = false
# Use default logging formatter so that PID and timestamp are not suppressed.
@@ -116,4 +132,11 @@
ActionMailer::Base.default from: Settings.mail_from
ActionMailer::Base.default reply_to: Settings.mail_reply_to
end
+ # Enable DNS rebinding protection and other `Host` header attacks.
+ # config.hosts = [
+ # "example.com", # Allow requests from example.com
+ # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+ # ]
+ # Skip DNS rebinding protection for the default health check endpoint.
+ # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5e1818886..7e00ee3e1 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,44 +8,44 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- config.cache_classes = true
+ # While tests run files are not watched, reloading is not necessary.
+ config.enable_reloading = false
- # Eager loading loads your whole application. When running a single test locally,
- # this probably isn't necessary. It's a good idea to do in a continuous integration
- # system, or in some way before deploying your code.
- config.eager_load = false
+ # Eager loading loads your entire application. When running a single test locally,
+ # this is usually not necessary, and can slow down your test suite. However, it's
+ # recommended that you enable it in continuous integration systems to ensure eager
+ # loading is working properly before deploying your code.
+ config.eager_load = ENV["CI"].present?
# Configure public file server for tests with Cache-Control for performance.
- config.public_file_server.enabled = true
- config.public_file_server.headers = {
- "Cache-Control" => "public, max-age=#{1.hour.to_i}",
- }
+ config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{1.hour.to_i}" }
# Show full error reports and disable caching.
- config.consider_all_requests_local = true
+ config.consider_all_requests_local = true
config.action_controller.perform_caching = false
config.cache_store = :null_store
- # Raise exceptions instead of rendering exception templates.
- config.action_dispatch.show_exceptions = false
+ # Render exception templates for rescuable exceptions and raise for other exceptions.
+ config.action_dispatch.show_exceptions = :rescuable
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
-
# Store uploaded files on the local file system in a temporary directory.
- # config.active_storage.service = :test
+ config.active_storage.service = :test
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
- # This fills in the 'from' field which is required to run feature
- config.action_mailer.default_options = { from: "localhost" }
+
+ # Unlike controllers, the mailer instance doesn't have any context about the
+ # incoming request so you'll need to provide the :host parameter yourself.
+ config.action_mailer.default_url_options = { host: "www.example.com" }
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 91bbaf7c2..561f83b4f 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,12 +1,16 @@
-Rails.application.config.assets.precompile += %w[favicon.ico]
-Rails.application.config.assets.precompile += %w[apple-touch-icon-152x152.png]
-Rails.application.config.assets.precompile += %w[apple-touch-icon-120x120.png]
-Rails.application.config.assets.precompile += %w[apple-touch-icon-76x76.png]
-Rails.application.config.assets.precompile += %w[apple-touch-icon-60x60.png]
-Rails.application.config.assets.precompile += %w[opengraph-image.png]
-Rails.application.config.assets.precompile += %w[gov.uk_logotype_crown.png]
-Rails.application.config.assets.precompile += %w[font-awesome.css]
-Rails.application.config.assets.precompile += %w[select2.css]
-Rails.application.config.assets.precompile += %w[select2-bootstrap.css]
-Rails.application.config.assets.precompile += %w[vendor/jquery.datetimepicker.css]
-Rails.application.config.assets.precompile += %w[vendor/pq-select2.css]
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = "1.0"
+
+# Add additional assets to the asset load path.
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w[ admin.js admin.css ]
+
+# For local development
+Rails.application.config.assets.paths << Rails.root.join("node_modules")
+Rails.application.config.assets.paths << Rails.root.join("node_modules/govuk-frontend/dist/govuk/assets")
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
deleted file mode 100644
index d09cd2375..000000000
--- a/config/initializers/constants.rb
+++ /dev/null
@@ -1 +0,0 @@
-LARGEST_POSTGRES_INTEGER = 2_147_483_647
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
deleted file mode 100644
index f51a497e1..000000000
--- a/config/initializers/cookies_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Specify a serializer for the signed and encrypted cookie jars.
-# Valid options are :json, :marshal, and :hybrid.
-Rails.application.config.action_dispatch.cookies_serializer = :hybrid
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 90c6fdd26..7e6fd2304 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -315,7 +315,6 @@
Warden::Manager.after_authentication do |user, _auth, _opts|
LogStuff.info "AUTH-LOG-IN: user #{user.email}, log in"
- $statsd.increment "login" # rubocop:disable Style/GlobalVars
end
Warden::Manager.before_logout do |user, _auth, _opts|
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 8f69afd89..8900bb374 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -4,12 +4,10 @@
# are locale specific, and you may define rules for as many different
# locales as you wish. All of these examples are active by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect|
-# inflect.plural /^(ox)$/i, '\1en'
# inflect.plural /^(ox)$/i, "\\1en"
-# inflect.singular /^(ox)en/i, '\1'
# inflect.singular /^(ox)en/i, "\\1"
-# inflect.irregular 'person', 'people'
# inflect.irregular "person", "people"
+# inflect.uncountable %w( fish sheep )
# end
# These inflection rules are supported but not enabled by default:
diff --git a/config/initializers/monitoring.rb b/config/initializers/monitoring.rb
deleted file mode 100644
index 9cad43a0c..000000000
--- a/config/initializers/monitoring.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-ActiveSupport::Notifications.subscribe(/process_action.action_controller/) do |*args|
- event = ActiveSupport::Notifications::Event.new(*args)
-
- controller = event.payload[:controller]
- action = event.payload[:action]
- event.payload[:path]
- page_duration = event.duration
- view_duration = event.payload[:view_runtime]
- db_duration = event.payload[:db_runtime]
-
- key = "#{StatsHelper::PAGES_TIMING}.#{controller}.#{action}"
- key = key.underscore
-
- # rubocop:disable Style/GlobalVars
- $statsd.timing("#{key}.page", page_duration)
- $statsd.timing("#{key}.view", view_duration)
- $statsd.timing("#{key}.db", db_duration)
- # rubocop:enable Style/GlobalVars
-end
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
deleted file mode 100644
index 2977589da..000000000
--- a/config/initializers/new_framework_defaults_7_0.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file eases your Rails 7.0 framework defaults upgrade.
-#
-# Uncomment each configuration one by one to switch to the new default.
-# Once your application is ready to run with all new defaults, you can remove
-# this file and set the `config.load_defaults` to `7.0`.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
-
-# `button_to` view helper will render `<button>` element, regardless of whether
-# or not the content is passed as the first argument or as a block.
-Rails.application.config.action_view.button_to_generates_button_tag = true
-
-# `stylesheet_link_tag` view helper will not render the media attribute by default.
-Rails.application.config.action_view.apply_stylesheet_media_default = false
-
-# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
-# Changing this default means invalidate all encrypted messages generated by
-# your application and, all the encrypted cookies. Only change this after you
-# rotated all the messages using the key rotator.
-#
-# See upgrading guide for more information on how to build a rotator.
-# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
-# Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
-
-# Change the digest class for ActiveSupport::Digest.
-# Changing this default means that for example Etags change and
-# various cache keys leading to cache invalidation.
-Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
-
-# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
-# implementation.
-Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
-
-# Calls `Rails.application.executor.wrap` around test cases.
-# This makes test cases behave closer to an actual request or job.
-# Several features that are normally disabled in test, such as Active Record query cache
-# and asynchronous queries will then be enabled.
-Rails.application.config.active_support.executor_around_test_case = true
-
-# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
-Rails.application.config.action_mailer.smtp_timeout = 5
-
-# The ActiveStorage video previewer will now use scene change detection to generate
-# better preview images (rather than the previous default of using the first frame
-# of the video).
-# Rails.application.config.active_storage.video_preview_arguments =
-# "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
-
-# Automatically infer `inverse_of` for associations with a scope.
-Rails.application.config.active_record.automatic_scope_inversing = true
-
-# Raise when running tests if fixtures contained foreign key violations
-Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
-
-# Disable partial inserts.
-# This default means that all columns will be referenced in INSERT queries
-# regardless of whether they have a default or not.
-Rails.application.config.active_record.partial_inserts = false
-
-# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
-Rails.application.config.action_controller.raise_on_open_redirects = true
-
-# Change the variant processor for Active Storage.
-# Changing this default means updating all places in your code that
-# generate variants to use image processing macros and ruby-vips
-# operations. See the upgrading guide for detail on the changes required.
-# The `:mini_magick` option is not deprecated; it's fine to keep using it.
-# Rails.application.config.active_storage.variant_processor = :vips
-
-# Enable parameter wrapping for JSON.
-# Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
-# To disable parameter wrapping entirely, set this config to `false`.
-Rails.application.config.action_controller.wrap_parameters_by_default = true
-
-# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
-# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
-#
-# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
-# more information.
-Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
-
-# Change the default headers to disable browsers' flawed legacy XSS protection.
-Rails.application.config.action_dispatch.default_headers = {
- "X-Frame-Options" => "SAMEORIGIN",
- "X-XSS-Protection" => "0",
- "X-Content-Type-Options" => "nosniff",
- "X-Download-Options" => "noopen",
- "X-Permitted-Cross-Domain-Policies" => "none",
- "Referrer-Policy" => "strict-origin-when-cross-origin",
-}
-
-# ** Please read carefully, this must be configured in config/application.rb **
-# Change the format of the cache entry.
-# Changing this default means that all new cache entries added to the cache
-# will have a different format that is not supported by Rails 6.1 applications.
-# Only change this value after your application is fully deployed to Rails 7.0
-# and you have no plans to rollback.
-# When you're ready to change format, add this to `config/application.rb` (NOT this file):
-# config.active_support.cache_format_version = 7.0
-
-# Cookie serializer: 2 options
-#
-# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
-# is `:marshal`. The default for new apps is `:json`.
-#
-# Rails.application.config.action_dispatch.cookies_serializer = :json
-#
-#
-# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
-#
-# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
-# re-writes them in the JSON format.
-#
-# It is fine to use `:hybrid` long term; you should do that until you're confident *all* your cookies
-# have been converted to JSON. To keep using `:hybrid` long term, move this config to its own
-# initializer or to `config/application.rb`.
-#
-# Rails.application.config.action_dispatch.cookies_serializer = :hybrid
-#
-#
-# If your cookies can't yet be serialized to JSON, keep using `:marshal` for backward-compatibility.
-#
-# If you have configured the serializer elsewhere, you can remove this section of the file.
-#
-# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
-
-# Change the return value of `ActionDispatch::Request#content_type` to the Content-Type header without modification.
-Rails.application.config.action_dispatch.return_only_request_media_type_on_content_type = false
-
-# Active Storage `has_many_attached` relationships will default to replacing the current collection instead of appending to it.
-# Thus, to support submitting an empty collection, the `file_field` helper will render an hidden field `include_hidden` by default when `multiple_file_field_include_hidden` is set to `true`.
-# See https://guides.rubyonrails.org/configuring.html#config-active-storage-multiple-file-field-include-hidden for more information.
-# Rails.application.config.active_storage.multiple_file_field_include_hidden = true
-
-# ** Please read carefully, this must be configured in config/application.rb (NOT this file) **
-# Disables the deprecated #to_s override in some Ruby core classes
-# See https://guides.rubyonrails.org/configuring.html#config-active-support-disable-to-s-conversion for more information.
-# config.active_support.disable_to_s_conversion = true
diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
deleted file mode 100644
index d18d266c6..000000000
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file eases your Rails 7.1 framework defaults upgrade.
-#
-# Uncomment each configuration one by one to switch to the new default.
-# Once your application is ready to run with all new defaults, you can remove
-# this file and set the `config.load_defaults` to `7.1`.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
-
-###
-# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
-# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
-#
-# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
-# of the bootsnap cache if you use it.
-#
-# To set this configuration, add the following line to `config/application.rb` (NOT this file):
-# config.add_autoload_paths_to_load_path = false
-
-###
-# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
-# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
-#++
-Rails.application.config.action_dispatch.default_headers = {
- "X-Frame-Options" => "SAMEORIGIN",
- "X-XSS-Protection" => "0",
- "X-Content-Type-Options" => "nosniff",
- "X-Permitted-Cross-Domain-Policies" => "none",
- "Referrer-Policy" => "strict-origin-when-cross-origin",
-}
-
-###
-# Do not treat an `ActionController::Parameters` instance
-# as equal to an equivalent `Hash` by default.
-#++
-Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
-
-###
-# Active Record Encryption now uses SHA-256 as its hash digest algorithm.
-#
-# There are 3 scenarios to consider.
-#
-# 1. If you have data encrypted with previous Rails versions, and you have
-# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
-# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
-#++
-# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
-#
-# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
-# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
-#++
-# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
-#
-# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
-# configure the default behavior starting 7.1+:
-#++
-# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
-
-###
-# No longer run after_commit callbacks on the first of multiple Active Record
-# instances to save changes to the same database row within a transaction.
-# Instead, run these callbacks on the instance most likely to have internal
-# state which matches what was committed to the database, typically the last
-# instance to save.
-#++
-Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
-
-###
-# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
-#
-# SQLite has some quirks around double-quoted string literals.
-# It first tries to consider double-quoted strings as identifier names, but if they don't exist
-# it then considers them as string literals. Because of this, typos can silently go unnoticed.
-# For example, it is possible to create an index for a non existing column.
-# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
-#++
-# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
-
-###
-# Disable deprecated singular associations names.
-#++
-Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
-
-###
-# Enable the Active Job `BigDecimal` argument serializer, which guarantees
-# roundtripping. Without this serializer, some queue adapters may serialize
-# `BigDecimal` arguments as simple (non-roundtrippable) strings.
-#
-# When deploying an application with multiple replicas, old (pre-Rails 7.1)
-# replicas will not be able to deserialize `BigDecimal` arguments from this
-# serializer. Therefore, this setting should only be enabled after all replicas
-# have been successfully upgraded to Rails 7.1.
-#++
-Rails.application.config.active_job.use_big_decimal_serializer = true
-
-###
-# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
-# `write` are given an invalid `expires_at` or `expires_in` time.
-# Options are `true`, and `false`. If `false`, the exception will be reported
-# as `handled` and logged instead.
-#++
-Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
-
-###
-# Specify whether Query Logs will format tags using the SQLCommenter format
-# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
-# Options are `:legacy` and `:sqlcommenter`.
-#++
-# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
-
-###
-# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
-# instances.
-#
-# The legacy default is `:marshal`, which is a potential vector for
-# deserialization attacks in cases where a message signing secret has been
-# leaked.
-#
-# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
-# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
-# with `Marshal` so that legacy messages can still be read.
-#
-# In Rails 7.2, the default will become `:json` which serializes and
-# deserializes with `ActiveSupport::JSON` only.
-#
-# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
-# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
-# can roundtrip some Ruby types that are not supported by JSON, and may provide
-# improved performance, but it requires the `msgpack` gem.
-#
-# For more information, see
-# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
-#
-# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
-# that have not yet been upgraded must be able to read messages from upgraded
-# servers, first deploy without changing the serializer, then set the serializer
-# in a subsequent deploy.
-#++
-# Rails.application.config.active_support.message_serializer = :json_allow_marshal
-
-###
-# Enable a performance optimization that serializes message data and metadata
-# together. This changes the message format, so messages serialized this way
-# cannot be read by older versions of Rails. However, messages that use the old
-# format can still be read, regardless of whether this optimization is enabled.
-#
-# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
-# not yet been upgraded must be able to read messages from upgraded servers,
-# leave this optimization off on the first deploy, then enable it on a
-# subsequent deploy.
-#++
-# Rails.application.config.active_support.use_message_serializer_for_metadata = true
-
-###
-# Set the maximum size for Rails log files.
-#
-# `config.load_defaults 7.1` does not set this value for environments other than
-# development and test.
-#++
-# if Rails.env.local?
-# Rails.application.config.log_file_size = 100 * 1024 * 1024
-# end
-
-###
-# Enable raising on assignment to attr_readonly attributes. The previous
-# behavior would allow assignment but silently not persist changes to the
-# database.
-#++
-Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
-
-###
-# Enable validating only parent-related columns for presence when the parent is mandatory.
-# The previous behavior was to validate the presence of the parent record, which performed an extra query
-# to get the parent every time the child record was updated, even when parent has not changed.
-#++
-Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
-
-###
-# Enable precompilation of `config.filter_parameters`. Precompilation can
-# improve filtering performance, depending on the quantity and types of filters.
-#++
-Rails.application.config.precompile_filter_parameters = true
-
-###
-# Enable before_committed! callbacks on all enrolled records in a transaction.
-# The previous behavior was to only run the callbacks on the first copy of a record
-# if there were multiple copies of the same record enrolled in the transaction.
-#++
-Rails.application.config.active_record.before_committed_on_all_records = true
-
-###
-# Disable automatic column serialization into YAML.
-# To keep the historic behavior, you can set it to `YAML`, however it is
-# recommended to explicitly define the serialization method for each column
-# rather than to rely on a global default.
-#++
-# Rails.application.config.active_record.default_column_serializer = nil
-
-###
-# Enable a performance optimization that serializes Active Record models
-# in a faster and more compact way.
-#
-# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
-# not yet been upgraded must be able to read caches from upgraded servers,
-# leave this optimization off on the first deploy, then enable it on a
-# subsequent deploy.
-#++
-# Rails.application.config.active_record.marshalling_format_version = 7.1
-
-###
-# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
-# This matches the behaviour of all other callbacks.
-# In previous versions of Rails, they ran in the inverse order.
-#++
-Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
-
-###
-# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
-#++
-Rails.application.config.active_record.commit_transaction_on_non_local_return = true
-
-###
-# Controls when to generate a value for <tt>has_secure_token</tt> declarations.
-#++
-Rails.application.config.active_record.generate_secure_token_on = :initialize
-
-###
-# ** Please read carefully, this must be configured in config/application.rb **
-#
-# Change the format of the cache entry.
-#
-# Changing this default means that all new cache entries added to the cache
-# will have a different format that is not supported by Rails 7.0
-# applications.
-#
-# Only change this value after your application is fully deployed to Rails 7.1
-# and you have no plans to rollback.
-# When you're ready to change format, add this to `config/application.rb` (NOT
-# this file):
-# config.active_support.cache_format_version = 7.1
-
-###
-# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
-# platform.
-#
-# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
-# sanitizers if they are supported, else fall back to HTML4 sanitizers.
-#
-# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
-#++
-Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-
-###
-# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
-# platform.
-#
-# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
-# sanitizers if they are supported, else fall back to HTML4 sanitizers.
-#
-# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
-#++
-# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-
-###
-# Configure the log level used by the DebugExceptions middleware when logging
-# uncaught exceptions during requests.
-#++
-Rails.application.config.action_dispatch.debug_exception_log_level = :error
-
-###
-# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
-# parsers.
-#
-# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
-#
-# In previous versions of Rails, these test helpers always used an HTML4 parser.
-#++
-Rails.application.config.dom_testing_default_html_version = :html5
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 761556186..7473d3ad7 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,5 +1,6 @@
if ENV["SENTRY_DSN"].present?
Sentry.init do |config|
+ config.environment = ENV["ENV"]
config.dsn = ENV["SENTRY_DSN"]
config.breadcrumbs_logger = [:active_support_logger]
end
diff --git a/config/kubernetes/development/deployment.yaml b/config/kubernetes/development/deployment.yaml
index 874bf3bc9..4db49b475 100644
--- a/config/kubernetes/development/deployment.yaml
+++ b/config/kubernetes/development/deployment.yaml
@@ -63,9 +63,9 @@ spec:
value: https
- name: X-Forwarded-Ssl
value: "on"
- initialDelaySeconds: 40
- periodSeconds: 60
- timeoutSeconds: 15
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
livenessProbe:
httpGet:
path: /ping.json
@@ -75,9 +75,9 @@ spec:
value: https
- name: X-Forwarded-Ssl
value: "on"
- initialDelaySeconds: 40
- periodSeconds: 60
- timeoutSeconds: 15
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
imagePullPolicy: Always
ports:
- containerPort: 3000
diff --git a/config/kubernetes/development/deployment_sidekiq.yaml b/config/kubernetes/development/deployment_sidekiq.yaml
index 6de095dfd..a01fcbcef 100644
--- a/config/kubernetes/development/deployment_sidekiq.yaml
+++ b/config/kubernetes/development/deployment_sidekiq.yaml
@@ -60,19 +60,15 @@ spec:
- /bin/sh
- -c
- 'bundle exec sidekiqmon | grep "parliamentary-questions"'
- initialDelaySeconds: 30
- periodSeconds: 90
- timeoutSeconds: 15
- successThreshold: 1
- failureThreshold: 3
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
livenessProbe:
exec:
command:
- /bin/sh
- -c
- 'bundle exec sidekiqmon | grep "parliamentary-questions"'
- initialDelaySeconds: 30
- periodSeconds: 90
- timeoutSeconds: 15
- successThreshold: 1
- failureThreshold: 3
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
diff --git a/config/kubernetes/development/migration_job.yaml b/config/kubernetes/development/migration_job.yaml
index ab8338f58..d2f4acf61 100644
--- a/config/kubernetes/development/migration_job.yaml
+++ b/config/kubernetes/development/migration_job.yaml
@@ -17,16 +17,6 @@ spec:
secretKeyRef:
key: rds_instance_address
name: parliamentary-questions-development-rds
- - name: DEVISE_SECRET
- valueFrom:
- secretKeyRef:
- key: DEVISE_SECRET
- name: pq-secrets
- - name: GOVUK_NOTIFY_API_KEY
- valueFrom:
- secretKeyRef:
- key: GOVUK_NOTIFY_API_KEY
- name: pq-secrets
- name: PGPASSWORD
valueFrom:
secretKeyRef:
@@ -37,26 +27,6 @@ spec:
secretKeyRef:
key: database_username
name: parliamentary-questions-development-rds
- - name: PQ_REST_API_HOST
- valueFrom:
- secretKeyRef:
- key: PQ_REST_API_HOST
- name: pq-secrets
- - name: PQ_REST_API_PASSWORD
- valueFrom:
- secretKeyRef:
- key: PQ_REST_API_PASSWORD
- name: pq-secrets
- - name: PQ_REST_API_URL
- valueFrom:
- secretKeyRef:
- key: PQ_REST_API_URL
- name: pq-secrets
- - name: PQ_REST_API_USERNAME
- valueFrom:
- secretKeyRef:
- key: PQ_REST_API_USERNAME
- name: pq-secrets
envFrom:
- configMapRef:
name: environment-variables
diff --git a/config/kubernetes/production/deployment.yaml b/config/kubernetes/production/deployment.yaml
index ad889ce3d..4a5a37baf 100644
--- a/config/kubernetes/production/deployment.yaml
+++ b/config/kubernetes/production/deployment.yaml
@@ -63,9 +63,9 @@ spec:
value: https
- name: X-Forwarded-Ssl
value: "on"
- initialDelaySeconds: 40
- periodSeconds: 60
- timeoutSeconds: 15
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
livenessProbe:
httpGet:
path: /ping.json
@@ -75,9 +75,9 @@ spec:
value: https
- name: X-Forwarded-Ssl
value: "on"
- initialDelaySeconds: 40
- periodSeconds: 60
- timeoutSeconds: 15
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
imagePullPolicy: Always
ports:
- containerPort: 3000
diff --git a/config/kubernetes/production/deployment_sidekiq.yaml b/config/kubernetes/production/deployment_sidekiq.yaml
index c9fa9296b..43ffffc1c 100644
--- a/config/kubernetes/production/deployment_sidekiq.yaml
+++ b/config/kubernetes/production/deployment_sidekiq.yaml
@@ -60,19 +60,15 @@ spec:
- /bin/sh
- -c
- 'bundle exec sidekiqmon | grep "parliamentary-questions"'
- initialDelaySeconds: 30
- periodSeconds: 90
- timeoutSeconds: 15
- successThreshold: 1
- failureThreshold: 3
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
livenessProbe:
exec:
command:
- /bin/sh
- -c
- 'bundle exec sidekiqmon | grep "parliamentary-questions"'
- initialDelaySeconds: 30
- periodSeconds: 90
- timeoutSeconds: 15
- successThreshold: 1
- failureThreshold: 3
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
diff --git a/config/kubernetes/staging/deployment.yaml b/config/kubernetes/staging/deployment.yaml
index 6e2e5d700..f04e35200 100755
--- a/config/kubernetes/staging/deployment.yaml
+++ b/config/kubernetes/staging/deployment.yaml
@@ -63,9 +63,9 @@ spec:
value: https
- name: X-Forwarded-Ssl
value: "on"
- initialDelaySeconds: 40
- periodSeconds: 60
- timeoutSeconds: 15
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
livenessProbe:
httpGet:
path: /ping.json
@@ -75,9 +75,9 @@ spec:
value: https
- name: X-Forwarded-Ssl
value: "on"
- initialDelaySeconds: 40
- periodSeconds: 60
- timeoutSeconds: 15
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
imagePullPolicy: Always
ports:
- containerPort: 3000
diff --git a/config/kubernetes/staging/deployment_sidekiq.yaml b/config/kubernetes/staging/deployment_sidekiq.yaml
index ddb462871..dacbdeaf1 100644
--- a/config/kubernetes/staging/deployment_sidekiq.yaml
+++ b/config/kubernetes/staging/deployment_sidekiq.yaml
@@ -60,19 +60,15 @@ spec:
- /bin/sh
- -c
- 'bundle exec sidekiqmon | grep "parliamentary-questions"'
- initialDelaySeconds: 30
- periodSeconds: 90
- timeoutSeconds: 15
- successThreshold: 1
- failureThreshold: 3
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
livenessProbe:
exec:
command:
- /bin/sh
- -c
- 'bundle exec sidekiqmon | grep "parliamentary-questions"'
- initialDelaySeconds: 30
- periodSeconds: 90
- timeoutSeconds: 15
- successThreshold: 1
- failureThreshold: 3
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
diff --git a/config/routes.rb b/config/routes.rb
index 3303d5abc..393642802 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,18 +81,8 @@
match "export/csv_quick.csv" => "export#csv_quick", via: %i[get post]
get "export" => "export#index"
- get "reports/ministers_by_progress" => "reports#ministers_by_progress"
- get "reports/press_desk_by_progress" => "reports#press_desk_by_progress"
-
get "/accessibility" => "pages#accessibility"
- match "reports/filter_all" => "reports#filter_all", via: %i[get post], as: "filter_all"
-
- match "*path", to: "application#page_not_found", via: :all
-
- if Rails.env.production?
- get "401", to: "application#unauthorized"
- get "404", to: "application#page_not_found"
- get "500", to: "application#server_error"
- end
+ get "/404", to: "errors#not_found"
+ get "/500", to: "errors#internal_error"
end
diff --git a/db/schema.rb b/db/schema.rb
index 886973432..93cf77f5f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_10_16_133636) do
+ActiveRecord::Schema[7.2].define(version: 2024_10_16_133636) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -286,5 +286,4 @@
t.datetime "created_at", precision: nil
t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
end
-
end
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100755
index fe4b435f8..000000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export PATH=${APP_HOME}/bin:$PATH
-
-exec -- "$@"
diff --git a/lib/pqa/mock_api_server.rb b/lib/pqa/mock_api_server.rb
index 24d5d2215..102c1cb3e 100644
--- a/lib/pqa/mock_api_server.rb
+++ b/lib/pqa/mock_api_server.rb
@@ -13,6 +13,8 @@ class MockApiServer < Sinatra::Base
set :lock, true
end
+ use Rack::RewindableInput::Middleware
+
# NOTE: Internal to the Mock API server
get "/" do
"This API is working"
@@ -26,6 +28,7 @@ class MockApiServer < Sinatra::Base
# NOTE: Internal to the Mock API server
put "/api/qais/questions/:uin" do
+ request.body.rewind
xml = request.body.read
doc = Nokogiri::XML(xml)
errors = SCHEMA.validate(doc)
diff --git a/lib/pqa/mock_api_server_runner.rb b/lib/pqa/mock_api_server_runner.rb
index db9811284..4deacbed8 100644
--- a/lib/pqa/mock_api_server_runner.rb
+++ b/lib/pqa/mock_api_server_runner.rb
@@ -9,7 +9,7 @@ class MockApiServerRunner
HEARTBEAT_ENDPOINT = "/".freeze
def start
- cmd = "rackup -p #{PORT} -P #{PID_FILEPATH} #{RACK_CONFIG_PATH} &> #{LOG_FILEPATH}"
+ cmd = "bundle exec rackup -p #{PORT} -P #{PID_FILEPATH} #{RACK_CONFIG_PATH} &> #{LOG_FILEPATH}"
if File.exist?(PID_FILEPATH)
pid = File.read(PID_FILEPATH)
diff --git a/lib/presenters/report.rb b/lib/presenters/report.rb
deleted file mode 100644
index e9b43e572..000000000
--- a/lib/presenters/report.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-module Presenters
- class Report
- attr_reader :header_cells, :rows, :title
-
- def initialize(header_cells, rows, title)
- @header_cells = header_cells
- @rows = rows
- @title = title
- end
-
- def self.ministers(report_h, ministers)
- build(report_h, ministers, PqState::IN_PROGRESS, "Minister report")
- end
-
- def self.press_desk(report_h, press_desks)
- states = PqState::IN_PROGRESS + PqState::CLOSED
- build(report_h, press_desks, states, "Press desk report")
- end
-
- # private_class_method
-
- def self.build(report_h, records, states, title)
- header_cells = records.map { |r| present_cell(r) }
- rows =
- states.map do |state|
- counts = report_h.fetch(state, {})
- cells =
- records.map do |r|
- count = counts.fetch(r.id, 0)
- present_count_cell(count, r, state)
- end
- Row.new(state, cells)
- end
-
- new(header_cells, rows, title)
- end
-
- def self.present_cell(report)
- case report
- when Minister
- ClickableCell.minister(report.name, report.id)
- when PressDesk
- ClickableCell.press_desk(report.name, report.id)
- else
- raise ArgumentError, "record should be a Minister or a PressDesk"
- end
- end
-
- def self.present_count_cell(count, report, state)
- case report
- when Minister
- CountCell.minister(count, report.id, state)
- when PressDesk
- CountCell.press_desk(count, report.id, state)
- else
- raise ArgumentError, "record should be a Minister or a PressDesk"
- end
- end
- end
-end
diff --git a/lib/presenters/report/clickable_cell.rb b/lib/presenters/report/clickable_cell.rb
deleted file mode 100644
index ef8a652ec..000000000
--- a/lib/presenters/report/clickable_cell.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Presenters
- class Report
- class ClickableCell
- include Rails.application.routes.url_helpers
-
- def self.minister(label, id)
- new(label, minister_id: id)
- end
-
- def self.press_desk(label, id)
- new(label, press_desk_id: id)
- end
-
- attr_reader :label
-
- def initialize(label, filter_params)
- @label = label
- @filter_params = filter_params
- end
-
- def path
- filter_all_path(@filter_params)
- end
- end
- end
-end
diff --git a/lib/presenters/report/count_cell.rb b/lib/presenters/report/count_cell.rb
deleted file mode 100644
index a2ba1415b..000000000
--- a/lib/presenters/report/count_cell.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Presenters
- class Report
- class CountCell < ClickableCell
- attr_reader :count
-
- def self.minister(label, id, state)
- new(label, minister_id: id, state:)
- end
-
- def self.press_desk(label, id, state)
- new(label, press_desk_id: id, state:)
- end
-
- def initialize(count, filter_params)
- @count = count
- super(count, filter_params)
- end
-
- def zero?
- @count.zero?
- end
- end
- end
-end
diff --git a/lib/presenters/report/row.rb b/lib/presenters/report/row.rb
deleted file mode 100644
index 4f0ed76d0..000000000
--- a/lib/presenters/report/row.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Presenters
- class Report
- class Row
- attr_reader :cells, :state
-
- def initialize(state, cells)
- @state = state
- @cells = cells
- end
-
- def label
- PqState.state_label(@state)
- end
- end
- end
-end
diff --git a/lib/smoke_test.rb b/lib/smoke_test.rb
index 54da22a2d..7bfddd3db 100644
--- a/lib/smoke_test.rb
+++ b/lib/smoke_test.rb
@@ -8,7 +8,6 @@ module SmokeTest
ALL =
[
SmokeTest::Dashboard,
- SmokeTest::Report,
].freeze
def factory
diff --git a/lib/smoke_test/report.rb b/lib/smoke_test/report.rb
deleted file mode 100644
index 2bc1a873a..000000000
--- a/lib/smoke_test/report.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module SmokeTest
- class Report < Base
- private
-
- def all_checks_succeed?
- agent.get reports_press_desk_by_progress_path
-
- agent.page.code == "200" && !!agent.page.body.include?("/Press desk report/")
- end
- end
-end
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
deleted file mode 100644
index 89aa75c9a..000000000
--- a/lib/tasks/email.rake
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace :email do
- desc "Adds emails from db to a queue and attempts to send, logging failures"
- task process_queue: :environment do
- MailWorker.new.run!
- end
-end
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..aae4220ab
--- /dev/null
+++ b/package.json
@@ -0,0 +1,18 @@
+{
+ "dependencies": {
+ "@rails/ujs": "^7.1.3-4",
+ "font-awesome": "^4.7.0",
+ "govuk-frontend": "^5.7.1",
+ "jquery": "^3.7.1",
+ "moment": "^2.30.1",
+ "sass": "^1.80.5",
+ "select2": "^4.1.0-rc.0"
+ },
+ "scripts": {
+ "build:css": "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules --quiet-deps --silence-deprecation=import",
+ "build": "esbuild app/javascript/*.* --bundle --sourcemap --format=esm --outdir=app/assets/builds --public-path=/assets"
+ },
+ "devDependencies": {
+ "esbuild": "^0.24.0"
+ }
+}
diff --git a/public/401.html b/public/401.html
deleted file mode 100644
index e92ca1106..000000000
--- a/public/401.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8" />
- <title>Error - 401 - Unauthorised - Parliamentary Questions - Ministry of Justice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-