alchemy_cms 4.6.2 → 5.0.0.beta1

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -6,7 +6,7 @@ module Alchemy
       include UploaderResponses
       include ArchiveOverlay
 
-      helper 'alchemy/admin/tags'
+      helper "alchemy/admin/tags"
 
       before_action :load_resource,
         only: [:show, :edit, :update, :destroy, :info]
@@ -14,12 +14,12 @@ module Alchemy
       authorize_resource class: Alchemy::Picture
 
       def index
-        @size = params[:size].present? ? params[:size] : 'medium'
+        @size = params[:size].present? ? params[:size] : "medium"
         @query = Picture.ransack(search_filter_params[:q])
         @pictures = Picture.search_by(
           search_filter_params,
           @query,
-          items_per_page
+          items_per_page,
         )
 
         if in_overlay?
@@ -31,7 +31,7 @@ module Alchemy
         @previous = @picture.previous(params)
         @next = @picture.next(params)
         @assignments = @picture.essence_pictures.joins(content: {element: :page})
-        render action: 'show'
+        render action: "show"
       end
 
       def create
@@ -46,19 +46,19 @@ module Alchemy
 
       def edit_multiple
         @pictures = Picture.where(id: params[:picture_ids])
-        @tags = @pictures.collect(&:tag_list).flatten.uniq.join(', ')
+        @tags = @pictures.collect(&:tag_list).flatten.uniq.join(", ")
       end
 
       def update
         if @picture.update(picture_params)
           @message = {
             body: Alchemy.t(:picture_updated_successfully, name: @picture.name),
-            type: 'notice'
+            type: "notice",
           }
         else
           @message = {
             body: Alchemy.t(:picture_update_failed),
-            type: 'error'
+            type: "error",
           }
         end
         render :update
@@ -89,7 +89,7 @@ module Alchemy
           if not_deletable.any?
             flash[:warn] = Alchemy.t(
               "These pictures could not be deleted, because they were in use",
-              names: not_deletable.to_sentence
+              names: not_deletable.to_sentence,
             )
           else
             flash[:notice] = Alchemy.t("Pictures deleted successfully", names: names.to_sentence)
@@ -116,15 +116,15 @@ module Alchemy
       def items_per_page
         if in_overlay?
           case params[:size]
-          when 'small' then 25
-          when 'large' then 4
+          when "small" then 25
+          when "large" then 4
           else
             9
           end
         else
           cookies[:alchemy_pictures_per_page] = params[:per_page] ||
-                                                cookies[:alchemy_pictures_per_page] ||
-                                                pictures_per_page_for_size(params[:size])
+            cookies[:alchemy_pictures_per_page] ||
+            pictures_per_page_for_size(params[:size])
         end
       end
 
@@ -137,8 +137,8 @@ module Alchemy
 
       def pictures_per_page_for_size(size)
         case size
-        when 'small' then 60
-        when 'large' then 12
+        when "small" then 60
+        when "large" then 12
         else
           20
         end
@@ -154,8 +154,8 @@ module Alchemy
             :size,
             :element_id,
             :swap,
-            :content_id
-          ]
+            :content_id,
+          ],
         )
       end
 

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'csv'
-require 'alchemy/resource'
-require 'alchemy/resources_helper'
+require "csv"
+require "alchemy/resource"
+require "alchemy/resources_helper"
 
 module Alchemy
   module Admin
@@ -22,6 +22,7 @@ module Alchemy
 
       def index
         @query = resource_handler.model.ransack(search_filter_params[:q])
+        @query.sorts = default_sort_order if @query.sorts.empty?
         items = @query.result
 
         if contains_relations?
@@ -52,7 +53,7 @@ module Alchemy
       end
 
       def show
-        render action: 'edit'
+        render action: "edit"
       end
 
       def edit; end
@@ -63,7 +64,7 @@ module Alchemy
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),
-          flash_notice_for_resource_action
+          flash_notice_for_resource_action,
         )
       end
 
@@ -72,14 +73,17 @@ module Alchemy
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),
-          flash_notice_for_resource_action
+          flash_notice_for_resource_action,
         )
       end
 
       def destroy
         resource_instance_variable.destroy
+        if resource_instance_variable.errors.any?
+          flash[:error] = resource_instance_variable.errors.full_messages.join(", ")
+        end
         flash_notice_for_resource_action
-        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: 'index'))
+        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: "index"))
       end
 
       def resource_handler
@@ -92,6 +96,7 @@ module Alchemy
       # The key should look like "Modelname successfully created|updated|destroyed."
       def flash_notice_for_resource_action(action = params[:action])
         return if resource_instance_variable.errors.any?
+
         case action.to_sym
         when :create
           verb = "created"
@@ -104,11 +109,11 @@ module Alchemy
       end
 
       def is_alchemy_module?
-        !alchemy_module.nil? && !alchemy_module['engine_name'].nil?
+        !alchemy_module.nil? && !alchemy_module["engine_name"].nil?
       end
 
       def alchemy_module
-        @alchemy_module ||= module_definition_for(controller: params[:controller], action: 'index')
+        @alchemy_module ||= module_definition_for(controller: params[:controller], action: "index")
       end
 
       def load_resource
@@ -143,16 +148,14 @@ module Alchemy
 
       def common_search_filter_includes
         [
-          # contrary to Rails' documentation passing an empty hash to permit all keys does not work
-          {options: options_from_params.keys},
           {q: [
             resource_handler.search_field_name,
-            :s
+            :s,
           ]},
           :tagged_with,
           :filter,
           :page,
-          :per_page
+          :per_page,
         ].freeze
       end
 
@@ -164,6 +167,11 @@ module Alchemy
         per_page = Alchemy::Config.get(:items_per_page)
         [per_page, per_page * 2, per_page * 4]
       end
+
+      def default_sort_order
+        name = resource_handler.attributes.detect { |attr| attr[:name] == "name" }
+        name ? "name asc" : "#{resource_handler.attributes.first[:name]} asc"
+      end
     end
   end
 end

data/app/controllers/alchemy/admin/sites_controller.rb

@@ -3,6 +3,24 @@
 module Alchemy
   module Admin
     class SitesController < ResourcesController
+      def create
+        @site = Alchemy::Site.new(resource_params)
+        if @site.save
+          flash[:notice] = Alchemy.t("Please create a default language for this site.")
+          redirect_to alchemy.admin_languages_path(site_id: @site)
+        else
+          render :new
+        end
+      end
+
+      def destroy
+        if @site.destroy
+          flash[:notice] = Alchemy.t("Site successfully removed")
+        else
+          flash[:warning] = @site.errors.full_messages.to_sentence
+        end
+        do_redirect_to alchemy.admin_sites_path
+      end
     end
   end
 end

data/app/controllers/alchemy/admin/styleguide_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Alchemy
   module Admin
     class StyleguideController < BaseController

data/app/controllers/alchemy/admin/tags_controller.rb

@@ -7,6 +7,7 @@ module Alchemy
 
       def index
         @query = Gutentag::Tag.ransack(search_filter_params[:q])
+        @query.sorts = default_sort_order if @query.sorts.empty?
         @tags = @query
                   .result
                   .page(params[:page] || 1)
@@ -20,7 +21,7 @@ module Alchemy
 
       def create
         @tag = Gutentag::Tag.create(tag_params)
-        render_errors_or_redirect @tag, admin_tags_path, Alchemy.t('New Tag Created')
+        render_errors_or_redirect @tag, admin_tags_path, Alchemy.t("New Tag Created")
       end
 
       def edit
@@ -31,7 +32,7 @@ module Alchemy
         if tag_params[:merge_to]
           @new_tag = Gutentag::Tag.find(tag_params[:merge_to])
           Tag.replace(@tag, @new_tag)
-          operation_text = Alchemy.t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name}
+          operation_text = Alchemy.t("Replaced Tag") % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
         else
           @tag.update(tag_params)
@@ -65,7 +66,8 @@ module Alchemy
 
       def tags_from_term(term)
         return [] if term.blank?
-        Gutentag::Tag.where(['LOWER(name) LIKE ?', "#{term.downcase}%"])
+
+        Gutentag::Tag.where(["LOWER(name) LIKE ?", "#{term.downcase}%"])
       end
 
       def json_for_autocomplete(items, attribute)

data/app/controllers/alchemy/admin/trash_controller.rb

@@ -25,16 +25,16 @@ module Alchemy
         [
           {
             contents: {
-              essence: :ingredient_association
+              essence: :ingredient_association,
             },
             all_nested_elements: [
               {
                 contents: {
-                  essence: :ingredient_association
-                }
-              }
-            ]
-          }
+                  essence: :ingredient_association,
+                },
+              },
+            ],
+          },
         ]
       end
     end

data/app/controllers/alchemy/api/base_controller.rb

@@ -11,11 +11,11 @@ module Alchemy
     private
 
     def render_not_authorized
-      render json: {error: 'Not authorized'}, status: 403
+      render json: {error: "Not authorized"}, status: 403
     end
 
     def render_not_found
-      render json: {error: 'Record not found'}, status: 404
+      render json: {error: "Record not found"}, status: 404
     end
   end
 end

data/app/controllers/alchemy/api/contents_controller.rb

@@ -18,7 +18,7 @@ module Alchemy
       end
       @contents = @contents.includes(*content_includes)
 
-      render json: @contents, adapter: :json, root: 'contents'
+      render json: @contents, adapter: :json, root: "contents"
     end
 
     # Returns a json object for content
@@ -36,7 +36,7 @@ module Alchemy
       elsif params[:element_id] && params[:name]
         @content = Content.where(
           element_id: params[:element_id],
-          name: params[:name]
+          name: params[:name],
         ).includes(*content_includes).first || raise(ActiveRecord::RecordNotFound)
       end
       authorize! :show, @content
@@ -48,8 +48,8 @@ module Alchemy
     def content_includes
       [
         {
-          essence: :ingredient_association
-        }
+          essence: :ingredient_association,
+        },
       ]
     end
   end

data/app/controllers/alchemy/api/elements_controller.rb

@@ -22,7 +22,7 @@ module Alchemy
       end
       @elements = @elements.includes(*element_includes)
 
-      render json: @elements, adapter: :json, root: 'elements'
+      render json: @elements, adapter: :json, root: "elements"
     end
 
     # Returns a json object for element
@@ -41,18 +41,18 @@ module Alchemy
           nested_elements: [
             {
               contents: {
-                essence: :ingredient_association
-              }
+                essence: :ingredient_association,
+              },
             },
-            :tags
-          ]
+            :tags,
+          ],
         },
         {
           contents: {
-            essence: :ingredient_association
-          }
+            essence: :ingredient_association,
+          },
         },
-        :tags
+        :tags,
       ]
     end
   end

data/app/controllers/alchemy/api/nodes_controller.rb

@@ -2,9 +2,21 @@
 
 module Alchemy
   class Api::NodesController < Api::BaseController
-    before_action :load_node
+    before_action :load_node, except: :index
     before_action :authorize_access, only: [:move, :toggle_folded]
 
+    def index
+      @nodes = Node.all
+      @nodes = @nodes.includes(:parent)
+      @nodes = @nodes.ransack(params[:filter]).result
+
+      if params[:page]
+        @nodes = @nodes.page(params[:page]).per(params[:per_page])
+      end
+
+      render json: @nodes, adapter: :json, root: "data", meta: meta_data, include: params[:include]
+    end
+
     def move
       target_parent_node = Node.find(params[:target_parent_id])
       @node.move_to_child_with_index(target_parent_node, params[:new_position])
@@ -25,5 +37,29 @@ module Alchemy
     def authorize_access
       authorize! :update, @node
     end
+
+    def meta_data
+      {
+        total_count: total_count_value,
+        per_page: per_page_value,
+        page: page_value,
+      }
+    end
+
+    def total_count_value
+      params[:page] ? @nodes.total_count : @nodes.size
+    end
+
+    def per_page_value
+      if params[:page]
+        (params[:per_page] || Kaminari.config.default_per_page).to_i
+      else
+        @nodes.size
+      end
+    end
+
+    def page_value
+      params[:page] ? params[:page].to_i : 1
+    end
   end
 end

data/app/controllers/alchemy/api/pages_controller.rb

@@ -13,25 +13,14 @@ module Alchemy
       else
         @pages = Page.accessible_by(current_ability, :index)
       end
-      @pages = @pages.where.not(parent_id: nil)
       @pages = @pages.includes(*page_includes)
-      if params[:page_layout].present?
-        Alchemy::Deprecation.warn <<~WARN
-          Passing page_layout parameter to Alchemy::Api::PagesController#index is deprecated.
-          Please pass a Ransack search query instead:
-              q: {
-                page_layout_eq: '#{params[:page_layout]}'
-              }
-        WARN
-        @pages = @pages.where(page_layout: params[:page_layout])
-      end
       @pages = @pages.ransack(params[:q]).result
 
       if params[:page]
         @pages = @pages.page(params[:page]).per(params[:per_page])
       end
 
-      render json: @pages, adapter: :json, root: 'pages', meta: meta_data
+      render json: @pages, adapter: :json, root: "pages", meta: meta_data
     end
 
     # Returns all pages as nested json object for tree views
@@ -71,9 +60,11 @@ module Alchemy
     end
 
     def load_page_by_urlname
+      return unless Language.current
+
       Language.current.pages.where(
         urlname: params[:urlname],
-        language_code: params[:locale] || Language.current.code
+        language_code: params[:locale] || Language.current.code,
       ).includes(page_includes).first
     end
 
@@ -81,7 +72,7 @@ module Alchemy
       {
         total_count: total_count_value,
         per_page: per_page_value,
-        page: page_value
+        page: page_value,
       }
     end
 
@@ -111,20 +102,20 @@ module Alchemy
               nested_elements: [
                 {
                   contents: {
-                    essence: :ingredient_association
-                  }
+                    essence: :ingredient_association,
+                  },
                 },
-                :tags
-              ]
+                :tags,
+              ],
             },
             {
               contents: {
-                essence: :ingredient_association
-              }
+                essence: :ingredient_association,
+              },
             },
-            :tags
-          ]
-        }
+            :tags,
+          ],
+        },
       ]
     end
   end