New sortable page tree

.gitignore

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

.rspec

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

Rakefile

@@ -41,12 +41,15 @@ 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

app/assets/javascripts/alchemy/admin.js

@@ -35,7 +35,6 @@
 //= 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.spinner

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

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>

app/assets/stylesheets/alchemy/sitemap.scss

@@ -142,12 +142,8 @@ $sitemap-url-xlarge-width: 350px;
 #sitemap {
   padding: 0 0 104px 0;
 
-  &.sorting {
-    padding-top: 100px;
-
-    .page_icon {
-      cursor: move;
-    }
+  .handle {
+    cursor: move;
   }
 
   .page_folder {

app/controllers/alchemy/admin/pages_controller.rb

@@ -7,7 +7,7 @@ class PagesController < ResourcesController
 
       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 @@ class PagesController < ResourcesController
         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?,
@@ -168,9 +168,7 @@ def link
       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
@@ -203,10 +201,6 @@ def copy_language_tree
         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
@@ -388,9 +382,11 @@ def set_page_version
       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

app/controllers/alchemy/api/pages_controller.rb

@@ -51,6 +51,14 @@ def show
       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

app/serializers/alchemy/page_serializer.rb

@@ -14,7 +14,8 @@ class PageSerializer < ActiveModel::Serializer
       :created_at,
       :updated_at,
       :status,
-      :url_path
+      :url_path,
+      :parent_id
 
     has_many :elements
   end

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(:public_version, { language: :site })
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)