From bdceb1dacf13f49cd1f1bc2b644de4cf3c0646ac Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 1 Oct 2024 05:30:21 -0400
Subject: [PATCH] Add `date_range` view helper (#32187)

---
 app/helpers/admin/dashboard_helper.rb     | 5 +++++
 app/views/admin/dashboard/index.html.haml | 4 +---
 app/views/admin/instances/show.html.haml  | 4 +---
 app/views/admin/tags/show.html.haml       | 4 +---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/helpers/admin/dashboard_helper.rb b/app/helpers/admin/dashboard_helper.rb
index 6096ff138..4de779b79 100644
--- a/app/helpers/admin/dashboard_helper.rb
+++ b/app/helpers/admin/dashboard_helper.rb
@@ -18,6 +18,11 @@ module Admin::DashboardHelper
     end
   end
 
+  def date_range(range)
+    [l(range.first), l(range.last)]
+      .join(' - ')
+  end
+
   def relevant_account_timestamp(account)
     timestamp, exact = if account.user_current_sign_in_at && account.user_current_sign_in_at < 24.hours.ago
                          [account.user_current_sign_in_at, true]
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 27d8f4790..2b4d02fa6 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -2,9 +2,7 @@
   = t('admin.dashboard.title')
 
 - content_for :heading_actions do
-  = l(@time_period.first)
-  = ' - '
-  = l(@time_period.last)
+  = date_range(@time_period)
 
 - unless @system_checks.empty?
   .flash-message-stack
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index dfedbf4cb..812a9c887 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -3,9 +3,7 @@
 
 - if current_user.can?(:view_dashboard)
   - content_for :heading_actions do
-    = l(@time_period.first)
-    = ' - '
-    = l(@time_period.last)
+    = date_range(@time_period)
 
   - if @instance.persisted?
     = render 'dashboard', instance_domain: @instance.domain, period_end_at: @time_period.last, period_start_at: @time_period.first
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index 93387843b..462ca312a 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -4,9 +4,7 @@
 - content_for :heading_actions do
   - if current_user.can?(:view_dashboard)
     .time-period
-      = l(@time_period.first)
-      = ' - '
-      = l(@time_period.last)
+      = date_range(@time_period)
 
   = link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer'