Fix dates in competitions admin view

thewca · Jan 22, 2025 · 55eefa9 · 55eefa9
1 parent 92de2b5
commit 55eefa9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/app/controllers/api/v0/competitions_controller.rb b/app/controllers/api/v0/competitions_controller.rb
@@ -29,7 +29,8 @@ def competition_index
     serial_includes = {}
 
     serial_includes["delegates"] = { only: ["id", "name"], methods: [], include: ["avatar"] } if admin_mode
-    serial_methods |= ["announced_at", "results_submitted_at", "report_posted_at"] if admin_mode
+    serial_includes["delegate_report"] = { only: ["posted_by_user_id"] } if admin_mode
+    serial_methods |= ["announced_at", "results_submitted_at", "results_posted_at", "report_posted_at"] if admin_mode
 
     paginate json: competitions,
              only: ["id", "name", "start_date", "end_date", "registration_open", "registration_close", "venue"],

diff --git a/app/webpacker/components/CompetitionsOverview/ListViewSection.js b/app/webpacker/components/CompetitionsOverview/ListViewSection.js
@@ -15,8 +15,8 @@ import {
   isProbablyOver,
   PseudoLinkMarkdown,
   reportAdminCellContent,
+  resultsSubmittedAtAdminCellContent,
   startYear,
-  timeDifferenceAfter,
   timeDifferenceBefore,
 } from '../../lib/utils/competition-table';
 import { countries } from '../../lib/wca-data.js.erb';
@@ -389,11 +389,7 @@ function AdminCompetitionsTable({
                   warning={resultsPostedStatus === 'warning'}
                   error={resultsPostedStatus === 'danger'}
                 >
-                  {
-                    comp.results_posted_at
-                      ? timeDifferenceAfter(comp, comp.results_posted_at)
-                      : (isProbablyOver(comp) && I18n.t('competitions.competition_info.pending'))
-                  }
+                  {resultsSubmittedAtAdminCellContent(comp)}
                 </Table.Cell>
                 <Table.Cell collapsing>
                   <Button

diff --git a/app/webpacker/lib/utils/competition-table.js b/app/webpacker/lib/utils/competition-table.js
@@ -106,7 +106,7 @@ export function reportAdminCellContent(comp) {
   if (comp.report_posted_at) {
     const delegateIds = comp.delegates.map((delegate) => delegate.id);
 
-    return delegateIds.includes(comp.report_posted_by_user)
+    return delegateIds.includes(comp.delegate_report.posted_by_user_id)
       ? timeDifferenceAfter(comp, comp.report_posted_at)
       : I18n.t('competitions.competition_info.submitted_by_other');
   }
@@ -118,6 +118,17 @@ export function reportAdminCellContent(comp) {
   return null;
 }
 
+export function resultsSubmittedAtAdminCellContent(comp) {
+  if (comp.results_posted_at) {
+    const date = comp.results_submitted_at ? comp.results_submitted_at : comp.results_posted_at;
+    return timeDifferenceAfter(comp, date);
+  }
+  if ((isProbablyOver(comp))) {
+    I18n.t('competitions.competition_info.pending');
+  }
+  return null;
+}
+
 function lookupStatus(numOfDays, statusMap, compareFn, defaultStatus = null) {
   if (!Number.isInteger(numOfDays)) {
     return defaultStatus;