🧹 Rooms: Get rid of locked/unlocked Rooms

- #1155

It's not really serving us, and is a hold-over from when Convene was
more video-forward.

app/controllers/application_controller.rb

@@ -141,10 +141,6 @@ def space_repository
     current_space.entrance
   end
 
-  helper_method def current_access_code(room)
-    session.dig(room.id, "access_code")
-  end
-
   def render_not_found
     render file: "#{Rails.root}/public/404.html", layout: false, status: :not_found
   end

app/controllers/rooms_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class RoomsController < ApplicationController
-  before_action :check_access_code
-
   def show
     respond_to do |format|
       format.html
@@ -67,22 +65,4 @@ def room_params
       authorize(room)
     end
   end
-
-  # TODO: Unit test authorize and redirect url
-  private def check_access_code
-    return unless room.persisted?
-
-    unless room.enterable?(current_access_code(room))
-      redirect_to [current_space, current_room, :waiting_room, redirect_url: after_authorization_redirect_url]
-    end
-  end
-
-  # TODO: Unit test authorize and redirect url
-  private def after_authorization_redirect_url
-    if %i[edit update].include?(action_name.to_sym)
-      return url_for([:edit, room.space, room])
-    end
-
-    url_for([room.space, room])
-  end
 end

app/javascript/controllers/index.js

@@ -6,6 +6,3 @@ import { application } from "./application.js"
 
 import MenuController from "./menu_controller.js"
 application.register("menu", MenuController)
-
-import RoomFormController from "./room_form_controller.js"
-application.register("room-form", RoomFormController)

app/lib/space_routes.rb

@@ -6,7 +6,6 @@ def self.append_routes(router)
     end
     router.resources :rooms, only: %i[show edit update new create destroy] do
       Furniture.append_routes(router)
-      router.resource :waiting_room, only: %i[show update]
       router.resources :furniture_placements, only: %i[create edit update destroy]
     end
 

app/models/blueprint.rb

@@ -101,38 +101,27 @@ def space_attributes
         {
           name: "Listed Room 1",
           publicity_level: :listed,
-          access_level: :unlocked,
-          access_code: nil,
+          access_level: :public,
           furniture_placements: {
             markdown_text_block: {content: "# Welcome!"}
           }
         },
         {
           name: "Listed Room 2",
           publicity_level: :listed,
-          access_level: :unlocked,
-          access_code: nil,
-          furniture_placements: {}
-        },
-        {
-          name: "Listed Locked Room 1",
-          publicity_level: :listed,
-          access_level: :locked,
-          access_code: :secret,
+          access_level: :public,
           furniture_placements: {}
         },
         {
           name: "Unlisted Room 1",
           publicity_level: :unlisted,
-          access_level: :unlocked,
-          access_code: nil,
+          access_level: :public,
           furniture_placements: {}
         },
         {
           name: "Unlisted Room 2",
           publicity_level: :unlisted,
-          access_level: :unlocked,
-          access_code: nil,
+          access_level: :public,
           furniture_placements: {}
         },
         {

app/models/room.rb

@@ -17,29 +17,19 @@ class Room < ApplicationRecord
   extend FriendlyId
   friendly_id :name, use: :scoped, scope: :space
 
+  ACCESS_LEVELS = %i[internal public].freeze
   # A Room's Access Level indicates what a participant must know in order to gain access to the room.
-  # `unlocked` indicates that the participant does not need to know anything to gain access.
-  # `locked` indicates that only participants who know the rrooms `access_code` may access the room.
-  # `internal` indicates that only participants who are Space Members _or_ know the Spaces `access_code` may
-  # access the room.
-  attribute :access_level, :string, default: "unlocked"
-
-  # A room's Access Code is a "secret" that, when known, grants access to the room.
-  attribute :access_code, :string
-  validates :access_code, presence: {if: :locked?}
-
-  def locked?
-    access_level&.to_sym == :locked
-  end
-
-  def unlocked?
-    access_level&.to_sym == :unlocked
-  end
+  # `internal` only Members may access the Room
+  attribute :access_level, :string, default: :public
 
   def internal?
     access_level&.to_sym == :internal
   end
 
+  def public?
+    access_level&.to_sym == :public
+  end
+
   # A Room's Publicity Level indicates how visible the room is.
   # `listed` - The room is discoverable by anyone in the space lobby.
   # `unlisted` - The room is not listed.
@@ -66,14 +56,6 @@ def full_slug
     "#{space.slug}--#{slug}"
   end
 
-  def enterable?(access_code)
-    return true if access_level == "unlocked"
-
-    can_enter = self.access_code == access_code
-    errors.add(:base, "Invalid access code") if access_code
-    can_enter
-  end
-
   def entrance?
     space.entrance == self
   end

app/policies/room_policy.rb

@@ -5,7 +5,7 @@ class RoomPolicy < ApplicationPolicy
   delegate :space, to: :room
 
   def show?
-    return true if room.unlocked? || room.locked?
+    return true if room.public?
     return true if room.internal? && (person&.member_of?(space) || person&.operator?)
   end
 
@@ -19,7 +19,7 @@ def create?
   alias_method :new?, :create?
 
   def permitted_attributes(params)
-    [:access_level, :access_code, :name, :slug, :publicity_level,
+    [:access_level, :name, :slug, :publicity_level,
       furniture_placements_attributes:
        policy(FurniturePlacement).permitted_attributes(params)]
   end

app/views/rooms/_form.html.erb

@@ -1,36 +1,12 @@
-<%= form_with model: room.location, data: { controller: "room-form" } do |room_form| %>
+<%= form_with model: room.location do |room_form| %>
   <fieldset>
-    <div>
-      <%= room_form.label :name %>
-      <%= room_form.text_field :name %>
-      <%= render partial: "error", locals: { model: room, attribute: :name } %>
-    </div>
-
-    <div>
-      <%= room_form.label :slug %>
-      <%= room_form.text_field :slug %>
-      <%= render partial: "error", locals: { model: room, attribute: :slug } %>
-    </div>
+    <%= render "text_field", attribute: :name, form: room_form %>
+    <%= render "text_field", attribute: :slug, form: room_form %>
 
     <h3>Privacy and Security</h3>
 
-    <div>
-     <%= room_form.label :publicity_level %>
-     <%= room_form.select :publicity_level, Room::PUBLICITY_LEVELS.map(&:to_s) %>
-     <%= render partial: "error", locals: { model: room, attribute: :publicity_level } %>
-    </div>
-
-    <div>
-      <%= room_form.label :access_level %>
-      <%= room_form.select :access_level, ['locked', 'unlocked'], { class: "form-select" }, "data-action": "room-form#accessLevelToggle" %>
-      <%= render partial: "error", locals: { model: room, attribute: :access_level } %>
-    </div>
-
-    <div>
-      <%= room_form.label :access_code %>
-      <%= room_form.text_field :access_code, "data-target": "room-form.accessCode", disabled: !room.locked? %>
-      <%= render partial: "error", locals: { model: room, attribute: :access_code } %>
-    </div>
+    <%= render "select", attribute: :publicity_level, options: Room::PUBLICITY_LEVELS.map(&:to_s), form: room_form %>
+    <%= render "select", attribute: :access_level, options: Room::ACCESS_LEVELS.map(&:to_s), form: room_form %>
 
     <footer>
       <%- if policy(room).destroy? && room.persisted? %>

app/views/spaces/_room_card.html.erb

@@ -3,12 +3,6 @@
     <h3 class="text-neutral-900 text-sm leading-5 font-medium truncate pl-8 mr-4">
       <%= room.name %>
     </h3>
-    <%- if room.locked? %>
-      <span class="icon --lock" role="img" aria-label="Locked"></span>
-    <%- end %>
-    <%- if room.locked? && room.enterable?(current_access_code(room)) %>
-      <span class="icon --key" role="img" aria-label="Enterable"></span>
-    <%- end %>
   </header>
   <footer class="w-full flex flex-col items-center justify-center border-t border-neutral-200">
     <div data-role="enter" class="flex justify-center text-sm leading-5 text-neutral-700 font-medium transition ease-in-out duration-150 focus:outline-none focus:ring-blue-500 focus:border-blue-300 focus:z-10 hovertext-neutral-500">

config/breadcrumbs.rb

@@ -56,11 +56,6 @@
   parent :room, room
 end
 
-crumb :waiting_room do |waiting_room|
-  link "Waiting Room", space_room_waiting_room_path(waiting_room.room.space, waiting_room.room)
-  parent :room, waiting_room.room
-end
-
 crumb :rsvp do |rsvp|
   link "Respond to your Invitation"
   parent :root, rsvp.space

db/migrate/20230304003325_drop_rooms_access_code.rb

@@ -0,0 +1,6 @@
+class DropRoomsAccessCode < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :rooms, :access_code, :string
+    change_column :rooms, :access_level, :string, default: :public
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_03_03_201956) do
+ActiveRecord::Schema[7.0].define(version: 2023_03_04_003325) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -182,8 +182,7 @@
   create_table "rooms", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name"
     t.string "slug"
-    t.string "access_level", default: "unlocked", null: false
-    t.string "access_code"
+    t.string "access_level", default: "public", null: false
     t.string "publicity_level"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

features/harness/Pages.js

@@ -1,7 +1,6 @@
 import Page from "./Page.js";
 import RoomPage from "./RoomPage.js";
 import RoomEditPage from "./RoomEditPage.js";
-import WaitingRoomPage from "./WaitingRoomPage.js";
 import SpacePage from "./SpacePage.js";
 import SpaceEditPage from "./SpaceEditPage.js";
 import MembershipsIndexPage from "./MembershipsIndexPage.js";
@@ -17,7 +16,6 @@ export { SpaceEditPage };
 export { MembershipsIndexPage };
 export { InvitationsIndexPage };
 export { RoomEditPage };
-export { WaitingRoomPage };
 export default {
   Page,
   SpacePage,
@@ -26,5 +24,4 @@ export default {
   RoomPage,
   SpaceEditPage,
   RoomEditPage,
-  WaitingRoomPage,
 };