renalware-core 2.0.146 → 2.0.152

data/app/controllers/renalware/session_timeout_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# This controller exposes a has_user_timed_out action which is invoked via Ajax on a JavaScript
+# This controller exposes a check_session_expired action which is invoked via Ajax on a JavaScript
 # timer and will cause the user to be redirected to the login page if their session has expired
 # due to a period of activity. The redirect happens because of a generic Ajax error handling
 # JavaScript - see ajax_errors.js - which causes the page to reload after any Ajax 401 error
@@ -11,35 +11,38 @@
 #
 module Renalware
   class SessionTimeoutController < BaseController
-    prepend_before_action :skip_timeout, only: :has_user_timed_out
-    skip_before_action :authenticate_user!, only: :has_user_timed_out
-    skip_before_action :track_ahoy_visit, only: :has_user_timed_out
-    protect_from_forgery except: [:has_user_timed_out, :reset_user_clock]
+    prepend_before_action :skip_timeout, only: :check_session_expired
+    skip_before_action :authenticate_user!, only: :check_session_expired
+    skip_before_action :track_ahoy_visit
+    protect_from_forgery only: []
+    after_action :track_action, only: []
 
     # Note this action will NOT update the session activity (thus keeping the session alive)
     # because we invoke #skip_timeout at the beginning of the filter chain.
     # We could return the amount of time remaining before the session expires like so
     #   time_left = Devise.timeout_in - (Time.now - user_session["last_request_at"]).round
     # and display this to the user if required.
-    # rubocop :disable Naming/PredicateName
-    def has_user_timed_out
-      skip_authorization
+    def check_session_expired
+      skip_authorization # pundit
       if referrer_is_a_devise_url? || !current_users_session_has_timed_out?
-        head(:ok)
+        head :ok
       else
-        flash[:notice] = "Your session timed due to inactivity. Please log in again."
         head :unauthorized
       end
     end
-    # rubocop :enable Naming/PredicateName
 
-    # A user could invoke this action to keep their session alive, by for example
-    # clicking on a "Keep my session active" button which makes an ajax call to this action.
-    # Note this will keep the session alive because we have not invoked skip_timeout before
-    # action, so, like all actions on all controllers, the user's last_request_at time stamp is
+    # session_controller.js invoked this action to when there is user activity on the page
+    # to update the session window.
+    # Note this will keep the session alive because we have NOT invoked skip_timeout before the
+    # action, so, like all controller actions, the user's last_request_at time stamp is
     # updated in their session cookie.
-    def reset_user_clock
-      head :ok
+    def keep_session_alive
+      skip_authorization # pundit
+      if referrer_is_a_devise_url? || !current_users_session_has_timed_out?
+        head :ok
+      else
+        head :unauthorized
+      end
     end
 
     private

data/app/documents/renalware/age.rb

@@ -17,6 +17,8 @@ module Renalware
     end
 
     def self.new_from(years:, months:, **)
+      years = years&.to_i
+      months = months&.to_i
       new.tap do |age|
         if years && months
           if years < age_in_months_threshold
@@ -39,7 +41,7 @@ module Renalware
     def validate_unit
       return if amount.blank?
 
-      if amount < Age.age_in_months_threshold && unit.to_sym != :months
+      if amount.to_i < Age.age_in_months_threshold && unit.to_sym != :months
         errors.add(:unit, :invalid_unit)
       end
     end

data/app/helpers/renalware/application_helper.rb

@@ -3,6 +3,7 @@
 require "inline_image"
 require "git_commit_sha"
 require "breadcrumb"
+require "renalware/version_number"
 
 module Renalware
   module ApplicationHelper
@@ -61,15 +62,15 @@ module Renalware
       " field_with_errors" if model.errors.key?(attr)
     end
 
-    def yes_no(bool)
-      bool ? "Yes" : "No"
-    end
+    # def yes_no(bool)
+    #   bool ? "Yes" : "No"
+    # end
 
-    def yes_no_if_set(bool)
-      return if bool.nil?
+    # def yes_no_if_set(bool)
+    #   return if bool.nil?
 
-      yes_no(bool)
-    end
+    #   yes_no(bool)
+    # end
 
     def default_for_associated(assoc, method, msg)
       assoc.present? ? assoc.public_send(method) : msg
@@ -113,7 +114,7 @@ module Renalware
     end
 
     def semantic_app_version
-      "#{Renalware::VERSION}+sha.#{GitCommitSha.current}"
+      "#{Renalware::VersionNumber::VERSION}+sha.#{GitCommitSha.current}"
     end
   end
 end

data/app/helpers/renalware/article_helper.rb

@@ -13,8 +13,8 @@ module Renalware
       output = tag(:article, options, true)
       if title.present?
         output.safe_concat(
-          content_tag("header") do
-            content_tag("h1", title)
+          tag.header do
+            tag.h1(title)
           end
         )
       end
@@ -37,7 +37,7 @@ module Renalware
         end
       end
       parts.append(")")
-      content_tag("span", parts.join(""))
+      tag.span(parts.join(""))
     end
   end
 end

data/app/helpers/renalware/boolean_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Renalware
+  module BooleanHelper
+    def yes_no(bool)
+      bool ? "Yes" : "No"
+    end
+
+    def yes_no_if_set(bool)
+      return if bool.nil?
+
+      yes_no(bool)
+    end
+  end
+end

data/app/helpers/renalware/clipboard_helper.rb

@@ -4,9 +4,8 @@ module Renalware
   module ClipboardHelper
     # A helper to create a clipboard.js button https://clipboardjs.com/
     def clipboard_button_for(target, width: "13rem")
-      content_tag :button,
-                  data: { "clipboard-action" => "copy", "clipboard-target" => target },
-                  class: "button compact low-key clipboard-btn" do
+      tag.button data: { "clipboard-action" => "copy", "clipboard-target" => target },
+                 class: "button compact low-key clipboard-btn" do
         image_tag "renalware/clippy.svg", width: width
       end
     end

data/app/helpers/renalware/dashboards_helper.rb

@@ -4,8 +4,8 @@ module Renalware
   module DashboardsHelper
     def composed_dashboard_title(user_name)
       capture do
-        concat content_tag(:span, I18n.t("renalware.dashboard.dashboards.title"))
-        concat content_tag(:span, user_name, class: "dashboard-owner")
+        concat tag.span(I18n.t("renalware.dashboard.dashboards.title"))
+        concat tag.span(user_name, class: "dashboard-owner")
       end
     end
   end

data/app/helpers/renalware/definition_list_helper.rb

@@ -17,14 +17,14 @@ module Renalware
         value = __getobj__.public_send(attribute)
         value = yield(value) if value.present? && block_given?
         capture do
-          concat content_tag(:dt, text)
-          concat content_tag(:dd, value)
+          concat tag.dt(text)
+          concat tag.dd(value)
         end
       end
     end
 
     def definition_list_for(model, size: :large)
-      content_tag(:dl, class: "dl-horizontal #{size}") do
+      tag.dl(class: "dl-horizontal #{size}") do
         yield DefinitionList.new(model)
       end
     end

data/app/helpers/renalware/devise_helper.rb

@@ -5,7 +5,7 @@ module Renalware
     def custom_devise_error_messages!
       return "" if resource.errors.empty?
 
-      messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
+      messages = resource.errors.full_messages.map { |msg| tag.li(msg) }.join
 
       html = <<-HTML
       <ul class="error-messages">#{messages}</ul>

data/app/helpers/renalware/form_helper.rb

@@ -30,7 +30,7 @@ module Renalware
     end
 
     def monospace(value, width = 5)
-      content_tag(:span, class: "monospaced") do
+      tag.span(class: "monospaced") do
         concat("%#{width}s" % value).gsub(/ /, " ").html_safe
       end
     end
@@ -38,7 +38,7 @@ module Renalware
     def save_or_cancel(form:, back_path:, submit_title: "Save", cancel_title: "cancel")
       capture do
         concat(form.submit(submit_title, class: "button"))
-        concat(content_tag(:span) { " or " })
+        concat(tag.span { " or " })
         concat(link_to(cancel_title, back_path))
       end
     end

data/app/helpers/renalware/letters_helper.rb

@@ -16,7 +16,7 @@ module Renalware
 
     def inline_value(label, value, unit = nil)
       [
-        content_tag(:strong, "#{label}: "),
+        tag.strong("#{label}: "),
         value,
         unit
       ].flatten.join(" ").html_safe

data/app/helpers/renalware/link_helper.rb

@@ -6,7 +6,7 @@ module Renalware
     # not permitted if condition is falsey.
     def link_to_if_allowed(condition, name, options = {}, html_options = {})
       link_to_if(condition, name, options, html_options) do
-        content_tag(:span, class: "no-permission") { name }
+        tag.span(class: "no-permission") { name }
       end
     end
   end

data/app/helpers/renalware/mdm_helper.rb

@@ -37,6 +37,7 @@ module Renalware
       private
 
       attr_reader :patient
+
       delegate :name, to: :modality_description, prefix: true, allow_nil: true
 
       def modality_description

data/app/helpers/renalware/navigation_helper.rb

@@ -6,7 +6,7 @@ module Renalware
     # e.g. Engine.routes.url_for({controller: .., action: .., only_path: true})
     def sub_nav_item(label, path)
       current_page = current_page?(path)
-      content_tag(:dd, class: ("active" if current_page)) do
+      tag.dd(class: ("active" if current_page)) do
         link_to label, path
       end
     end

data/app/helpers/renalware/patient_helper.rb

@@ -5,11 +5,11 @@ module Renalware
     def patient_menu_item(title:, path:, active_when_controller_matches:, enabled: true)
       klasses = %w(link)
       klasses << "active" if current_controller_matches(active_when_controller_matches)
-      content_tag :li, class: klasses.join(" ") do
+      tag.li(class: klasses.join(" ")) do
         if enabled
           link_to(title, path)
         else
-          content_tag :span, title
+          tag.span title
         end
       end
     end

data/app/helpers/renalware/snippets_helper.rb

@@ -9,16 +9,15 @@ module Renalware
     # populated with when a snippet is selected.
     def snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet:)
       capture do
-        concat content_tag(:div,
-                           nil,
-                           id: "snippets-modal",
-                           class: "reveal-modal",
-                           data: {
-                             reveal: "data-reveal",
-                             controller: "snippets",
-                             "snippets-target-input" => target_input_for_seleted_snippet,
-                             target: target_input_for_seleted_snippet
-                           })
+        concat tag.div(nil,
+                       id: "snippets-modal",
+                       class: "reveal-modal",
+                       data: {
+                         reveal: "data-reveal",
+                         controller: "snippets",
+                         "snippets-target-input" => target_input_for_seleted_snippet,
+                         target: target_input_for_seleted_snippet
+                       })
         concat link_to t("snippets.insert"),
                        snippets_path(format: :js),
                        class: "button alternative right insert-snippet-button",

data/app/helpers/renalware/toggle_helper.rb

@@ -17,7 +17,7 @@ module Renalware
         class: "toggler",
         title: link_title
       ) do
-        content_tag(:i)
+        tag.i
       end
     end
 
@@ -29,18 +29,18 @@ module Renalware
         class: "toggler",
         title: link_title
       ) do
-        content_tag(:i)
+        tag.i
       end
     end
 
     def th_toggle_all_rows
-      content_tag(:th, class: "noprint togglers") do
+      tag.th(class: "noprint togglers") do
         table_toggler(link_title: "Toggle all rows")
       end
     end
 
     def td_toggle_row(row_selector)
-      content_tag(:td, class: "noprint") do
+      tag.td(class: "noprint") do
         toggler(row_selector)
       end
     end
@@ -57,7 +57,7 @@ module Renalware
         class: "toggler",
         title: link_title
       ) do
-        content_tag(:i)
+        tag.i
       end
     end
 
@@ -73,7 +73,7 @@ module Renalware
         class: "toggler",
         title: link_title
       ) do
-        content_tag(:i)
+        tag.i
       end
     end
   end

data/app/helpers/renalware/tooltip_helper.rb

@@ -3,27 +3,25 @@
 module Renalware
   module TooltipHelper
     def tooltip(label:, content:)
-      content_tag(:span,
-                  title: content,
-                  class: "has-tip",
-                  "aria-haspopup" => "true",
-                  data: {
-                    tooltip: "",
-                    options: "disable_for_touch:true"
-                  }) do
+      tag.span(title: content,
+               class: "has-tip",
+               "aria-haspopup" => "true",
+               data: {
+                 tooltip: "",
+                 options: "disable_for_touch:true"
+               }) do
         label
       end
     end
 
     def tooltip_with_block(label:)
-      content_tag(:span,
-                  title: label,
-                  class: "has-tip",
-                  "aria-haspopup" => "true",
-                  data: {
-                    tooltip: "",
-                    options: "disable_for_touch: true; hover_delay: 100;"
-                  }) do
+      tag.span(title: label,
+               class: "has-tip",
+               "aria-haspopup" => "true",
+               data: {
+                 tooltip: "",
+                 options: "disable_for_touch: true; hover_delay: 100;"
+               }) do
         yield if block_given?
       end
     end

data/app/inputs/clock_picker_input.rb

@@ -4,14 +4,14 @@ class ClockPickerInput < SimpleForm::Inputs::StringInput
   # Note that where we use `wrapper: :clockpicker` or `wrapper: horizontal_clockpicker`,
   # #input is not called and we call #prefix_column and #input_column directly.
   def input(_wrapper_options)
-    template.content_tag(:div, class: "row collapse #{class_name}-wrapper") do
+    template.tag.div(class: "row collapse #{class_name}-wrapper") do
       template.concat prefix_column
       template.concat input_column
     end
   end
 
   def prefix_column(_wrapper_options = {})
-    template.content_tag(:div, class: "small-3 input-group-addon columns") do
+    template.tag.div(class: "small-3 input-group-addon columns") do
       template.concat(icon_clock)
     end
   end
@@ -20,7 +20,7 @@ class ClockPickerInput < SimpleForm::Inputs::StringInput
     html_options = input_html_options
     html_options[:class] ||= []
     html_options[:class] << class_name
-    template.content_tag(:div, class: "small-9 columns") do
+    template.tag.div(class: "small-9 columns") do
       datestamp = @builder.object.public_send(attribute_name)
       value = datestamp.present? ? I18n.l(datestamp, format: :time) : ""
       template.concat @builder.text_field(attribute_name, html_options.merge(value: value))

data/app/inputs/date_picker_input.rb

@@ -4,14 +4,14 @@ class DatePickerInput < SimpleForm::Inputs::StringInput
   # Note that where we use `wrapper: :clockpicker` or `wrapper: horizontal_clockpicker`,
   # #input is not called and we call #prefix_column and #input_column directly.
   def input(_wrapper_options)
-    template.content_tag(:div, class: "row collapse #{class_name}-wrapper") do
+    template.tag.div(class: "row collapse #{class_name}-wrapper") do
       template.concat prefix_column
       template.concat input_column
     end
   end
 
   def prefix_column(_wrapper_options = {})
-    template.content_tag(:div, class: "small-2 columns") do
+    template.tag.div(class: "small-2 columns") do
       template.concat icon_calendar
     end
   end
@@ -20,7 +20,7 @@ class DatePickerInput < SimpleForm::Inputs::StringInput
     html_options = input_html_options
     html_options[:class] ||= []
     html_options[:class] << class_name
-    template.content_tag(:div, class: "small-10 columns") do
+    template.tag.div(class: "small-10 columns") do
       datestamp = @builder.object.public_send(attribute_name)
       value = format_date(datestamp)
       template.concat @builder.text_field(attribute_name, html_options.merge(value: value))