maglevcms 3.0.0.beta3 → 3.0.1

data/app/controllers/maglev/application_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Maglev
-  class ApplicationController < ::ApplicationController
+  class ApplicationController < Maglev.parent_controller_class
     include Maglev::ServicesConcern
     include Maglev::ResourceIdConcern
     include Maglev::ErrorsConcern

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

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

@@ -4,6 +4,7 @@ module Maglev
   module Editor
     class SectionBlocksController < Maglev::Editor::BaseController
       helper Maglev::Editor::SettingsHelper
+      helper_method :source_lock_version
 
       before_action :set_section
       before_action :set_section_block, only: %i[edit update destroy]
@@ -31,7 +32,6 @@ module Maglev
 
       def update
         update_section_block
-        refresh_lock_version
         flash.now[:notice] = flash_t(:success)
       end
 
@@ -59,12 +59,12 @@ module Maglev
 
       def set_section
         @section = current_maglev_sections.find { |section| section.id == params[:section_id] }
-        raise ActiveRecord::StaleObjectError unless @section
+        redirect_to editor_sections_path_with_context unless @section
       end
 
       def set_section_block
         @section_block = @section.blocks.find(params[:id])
-        raise ActiveRecord::StaleObjectError unless @section_block
+        redirect_to editor_sections_path_with_context unless @section_block
       end
 
       def update_section_block
@@ -77,12 +77,12 @@ module Maglev
         )
       end
 
-      def refresh_lock_version
-        source = @section.site_scoped? ? maglev_site : current_maglev_page
-        @section_block.lock_version = source.find_section_block_by_id(
-          @section.id,
-          @section_block.id
-        )['lock_version']
+      def lock_source
+        @section.site_scoped? ? maglev_site : current_maglev_page
+      end
+
+      def source_lock_version
+        lock_source.lock_version || 0
       end
 
       def redirect_to_section_blocks_path(success: true)
@@ -96,6 +96,10 @@ module Maglev
 
         redirect_to path, status: :see_other, **flash
       end
+
+      def editor_sections_path_with_context
+        editor_sections_path(maglev_editing_route_context)
+      end
     end
   end
 end

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

@@ -4,7 +4,9 @@ module Maglev
   module Editor
     class SectionsController < Maglev::Editor::BaseController
       helper Maglev::Editor::SettingsHelper
+      helper_method :source_lock_version
 
+      before_action :ensure_turbo_frame_request, only: [:new]
       before_action :set_section, only: %i[edit update]
 
       def show
@@ -12,8 +14,11 @@ module Maglev
       end
 
       def new
-        @grouped_sections = maglev_theme.sections.available_for(current_maglev_sections).grouped_by_category
+        set_query_and_category_id
         @position = (params[:position] || -1).to_i
+        @theme_sections = maglev_theme.sections.filter(current_maglev_sections, keyword: @query,
+                                                                                category_id: @category_id)
+        render layout: false
       end
 
       def create
@@ -34,7 +39,6 @@ module Maglev
 
       def update
         update_section
-        refresh_lock_version
         flash.now[:notice] = flash_t(:success)
       end
 
@@ -56,7 +60,7 @@ module Maglev
 
       def set_section
         @section = current_maglev_sections.find { |section| section.id == params[:id] }
-        raise ActiveRecord::StaleObjectError unless @section
+        redirect_to editor_sections_path_with_context unless @section
       end
 
       def update_section
@@ -73,6 +77,14 @@ module Maglev
         render 'index', status: :unprocessable_content
       end
 
+      def set_query_and_category_id
+        # we can't filter by both query and category_id in the same time
+        @query = params[:category_id].present? ? nil : params[:query]
+        # if no category_id is provided AND we don't have a query, we take the first category
+        @category_id = params[:category_id] || maglev_theme.section_categories.first.id
+        @category_id = nil if @query.present?
+      end
+
       def newly_added_section_to_flash
         # use flash because we can't pass directly the information to the redirect
         { section_id: @section[:id], position: current_maglev_page.position_of_section(@section[:id]) }
@@ -83,13 +95,20 @@ module Maglev
         headers['X-Section-Position'] = flash[:position]
       end
 
-      def refresh_lock_version
-        source = @section.site_scoped? ? maglev_site : current_maglev_page
-        @section.lock_version = source.find_section_by_id(@section.id)['lock_version']
+      def lock_source
+        @section.site_scoped? ? maglev_site : current_maglev_page
+      end
+
+      def source_lock_version
+        lock_source.lock_version || 0
       end
 
       def redirect_to_sections_path
-        redirect_to editor_sections_path(maglev_editing_route_context), notice: flash_t(:success), status: :see_other
+        redirect_to editor_sections_path_with_context, notice: flash_t(:success), status: :see_other
+      end
+
+      def editor_sections_path_with_context
+        editor_sections_path(maglev_editing_route_context)
       end
     end
   end

data/app/controllers/maglev/published_page_preview_controller.rb

@@ -13,6 +13,10 @@ module Maglev
     helper Maglev::PagePreviewHelper
 
     def index
+      # use the title + SEO informations from the published payload
+      # Warning: the page may not exist even in draft
+      maglev_page&.apply_published_payload
+
       render_maglev_page
     end
 

data/app/helpers/maglev/application_helper.rb

@@ -105,20 +105,20 @@ module Maglev
     def maglev_button_classes(...)
       ClassVariants.build(
         base: %(
-        rounded-xs transition-colors transition-background duration-200 text-center cursor-pointer
-        group-[.is-success]/form:bg-green-500/95 group-[.is-success]/form:hover:bg-green-500/100
+        rounded-sm transition-colors transition-background duration-200 text-center cursor-pointer
+        group-[.is-success]/form:bg-green-500 group-[.is-success]/form:hover:bg-green-500/90
         group-[.is-success]/form:disabled:bg-green-500/75
-        group-[.is-error]/form:bg-red-500/95 group-[.is-error]/form:hover:bg-red-500/100
+        group-[.is-error]/form:bg-red-500 group-[.is-error]/form:hover:bg-red-500/90
         group-[.is-error]/form:disabled:bg-red-500/75
         ),
         variants: {
           color: {
-            primary: 'text-white bg-editor-primary/95 hover:bg-editor-primary/100 disabled:bg-editor-primary/75',
+            primary: 'text-white bg-editor-primary hover:bg-editor-primary/90 disabled:bg-editor-primary/75',
             secondary: 'text-gray-800 hover:bg-gray-100'
           },
           size: {
-            big: 'flex items-center justify-center w-full px-6 py-4',
-            medium: 'inline-flex items-center justify-center px-4 py-2'
+            big: 'flex items-center justify-center w-full px-6 h-14',
+            medium: 'inline-flex items-center justify-center px-4 h-10'
           }
         },
         defaults: {

data/app/helpers/maglev/editor/section_blocks_helper.rb

@@ -39,7 +39,7 @@ module Maglev
       def add_section_block_no_dropdown_button(section, block_type)
         button_to(
           t('maglev.editor.section_blocks.index.add_button'),
-          editor_section_blocks_path(section, block_type: block_type, lock_version: section.lock_version,
+          editor_section_blocks_path(section, block_type: block_type, lock_version: source_lock_version,
                                               **maglev_editing_route_context),
           class: maglev_button_classes(size: :big),
           **section_block_button_common_attributes(section)
@@ -72,7 +72,7 @@ module Maglev
       def add_child_section_block_no_dropdown_button(section, parent_id, block_type)
         button_to(
           editor_section_blocks_path(section, block_type: block_type, parent_id: parent_id,
-                                              lock_version: section.lock_version,
+                                              lock_version: source_lock_version,
                                               **maglev_editing_route_context),
           class: maglev_icon_button_classes,
           name: 'add_child_section_block',

data/app/models/maglev/page/publishable_concern.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+module Maglev::Page::PublishableConcern
+  extend ActiveSupport::Concern
+
+  included do
+    # force JSON column for MariaDB
+    attribute :published_payload, :json
+  end
+
+  def published?
+    published_at.present?
+  end
+
+  def need_to_be_published?
+    !published? || updated_at.blank? || updated_at > published_at
+  end
+
+  # opposite of #need_to_be_published?
+  def published_and_up_to_date?
+    published? && updated_at <= published_at
+  end
+
+  def discard_draft?
+    published? && updated_at > published_at
+  end
+
+  # called when a publishedpage is being previewed
+  def apply_published_payload
+    return if !published? || published_payload.blank?
+
+    published_payload_attributes.each do |attribute|
+      send("#{attribute}=", published_payload[attribute])
+    end
+  end
+
+  # called when a page is being published
+  def update_published_payload
+    # in MySQL, default values for json columns are not supported, so we need to set an empty hash if the value is nil
+    self.published_payload ||= {}
+
+    published_payload_attributes.each do |attribute|
+      value = send(attribute.to_sym)
+
+      # in MySQL, default values for json columns are not supported, so we need to set an empty hash if the value is nil
+      value = {} if attribute.ends_with?('_translations') && value.nil?
+
+      self.published_payload[attribute] = value
+    end
+  end
+
+  private
+
+  def published_payload_attributes
+    published_payload_core_attributes + published_payload_additional_attributes
+  end
+
+  def published_payload_additional_attributes
+    # override this method to add additional attributes to the published payload
+    []
+  end
+
+  def published_payload_core_attributes
+    %w[title_translations seo_title_translations meta_description_translations og_title_translations
+       og_description_translations og_image_url_translations]
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/page.rb

@@ -11,6 +11,7 @@
 #  og_image_url_translations     :jsonb
 #  og_title_translations         :jsonb
 #  published_at                  :datetime
+#  published_payload             :jsonb
 #  sections_translations         :jsonb
 #  seo_title_translations        :jsonb
 #  title_translations            :jsonb
@@ -25,6 +26,7 @@ module Maglev
     include Maglev::SectionsConcern
     include Maglev::Page::PathConcern
     include Maglev::Page::SearchConcern
+    include Maglev::Page::PublishableConcern
 
     ## associations ##
     has_many :sections_content_stores, as: :container, dependent: :destroy
@@ -56,19 +58,6 @@ module Maglev
       false
     end
 
-    def published?
-      published_at.present?
-    end
-
-    def need_to_be_published?
-      !published? || updated_at.blank? || updated_at > published_at
-    end
-
-    # opposite of #need_to_be_published?
-    def published_and_up_to_date?
-      published? && updated_at <= published_at
-    end
-
     def translate_in(locale, source_locale)
       %i[title sections seo_title meta_description og_title og_description og_image_url].each do |attr|
         translate_attr_in(attr, locale, source_locale)

data/app/models/maglev/section/block.rb

@@ -30,6 +30,10 @@ class Maglev::Section::Block
     settings.select(&:advanced?)
   end
 
+  def empty?
+    settings.none?
+  end
+
   def as_json
     super(only: %i[name type settings root accept])
   end

data/app/models/maglev/section/content_concern.rb

@@ -85,13 +85,15 @@ module Maglev::Section::ContentConcern
     return [] if blocks.blank?
 
     blocks.map do |block|
+      next unless block.root?
+
       3.times.to_a.map do
         {
           type: block.type,
           settings: fallback_build_default_settings_content(block.settings)
         }
       end
-    end.flatten
+    end.compact.flatten
   end
 end
 # rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/section.rb

@@ -78,6 +78,14 @@ module Maglev
       "maglev.themes.#{theme.id}.sections.#{id}"
     end
 
+    def empty?
+      settings.none? && blocks.none?
+    end
+
+    def local_screenshot?
+      screenshot_timestamp.present?
+    end
+
     ## class methods ##
 
     def self.build(hash)
@@ -104,7 +112,7 @@ module Maglev
 
     class Store
       extend Forwardable
-      def_delegators :@array, :all, :first, :last, :count, :each, :each_with_index, :map, :group_by
+      def_delegators :@array, :all, :first, :last, :count, :each, :each_with_index, :map, :group_by, :any?
 
       attr_reader :array
 
@@ -134,6 +142,18 @@ module Maglev
         self.class.new(new_array)
       end
 
+      def filter(sections_content, keyword: nil, category_id: nil)
+        new_array = if keyword.present?
+                      @array.select { |section| section.name.downcase.include?(keyword.downcase) }
+                    elsif category_id.present?
+                      @array.select { |section| section.category == category_id }
+                    else
+                      @array
+                    end
+
+        self.class.new(new_array).available_for(sections_content)
+      end
+
       def as_json(**_options)
         @array.as_json
       end

data/app/models/maglev/sections_content_store.rb

@@ -14,9 +14,7 @@
 #
 # Indexes
 #
-#  index_maglev_sections_content_stores_on_published       (published)
-#  maglev_sections_content_stores_container                (container_id,container_type)
-#  maglev_sections_content_stores_container_and_published  (container_id,container_type,published)
+#  maglev_sections_content_stores_container_and_published  (container_id,container_type,published) UNIQUE
 #
 module Maglev
   class SectionsContentStore < ApplicationRecord

data/app/services/concerns/maglev/content/helpers_concern.rb

@@ -68,22 +68,19 @@ module Maglev
       end
 
       def check_section_lock_version!(source)
-        check_lock_version!(source, find_section(source), 'update_section')
+        check_lock_version!(source, 'update_section')
       end
 
       def check_block_lock_version!(source)
-        check_lock_version!(source, find_block(source), 'update_block')
+        check_lock_version!(source, 'update_block')
       end
 
-      def check_lock_version!(source, section_or_block, action_name)
+      def check_lock_version!(source, action_name)
         return if lock_version.blank? # without a lock version, we disable the lock version check
 
-        current_lock_version = section_or_block['lock_version'].to_i
+        current_lock_version = source.lock_version.to_i
+        source.lock_version = lock_version.to_i
 
-        # always increment the lock version
-        section_or_block['lock_version'] = lock_version.to_i + 1
-
-        # if the lock version is the same, we don't need to raise an error
         return if current_lock_version == lock_version.to_i
 
         raise ActiveRecord::StaleObjectError.new(source, action_name)

data/app/services/maglev/app_container.rb

@@ -8,7 +8,7 @@ module Maglev
       Maglev.config
     end
 
-    # hold the Rails request context
+    # hold the Rails HTTP request context
     dependency :context
 
     dependency :fetch_site,                 class: Maglev::FetchSite, depends_on: %i[config context]
@@ -19,7 +19,7 @@ module Maglev
     dependency :fetch_section_screenshot_path, class: Maglev::FetchSectionScreenshotPath,
                                                depends_on: :fetch_sections_path
     dependency :fetch_section_screenshot_url, class: Maglev::FetchSectionScreenshotUrl,
-                                              depends_on: :fetch_section_screenshot_path
+                                              depends_on: %i[fetch_section_screenshot_path context]
 
     dependency :fetch_collection_items, class: Maglev::FetchCollectionItems, depends_on: %i[fetch_site config]
     dependency :fetch_static_pages, class: Maglev::FetchStaticPages, depends_on: %i[config]
@@ -67,7 +67,9 @@ module Maglev
     dependency :sort_section_blocks,        class: Maglev::Content::SortSectionBlocksService,
                                             depends_on: %i[fetch_site fetch_theme]
 
+    dependency :has_unpublished_changes,    class: Maglev::HasUnpublishedChanges
     dependency :publish,                    class: Maglev::PublishService
+    dependency :discard_page_draft,         class: Maglev::DiscardPageDraftService
 
     def call
       self