From 8b845fdebe79c704b025fecbc9ee9823b930f045 Mon Sep 17 00:00:00 2001
From: Zee Spencer <50284+zspencer@users.noreply.github.com>
Date: Mon, 30 Jan 2023 15:36:51 -0800
Subject: [PATCH] BYO Domains: (WIP) Identify a few places where things are
 shady
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We probably want to figure out a better strategy for how we test the BYO
domains feature; perhaps there's a way to do it with the end-to-end
tests so that they run against a BYO-domained Space and a non-BYO
domained space in different github actions? I don't know 🤷

https://github.com/zinc-collective/convene/issues/74
---
 app/views/furniture_placements/_new.html.erb | 4 ++--
 app/views/rooms/_form.html.erb               | 2 +-
 app/views/rsvps/_pending.html.erb            | 2 +-
 app/views/spaces/edit.html.erb               | 2 +-
 app/views/utility_hookups/_form.html.erb     | 2 +-
 app/views/utility_hookups/new.html.erb       | 2 +-
 app/views/waiting_rooms/show.html.erb        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/furniture_placements/_new.html.erb b/app/views/furniture_placements/_new.html.erb
index 4a8c8c070..a1892c3fb 100644
--- a/app/views/furniture_placements/_new.html.erb
+++ b/app/views/furniture_placements/_new.html.erb
@@ -1,10 +1,10 @@
 <fieldset id="new_furniture_placement">
   <h3><%= t('rooms.place_furniture_heading') %></h3>
-  <%= form_with model: [furniture_placement.room.space, furniture_placement.room, furniture_placement] do | placement_form | %>
+  <%= form_with model: furniture_placement.location do | placement_form | %>
     <%= placement_form.hidden_field :slot, value: furniture_placement.room.furniture_placements.count %>
     <%= placement_form.select :furniture_kind, Furniture::REGISTRY.keys.map { |k| [k.to_s.titleize, k] } %>
     <footer>
       <%= placement_form.submit %>
     </footer>
   <%- end %>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/app/views/rooms/_form.html.erb b/app/views/rooms/_form.html.erb
index 1ea8e7aa9..554e312d6 100644
--- a/app/views/rooms/_form.html.erb
+++ b/app/views/rooms/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with model: [room.space, room], data: { controller: "room-form" }, local: true do |room_form| %>
+<%= form_with model: room.location, data: { controller: "room-form" } do |room_form| %>
   <fieldset>
     <div>
       <%= room_form.label :name %>
diff --git a/app/views/rsvps/_pending.html.erb b/app/views/rsvps/_pending.html.erb
index ea5544b50..9acf496be 100644
--- a/app/views/rsvps/_pending.html.erb
+++ b/app/views/rsvps/_pending.html.erb
@@ -10,4 +10,4 @@
               [rsvp.space, rsvp.invitation, rsvp],
               params: { rsvp: { status: 'ignored' } },
               data: {testid: 'ignore' },
-              class: '--neutral w-full' %>
\ No newline at end of file
+              class: '--neutral w-full' %>
diff --git a/app/views/spaces/edit.html.erb b/app/views/spaces/edit.html.erb
index a3389cc4a..10f375fee 100644
--- a/app/views/spaces/edit.html.erb
+++ b/app/views/spaces/edit.html.erb
@@ -33,7 +33,7 @@
 </fieldset>
 
 <fieldset>
-  <%= form_with(model: [space]) do |space_form| %>
+  <%= form_with(model: space.location) do |space_form| %>
     <%= render "select",
                attribute: :theme,
                include_blank: false,
diff --git a/app/views/utility_hookups/_form.html.erb b/app/views/utility_hookups/_form.html.erb
index c3f92ed79..2ca55551d 100644
--- a/app/views/utility_hookups/_form.html.erb
+++ b/app/views/utility_hookups/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: [space, utility_hookup]) do |form| %>
+<%= form_with(model: utility_hookup.location) do |form| %>
   <%- form.object = form.object.utility %>
   <%= form.hidden_field :utility_slug %>
   <header>
diff --git a/app/views/utility_hookups/new.html.erb b/app/views/utility_hookups/new.html.erb
index 381c5ac64..0eb59cb8f 100644
--- a/app/views/utility_hookups/new.html.erb
+++ b/app/views/utility_hookups/new.html.erb
@@ -1,5 +1,5 @@
 <%- breadcrumb :new_utility_hookup, utility_hookup %>
-<%= form_with(model: [utility_hookup.space, utility_hookup], local: true) do |form| %>
+<%= form_with(model: utility_hookup.location) do |form| %>
   <%= render "select", attribute: :utility_slug, options: Utilities::REGISTRY.keys, form: form %>
   <%= render "text_field", attribute: :name, form: form %>
   <%= form.submit %>
diff --git a/app/views/waiting_rooms/show.html.erb b/app/views/waiting_rooms/show.html.erb
index 27ea62b19..14209f8ba 100644
--- a/app/views/waiting_rooms/show.html.erb
+++ b/app/views/waiting_rooms/show.html.erb
@@ -6,7 +6,7 @@
     </div>
   </div>
 
-  <%= form_with model: [waiting_room.room.space, waiting_room.room, waiting_room], class: "access-code-form", local: true do |form| %>
+  <%= form_with model: waiting_room.location, class: "access-code-form", local: true do |form| %>
     <%= render "password_field", form: form, attribute: :access_code%>
 
     <%= form.hidden_field :redirect_url %>