spina-blocks 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e197d3a0201be80942ea3c1807a1c538312e4ca58ddf9cc0c8ce08f39a0c05'
-  data.tar.gz: 04ae851acfdbfbecf0f30486748f0283b9afa9d18c0bb8f03cde8f83fec21450
+  metadata.gz: 4bb4bd87c20dc0578090ce0f7e9b26a0ff511f79c52c1e11319527fb9a132362
+  data.tar.gz: 768fbfeb07527abc7d752e7f8af4d51ebd0e86f0e7fc643f313e11d11874de3d
 SHA512:
-  metadata.gz: 4606d45194c8fabe89c79f51a8129af1d1fb8043ec07e6601a65c3c2d5f59997c475904ee04088f6966b3a56652584c20c41c0fb15433d22589b445373276af1
-  data.tar.gz: cb7906b60e6100513d8e637759074e0e7ed6968a7a18deaa7a6b3806b93c86853efc9df43fdc0461e3c025d78f8070f6db2546bec0a60ab766929909b9440c2b
+  metadata.gz: 6887a086f16feb25de70d36706ef1f5492c8b3f2831a3e1e7d583b1e62dcf79d547fa9e46edeca27805260a3e68835d9b1234a7144df0a1affd7ef5acf548fbc
+  data.tar.gz: 3741e38abf77005b798a73bdfbfc335f10c7a6109c88551ad6c649f287761714f15aa2e4467e5d65feed3e957c233210da0411e3691dc5204b3b479311dc52a2

data/README.md

@@ -1,5 +1,7 @@
 # Spina Blocks
 
+> ⚠️ **Warning**: This plugin is not production-ready and may cause issues. Use at your own risk.
+
 A plugin for [Spina CMS](https://www.spinacms.com) that adds reusable block components. Blocks are independent content units with their own templates and fields that can be assembled into pages.
 
 ## Installation
@@ -14,9 +16,15 @@ Run:
 
 ```bash
 bundle install
-rails db:migrate
+rails generate spina:blocks:install
 ```
 
+This copies the plugin's migrations into your app and runs `db:migrate`.
+
+## Upgrading
+
+If you are upgrading from a version that used timestamp migrations (`20250101000001`–`20250101000004`), the new migrations will detect the old version numbers in your `schema_migrations` table, clean them up automatically, and skip any tables that already exist. No manual intervention is needed.
+
 ## Configuration
 
 ### Theme setup
@@ -111,6 +119,24 @@ theme.parts = [
 ]
 ```
 
+#### Filtering blocks by template
+
+By default, `BlockReference` and `BlockCollection` show all active blocks in their selects. To limit the list to blocks of a specific template, pass `block_template` in the part's `options`:
+
+```ruby
+theme.parts = [
+  { name: "hero_block", title: "Hero Block",
+    part_type: "Spina::Parts::BlockReference",
+    options: { block_template: "hero" } },
+
+  { name: "sidebar_blocks", title: "Sidebar Blocks",
+    part_type: "Spina::Parts::BlockCollection",
+    options: { block_template: "sidebar_widget" } }
+]
+```
+
+With this configuration, the "Hero Block" select will only show blocks created with the `hero` template, and "Sidebar Blocks" will only show `sidebar_widget` blocks. If `options` is omitted or does not contain `block_template`, all active blocks are shown (the default behavior).
+
 Then in your template:
 
 ```erb
@@ -125,10 +151,10 @@ Then in your template:
 
 ## Models
 
-| Model | Description |
-|-------|-------------|
-| `Spina::Blocks::Block` | Reusable content block with template and parts |
-| `Spina::Blocks::Category` | Block category for organizing the library |
+| Model                      | Description                                        |
+| -------------------------- | -------------------------------------------------- |
+| `Spina::Blocks::Block`     | Reusable content block with template and parts     |
+| `Spina::Blocks::Category`  | Block category for organizing the library          |
 | `Spina::Blocks::PageBlock` | Join model linking blocks to pages (with position) |
 
 ## Admin interface
@@ -142,13 +168,13 @@ The plugin adds:
 
 ## Helper methods
 
-| Helper | Description |
-|--------|-------------|
-| `render_blocks(page)` | Render all blocks attached to a page via PageBlocks |
-| `render_block(block)` | Render a single block using its template partial |
-| `block_content(block, :part_name)` | Access a block's content |
-| `block_has_content?(block, :part_name)` | Check if a block has content |
+| Helper                                  | Description                                         |
+| --------------------------------------- | --------------------------------------------------- |
+| `render_blocks(page)`                   | Render all blocks attached to a page via PageBlocks |
+| `render_block(block)`                   | Render a single block using its template partial    |
+| `block_content(block, :part_name)`      | Access a block's content                            |
+| `block_has_content?(block, :part_name)` | Check if a block has content                        |
 
 ## License
 
-MIT
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,4 +1,22 @@
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
+
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
+# The engine.rake mechanism auto-appends db/migrate/ from ENGINE_ROOT to the
+# migration paths. This causes ordering issues because engine migrations use
+# sequential versions (1, 2, 3, 4) that sort before the timestamped copies in
+# spec/dummy/db/migrate/. Since we copy engine migrations to the dummy app via
+# railties:install:migrations, we remove the engine source path to avoid
+# duplicates and ordering problems.
+Rake::Task["app:db:load_config"].enhance do
+  engine_migrate = File.expand_path("db/migrate", ENGINE_ROOT)
+  ActiveRecord::Tasks::DatabaseTasks.migrations_paths.delete(engine_migrate)
+end
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(spec: "app:db:test:prepare")
+
+task default: :spec

data/app/assets/javascripts/spina/controllers/block_collection_controller.js

@@ -2,24 +2,36 @@ import { Controller } from "@hotwired/stimulus";
 import Sortable from "libraries/sortablejs";
 
 export default class extends Controller {
+  #abortController = null;
+  #modalWasOpen = false;
+  #modalObserver = null;
+
+  get #searchQuery() {
+    return this.hasSearchInputTarget ? this.searchInputTarget.value : "";
+  }
+
   static get targets() {
     return [
       "list",
       "hiddenFields",
       "dropdown",
-      "addButton",
+      "searchInput",
       "emptyMessage",
       "listItemTemplate",
       "groupHeaderTemplate",
       "dropdownOptionTemplate",
       "dropdownEmptyTemplate",
+      "newBlockTemplate",
     ];
   }
 
   static get values() {
     return {
-      blocks: Array, // [{id, title, templateName, templateTitle}]
+      blocks: Array, // [{id, name, templateName, templateTitle}]
       selectedIds: Array, // [id, id, ...]
+      editUrl: String, // base edit_modal URL with __ID__ placeholder
+      newUrl: String, // URL for new block modal
+      blocksDataUrl: String, // JSON endpoint to refresh blocks list
     };
   }
 
@@ -35,10 +47,17 @@ export default class extends Controller {
       onEnd: this.reorderHiddenFields.bind(this),
     });
     this.render();
+    this.#observeModal();
   }
 
   disconnect() {
     if (this.sortable) this.sortable.destroy();
+    if (this.#modalObserver) {
+      this.#modalObserver.disconnect();
+      this.#modalObserver = null;
+    }
+    this.#abortController?.abort();
+    this.#abortController = null;
   }
 
   // --- Actions ---
@@ -49,6 +68,9 @@ export default class extends Controller {
     if (this.selectedIdsValue.indexOf(id) !== -1) return;
 
     this.selectedIdsValue = this.selectedIdsValue.concat([id]);
+    if (this.hasSearchInputTarget) {
+      this.searchInputTarget.value = "";
+    }
     this.render();
     this.closeDropdown();
   }
@@ -60,19 +82,23 @@ export default class extends Controller {
     this.render();
   }
 
-  toggleDropdown(event) {
-    event.preventDefault();
-    event.stopPropagation();
-    const dropdown = this.dropdownTarget;
-    if (dropdown.style.display === "none" || dropdown.style.display === "") {
-      this.openDropdown();
-    } else {
-      this.closeDropdown();
-    }
+  onSearchInput() {
+    this.renderDropdown();
+    this.openDropdown();
+  }
+
+  onSearchFocus() {
+    this.renderDropdown();
+    this.openDropdown();
   }
 
   closeOnOutsideClick(event) {
-    if (!this.element.contains(event.target)) {
+    const clickedInsideSearch =
+      this.hasSearchInputTarget &&
+      this.searchInputTarget.contains(event.target);
+    const clickedInsideDropdown = this.dropdownTarget.contains(event.target);
+
+    if (!clickedInsideSearch && !clickedInsideDropdown) {
       this.closeDropdown();
     }
   }
@@ -117,43 +143,74 @@ export default class extends Controller {
   }
 
   renderDropdown() {
-    const availableBlocks = this.blocksValue.filter((b) => {
+    let availableBlocks = this.blocksValue.filter((b) => {
       return this.selectedIdsValue.indexOf(b.id) === -1;
     });
 
+    // Filter by search query
+    const query = this.#searchQuery.toLowerCase().trim();
+    if (query) {
+      availableBlocks = availableBlocks.filter((b) => {
+        return (
+          b.name.toLowerCase().includes(query) ||
+          (b.templateTitle && b.templateTitle.toLowerCase().includes(query)) ||
+          (b.templateName && b.templateName.toLowerCase().includes(query))
+        );
+      });
+    }
+
     this.dropdownTarget.innerHTML = "";
 
     if (availableBlocks.length === 0) {
       const empty = this.dropdownEmptyTemplateTarget.content.cloneNode(true);
       this.dropdownTarget.appendChild(empty);
-      return;
-    }
+    } else {
+      // Group by templateTitle
+      const groups = {};
+      availableBlocks.forEach((b) => {
+        const key = b.templateTitle || b.templateName || "Other";
+        if (!groups[key]) groups[key] = [];
+        groups[key].push(b);
+      });
 
-    // Group by templateTitle
-    const groups = {};
-    availableBlocks.forEach((b) => {
-      const key = b.templateTitle || b.templateName || "Other";
-      if (!groups[key]) groups[key] = [];
-      groups[key].push(b);
-    });
+      Object.keys(groups)
+        .sort()
+        .forEach((groupName) => {
+          const header = this.groupHeaderTemplateTarget.content.cloneNode(true);
+          header.querySelector("[data-role='group-name']").textContent =
+            groupName;
+          this.dropdownTarget.appendChild(header);
 
-    Object.keys(groups)
-      .sort()
-      .forEach((groupName) => {
-        const header = this.groupHeaderTemplateTarget.content.cloneNode(true);
-        header.querySelector("[data-role='group-name']").textContent =
-          groupName;
-        this.dropdownTarget.appendChild(header);
-
-        groups[groupName].forEach((block) => {
-          const option =
-            this.dropdownOptionTemplateTarget.content.cloneNode(true);
-          const button = option.querySelector("button");
-          button.dataset.blockId = block.id;
-          option.querySelector("[data-role='title']").textContent = block.title;
-          this.dropdownTarget.appendChild(option);
+          groups[groupName].forEach((block) => {
+            const option =
+              this.dropdownOptionTemplateTarget.content.cloneNode(true);
+            const button = option.querySelector("button");
+            button.dataset.blockId = block.id;
+            option.querySelector("[data-role='title']").textContent =
+              block.name;
+            this.dropdownTarget.appendChild(option);
+          });
         });
-      });
+    }
+
+    // "New block" link at the bottom of the dropdown
+    if (
+      this.hasNewBlockTemplateTarget &&
+      this.hasNewUrlValue &&
+      this.newUrlValue
+    ) {
+      const newBlock = this.newBlockTemplateTarget.content.cloneNode(true);
+      const link = newBlock.querySelector("[data-role='new-block-link']");
+      if (link) {
+        link.href = this.newUrlValue;
+      }
+      this.dropdownTarget.appendChild(newBlock);
+    }
+
+    // Reposition if dropdown is currently visible
+    if (this.dropdownTarget.style.display !== "none") {
+      this.#positionDropdown();
+    }
   }
 
   renderEmptyMessage() {
@@ -169,12 +226,18 @@ export default class extends Controller {
     const fragment = this.listItemTemplateTarget.content.cloneNode(true);
     const root = fragment.querySelector("[data-block-id]");
     root.dataset.blockId = block.id;
-    fragment.querySelector("[data-role='title']").textContent = block.title;
+    fragment.querySelector("[data-role='title']").textContent = block.name;
     fragment.querySelector("[data-role='template-label']").textContent =
       "(" + (block.templateTitle || block.templateName) + ")";
     fragment.querySelector(
       "[data-action='block-collection#remove']",
     ).dataset.blockId = block.id;
+
+    const editLink = fragment.querySelector("[data-role='edit-link']");
+    if (editLink && this.hasEditUrlValue && this.editUrlValue) {
+      editLink.href = this.editUrlValue.replace("__ID__", block.id);
+    }
+
     return fragment;
   }
 
@@ -190,20 +253,101 @@ export default class extends Controller {
   }
 
   openDropdown() {
+    if (this.dropdownTarget.style.display === "block") {
+      // Already open, just reposition
+      this.#positionDropdown();
+      return;
+    }
+
     this.dropdownTarget.style.display = "block";
-    this._outsideClickHandler = this.closeOnOutsideClick.bind(this);
-    document.addEventListener("click", this._outsideClickHandler, true);
+    this.#positionDropdown();
+
+    this.#abortController = new AbortController();
+    const { signal } = this.#abortController;
+
+    document.addEventListener("click", (e) => this.closeOnOutsideClick(e), {
+      capture: true,
+      signal,
+    });
+
+    let scrollTimeout;
+    const debouncedPosition = () => {
+      clearTimeout(scrollTimeout);
+      scrollTimeout = setTimeout(() => this.#positionDropdown(), 100);
+    };
+    window.addEventListener("scroll", debouncedPosition, {
+      capture: true,
+      signal,
+    });
+    window.addEventListener("resize", debouncedPosition, { signal });
   }
 
   closeDropdown() {
     this.dropdownTarget.style.display = "none";
-    if (this._outsideClickHandler) {
-      document.removeEventListener("click", this._outsideClickHandler, true);
-      this._outsideClickHandler = null;
+    if (this.hasSearchInputTarget) {
+      this.searchInputTarget.value = "";
     }
+    this.#abortController?.abort();
+    this.#abortController = null;
   }
 
   findBlock(id) {
     return this.blocksValue.find((b) => b.id === id);
   }
+
+  // --- Private ---
+
+  #positionDropdown() {
+    const dropdown = this.dropdownTarget;
+    const container = dropdown.parentElement;
+    const containerRect = container.getBoundingClientRect();
+    const dropdownHeight = dropdown.offsetHeight;
+    const viewportHeight = window.innerHeight;
+
+    const spaceBelow = viewportHeight - containerRect.bottom;
+    const spaceAbove = containerRect.top;
+
+    if (spaceBelow < dropdownHeight && spaceAbove > spaceBelow) {
+      // Not enough space below and more space above, show above
+      dropdown.style.bottom = "100%";
+      dropdown.style.top = "auto";
+      dropdown.style.marginBottom = "4px";
+      dropdown.style.marginTop = "0";
+    } else {
+      // Default: show below
+      dropdown.style.bottom = "auto";
+      dropdown.style.top = "100%";
+      dropdown.style.marginTop = "4px";
+      dropdown.style.marginBottom = "0";
+    }
+  }
+
+  #observeModal() {
+    const modalFrame = document.querySelector("turbo-frame[id='modal']");
+    if (!modalFrame || !this.hasBlocksDataUrlValue || !this.blocksDataUrlValue)
+      return;
+
+    this.#modalWasOpen = false;
+    this.#modalObserver = new MutationObserver(() => {
+      const hasModal = modalFrame.querySelector(".modal");
+      if (hasModal) {
+        this.#modalWasOpen = true;
+      } else if (this.#modalWasOpen) {
+        this.#modalWasOpen = false;
+        this.refreshBlocks();
+      }
+    });
+    this.#modalObserver.observe(modalFrame, { childList: true });
+  }
+
+  refreshBlocks() {
+    fetch(this.blocksDataUrlValue, {
+      headers: { Accept: "application/json" },
+    })
+      .then((response) => response.json())
+      .then((blocks) => {
+        this.blocksValue = blocks;
+        this.render();
+      });
+  }
 }

data/app/controllers/spina/blocks/admin/blocks_controller.rb

@@ -7,13 +7,13 @@ module Spina
         admin_section :content
 
         before_action :set_locale
-        before_action :set_block, only: %i[edit edit_content update destroy]
-        before_action :set_tabs, only: %i[edit update]
+        before_action :set_block, only: [:edit, :edit_content, :edit_modal, :update, :destroy]
+        before_action :set_tabs, only: [:edit, :edit_modal, :update]
 
         helper ::Spina::Admin::PagesHelper
 
         def index
-          add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path
+          add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path)
 
           @block_templates = current_theme.try(:block_templates) || []
 
@@ -29,24 +29,37 @@ module Spina
         def new
           @block_templates = current_theme.try(:block_templates) || []
           @block = Spina::Blocks::Block.new(block_template: params[:block_template])
+          @modal = params[:modal]
         end
 
         def create
           @block = Spina::Blocks::Block.new(block_params)
           if @block.save
-            redirect_to spina.edit_blocks_admin_block_url(@block)
+            if params[:modal]
+              redirect_to(spina.edit_modal_blocks_admin_block_url(@block))
+            else
+              redirect_to(spina.edit_blocks_admin_block_url(@block))
+            end
           else
             @block_templates = current_theme.try(:block_templates) || []
-            render turbo_stream: turbo_stream.update(
-              helpers.dom_id(@block, :new_block_form),
-              partial: 'new_block_form'
-            )
+            if params[:modal]
+              @modal = true
+              render(turbo_stream: turbo_stream.update(
+                helpers.dom_id(@block, :new_block_modal_form),
+                partial: "new_block_modal_form",
+              ))
+            else
+              render(turbo_stream: turbo_stream.update(
+                helpers.dom_id(@block, :new_block_form),
+                partial: "new_block_form",
+              ))
+            end
           end
         end
 
         def edit
-          add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path, class: 'text-gray-400'
-          add_breadcrumb @block.title
+          add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path, class: "text-gray-400")
+          add_breadcrumb(@block.name)
         end
 
         def edit_content
@@ -55,33 +68,56 @@ module Spina
           end&.dig(:parts) || []
         end
 
+        def edit_modal
+        end
+
         def update
           Mobility.locale = @locale
           if @block.update(block_params)
-            flash[:success] = I18n.t('spina.blocks.saved')
-            redirect_to spina.edit_blocks_admin_block_url(@block, params: { locale: @locale })
+            if params[:modal]
+              render(turbo_stream: turbo_stream.update("modal", ""))
+            else
+              flash[:success] = I18n.t("spina.blocks.saved")
+              redirect_to(spina.edit_blocks_admin_block_url(@block, params: { locale: @locale }))
+            end
+          elsif params[:modal]
+            flash.now[:error] = I18n.t("spina.blocks.couldnt_be_saved")
+            render(:edit_modal, status: :unprocessable_entity)
           else
-            add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path, class: 'text-gray-400'
+            add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path, class: "text-gray-400")
             Mobility.locale = I18n.locale
-            add_breadcrumb @block.title
-            flash.now[:error] = I18n.t('spina.blocks.couldnt_be_saved')
-            render :edit, status: :unprocessable_entity
+            add_breadcrumb(@block.name)
+            flash.now[:error] = I18n.t("spina.blocks.couldnt_be_saved")
+            render(:edit, status: :unprocessable_entity)
           end
         end
 
+        def blocks_data
+          blocks = Spina::Blocks::Block.active.sorted
+          template_titles = build_template_titles
+          render(json: blocks.map do |b|
+            {
+              id: b.id,
+              name: b.name,
+              templateName: b.block_template.to_s,
+              templateTitle: template_titles[b.block_template.to_s] || b.block_template.to_s.titleize,
+            }
+          end)
+        end
+
         def sort
           params[:ids].each.with_index do |id, index|
             Spina::Blocks::Block.where(id: id).update_all(position: index + 1)
           end
 
-          flash.now[:info] = I18n.t('spina.blocks.sorting_saved')
+          flash.now[:info] = I18n.t("spina.blocks.sorting_saved")
           render_flash
         end
 
         def destroy
-          flash[:info] = I18n.t('spina.blocks.deleted')
+          flash[:info] = I18n.t("spina.blocks.deleted")
           @block.destroy
-          redirect_to spina.blocks_admin_blocks_url
+          redirect_to(spina.blocks_admin_blocks_url)
         end
 
         private
@@ -95,7 +131,15 @@ module Spina
         end
 
         def set_tabs
-          @tabs = %w[block_content block_settings]
+          @tabs = ["block_content", "block_settings"]
+        end
+
+        def build_template_titles
+          titles = {}
+          (current_theme.try(:block_templates) || []).each do |bt|
+            titles[bt[:name].to_s] = bt[:title].to_s
+          end
+          titles
         end
 
         def block_params

data/app/controllers/spina/blocks/admin/categories_controller.rb

@@ -12,18 +12,18 @@ module Spina
 
         def edit
           @category = Spina::Blocks::Category.find(params[:id])
-          add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path, class: 'text-gray-400'
-          add_breadcrumb @category.label
+          add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path, class: "text-gray-400")
+          add_breadcrumb(@category.label)
         end
 
         def update
           @category = Spina::Blocks::Category.find(params[:id])
           if @category.update(category_params)
-            flash[:success] = I18n.t('spina.block_categories.saved')
-            redirect_to spina.blocks_admin_blocks_url
+            flash[:success] = I18n.t("spina.block_categories.saved")
+            redirect_to(spina.blocks_admin_blocks_url)
           else
-            flash.now[:error] = I18n.t('spina.block_categories.couldnt_be_saved')
-            render :edit, status: :unprocessable_entity
+            flash.now[:error] = I18n.t("spina.block_categories.couldnt_be_saved")
+            render(:edit, status: :unprocessable_entity)
           end
         end
 

data/app/controllers/spina/blocks/admin/page_blocks_controller.rb

@@ -9,9 +9,9 @@ module Spina
         before_action :set_page
 
         def index
-          add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path, class: 'text-gray-400'
-          add_breadcrumb @page.title, spina.edit_admin_page_path(@page), class: 'text-gray-400'
-          add_breadcrumb I18n.t('spina.page_blocks.title')
+          add_breadcrumb(I18n.t("spina.website.pages"), spina.admin_pages_path, class: "text-gray-400")
+          add_breadcrumb(@page.title, spina.edit_admin_page_path(@page), class: "text-gray-400")
+          add_breadcrumb(I18n.t("spina.page_blocks.title"))
 
           @page_blocks = @page.page_blocks.sorted.includes(:block)
           @available_blocks = Spina::Blocks::Block.active.sorted.where.not(id: @page.block_ids)
@@ -22,19 +22,19 @@ module Spina
           @page_block.position = @page.page_blocks.maximum(:position).to_i + 1
 
           if @page_block.save
-            flash[:success] = I18n.t('spina.page_blocks.added')
+            flash[:success] = I18n.t("spina.page_blocks.added")
           else
-            flash[:error] = I18n.t('spina.page_blocks.couldnt_be_added')
+            flash[:error] = I18n.t("spina.page_blocks.couldnt_be_added")
           end
 
-          redirect_to spina.blocks_admin_page_page_blocks_url(page_id: @page.id)
+          redirect_to(spina.blocks_admin_page_page_blocks_url(page_id: @page.id))
         end
 
         def destroy
           @page_block = @page.page_blocks.find(params[:id])
           @page_block.destroy
-          flash[:info] = I18n.t('spina.page_blocks.removed')
-          redirect_to spina.blocks_admin_page_page_blocks_url(page_id: @page.id)
+          flash[:info] = I18n.t("spina.page_blocks.removed")
+          redirect_to(spina.blocks_admin_page_page_blocks_url(page_id: @page.id))
         end
 
         def sort
@@ -42,7 +42,7 @@ module Spina
             @page.page_blocks.where(id: id).update_all(position: index + 1)
           end
 
-          flash.now[:info] = I18n.t('spina.page_blocks.sorting_saved')
+          flash.now[:info] = I18n.t("spina.page_blocks.sorting_saved")
           render_flash
         end