alchemy_cms 6.0.12 → 6.1.1

data/app/views/alchemy/admin/partials/_routes.html.erb

@@ -34,6 +34,7 @@
     order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
     link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>',
     api_pages_path: '<%= alchemy.api_pages_path %>',
-    api_elements_path: '<%= alchemy.api_elements_path %>'
+    api_elements_path: '<%= alchemy.api_elements_path %>',
+    api_ingredients_path: '<%= alchemy.api_ingredients_path %>'
   };
 </script>

data/app/views/alchemy/ingredients/_headline_editor.html.erb

@@ -1,3 +1,6 @@
+<% has_level_select = headline_editor.level_options.many? %>
+<% has_size_select = headline_editor.size_options.many? %>
+
 <%= content_tag :div,
   class: headline_editor.css_classes,
   data: headline_editor.data_attributes do %>
@@ -5,26 +8,25 @@
     <%= ingredient_label(headline_editor) %>
     <%= f.text_field :value, id: nil %>
 
-    <div class="input-row">
-      <% if headline_editor.level_options.length > 1 %>
-        <div class="input-column">
-          <%= f.label :level %>
-          <%= f.select :level,
-            options_for_select(headline_editor.level_options, headline_editor.level),
-            {},
-            { class: "alchemy_selectbox full_width" } %>
-        </div>
-      <% end %>
+    <% if headline_editor.settings[:anchor] %>
+      <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>
+    <% end %>
+
+    <% if has_level_select %>
+      <div class="input-addon right<%= " second" if has_size_select %>">
+        <%= f.select :level,
+          options_for_select(headline_editor.level_options, headline_editor.level),
+          {},
+          { class: "custom-select", title: f.object.class.human_attribute_name(:level) } %>
+      </div>
+    <% end %>
 
-      <% if headline_editor.size_options.length > 1 %>
-        <div class="input-column">
-          <%= f.label :size %>
-          <%= f.select :size,
-            options_for_select(headline_editor.size_options, headline_editor.size),
-            {},
-            { class: "alchemy_selectbox full_width" } %>
-        </div>
-      <% end %>
-    </div>
+    <% if has_size_select %>
+      <div class="input-addon right">
+        <%= f.select :size, options_for_select(headline_editor.size_options, headline_editor.size),
+          {},
+          { class: "custom-select", title: f.object.class.human_attribute_name(:size) } %>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_headline_view.html.erb

@@ -2,6 +2,7 @@
 
 <%= content_tag "h#{headline_view.level}",
     headline_view.value,
+    id: headline_view.dom_id.presence,
     class: [
       headline_view.size ? "h#{headline_view.size}" : nil,
       html_options[:class]

data/app/views/alchemy/ingredients/_text_editor.html.erb

@@ -9,6 +9,9 @@
       class: text_editor.settings[:linkable] ? "text_with_icon" : "",
       id: nil,
       type: text_editor.settings[:input_type] || "text" %>
+    <% if text_editor.settings[:anchor] %>
+      <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: text_editor %>
+    <% end %>
     <% if text_editor.settings[:linkable] %>
       <%= f.hidden_field :link, "data-link-value": true, id: nil %>
       <%= f.hidden_field :link_title, "data-link-title": true, id: nil %>

data/app/views/alchemy/ingredients/_text_view.html.erb

@@ -1,13 +1,17 @@
 <%- options = local_assigns.fetch(:options, {}) -%>
 <%- html_options = local_assigns.fetch(:html_options, {}) -%>
-<%- if text_view.link.blank? ||
-    text_view.settings_value(:disable_link, options) -%>
-<%= text_view.value -%>
+<%- if text_view.link.blank? || text_view.settings_value(:disable_link, options) -%>
+  <%- if text_view.dom_id.present? -%>
+    <%= content_tag :a, text_view.value, id: text_view.dom_id %>
+  <% else %>
+    <%= text_view.value -%>
+  <%- end -%>
 <%- else -%>
   <%= link_to(
     text_view.value,
     url_for(text_view.link),
     {
+      id: text_view.dom_id.presence,
       title: text_view.link_title,
       target: (text_view.link_target == "blank" ? "_blank" : nil),
       'data-link-target' => text_view.link_target

data/app/views/alchemy/ingredients/shared/_anchor.html.erb

@@ -0,0 +1,9 @@
+<span class="edit-ingredient-anchor-link">
+  <%= link_to_dialog render_icon(:bookmark, { style: ingredient_editor.dom_id.present? ? "solid" : "regular" }),
+    alchemy.edit_admin_ingredient_path(id: ingredient_editor.id),
+    {
+      title: Alchemy.t(:edit_anchor),
+      size: "380x125"
+    },
+    title: Alchemy.t(:edit_anchor) %>
+</span>

data/app/views/alchemy/messages_mailer/contact_form_mail.de.text.erb

@@ -1,3 +1,5 @@
+<!-- Diese Vorlage stimmt mit den config Mailer-Feldern überein. Wenn Sie die Konfiguration ändern, erstellen Sie bitte eine eigene Datei -->
+
 <%= @message.message %>
 
 --

data/app/views/alchemy/messages_mailer/contact_form_mail.en.text.erb

@@ -1,3 +1,5 @@
+<!-- This template matches the config mailer fields. If you change the config, please create your own file: app/views/alchemy/messages_mailer/contact_form_mail.text.erb -->
+
 <%= @message.message %>
 
 --

data/app/views/alchemy/messages_mailer/contact_form_mail.es.text.erb

@@ -1,3 +1,5 @@
+<!-- Esta plantilla coincide con los campos de correo config. Si cambia la configuración, cree su propio archivo -->
+
 <%= @message.message %>
 
 --

data/config/locales/alchemy.en.yml

@@ -228,7 +228,8 @@ en:
 
     add_nested_element: "Add %{name}"
     anchor: 'Anchor'
-    anchor_link_headline: "You can link to an element anchor from the actual page."
+    anchor_link_headline: You can link to an anchor from the current page.
+    automatic_anchor_notice: The anchor is generated automatically.
     attribute_fixed: Value can't be changed for this page type
     back: 'back'
     locked_pages: "Active pages"
@@ -467,7 +468,7 @@ en:
     image_name: "Name: %{name}"
     image_title: "Title-tag"
     internal_link_headline: "Search for a page to link to by entering its name into the Page select."
-    internal_link_page_elements_explanation: "Additionally you can choose an anchor to an element from selected page."
+    internal_link_page_elements_explanation: "Additionally you can choose an anchor to link to from selected page."
     "item copied to clipboard": "Copied %{name} to clipboard"
     "item moved to clipboard": "Moved %{name} to clipboard"
     "item removed from clipboard": "Removed %{name} from clipboard"
@@ -593,6 +594,7 @@ en:
     saved_link: "Link saved."
     search: "search"
     search_engines: "Search engines"
+    fulltext_search: "Fulltext search"
     select_element: "Select element"
     seperate_tags_with_comma: "Seperate tags with comma"
     show_element_content: "Show content of this element."
@@ -845,6 +847,8 @@ en:
         crop_from: Crop from
         crop_size: Crop size
         picture_id: Bild
+      alchemy/ingredient:
+        dom_id: Anchor
       alchemy/language:
         country_code: "Country code"
         language_code: "Language code"
@@ -876,6 +880,7 @@ en:
         page_layout: "Page type"
         public: "public"
         restricted: "restricted"
+        searchable: "show in search"
         robot_follow: "robot may follow links"
         robot_index: "allow robot to index"
         sitemap: "visible in sitemap"

data/config/routes.rb

@@ -126,6 +126,7 @@ Alchemy::Engine.routes.draw do
 
   namespace :api, defaults: { format: "json" } do
     resources :contents, only: [:index, :show]
+    resources :ingredients, only: [:index]
 
     resources :elements, only: [:index, :show] do
       get "/contents" => "contents#index", as: "contents"

data/db/migrate/20230123112425_add_searchable_to_alchemy_pages.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddSearchableToAlchemyPages < ActiveRecord::Migration[6.0]
+  def change
+    return if column_exists?(:alchemy_pages, :searchable)
+
+    add_column :alchemy_pages, :searchable, :boolean, default: true, null: false
+  end
+end

data/lib/alchemy/deprecation.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Alchemy
-  Deprecation = ActiveSupport::Deprecation.new("6.1", "Alchemy")
+  Deprecation = ActiveSupport::Deprecation.new("7.0", "Alchemy")
 end

data/lib/alchemy/error_tracking/error_logger.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class ErrorLogger < BaseHandler
+      def self.call(exception)
+        ::Rails.logger.tagged("alchemy_cms") do
+          ::Rails.logger.error("#{exception.class.name}: #{exception.message} in #{exception.backtrace.first}")
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/error_tracking.rb

@@ -9,6 +9,8 @@ module Alchemy
     end
 
     mattr_accessor :notification_handler
-    @@notification_handler = BaseHandler
   end
 end
+
+require "alchemy/error_tracking/error_logger"
+Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::ErrorLogger

data/lib/alchemy/page_layout.rb

@@ -41,112 +41,8 @@ module Alchemy
         all.detect { |a| a["name"].casecmp(name).zero? }
       end
 
-      def get_all_by_attributes(attributes)
-        return [] if attributes.blank?
-
-        if attributes.is_a? Hash
-          layouts = []
-          attributes.stringify_keys.each do |key, value|
-            result = all.select { |l| l.key?(key) && l[key].to_s.casecmp(value.to_s).zero? }
-            layouts += result unless result.empty?
-          end
-          layouts
-        else
-          []
-        end
-      end
-
-      # Returns page layouts ready for Rails' select form helper.
-      #
-      def layouts_for_select(language_id, only_layoutpages = false)
-        @map_array = []
-        mapped_layouts_for_select(selectable_layouts(language_id, only_layoutpages))
-      end
-
-      # Returns all layouts that can be used for creating a new page.
-      #
-      # It removes all layouts from available layouts that are unique and already taken and that are marked as hide.
-      #
-      # @param [Fixnum]
-      #   language_id of current used Language.
-      # @param [Boolean] (false)
-      #   Pass true to only select layouts for global/layout pages.
-      #
-      def selectable_layouts(language_id, only_layoutpages = false)
-        @language_id = language_id
-        all.select do |layout|
-          if only_layoutpages
-            layout["layoutpage"] && layout_available?(layout)
-          else
-            !layout["layoutpage"] && layout_available?(layout)
-          end
-        end
-      end
-
-      # Returns all names of elements defined in given page layout.
-      #
-      def element_names_for(page_layout)
-        if definition = get(page_layout)
-          definition.fetch("elements", [])
-        else
-          Rails.logger.warn "\n+++ Warning: No layout definition for #{page_layout} found! in page_layouts.yml\n"
-          []
-        end
-      end
-
-      # Translates name for given layout
-      #
-      # === Translation example
-      #
-      #   en:
-      #     alchemy:
-      #       page_layout_names:
-      #         products_overview: Products Overview
-      #
-      # @param [String]
-      #   The layout name
-      #
-      def human_layout_name(layout)
-        Alchemy.t(layout, scope: "page_layout_names", default: layout.to_s.humanize)
-      end
-
       private
 
-      # Returns true if the given layout is unique and not already taken or it should be hidden.
-      #
-      def layout_available?(layout)
-        !layout["hide"] && !already_taken?(layout) && available_on_site?(layout)
-      end
-
-      # Returns true if this layout is unique and already taken by another page.
-      #
-      def already_taken?(layout)
-        layout["unique"] && page_with_layout_existing?(layout["name"])
-      end
-
-      # Returns true if one page already has the given layout
-      #
-      def page_with_layout_existing?(layout)
-        Alchemy::Page.where(page_layout: layout, language_id: @language_id).pluck(:id).any?
-      end
-
-      # Returns true if given layout is available for current site.
-      #
-      # If no site layouts are defined it always returns true.
-      #
-      # == Example
-      #
-      #   # config/alchemy/site_layouts.yml
-      #   - name: default_site
-      #     page_layouts: [default_intro]
-      #
-      def available_on_site?(layout)
-        return false unless Alchemy::Site.current
-
-        Alchemy::Site.current.definition.blank? ||
-          Alchemy::Site.current.definition.fetch("page_layouts", []).include?(layout["name"])
-      end
-
       # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
       #
       def read_definitions_file
@@ -168,15 +64,6 @@ module Alchemy
       def layouts_file_path
         Rails.root.join "config/alchemy/page_layouts.yml"
       end
-
-      # Maps given layouts for Rails select form helper.
-      #
-      def mapped_layouts_for_select(layouts)
-        layouts.each do |layout|
-          @map_array << [human_layout_name(layout["name"]), layout["name"]]
-        end
-        @map_array
-      end
     end
   end
 end

data/lib/alchemy/test_support/shared_dom_ids_examples.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "having dom ids" do
+  let(:element) { build(:alchemy_element, name: "element_with_ingredients") }
+
+  let(:ingredient) do
+    described_class.new(
+      element: element,
+      role: "headline",
+    )
+  end
+
+  describe "setting dom id from value" do
+    subject do
+      ingredient.valid? && ingredient.dom_id
+    end
+
+    before do
+      expect_any_instance_of(described_class).to receive(:settings).at_least(:once) { settings }
+    end
+
+    context "without anchor settings" do
+      let(:settings) do
+        {}
+      end
+
+      it "does not set a dom_id" do
+        is_expected.to be_nil
+      end
+    end
+
+    context "with anchor setting set to true" do
+      let(:settings) do
+        { anchor: true }
+      end
+
+      it "parameterizes dom_id" do
+        ingredient.dom_id = "SE Headline"
+        is_expected.to eq "se-headline"
+      end
+    end
+
+    context "with anchor setting set to from_value" do
+      let(:settings) do
+        { anchor: "from_value" }
+      end
+
+      context "with a value present" do
+        let(:ingredient) do
+          described_class.new(
+            element: element,
+            role: "headline",
+            value: "Hello World",
+          )
+        end
+
+        it "sets a dom_id from value" do
+          is_expected.to eq "hello-world"
+        end
+      end
+
+      context "with no value present" do
+        let(:ingredient) do
+          described_class.new(
+            element: element,
+            role: "headline",
+            value: "",
+          )
+        end
+
+        it "sets no dom_id" do
+          is_expected.to eq ""
+        end
+      end
+    end
+
+    context "with anchor setting set to fixed value" do
+      context "that is false" do
+        let(:settings) do
+          { anchor: false }
+        end
+
+        it "sets no dom_id" do
+          is_expected.to be_nil
+        end
+      end
+
+      context "that is true" do
+        let(:settings) do
+          { anchor: true }
+        end
+
+        it "sets no dom_id" do
+          is_expected.to be_nil
+        end
+      end
+
+      context "that is from_value" do
+        let(:settings) do
+          { anchor: true }
+        end
+
+        it "sets no dom_id" do
+          is_expected.to be_nil
+        end
+      end
+
+      context "that is a non reserved value" do
+        let(:settings) do
+          { anchor: "FixED VALUE" }
+        end
+
+        it "sets the dom_id to fixed value" do
+          is_expected.to eq "fixed-value"
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -7,7 +7,7 @@ module Alchemy::Upgrader::Tasks
     include Thor::Actions
 
     no_tasks do
-      def create_ingredients
+      def create_ingredients(verbose: !Rails.env.test?)
         Alchemy::Deprecation.silence do
           elements_with_ingredients = Alchemy::ElementDefinition.all.select { |d| d.key?(:ingredients) }
           if ENV["ONLY"]
@@ -22,13 +22,13 @@ module Alchemy::Upgrader::Tasks
           elements_with_ingredients.map do |element_definition|
             elements = all_elements.select { |e| e.name == element_definition[:name] }
             if elements.any?
-              puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)"
+              puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)" if verbose
               elements.each do |element|
                 MigrateElementIngredients.call(element)
-                print "."
+                print "." if verbose
               end
-              puts "\n"
-            else
+              puts "\n" if verbose
+            elsif verbose
               puts "-- No #{element_definition[:name]} elements found for migration."
             end
           end
@@ -56,6 +56,8 @@ module Alchemy::Upgrader::Tasks
                   ingredient.value = content.ingredient
                 end
                 data = ingredient.class.stored_attributes.fetch(:data, []).each_with_object({}) do |attr, d|
+                  next unless essence.respond_to?(attr)
+
                   d[attr] = essence.public_send(attr)
                 end
                 ingredient.data = data

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.12"
+  VERSION = "6.1.1"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -57,6 +57,10 @@ module Alchemy
     @_preview_sources ||= Set.new << Alchemy::Admin::PreviewUrl
   end
 
+  def self.preview_sources=(sources)
+    @_preview_sources = Array(sources)
+  end
+
   # Define page publish targets
   #
   # A publish target is a ActiveJob that gets performed
@@ -80,4 +84,17 @@ module Alchemy
   def self.publish_targets
     @_publish_targets ||= Set.new
   end
+
+  # Enable full text search configuration
+  #
+  # It enables a searchable checkbox in the page form to toggle
+  # the searchable field. These information can used in a search
+  # plugin (e.g. https://github.com/AlchemyCMS/alchemy-pg_search).
+  #
+  # == Example
+  #
+  #     # config/initializers/alchemy.rb
+  #     Alchemy.enable_searchable = true
+  #
+  mattr_accessor :enable_searchable, default: false
 end

data/package/admin.js

@@ -2,6 +2,7 @@ import translate from "./src/i18n"
 import translationData from "./src/translations"
 import NodeTree from "./src/node_tree"
 import fileEditors from "./src/file_editors"
+import IngredientAnchorLink from "./src/ingredient_anchor_link"
 import pictureEditors from "./src/picture_editors"
 import ImageLoader from "./src/image_loader"
 import ImageCropper from "./src/image_cropper"
@@ -24,6 +25,7 @@ Object.assign(Alchemy, {
   pictureEditors,
   ImageLoader: ImageLoader.init,
   ImageCropper,
+  IngredientAnchorLink,
   Datepicker,
   Sitemap,
   PagePublicationFields

data/package/src/ingredient_anchor_link.js

@@ -0,0 +1,17 @@
+export default class IngredientAnchorLink {
+  static updateIcon(ingredientId, active = false) {
+    const ingredientEditor = document.querySelector(
+      `[data-ingredient-id="${ingredientId}"]`
+    )
+    if (ingredientEditor) {
+      const icon = ingredientEditor.querySelector(
+        ".edit-ingredient-anchor-link > a > .icon"
+      )
+      if (icon) {
+        active
+          ? icon.classList.replace("far", "fas")
+          : icon.classList.replace("fas", "far")
+      }
+    }
+  }
+}

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.12",
+  "version": "6.1.1",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
-    "babel-jest": "^27.0.1",
+    "babel-jest": "^29.0.1",
     "jest": "^25.2.7",
     "prettier": "^2.0.2",
     "xhr-mock": "^2.5.1"