Merge pull request #693 from NatLabRockies/695-et-tz

jtmkrueger · web-flow · commit a0fdddacffa2 · 2026-02-13T11:57:19.000-05:00
use ET timezone consistently in the admin UI
diff --git a/src/api-umbrella/admin-ui/app/components/admins/index-table.js b/src/api-umbrella/admin-ui/app/components/admins/index-table.js
@@ -65,15 +65,15 @@ export default class IndexTable extends Component {
           name: 'Last Signed In',
           title: t('Last Signed In'),
           defaultContent: '-',
-          render: DataTablesHelpers.renderTime,
+          render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),
         },
         {
           data: 'created_at',
           type: 'date',
           name: 'Created',
           title: t('Created'),
           defaultContent: '-',
-          render: DataTablesHelpers.renderTime,
+          render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),
         },
       ],
     });
diff --git a/src/api-umbrella/admin-ui/app/components/api-users/index-table.js b/src/api-umbrella/admin-ui/app/components/api-users/index-table.js
@@ -58,7 +58,7 @@ export default class IndexTable extends Component {
           type: 'date',
           title: 'Created',
           defaultContent: '-',
-          render: DataTablesHelpers.renderTime,
+          render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),
         },
         {
           data: 'registration_source',
diff --git a/src/api-umbrella/admin-ui/app/components/stats/logs/results-table.js b/src/api-umbrella/admin-ui/app/components/stats/logs/results-table.js
@@ -1,6 +1,7 @@
 // eslint-disable-next-line ember/no-classic-components
 import Component from '@ember/component';
 import { action, computed } from '@ember/object';
+import { inject } from '@ember/service';
 import { observes } from '@ember-decorators/object';
 import Logs from 'api-umbrella-admin-ui/models/stats/logs';
 import DataTablesHelpers from 'api-umbrella-admin-ui/utils/data-tables-helpers';
@@ -22,6 +23,9 @@ marked.use({
 export default class ResultsTable extends Component {
   tagName = '';
 
+  @inject('session')
+  session;
+
   @action
   didInsert(element) {
     this.table = $(element).find('table').DataTable({
@@ -58,7 +62,7 @@ export default class ResultsTable extends Component {
           type: 'date',
           title: 'Time',
           defaultContent: '-',
-          render: DataTablesHelpers.renderTime,
+          render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),
         },
         {
           data: 'request_method',
diff --git a/src/api-umbrella/admin-ui/app/components/stats/users/results-table.js b/src/api-umbrella/admin-ui/app/components/stats/users/results-table.js
@@ -1,6 +1,7 @@
 // eslint-disable-next-line ember/no-classic-components
 import Component from '@ember/component';
 import { action, computed } from '@ember/object';
+import { inject } from '@ember/service';
 import { observes } from '@ember-decorators/object';
 import DataTablesHelpers from 'api-umbrella-admin-ui/utils/data-tables-helpers';
 import classic from 'ember-classic-decorator';
@@ -14,6 +15,9 @@ import numeral from 'numeral';
 export default class ResultsTable extends Component {
   tagName = '';
 
+  @inject('session')
+  session;
+
   @action
   didInsert(element) {
     this.table = $(element).find('table').DataTable({
@@ -60,7 +64,7 @@ export default class ResultsTable extends Component {
           type: 'date',
           title: 'Signed Up',
           defaultContent: '-',
-          render: DataTablesHelpers.renderTime,
+          render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),
         },
         {
           data: 'hits',
@@ -79,7 +83,7 @@ export default class ResultsTable extends Component {
           type: 'date',
           title: 'Last Request',
           defaultContent: '-',
-          render: DataTablesHelpers.renderTime,
+          render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),
         },
         {
           data: 'use_description',
diff --git a/src/api-umbrella/admin-ui/app/helpers/format-date.js b/src/api-umbrella/admin-ui/app/helpers/format-date.js
@@ -1,20 +1,23 @@
-import { helper } from '@ember/component/helper';
+import Helper from '@ember/component/helper';
+import { inject } from '@ember/service';
 import isString from 'lodash-es/isString';
 import moment from 'moment-timezone';
 
-export function formatDate(params) {
-  let date = params[0];
-  let format = params[1];
+export default class FormatDate extends Helper {
+  @inject session;
 
-  if(!format || !isString(format)) {
-    format = 'YYYY-MM-DD HH:mm Z';
-  }
+  compute(positional) {
+    let date = positional[0];
+    let format = positional[1];
+
+    if(!format || !isString(format)) {
+      format = 'YYYY-MM-DD LT z';
+    }
 
-  if(date) {
-    return moment(date).format(format);
-  } else {
-    return '';
+    if(date) {
+      return moment(date).tz(this.session.data.authenticated.analytics_timezone).format(format);
+    } else {
+      return '';
+    }
   }
 }
-
-export default helper(formatDate);
diff --git a/src/api-umbrella/admin-ui/app/utils/data-tables-helpers.js b/src/api-umbrella/admin-ui/app/utils/data-tables-helpers.js
@@ -81,11 +81,13 @@ export default {
     }
   },
 
-  renderTime(value, type) {
-    if(type === 'display' && value && value !== '-') {
-      return moment(value).format('YYYY-MM-DD HH:mm:ss');
-    }
+  renderTime(timezone) {
+    return function(value, type) {
+      if(type === 'display' && value && value !== '-') {
+        return moment(value).tz(timezone).format('YYYY-MM-DD LTS z');
+      }
 
-    return value;
+      return value;
+    }
   },
 };
diff --git a/src/api-umbrella/utils/time.lua b/src/api-umbrella/utils/time.lua
@@ -7,7 +7,6 @@ local null = ngx.null
 local date = icu_date.new()
 local format_iso8601 = icu_date.formats.pattern("yyyy-MM-dd'T'HH:mm:ssZZZZZ")
 local format_iso8601_ms = icu_date.formats.pattern("yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ")
-local format_csv = icu_date.formats.pattern("yyyy-MM-dd HH:mm:ss")
 local format_postgres = icu_date.formats.pattern("yyyy-MM-dd HH:mm:ss.SSSSxxx")
 local format_postgres_no_millis = icu_date.formats.pattern("yyyy-MM-dd HH:mm:ssxxx")
 
@@ -80,7 +79,7 @@ function _M.timestamp_ms_to_csv(timestamp)
   end
 
   date:set_millis(timestamp)
-  return date:format(format_csv)
+  return date:format(format_iso8601_ms)
 end
 
 function _M.iso8601_to_timestamp(string)
@@ -116,7 +115,7 @@ function _M.iso8601_to_csv(string)
   end
 
   date:parse(format_iso8601, string)
-  return date:format(format_csv)
+  return date:format(format_iso8601)
 end
 
 function _M.iso8601_ms_to_csv(string)
@@ -125,7 +124,7 @@ function _M.iso8601_ms_to_csv(string)
   end
 
   date:parse(format_iso8601_ms, string)
-  return date:format(format_csv)
+  return date:format(format_iso8601_ms)
 end
 
 function _M.opensearch_to_csv(value)
diff --git a/test/admin_ui/test_api_users.rb b/test/admin_ui/test_api_users.rb
@@ -68,4 +68,16 @@ def test_form
     assert_field("Restrict Access to HTTP Referers", :with => "*.example.com/*\n*//example2.com/*")
     assert_select("Account Enabled", :selected => "Disabled")
   end
+
+  def test_metadata_timezone_display
+    user = FactoryBot.create(:api_user, {
+      :created_at => Time.parse("2015-01-16T06:06:28.816Z").utc,
+      :updated_at => Time.parse("2015-07-16T06:09:33.273Z").utc,
+    })
+    admin_login
+    visit "/admin/#/api_users/#{user.id}/edit"
+
+    assert_text("Created: 2015-01-15 11:06 PM MST by ")
+    assert_text("Last Updated: 2015-07-16 12:09 AM MDT by ")
+  end
 end
diff --git a/test/admin_ui/test_stats_logs.rb b/test/admin_ui/test_stats_logs.rb
@@ -305,4 +305,34 @@ def test_filter_options
       "is not null",
     ]
   end
+
+  def test_table_displays_time_in_local_timezone
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-01-16T06:06:28.816Z").utc, :request_method => "OPTIONS")
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-01-16T08:23:31.273Z").utc, :request_method => "OPTIONS")
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-01-16T19:02:43.902Z").utc, :request_method => "OPTIONS")
+    LogItem.refresh_indices!
+
+    admin_login
+    visit "/admin/#/stats/logs?search=&start_at=2015-01-12&end_at=2015-01-18&interval=day"
+    refute_selector(".busy-blocker")
+
+    assert_equal("2015-01-16 12:02:43 PM MST", find("#results_table table tbody tr:nth-child(1) td:first-child").text)
+    assert_equal("2015-01-16 1:23:31 AM MST", find("#results_table table tbody tr:nth-child(2) td:first-child").text)
+    assert_equal("2015-01-15 11:06:28 PM MST", find("#results_table table tbody tr:nth-child(3) td:first-child").text)
+  end
+
+  def test_table_displays_time_in_local_timezone_during_dst
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-07-16T06:06:28.816Z").utc, :request_method => "OPTIONS")
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-07-16T08:23:31.273Z").utc, :request_method => "OPTIONS")
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-07-16T19:02:43.902Z").utc, :request_method => "OPTIONS")
+    LogItem.refresh_indices!
+
+    admin_login
+    visit "/admin/#/stats/logs?search=&start_at=2015-07-12&end_at=2015-07-18&interval=day"
+    refute_selector(".busy-blocker")
+
+    assert_equal("2015-07-16 1:02:43 PM MDT", find("#results_table table tbody tr:nth-child(1) td:first-child").text)
+    assert_equal("2015-07-16 2:23:31 AM MDT", find("#results_table table tbody tr:nth-child(2) td:first-child").text)
+    assert_equal("2015-07-16 12:06:28 AM MDT", find("#results_table table tbody tr:nth-child(3) td:first-child").text)
+  end
 end
diff --git a/test/apis/admin/stats/test_logs.rb b/test/apis/admin/stats/test_logs.rb
@@ -226,4 +226,26 @@ def test_no_results_non_existent_indices
       "recordsTotal" => 0,
     }, data)
   end
+
+  def test_csv_timestamps_in_iso8601_utc_format
+    FactoryBot.create(:log_item, :request_at => Time.parse("2015-01-16T06:06:28.816Z").utc, :request_user_agent => unique_test_id)
+    LogItem.refresh_indices!
+
+    response = Typhoeus.get("https://127.0.0.1:9081/admin/stats/logs.csv", http_options.deep_merge(admin_session).deep_merge({
+      :params => {
+        "start_at" => "2015-01-13",
+        "end_at" => "2015-01-18",
+        "interval" => "day",
+        "start" => "0",
+        "length" => "10",
+      },
+    }))
+
+    assert_response_code(200, response)
+
+    csv = CSV.parse(response.body)
+    assert_equal(2, csv.length)
+    assert_equal("Time", csv[0][0])
+    assert_equal("2015-01-16T06:06:28.816Z", csv[1][0])
+  end
 end
diff --git a/test/apis/admin/stats/test_users.rb b/test/apis/admin/stats/test_users.rb
@@ -96,9 +96,9 @@ def test_csv_download
       @user1.last_name,
       @user1.website,
       @user1.registration_source,
-      @user1.created_at.utc.strftime("%Y-%m-%d %H:%M:%S"),
+      @user1.created_at.utc.iso8601,
       "2",
-      "2015-01-16 00:00:00",
+      "2015-01-16T00:00:00Z",
       @user1.use_description,
     ], csv[1])
     assert_equal([
@@ -107,9 +107,9 @@ def test_csv_download
       @user2.last_name,
       @user2.website,
       @user2.registration_source,
-      @user2.created_at.utc.strftime("%Y-%m-%d %H:%M:%S"),
+      @user2.created_at.utc.iso8601,
       "1",
-      "2015-01-17 00:00:00",
+      "2015-01-17T00:00:00Z",
       @user2.use_description,
     ], csv[2])
   end

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export default class IndexTable extends Component {`
`58`	`58`	`type: 'date',`
`59`	`59`	`title: 'Created',`
`60`	`60`	`defaultContent: '-',`
`61`		`- render: DataTablesHelpers.renderTime,`
	`61`	`+ render: DataTablesHelpers.renderTime(this.session.data.authenticated.analytics_timezone),`
`62`	`62`	`},`
`63`	`63`	`{`
`64`	`64`	`data: 'registration_source',`