Review changes

Author: danieljames-dj

app/controllers/admin_controller.rb

@@ -36,6 +36,24 @@ def check_competition_results
     @competition = competition_from_params
   end
 
+  def clear_results_submission
+    # Just clear the "results_submitted_at" field to let the Delegate submit
+    # the results again. We don't actually want to clear InboxResult and InboxPerson.
+    @competition = competition_from_params
+
+    if @competition.results_submitted? && !@competition.results_posted?
+      ActiveRecord::Base.transaction do
+        @competition.update!(results_submitted_at: nil)
+        @competition.tickets_competition_result.update!(status: TicketsCompetitionResult.statuses[:aborted])
+      end
+      render status: :ok, json: { success: true }
+    else
+      render status: :unprocessable_entity, json: {
+        error: "Could not clear the results submission. Maybe results are already posted, or there is no submission.",
+      }
+    end
+  end
+
   # The order of this array has to follow the steps in which results have to be imported.
   RESULTS_POSTING_STEPS = %i[inbox_result inbox_person].freeze
 

app/webpacker/components/Tickets/TicketWorkbenches/CompetitionResultActionerView/MiscActions/AbortProcess.jsx

@@ -1,18 +1,48 @@
 import React, { useState } from 'react';
 import { Button, Confirm, Popup } from 'semantic-ui-react';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { ticketsCompetitionResultStatuses } from '../../../../../lib/wca-data.js.erb';
+import clearResultsSubmission from '../../../api/competitionResult/clearResultsSubmission';
+import Loading from '../../../../Requests/Loading';
+import Errored from '../../../../Requests/Errored';
 
-export default function AbortProcess({ ticketDetails, updateStatus }) {
-  const { ticket: { metadata: { status } } } = ticketDetails;
+export default function AbortProcess({ ticketDetails }) {
+  const { ticket: { id, metadata: { status, competition_id: competitionId } } } = ticketDetails;
   const [confirmAbort, setConfirmAbort] = useState();
 
+  const queryClient = useQueryClient();
+  const {
+    mutate: clearResultsSubmissionMutate,
+    isPending,
+    isError,
+    error,
+  } = useMutation({
+    mutationFn: clearResultsSubmission,
+    onSuccess: () => queryClient.setQueryData(
+      ['ticket-details', id],
+      (oldTicketDetails) => ({
+        ...oldTicketDetails,
+        ticket: {
+          ...oldTicketDetails.ticket,
+          metadata: {
+            ...oldTicketDetails.ticket.metadata,
+            status: ticketsCompetitionResultStatuses.aborted,
+          },
+        },
+      }),
+    ),
+  });
+
   // Result Process can be aborted before the inbox results are merged.
   const canAbort = [
     ticketsCompetitionResultStatuses.submitted,
     ticketsCompetitionResultStatuses.locked_for_posting,
     ticketsCompetitionResultStatuses.warnings_verified,
   ].includes(status);
 
+  if (isPending) return <Loading />;
+  if (isError) return <Errored error={error} />;
+
   return (
     <>
       <Popup
@@ -32,7 +62,10 @@ export default function AbortProcess({ ticketDetails, updateStatus }) {
       <Confirm
         open={confirmAbort}
         onCancel={() => setConfirmAbort(false)}
-        onConfirm={() => updateStatus(ticketsCompetitionResultStatuses.aborted)}
+        onConfirm={() => {
+          setConfirmAbort(false);
+          clearResultsSubmissionMutate({ competitionId });
+        }}
         content="Are you sure you want to abort the process and allow Delegates to resubmit results?"
       />
     </>

app/webpacker/components/Tickets/api/competitionResult/clearResultsSubmission.js

@@ -0,0 +1,10 @@
+import { fetchJsonOrError } from '../../../../lib/requests/fetchWithAuthenticityToken';
+import { clearResultsSubmissionUrl } from '../../../../lib/requests/routes.js.erb';
+
+export default async function clearResultsSubmission({ competitionId }) {
+  const { data } = await fetchJsonOrError(
+    clearResultsSubmissionUrl(competitionId),
+    { method: 'POST' },
+  );
+  return data;
+}

app/webpacker/lib/requests/routes.js.erb

@@ -152,6 +152,8 @@ export const adminPostingCompetitionsUrl = `<%= CGI.unescape(Rails.application.r
 
 export const adminStartPostingUrl = `<%= CGI.unescape(Rails.application.routes.url_helpers.start_posting_path) %>`;
 
+export const clearResultsSubmissionUrl = (competitionId) => `<%= CGI.unescape(Rails.application.routes.url_helpers.competition_clear_results_submission_path("${competitionId}")) %>`;
+
 export const adminImportResultsUrl = (competitionId) => `<%= CGI.unescape(Rails.application.routes.url_helpers.competition_admin_import_results_path("${competitionId}")) %>`;
 
 export const adminCheckUploadedResults = (competitionId) => `<%= CGI.unescape(Rails.application.routes.url_helpers.competition_admin_upload_results_edit_path("${competitionId}"))%>`;

config/routes.rb

@@ -125,6 +125,7 @@
     # WRT views and action
     get '/admin/upload-results' => "admin#new_results", as: :admin_upload_results_edit
     get '/admin/check-existing-results' => "admin#check_competition_results", as: :admin_check_existing_results
+    post '/admin/clear-submission' => "admin#clear_results_submission", as: :clear_results_submission
     get '/admin/import-results' => 'admin#import_results', as: :admin_import_results
     get '/admin/result-inbox-steps' => 'admin#result_inbox_steps', as: :admin_result_inbox_steps
     post '/admin/import-inbox-results' => 'admin#import_inbox_results', as: :admin_import_inbox_results