alchemy_cms 5.2.6 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e1ed1598e179337636198e31cf6d94b85bce3376cd1cb704e6a6e3312224b7
-  data.tar.gz: 2cfe0ee0fb63eddb1d5de0ac156e9f3abfcc6ac91d6652ebf8aaf80db3da6e61
+  metadata.gz: 0d0f346b9e40e791697acdf21d5e1193c72023f8f2570b777683ba2e781b67c1
+  data.tar.gz: b0c6a7f6e466bd0b134f9a7fdc76cb88ec1a56d0ca068209fa6b004619ed3a8e
 SHA512:
-  metadata.gz: 43f19d474f2e3e153af2b98d3867e7b0151f6ccc3fa4518e88f4b88055fe99cda98a11d53e668e8e5c8485ed17e4a52f0547a8e819f8475ba95c06b6de5f33c1
-  data.tar.gz: 641ade4c39110add57ddcf2c5a5968541ebafc953f47b9c3f10d6681cfa6d31357794df4b03d488597bc5f56b0e1696a550d57e29da170aac74946bf8b86d167
+  metadata.gz: e10199dcdc4b12d01bfebef27d23b752d1dd95c393263dac664c2d5588677aca80113c8b99ca281aefa130592767cc01304ab635d09273c63f3cc575ab2a1313
+  data.tar.gz: eaf3f967e1cb5ac4644cddf31ffdfcf3e931107be5508091fe94f61ceb7c096bacc4e39a8203ab8ba1ddf820992abfdae795774f91ac4ff571fc7687f7efd0ba

data/.gitignore

@@ -34,7 +34,6 @@ spec/dummy/uploads/
 .ruby-gemset
 .ruby-version
 .env
-.rspec
 node_modules
 yarn-error.log
 yarn-debug.log*

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 5.3.1 (2022-03-11)
+
+- Allow all pages in API again ([tvdeyen](https://github.com/tvdeyen))
+- New sortable page tree ([tvdeyen](https://github.com/tvdeyen))
+- Send language_id to Api::PagesController#index so Pages can be restricted to the language of the page. ([dbwinger](https://github.com/dbwinger))
+- Eager load in PageTree serializer ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.3.0 (2022-03-09)
+
+- Allow parent page change ([tvdeyen](https://github.com/tvdeyen))
+- Precompile packs during test setup ([tvdeyen](https://github.com/tvdeyen))
+- Rework Sitemap JS ([tvdeyen](https://github.com/tvdeyen))
+- Fix rendering errors in page configure overlay ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.2.7 (2022-03-01)
+
+- Fix copying page with descendants to a different language ([dbwinger](https://github.com/dbwinger))
+- Handle copying/pasting global pages ([dbwinger](https://github.com/dbwinger))
+
 ## 5.2.6 (2022-02-28)
 
 - Add crop_resize Dragonfly processor ([tvdeyen](https://github.com/tvdeyen))

data/Rakefile

@@ -41,12 +41,16 @@ namespace :alchemy do
     task :prepare do
       system(
         <<~BASH
+          yarn install && \
+          yarn link && \
           cd spec/dummy && \
           export RAILS_ENV=test && \
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
           bin/rails g alchemy:install --skip --skip-demo-files --auto-accept && \
+          yarn link @alchemy_cms/admin && \
+          RAILS_ENV=test bin/webpack && \
           cd -
         BASH
       ) || fail
@@ -72,4 +76,18 @@ namespace :alchemy do
       File.delete(backup)
     end
   end
+
+  desc "Release a new Ruby gem and npm package in one command"
+  task :release do
+    require "json"
+    require_relative "lib/alchemy/version"
+    package = File.read("package.json")
+    unless JSON.parse(package)["version"] == Alchemy.version
+      abort "Ruby gem and npm package versions are out of sync! Please fix."
+    end
+    # Release the Ruby gem with bundler
+    Rake::Task["release"].invoke
+    # Publish npm package via CLI
+    system "npm publish"
+  end
 end

data/alchemy_cms.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'originator',                       ['~> 3.1']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
   gem.add_runtime_dependency 'rails',                            ['>= 5.2.0', '< 6.1']
-  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 2.4.2'] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 3.0']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
   gem.add_runtime_dependency 'sassc-rails',                      ['~> 2.1']

data/app/assets/javascripts/alchemy/admin.js

@@ -37,10 +37,8 @@
 //= require alchemy/alchemy.link_dialog
 //= require alchemy/alchemy.list_filter
 //= require alchemy/alchemy.initializer
-//= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.preview_window
-//= require alchemy/alchemy.sitemap
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.tooltips

data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee

@@ -82,7 +82,12 @@ class window.Alchemy.Dialog
     @dialog_body.hide()
     @dialog_body.html(data)
     @init()
-    @dialog.trigger('DialogReady.Alchemy', @dialog_body)
+    @dialog[0].dispatchEvent(new CustomEvent(
+      "DialogReady.Alchemy",
+      bubbles: true
+      detail:
+        body: @dialog_body[0]
+    ))
     if @options.ready?
       @options.ready(@dialog_body)
     @dialog_body.show('fade', 200)

data/app/assets/javascripts/alchemy/page_select.js

@@ -1,9 +1,11 @@
-$.fn.alchemyPageSelect = function(options) {
+$.fn.alchemyPageSelect = function (options) {
   var pageTemplate = HandlebarsTemplates.page
 
   return this.select2({
     placeholder: options.placeholder,
-    allowClear: true,
+    allowClear: options.hasOwnProperty("allowClear")
+      ? options.allowClear
+      : true,
     minimumInputLength: 3,
     initSelection: function (_$el, callback) {
       if (options.initialSelection) {
@@ -12,13 +14,16 @@ $.fn.alchemyPageSelect = function(options) {
     },
     ajax: {
       url: options.url,
-      datatype: 'json',
+      datatype: "json",
       quietMillis: 300,
       data: function (term, page) {
         return {
-          q: $.extend({
-            name_cont: term
-          }, options.query_params),
+          q: $.extend(
+            {
+              name_cont: term
+            },
+            options.query_params
+          ),
           page: page
         }
       },
@@ -34,8 +39,8 @@ $.fn.alchemyPageSelect = function(options) {
     formatSelection: function (page) {
       return page.text || page.name
     },
-    formatResult: function(page) {
-      return pageTemplate({page: page})
+    formatResult: function (page) {
+      return pageTemplate({ page: page })
     }
   })
 }

data/app/assets/javascripts/alchemy/templates/index.js

@@ -2,3 +2,4 @@
 //= require alchemy/templates/page
 //= require alchemy/templates/node_folder
 //= require alchemy/templates/node
+//= require alchemy/templates/page_folder

data/app/assets/javascripts/alchemy/templates/page.hbs

@@ -1,9 +1,19 @@
 <div class="page-select--page">
-  <i class="icon far fa-file fa-lg"></i>
-  <span class="page-select--page-name">
-    {{ page.name }}
-  </span>
-  <span class="page-select--page-urlname">
-    {{ page.url_path }}
-  </span>
+  <div class="page-select--top">
+    <i class="icon far fa-file fa-lg"></i>
+    <span class="page-select--page-name">
+      {{ page.name }}
+    </span>
+    <span class="page-select--page-urlname">
+      {{ page.url_path }}
+    </span>
+  </div>
+  <div class="page-select--bottom">
+    <span class="page-select--site-name">
+      {{ page.site.name }}
+    </span>
+    <span class="page-select--language-code">
+      {{ page.language.name }}
+    </span>
+  </div>
 </div>

data/app/assets/javascripts/alchemy/templates/page_folder.hbs

@@ -0,0 +1,3 @@
+<a class="page_folder" data-page-id="{{ page.id }}">
+  <i class="far fa-{{#if page.folded }}plus{{else}}minus{{/if}}-square fa-fw"></i>
+</a>

data/app/assets/stylesheets/alchemy/page-select.scss

@@ -7,24 +7,49 @@
 
 .page-select--page {
   display: flex;
-  align-items: center;
+  flex-direction: column;
 
   .icon {
     margin: 0 8px 0 4px;
 
     .select2-highlighted & {
-      color: $white
+      color: $white;
     }
   }
 }
 
+.page-select--top,
+.page-select--bottom {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.page-select--bottom {
+  font-size: $small-font-size;
+  padding-left: 6 * $default-padding;
+}
+
+.page-select--language-code {
+  display: inline-block;
+  background-color: $medium-gray;
+  margin-left: auto;
+  border-radius: $default-border-radius;
+  padding: $default-padding / 2 $default-padding;
+
+  .select2-highlighted & {
+    color: $select-hover-bg-color;
+    background-color: white;
+  }
+}
+
 .page-select--page-urlname {
   margin-left: auto;
-  padding: $default-padding 2*$default-padding;
+  padding: $default-padding 2 * $default-padding;
   color: $dark-gray;
   font-size: $small-font-size;
 
   .select2-highlighted & {
-    color: $white
+    color: $white;
   }
 }

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -23,7 +23,7 @@ $sitemap-url-xlarge-width: 350px;
 
 #sitemap-wrapper {
   position: relative;
-  min-height: calc(100vh - 96px);
+  min-height: calc(100vh - 148px);
 }
 
 .sitemap_pagename_link {
@@ -142,18 +142,16 @@ $sitemap-url-xlarge-width: 350px;
 #sitemap {
   padding: 0 0 104px 0;
 
-  &.sorting {
-    padding-top: 100px;
-
-    .page_icon {
-      cursor: move;
-    }
+  .handle {
+    cursor: move;
   }
 
   .page_folder {
     position: absolute;
     left: -23px;
     top: 0;
+    width: 16px;
+    height: $sitemap-line-height;
   }
 
   .placeholder {
@@ -258,3 +256,7 @@ $sitemap-url-xlarge-width: 350px;
     }
   }
 }
+
+#search_field_clear {
+  cursor: pointer;
+}

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

@@ -7,7 +7,7 @@ module Alchemy
 
       helper "alchemy/pages"
 
-      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link]
 
       authorize_resource class: Alchemy::Page, except: [:index, :tree]
 
@@ -21,7 +21,7 @@ module Alchemy
         except: [:show]
 
       before_action :set_root_page,
-        only: [:index, :show, :sort, :order]
+        only: [:index, :show, :order]
 
       before_action :run_on_page_layout_callbacks,
         if: :run_on_page_layout_callbacks?,
@@ -128,6 +128,7 @@ module Alchemy
       def update
         # stores old page_layout value, because unfurtunally rails @page.changes does not work here.
         @old_page_layout = @page.page_layout
+        @old_parent_id = @page.parent_id
         if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?("edit")
@@ -136,7 +137,7 @@ module Alchemy
             @tree = serialized_page_tree
           end
         else
-          configure
+          render :configure
         end
       end
 
@@ -172,9 +173,7 @@ module Alchemy
       def fold
         # @page is fetched via before filter
         @page.fold!(current_alchemy_user.id, !@page.folded?(current_alchemy_user.id))
-        respond_to do |format|
-          format.js
-        end
+        render json: serialized_page_tree
       end
 
       # Leaves the page editing mode and unlocks the page for other users
@@ -219,10 +218,6 @@ module Alchemy
         redirect_to admin_pages_path
       end
 
-      def sort
-        @sorting = true
-      end
-
       # Receives a JSON object representing a language tree to be ordered
       # and updates all pages in that language structure to their correct indexes
       def order
@@ -404,9 +399,11 @@ module Alchemy
       end
 
       def serialized_page_tree
-        PageTreeSerializer.new(@page, ability: current_ability,
-                                      user: current_alchemy_user,
-                                      full: params[:full] == "true")
+        PageTreeSerializer.new(
+          @page,
+          ability: current_ability,
+          user: current_alchemy_user,
+        )
       end
 
       def load_languages_and_layouts

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

@@ -2,17 +2,19 @@
 
 module Alchemy
   class Api::PagesController < Api::BaseController
+    serialization_scope :current_ability
     before_action :load_page, only: [:show]
 
     # Returns all pages as json object
     #
     def index
       # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if cannot? :edit_content, Alchemy::Page
-        @pages = Alchemy::Page.accessible_by(current_ability, :index)
-        @pages = @pages.where(language: Language.current)
+      if can? :edit_content, Alchemy::Page
+        @pages = Alchemy::Page.all
       else
-        @pages = Language.current&.pages.presence || Alchemy::Page.none
+        language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
+        @pages = Alchemy::Page.accessible_by(current_ability, :index)
+        @pages = @pages.where(language: language)
       end
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
@@ -49,6 +51,14 @@ module Alchemy
       respond_with @page
     end
 
+    def move
+      @page = Page.find(params[:id])
+      authorize! :update, @page
+      target_parent_page = Page.find(params[:target_parent_id])
+      @page.move_to_child_with_index(target_parent_page, params[:new_position])
+      render json: @page, serializer: PageSerializer
+    end
+
     private
 
     def load_page

data/app/models/alchemy/page.rb

@@ -217,8 +217,8 @@ module Alchemy
 
       def copy_and_paste(source, new_parent, new_name)
         page = copy(source, {
-          parent_id: new_parent.id,
-          language: new_parent.language,
+          parent: new_parent,
+          language: new_parent&.language,
           name: new_name,
           title: new_name,
         })
@@ -415,6 +415,7 @@ module Alchemy
         next if child == new_parent
 
         new_child = Page.copy(child, {
+          parent_id: new_parent.id,
           language_id: new_parent.language_id,
           language_code: new_parent.language_code,
         })

data/app/serializers/alchemy/page_serializer.rb

@@ -14,8 +14,14 @@ module Alchemy
       :created_at,
       :updated_at,
       :status,
-      :url_path
+      :url_path,
+      :parent_id
 
     has_many :elements
+
+    with_options if: -> { scope.can?(:edit_content, object) } do
+      belongs_to :site
+      belongs_to :language
+    end
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      {"pages" => nil}
+      { "pages" => nil }
     end
 
     def pages
       tree = []
-      path = [{id: object.parent_id, children: tree}]
-      page_list = object.self_and_descendants
+      path = [{ id: object.parent_id, children: tree }]
+      page_list = object.self_and_descendants.includes(language: :site)
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -1,4 +1,8 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
+  <% unless @page.language_root? || @page.layoutpage %>
+    <%= f.input :parent_id, required: true, input_html: { class: 'alchemy_selectbox' } %>
+  <% end %>
+
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: page_layout_label(@page),
@@ -43,3 +47,18 @@
 
   <%= f.submit Alchemy.t(:save) %>
 <% end %>
+
+<script>
+  $('#page_parent_id').alchemyPageSelect({
+    placeholder: "<%= Alchemy.t(:search_page) %>",
+    url: "<%= alchemy.api_pages_path %>",
+    allowClear: false,
+    <% if @page.parent %>
+    initialSelection: {
+      id: <%= @page.parent.id %>,
+      text: "<%= @page.parent.name %>",
+      url_path: "<%= @page.parent.url_path %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/admin/pages/_new_page_form.html.erb

@@ -3,11 +3,7 @@
     <%= f.hidden_field(:parent_id) %>
   <% else %>
     <% @page.parent = @current_language.root_page %>
-    <%= f.input :parent_id,
-      collection: @current_language.pages.contentpages,
-      label_method: :name,
-      value_method: :id,
-      input_html: { class: "alchemy_selectbox" } %>
+    <%= f.input :parent_id, as: :string, input_html: { class: 'alchemy_selectbox' } %>
   <% end %>
   <%= f.hidden_field(:language_id) %>
   <%= f.hidden_field(:layoutpage) %>
@@ -21,3 +17,18 @@
   <%= f.input :name %>
   <%= f.submit Alchemy.t(:create) %>
 <% end %>
+
+<script>
+  $('input[type="text"]#page_parent_id').alchemyPageSelect({
+    placeholder: "<%= Alchemy.t(:search_page) %>",
+    url: "<%= alchemy.api_pages_path %>",
+    allowClear: false,
+    <% if @page.parent %>
+    initialSelection: {
+      id: <%= @page.parent.id %>,
+      text: "<%= @page.parent.name %>",
+      url_path: "<%= @page.parent.url_path %>"
+    }
+    <% end %>
+  })
+</script>