Cloning fixes in new competition form (#8910)

* Add cloning check to frontend to filter out main event * Compute staff and organizer IDs in a more cloning-friendly way * Extra requirements are not required as per WCRP
thewca · Feb 13, 2024 · 90fcc72 · 90fcc72
1 parent 7b99d90
commit 90fcc72
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/WcaOnRails/app/models/competition.rb b/WcaOnRails/app/models/competition.rb
@@ -2135,9 +2135,9 @@ def to_form_data
         "reason" => competitor_limit_reason,
       },
       "staff" => {
-        "staffDelegateIds" => staff_delegates.pluck(:id),
-        "traineeDelegateIds" => trainee_delegates.pluck(:id),
-        "organizerIds" => organizers.pluck(:id),
+        "staffDelegateIds" => staff_delegates.to_a.pluck(:id),
+        "traineeDelegateIds" => trainee_delegates.to_a.pluck(:id),
+        "organizerIds" => organizers.to_a.pluck(:id),
         "contact" => contact,
       },
       "championships" => championships.map(&:championship_type),

diff --git a/WcaOnRails/app/views/competitions/_competition_form.html.erb b/WcaOnRails/app/views/competitions/_competition_form.html.erb
@@ -6,4 +6,5 @@
   isAdminView: @competition_admin_view,
   isPersisted: @competition.persisted?,
   isSeriesPersisted: @competition.competition_series&.persisted? || false,
+  isCloning: @competition.being_cloned_from.present?,
 }) %>
diff --git a/WcaOnRails/app/webpacker/components/CompetitionForm/FormSections/EventRestrictions.js b/WcaOnRails/app/webpacker/components/CompetitionForm/FormSections/EventRestrictions.js
@@ -20,6 +20,7 @@ export default function EventRestrictions() {
         eventLimitation,
       },
     },
+    isCloning,
     storedEvents,
   } = useStore();
 
@@ -63,9 +64,13 @@ export default function EventRestrictions() {
           <InputNumber id="perRegistrationLimit" />
         </ConditionalSection>
       </SubSection>
-      <Divider />
 
-      <InputSelect id="mainEventId" options={mainEventOptions} />
+      {!isCloning && (
+        <>
+          <Divider />
+          <InputSelect id="mainEventId" options={mainEventOptions} />
+        </>
+      )}
     </SubSection>
   );
 }
diff --git a/WcaOnRails/app/webpacker/components/CompetitionForm/FormSections/RegistrationDetails.js b/WcaOnRails/app/webpacker/components/CompetitionForm/FormSections/RegistrationDetails.js
@@ -42,7 +42,7 @@ export default function RegistrationDetails() {
       <ConditionalSection showIf={guestsRestricted}>
         <InputNumber id="guestsPerRegistration" required={guestsRestricted} />
       </ConditionalSection>
-      <InputMarkdown id="extraRequirements" required />
+      <InputMarkdown id="extraRequirements" />
       <InputBoolean id="forceComment" />
     </SubSection>
   );

diff --git a/WcaOnRails/config/locales/en.yml b/WcaOnRails/config/locales/en.yml
@@ -1534,7 +1534,8 @@ en:
             per_registration_limit: "Events per registration limit"
           main_event_id: "Main event"
         remarks: "Remarks"
-        clone_tabs: "I would like to clone all tabs with additional information as well"
+        cloning:
+          clone_tabs: "I would like to clone all tabs with additional information as well"
       #context: for a competition
       hints:
         admin:
@@ -1614,7 +1615,8 @@ en:
             per_registration_limit: "Optionally enforce the total number of events a competitor can register for (commonly used for \"Favorites\" competitions). You should add events before using this field. Registrations with too many events will be blocked. Leave blank if there is no limit."
           main_event_id: "The winner of this event will be the winner of the competition."
         remarks: "Some additional information you want to pass on to the WCAT. For example, if there is something you are uncertain about, or if there are any special requests for the WCAT. Please fill this out in English!"
-        clone_tabs: ""
+        cloning:
+          clone_tabs: ""
       choices:
         #context: about guests
         guests_enabled: