Move abort results to ticket

Author: danieljames-dj

app/controllers/admin_controller.rb

@@ -36,20 +36,6 @@ 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?
-      @competition.update(results_submitted_at: nil)
-      flash[:success] = "Results submission cleared."
-    else
-      flash[:danger] = "Could not clear the results submission. Maybe results are already posted, or there is no submission."
-    end
-    redirect_to competition_admin_upload_results_edit_path
-  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/controllers/results_submission_controller.rb

@@ -172,13 +172,24 @@ def create
 
     return render status: :unprocessable_entity, json: { error: "Submitted results contain errors." } if results_validator.any_errors?
 
-    return render status: :unprocessable_entity, json: { error: "There is already a ticket associated, please contact WRT to update this." } if competition.result_ticket.present?
+    if competition.tickets_competition_result.present? && !competition.tickets_competition_result.aborted?
+      return render status: :unprocessable_entity, json: {
+        error: "Cannot submit results for this competition as the results ticket is not aborted.",
+      }
+    end
 
     CompetitionsMailer.results_submitted(competition, results_validator, message, current_user).deliver_now
 
     ActiveRecord::Base.transaction do
       competition.touch(:results_submitted_at)
-      TicketsCompetitionResult.create_ticket!(competition, message, current_user)
+      if competition.tickets_competition_result.present?
+        competition.tickets_competition_result.update!(
+          status: TicketsCompetitionResult.statuses[:submitted],
+          delegate_message: message,
+        )
+      else
+        TicketsCompetitionResult.create_ticket!(competition, message, current_user)
+      end
     end
 
     render status: :ok, json: { success: true }

app/models/tickets_competition_result.rb

@@ -5,6 +5,7 @@ class TicketsCompetitionResult < ApplicationRecord
 
   enum :status, {
     submitted: "submitted",
+    aborted: "aborted",
     locked_for_posting: "locked_for_posting",
     warnings_verified: "warnings_verified",
     merged_inbox_results: "merged_inbox_results",

app/views/admin/new_results.html.erb

@@ -1,15 +1,6 @@
 <% provide(:title, "Upload results") %>
 <%= render layout: 'competitions/nav' do %>
   <h1><%= yield(:title) %></h1>
-  <% if @competition.results_submitted? && !@competition.results_posted? %>
-    <%= alert :info, note: true do %>
-      It looks like the results have been submitted by the Delegate but not posted yet.
-      If you want to let the Delegate submit the results again you can
-      <%= link_to("clear the results submission",
-                  competition_clear_results_submission_path(@competition),
-                  method: :post, class: "btn btn-primary") %>
-    <% end %>
-  <% end %>
   <p>
     Import the results JSON for this competition.
     The server will check for any error compared to the declared rounds, cutoffs, and time limits.

app/views/results_submission/new.html.erb

@@ -8,5 +8,6 @@
     resultsSubmitted: @competition.results_submitted?,
     hasTemporaryResults: @competition.inbox_results.present?,
     canSubmitResults: @current_user.can_submit_competition_results?(@competition),
+    resultProcessAborted: @competition.tickets_competition_result&.aborted?,
   }) %>
 <% end %>

app/webpacker/components/CompetitionResultSubmission/index.jsx

@@ -23,14 +23,16 @@ export default function Wrapper(
 
 function CompetitionResultSubmission(
   {
-    competitionId, resultsSubmitted, hasTemporaryResults, canSubmitResults,
+    competitionId, resultsSubmitted, hasTemporaryResults, canSubmitResults, resultProcessAborted,
   },
 ) {
-  if (resultsSubmitted) {
-    <Message positive>
-      The results have already been submitted. If you have any more questions or
-      comments please reply to the email sent with the first results submission.
-    </Message>;
+  if (resultsSubmitted && !resultProcessAborted) {
+    return (
+      <Message positive>
+        The results have already been submitted. If you have any more questions or
+        comments please reply to the email sent with the first results submission.
+      </Message>
+    );
   }
 
   return (

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import { Header, List, Segment } from 'semantic-ui-react';
+import AbortProcess from './MiscActions/AbortProcess';
+
+export default function MiscActions({ ticketDetails, updateStatus }) {
+  return (
+    <Segment>
+      <Header>Misc Actions</Header>
+      <List>
+        <List.Item>
+          <AbortProcess
+            ticketDetails={ticketDetails}
+            updateStatus={updateStatus}
+          />
+        </List.Item>
+      </List>
+    </Segment>
+  );
+}

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

@@ -0,0 +1,40 @@
+import React, { useState } from 'react';
+import { Button, Confirm, Popup } from 'semantic-ui-react';
+import { ticketsCompetitionResultStatuses } from '../../../../../lib/wca-data.js.erb';
+
+export default function AbortProcess({ ticketDetails, updateStatus }) {
+  const { ticket: { metadata: { status } } } = ticketDetails;
+  const [confirmAbort, setConfirmAbort] = useState();
+
+  // Result Process can be aborted before the inbox results are merged.
+  const canAbort = [
+    ticketsCompetitionResultStatuses.submitted,
+    ticketsCompetitionResultStatuses.locked_for_posting,
+    ticketsCompetitionResultStatuses.warnings_verified,
+  ].includes(status);
+
+  return (
+    <>
+      <Popup
+        trigger={(
+          <div>
+            {/* Button wrapped in a div because disabled button does not fire mouse events */}
+            <Button
+              disabled={!canAbort}
+              onClick={() => setConfirmAbort(true)}
+            >
+              Abort Process
+            </Button>
+          </div>
+      )}
+        content={canAbort ? 'Allow Delegate to resubmit results.' : 'Cannot abort at this stage.'}
+      />
+      <Confirm
+        open={confirmAbort}
+        onCancel={() => setConfirmAbort(false)}
+        onConfirm={() => updateStatus(ticketsCompetitionResultStatuses.aborted)}
+        content="Are you sure you want to abort the process and allow Delegates to resubmit results?"
+      />
+    </>
+  );
+}

app/webpacker/components/Tickets/TicketWorkbenches/CompetitionResultActionerView/index.jsx

@@ -5,6 +5,7 @@ import TimelineView from './TimelineView';
 import MergeInboxResults from './MergeInboxResults';
 import CreateWcaIds from './CreateWcaIds';
 import FinalSteps from './FinalSteps';
+import MiscActions from './MiscActions';
 
 export default function CompetitionResultActionerView({ ticketDetails, updateStatus }) {
   const { ticket: { metadata: { status } } } = ticketDetails;
@@ -17,6 +18,10 @@ export default function CompetitionResultActionerView({ ticketDetails, updateSta
         ticketDetails={ticketDetails}
         updateStatus={updateStatus}
       />
+      <MiscActions
+        ticketDetails={ticketDetails}
+        updateStatus={updateStatus}
+      />
     </>
   );
 }

config/routes.rb

@@ -125,7 +125,6 @@
     # 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