renalware-core 2.0.148 → 2.0.149

data/config/routes/system.rb

@@ -25,7 +25,8 @@ devise_for :users,
 
 # An ajax-polled route which will cause the users browser to redirect to the login page
 #  when their session expires
-get "/session_timed_out" => "session_timeout#has_user_timed_out", as: "session_timed_out"
+get "/check_session_expired" => "session_timeout#check_session_expired", as: "check_session_expired"
+get "/keep_session_alive" => "session_timeout#keep_session_alive", as: "keep_session_alive"
 
 super_admin_constraint = lambda do |request|
   current_user = request.env["warden"].user || Renalware::NullUser.new

data/db/migrate/20200408131217_associate_batch_with_ukrdc_transmission_log.rb

@@ -0,0 +1,15 @@
+class AssociateBatchWithUKRDCTransmissionLog < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      rename_table :ukrdc_batch_numbers, :ukrdc_batches
+      change_column_null :ukrdc_transmission_logs, :request_uuid, true
+      add_reference(
+        :ukrdc_transmission_logs,
+        :batch,
+        foreign_key: { to_table: :ukrdc_batches },
+        index: true,
+        null: true
+      )
+    end
+  end
+end

data/db/seeds/seeds_helper.rb

@@ -2,8 +2,14 @@
 
 module SeedsHelper
   def without_papertrail_versioning_for(klasses)
-    Array(klasses).each { |klass| klass.paper_trail.disable }
+    Array(klasses).each do |klass|
+      klass.paper_trail.disable if klass.paper_trail.respond_to?(:disable)
+    end
+
     yield
-    Array(klasses).each { |klass| klass.paper_trail.enable }
+
+    Array(klasses).each do |klass|
+      klass.paper_trail.enable if klass.paper_trail.respond_to?(:enable)
+    end
   end
 end

data/lib/renalware/configuration.rb

@@ -14,6 +14,7 @@
 # To access configuration settings use e.g.
 #   Renalware.config.x
 #
+# rubocop:disable Metrics/ClassLength
 module Renalware
   class Configuration
     include ActiveSupport::Configurable
@@ -35,6 +36,10 @@ module Renalware
     config_accessor(:page_title_spearator) { " : " }
     config_accessor(:patient_hospital_identifiers) { {} }
     config_accessor(:session_timeout_polling_frequency) { 1.minute }
+    config_accessor(:session_register_user_user_activity_after) { 2.minutes }
+    config_accessor(:session_expiry_use_previous_mechansim) {
+      ENV["SESSION_EXPIRY_USE_PREVIOUS_MECHANSIM"] == "true"
+    }
     config_accessor(:duration_of_last_url_memory_after_session_expiry) { 30.minutes }
     config_accessor(:broadcast_subscription_map) { {} }
     config_accessor(:include_sunday_on_hd_diaries) { false }
@@ -154,3 +159,4 @@ module Renalware
     yield config
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/renalware/engine.rb

@@ -110,7 +110,8 @@ module Renalware
         # need to see them. 100 users with an active session polling every minute will add
         # up to fair number of log entries.
         app.config.lograge.ignore_actions = [
-          "Renalware::SessionTimeoutController#has_user_timed_out"
+          "Renalware::SessionTimeoutController#check_session_expired",
+          "Renalware::SessionTimeoutController#keep_session_alive"
         ]
       end
     end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.148"
+  VERSION = "2.0.149"
 end

data/spec/support/shared_examples/supersedable_examples.rb

@@ -5,10 +5,10 @@ shared_examples_for "a Supersedable model" do
   it { is_expected.to have_db_index(:deactivated_at) }
 
   it "adds a deactivated_at where clause" do
-    expect(described_class.all.where_sql).to include(".\"deactivated_at\" IS NULL")
+    expect(described_class.all.to_sql).to include(".\"deactivated_at\" IS NULL")
   end
 
   it "skips adding the deactivated_at where clause when unscoped" do
-    expect(described_class.unscoped.where_sql.to_s).not_to include("\"deactivated_at\"")
+    expect(described_class.unscoped.to_sql.to_s).not_to include("\"deactivated_at\"")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.148
+  version: 2.0.149
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -378,16 +378,22 @@ dependencies:
   name: groupdate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -742,16 +748,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -1495,6 +1507,7 @@ files:
 - app/javascript/renalware/controllers/letters/form_controller.js
 - app/javascript/renalware/controllers/medications/home_delivery_modal_controller.js
 - app/javascript/renalware/controllers/medications/prescriptions_controller.js
+- app/javascript/renalware/controllers/session_controller.js
 - app/javascript/renalware/controllers/snippets_controller.js
 - app/javascript/renalware/controllers/toggle_controller.js
 - app/javascript/renalware/index.js
@@ -2051,7 +2064,7 @@ files:
 - app/models/renalware/transplants/rejection_treatment.rb
 - app/models/renalware/transplants/version.rb
 - app/models/renalware/ukrdc.rb
-- app/models/renalware/ukrdc/batch_number.rb
+- app/models/renalware/ukrdc/batch.rb
 - app/models/renalware/ukrdc/create_encrypted_patient_xml_files.rb
 - app/models/renalware/ukrdc/create_patient_xml_file.rb
 - app/models/renalware/ukrdc/export_summary.rb
@@ -2305,6 +2318,7 @@ files:
 - app/presenters/renalware/ukrdc/pathology_observation_request_presenter.rb
 - app/presenters/renalware/ukrdc/patient_presenter.rb
 - app/presenters/renalware/ukrdc/transplant_operation_presenter.rb
+- app/presenters/renalware/user_session_presenter.rb
 - app/presenters/renalware/virology/dashboard_presenter.rb
 - app/presenters/string_presenter.rb
 - app/presenters/time_presenter.rb
@@ -3901,6 +3915,7 @@ files:
 - db/migrate/20200318134807_create_letter_mailshots.rb
 - db/migrate/20200320103052_add_status_to_letter_mailshot_mailshots.rb
 - db/migrate/20200401115705_add_label_abbrv_to_survey_questions.rb
+- db/migrate/20200408131217_associate_batch_with_ukrdc_transmission_log.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb