maglevcms 3.0.0.beta2 → 3.0.0

data/app/components/maglev/uikit/page_actions_dropdown_component/page_actions_dropdown_component.html.erb

@@ -1,56 +1,49 @@
-<%= render Maglev::Uikit::MenuDropdownComponent.new(icon_name: icon_name) do |dropdown| %>
-  <% dropdown.with_item do %>
-    <%= link_to paths[:edit], class: dropdown.item_classes, data: { turbo_frame: '_top' } do %>
-      <%= render Maglev::Uikit::IconComponent.new(name: 'settings', class_names: 'shrink-0') %>
-      <span class="ml-2 whitespace-nowrap truncate overflow-hidden"><%= t('maglev.editor.pages.actions.edit') %></span>
-    <% end %>
+<%= render Maglev::Uikit::MenuDropdownComponent.new(icon_name: icon_name) do |menu_dropdown| %>
+  <% menu_dropdown.with_item_link_to(paths[:edit], data: { turbo_frame: '_top' }) do |menu_item| %>
+    <% menu_item.with_icon_content('settings') %>
+    <% menu_item.with_label_content(t('maglev.editor.pages.actions.edit')) %>
   <% end if allow?(:edit) %>
 
-  <% dropdown.with_item do %>    
-    <%= render Maglev::Uikit::MenuDropdownComponent.new(placement: 'right-start') do |sub_menu| %>
-      <% sub_menu.with_trigger do %>
-        <%= button_tag class: sub_menu.item_classes, data: { action: 'click->uikit-dropdown#toggle', 'uikit-dropdown-target': 'button' } do %>
-          <%= render Maglev::Uikit::IconComponent.new(name: 'preview', class_names: 'shrink-0') %>
-          <span class="ml-2 whitespace-nowrap truncate overflow-hidden"><%= t('maglev.editor.pages.actions.preview') %></span>
-        <% end %>
-      <% end %>
-      <% sub_menu.with_item do %>
-        <%= link_to t('maglev.editor.pages.actions.draft_preview'), paths[:preview], class: sub_menu.item_classes, target: '_blank' %>
-      <% end %>
-      <% sub_menu.with_item do %>
-        <%= link_to t('maglev.editor.pages.actions.live_preview'), live_url, class: sub_menu.item_classes, target: '_blank' %>
-      <% end %>
+  <% menu_dropdown.with_item_divider if allow?(:edit) %>
+
+  <% menu_dropdown.with_item_nested_menu(placement: 'right-start') do |menu_item| %>
+    <% menu_item.with_icon_content('preview') %>
+    <% menu_item.with_label_content(t('maglev.editor.pages.actions.preview')) %>
+
+    <% menu_item.with_item_link_to(paths[:preview], target: '_blank') do |sub_menu_item| %>
+      <% sub_menu_item.with_label_content(t('maglev.editor.pages.actions.draft_preview')) %>
     <% end %>
-  <% end if allow?(:preview) %>
 
-  <% dropdown.with_item do %>
-    <%= button_to paths[:clone], class: dropdown.form_item_classes, form_class: dropdown.item_classes do %>
-      <%= render Maglev::Uikit::IconComponent.new(name: 'clone', class_names: 'shrink-0') %>
-      <span class="ml-2 whitespace-nowrap truncate overflow-hidden"><%= t('maglev.editor.pages.actions.clone') %></span>
+    <% menu_item.with_item_link_to(live_url, target: '_blank') do |sub_menu_item| %>
+      <% sub_menu_item.with_label_content(t('maglev.editor.pages.actions.live_preview')) %>
+    <% end if live_url.present? %>
+
+    <% menu_item.with_item_text(variant: 'subdued') do |text_item| %>   
+      <% text_item.with_label_content(t('maglev.editor.pages.actions.no_live_preview')) %>
+    <% end if live_url.blank? %> 
+  <% end %>  
+
+  <% menu_dropdown.with_item_wrapper(data: { controller: 'copy-to-clipboard', copy_to_clipboard_source_value: live_url }) do |wrapper_item| %>
+    <% wrapper_item.with_item_button(data: { copy_to_clipboard_target: 'text', action: 'click->copy-to-clipboard#copy:prevent' }) do |menu_item| %>
+      <% menu_item.with_icon_content('clipboard') %>
+      <% menu_item.with_label_content(t('maglev.editor.pages.actions.copy_url_to_clipboard')) %>
     <% end %>
-  <% end if allow?(:clone) %>
 
-  <% dropdown.with_item do %> 
-    <div data-controller="copy-to-clipboard" data-copy-to-clipboard-source-value="<%= live_url %>">
-      <%= link_to '#', class: dropdown.item_classes, data: { copy_to_clipboard_target: 'text', action: 'click->copy-to-clipboard#copy:prevent' } do %>
-        <%= render Maglev::Uikit::IconComponent.new(name: 'clipboard', class_names: 'shrink-0') %>
-        <span class="ml-2 whitespace-nowrap truncate overflow-hidden">
-          <%= t('maglev.editor.pages.actions.copy_url_to_clipboard') %>
-        </span>                                    
-      <% end %>
-      <div class="<%= dropdown.item_classes %> hidden" data-copy-to-clipboard-target="success">
-        <%= render Maglev::Uikit::IconComponent.new(name: 'checkbox_circle', class_names: 'text-green-500 shrink-0') %>
-        <span class="ml-2 whitespace-nowrap truncate overflow-hidden text-green-500">
-          <%= t('maglev.editor.pages.actions.copy_url_to_clipboard_success') %>
-        </span>
-      </div>
-    </div>
+    <% wrapper_item.with_item_button(class: 'hidden text-green-500', data: { copy_to_clipboard_target: 'success' }) do |menu_item| %>
+      <% menu_item.with_icon_content('checkbox_circle') %>
+      <% menu_item.with_label_content(t('maglev.editor.pages.actions.copy_url_to_clipboard_success')) %>
+    <% end %>
   <% end if allow?(:copy_url_to_clipboard) %>
 
-  <% dropdown.with_item do %>
-    <%= button_to paths[:delete], method: :delete, class: dropdown.item_classes, form_class: dropdown.form_item_classes, data: { turbo_confirm: t('maglev.editor.pages.actions.confirm_delete'), turbo_frame: '_top' } do %>
-      <%= render Maglev::Uikit::IconComponent.new(name: 'delete_bin', class_names: 'shrink-0') %>
-      <span class="ml-2 whitespace-nowrap truncate overflow-hidden"><%= t('maglev.editor.pages.actions.delete') %></span>
-    <% end %>
+  <% menu_dropdown.with_item_divider if allow?(:clone) || allow?(:delete) %>
+
+  <% menu_dropdown.with_item_button_to(paths[:clone], data: { turbo_frame: '_top' }) do |menu_item| %>
+    <% menu_item.with_icon_content('clone') %>
+    <% menu_item.with_label_content(t('maglev.editor.pages.actions.clone')) %>
+  <% end if allow?(:clone) %>
+
+  <% menu_dropdown.with_item_button_to(paths[:delete], method: :delete, variant: 'danger', data: { turbo_confirm: t('maglev.editor.pages.actions.confirm_delete'), turbo_frame: '_top' }) do |menu_item| %>
+    <% menu_item.with_icon_content('delete_bin') %>
+    <% menu_item.with_label_content(t('maglev.editor.pages.actions.delete')) %>
   <% end if allow?(:delete) %>
 <% end %>

data/app/components/maglev/uikit/pagination_component/pagination_component.html.erb

@@ -27,20 +27,17 @@
     <% end %>
   </div>
 
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm">
+  <div class="hidden sm:flex sm:flex-1 sm:items-center <%= show_info? ? 'sm:justify-between' : 'sm:justify-center' %>">
+      <p class="text-sm <%= 'hidden' unless show_info? %>">
         <%== pagy_info(pagy, item_name: item_name) %>
-      </p>
-    </div>
+      </p>    
 
-    <div class="<%= 'hidden' if pagy.series.size == 1 %>">  
       <nav class="isolate inline-flex gap-1" aria-label="Pages">
         <%# Previous page link %>
         <% if pagy.prev %>
-          <%== a.(pagy.prev, left_arrow, aria_label: 'Previous', classes: 'relative inline-flex items-center rounded-sm px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0') %>
+          <%== a.(pagy.prev, left_arrow, aria_label: 'Previous', classes: 'relative inline-flex items-center rounded-xs px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0') %>
         <% else %>
-          <a role="link" aria-disabled="true" aria-label="Previous" class="relative inline-flex items-center rounded-sm px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0">
+          <a role="link" aria-disabled="true" aria-label="Previous" class="relative inline-flex items-center rounded-xs px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0">
             <%= left_arrow %>
           </a>
         <% end %>
@@ -48,9 +45,9 @@
         <%# Page links (series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]) %>
         <% pagy.series.each do |item| %>
           <% if item.is_a?(Integer) %>
-            <%== a.(item, classes: 'relative inline-flex items-center px-2.5 py-1 text-sm font-semibold text-gray-900 hover:bg-gray-100 focus:z-20 focus:outline-offset-0') %>
+            <%== a.(item, classes: 'relative inline-flex items-center px-2.5 py-1 text-sm font-semibold text-gray-900 rounded-xs hover:bg-gray-100 focus:z-20 focus:outline-offset-0') %>
           <% elsif item.is_a?(String) %>
-            <a role="link" aria-disabled="true" aria-current="page" class="relative z-10 inline-flex items-center bg-editor-primary px-2.5 py-1 text-sm font-semibold text-white focus:z-20"><%= item %></a>
+            <a role="link" aria-disabled="true" aria-current="page" class="relative z-10 inline-flex items-center rounded-xs bg-editor-primary px-2.5 py-1 text-sm font-semibold text-white focus:z-20"><%= item %></a>
           <% elsif item == :gap %>
             <a role="link" aria-disabled="true" class="relative inline-flex items-center px-2.5 py-1 text-sm font-semibold text-gray-700 focus:outline-offset-0">&hellip;</a>
           <% end %>
@@ -58,9 +55,9 @@
 
         <%# Next page link %>
         <% if pagy.next %>
-          <%== a.(pagy.next, right_arrow, aria_label: 'Next', classes: 'relative inline-flex items-center rounded-sm px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0') %>
+          <%== a.(pagy.next, right_arrow, aria_label: 'Next', classes: 'relative inline-flex items-center rounded-xs px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0') %>
         <% else %>
-          <a role="link" aria-disabled="true" aria-label="Next" class="relative inline-flex items-center rounded-sm px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0">
+          <a role="link" aria-disabled="true" aria-label="Next" class="relative inline-flex items-center rounded-xs px-1 py-1 text-gray-400 hover:bg-gray-100 focus:z-20 focus:outline-offset-0">
             <%= right_arrow %>
           </a>
         <% end %>

data/app/components/maglev/uikit/pagination_component.rb

@@ -7,10 +7,11 @@ module Maglev
 
       attr_reader :pagy, :hidden_if_single_page
 
-      def initialize(pagy:, item_name: 'item', hidden_if_single_page: true)
+      def initialize(pagy:, item_name: 'item', hidden_if_single_page: true, show_info: true)
         @pagy = pagy
         @hidden_if_single_page = hidden_if_single_page
         @item_name = item_name
+        @show_info = show_info
       end
 
       def item_name
@@ -20,6 +21,10 @@ module Maglev
       def render?
         !(hidden_if_single_page && pagy.pages < 2)
       end
+
+      def show_info?
+        @show_info
+      end
     end
   end
 end

data/app/components/maglev/uikit/section_toolbar/bottom_component.html.erb

@@ -7,7 +7,7 @@
   data-transition-leave-start="translate-y-0 opacity-100"
   data-transition-leave-end="translate-y-[50%] opacity-0"
 >
-  <%= link_to paths[:add], class: button_classes, data: { turbo_frame: '_top' } do %>
+  <%= link_to paths[:add], class: button_classes, data: { turbo_frame: 'modal' } do %>
     <%= render Maglev::Uikit::IconComponent.new(name: 'add') %>
   <% end if insert_button? %>
 </div>

data/app/components/maglev/uikit/tabs_component/tabs_component.html.erb

@@ -8,9 +8,9 @@
   <input type="hidden" name="active_tab" value="<%= active_tab_index %>" data-uikit-tabs-target="hiddenInput" />  
 
   <nav>
-    <ul class="flex flex-col sm:flex-row">
+    <ul class="flex flex-row">
       <% tabs.each_with_index do |tab, index| %>
-        <li>
+        <li class="shrink-0">
           <% if tab.link? %>
             <%= link_to tab.label, tab.link[:url], class: label_classes(active: tab.active?), **tab.link_html_options %>
           <% else %>
@@ -25,11 +25,14 @@
     </ul>
   </nav>
 
-  <div class="relative -mt-0.5"><div class="w-full border-gray-200 border-t-2 h-0"></div></div>
+  <% if variant == :default %>
+    <div class="relative -mt-0.5"><div class="w-full border-gray-200 border-t-2 h-0"></div></div>
+  <% end %>
 
   <% tabs.each_with_index do |tab, index| %>
+    <% next unless tab.block? %>
     <div data-uikit-tabs-target="tabContent" class="flex-1 mt-4 pt-2 pb-4 overflow-y-auto overflow-x-visible <%= 'hidden' unless tab.active? %>">
-      <%= capture(&tab.block) if tab.block? %>
+      <%= capture(&tab.block) %>
     </div>
   <% end %>
 </div>

data/app/components/maglev/uikit/tabs_component.rb

@@ -7,16 +7,21 @@ module Maglev
         Tab.new(self, label: label, active: active, link: link, block: block)
       }
 
-      attr_reader :container_classes, :active_tab, :active_tab_index, :disable_inputs
+      attr_reader :container_classes, :active_tab, :active_tab_index, :disable_inputs, :variant
 
       # disable_inputs: true | false (default: false) if true, the inputs of hidden tabs will not be submitted
-      def initialize(container_classes: nil, active_tab_index: nil, disable_inputs: false)
+      def initialize(container_classes: nil, active_tab_index: nil, disable_inputs: false, variant: :default)
         @container_classes = container_classes
         @active_tab_index = active_tab_index
         @disable_inputs = disable_inputs
+        @variant = variant
       end
 
       def label_classes(...)
+        variant == :pills ? pills_label_classes(...) : default_label_classes(...)
+      end
+
+      def default_label_classes(...)
         class_variants(
           base: %(
             relative py-1 pb-0 px-4 block focus:outline-none border-b-2
@@ -29,9 +34,23 @@ module Maglev
         ).render(...)
       end
 
+      def pills_label_classes(...)
+        class_variants(
+          base: %(rounded-md px-3 py-2 text-sm),
+          variants: {
+            active: 'rounded-md bg-editor-primary/10 font-semibold text-editor-primary',
+            '!active': 'text-gray-500 hover:text-gray-700 font-medium'
+          }
+        ).render(...)
+      end
+
       def before_render
-        @active_tab = tabs.find(&:active?) || tabs[active_tab_index.to_i]
-        @active_tab.active = true
+        @active_tab = tabs.find(&:active?)
+
+        return unless !@active_tab && active_tab_index != -1
+
+        @active_tab = tabs[active_tab_index.to_i]
+        @active_tab&.active = true
       end
 
       def disable_inputs?

data/app/components/maglev/uikit/well/simple_well_component.html.erb

@@ -0,0 +1,15 @@
+<div class="bg-gray-50 sm:rounded-lg">
+  <div class="px-4 py-5 sm:p-6">
+    <h3 class="text-base font-semibold text-gray-900">
+      <%= title %>
+    </h3>
+    <div class="mt-2 max-w-xl text-sm text-gray-500 space-y-2">
+      <%= description %>
+    </div>
+    <% if action? %>
+      <div class="mt-5">
+        <%= action %>
+      </div>
+    <% end %>    
+  </div>
+</div>

data/app/components/maglev/uikit/well/simple_well_component.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Uikit
+    module Well
+      class SimpleWellComponent < ViewComponent::Base
+        renders_one :title
+        renders_one :description
+        renders_one :action
+      end
+    end
+  end
+end

data/app/controllers/concerns/maglev/editor/errors_concern.rb

@@ -7,23 +7,16 @@ module Maglev
 
       included do
         around_action :handle_editor_errors
-
-        rescue_from ActiveRecord::StaleObjectError, with: :handle_stale_object
       end
 
       private
 
-      def handle_stale_object
-        respond_to do |format|
-          format.turbo_stream { render 'maglev/editor/shared/errors/stale_object_error' }
-          format.html { redirect_to editor_root_path }
-        end
-      end
-
       def handle_editor_errors
         yield
       rescue Maglev::Errors::NotAuthorized
         raise # Let the main app handle this one
+      rescue ActiveRecord::StaleObjectError
+        handle_stale_object
       rescue StandardError => e
         respond_to do |format|
           format.turbo_stream { render_turbo_stream_standard_error(e) }
@@ -31,6 +24,13 @@ module Maglev
         end
       end
 
+      def handle_stale_object
+        respond_to do |format|
+          format.turbo_stream { render 'maglev/editor/shared/errors/stale_object_error' }
+          format.html { redirect_to editor_root_path }
+        end
+      end
+
       def render_turbo_stream_standard_error(error)
         track_maglev_error(error)
         render 'maglev/editor/shared/errors/standard_error', status: :internal_server_error

data/app/controllers/concerns/maglev/editor/preview_urls_concern.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Editor
+    module PreviewUrlsConcern
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :current_maglev_page_urls, :maglev_page_live_url, :maglev_page_preview_url
+      end
+
+      private
+
+      def current_maglev_page_urls
+        {
+          path: maglev_services.get_page_fullpath.call(page: current_maglev_page, preview_mode: false,
+                                                       locale: content_locale),
+          preview: maglev_page_preview_url(current_maglev_page),
+          live: maglev_page_live_url(current_maglev_page)
+        }
+      end
+
+      def maglev_page_live_url(page)
+        maglev_services.get_page_fullpath.call(page: page, preview_mode: false, locale: content_locale)
+      end
+
+      def maglev_page_preview_url(page)
+        maglev_services.get_page_fullpath.call(page: page, preview_mode: true, locale: content_locale)
+      end
+    end
+  end
+end

data/app/controllers/concerns/maglev/editor/turbo_concern.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Editor
+    module TurboConcern
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :maglev_disable_turbo_cache?
+      end
+
+      private
+
+      def maglev_disable_turbo_cache
+        @maglev_disable_turbo_cache = true
+      end
+
+      def maglev_disable_turbo_cache?
+        !!@maglev_disable_turbo_cache
+      end
+
+      def ensure_turbo_frame_request
+        return if turbo_frame_request?
+
+        redirect_to editor_root_path
+      end
+    end
+  end
+end

data/app/controllers/concerns/maglev/errors_concern.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Maglev
+  module ErrorsConcern
+    extend ActiveSupport::Concern
+
+    included do
+      rescue_from ::Maglev::Errors::SiteNotFound, with: :handle_site_not_found if Rails.env.development?
+    end
+
+    private
+
+    def handle_site_not_found
+      render 'maglev/errors/site_not_found', layout: nil, status: :not_found
+    end
+  end
+end

data/app/controllers/concerns/maglev/flash_i18n_concern.rb

@@ -5,6 +5,7 @@ module Maglev
     private
 
     def flash_t(type, **opts)
+      controller_name = controller_path.gsub('maglev/editor/', '').gsub('/', '.')
       t("maglev.editor.flash.#{controller_name}.#{action_name}.#{type}", **opts)
     end
   end

data/app/controllers/maglev/application_controller.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Maglev
-  class ApplicationController < ::ApplicationController
+  class ApplicationController < Maglev.parent_controller_class
     include Maglev::ServicesConcern
     include Maglev::ResourceIdConcern
+    include Maglev::ErrorsConcern
 
     protect_from_forgery with: :exception
 

data/app/controllers/maglev/assets/active_storage_proxy_controller.rb

@@ -8,7 +8,8 @@ module Maglev
       private
 
       def set_blob
-        @blob = Maglev::Asset.find(resource_id).file
+        blob = Maglev::Asset.find(resource_id).file.blob
+        @blob = Maglev::ActiveStorage::ServingBlob.new(blob)
       rescue ActiveRecord::RecordNotFound
         head :not_found
       end

data/app/controllers/maglev/editor/assets_controller.rb

@@ -36,7 +36,7 @@ module Maglev
       end
 
       def per_page
-        16 # TODO: make this configurable
+        maglev_config.per_page(:assets)
       end
 
       def resources

data/app/controllers/maglev/editor/base_controller.rb

@@ -13,6 +13,8 @@ module Maglev
       include Maglev::ServicesConcern
       include Maglev::FlashI18nConcern
       include Maglev::Editor::ErrorsConcern
+      include Maglev::Editor::TurboConcern
+      include Maglev::Editor::PreviewUrlsConcern
 
       before_action :fetch_maglev_site
       before_action :fetch_maglev_page
@@ -20,9 +22,8 @@ module Maglev
 
       helper Maglev::ApplicationHelper
       helper_method :maglev_site, :maglev_theme,
-                    :current_maglev_page, :current_maglev_sections, :current_maglev_page_urls,
-                    :maglev_editing_route_context, :maglev_disable_turbo_cache?,
-                    :maglev_page_live_url, :maglev_page_preview_url
+                    :current_maglev_page, :current_maglev_sections,
+                    :maglev_editing_route_context, :unpublished_changes?
 
       private
 
@@ -61,21 +62,8 @@ module Maglev
         )
       end
 
-      def current_maglev_page_urls
-        {
-          path: maglev_services.get_page_fullpath.call(page: current_maglev_page, preview_mode: false,
-                                                       locale: content_locale),
-          preview: maglev_page_preview_url(current_maglev_page),
-          live: maglev_page_live_url(current_maglev_page)
-        }
-      end
-
-      def maglev_page_live_url(page)
-        maglev_services.get_page_fullpath.call(page: page, preview_mode: false, locale: content_locale)
-      end
-
-      def maglev_page_preview_url(page)
-        maglev_services.get_page_fullpath.call(page: page, preview_mode: true, locale: content_locale)
+      def unpublished_changes?
+        maglev_services.has_unpublished_changes.call(site: maglev_site, page: current_maglev_page, theme: maglev_theme)
       end
 
       def maglev_theme
@@ -89,20 +77,6 @@ module Maglev
         }.compact_blank
       end
 
-      def maglev_disable_turbo_cache
-        @maglev_disable_turbo_cache = true
-      end
-
-      def maglev_disable_turbo_cache?
-        !!@maglev_disable_turbo_cache
-      end
-
-      def ensure_turbo_frame_request
-        return if turbo_frame_request?
-
-        redirect_to editor_root_path
-      end
-
       def redirect_to_real_root
         redirect_to editor_real_root_path(maglev_editing_route_context)
       end

data/app/controllers/maglev/editor/pages/clone_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Editor
+    module Pages
+      class CloneController < Maglev::Editor::BaseController
+        def create
+          @source_page = maglev_page_resources.find(params[:id])
+          @page = clone_page(@source_page)
+          edit_cloned_page_path = edit_editor_page_path(@page, maglev_editing_route_context(page: @page))
+          redirect_to edit_cloned_page_path, notice: flash_t(:success), status: :see_other
+        end
+
+        private
+
+        def clone_page(page)
+          services.clone_page.call(page: page)
+        end
+      end
+    end
+  end
+end

data/app/controllers/maglev/editor/pages/discard_draft_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Editor
+    module Pages
+      class DiscardDraftController < Maglev::Editor::BaseController
+        def create
+          page = maglev_page_resources.find(params[:id])
+          services.discard_page_draft.call(
+            site: maglev_site,
+            page: page
+          )
+        end
+      end
+    end
+  end
+end

data/app/controllers/maglev/editor/pages_controller.rb

@@ -3,16 +3,16 @@
 module Maglev
   module Editor
     class PagesController < Maglev::Editor::BaseController
+      include ::Pagy::Backend
+
       before_action :set_page, only: %i[edit update destroy]
       before_action :maglev_disable_turbo_cache, only: %i[edit update new create]
 
       helper_method :query_params
 
       def index
-        @pages = services.search_pages.call(q: params[:q], content_locale: content_locale,
-                                            default_locale: default_content_locale,
-                                            with_static_pages: false,
-                                            index_first: true)
+        @pages = fetch_pages
+        @pagy, @pages = pagy(@pages, limit: per_page, page_param: 'offset') if pagination_enabled?
       end
 
       def new
@@ -58,6 +58,10 @@ module Maglev
         @page = maglev_page_resources.find(params[:id])
       end
 
+      def build_page_resource
+        maglev_page_resources.build(page_params)
+      end
+
       def page_params
         params.require(:page).permit(:title, :path,
                                      :seo_title, :meta_description,
@@ -66,11 +70,26 @@ module Maglev
       end
 
       def query_params(from_list: false)
-        { q: params[:q], from_list: params[:from_list] || from_list }.compact_blank
+        base = { q: params[:q], from_list: params[:from_list] || from_list }
+        (pagination_enabled? ? base.merge(offset: params[:offset]) : base).compact_blank
       end
 
-      def build_page_resource
-        maglev_page_resources.build(page_params)
+      def fetch_pages
+        services.search_pages.call(
+          q: params[:q],
+          content_locale: content_locale,
+          default_locale: default_content_locale,
+          with_static_pages: false,
+          index_first: true
+        )
+      end
+
+      def pagination_enabled?
+        maglev_config.pagination?(:pages)
+      end
+
+      def per_page
+        maglev_config.per_page(:pages)
       end
     end
   end