Enable single table inheritance for maps

Author: rsmithlal

app/controllers/better_together/resource_controller.rb

@@ -26,7 +26,8 @@ def create
       authorize_resource
 
       if @resource.save
-        redirect_to @resource.becomes(resource_class), notice: "#{resource_class.model_name.human} was successfully created."
+        redirect_to @resource.becomes(resource_class),
+                    notice: "#{resource_class.model_name.human} was successfully created."
       else
         render :new, status: :unprocessable_entity
       end
@@ -36,7 +37,8 @@ def update
       authorize_resource
 
       if @resource.update(resource_params)
-        redirect_to @resource.becomes(resource_class), notice: "#{resource_class.model_name.human} was successfully updated."
+        redirect_to @resource.becomes(resource_class),
+                    notice: "#{resource_class.model_name.human} was successfully updated."
       else
         render :edit, status: :unprocessable_entity
       end

app/helpers/better_together/form_helper.rb

@@ -111,6 +111,7 @@ def type_select_field(form:, model_class:, selected_type: nil, include_model_cla
       options = {
         required: true,
         class: 'form-select',
+        data: { controller: 'better_together--slim-select' },
         disabled:, # Disable if the model is persisted
         **options
       }

app/models/better_together/geography/map.rb

@@ -39,6 +39,10 @@ class Map < ApplicationRecord
         end
       end
 
+      def self.permitted_attributes(id: false, destroy: false)
+        super + %i[type zoom center]
+      end
+
       def center
         super || default_center
       end
@@ -70,6 +74,10 @@ def spaces_for_leaflet
         spaces.map(&:to_leaflet_point).compact.to_json
       end
 
+      def to_partial_path
+        'better_together/geography/maps/map'
+      end
+
       def to_s
         title
       end

app/policies/better_together/geography/map_policy.rb

@@ -16,11 +16,11 @@ def create?
       end
 
       def update?
-        user.present? && !record.protected?
+        user.present? && !record.protected? && (record.creator == agent || permitted_to(:manage_platform))
       end
 
       def destroy?
-        user.present? && !record.protected?
+        user.present? && !record.protected? && (record.creator == agent || permitted_to(:manage_platform))
       end
 
       class Scope < Scope # rubocop:todo Style/Documentation

app/views/better_together/geography/maps/_form.html.erb

@@ -1,8 +1,7 @@
-<%= form_with(model: map, class: "form", multipart: true, local: false, data: { controller: "better_together--form-validation" }) do |form| %>
+<%= form_with(model: map.becomes(BetterTogether::Geography::Map), class: "form", multipart: true, local: false, data: { controller: "better_together--form-validation" }) do |form| %>
   <% if map.errors.any? %>
-    <div style="color: red">
-      <h2><%= pluralize(map.errors.count, "error") %> prohibited this map from being saved:</h2>
-
+    <div class="alert alert-danger">
+      <h4 class="alert-heading"><%= pluralize(map.errors.count, "error") %> prohibited this map from being saved:</h4>
       <ul>
         <% map.errors.each do |error| %>
           <li><%= error.full_message %></li>
@@ -13,24 +12,29 @@
 
   <%= form.hidden_field :creator_id, value: current_person&.id %>
 
-<div class="mb-3">
-  <%= render partial: 'better_together/shared/translated_string_field', locals: { model: map, form: form, attribute: 'title' } %>
-</div>
+  <div class="form-group mb-3">
+    <%= required_label form, :type, class: "form-label" %>
+    <%= type_select_field(form: form, model_class: ::BetterTogether::Geography::Map, include_model_class: true, required: true) %>
+  </div>
 
-<div class="mb-3">
-  <%= render partial: 'better_together/shared/translated_rich_text_field', locals: { model: map, form: form, attribute: 'description' } %>
-</div>
+  <div class="form-group mb-3">
+    <%= render partial: 'better_together/shared/translated_string_field', locals: { model: map, form: form, attribute: 'title' } %>
+  </div>
 
-<div class="mb-3">
-  <%= render partial: 'better_together/shared/translated_string_field', locals: { model: map, form: form, attribute: 'slug' } %>
-</div>
+  <div class="form-group mb-3">
+    <%= render partial: 'better_together/shared/translated_rich_text_field', locals: { model: map, form: form, attribute: 'description' } %>
+  </div>
 
-<div class="mb-3">
-  <%= required_label form, :privacy, class: "form-label" %>
-  <%= privacy_field(form:, klass: resource_class) %>
-</div>
+  <div class="form-group mb-3">
+    <%= render partial: 'better_together/shared/translated_string_field', locals: { model: map, form: form, attribute: 'slug' } %>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= required_label form, :privacy, class: "form-label" %>
+    <%= privacy_field(form:, klass: resource_class) %>
+  </div>
 
-  <div>
-    <%= form.submit %>
+  <div class="form-group">
+    <%= form.submit class: "btn btn-primary" %>
   </div>
 <% end %>

app/views/better_together/geography/maps/edit.html.erb

@@ -1,10 +1,14 @@
-<h1>Editing map</h1>
+<div class="container mt-4">
+  <h1 class="mb-4">Editing Map</h1>
 
-<%= render "form", map: @geography_map %>
+  <div class="card">
+    <div class="card-body">
+      <%= render "form", map: @geography_map %>
+    </div>
+  </div>
 
-<br>
-
-<div>
-  <%= link_to "Show this map", @geography_map %> |
-  <%= link_to "Back to maps", maps_path %>
-</div>
+  <div class="mt-3">
+    <%= link_to "Show this map", map_path(@geography_map), class: "btn btn-primary" %>
+    <%= link_to "Back to maps", maps_path, class: "btn btn-secondary" %>
+  </div>
+</div></div>

app/views/better_together/geography/maps/new.html.erb

@@ -1,9 +1,13 @@
-<h1>New map</h1>
+<div class="container mt-4">
+  <div class="row">
+    <div class="col-md-8 offset-md-2">
+      <h1 class="mb-4">New Map</h1>
 
-<%= render "form", map: @geography_map %>
+      <%= render "form", map: @geography_map %>
 
-<br>
-
-<div>
-  <%= link_to "Back to maps", maps_path %>
+      <div class="mt-3">
+        <%= link_to "Back to Maps", maps_path, class: "btn btn-secondary" %>
+      </div>
+    </div>
+  </div>
 </div>

app/views/better_together/geography/maps/show.html.erb

@@ -4,18 +4,11 @@
   <div class="my-3 d-flex justify-content-between">
     <%= link_to "Edit this map", edit_map_path(@geography_map), class: "btn btn-primary" %>
     <%= link_to "Back to maps", maps_path, class: "btn btn-secondary" %>
-    <%= button_to "Destroy this map", @geography_map, method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger" %>
+    <%= button_to "Destroy this map", map_path(@geography_map), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger" %>
   </div>
 
-  <div class="map"
-       data-controller="better_together--map"
-       data-better_together--map-center-value="<%= @geography_map.center_for_leaflet %>"
-       data-better_together--map-zoom-value="<%= @geography_map.zoom %>"
-       data-better_together--map-extent-value="<%= @geography_map.viewport %>">
-    <div class="map-controls">
-      <button data-action="better_together--map#switchToOSM">OpenStreetMap</button>
-      <button data-action="better_together--map#switchToSatellite">Satellite</button>
-      <button data-action="better_together--map#enableGeolocation">Geolocate Me</button>
-    </div>
-  </div>
+  <section id="map" class="my-4 pb-2">
+    <h3><i class="fas fa-map-marker-alt text-warning"></i> Location Map</h3>
+    <%= render partial: 'better_together/shared/map', locals: { map: @geography_map } %>
+  </section>
 </div>

db/migrate/20250410133055_add_type_to_better_together_geography_maps.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTypeToBetterTogetherGeographyMaps < ActiveRecord::Migration[7.1]
+  def change
+    add_column :better_together_geography_maps, :type, :string, null: false, default: 'BetterTogether::Geography::Map'
+  end
+end

spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_04_09_012010) do
+ActiveRecord::Schema[7.1].define(version: 2025_04_10_133055) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -329,6 +329,7 @@
     t.jsonb "metadata", default: {}, null: false
     t.string "mappable_type"
     t.uuid "mappable_id"
+    t.string "type", default: "BetterTogether::Geography::Map", null: false
     t.index ["creator_id"], name: "by_better_together_geography_maps_creator"
     t.index ["identifier"], name: "index_better_together_geography_maps_on_identifier", unique: true
     t.index ["locale"], name: "by_better_together_geography_maps_locale"
@@ -861,6 +862,7 @@
     t.integer "position", null: false
     t.string "resource_type", null: false
     t.string "slug"
+    t.string "type", default: "BetterTogether::Role", null: false
     t.index ["identifier"], name: "index_better_together_roles_on_identifier", unique: true
     t.index ["resource_type", "position"], name: "index_roles_on_resource_type_and_position", unique: true
     t.index ["slug"], name: "index_better_together_roles_on_slug", unique: true