spina-blocks 0.2.0 → 0.3.1

data/app/helpers/spina/blocks/blocks_helper.rb

@@ -13,7 +13,7 @@ module Spina
           block = page_block.block
           next unless block&.active?
 
-          concat render_block(block)
+          concat(render_block(block))
         end
       end
 
@@ -28,7 +28,7 @@ module Spina
         partial_path = "#{theme_name}/blocks/#{block.block_template}"
 
         if lookup_context.exists?(partial_path, [], true)
-          render partial: partial_path, locals: { block: block }
+          render(partial: partial_path, locals: { block: block })
         else
           render_block_fallback(block)
         end
@@ -49,7 +49,7 @@ module Spina
 
       def render_block_fallback(block)
         content_tag(:div, class: "spina-block spina-block--#{block.block_template}") do
-          content_tag(:p, block.title, class: 'spina-block__title')
+          content_tag(:p, block.name, class: "spina-block__title")
         end
       end
     end

data/app/models/concerns/spina/parts/block_filterable.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module BlockFilterable
+      extend ActiveSupport::Concern
+
+      def available_blocks
+        scope = ::Spina::Blocks::Block.active.sorted
+        opts = options.is_a?(Hash) ? options.with_indifferent_access : nil
+        if opts&.dig(:block_template).present?
+          scope = scope.where(block_template: opts[:block_template])
+        end
+        scope
+      end
+    end
+  end
+end

data/app/models/spina/blocks/account_extension.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    module AccountExtension
+      extend ActiveSupport::Concern
+
+      included do
+        after_save :bootstrap_block_categories
+      end
+
+      private
+
+      def bootstrap_block_categories
+        theme_config = Spina::Theme.find_by_name(theme)
+        return unless theme_config
+        return unless theme_config.respond_to?(:block_categories) && theme_config.block_categories.present?
+
+        theme_config.block_categories.each_with_index do |category, index|
+          Spina::Blocks::Category.where(name: category[:name])
+            .first_or_create(label: category[:label])
+            .update(label: category[:label], position: index)
+        end
+      end
+    end
+  end
+end

data/app/models/spina/blocks/block.rb

@@ -8,18 +8,18 @@ module Spina
       include Spina::Partable
       include Spina::TranslatedContent
 
-      belongs_to :category, class_name: 'Spina::Blocks::Category', optional: true
-      has_many :page_blocks, class_name: 'Spina::Blocks::PageBlock', dependent: :destroy
-      has_many :pages, through: :page_blocks, class_name: 'Spina::Page'
+      belongs_to :category, class_name: "Spina::Blocks::Category", optional: true
+      has_many :page_blocks, class_name: "Spina::Blocks::PageBlock", dependent: :destroy
+      has_many :pages, through: :page_blocks, class_name: "Spina::Page"
 
-      validates :title, presence: true
+      validates :name, presence: true
       validates :block_template, presence: true
 
       scope :active, -> { where(active: true) }
       scope :sorted, -> { order(:position) }
 
       def to_s
-        title
+        name
       end
     end
   end

data/app/models/spina/blocks/category.rb

@@ -3,7 +3,7 @@
 module Spina
   module Blocks
     class Category < ApplicationRecord
-      has_many :blocks, class_name: 'Spina::Blocks::Block', foreign_key: :category_id, dependent: :nullify
+      has_many :blocks, class_name: "Spina::Blocks::Block", foreign_key: :category_id, dependent: :nullify
 
       validates :name, presence: true, uniqueness: true
       validates :label, presence: true

data/app/models/spina/blocks/page_block.rb

@@ -3,8 +3,8 @@
 module Spina
   module Blocks
     class PageBlock < ApplicationRecord
-      belongs_to :page, class_name: 'Spina::Page'
-      belongs_to :block, class_name: 'Spina::Blocks::Block'
+      belongs_to :page, class_name: "Spina::Page"
+      belongs_to :block, class_name: "Spina::Blocks::Block"
 
       validates :block_id, uniqueness: { scope: :page_id }
 

data/app/models/spina/blocks/page_extension.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    module PageExtension
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :page_blocks, class_name: "Spina::Blocks::PageBlock", foreign_key: :page_id, dependent: :destroy
+        has_many :blocks, through: :page_blocks, class_name: "Spina::Blocks::Block"
+      end
+    end
+  end
+end

data/app/models/spina/blocks/search_extension.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    module SearchExtension
+      extend ActiveSupport::Concern
+
+      included do
+        include Spina::Pro::Search
+
+        spina_searchable against: [:name]
+      end
+    end
+  end
+end

data/app/models/spina/parts/block_collection.rb

@@ -3,6 +3,8 @@
 module Spina
   module Parts
     class BlockCollection < Base
+      include BlockFilterable
+
       attr_json :block_ids, :integer, array: true, default: -> { [] }
 
       attr_accessor :options

data/app/models/spina/parts/block_reference.rb

@@ -3,6 +3,8 @@
 module Spina
   module Parts
     class BlockReference < Base
+      include BlockFilterable
+
       attr_json :block_id, :integer, default: nil
 
       attr_accessor :options

data/app/views/spina/admin/parts/block_collections/_form.html.erb

@@ -1,5 +1,5 @@
 <%
-  blocks = Spina::Blocks::Block.active.sorted
+  blocks = f.object.available_blocks
   selected_ids = f.object.block_ids || []
   field_name = "#{f.object_name}[block_ids][]"
 
@@ -15,7 +15,7 @@
   blocks_json = blocks.map { |b|
     {
       id: b.id,
-      title: b.title,
+      name: b.name,
       templateName: b.block_template.to_s,
       templateTitle: template_titles[b.block_template.to_s] || b.block_template.to_s.titleize
     }
@@ -26,6 +26,9 @@
      data-controller="block-collection"
      data-block-collection-blocks-value="<%= blocks_json.to_json %>"
      data-block-collection-selected-ids-value="<%= selected_ids.to_json %>"
+     data-block-collection-edit-url-value="<%= spina.edit_modal_blocks_admin_block_path("__ID__") %>"
+     data-block-collection-new-url-value="<%= spina.new_blocks_admin_block_path(modal: 1) %>"
+     data-block-collection-blocks-data-url-value="<%= spina.blocks_data_blocks_admin_blocks_path(format: :json) %>"
      data-field-name="<%= field_name %>">
 
   <label class="block text-sm leading-5 font-medium text-gray-700"><%= f.object.title %></label>
@@ -33,11 +36,26 @@
     <div class="text-gray-400 text-sm mb-2"><%= f.object.hint %></div>
   <% end %>
 
+  <%# Search input + dropdown %>
+  <div class="relative mb-3">
+    <input type="text"
+           data-block-collection-target="searchInput"
+           data-action="input->block-collection#onSearchInput focus->block-collection#onSearchFocus"
+           placeholder="Search or add block..."
+           autocomplete="off"
+           class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-spina focus:ring-spina" />
+
+    <div data-block-collection-target="dropdown"
+         style="display:none"
+         class="absolute z-10 w-full bg-white border border-gray-200 rounded-md shadow-lg py-1 max-h-60 overflow-y-auto">
+    </div>
+  </div>
+
   <%# Empty state message %>
   <div data-block-collection-target="emptyMessage"
        class="text-sm text-gray-400 italic py-3"
        style="<%= selected_ids.any? ? 'display:none' : '' %>">
-    No blocks selected. Click &ldquo;Add block&rdquo; to get started.
+    No blocks selected. Use the search field above to add blocks.
   </div>
 
   <%# Sortable list of selected blocks (rendered by Stimulus) %>
@@ -46,24 +64,6 @@
   <%# Hidden fields container (rendered by Stimulus) %>
   <div data-block-collection-target="hiddenFields"></div>
 
-  <%# Add block button + dropdown %>
-  <div class="relative inline-block">
-    <button type="button"
-            data-action="block-collection#toggleDropdown"
-            data-block-collection-target="addButton"
-            class="inline-flex items-center px-3 py-1.5 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-spina">
-      <svg class="w-4 h-4 mr-1.5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"/>
-      </svg>
-      Add block
-    </button>
-
-    <div data-block-collection-target="dropdown"
-         style="display:none"
-         class="absolute z-10 mt-1 w-64 bg-white border border-gray-200 rounded-md shadow-lg py-1 max-h-60 overflow-y-auto">
-    </div>
-  </div>
-
   <%# ===== Templates for Stimulus controller ===== %>
 
   <%# Selected block list item %>
@@ -78,6 +78,12 @@
         <span class="text-sm font-medium text-gray-800 truncate" data-role="title"></span>
         <span class="ml-2 text-xs text-gray-400" data-role="template-label"></span>
       </div>
+      <a class="ml-2 text-gray-300 hover:text-gray-600 transition-colors"
+         data-role="edit-link" href="" data-turbo-frame="modal" title="Edit">
+        <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
+        </svg>
+      </a>
       <button type="button" class="ml-2 text-gray-300 hover:text-red-500 transition-colors"
               data-action="block-collection#remove" data-block-id="" title="Remove">
         <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -103,6 +109,19 @@
 
   <%# Dropdown empty state %>
   <template data-block-collection-target="dropdownEmptyTemplate">
-    <div class="px-3 py-2 text-sm text-gray-400 italic">All blocks added</div>
+    <div class="px-3 py-2 text-sm text-gray-400 italic">No blocks found</div>
+  </template>
+
+  <%# Dropdown "New block" link %>
+  <template data-block-collection-target="newBlockTemplate">
+    <div class="border-t border-gray-200 mt-1 pt-1">
+      <a class="w-full text-left px-3 py-2 text-sm text-spina-primary hover:bg-gray-100 flex items-center font-medium"
+         href="" data-turbo-frame="modal" data-role="new-block-link">
+        <svg class="w-4 h-4 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"/>
+        </svg>
+        <%= t('spina.blocks.new') %>
+      </a>
+    </div>
   </template>
 </div>

data/app/views/spina/admin/parts/block_references/_form.html.erb

@@ -4,9 +4,9 @@
     <div class="text-gray-400 text-sm"><%= f.object.hint %></div>
   <% end %>
   <div class="mt-1">
-    <% blocks = Spina::Blocks::Block.active.sorted %>
+    <% blocks = f.object.available_blocks %>
     <%= f.select :block_id,
-          blocks.map { |b| [b.title, b.id] },
+          blocks.map { |b| [b.name, b.id] },
           {include_blank: t('spina.blocks.select_block')},
           class: "form-select text-sm w-full shadow-xs" %>
   </div>

data/app/views/spina/admin/pro/search/results/_block.html.erb

@@ -0,0 +1,23 @@
+<%= link_to spina.edit_blocks_admin_block_path(block), class: "block px-2 leading-tight", data: {selected: index.zero?, search_target: "result", action: "mouseenter->search#select", turbo_frame: "_top"} do %>
+  <div class="flex items-center justify-between w-full px-4 py-3 rounded-md bg-gray-400 bg-opacity-0 <%= 'bg-opacity-25' if index.zero? %>" data-selected-class="bg-opacity-25">
+    <div>
+      <div class="font-medium flex items-center">
+        <%= block.name %>
+        <% unless block.active? %>
+          <div class="opacity-50 text-xs ml-1">(inactive)</div>
+        <% end %>
+        <div class="flex items-center ml-2 text-xs px-1.5 py-0.5 space-x-1 bg-gray-900 bg-opacity-5 rounded">
+          <%= heroicon('cube', style: :outline, class: 'w-3 h-3 opacity-50') %>
+          <div class="opacity-75"><%= block.block_template %></div>
+        </div>
+      </div>
+      <% if block.category %>
+        <div class="opacity-50 text-xs"><%= block.category.label %></div>
+      <% end %>
+    </div>
+
+    <div class="opacity-0 <%= 'opacity-100' if index.zero? %>" data-selected-class="opacity-100">
+      <%= heroicon('arrow-narrow-right', style: :solid, class: 'w-5 h-5 text-gray-600') %>
+    </div>
+  </div>
+<% end %>

data/app/views/spina/blocks/admin/blocks/_form_block_content.html.erb

@@ -1,8 +1,8 @@
 <div class="max-w-5xl">
   <label class="font-medium text-gray-700">
-    <%= Spina::Blocks::Block.human_attribute_name(:title) %>
+    <%= Spina::Blocks::Block.human_attribute_name(:name) %>
   </label>
-  <%= render Spina::Forms::TextFieldComponent.new(f, :title, size: "lg") %>
+  <%= render Spina::Forms::TextFieldComponent.new(f, :name, size: "lg") %>
   <turbo-frame id="block_content" src="<%= spina.edit_content_blocks_admin_block_path(f.object, locale: @locale) %>">
   </turbo-frame>
 </div>

data/app/views/spina/blocks/admin/blocks/_modal_form.html.erb

@@ -0,0 +1,61 @@
+<%# Reusable modal form for editing a block. Used by edit_modal action.
+    Expects: @block, @tabs, @locale %>
+<%= turbo_frame_tag dom_id(@block, :modal_form) do %>
+  <div data-controller="tabs"
+       data-tabs-active="cursor-default text-gray-900 bg-spina-dark/10"
+       data-tabs-inactive="cursor-pointer bg-transparent text-gray-400 border-transparent">
+
+    <%# Modal header %>
+    <div class="px-6 pt-5 pb-4 border-b border-gray-200">
+      <div class="flex items-center justify-between">
+        <h3 class="text-lg leading-6 font-medium text-gray-900">
+          <%= @block.name %>
+        </h3>
+
+        <%# Tab navigation %>
+        <nav>
+          <ul class="inline-flex w-auto rounded-md bg-gray-100">
+            <% @tabs.each do |tab_name| %>
+              <%= render partial: "button_#{tab_name}" %>
+            <% end %>
+          </ul>
+        </nav>
+      </div>
+    </div>
+
+    <%# Form %>
+    <%= form_with model: @block,
+                  url: spina.blocks_admin_block_path(@block),
+                  id: dom_id(@block, :modal),
+                  data: { turbo_frame: dom_id(@block, :modal_form) } do |f| %>
+      <%= hidden_field_tag :locale, @locale %>
+      <%= hidden_field_tag :modal, 1 %>
+
+      <div class="px-6 py-4 max-h-[70vh] overflow-y-auto">
+        <% Mobility.with_locale(@locale) do %>
+          <% @tabs.each_with_index do |tab_name, idx| %>
+            <div data-tabs-target="pane" id="<%= tab_name %>" <%= 'hidden' unless idx.zero? %>>
+              <%= render partial: "form_#{tab_name}", locals: { f: f } %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+
+      <%# Action buttons %>
+      <div class="px-6 py-4 border-t border-gray-200 flex flex-row-reverse">
+        <button type="submit"
+                form="<%= dom_id(@block, :modal) %>"
+                class="btn btn-primary ml-3"
+                data-controller="button"
+                data-action="button#loading"
+                data-loading-message="<%= t('spina.blocks.save') %>...">
+          <%= t('spina.blocks.save') %>
+        </button>
+
+        <button type="button" class="btn btn-default" data-action="modal#close">
+          <%= t('spina.ui.cancel') %>
+        </button>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/spina/blocks/admin/blocks/_new_block_form.html.erb

@@ -19,7 +19,7 @@
           </div>
 
           <div class="mt-3">
-            <%= render Spina::Forms::TextFieldComponent.new(f, :title, size: 'lg', autofocus: true) %>
+            <%= render Spina::Forms::TextFieldComponent.new(f, :name, size: 'lg', autofocus: true) %>
           </div>
         </div>
       </div>

data/app/views/spina/blocks/admin/blocks/_new_block_modal_form.html.erb

@@ -0,0 +1,42 @@
+<%# Modal variant of the new block form. Used when creating a block from BlockCollection.
+    After successful creation, the modal transitions to the block edit form.
+    Expects: @block, @block_templates %>
+<%= turbo_frame_tag dom_id(@block, :new_block_modal_form) do %>
+  <%= form_with model: @block, url: spina.blocks_admin_blocks_path, data: { turbo_frame: "modal" } do |f| %>
+    <%= hidden_field_tag :modal, 1 %>
+
+    <div class="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+      <div class="sm:flex sm:items-start">
+        <div class="w-full">
+          <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-headline">
+            <%= t('spina.blocks.new') %>
+          </h3>
+
+          <div class="mt-4">
+            <label for="block_block_template" class="block text-sm font-medium text-gray-700 mb-1">
+              <%= t('spina.blocks.block_type') %>
+            </label>
+            <%= f.select :block_template,
+                  @block_templates.map { |bt| [bt[:title], bt[:name]] },
+                  { include_blank: t('spina.blocks.select_block_type') },
+                  class: "block w-full rounded-md border-gray-300 shadow-xs focus:border-blue-500 focus:ring-blue-500 text-sm",
+                  required: true %>
+          </div>
+
+          <div class="mt-3">
+            <%= render Spina::Forms::TextFieldComponent.new(f, :name, size: 'lg', autofocus: true) %>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="px-4 pb-5 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+      <button type="submit" class="btn btn-primary w-full sm:w-auto sm:ml-3">
+        <%= t('spina.blocks.create') %>
+      </button>
+
+      <button type="button" class="btn btn-default w-full sm:w-auto mt-2 sm:mt-0" data-action="modal#close">
+        <%= t('spina.ui.cancel') %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spina/blocks/admin/blocks/edit_modal.html.erb

@@ -0,0 +1,3 @@
+<%= render(Spina::UserInterface::ModalComponent.new(size: "max-w-5xl")) do %>
+  <%= render 'modal_form' %>
+<% end %>

data/app/views/spina/blocks/admin/blocks/index.html.erb

@@ -75,7 +75,7 @@
             </div>
             <div class="flex-1 py-3 pr-4">
               <%= link_to spina.edit_blocks_admin_block_path(block), class: "block" do %>
-                <div class="text-gray-900 font-medium text-sm"><%= block.title %></div>
+                <div class="text-gray-900 font-medium text-sm"><%= block.name %></div>
                 <div class="text-gray-400 text-xs">
                   <%= block.block_template %>
                   <% unless block.active? %>

data/app/views/spina/blocks/admin/blocks/new.html.erb

@@ -1,3 +1,7 @@
 <%= render(Spina::UserInterface::ModalComponent.new) do %>
-  <%= render 'new_block_form' %>
+  <% if @modal %>
+    <%= render 'new_block_modal_form' %>
+  <% else %>
+    <%= render 'new_block_form' %>
+  <% end %>
 <% end %>

data/app/views/spina/blocks/admin/page_blocks/index.html.erb

@@ -18,7 +18,7 @@
                         params: {page_block: {block_id: block.id}},
                         method: :post,
                         class: "block w-full text-left px-4 py-2 text-sm font-medium leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900" do %>
-                    <div><%= block.title %></div>
+                    <div><%= block.name %></div>
                     <div class="text-xs text-gray-400"><%= block.block_template %></div>
                   <% end %>
                 <% end %>
@@ -33,7 +33,7 @@
                       params: {page_block: {block_id: block.id}},
                       method: :post,
                       class: "block w-full text-left px-4 py-2 text-sm font-medium leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900" do %>
-                  <div><%= block.title %></div>
+                  <div><%= block.name %></div>
                   <div class="text-xs text-gray-400"><%= block.block_template %></div>
                 <% end %>
               <% end %>
@@ -64,7 +64,7 @@
             </div>
             <div class="flex-1 py-3">
               <%= link_to spina.edit_blocks_admin_block_path(page_block.block), class: "block" do %>
-                <div class="text-gray-900 font-medium text-sm"><%= page_block.block.title %></div>
+                <div class="text-gray-900 font-medium text-sm"><%= page_block.block.name %></div>
                 <div class="text-gray-400 text-xs">
                   <%= page_block.block.block_template %>
                 </div>

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
       new: "New block"
       create: "Create block"
       save: "Save block"
+      edit: "Edit block"
       saved: "Block saved"
       deleted: "Block deleted"
       delete: "Delete block"

data/config/routes.rb

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
 Spina::Engine.routes.draw do
-  namespace :blocks, path: '', module: 'blocks' do
+  namespace :blocks, path: "", module: "blocks" do
     namespace :admin, path: Spina.config.backend_path do
       resources :blocks do
         member do
           get :edit_content
+          get :edit_modal
         end
 
         collection do
           post :sort
+          get :blocks_data
         end
       end
 
-      resources :categories, only: %i[index edit update]
+      resources :categories, only: [:index, :edit, :update]
 
       resources :pages, only: [] do
-        resources :page_blocks, only: %i[index create destroy] do
+        resources :page_blocks, only: [:index, :create, :destroy] do
           collection do
             post :sort
           end

data/db/migrate/1_create_spina_blocks_categories.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CreateSpinaBlocksCategories < ActiveRecord::Migration[7.0]
+  def change
+    if previous_version_applied?("20250101000001")
+      cleanup_version!("20250101000001")
+      return
+    end
+
+    return if connection.table_exists?(:spina_blocks_categories)
+
+    create_table(:spina_blocks_categories) do |t|
+      t.string(:name, null: false)
+      t.string(:label, null: false)
+      t.integer(:position, default: 0)
+
+      t.timestamps
+    end
+
+    add_index(:spina_blocks_categories, :name, unique: true)
+  end
+
+  private
+
+  def previous_version_applied?(version)
+    connection.select_value(
+      "SELECT 1 FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+
+  def cleanup_version!(version)
+    connection.execute(
+      "DELETE FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+end

data/db/migrate/2_create_spina_blocks_blocks.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class CreateSpinaBlocksBlocks < ActiveRecord::Migration[7.0]
+  def change
+    if previous_version_applied?("20250101000002")
+      cleanup_version!("20250101000002")
+      return
+    end
+
+    return if connection.table_exists?(:spina_blocks_blocks)
+
+    create_table(:spina_blocks_blocks) do |t|
+      t.string(:name, null: false)
+      t.string(:block_template, null: false)
+      t.references(:category, foreign_key: { to_table: :spina_blocks_categories }, null: true)
+      t.integer(:position, default: 0)
+      t.boolean(:active, default: true)
+      t.json(:json_attributes)
+
+      t.timestamps
+    end
+
+    add_index(:spina_blocks_blocks, :name, unique: true)
+  end
+
+  private
+
+  def previous_version_applied?(version)
+    connection.select_value(
+      "SELECT 1 FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+
+  def cleanup_version!(version)
+    connection.execute(
+      "DELETE FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+end

data/db/migrate/3_create_spina_blocks_page_blocks.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CreateSpinaBlocksPageBlocks < ActiveRecord::Migration[7.0]
+  def change
+    if previous_version_applied?("20250101000003")
+      cleanup_version!("20250101000003")
+      return
+    end
+
+    return if connection.table_exists?(:spina_blocks_page_blocks)
+
+    create_table(:spina_blocks_page_blocks) do |t|
+      t.references(:page, null: false, foreign_key: { to_table: :spina_pages })
+      t.references(:block, null: false, foreign_key: { to_table: :spina_blocks_blocks })
+      t.integer(:position, default: 0)
+
+      t.timestamps
+    end
+
+    add_index(:spina_blocks_page_blocks, [:page_id, :block_id], unique: true)
+  end
+
+  private
+
+  def previous_version_applied?(version)
+    connection.select_value(
+      "SELECT 1 FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+
+  def cleanup_version!(version)
+    connection.execute(
+      "DELETE FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+end