Fix warning message to show remaining time in minutes

Author: nomadicoder

app/javascript/controllers/session_timeout_controller.js

@@ -88,8 +88,9 @@ export default class extends Controller {
   showWarning() {
     if (!this.flashElement || this.warningVisible) return;
 
-    const messageTemplate = this.valueOrDefault("warningMessage", "Your session will expire in %{seconds} seconds.");
-    const messageText = messageTemplate.replace("%{seconds}", this.warningOffsetValue);
+    const remainingMinutes = this.minutesFromSeconds(this.warningOffsetValue);
+    const messageTemplate = this.valueOrDefault("warningMessage", "Your session will expire in %{minutes} minutes.");
+    const messageText = messageTemplate.replace("%{minutes}", remainingMinutes);
     const staySignedInLabel = this.valueOrDefault("staySignedInLabel", "Stay signed in");
 
     const alert = document.createElement("div");
@@ -184,6 +185,11 @@ export default class extends Controller {
     alert.remove();
   }
 
+  minutesFromSeconds(seconds) {
+    const minutes = Math.ceil(seconds / 60);
+    return Math.max(minutes, 1);
+  }
+
   valueOrDefault(name, fallback = "") {
     const hasKey = this[`has${this.capitalize(name)}Value`];
     if (hasKey) {

config/locales/en.yml

@@ -32,7 +32,7 @@ en:
     messages:
       user_not_registered: "User Not registered. Please contact a server administrator for a user account"
   session_timeout:
-    warning_message: "Your session will expire in %{seconds} seconds."
+    warning_message: "Your session will expire in %{minutes} minutes."
     stay_signed_in: "Stay signed in"
     error_message: "We couldn't extend your session. Please save your work and sign in again."
     expired_message: "Your session has expired. Please sign in again to continue."

spec/system/session_timeout_spec.rb

@@ -36,7 +36,7 @@
 
     expect(page).to have_css(
       ".alert-warning",
-      text: I18n.t("session_timeout.warning_message", seconds: warning_offset_seconds)
+      text: expected_warning_message(warning_offset_seconds)
     )
   end
 
@@ -148,6 +148,14 @@
     end
   end
 
+  def expected_warning_message(seconds)
+    I18n.t("session_timeout.warning_message", minutes: minutes_from_seconds(seconds))
+  end
+
+  def minutes_from_seconds(seconds)
+    [(seconds / 60.0).ceil, 1].max
+  end
+
   def wait_for_session_timeout_controller
     page.find("#flash-messages", visible: :all)