maglevcms 1.8.0 → 2.0.0.beta1

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

@@ -4,22 +4,32 @@
 module Maglev::Page::PathConcern
   extend ActiveSupport::Concern
 
+  COMMON_ASSOCIATION_PATH_OPTIONS = {
+    class_name: '::Maglev::PagePath',
+    foreign_key: 'maglev_page_id',
+    inverse_of: :page
+  }.freeze
+
   included do
     ## associations ##
     has_many :paths,
-             class_name: '::Maglev::PagePath',
+             **COMMON_ASSOCIATION_PATH_OPTIONS,
              dependent: :delete_all,
-             foreign_key: 'maglev_page_id',
-             inverse_of: :page,
              autosave: true
 
+    # rubocop:disable Rails/HasManyOrHasOneDependent, Rails/InverseOf
+    has_many :canonical_paths,
+             -> { where(canonical: true) },
+             **COMMON_ASSOCIATION_PATH_OPTIONS
+    # rubocop:enable Rails/HasManyOrHasOneDependent, Rails/InverseOf
+
     ## callbacks ##
     before_validation { path } # force the initialization of a new path if it doesn't exist
     before_save :spawn_redirection, if: :spawn_redirection?
   end
 
   def default_path
-    @default_path ||= paths.find_by(locale: Maglev::I18n.default_locale)&.value
+    @default_path ||= path_hash[Maglev::I18n.default_locale]
   end
 
   def path
@@ -38,13 +48,18 @@ module Maglev::Page::PathConcern
   end
 
   def current_path
-    locale = Maglev::I18n.current_locale.to_sym
-    @memoized_paths ||= {}
-    @memoized_paths[locale] ||= paths.canonical.find_or_initialize_by(locale: locale, canonical: true)
+    locale = Maglev::I18n.current_locale
+    canonical_path_hash[locale] ||= paths.build(locale: locale, canonical: true)
+  end
+
+  def canonical_path_hash
+    @canonical_path_hash ||= canonical_paths.to_a.each_with_object({}.with_indifferent_access) do |path, memo|
+      memo[path.locale] ||= path
+    end
   end
 
   def path_hash
-    paths.build_hash
+    canonical_path_hash.transform_values(&:value)
   end
 
   def disable_spawn_redirection

data/app/models/maglev/page.rb

@@ -1,5 +1,22 @@
 # frozen_string_literal: true
 
+# == Schema Information
+#
+# Table name: maglev_pages
+#
+#  id                            :bigint           not null, primary key
+#  lock_version                  :integer
+#  meta_description_translations :jsonb
+#  og_description_translations   :jsonb
+#  og_image_url_translations     :jsonb
+#  og_title_translations         :jsonb
+#  sections_translations         :jsonb
+#  seo_title_translations        :jsonb
+#  title_translations            :jsonb
+#  visible                       :boolean          default(TRUE)
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
+#
 module Maglev
   class Page < ApplicationRecord
     ## concerns ##
@@ -42,21 +59,3 @@ module Maglev
     end
   end
 end
-
-# == Schema Information
-#
-# Table name: maglev_pages
-#
-#  id                            :bigint           not null, primary key
-#  lock_version                  :integer
-#  meta_description_translations :jsonb
-#  og_description_translations   :jsonb
-#  og_image_url_translations     :jsonb
-#  og_title_translations         :jsonb
-#  sections_translations         :jsonb
-#  seo_title_translations        :jsonb
-#  title_translations            :jsonb
-#  visible                       :boolean          default(TRUE)
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#

data/app/models/maglev/page_path.rb

@@ -1,5 +1,21 @@
 # frozen_string_literal: true
 
+# == Schema Information
+#
+# Table name: maglev_page_paths
+#
+#  id             :bigint           not null, primary key
+#  canonical      :boolean          default(TRUE)
+#  locale         :string           not null
+#  value          :string           not null
+#  maglev_page_id :bigint
+#
+# Indexes
+#
+#  canonical_speed                            (canonical,locale,value)
+#  index_maglev_page_paths_on_maglev_page_id  (maglev_page_id)
+#  scoped_canonical_speed                     (canonical,maglev_page_id,locale)
+#
 module Maglev
   class PagePath < ApplicationRecord
     ## associations ##
@@ -13,6 +29,7 @@ module Maglev
     ## validations ##
     validates :value, presence: true, exclusion: { in: Maglev.config.reserved_paths }
     validates :value, uniqueness: { scope: %i[locale canonical] }, if: :canonical?
+    validates :value, format: { without: /\s/, message: :invalid_path }
     validates :canonical, uniqueness: { scope: %i[locale maglev_page_id] }, if: :canonical?
 
     ## callbacks ##
@@ -23,7 +40,7 @@ module Maglev
 
     ## class methods ##
 
-    def self.build_hash(page_id = nil)
+    def self.canonical_value_hash(page_id = nil)
       query = page_id ? where(maglev_page_id: page_id) : all
       query.canonical.pluck(:locale, :value).to_h
     end
@@ -44,20 +61,3 @@ module Maglev
     end
   end
 end
-
-# == Schema Information
-#
-# Table name: maglev_page_paths
-#
-#  id             :bigint           not null, primary key
-#  canonical      :boolean          default(TRUE)
-#  locale         :string           not null
-#  value          :string           not null
-#  maglev_page_id :bigint
-#
-# Indexes
-#
-#  canonical_speed                            (canonical,locale,value)
-#  index_maglev_page_paths_on_maglev_page_id  (maglev_page_id)
-#  scoped_canonical_speed                     (canonical,maglev_page_id,locale)
-#

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

@@ -12,7 +12,7 @@ class Maglev::Section::Setting
   attr_accessor :id, :label, :type, :default, :options
 
   ## validations ##
-  validates :id, :label, :type, :default, 'maglev/presence': true
+  validates :id, :label, :type, 'maglev/presence': true
   validates :type, inclusion: { in: REGISTERED_TYPES }
 
   ## methods ##

data/app/models/maglev/section.rb

@@ -35,19 +35,28 @@ module Maglev
       !!viewport_fixed_position?
     end
 
+    def assign_attributes_from_yaml(hash)
+      attributes = prepare_default_attributes(hash).merge(
+        settings: ::Maglev::Section::Setting.build_many(hash['settings']),
+        blocks: ::Maglev::Section::Block.build_many(hash['blocks'])
+      )
+
+      assign_attributes(attributes)
+    end
+
     ## class methods ##
-    def self.build(hash)
-      attributes = prepare_attributes(hash)
 
-      new(
-        attributes.merge(
-          settings: ::Maglev::Section::Setting.build_many(hash['settings']),
-          blocks: ::Maglev::Section::Block.build_many(hash['blocks'])
-        )
-      )
+    def self.build(hash)
+      new.tap do |section|
+        section.assign_attributes_from_yaml(hash)
+      end
     end
 
-    def self.prepare_attributes(hash)
+    ## private methods ##
+
+    private
+
+    def prepare_default_attributes(hash)
       attributes = hash.slice(*HASH_ATTRIBUTES)
 
       %w[site_scoped singleton viewport_fixed_position max_width_pane].each do |name|

data/app/models/maglev/setting_types/link.rb

@@ -5,7 +5,7 @@ class Maglev::SettingTypes::Link < Maglev::SettingTypes::Base
   def cast_value(value)
     if value.is_a?(String)
       { text: 'Link', link_type: 'url', href: value }
-    else
+    elsif value
       { text: 'Link', link_type: 'url', href: '#' }.merge(value.symbolize_keys)
     end
   end

data/app/models/maglev/site.rb

@@ -1,5 +1,18 @@
 # frozen_string_literal: true
 
+# == Schema Information
+#
+# Table name: maglev_sites
+#
+#  id                    :bigint           not null, primary key
+#  locales               :jsonb
+#  lock_version          :integer
+#  name                  :string
+#  sections_translations :jsonb
+#  style                 :jsonb
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#
 module Maglev
   class Site < ApplicationRecord
     ## concerns ##
@@ -27,27 +40,3 @@ module Maglev
     end
   end
 end
-
-# == Schema Information
-#
-# Table name: maglev_sites
-#
-#  id                    :bigint           not null, primary key
-#  domain                :string
-#  handle                :string
-#  locales               :jsonb
-#  lock_version          :integer
-#  name                  :string
-#  navigation            :jsonb
-#  sections_translations :jsonb
-#  siteable_type         :string
-#  style                 :jsonb
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  siteable_id           :bigint
-#  theme_id              :string
-#
-# Indexes
-#
-#  index_maglev_sites_on_siteable  (siteable_type,siteable_id)
-#

data/app/services/maglev/app_container.rb

@@ -23,7 +23,7 @@ module Maglev
 
     dependency :fetch_collection_items, class: Maglev::FetchCollectionItems, depends_on: %i[fetch_site config]
     dependency :fetch_static_pages, class: Maglev::FetchStaticPages, depends_on: %i[config]
-    dependency :search_pages, class: Maglev::SearchPages, depends_on: %i[fetch_site fetch_static_pages]
+    dependency :search_pages, class: Maglev::SearchPages, depends_on: %i[fetch_site fetch_static_pages context]
 
     dependency :get_base_url,               class: Maglev::GetBaseUrl, depends_on: %i[context fetch_site]
     dependency :extract_locale,             class: Maglev::ExtractLocale
@@ -34,7 +34,7 @@ module Maglev
     dependency :add_site_locale,            class: Maglev::AddSiteLocale
     dependency :change_site_locales,        class: Maglev::ChangeSiteLocales
 
-    dependency :fetch_page,                 class: Maglev::FetchPage, depends_on: :fetch_site
+    dependency :fetch_page,                 class: Maglev::FetchPage, depends_on: %i[context fetch_site]
     dependency :get_page_fullpath,          class: Maglev::GetPageFullpath, depends_on: %i[fetch_site get_base_url]
     dependency :get_page_sections,          class: Maglev::GetPageSections,
                                             depends_on: %i[fetch_site fetch_theme

data/app/services/maglev/extract_locale.rb

@@ -22,9 +22,10 @@ module Maglev
     protected
 
     def extract_locale
-      segments = params[:path].split('/')
+      path = params[:path] || 'index'
+      segments = path.split('/')
 
-      return [default_locale, params[:path]] unless locales.include?(segments[0]&.to_sym)
+      return [default_locale, path] unless locales.include?(segments[0]&.to_sym)
 
       [segments.shift, segments.empty? ? 'index' : segments.join('/')]
     end

data/app/services/maglev/fetch_page.rb

@@ -6,6 +6,8 @@ module Maglev
   class FetchPage
     include Injectable
 
+    dependency :context
+
     argument :path
     argument :locale
     argument :default_locale

data/app/services/maglev/fetch_theme_layout.rb

@@ -7,6 +7,8 @@ module Maglev
 
     dependency :fetch_theme
 
+    argument :page
+
     def call
       'theme/layout'
     end

data/app/services/maglev/get_page_fullpath.rb

@@ -38,8 +38,7 @@ module Maglev
     end
 
     def fetch_paths
-      page_id = page.respond_to?(:path) ? page.id : page
-      Maglev::PagePath.build_hash(page_id)
+      page.respond_to?(:path_hash) ? page.path_hash : Maglev::PagePath.canonical_value_hash(page)
     end
 
     def build_fullpath(base_url, path)

data/app/services/maglev/remove_section_type.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Maglev
+  # Remove all sections of a specific type across a site and its pages
+  class RemoveSectionType
+    include Injectable
+
+    argument :site
+    argument :type
+
+    def call
+      @removed_count = 0
+
+      remove_sections
+
+      @removed_count
+    end
+
+    private
+
+    def remove_sections
+      ActiveRecord::Base.transaction do
+        remove_resource_sections(site)
+        site_pages.find_each do |page|
+          remove_resource_sections(page)
+        end
+      end
+    end
+
+    def remove_resource_sections(resource)
+      site.each_locale do
+        @removed_count += remove_sections_of_type(resource.sections, type)
+      end
+
+      resource.save!
+    end
+
+    def remove_sections_of_type(sections, type)
+      return 0 if sections.blank?
+
+      original_size = sections.size
+      sections.reject! { |section| section['type'] == type }
+      original_size - sections.size
+    end
+
+    def site_pages
+      Maglev::Page
+    end
+  end
+end

data/app/services/maglev/rename_section_type.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Maglev
+  # Rename all sections of a specific type to a new type across a site and its pages
+  class RenameSectionType
+    include Injectable
+
+    argument :site
+    argument :theme
+    argument :old_type
+    argument :new_type
+
+    def call
+      validate_section_types!
+
+      ActiveRecord::Base.transaction do
+        rename_resource_sections(site)
+        site_pages.find_each do |page|
+          rename_resource_sections(page)
+        end
+      end
+
+      true
+    end
+
+    private
+
+    def validate_section_types!
+      return if theme.sections.find(new_type)
+
+      raise Maglev::Errors::UnknownSection,
+            "New section type '#{new_type}' doesn't exist in the theme"
+    end
+
+    def rename_resource_sections(resource)
+      site.each_locale do |locale|
+        Maglev::I18n.with_locale(locale) do
+          change_section_type(resource.sections, old_type, new_type)
+        end
+      end
+
+      resource.save!
+    end
+
+    def change_section_type(sections, old_type, new_type)
+      return if sections.blank?
+
+      sections.each do |section|
+        section['type'] = new_type if section['type'] == old_type
+      end
+    end
+
+    def site_pages
+      Maglev::Page
+    end
+  end
+end

data/app/services/maglev/search_pages.rb

@@ -9,6 +9,7 @@ module Maglev
 
     dependency :fetch_site
     dependency :fetch_static_pages
+    dependency :context
 
     argument :id, default: nil
     argument :q, default: nil
@@ -54,7 +55,7 @@ module Maglev
     end
 
     def resources
-      ::Maglev::Page
+      ::Maglev::Page.includes(:canonical_paths)
     end
   end
 end

data/app/views/layouts/maglev/admin/application.html.erb

@@ -9,7 +9,7 @@
   <%= vite_javascript_tag 'admin' %>
   <%= vite_stylesheet_tag 'admin.scss' %>
   
-  <%= favicon_link_tag vite_asset_path 'images/favicon.png' %>
+  <%= favicon_link_tag vite_asset_path 'images/favicon.svg' %>
 </head>
 <body class="bg-gray-100">
   <main role="main" class="container mx-auto">

data/app/views/maglev/admin/sections/previews/show.html.erb

@@ -12,11 +12,26 @@
         Open in a new tab
       <% end %>
       <button 
-        class="bg-purple-600 hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-purple-600 focus:ring-opacity-50 rounded text-white py-2 px-3"
+        class="bg-purple-600 hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-purple-600 focus:ring-opacity-50 rounded text-white py-2 px-3 mr-3"
         data-action="click->screenshot#take"      
       >
         Take screenshot
       </button>
+      <div class="relative">
+        <button 
+          class="bg-purple-600 hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-purple-600 focus:ring-opacity-50 rounded text-white py-2 px-3"
+          data-action="click->screenshot#triggerFileInput"      
+        >
+          Upload screenshot
+        </button>
+        <input 
+          type="file" 
+          accept="image/*"
+          class="hidden"
+          data-screenshot-target="fileInput"
+          data-action="change->screenshot#handleFileUpload"
+        />
+      </div>
     </div>
   </div>
   <iframe     

data/app/views/maglev/api/collection_items/show.json.jbuilder

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+if @item
+  json.partial!('show', item: @item)
+else
+  json.nil!
+end

data/app/views/maglev/api/page_clones/create.json.jbuilder

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.partial!('/maglev/api/pages/show', page: @page)

data/app/views/maglev/editor/show.html.erb

@@ -5,9 +5,10 @@
 
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  
-  <script>
+
+  <%= javascript_tag nonce: true do %>
     window.locale = <%= h content_locale.to_json.html_safe %>;
+    window.uiLocale = <%= h editor_ui_locale.to_json.html_safe %>;
     window.baseUrl = <%= h site_base_editor_path.to_json.html_safe %>;
     window.leaveUrl = <%= site_leave_editor_path.to_json.html_safe %>;
     window.apiBaseUrl = <%= h api_base_path.to_json.html_safe %>;
@@ -18,8 +19,8 @@
     window.primaryColor = <%= editor_primary_hex_color.to_json.html_safe %>;
     window.sitePublishable = <%= editor_site_publishable.to_json %>;
     window.customTranslations = <%= h editor_custom_translations.to_json.html_safe %>
-  </script>
-  
+  <% end %>
+
   <%= vite_client_tag %>
   <%= vite_javascript_tag 'editor' %>
 
@@ -32,7 +33,7 @@
     }
   </style>
 
-  <%= render 'header' %>  
+  <%= render 'header' %>
 </head>
 <body class="h-full overflow-y-hidden font-nunito">
   <div id="maglev-app"></div>

data/config/locales/activerecord.ar.yml

@@ -0,0 +1,13 @@
+ar:
+  activerecord:
+    attributes:
+      'maglev/page':
+        cloned_title: "%{title} نسخة"
+      'maglev/page/paths':
+        value: المسار
+    errors:
+      models:
+        maglev/page_path:
+          attributes:
+            value:
+              invalid_path: "ليس مسارًا صالحًا"

data/config/locales/activerecord.en.yml

@@ -1,7 +1,13 @@
 en:
   activerecord:
     attributes:
-      'maglev/page': 
+      'maglev/page':
         cloned_title: "%{title} COPY"
       'maglev/page/paths':
-        value: Path
+        value: Path
+    errors:
+      models:
+        maglev/page_path:
+          attributes:
+            value:
+              invalid_path: "is not a valid path"

data/config/locales/activerecord.es.yml

@@ -24,3 +24,7 @@ es:
             path:
               taken: ya está en uso por otra página
               exclusion: ya está en uso por otra página
+        maglev/page_path:
+          attributes:
+            value:
+              invalid_path: "no es una ruta válida"

data/config/locales/activerecord.fr.yml

@@ -4,7 +4,7 @@ fr:
       'maglev/page': Page
 
     attributes:
-      'maglev/page': 
+      'maglev/page':
         title: Titre
         cloned_title: "%{title} COPIE"
         seo_title: Titre SEO
@@ -23,4 +23,8 @@ fr:
               blank: doît être rempli
             path:
               taken: est déjà utilisé par une autre page
-              exclusion: est déjà utilisé par une autre page
+              exclusion: est déjà utilisé par une autre page
+        maglev/page_path:
+          attributes:
+            value:
+              invalid_path: "n'est pas un chemin valide"

data/config/locales/activerecord.pt-BR.yml

@@ -0,0 +1,13 @@
+'pt-BR':
+  activerecord:
+    attributes:
+      'maglev/page':
+        cloned_title: "%{title} CÓPIA"
+      'maglev/page/paths':
+        value: Caminho
+    errors:
+      models:
+        maglev/page_path:
+          attributes:
+            value:
+              invalid_path: "não é um caminho válido" 

data/config/routes.rb

@@ -12,9 +12,7 @@ Maglev::Engine.routes.draw do
       end
       resources :assets
       resource :publication, only: %i[show create]
-      scope 'collections/:collection_id' do
-        get '/', to: 'collection_items#index', as: :collection_items
-      end
+      resources :collection_items, path: 'collections/:collection_id', only: %i[index show]
     end
   end
 
@@ -52,6 +50,7 @@ Maglev::Engine.routes.draw do
   post 'preview/(*path)', to: 'page_preview#create', defaults: { path: 'index', rendering_mode: :editor }
 
   # Public Assets
-  get 'assets/:id(/:filename)', to: 'assets#show', as: :public_asset
+  get 'assets/:id(/:filename)', to: "#{Maglev.uploader_proxy_controller_name}#show",
+                                as: :public_asset
 end
 # rubocop:enable Metrics/BlockLength

data/db/migrate/20200831101942_create_maglev_section_content.rb

@@ -1,11 +1,19 @@
 class CreateMaglevSectionContent < ActiveRecord::Migration[6.0]
   def change
     change_table :maglev_sites do |t|
-      t.jsonb :sections, default: []
+      if t.respond_to? :jsonb
+        t.jsonb :sections, default: []
+      else
+        t.json :sections, default: []
+      end
     end
 
     change_table :maglev_pages do |t|
-      t.jsonb :sections, default: []
+      if t.respond_to? :jsonb
+        t.jsonb :sections, default: []
+      else
+        t.json :sections, default: []
+      end
     end
   end
 end