Added POLL_DELAY environment variable to UserConfiguration class

OSC · Mar 14, 2024 · 71a2c83 · 71a2c83
1 parent 8a7bf69
commit 71a2c83
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/apps/dashboard/app/models/user_configuration.rb b/apps/dashboard/app/models/user_configuration.rb
@@ -77,7 +77,11 @@ class UserConfiguration
     # Custom pages configuration property
     ConfigurationProperty.property(name: :custom_pages, default_value: {}),
     # Support ticket configuration property
-    ConfigurationProperty.property(name: :support_ticket, default_value: {})
+    ConfigurationProperty.property(name: :support_ticket, default_value: {}),
+
+    # Session cards job information update poll waiting time in milliseconds
+    ConfigurationProperty.property(name: :sessions_poll_delay, default_value: '10000', read_from_env: true,
+                                   env_names: ['POLL_DELAY'])
   ].freeze
 
   def initialize(request_hostname: nil)

diff --git a/apps/dashboard/app/views/batch_connect/sessions/index.html.erb b/apps/dashboard/app/views/batch_connect/sessions/index.html.erb
@@ -34,7 +34,7 @@ locals: {
       %>
     </div>
     <div class="col-md-9">
-      <div id="batch_connect_sessions" class="batch-connect sessions" data-toggle="poll" data-url="<%= batch_connect_sessions_path(format: :js) %>" data-delay="<%= ENV["POLL_DELAY"] || 10000 %>">
+      <div id="batch_connect_sessions" class="batch-connect sessions" data-toggle="poll" data-url="<%= batch_connect_sessions_path(format: :js) %>" data-delay="<%= @user_configuration.sessions_poll_delay %>">
         <% if @sessions.empty? %>
           <div class="ood-appkit markdown">
             <p><%= t('dashboard.batch_connect_no_sessions') %></p>

diff --git a/apps/dashboard/app/views/widgets/_sessions.html.erb b/apps/dashboard/app/views/widgets/_sessions.html.erb
@@ -1,6 +1,6 @@
 <%-
   max_sessions = 3
-  poll_delay = ENV["POLL_DELAY"] || 10000
+  poll_delay = @user_configuration.sessions_poll_delay
   active_sessions = BatchConnect::Session.all.reject { |s| s.completed? }
   session_selection = active_sessions.first(max_sessions)
 -%>

diff --git a/apps/dashboard/test/models/user_configuration_test.rb b/apps/dashboard/test/models/user_configuration_test.rb
@@ -37,6 +37,7 @@ class UserConfigurationTest < ActiveSupport::TestCase
     'OOD_ANNOUNCEMENT_PATH' => [:announcement_path, Pathname.new("/#{SecureRandom.uuid}")],
 
     'SHOW_ALL_APPS_LINK' => [:show_all_apps_link, true],
+    'POLL_DELAY' => [:sessions_poll_delay, '10000'],
   }
 
   def setup()
@@ -79,6 +80,7 @@ def teardown
       interactive_apps_menu: [],
       custom_pages: {},
       support_ticket: {},
+      sessions_poll_delay: '10000',
     }
 
     # ensure all properties are tested