Split out editing venues from editing schedule

app/assets/stylesheets/application.css.scss

@@ -49,7 +49,6 @@
 @import "server_status";
 @import "static_pages";
 @import "edit_events";
-@import "edit_schedule";
 @import "media";
 @import "incidents";
 @import "translations";

app/controllers/api/v0/competitions_controller.rb

@@ -166,9 +166,13 @@ def show_wcif_public
   def update_wcif
     competition = competition_from_params
     require_can_manage!(competition)
-    wcif = params.permit!.to_h
+    skip_schedule = params[:skipSchedule]
+    skip_schedule = ActiveRecord::Type::Boolean.new.cast(skip_schedule)
+    skip_venue_details = params[:skipVenueDetails]
+    skip_venue_details = ActiveRecord::Type::Boolean.new.cast(skip_venue_details)
+    wcif = params.except("skipSchedule", "skipVenueDetails").permit!.to_h
     wcif = wcif["_json"] || wcif
-    competition.set_wcif!(wcif, require_user!)
+    competition.set_wcif!(wcif, require_user!, skip_schedule: skip_schedule, skip_venue_details: skip_venue_details)
     render json: {
       status: "Successfully saved WCIF",
     }

app/controllers/competitions_controller.rb

@@ -38,6 +38,7 @@ class CompetitionsController < ApplicationController
   before_action -> { redirect_to_root_unless_user(:can_manage_competition?, competition_from_params) }, only: [
     :edit,
     :edit_events,
+    :edit_venues,
     :edit_schedule,
     :payment_integration_setup,
   ]
@@ -253,6 +254,10 @@ def edit_events
     @competition = competition_from_params(includes: associations)
   end
 
+  def edit_venues
+    @competition = competition_from_params(includes: [competition_events: { rounds: { competition_event: [:event] } }, competition_venues: { venue_rooms: { schedule_activities: [:child_activities] } }])
+  end
+
   def edit_schedule
     @competition = competition_from_params(includes: [competition_events: { rounds: { competition_event: [:event] } }, competition_venues: { venue_rooms: { schedule_activities: [:child_activities] } }])
   end

app/models/competition.rb

@@ -1963,13 +1963,13 @@ def schedule_wcif
     }
   end
 
-  def set_wcif!(wcif, current_user)
+  def set_wcif!(wcif, current_user, skip_schedule: false, skip_venue_details: false)
     JSON::Validator.validate!(Competition.wcif_json_schema, wcif)
 
     ActiveRecord::Base.transaction do
       set_wcif_series!(wcif["series"], current_user) if wcif["series"]
       set_wcif_events!(wcif["events"], current_user) if wcif["events"]
-      set_wcif_schedule!(wcif["schedule"], current_user) if wcif["schedule"]
+      set_wcif_schedule!(wcif["schedule"], current_user, skip_schedule: skip_schedule, skip_venue_details: skip_venue_details) if wcif["schedule"]
       update_persons_wcif!(wcif["persons"], current_user) if wcif["persons"]
       WcifExtension.update_wcif_extensions!(self, wcif["extensions"]) if wcif["extensions"]
       set_wcif_competitor_limit!(wcif["competitorLimit"], current_user) if wcif["competitorLimit"]
@@ -2134,7 +2134,7 @@ def update_persons_wcif!(wcif_persons, current_user)
     Assignment.upsert_all(new_assignments) if new_assignments.any?
   end
 
-  def set_wcif_schedule!(wcif_schedule, current_user)
+  def set_wcif_schedule!(wcif_schedule, current_user, skip_schedule: false, skip_venue_details: false)
     if wcif_schedule["startDate"] != start_date.strftime("%F")
       raise WcaExceptions::BadApiParameter.new("Wrong start date for competition")
     elsif wcif_schedule["numberOfDays"] != number_of_days
@@ -2153,7 +2153,7 @@ def set_wcif_schedule!(wcif_schedule, current_user)
       # using this find instead of ActiveRecord's find_or_create_by avoid several queries
       # (despite having the association included :()
       venue = competition_venues.find { |v| v.wcif_id == venue_wcif["id"] } || competition_venues.build
-      venue.load_wcif!(venue_wcif)
+      venue.load_wcif!(venue_wcif, skip_schedule: skip_schedule, skip_venue_details: skip_venue_details)
     end
     self.competition_venues = new_venues
 

app/models/competition_venue.rb

@@ -22,11 +22,11 @@ def country
     Country.find_by_iso2(self.country_iso2)
   end
 
-  def load_wcif!(wcif)
-    update!(CompetitionVenue.wcif_to_attributes(wcif))
+  def load_wcif!(wcif, skip_schedule: false, skip_venue_details: false)
+    update!(CompetitionVenue.wcif_to_attributes(wcif)) unless skip_venue_details
     new_rooms = wcif["rooms"].map do |room_wcif|
       room = venue_rooms.find { |r| r.wcif_id == room_wcif["id"] } || venue_rooms.build
-      room.load_wcif!(room_wcif)
+      room.load_wcif!(room_wcif, skip_schedule: skip_schedule, skip_venue_details: skip_venue_details)
     end
     self.venue_rooms = new_rooms
     WcifExtension.update_wcif_extensions!(self, wcif["extensions"]) if wcif["extensions"]

app/models/venue_room.rb

@@ -53,13 +53,15 @@ def self.wcif_json_schema
     }
   end
 
-  def load_wcif!(wcif)
-    update!(VenueRoom.wcif_to_attributes(wcif))
-    new_activities = wcif["activities"].map do |activity_wcif|
-      activity = schedule_activities.find { |a| a.wcif_id == activity_wcif["id"] } || schedule_activities.build
-      activity.load_wcif!(activity_wcif)
+  def load_wcif!(wcif, skip_schedule: false, skip_venue_details: false)
+    update!(VenueRoom.wcif_to_attributes(wcif)) unless skip_venue_details
+    unless skip_schedule
+      new_activities = wcif["activities"].map do |activity_wcif|
+        activity = schedule_activities.find { |a| a.wcif_id == activity_wcif["id"] } || schedule_activities.build
+        activity.load_wcif!(activity_wcif)
+      end
+      self.schedule_activities = new_activities
     end
-    self.schedule_activities = new_activities
     WcifExtension.update_wcif_extensions!(self, wcif["extensions"]) if wcif["extensions"]
     self
   end

app/views/competitions/_nav.html.erb

@@ -42,6 +42,7 @@
             children: [
               { text: t('.menu.orga_view'), path: edit_competition_path(@competition), icon: "lock" },
               { text: t('.menu.event_view'), path: edit_events_path(@competition), icon: "cubes" },
+              { text: t('.menu.venue_view'), path: edit_venues_path(@competition), icon: "building" },
               { text: t('.menu.schedule_view'), path: edit_schedule_path(@competition), icon: "calendar" },
               { text: t('.menu.payment_view'), path: competition_payment_integration_setup_path(@competition), icon: "money bill alternate" },
             ] +

app/views/competitions/edit_schedule.html.erb

@@ -19,11 +19,8 @@
       competitionId: @competition.id,
       wcifEvents: @competition.events_wcif,
       wcifSchedule: @competition.schedule_wcif,
-      countryZones: @competition.country_zones,
       referenceTime: @competition.start_date.to_fs,
       calendarLocale: I18n.locale,
-    }, {
-      id: 'edit-schedule-area'
     }) %>
   <% end %>
 <% end %>

app/views/competitions/edit_venues.html.erb

@@ -0,0 +1,25 @@
+<% provide(:title, "Manage venue for #{@competition.name}") %>
+<% add_to_packs("wca_maps") %>
+
+<%= render layout: 'nav' do %>
+  <% if [email protected]_defined_dates? %>
+    <div class="alert alert-danger">
+      There is no start and/or end date assigned to this competition yet.
+      Before you can manage your venues, you have to add them
+      <%= link_to "here", edit_competition_path(@competition, anchor: "competition_start_date") %>.
+    </div>
+  <% elsif @competition.country.blank? %>
+    <div class="alert alert-danger">
+      There is no country assigned to this competition yet.
+      Before you can manage your venues, you have to add one
+      <%= link_to "here", edit_competition_path(@competition, anchor: "competition_countryId") %>.
+    </div>
+  <% else %>
+    <%= react_component("EditVenues", {
+      competitionId: @competition.id,
+      wcifSchedule: @competition.schedule_wcif,
+      countryZones: @competition.country_zones,
+      referenceTime: @competition.start_date.to_fs,
+    }) %>
+  <% end %>
+<% end %>

app/webpacker/components/EditSchedule/EditActivities/index.js → app/webpacker/components/EditSchedule/ManageActivities/index.js

@@ -54,7 +54,7 @@ import ActionsHeader from './ActionsHeader';
 import { getTimeZoneDropdownLabel } from '../../../lib/utils/timezone';
 import { earliestTimeOfDayWithBuffer } from '../../../lib/utils/activities';
 
-function EditActivities({
+function ManageActivities({
   wcifEvents,
   referenceTime,
   calendarLocale,
@@ -504,4 +504,4 @@ function EditActivities({
   );
 }
 
-export default EditActivities;
+export default ManageActivities;