ndr_error 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc647609724df66e2ef237cd3373f459e2607f42b1b7312d83d7b161e7842c55
-  data.tar.gz: f08d35d2bc1ac26fc397f870ba3fe68886a39ee458aed044bd52904253c27d6d
+  metadata.gz: 2a3df3ca931e154b2ad12097ab5725021d6aa1d3bcb3b61706459258d54084c6
+  data.tar.gz: 471325de64342030d9e7088eb27bf803dbcce0163aae2a95bbac7ad2ba6a7df5
 SHA512:
-  metadata.gz: 76d375aa7c43b7ff6edea6f7a0680ee96917f23e696b4304de12a09a743d5bb50af75b87e6b54bec7195bbad26ab8b42a2613930553780ef4a425094973cf3b3
-  data.tar.gz: 2a41a403e3af819a85f9152adb5f4e904b95d321626f59363faaa382a82aea6a1b47ec3108da0dd72c6f2943fc6a3b4281acd1c7ce7f25c48ccef488bd8f5be6
+  metadata.gz: 6a36f65267a128ab83d5eeaf4b836ea70508c89b30c2661f07bb6398ed78351506a632f4b794de621707bc9ca16abdc27d00e044188e4dfd26234986e7610ed6
+  data.tar.gz: f0968ff0236b079e0513ee841d3010f4c3135d6931e0f5cb7339471b74729a2b76e7a7707de425d16b0952a50ebda856dd2d5f54ce3f171234b7069d702a72e7

data/CHANGELOG.md

@@ -1,14 +1,10 @@
 ## [Unreleased]
-* no unreleased changes
++* no unreleased changes
 
-## 2.3.4 / 2026-07-10
-### Fixed
-* Support Rails 8.1, Ruby 4.0. Drop support for Ruby 3.2 [backported from v2.4.3]
-
-## 2.3.3 / 2025-11-24
-### Fixed
-* Support Ruby 3.4, Rails 8.0 [backported from v2.4.3]
-* Fix ruby 3.4 frozen string literal warnings [backported from v2.4.3]
+## 2.4.0 / 2025-01-31
+### Changed
+* New views with bootstrap 5 styles
+* Switch to bootstrap-icons as glyphicon no longer available in bootstrap 5
 
 ## 2.3.2 / 2024-11-21
 ### Fixed

data/app/helpers/ndr_error/application_helper.rb

@@ -2,11 +2,6 @@ module NdrError
   # Application-wide helpers.
   # TODO: await ndr_ui gem!
   module ApplicationHelper
-    # Bootstrap icon tag.
-    def glyphicon_tag(type)
-      content_tag(:span, '', class: "glyphicon glyphicon-#{type}")
-    end
-
     # Pagination helper for will_paginate:
     def pagination_summary_for(collection)
       page    = collection.current_page

data/app/helpers/ndr_error/errors_helper.rb

@@ -11,7 +11,7 @@ module NdrError
 
       error.backtrace.map do |line|
         css_classes = 'trace-item'
-        css_classes += ' stack-only' unless highlighting.include?(line)
+        css_classes << ' stack-only' unless highlighting.include?(line)
 
         content_tag(:span, line, class: css_classes)
       end
@@ -56,25 +56,25 @@ module NdrError
       bootstrap_list_link_to hash + ' - ' + text, error_fingerprint_path(print)
     end
 
-    def ticket_link_for(fingerprint, small = false)
-      text = glyphicon_tag('asterisk') + ' View ticket'
-      css  = 'btn btn-default'
-      css += ' btn-xs' if small
+    def ticket_link_for(fingerprint, small = false) # rubocop:disable Style/OptionalBooleanParameter
+      text = "#{bootstrap_icon_tag('asterisk', :bi)} View ticket"
+      css  = 'btn btn-outline-secondary'
+      css << ' btn-xs' if small
 
       url = fingerprint.ticket_url
       link_to(text, /^http/i =~ url ? url : "http://#{url}", class: css)
     end
 
     def edit_button_for(fingerprint)
-      css   = 'btn btn-default'
-      text  = glyphicon_tag('pencil') + ' Edit Ticket'
+      css   = 'btn btn-outline-secondary'
+      text  = "#{bootstrap_icon_tag('pencil', :bi)} Edit Ticket"
 
       link_to(text, edit_error_fingerprint_path(fingerprint), class: css)
     end
 
     def purge_button_for(fingerprint)
       css   = 'btn btn-danger'
-      text  = glyphicon_tag('trash icon-white') + ' Purge'
+      text  = "#{bootstrap_icon_tag('trash-fill', :bi)} Purge"
 
       options = {
         'method'       => :delete,
@@ -86,18 +86,18 @@ module NdrError
     end
 
     def previous_button_for(error)
-      css = 'btn btn-default'
-      css += ' disabled' if error.nil?
-      text = glyphicon_tag('chevron-left')
+      css = 'btn btn-outline-secondary'
+      css << ' disabled' if error.nil?
+      text = bootstrap_icon_tag('chevron-left', :bi)
       path = error.nil? ? '#' : error_fingerprint_path(error.error_fingerprint, log_id: error)
 
       link_to(text, path, class: css)
     end
 
     def next_button_for(error)
-      css = 'btn btn-default'
-      css += ' disabled' if error.nil?
-      text = glyphicon_tag('chevron-right')
+      css = 'btn btn-outline-secondary'
+      css << ' disabled' if error.nil?
+      text = bootstrap_icon_tag('chevron-right', :bi)
       path = error.nil? ? '#' : error_fingerprint_path(error.error_fingerprint, log_id: error)
 
       link_to(text, path, class: css)

data/app/views/layouts/ndr_error/ndr_error.html.erb

@@ -8,19 +8,14 @@
 </head>
 <body class="bootstrap">
 
-<div class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="navbar navbar-expand-lg fixed-top bg-body-tertiary" role="navigation">
   <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#menubar" aria-controls="menubar" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
       </button>
-
       <%= link_to '&#171; Back to App'.html_safe, '/', class: "navbar-brand" %>
-      <p class="navbar-text">Error Logging by NDR</p>
+      <span class="navbar-text">Error Logging by NDR</span>
     </div>
   </div>
 </div>

data/app/views/ndr_error/errors/edit.html.erb

@@ -16,5 +16,5 @@
   </div>
 
   <%= form.submit 'Update', class: 'btn btn-primary' %>
-  <%= link_to 'Cancel', error_fingerprint_path(@fingerprint), class: 'btn btn-default' %>
+  <%= link_to 'Cancel', error_fingerprint_path(@fingerprint), class: 'btn btn-outline-secondary' %>
 <% end %>

data/app/views/ndr_error/errors/index.html.erb

@@ -5,16 +5,14 @@
 %>
 
 <div class="row">
-  <div id="search_form_container" class="col-md-4 col-md-offset-8">
+  <div id="search_form_container" class="col-md-4 offset-md-8">
   <%= form_tag(error_fingerprints_path, method: :get) do %>
     <div class="input-group">
       <% if @keywords.any? %>
-        <%= link_to glyphicon_tag('list icon-white') + ' ' + glyphicon_tag('arrow-left icon-white'), error_fingerprints_path, class: 'btn btn-info input-group-addon' %>
+        <%= link_to bootstrap_icon_tag(:'list-task', :bi) + ' ' + bootstrap_icon_tag(:'arrow-left-circle-fill', :bi), error_fingerprints_path, class: 'btn btn-info' %>
       <% end %>
       <%= text_field_tag :q, @keywords.join(', '), class: 'form-control search-query' %>
-      <span class="input-group-btn">
-        <button type="submit" class="btn btn-default"><%= glyphicon_tag('search') %></button>
-      </span>
+      <button type="submit" class="btn btn-outline-secondary"><%= bootstrap_icon_tag(:search, :bi) %></button>
     </div>
   <% end %>
   </div>
@@ -45,7 +43,7 @@
             <%= latest_user_for(fingerprint, @keywords) %>
           </td>
           <td>
-            <div class="pull-right">
+            <div class="float-end">
               <%= ticket_link_for(fingerprint, true) if fingerprint.ticket_url.present? %>
             </div>
 
@@ -57,7 +55,8 @@
       </tbody>
     </table>
 
-    <span class="pull-right text-muted"><%= pagination_summary_for(@fingerprints) %></span>
+    <span class="float-end text-muted"><%= pagination_summary_for(@fingerprints) %></span>
+    <%# TODO: use bootstrap_will_paginate %>
     <%= will_paginate(@fingerprints) %>
   </div>
 </div>

data/app/views/ndr_error/errors/show.html.erb

@@ -7,7 +7,7 @@
 
 <hr />
 <div class="clearfix">
-  <div class="pull-right">
+  <div class="float-end">
     <div class="btn-group">
       <%= ticket_link_for(@fingerprint) if @fingerprint.ticket_url.present? %>
       <%= edit_button_for(@fingerprint) if user_can_edit_errors? %>
@@ -22,7 +22,7 @@
         <%= previous_button_for(@error.previous) %>
 
         <div class="btn-group">
-          <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+          <a class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" href="#">
             <%= pluralize(@error.similar_errors.length - 1, 'Similar Error') %> Stored
             <span class="caret"></span>
           </a>
@@ -39,13 +39,13 @@
 
     <% if @fingerprint.causal_error_fingerprint %>
       <div class="btn-group">
-        <%= link_to bootstrap_icon_tag('arrow-up') + ' View Cause', error_fingerprint_path(@fingerprint.causal_error_fingerprint), class: 'btn btn-default' %>
+        <%= link_to bootstrap_icon_tag('arrow-up') + ' View Cause', error_fingerprint_path(@fingerprint.causal_error_fingerprint), class: 'btn btn-outline-secondary' %>
       </div>
     <% end %>
 
     <% if @fingerprint.caused_error_fingerprints.any? %>
       <div class="btn-group">
-        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+        <a class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" href="#">
           <%= pluralize(@fingerprint.caused_error_fingerprints.length, 'Downstream Error') %> Stored
           <span class="caret"></span>
         </a>
@@ -117,7 +117,7 @@
 <% end %>
 
 <h4>
-  <small class="pull-right"><%= check_box_tag :toggle_app_trace_only %> only app trace?</small>
+  <small class="float-end"><%= check_box_tag :toggle_app_trace_only %> only app trace?</small>
   Backtrace:
 </h4>
 <% if (highlighted_trace = highlighted_trace_for(@error)).present? %>

data/lib/ndr_error/version.rb

@@ -2,5 +2,5 @@
 
 # Contains the version of NdrError. Sourced by the gemspec.
 module NdrError
-  VERSION = '2.3.4'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_error
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0
 platform: ruby
 authors:
 - NCRS Development Team
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -15,20 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '7.3'
+- !ruby/object:Gem::Dependency
+  name: net-imap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-pop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +90,14 @@ dependencies:
   name: ndr_ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -99,6 +142,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +237,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- SECURITY.md
 - app/assets/javascripts/ndr_error/ndr_error.js
 - app/assets/stylesheets/ndr_error/ndr_error.scss
 - app/controllers/ndr_error/application_controller.rb
@@ -213,6 +269,7 @@ homepage: https://github.com/NHSDigital/ndr_error
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,14 +277,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Rails exception logging
 test_files: []

data/SECURITY.md

@@ -1,35 +0,0 @@
-# Security
-
-NHS England takes security and the protection of private data extremely seriously. If you believe you have found a vulnerability or other issue which has compromised or could compromise the security of any of our systems and/or private data managed by our systems, please do not hesitate to contact us using the methods outlined below.
-
-## Table of Contents
-
-- [Security](#security)
-  - [Table of Contents](#table-of-contents)
-  - [Reporting a vulnerability](#reporting-a-vulnerability)
-    - [Email](#email)
-    - [NCSC](#ncsc)
-  - [General Security Enquiries](#general-security-enquiries)
-
-## Reporting a vulnerability
-
-Please note, email is our preferred method of receiving reports.
-
-### Email
-
-If you wish to notify us of a vulnerability via email, please include detailed information on the nature of the vulnerability and any steps required to reproduce it.
-
-You can reach us at:
-
-- [Brian.Shand@nhs.net](mailto:Brian.Shand@nhs.net)
-- [cybersecurity@nhs.net](mailto:cybersecurity@nhs.net)
-
-### NCSC
-
-You can send your report to the National Cyber Security Centre, who will assess your report and pass it on to NHS England if necessary.
-
-You can report vulnerabilities here: [https://www.ncsc.gov.uk/information/vulnerability-reporting](https://www.ncsc.gov.uk/information/vulnerability-reporting)
-
-## General Security Enquiries
-
-If you have general enquiries regarding our cybersecurity, please reach out to us at [cybersecurity@nhs.net](mailto:cybersecurity@nhs.net)