Fix dates in competitions admin view (#10682)

* Fix dates in competitions admin view

* Slim down report serialization to base model

---------

Co-authored-by: Gregor Billing <[email protected]>

Author: maxidragon

app/controllers/api/v0/competitions_controller.rb

@@ -29,7 +29,7 @@ def competition_index
     serial_includes = {}
 
     serial_includes["delegates"] = { only: ["id", "name"], methods: [], include: ["avatar"] } if admin_mode
-    serial_methods |= ["results_submitted_at", "report_posted_at"] if admin_mode
+    serial_methods |= ["results_submitted_at", "results_posted_at", "report_posted_at", "report_posted_by_user"] if admin_mode
 
     paginate json: competitions,
              only: ["id", "name", "start_date", "end_date", "registration_open", "registration_close", "venue"],

app/models/competition.rb

@@ -838,6 +838,10 @@ def report_posted_at
     delegate_report&.posted_at
   end
 
+  def report_posted_by_user
+    delegate_report&.posted_by_user_id
+  end
+
   # This callback updates all tables having the competition id, when the id changes.
   # This should be deleted after competition id is made immutable: https://github.com/thewca/worldcubeassociation.org/pull/381
   after_save :update_foreign_keys, if: :saved_change_to_id?

app/webpacker/components/CompetitionsOverview/ListViewSection.js

@@ -16,8 +16,8 @@ import {
   isProbablyOver,
   PseudoLinkMarkdown,
   reportAdminCellContent,
+  resultsSubmittedAtAdminCellContent,
   startYear,
-  timeDifferenceAfter,
   timeDifferenceBefore,
 } from '../../lib/utils/competition-table';
 import { countries } from '../../lib/wca-data.js.erb';
@@ -390,11 +390,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

app/webpacker/lib/utils/competition-table.js

@@ -118,6 +118,19 @@ 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)) {
+    return I18n.t('competitions.competition_info.pending');
+  }
+
+  return null;
+}
+
 function lookupStatus(numOfDays, statusMap, compareFn, defaultStatus = null) {
   if (!Number.isInteger(numOfDays)) {
     return defaultStatus;