Merge pull request #217 from rails/back-to-relative-times

Go back to relative times and a better locale management

Author: rosa

app/controllers/mission_control/jobs/application_controller.rb

@@ -13,8 +13,19 @@ class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_co
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
 
+  around_action :set_current_locale
+
   private
     def default_url_options
       { server_id: MissionControl::Jobs::Current.server }
     end
+
+    def set_current_locale(&block)
+      @previous_config = I18n.config
+      I18n.config = MissionControl::Jobs::I18nConfig.new
+      I18n.with_locale(:en, &block)
+    ensure
+      I18n.config = @previous_config
+      @previous_config = nil
+    end
 end

app/helpers/mission_control/jobs/dates_helper.rb

@@ -1,5 +1,19 @@
 module MissionControl::Jobs::DatesHelper
-  def formatted_time(time)
-    time.in_time_zone.strftime("%Y-%m-%d %H:%M:%S.%3N %Z")
+  def time_distance_in_words_with_title(time)
+    tag.span time_ago_in_words_with_default_options(time), title: "Since #{time.to_fs(:long)}"
+  end
+
+  def bidirectional_time_distance_in_words_with_title(time)
+    time_distance = if time.past?
+      "#{time_ago_in_words_with_default_options(time)} ago"
+    else
+      "in #{time_ago_in_words_with_default_options(time)}"
+    end
+
+    tag.span time_distance, title: time.to_fs(:long)
+  end
+
+  def time_ago_in_words_with_default_options(time)
+    time_ago_in_words(time, include_seconds: true, locale: :en)
   end
 end

app/helpers/mission_control/jobs/jobs_helper.rb

@@ -29,7 +29,7 @@ def attribute_names_for_job_status(status)
     when "blocked"     then [ "Queue", "Blocked by", "" ]
     when "finished"    then [ "Queue", "Finished" ]
     when "scheduled"   then [ "Queue", "Scheduled", "" ]
-    when "in_progress" then [ "Queue", "Run by", "Running since" ]
+    when "in_progress" then [ "Queue", "Run by", "Running for" ]
     else               []
     end
   end

app/views/mission_control/jobs/jobs/_general_information.html.erb

@@ -23,14 +23,14 @@
   <tr>
     <th>Enqueued</th>
     <td>
-      <%= formatted_time(job.enqueued_at.to_datetime) %>
+      <%= time_distance_in_words_with_title(job.enqueued_at.to_datetime) %> ago
     </td>
   </tr>
   <% if job.scheduled? %>
     <tr>
       <th>Scheduled</th>
       <td>
-        <%= formatted_time(job.scheduled_at) %>
+        <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %>
         <% if job_delayed?(job) %>
           <div class="is-danger tag ml-4">delayed</div>
         <% end %>
@@ -41,15 +41,15 @@
     <tr>
       <th>Failed</th>
       <td>
-        <%= formatted_time(job.failed_at) %>
+        <%= time_distance_in_words_with_title(job.failed_at) %> ago
       </td>
     </tr>
   <% end %>
   <% if job.finished_at.present? %>
     <tr>
       <th>Finished at</th>
       <td>
-        <%= formatted_time(job.finished_at) %>
+        <%= time_distance_in_words_with_title(job.finished_at) %> ago
       </td>
     </tr>
   <% end %>

app/views/mission_control/jobs/jobs/_job.html.erb

@@ -6,7 +6,7 @@
       <div class="is-family-monospace"><%= job_arguments(job) %></div>
     <% end %>
 
-    <div class="has-text-grey is-size-7">Enqueued <%= formatted_time(job.enqueued_at.to_datetime) %></div>
+    <div class="has-text-grey is-size-7">Enqueued <%= time_distance_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
   </td>
 
   <%= render "mission_control/jobs/jobs/#{jobs_status}/job", job: job %>

app/views/mission_control/jobs/jobs/blocked/_job.html.erb

@@ -1,6 +1,6 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div>
-    <div class="has-text-grey is-size-7">Until <%= formatted_time(job.blocked_until) %></div>
+    <div class="has-text-grey is-size-7">Expires <%= bidirectional_time_distance_in_words_with_title(job.blocked_until) %></div>
 </td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>

app/views/mission_control/jobs/jobs/failed/_job.html.erb

@@ -1,6 +1,6 @@
 <td>
   <%= link_to failed_job_error(job), application_job_path(@application, job.job_id, anchor: "error") %>
-  <div class="has-text-grey"><%= formatted_time(job.failed_at) %></div>
+  <div class="has-text-grey"><%= time_distance_in_words_with_title(job.failed_at) %> ago</div>
 </td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/failed/actions", job: job %>

app/views/mission_control/jobs/jobs/finished/_job.html.erb

@@ -1,2 +1,2 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
-<td><div class="has-text-grey"><%= formatted_time(job.finished_at) %></div></td>
+<td><div class="has-text-grey"><%= time_distance_in_words_with_title(job.finished_at) %> ago</div></td>

app/views/mission_control/jobs/jobs/in_progress/_job.html.erb

@@ -6,4 +6,4 @@
     —
   <% end %>
 </td>
-<td><div class="has-text-grey"><%= job.started_at ? formatted_time(job.started_at) : "(Finished)" %></div></td>
+<td><div class="has-text-grey"><%= job.started_at ? time_distance_in_words_with_title(job.started_at) : "(Finished)" %></div></td>

app/views/mission_control/jobs/jobs/scheduled/_job.html.erb

@@ -1,6 +1,6 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td>
-  <%= formatted_time(job.scheduled_at) %>
+  <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %>
   <% if job_delayed?(job) %>
     <div class="is-danger tag ml-4">delayed</div>
   <% end %>