From 39ca24e1a3bddb62339fc3e2e494499fb3036c46 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sun, 22 Mar 2020 16:30:37 +0100
Subject: [PATCH 01/14] Add Node Serializer

This is the simplest serializer for a node.
---
 app/serializers/alchemy/node_serializer.rb    | 12 +++++++++++
 .../alchemy/node_serializer_spec.rb           | 21 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 app/serializers/alchemy/node_serializer.rb
 create mode 100644 spec/serializers/alchemy/node_serializer_spec.rb

diff --git a/app/serializers/alchemy/node_serializer.rb b/app/serializers/alchemy/node_serializer.rb
new file mode 100644
index 0000000000..a260fba3b9
--- /dev/null
+++ b/app/serializers/alchemy/node_serializer.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class NodeSerializer < ActiveModel::Serializer
+    attributes :id,
+      :name,
+      :lft,
+      :rgt,
+      :url,
+      :parent_id
+  end
+end
diff --git a/spec/serializers/alchemy/node_serializer_spec.rb b/spec/serializers/alchemy/node_serializer_spec.rb
new file mode 100644
index 0000000000..5c6365056d
--- /dev/null
+++ b/spec/serializers/alchemy/node_serializer_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Alchemy::NodeSerializer do
+  subject { described_class.new(node).to_json }
+
+  let(:node) { build_stubbed(:alchemy_node) }
+
+  it 'includes all attributes' do
+    json = JSON.parse(subject)
+    expect(json).to eq(
+      'id' => node.id,
+      'lft' => node.lft,
+      'rgt' => node.rgt,
+      'parent_id' => node.parent_id,
+      'name' => node.name,
+      'url' => node.url
+    )
+  end
+end

From 85d113124ae60051ce30ab8c71c6ceb55c42991e Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sun, 22 Mar 2020 16:56:20 +0100
Subject: [PATCH 02/14] Add Api::NodesController#move

This moves an node to a specified parent and a specified position.
---
 .../alchemy/api/nodes_controller.rb           | 19 +++++++++++++
 config/routes.rb                              |  6 +++++
 .../alchemy/api/nodes_controller_spec.rb      | 27 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 app/controllers/alchemy/api/nodes_controller.rb
 create mode 100644 spec/requests/alchemy/api/nodes_controller_spec.rb

diff --git a/app/controllers/alchemy/api/nodes_controller.rb b/app/controllers/alchemy/api/nodes_controller.rb
new file mode 100644
index 0000000000..351b5d200f
--- /dev/null
+++ b/app/controllers/alchemy/api/nodes_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Api::NodesController < Api::BaseController
+    before_action :load_node
+
+    def move
+      target_parent_node = Node.find(params[:target_parent_id])
+      @node.move_to_child_with_index(target_parent_node, params[:new_position])
+      render json: @node, serializer: NodeSerializer
+    end
+
+    private
+
+    def load_node
+      @node = Node.find(params[:id])
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 7cd725778e..f4c7a60a04 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -153,6 +153,12 @@
 
     get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'
     get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page'
+
+    resources :nodes, only: [] do
+      member do
+        patch :move
+      end
+    end
   end
 
   get '/:locale' => 'pages#index',
diff --git a/spec/requests/alchemy/api/nodes_controller_spec.rb b/spec/requests/alchemy/api/nodes_controller_spec.rb
new file mode 100644
index 0000000000..2d5cdf63ba
--- /dev/null
+++ b/spec/requests/alchemy/api/nodes_controller_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+module Alchemy
+  describe Api::NodesController do
+    describe '#move' do
+      let!(:root_node) { create(:alchemy_node, name: 'main_menu') }
+      let!(:page_node) { create(:alchemy_node, :with_page, parent: root_node) }
+      let!(:page_node_2) { create(:alchemy_node, :with_page, parent: root_node) }
+      let!(:url_node) { create(:alchemy_node, :with_url, parent: root_node) }
+
+      it 'returns JSON and moves the node' do
+        expect(page_node.children).to be_empty
+        expect(url_node.lft).to eq(6)
+        patch alchemy.move_api_node_path(url_node, format: :json), params: {
+          target_parent_id: page_node.id,
+          new_position: 0
+        }
+        expect(response.status).to eq(200)
+        response_json = JSON.parse(response.body)
+        expect(response_json['parent_id']).to eq(page_node.id)
+        expect(page_node.children).to include(url_node)
+      end
+    end
+  end
+end

From b6151b45847777df5ffb803ccca3ee63954e773e Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sun, 22 Mar 2020 17:11:34 +0100
Subject: [PATCH 03/14] Add Sortable.js 1.10.2

This is a nice sorting library that works with trees.
---
 app/assets/javascripts/alchemy/admin.js            | 1 +
 vendor/assets/javascripts/sortable/Sortable.min.js | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 vendor/assets/javascripts/sortable/Sortable.min.js

diff --git a/app/assets/javascripts/alchemy/admin.js b/app/assets/javascripts/alchemy/admin.js
index bc9df5d794..ba3b82937b 100644
--- a/app/assets/javascripts/alchemy/admin.js
+++ b/app/assets/javascripts/alchemy/admin.js
@@ -15,6 +15,7 @@
 //= require requestAnimationFrame
 //= require select2
 //= require handlebars
+//= require sortable/Sortable.min
 //= require alchemy/templates
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
diff --git a/vendor/assets/javascripts/sortable/Sortable.min.js b/vendor/assets/javascripts/sortable/Sortable.min.js
new file mode 100644
index 0000000000..eba0614973
--- /dev/null
+++ b/vendor/assets/javascripts/sortable/Sortable.min.js
@@ -0,0 +1,2 @@
+/*! Sortable 1.10.2 - MIT | git://github.com/SortableJS/Sortable.git */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function a(){return(a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=n[o])}return t}).apply(this,arguments)}function I(i){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{},e=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(r).filter(function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable}))),e.forEach(function(t){var e,n,o;e=i,o=r[n=t],n in e?Object.defineProperty(e,n,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[n]=o})}return i}function l(t,e){if(null==t)return{};var n,o,i=function(t,e){if(null==t)return{};var n,o,i={},r=Object.keys(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||(i[n]=t[n]);return i}(t,e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||Object.prototype.propertyIsEnumerable.call(t,n)&&(i[n]=t[n])}return i}function e(t){return function(t){if(Array.isArray(t)){for(var e=0,n=new Array(t.length);e<t.length;e++)n[e]=t[e];return n}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}function t(t){if("undefined"!=typeof window&&window.navigator)return!!navigator.userAgent.match(t)}var w=t(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i),E=t(/Edge/i),c=t(/firefox/i),s=t(/safari/i)&&!t(/chrome/i)&&!t(/android/i),n=t(/iP(ad|od|hone)/i),i=t(/chrome/i)&&t(/android/i),r={capture:!1,passive:!1};function u(t,e,n){t.addEventListener(e,n,!w&&r)}function d(t,e,n){t.removeEventListener(e,n,!w&&r)}function h(t,e){if(e){if(">"===e[0]&&(e=e.substring(1)),t)try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return!1}return!1}}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"===e[0]?t.parentNode===n&&h(t,e):h(t,e))||o&&t===n)return t;if(t===n)break}while(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode)}var i;return null}var f,p=/\s+/g;function k(t,e,n){if(t&&e)if(t.classList)t.classList[n?"add":"remove"](e);else{var o=(" "+t.className+" ").replace(p," ").replace(" "+e+" "," ");t.className=(o+(n?" "+e:"")).replace(p," ")}}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];e in o||-1!==e.indexOf("webkit")||(e="-webkit-"+e),o[e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform");o&&"none"!==o&&(n=o+" "+n)}while(!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function g(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i<r;i++)n(o[i],i);return o}return[]}function N(){var t=document.scrollingElement;return t||document.documentElement}function X(t,e,n,o,i){if(t.getBoundingClientRect||t===window){var r,a,l,s,c,u,d;if(d=t!==window&&t!==N()?(a=(r=t.getBoundingClientRect()).top,l=r.left,s=r.bottom,c=r.right,u=r.height,r.width):(l=a=0,s=window.innerHeight,c=window.innerWidth,u=window.innerHeight,window.innerWidth),(e||n)&&t!==window&&(i=i||t.parentNode,!w))do{if(i&&i.getBoundingClientRect&&("none"!==R(i,"transform")||n&&"static"!==R(i,"position"))){var h=i.getBoundingClientRect();a-=h.top+parseInt(R(i,"border-top-width")),l-=h.left+parseInt(R(i,"border-left-width")),s=a+r.height,c=l+r.width;break}}while(i=i.parentNode);if(o&&t!==window){var f=v(i||t),p=f&&f.a,g=f&&f.d;f&&(s=(a/=g)+(u/=g),c=(l/=p)+(d/=p))}return{top:a,left:l,bottom:s,right:c,width:d,height:u}}}function Y(t,e,n){for(var o=H(t,!0),i=X(t)[e];o;){var r=X(o)[n];if(!("top"===n||"left"===n?r<=i:i<=r))return o;if(o===N())break;o=H(o,!1)}return!1}function m(t,e,n){for(var o=0,i=0,r=t.children;i<r.length;){if("none"!==r[i].style.display&&r[i]!==Rt.ghost&&r[i]!==Rt.dragged&&P(r[i],n.draggable,t,!1)){if(o===e)return r[i];o++}i++}return null}function B(t,e){for(var n=t.lastElementChild;n&&(n===Rt.ghost||"none"===R(n,"display")||e&&!h(n,e));)n=n.previousElementSibling;return n||null}function F(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t=t.previousElementSibling;)"TEMPLATE"===t.nodeName.toUpperCase()||t===Rt.clone||e&&!h(t,e)||n++;return n}function b(t){var e=0,n=0,o=N();if(t)do{var i=v(t),r=i.a,a=i.d;e+=t.scrollLeft*r,n+=t.scrollTop*a}while(t!==o&&(t=t.parentNode));return[e,n]}function H(t,e){if(!t||!t.getBoundingClientRect)return N();var n=t,o=!1;do{if(n.clientWidth<n.scrollWidth||n.clientHeight<n.scrollHeight){var i=R(n);if(n.clientWidth<n.scrollWidth&&("auto"==i.overflowX||"scroll"==i.overflowX)||n.clientHeight<n.scrollHeight&&("auto"==i.overflowY||"scroll"==i.overflowY)){if(!n.getBoundingClientRect||n===document.body)return N();if(o||e)return n;o=!0}}}while(n=n.parentNode);return N()}function y(t,e){return Math.round(t.top)===Math.round(e.top)&&Math.round(t.left)===Math.round(e.left)&&Math.round(t.height)===Math.round(e.height)&&Math.round(t.width)===Math.round(e.width)}function D(e,n){return function(){if(!f){var t=arguments;1===t.length?e.call(this,t[0]):e.apply(this,t),f=setTimeout(function(){f=void 0},n)}}}function L(t,e,n){t.scrollLeft+=e,t.scrollTop+=n}function S(t){var e=window.Polymer,n=window.jQuery||window.Zepto;return e&&e.dom?e.dom(t).cloneNode(!0):n?n(t).clone(!0)[0]:t.cloneNode(!0)}function _(t,e){R(t,"position","absolute"),R(t,"top",e.top),R(t,"left",e.left),R(t,"width",e.width),R(t,"height",e.height)}function C(t){R(t,"position",""),R(t,"top",""),R(t,"left",""),R(t,"width",""),R(t,"height","")}var j="Sortable"+(new Date).getTime();function T(){var e,o=[];return{captureAnimationState:function(){o=[],this.options.animation&&[].slice.call(this.el.children).forEach(function(t){if("none"!==R(t,"display")&&t!==Rt.ghost){o.push({target:t,rect:X(t)});var e=I({},o[o.length-1].rect);if(t.thisAnimationDuration){var n=v(t,!0);n&&(e.top-=n.f,e.left-=n.e)}t.fromRect=e}})},addAnimationState:function(t){o.push(t)},removeAnimationState:function(t){o.splice(function(t,e){for(var n in t)if(t.hasOwnProperty(n))for(var o in e)if(e.hasOwnProperty(o)&&e[o]===t[n][o])return Number(n);return-1}(o,{target:t}),1)},animateAll:function(t){var c=this;if(!this.options.animation)return clearTimeout(e),void("function"==typeof t&&t());var u=!1,d=0;o.forEach(function(t){var e=0,n=t.target,o=n.fromRect,i=X(n),r=n.prevFromRect,a=n.prevToRect,l=t.rect,s=v(n,!0);s&&(i.top-=s.f,i.left-=s.e),n.toRect=i,n.thisAnimationDuration&&y(r,i)&&!y(o,i)&&(l.top-i.top)/(l.left-i.left)==(o.top-i.top)/(o.left-i.left)&&(e=function(t,e,n,o){return Math.sqrt(Math.pow(e.top-t.top,2)+Math.pow(e.left-t.left,2))/Math.sqrt(Math.pow(e.top-n.top,2)+Math.pow(e.left-n.left,2))*o.animation}(l,r,a,c.options)),y(i,o)||(n.prevFromRect=o,n.prevToRect=i,e||(e=c.options.animation),c.animate(n,l,i,e)),e&&(u=!0,d=Math.max(d,e),clearTimeout(n.animationResetTimer),n.animationResetTimer=setTimeout(function(){n.animationTime=0,n.prevFromRect=null,n.fromRect=null,n.prevToRect=null,n.thisAnimationDuration=null},e),n.thisAnimationDuration=e)}),clearTimeout(e),u?e=setTimeout(function(){"function"==typeof t&&t()},d):"function"==typeof t&&t(),o=[]},animate:function(t,e,n,o){if(o){R(t,"transition",""),R(t,"transform","");var i=v(this.el),r=i&&i.a,a=i&&i.d,l=(e.left-n.left)/(r||1),s=(e.top-n.top)/(a||1);t.animatingX=!!l,t.animatingY=!!s,R(t,"transform","translate3d("+l+"px,"+s+"px,0)"),function(t){t.offsetWidth}(t),R(t,"transition","transform "+o+"ms"+(this.options.easing?" "+this.options.easing:"")),R(t,"transform","translate3d(0,0,0)"),"number"==typeof t.animated&&clearTimeout(t.animated),t.animated=setTimeout(function(){R(t,"transition",""),R(t,"transform",""),t.animated=!1,t.animatingX=!1,t.animatingY=!1},o)}}}}var x=[],M={initializeByDefault:!0},O={mount:function(t){for(var e in M)!M.hasOwnProperty(e)||e in t||(t[e]=M[e]);x.push(t)},pluginEvent:function(e,n,o){var t=this;this.eventCanceled=!1,o.cancel=function(){t.eventCanceled=!0};var i=e+"Global";x.forEach(function(t){n[t.pluginName]&&(n[t.pluginName][i]&&n[t.pluginName][i](I({sortable:n},o)),n.options[t.pluginName]&&n[t.pluginName][e]&&n[t.pluginName][e](I({sortable:n},o)))})},initializePlugins:function(o,i,r,t){for(var e in x.forEach(function(t){var e=t.pluginName;if(o.options[e]||t.initializeByDefault){var n=new t(o,i,o.options);n.sortable=o,n.options=o.options,o[e]=n,a(r,n.defaults)}}),o.options)if(o.options.hasOwnProperty(e)){var n=this.modifyOption(o,e,o.options[e]);void 0!==n&&(o.options[e]=n)}},getEventProperties:function(e,n){var o={};return x.forEach(function(t){"function"==typeof t.eventProperties&&a(o,t.eventProperties.call(n[t.pluginName],e))}),o},modifyOption:function(e,n,o){var i;return x.forEach(function(t){e[t.pluginName]&&t.optionListeners&&"function"==typeof t.optionListeners[n]&&(i=t.optionListeners[n].call(e[t.pluginName],o))}),i}};function A(t){var e=t.sortable,n=t.rootEl,o=t.name,i=t.targetEl,r=t.cloneEl,a=t.toEl,l=t.fromEl,s=t.oldIndex,c=t.newIndex,u=t.oldDraggableIndex,d=t.newDraggableIndex,h=t.originalEvent,f=t.putSortable,p=t.extraEventProperties;if(e=e||n&&n[j]){var g,v=e.options,m="on"+o.charAt(0).toUpperCase()+o.substr(1);!window.CustomEvent||w||E?(g=document.createEvent("Event")).initEvent(o,!0,!0):g=new CustomEvent(o,{bubbles:!0,cancelable:!0}),g.to=a||n,g.from=l||n,g.item=i||n,g.clone=r,g.oldIndex=s,g.newIndex=c,g.oldDraggableIndex=u,g.newDraggableIndex=d,g.originalEvent=h,g.pullMode=f?f.lastPutMode:void 0;var b=I({},p,O.getEventProperties(o,e));for(var y in b)g[y]=b[y];n&&n.dispatchEvent(g),v[m]&&v[m].call(e,g)}}function K(t,e,n){var o=2<arguments.length&&void 0!==n?n:{},i=o.evt,r=l(o,["evt"]);O.pluginEvent.bind(Rt)(t,e,I({dragEl:z,parentEl:G,ghostEl:U,rootEl:q,nextEl:V,lastDownEl:Z,cloneEl:Q,cloneHidden:$,dragStarted:dt,putSortable:it,activeSortable:Rt.active,originalEvent:i,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt,hideGhostForTarget:Nt,unhideGhostForTarget:It,cloneNowHidden:function(){$=!0},cloneNowShown:function(){$=!1},dispatchSortableEvent:function(t){W({sortable:e,name:t,originalEvent:i})}},r))}function W(t){A(I({putSortable:it,cloneEl:Q,targetEl:z,rootEl:q,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt},t))}var z,G,U,q,V,Z,Q,$,J,tt,et,nt,ot,it,rt,at,lt,st,ct,ut,dt,ht,ft,pt,gt,vt=!1,mt=!1,bt=[],yt=!1,wt=!1,Et=[],Dt=!1,St=[],_t="undefined"!=typeof document,Ct=n,Tt=E||w?"cssFloat":"float",xt=_t&&!i&&!n&&"draggable"in document.createElement("div"),Mt=function(){if(_t){if(w)return!1;var t=document.createElement("x");return t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}}(),Ot=function(t,e){var n=R(t),o=parseInt(n.width)-parseInt(n.paddingLeft)-parseInt(n.paddingRight)-parseInt(n.borderLeftWidth)-parseInt(n.borderRightWidth),i=m(t,0,e),r=m(t,1,e),a=i&&R(i),l=r&&R(r),s=a&&parseInt(a.marginLeft)+parseInt(a.marginRight)+X(i).width,c=l&&parseInt(l.marginLeft)+parseInt(l.marginRight)+X(r).width;if("flex"===n.display)return"column"===n.flexDirection||"column-reverse"===n.flexDirection?"vertical":"horizontal";if("grid"===n.display)return n.gridTemplateColumns.split(" ").length<=1?"vertical":"horizontal";if(i&&a.float&&"none"!==a.float){var u="left"===a.float?"left":"right";return!r||"both"!==l.clear&&l.clear!==u?"horizontal":"vertical"}return i&&("block"===a.display||"flex"===a.display||"table"===a.display||"grid"===a.display||o<=s&&"none"===n[Tt]||r&&"none"===n[Tt]&&o<s+c)?"vertical":"horizontal"},At=function(t){function s(a,l){return function(t,e,n,o){var i=t.options.group.name&&e.options.group.name&&t.options.group.name===e.options.group.name;if(null==a&&(l||i))return!0;if(null==a||!1===a)return!1;if(l&&"clone"===a)return a;if("function"==typeof a)return s(a(t,e,n,o),l)(t,e,n,o);var r=(l?t:e).options.group.name;return!0===a||"string"==typeof a&&a===r||a.join&&-1<a.indexOf(r)}}var e={},n=t.group;n&&"object"==o(n)||(n={name:n}),e.name=n.name,e.checkPull=s(n.pull,!0),e.checkPut=s(n.put),e.revertClone=n.revertClone,t.group=e},Nt=function(){!Mt&&U&&R(U,"display","none")},It=function(){!Mt&&U&&R(U,"display","")};_t&&document.addEventListener("click",function(t){if(mt)return t.preventDefault(),t.stopPropagation&&t.stopPropagation(),t.stopImmediatePropagation&&t.stopImmediatePropagation(),mt=!1},!0);function Pt(t){if(z){var e=function(r,a){var l;return bt.some(function(t){if(!B(t)){var e=X(t),n=t[j].options.emptyInsertThreshold,o=r>=e.left-n&&r<=e.right+n,i=a>=e.top-n&&a<=e.bottom+n;return n&&o&&i?l=t:void 0}}),l}((t=t.touches?t.touches[0]:t).clientX,t.clientY);if(e){var n={};for(var o in t)t.hasOwnProperty(o)&&(n[o]=t[o]);n.target=n.rootEl=e,n.preventDefault=void 0,n.stopPropagation=void 0,e[j]._onDragOver(n)}}}function kt(t){z&&z.parentNode[j]._isOutsideThisEl(t.target)}function Rt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return Ot(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==Rt.supportPointer&&"PointerEvent"in window,emptyInsertThreshold:5};for(var o in O.initializePlugins(this,t,n),n)o in e||(e[o]=n[o]);for(var i in At(e),this)"_"===i.charAt(0)&&"function"==typeof this[i]&&(this[i]=this[i].bind(this));this.nativeDraggable=!e.forceFallback&&xt,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?u(t,"pointerdown",this._onTapStart):(u(t,"mousedown",this._onTapStart),u(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(u(t,"dragover",this),u(t,"dragenter",this)),bt.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,T())}function Xt(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||w||E?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),d&&(c=d.call(u,s,a)),c}function Yt(t){t.draggable=!1}function Bt(){Dt=!1}function Ft(t){for(var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;n--;)o+=e.charCodeAt(n);return o.toString(36)}function Ht(t){return setTimeout(t,0)}function Lt(t){return clearTimeout(t)}Rt.prototype={constructor:Rt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(ht=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(function(t){St.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&St.push(o)}}(o),!z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled||s.isContentEditable||(l=P(l,t.draggable,o,!1))&&l.animated||Z===l)){if(J=F(l),et=F(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return W({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),K("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c&&(c=c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return W({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),K("filter",n,{evt:e}),!0})))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;if(n&&!z&&n.parentNode===r){var s=X(n);if(q=r,G=(z=n).parentNode,V=z.nextSibling,Z=n,ot=a.group,rt={target:Rt.dragged=z,clientX:(e||t).clientX,clientY:(e||t).clientY},ct=rt.clientX-s.left,ut=rt.clientY-s.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,z.style["will-change"]="all",o=function(){K("delayEnded",i,{evt:t}),Rt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!c&&i.nativeDraggable&&(z.draggable=!0),i._triggerDragStart(t,e),W({sortable:i,name:"choose",originalEvent:t}),k(z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){g(z,t.trim(),Yt)}),u(l,"dragover",Pt),u(l,"mousemove",Pt),u(l,"touchmove",Pt),u(l,"mouseup",i._onDrop),u(l,"touchend",i._onDrop),u(l,"touchcancel",i._onDrop),c&&this.nativeDraggable&&(this.options.touchStartThreshold=4,z.draggable=!0),K("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(E||w))o();else{if(Rt.eventCanceled)return void this._onDrop();u(l,"mouseup",i._disableDelayedDrag),u(l,"touchend",i._disableDelayedDrag),u(l,"touchcancel",i._disableDelayedDrag),u(l,"mousemove",i._delayedDragTouchMoveHandler),u(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&u(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)}}},_delayedDragTouchMoveHandler:function(t){var e=t.touches?t.touches[0]:t;Math.max(Math.abs(e.clientX-this._lastX),Math.abs(e.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){z&&Yt(z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._disableDelayedDrag),d(t,"touchend",this._disableDelayedDrag),d(t,"touchcancel",this._disableDelayedDrag),d(t,"mousemove",this._delayedDragTouchMoveHandler),d(t,"touchmove",this._delayedDragTouchMoveHandler),d(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?u(document,"pointermove",this._onTouchMove):u(document,e?"touchmove":"mousemove",this._onTouchMove):(u(z,"dragend",this),u(q,"dragstart",this._onDragStart));try{document.selection?Ht(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){if(vt=!1,q&&z){K("dragStarted",this,{evt:e}),this.nativeDraggable&&u(document,"dragover",kt);var n=this.options;t||k(z,n.dragClass,!1),k(z,n.ghostClass,!0),Rt.active=this,t&&this._appendGhost(),W({sortable:this,name:"start",originalEvent:e})}else this._nulling()},_emulateDragOver:function(){if(at){this._lastX=at.clientX,this._lastY=at.clientY,Nt();for(var t=document.elementFromPoint(at.clientX,at.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(at.clientX,at.clientY))!==e;)e=t;if(z.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j]){if(e[j]._onDragOver({clientX:at.clientX,clientY:at.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}t=e}while(e=e.parentNode);It()}},_onTouchMove:function(t){if(rt){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=U&&v(U,!0),a=U&&r&&r.a,l=U&&r&&r.d,s=Ct&&gt&&b(gt),c=(i.clientX-rt.clientX+o.x)/(a||1)+(s?s[0]-Et[0]:0)/(a||1),u=(i.clientY-rt.clientY+o.y)/(l||1)+(s?s[1]-Et[1]:0)/(l||1);if(!Rt.active&&!vt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))<n)return;this._onDragStart(t,!0)}if(U){r?(r.e+=c-(lt||0),r.f+=u-(st||0)):r={a:1,b:0,c:0,d:1,e:c,f:u};var d="matrix(".concat(r.a,",").concat(r.b,",").concat(r.c,",").concat(r.d,",").concat(r.e,",").concat(r.f,")");R(U,"webkitTransform",d),R(U,"mozTransform",d),R(U,"msTransform",d),R(U,"transform",d),lt=c,st=u,at=i}t.cancelable&&t.preventDefault()}},_appendGhost:function(){if(!U){var t=this.options.fallbackOnBody?document.body:q,e=X(z,!0,Ct,!0,t),n=this.options;if(Ct){for(gt=t;"static"===R(gt,"position")&&"none"===R(gt,"transform")&&gt!==document;)gt=gt.parentNode;gt!==document.body&&gt!==document.documentElement?(gt===document&&(gt=N()),e.top+=gt.scrollTop,e.left+=gt.scrollLeft):gt=N(),Et=b(gt)}k(U=z.cloneNode(!0),n.ghostClass,!1),k(U,n.fallbackClass,!0),k(U,n.dragClass,!0),R(U,"transition",""),R(U,"transform",""),R(U,"box-sizing","border-box"),R(U,"margin",0),R(U,"top",e.top),R(U,"left",e.left),R(U,"width",e.width),R(U,"height",e.height),R(U,"opacity","0.8"),R(U,"position",Ct?"absolute":"fixed"),R(U,"zIndex","100000"),R(U,"pointerEvents","none"),Rt.ghost=U,t.appendChild(U),R(U,"transform-origin",ct/parseInt(U.style.width)*100+"% "+ut/parseInt(U.style.height)*100+"%")}},_onDragStart:function(t,e){var n=this,o=t.dataTransfer,i=n.options;K("dragStart",this,{evt:t}),Rt.eventCanceled?this._onDrop():(K("setupClone",this),Rt.eventCanceled||((Q=S(z)).draggable=!1,Q.style["will-change"]="",this._hideClone(),k(Q,this.options.chosenClass,!1),Rt.clone=Q),n.cloneId=Ht(function(){K("clone",n),Rt.eventCanceled||(n.options.removeCloneOnHide||q.insertBefore(Q,z),n._hideClone(),W({sortable:n,name:"clone"}))}),e||k(z,i.dragClass,!0),e?(mt=!0,n._loopId=setInterval(n._emulateDragOver,50)):(d(document,"mouseup",n._onDrop),d(document,"touchend",n._onDrop),d(document,"touchcancel",n._onDrop),o&&(o.effectAllowed="move",i.setData&&i.setData.call(n,o,z)),u(document,"drop",n),R(z,"transform","translateZ(0)")),vt=!0,n._dragStartId=Ht(n._dragStarted.bind(n,e,t)),u(document,"selectstart",n),dt=!0,s&&R(document.body,"user-select","none"))},_onDragOver:function(n){var o,i,r,a,l=this.el,s=n.target,e=this.options,t=e.group,c=Rt.active,u=ot===t,d=e.sort,h=it||c,f=this,p=!1;if(!Dt){if(void 0!==n.preventDefault&&n.cancelable&&n.preventDefault(),s=P(s,e.draggable,l,!0),M("dragOver"),Rt.eventCanceled)return p;if(z.contains(n.target)||s.animated&&s.animatingX&&s.animatingY||f._ignoreWhileAnimating===s)return A(!1);if(mt=!1,c&&!e.disabled&&(u?d||(r=!q.contains(z)):it===this||(this.lastPutMode=ot.checkPull(this,c,z,n))&&t.checkPut(this,c,z,n))){if(a="vertical"===this._getDirection(n,s),o=X(z),M("dragOverValid"),Rt.eventCanceled)return p;if(r)return G=q,O(),this._hideClone(),M("revert"),Rt.eventCanceled||(V?q.insertBefore(z,V):q.appendChild(z)),A(!0);var g=B(l,e.draggable);if(!g||function(t,e,n){var o=X(B(n.el,n.options.draggable));return e?t.clientX>o.right+10||t.clientX<=o.right&&t.clientY>o.bottom&&t.clientX>=o.left:t.clientX>o.right&&t.clientY>o.top||t.clientX<=o.right&&t.clientY>o.bottom+10}(n,a,this)&&!g.animated){if(g===z)return A(!1);if(g&&l===n.target&&(s=g),s&&(i=X(s)),!1!==Xt(q,l,z,o,s,i,n,!!s))return O(),l.appendChild(z),G=l,N(),A(!0)}else if(s.parentNode===l){i=X(s);var v,m,b,y=z.parentNode!==l,w=!function(t,e,n){var o=n?t.left:t.top,i=n?t.right:t.bottom,r=n?t.width:t.height,a=n?e.left:e.top,l=n?e.right:e.bottom,s=n?e.width:e.height;return o===a||i===l||o+r/2===a+s/2}(z.animated&&z.toRect||o,s.animated&&s.toRect||i,a),E=a?"top":"left",D=Y(s,"top","top")||Y(z,"top","top"),S=D?D.scrollTop:void 0;if(ht!==s&&(m=i[E],yt=!1,wt=!w&&e.invertSwap||y),0!==(v=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,u=o?n.top:n.left,d=o?n.bottom:n.right,h=!1;if(!a)if(l&&pt<c*i){if(!yt&&(1===ft?u+c*r/2<s:s<d-c*r/2)&&(yt=!0),yt)h=!0;else if(1===ft?s<u+pt:d-pt<s)return-ft}else if(u+c*(1-i)/2<s&&s<d-c*(1-i)/2)return function(t){return F(z)<F(t)?1:-1}(e);if((h=h||a)&&(s<u+c*r/2||d-c*r/2<s))return u+c/2<s?1:-1;return 0}(n,s,i,a,w?1:e.swapThreshold,null==e.invertedSwapThreshold?e.swapThreshold:e.invertedSwapThreshold,wt,ht===s)))for(var _=F(z);_-=v,(b=G.children[_])&&("none"===R(b,"display")||b===U););if(0===v||b===s)return A(!1);ft=v;var C=(ht=s).nextElementSibling,T=!1,x=Xt(q,l,z,o,s,i,n,T=1===v);if(!1!==x)return 1!==x&&-1!==x||(T=1===x),Dt=!0,setTimeout(Bt,30),O(),T&&!C?l.appendChild(z):s.parentNode.insertBefore(z,T?C:s),D&&L(D,0,S-D.scrollTop),G=z.parentNode,void 0===m||wt||(pt=Math.abs(m-X(s)[E])),N(),A(!0)}if(l.contains(z))return A(!1)}return!1}function M(t,e){K(t,f,I({evt:n,isOwner:u,axis:a?"vertical":"horizontal",revert:r,dragRect:o,targetRect:i,canSort:d,fromSortable:h,target:s,completed:A,onMove:function(t,e){return Xt(q,l,z,o,t,X(t),n,e)},changed:N},e))}function O(){M("dragOverAnimationCapture"),f.captureAnimationState(),f!==h&&h.captureAnimationState()}function A(t){return M("dragOverCompleted",{insertion:t}),t&&(u?c._hideClone():c._showClone(f),f!==h&&(k(z,it?it.options.ghostClass:c.options.ghostClass,!1),k(z,e.ghostClass,!0)),it!==f&&f!==Rt.active?it=f:f===Rt.active&&it&&(it=null),h===f&&(f._ignoreWhileAnimating=s),f.animateAll(function(){M("dragOverAnimationComplete"),f._ignoreWhileAnimating=null}),f!==h&&(h.animateAll(),h._ignoreWhileAnimating=null)),(s===z&&!z.animated||s===l&&!s.animated)&&(ht=null),e.dragoverBubble||n.rootEl||s===document||(z.parentNode[j]._isOutsideThisEl(n.target),t||Pt(n)),!e.dragoverBubble&&n.stopPropagation&&n.stopPropagation(),p=!0}function N(){tt=F(z),nt=F(z,e.draggable),W({sortable:f,name:"change",toEl:l,newIndex:tt,newDraggableIndex:nt,originalEvent:n})}},_ignoreWhileAnimating:null,_offMoveEvents:function(){d(document,"mousemove",this._onTouchMove),d(document,"touchmove",this._onTouchMove),d(document,"pointermove",this._onTouchMove),d(document,"dragover",Pt),d(document,"mousemove",Pt),d(document,"touchmove",Pt)},_offUpEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._onDrop),d(t,"touchend",this._onDrop),d(t,"pointerup",this._onDrop),d(t,"touchcancel",this._onDrop),d(document,"selectstart",this)},_onDrop:function(t){var e=this.el,n=this.options;tt=F(z),nt=F(z,n.draggable),K("drop",this,{evt:t}),G=z&&z.parentNode,tt=F(z),nt=F(z,n.draggable),Rt.eventCanceled||(yt=wt=vt=!1,clearInterval(this._loopId),clearTimeout(this._dragStartTimer),Lt(this.cloneId),Lt(this._dragStartId),this.nativeDraggable&&(d(document,"drop",this),d(e,"dragstart",this._onDragStart)),this._offMoveEvents(),this._offUpEvents(),s&&R(document.body,"user-select",""),R(z,"transform",""),t&&(dt&&(t.cancelable&&t.preventDefault(),n.dropBubble||t.stopPropagation()),U&&U.parentNode&&U.parentNode.removeChild(U),(q===G||it&&"clone"!==it.lastPutMode)&&Q&&Q.parentNode&&Q.parentNode.removeChild(Q),z&&(this.nativeDraggable&&d(z,"dragend",this),Yt(z),z.style["will-change"]="",dt&&!vt&&k(z,it?it.options.ghostClass:this.options.ghostClass,!1),k(z,this.options.chosenClass,!1),W({sortable:this,name:"unchoose",toEl:G,newIndex:null,newDraggableIndex:null,originalEvent:t}),q!==G?(0<=tt&&(W({rootEl:G,name:"add",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"remove",toEl:G,originalEvent:t}),W({rootEl:G,name:"sort",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),it&&it.save()):tt!==J&&0<=tt&&(W({sortable:this,name:"update",toEl:G,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),Rt.active&&(null!=tt&&-1!==tt||(tt=J,nt=et),W({sortable:this,name:"end",toEl:G,originalEvent:t}),this.save())))),this._nulling()},_nulling:function(){K("nulling",this),q=z=G=U=V=Q=Z=$=rt=at=dt=tt=nt=J=et=ht=ft=it=ot=Rt.dragged=Rt.ghost=Rt.clone=Rt.active=null,St.forEach(function(t){t.checked=!0}),St.length=lt=st=0},handleEvent:function(t){switch(t.type){case"drop":case"dragend":this._onDrop(t);break;case"dragenter":case"dragover":z&&(this._onDragOver(t),function(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move");t.cancelable&&t.preventDefault()}(t));break;case"selectstart":t.preventDefault()}},toArray:function(){for(var t,e=[],n=this.el.children,o=0,i=n.length,r=this.options;o<i;o++)P(t=n[o],r.draggable,this.el,!1)&&e.push(t.getAttribute(r.dataIdAttr)||Ft(t));return e},sort:function(t){var o={},i=this.el;this.toArray().forEach(function(t,e){var n=i.children[e];P(n,this.options.draggable,i,!1)&&(o[t]=n)},this),t.forEach(function(t){o[t]&&(i.removeChild(o[t]),i.appendChild(o[t]))})},save:function(){var t=this.options.store;t&&t.set&&t.set(this)},closest:function(t,e){return P(t,e||this.options.draggable,this.el,!1)},option:function(t,e){var n=this.options;if(void 0===e)return n[t];var o=O.modifyOption(this,t,e);n[t]=void 0!==o?o:e,"group"===t&&At(n)},destroy:function(){K("destroy",this);var t=this.el;t[j]=null,d(t,"mousedown",this._onTapStart),d(t,"touchstart",this._onTapStart),d(t,"pointerdown",this._onTapStart),this.nativeDraggable&&(d(t,"dragover",this),d(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),this._onDrop(),this._disableDelayedDragEvents(),bt.splice(bt.indexOf(this.el),1),this.el=t=null},_hideClone:function(){if(!$){if(K("hideClone",this),Rt.eventCanceled)return;R(Q,"display","none"),this.options.removeCloneOnHide&&Q.parentNode&&Q.parentNode.removeChild(Q),$=!0}},_showClone:function(t){if("clone"===t.lastPutMode){if($){if(K("showClone",this),Rt.eventCanceled)return;q.contains(z)&&!this.options.group.revertClone?q.insertBefore(Q,z):V?q.insertBefore(Q,V):q.appendChild(Q),this.options.group.revertClone&&this.animate(z,Q),R(Q,"display",""),$=!1}}else this._hideClone()}},_t&&u(document,"touchmove",function(t){(Rt.active||vt)&&t.cancelable&&t.preventDefault()}),Rt.utils={on:u,off:d,css:R,find:g,is:function(t,e){return!!P(t,e,t,!1)},extend:function(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},throttle:D,closest:P,toggleClass:k,clone:S,index:F,nextTick:Ht,cancelNextTick:Lt,detectDirection:Ot,getChild:m},Rt.get=function(t){return t[j]},Rt.mount=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];e[0].constructor===Array&&(e=e[0]),e.forEach(function(t){if(!t.prototype||!t.prototype.constructor)throw"Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(t));t.utils&&(Rt.utils=I({},Rt.utils,t.utils)),O.mount(t)})},Rt.create=function(t,e){return new Rt(t,e)};var jt,Kt,Wt,zt,Gt,Ut,qt=[],Vt=!(Rt.version="1.10.2");function Zt(){qt.forEach(function(t){clearInterval(t.pid)}),qt=[]}function Qt(){clearInterval(Ut)}function $t(t){var e=t.originalEvent,n=t.putSortable,o=t.dragEl,i=t.activeSortable,r=t.dispatchSortableEvent,a=t.hideGhostForTarget,l=t.unhideGhostForTarget;if(e){var s=n||i;a();var c=e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e,u=document.elementFromPoint(c.clientX,c.clientY);l(),s&&!s.el.contains(u)&&(r("spill"),this.onSpill({dragEl:o,putSortable:n}))}}var Jt,te=D(function(n,t,e,o){if(t.scroll){var i,r=(n.touches?n.touches[0]:n).clientX,a=(n.touches?n.touches[0]:n).clientY,l=t.scrollSensitivity,s=t.scrollSpeed,c=N(),u=!1;Kt!==e&&(Kt=e,Zt(),jt=t.scroll,i=t.scrollFn,!0===jt&&(jt=H(e,!0)));var d=0,h=jt;do{var f=h,p=X(f),g=p.top,v=p.bottom,m=p.left,b=p.right,y=p.width,w=p.height,E=void 0,D=void 0,S=f.scrollWidth,_=f.scrollHeight,C=R(f),T=f.scrollLeft,x=f.scrollTop;D=f===c?(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX||"visible"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY||"visible"===C.overflowY)):(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY));var M=E&&(Math.abs(b-r)<=l&&T+y<S)-(Math.abs(m-r)<=l&&!!T),O=D&&(Math.abs(v-a)<=l&&x+w<_)-(Math.abs(g-a)<=l&&!!x);if(!qt[d])for(var A=0;A<=d;A++)qt[A]||(qt[A]={});qt[d].vx==M&&qt[d].vy==O&&qt[d].el===f||(qt[d].el=f,qt[d].vx=M,qt[d].vy=O,clearInterval(qt[d].pid),0==M&&0==O||(u=!0,qt[d].pid=setInterval(function(){o&&0===this.layer&&Rt.active._onTouchMove(Gt);var t=qt[this.layer].vy?qt[this.layer].vy*s:0,e=qt[this.layer].vx?qt[this.layer].vx*s:0;"function"==typeof i&&"continue"!==i.call(Rt.dragged.parentNode[j],e,t,n,Gt,qt[this.layer].el)||L(qt[this.layer].el,e,t)}.bind({layer:d}),24))),d++}while(t.bubbleScroll&&h!==c&&(h=H(h,!1)));Vt=u}},30);function ee(){}function ne(){}ee.prototype={startIndex:null,dragStart:function(t){var e=t.oldDraggableIndex;this.startIndex=e},onSpill:function(t){var e=t.dragEl,n=t.putSortable;this.sortable.captureAnimationState(),n&&n.captureAnimationState();var o=m(this.sortable.el,this.startIndex,this.options);o?this.sortable.el.insertBefore(e,o):this.sortable.el.appendChild(e),this.sortable.animateAll(),n&&n.animateAll()},drop:$t},a(ee,{pluginName:"revertOnSpill"}),ne.prototype={onSpill:function(t){var e=t.dragEl,n=t.putSortable||this.sortable;n.captureAnimationState(),e.parentNode&&e.parentNode.removeChild(e),n.animateAll()},drop:$t},a(ne,{pluginName:"removeOnSpill"});var oe,ie,re,ae,le,se=[],ce=[],ue=!1,de=!1,he=!1;function fe(o,i){ce.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}function pe(){se.forEach(function(t){t!==re&&t.parentNode&&t.parentNode.removeChild(t)})}return Rt.mount(new function(){function t(){for(var t in this.defaults={scroll:!0,scrollSensitivity:30,scrollSpeed:10,bubbleScroll:!0},this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this))}return t.prototype={dragStarted:function(t){var e=t.originalEvent;this.sortable.nativeDraggable?u(document,"dragover",this._handleAutoScroll):this.options.supportPointer?u(document,"pointermove",this._handleFallbackAutoScroll):e.touches?u(document,"touchmove",this._handleFallbackAutoScroll):u(document,"mousemove",this._handleFallbackAutoScroll)},dragOverCompleted:function(t){var e=t.originalEvent;this.options.dragOverBubble||e.rootEl||this._handleAutoScroll(e)},drop:function(){this.sortable.nativeDraggable?d(document,"dragover",this._handleAutoScroll):(d(document,"pointermove",this._handleFallbackAutoScroll),d(document,"touchmove",this._handleFallbackAutoScroll),d(document,"mousemove",this._handleFallbackAutoScroll)),Qt(),Zt(),clearTimeout(f),f=void 0},nulling:function(){Gt=Kt=jt=Vt=Ut=Wt=zt=null,qt.length=0},_handleFallbackAutoScroll:function(t){this._handleAutoScroll(t,!0)},_handleAutoScroll:function(e,n){var o=this,i=(e.touches?e.touches[0]:e).clientX,r=(e.touches?e.touches[0]:e).clientY,t=document.elementFromPoint(i,r);if(Gt=e,n||E||w||s){te(e,this.options,t,n);var a=H(t,!0);!Vt||Ut&&i===Wt&&r===zt||(Ut&&Qt(),Ut=setInterval(function(){var t=H(document.elementFromPoint(i,r),!0);t!==a&&(a=t,Zt()),te(e,o.options,t,n)},10),Wt=i,zt=r)}else{if(!this.options.bubbleScroll||H(t,!0)===N())return void Zt();te(e,this.options,H(t,!1),!1)}}},a(t,{pluginName:"scroll",initializeByDefault:!0})}),Rt.mount(ne,ee),Rt.mount(new function(){function t(){this.defaults={swapClass:"sortable-swap-highlight"}}return t.prototype={dragStart:function(t){var e=t.dragEl;Jt=e},dragOverValid:function(t){var e=t.completed,n=t.target,o=t.onMove,i=t.activeSortable,r=t.changed,a=t.cancel;if(i.options.swap){var l=this.sortable.el,s=this.options;if(n&&n!==l){var c=Jt;Jt=!1!==o(n)?(k(n,s.swapClass,!0),n):null,c&&c!==Jt&&k(c,s.swapClass,!1)}r(),e(!0),a()}},drop:function(t){var e=t.activeSortable,n=t.putSortable,o=t.dragEl,i=n||this.sortable,r=this.options;Jt&&k(Jt,r.swapClass,!1),Jt&&(r.swap||n&&n.options.swap)&&o!==Jt&&(i.captureAnimationState(),i!==e&&e.captureAnimationState(),function(t,e){var n,o,i=t.parentNode,r=e.parentNode;if(!i||!r||i.isEqualNode(e)||r.isEqualNode(t))return;n=F(t),o=F(e),i.isEqualNode(r)&&n<o&&o++;i.insertBefore(e,i.children[n]),r.insertBefore(t,r.children[o])}(o,Jt),i.animateAll(),i!==e&&e.animateAll())},nulling:function(){Jt=null}},a(t,{pluginName:"swap",eventProperties:function(){return{swapItem:Jt}}})}),Rt.mount(new function(){function t(o){for(var t in this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this));o.options.supportPointer?u(document,"pointerup",this._deselectMultiDrag):(u(document,"mouseup",this._deselectMultiDrag),u(document,"touchend",this._deselectMultiDrag)),u(document,"keydown",this._checkKeyDown),u(document,"keyup",this._checkKeyUp),this.defaults={selectedClass:"sortable-selected",multiDragKey:null,setData:function(t,e){var n="";se.length&&ie===o?se.forEach(function(t,e){n+=(e?", ":"")+t.textContent}):n=e.textContent,t.setData("Text",n)}}}return t.prototype={multiDragKeyDown:!1,isMultiDrag:!1,delayStartGlobal:function(t){var e=t.dragEl;re=e},delayEnded:function(){this.isMultiDrag=~se.indexOf(re)},setupClone:function(t){var e=t.sortable,n=t.cancel;if(this.isMultiDrag){for(var o=0;o<se.length;o++)ce.push(S(se[o])),ce[o].sortableIndex=se[o].sortableIndex,ce[o].draggable=!1,ce[o].style["will-change"]="",k(ce[o],this.options.selectedClass,!1),se[o]===re&&k(ce[o],this.options.chosenClass,!1);e._hideClone(),n()}},clone:function(t){var e=t.sortable,n=t.rootEl,o=t.dispatchSortableEvent,i=t.cancel;this.isMultiDrag&&(this.options.removeCloneOnHide||se.length&&ie===e&&(fe(!0,n),o("clone"),i()))},showClone:function(t){var e=t.cloneNowShown,n=t.rootEl,o=t.cancel;this.isMultiDrag&&(fe(!1,n),ce.forEach(function(t){R(t,"display","")}),e(),le=!1,o())},hideClone:function(t){var e=this,n=(t.sortable,t.cloneNowHidden),o=t.cancel;this.isMultiDrag&&(ce.forEach(function(t){R(t,"display","none"),e.options.removeCloneOnHide&&t.parentNode&&t.parentNode.removeChild(t)}),n(),le=!0,o())},dragStartGlobal:function(t){t.sortable;!this.isMultiDrag&&ie&&ie.multiDrag._deselectMultiDrag(),se.forEach(function(t){t.sortableIndex=F(t)}),se=se.sort(function(t,e){return t.sortableIndex-e.sortableIndex}),he=!0},dragStarted:function(t){var e=this,n=t.sortable;if(this.isMultiDrag){if(this.options.sort&&(n.captureAnimationState(),this.options.animation)){se.forEach(function(t){t!==re&&R(t,"position","absolute")});var o=X(re,!1,!0,!0);se.forEach(function(t){t!==re&&_(t,o)}),ue=de=!0}n.animateAll(function(){ue=de=!1,e.options.animation&&se.forEach(function(t){C(t)}),e.options.sort&&pe()})}},dragOver:function(t){var e=t.target,n=t.completed,o=t.cancel;de&&~se.indexOf(e)&&(n(!1),o())},revert:function(t){var e=t.fromSortable,n=t.rootEl,o=t.sortable,i=t.dragRect;1<se.length&&(se.forEach(function(t){o.addAnimationState({target:t,rect:de?X(t):i}),C(t),t.fromRect=i,e.removeAnimationState(t)}),de=!1,function(o,i){se.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}(!this.options.removeCloneOnHide,n))},dragOverCompleted:function(t){var e=t.sortable,n=t.isOwner,o=t.insertion,i=t.activeSortable,r=t.parentEl,a=t.putSortable,l=this.options;if(o){if(n&&i._hideClone(),ue=!1,l.animation&&1<se.length&&(de||!n&&!i.options.sort&&!a)){var s=X(re,!1,!0,!0);se.forEach(function(t){t!==re&&(_(t,s),r.appendChild(t))}),de=!0}if(!n)if(de||pe(),1<se.length){var c=le;i._showClone(e),i.options.animation&&!le&&c&&ce.forEach(function(t){i.addAnimationState({target:t,rect:ae}),t.fromRect=ae,t.thisAnimationDuration=null})}else i._showClone(e)}},dragOverAnimationCapture:function(t){var e=t.dragRect,n=t.isOwner,o=t.activeSortable;if(se.forEach(function(t){t.thisAnimationDuration=null}),o.options.animation&&!n&&o.multiDrag.isMultiDrag){ae=a({},e);var i=v(re,!0);ae.top-=i.f,ae.left-=i.e}},dragOverAnimationComplete:function(){de&&(de=!1,pe())},drop:function(t){var e=t.originalEvent,n=t.rootEl,o=t.parentEl,i=t.sortable,r=t.dispatchSortableEvent,a=t.oldIndex,l=t.putSortable,s=l||this.sortable;if(e){var c=this.options,u=o.children;if(!he)if(c.multiDragKey&&!this.multiDragKeyDown&&this._deselectMultiDrag(),k(re,c.selectedClass,!~se.indexOf(re)),~se.indexOf(re))se.splice(se.indexOf(re),1),oe=null,A({sortable:i,rootEl:n,name:"deselect",targetEl:re,originalEvt:e});else{if(se.push(re),A({sortable:i,rootEl:n,name:"select",targetEl:re,originalEvt:e}),e.shiftKey&&oe&&i.el.contains(oe)){var d,h,f=F(oe),p=F(re);if(~f&&~p&&f!==p)for(d=f<p?(h=f,p):(h=p,f+1);h<d;h++)~se.indexOf(u[h])||(k(u[h],c.selectedClass,!0),se.push(u[h]),A({sortable:i,rootEl:n,name:"select",targetEl:u[h],originalEvt:e}))}else oe=re;ie=s}if(he&&this.isMultiDrag){if((o[j].options.sort||o!==n)&&1<se.length){var g=X(re),v=F(re,":not(."+this.options.selectedClass+")");if(!ue&&c.animation&&(re.thisAnimationDuration=null),s.captureAnimationState(),!ue&&(c.animation&&(re.fromRect=g,se.forEach(function(t){if(t.thisAnimationDuration=null,t!==re){var e=de?X(t):g;t.fromRect=e,s.addAnimationState({target:t,rect:e})}})),pe(),se.forEach(function(t){u[v]?o.insertBefore(t,u[v]):o.appendChild(t),v++}),a===F(re))){var m=!1;se.forEach(function(t){t.sortableIndex===F(t)||(m=!0)}),m&&r("update")}se.forEach(function(t){C(t)}),s.animateAll()}ie=s}(n===o||l&&"clone"!==l.lastPutMode)&&ce.forEach(function(t){t.parentNode&&t.parentNode.removeChild(t)})}},nullingGlobal:function(){this.isMultiDrag=he=!1,ce.length=0},destroyGlobal:function(){this._deselectMultiDrag(),d(document,"pointerup",this._deselectMultiDrag),d(document,"mouseup",this._deselectMultiDrag),d(document,"touchend",this._deselectMultiDrag),d(document,"keydown",this._checkKeyDown),d(document,"keyup",this._checkKeyUp)},_deselectMultiDrag:function(t){if(!(void 0!==he&&he||ie!==this.sortable||t&&P(t.target,this.options.draggable,this.sortable.el,!1)||t&&0!==t.button))for(;se.length;){var e=se[0];k(e,this.options.selectedClass,!1),se.shift(),A({sortable:this.sortable,rootEl:this.sortable.el,name:"deselect",targetEl:e,originalEvt:t})}},_checkKeyDown:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!0)},_checkKeyUp:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!1)}},a(t,{pluginName:"multiDrag",utils:{select:function(t){var e=t.parentNode[j];e&&e.options.multiDrag&&!~se.indexOf(t)&&(ie&&ie!==e&&(ie.multiDrag._deselectMultiDrag(),ie=e),k(t,e.options.selectedClass,!0),se.push(t))},deselect:function(t){var e=t.parentNode[j],n=se.indexOf(t);e&&e.options.multiDrag&&~n&&(k(t,e.options.selectedClass,!1),se.splice(n,1))}},eventProperties:function(){var n=this,o=[],i=[];return se.forEach(function(t){var e;o.push({multiDragElement:t,index:t.sortableIndex}),e=de&&t!==re?-1:de?F(t,":not(."+n.options.selectedClass+")"):F(t),i.push({multiDragElement:t,index:e})}),{items:e(se),clones:[].concat(ce),oldIndicies:o,newIndicies:i}},optionListeners:{multiDragKey:function(t){return"ctrl"===(t=t.toLowerCase())?t="Control":1<t.length&&(t=t.charAt(0).toUpperCase()+t.substr(1)),t}}})}),Rt});
\ No newline at end of file

From 7da1c0ab7f33c0dcf1e7d88608caf326c4163831 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sun, 22 Mar 2020 19:44:56 +0100
Subject: [PATCH 04/14] Use Sortable.js to sort Menus

This commit allows sorting of menus. We instantiate for each element in
the tree one instance of Sortable.js, but - through the `group` option
- allow dragging and dropping between each element. For this to work,
  all `ul` elements need to be present (otherwise we cannot drop a node
below a list that does not have nodes yet).

A little tricky was the correct behaviour of the `folded` button: It
should only be displayed if there are any pages to fold. This is now
accomplished through rendering the `+` and `-` buttons in Javascript,
depending on how many elements are in each list after sorting.

Additionally: The full node tree is now rendered on page load, and all
manipulations manipulate the DOM. There are no nodes being inserted or
deleted through sorting or folding.
---
 app/assets/javascripts/alchemy/admin.js       |  1 +
 .../javascripts/alchemy/alchemy.node_tree.js  | 92 +++++++++++++++++++
 app/assets/stylesheets/alchemy/nodes.scss     |  4 +
 .../alchemy/admin/nodes_controller.rb         |  6 +-
 app/views/alchemy/admin/nodes/_node.html.erb  | 24 +----
 app/views/alchemy/admin/nodes/index.html.erb  | 18 +---
 .../alchemy/admin/nodes_controller_spec.rb    |  4 +-
 7 files changed, 107 insertions(+), 42 deletions(-)
 create mode 100644 app/assets/javascripts/alchemy/alchemy.node_tree.js

diff --git a/app/assets/javascripts/alchemy/admin.js b/app/assets/javascripts/alchemy/admin.js
index ba3b82937b..6648da0b13 100644
--- a/app/assets/javascripts/alchemy/admin.js
+++ b/app/assets/javascripts/alchemy/admin.js
@@ -40,6 +40,7 @@
 //= require alchemy/alchemy.link_dialog
 //= require alchemy/alchemy.list_filter
 //= require alchemy/alchemy.initializer
+//= require alchemy/alchemy.node_tree
 //= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.preview_window
diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
new file mode 100644
index 0000000000..0abe3d3591
--- /dev/null
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -0,0 +1,92 @@
+Alchemy.NodeTree = {
+  onFinishDragging: function (evt) {
+    var url = '/api/nodes/' + evt.item.dataset.id + '/move.json'
+    var xhr = new XMLHttpRequest()
+    var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+    var data = {
+      target_parent_id: evt.to.dataset.nodeId,
+      new_position: evt.newIndex
+    };
+    var json = JSON.stringify(data)
+    xhr.open("PATCH", url);
+    xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
+    xhr.setRequestHeader('X-CSRF-Token', token)
+    evt.to.parentElement.dataset.folded = 'false'
+    evt.to.classList.remove('folded')
+    xhr.onload = function () {
+      response_json = JSON.parse(xhr.responseText)
+      if (xhr.readyState == 4 && xhr.status == "200") {
+        Alchemy.NodeTree.displayNodeFolders()
+      } else {
+        Alchemy.growl(response_json.error, 'error');
+      }
+    }
+    xhr.send(json)
+  },
+
+  displayNodeFolders: function () {
+    var generate_link = function (node_id, folded) {
+      var icon = folded === "true" ? 'plus' : 'minus';
+      return '<a class="node_folder" data-node-id="' + node_id + '"><i class="far fa-' + icon + '-square fa-fw"></i></a>'
+    }
+
+    document.querySelectorAll('li.menu-item').forEach(function (el) {
+      var leftIconArea = el.querySelector('.nodes_tree-left_images')
+      var list = el.querySelector('ul')
+
+      if (list.children.length > 0 || el.dataset.folded === 'true' ) {
+        leftIconArea.innerHTML = generate_link(el.dataset.id, el.dataset.folded)
+      } else {
+        leftIconArea.innerHTML = '&nbsp;'
+      }
+    });
+
+    this.handleNodeFolders();
+  },
+
+  handleNodeFolders: function() {
+    var folders = document.querySelectorAll('.nodes_tree .node_folder');
+
+    folders.forEach(function(folder){
+      folder.addEventListener('click', function(evt) {
+        var nodeId = this.dataset.nodeId
+        var menu_item = this.closest('li.menu-item')
+        var url = '/admin/nodes/' + nodeId + '/toggle.html'
+        var list = menu_item.querySelector('.children')
+        var xhr = new XMLHttpRequest()
+        var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+
+        xhr.open("PATCH", url);
+        xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
+        xhr.setRequestHeader('X-CSRF-Token', token)
+
+        xhr.onload = function () {
+          if (xhr.readyState == 4 && xhr.status == "200") {
+            list.classList.toggle('folded')
+            menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true'
+            Alchemy.NodeTree.displayNodeFolders();
+          } else {
+            Alchemy.growl('error folding');
+          }
+        }
+        xhr.send()
+      })
+    });
+  },
+
+  init: function() {
+    this.displayNodeFolders()
+
+    document.querySelectorAll('.nodes_tree ul.children').forEach(function (el) {
+      new Sortable(el, {
+        group: 'nodes',
+        animation: 150,
+        fallbackOnBody: true,
+        swapThreshold: 0.65,
+        handle: '.node_name',
+        invertSwap: true,
+        onEnd: Alchemy.NodeTree.onFinishDragging
+      });
+    });
+  }
+}
diff --git a/app/assets/stylesheets/alchemy/nodes.scss b/app/assets/stylesheets/alchemy/nodes.scss
index 6e2d4790e8..6d2464aca7 100644
--- a/app/assets/stylesheets/alchemy/nodes.scss
+++ b/app/assets/stylesheets/alchemy/nodes.scss
@@ -63,6 +63,10 @@
   ul {
     margin: 0;
     padding: 0;
+
+    .folded > li {
+      display: none;
+    }
   }
 
   li {
diff --git a/app/controllers/alchemy/admin/nodes_controller.rb b/app/controllers/alchemy/admin/nodes_controller.rb
index 38957fb148..29d29ac304 100644
--- a/app/controllers/alchemy/admin/nodes_controller.rb
+++ b/app/controllers/alchemy/admin/nodes_controller.rb
@@ -18,11 +18,7 @@ def new
       def toggle
         node = Node.find(params[:id])
         node.update(folded: !node.folded)
-        if node.folded?
-          head :ok
-        else
-          render partial: 'node', collection: node.children.includes(:page, :children)
-        end
+        head :ok
       end
 
       private
diff --git a/app/views/alchemy/admin/nodes/_node.html.erb b/app/views/alchemy/admin/nodes/_node.html.erb
index 45db0c628b..1615497ed0 100644
--- a/app/views/alchemy/admin/nodes/_node.html.erb
+++ b/app/views/alchemy/admin/nodes/_node.html.erb
@@ -1,21 +1,11 @@
-<li>
+<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded? } do %>
   <%= content_tag :div, class: [
     'sitemap_node',
     node.external? ? 'external' : 'internal',
     "sitemap_node-level_#{node.depth}"
   ] do %>
     <span class="nodes_tree-left_images">
-      <% if node.children.any? %>
-        <a class="node_folder" data-node-id="<%= node.id %>">
-          <% if node.folded? %>
-            <i class="far fa-plus-square fa-fw"></i>
-          <% else %>
-            <i class="far fa-minus-square fa-fw"></i>
-          <% end %>
-        </a>
-      <% else %>
-        &nbsp;
-      <% end %>
+      &nbsp;
     </span>
     <span class="nodes_tree-right_tools">
       <% if can?(:edit, node) %>
@@ -81,11 +71,7 @@
       <% end %>
     </div>
   <% end %>
-  <% if node.children.any? %>
-    <ul class="children<%= node.folded? ? ' hidden' : nil %>">
-      <% unless node.folded? %>
-        <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
-      <% end %>
-    </ul>
+  <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { node_id: node.id } do %>
+    <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
   <% end %>
-</li>
+<% end %>
diff --git a/app/views/alchemy/admin/nodes/index.html.erb b/app/views/alchemy/admin/nodes/index.html.erb
index 43cd246097..ac0c30bd25 100644
--- a/app/views/alchemy/admin/nodes/index.html.erb
+++ b/app/views/alchemy/admin/nodes/index.html.erb
@@ -43,20 +43,6 @@
 </div>
 
 <script>
-  $('.nodes_tree').on('click', '.node_folder', function() {
-    var $this = $(this)
-    var node_id = $this.data('node-id')
-    var url = '<%= alchemy.toggle_admin_node_path(id: ":id") %>'.replace(':id', node_id)
-    var $children = $this.closest('li').find('> .children')
-    $this.find('> i').
-      toggleClass('fa-plus-square').
-      toggleClass('fa-minus-square')
-    $children.toggleClass('hidden')
-    $.ajax(url, { method: 'PATCH' }).then(function (nodes) {
-      if ($children.children().length === 0) {
-        $children.append(nodes)
-      }
-    })
-    return false
-  })
+  Alchemy.NodeTree.init()
+
 </script>
diff --git a/spec/controllers/alchemy/admin/nodes_controller_spec.rb b/spec/controllers/alchemy/admin/nodes_controller_spec.rb
index 0dfbb940a0..cf0ba30fdf 100644
--- a/spec/controllers/alchemy/admin/nodes_controller_spec.rb
+++ b/spec/controllers/alchemy/admin/nodes_controller_spec.rb
@@ -88,9 +88,9 @@ module Alchemy
 
           render_views
 
-          it "returns nodes children" do
+          it "returns success" do
             patch :toggle, params: { id: node.id }
-            expect(response.body).to have_selector('li .sitemap_node')
+            expect(response).to be_successful
           end
         end
       end

From 1d59430740bc01c3c1ddf1d9396b4bf0ad8547ed Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 10:41:01 +0100
Subject: [PATCH 05/14] Refactor folding code to only use one Event handler

I had to reimplement jQuery.on for this to work.
---
 .../javascripts/alchemy/alchemy.node_tree.js  | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index 0abe3d3591..697ea39728 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -40,41 +40,51 @@ Alchemy.NodeTree = {
         leftIconArea.innerHTML = '&nbsp;'
       }
     });
-
-    this.handleNodeFolders();
   },
 
   handleNodeFolders: function() {
-    var folders = document.querySelectorAll('.nodes_tree .node_folder');
+    this.registerDelegatingEventHandler('click', '.nodes_tree', '.node_folder', function(evt) {
+      var nodeId = this.dataset.nodeId
+      var menu_item = this.closest('li.menu-item')
+      var url = '/admin/nodes/' + nodeId + '/toggle.html'
+      var list = menu_item.querySelector('.children')
+      var xhr = new XMLHttpRequest()
+      var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
 
-    folders.forEach(function(folder){
-      folder.addEventListener('click', function(evt) {
-        var nodeId = this.dataset.nodeId
-        var menu_item = this.closest('li.menu-item')
-        var url = '/admin/nodes/' + nodeId + '/toggle.html'
-        var list = menu_item.querySelector('.children')
-        var xhr = new XMLHttpRequest()
-        var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+      xhr.open("PATCH", url);
+      xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
+      xhr.setRequestHeader('X-CSRF-Token', token)
 
-        xhr.open("PATCH", url);
-        xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
-        xhr.setRequestHeader('X-CSRF-Token', token)
+      xhr.onload = function () {
+        if (xhr.readyState == 4 && xhr.status == "200") {
+          list.classList.toggle('folded')
+          menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true'
+          Alchemy.NodeTree.displayNodeFolders();
+        } else {
+          Alchemy.growl('error folding');
+        }
+      }
+      xhr.send()
+    });
+  },
 
-        xhr.onload = function () {
-          if (xhr.readyState == 4 && xhr.status == "200") {
-            list.classList.toggle('folded')
-            menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true'
-            Alchemy.NodeTree.displayNodeFolders();
-          } else {
-            Alchemy.growl('error folding');
-          }
+  registerDelegatingEventHandler: function(eventName, baseSelector, targetSelector, callback) {
+    var baseNode = document.querySelector(baseSelector)
+    baseNode.addEventListener(eventName, function(evt) {
+      var targets = Array.from(baseNode.querySelectorAll(targetSelector))
+      var currentNode = evt.target
+      while (currentNode !== baseNode) {
+        if (targets.includes(currentNode)) {
+          callback.call(currentNode, evt)
+          return
         }
-        xhr.send()
-      })
+        currentNode = currentNode.parentElement
+      }
     });
   },
 
   init: function() {
+    this.handleNodeFolders()
     this.displayNodeFolders()
 
     document.querySelectorAll('.nodes_tree ul.children').forEach(function (el) {

From 3d4f004319002d7a02976e08ac89a0ed474230ce Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 11:05:00 +0100
Subject: [PATCH 06/14] Move reimplementation of jQuery.on to Alchemy.on

We'll need to use this elsewhere.
---
 app/assets/javascripts/alchemy/admin.js         |  1 +
 .../javascripts/alchemy/alchemy.node_tree.js    | 17 +----------------
 app/assets/javascripts/alchemy/alchemy.utils.js | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/javascripts/alchemy/alchemy.utils.js

diff --git a/app/assets/javascripts/alchemy/admin.js b/app/assets/javascripts/alchemy/admin.js
index 6648da0b13..7b728dfd24 100644
--- a/app/assets/javascripts/alchemy/admin.js
+++ b/app/assets/javascripts/alchemy/admin.js
@@ -18,6 +18,7 @@
 //= require sortable/Sortable.min
 //= require alchemy/templates
 //= require alchemy/alchemy.base
+//= require alchemy/alchemy.utils
 //= require alchemy/alchemy.autocomplete
 //= require alchemy/alchemy.browser
 //= require alchemy/alchemy.buttons
diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index 697ea39728..a8d46828f4 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -43,7 +43,7 @@ Alchemy.NodeTree = {
   },
 
   handleNodeFolders: function() {
-    this.registerDelegatingEventHandler('click', '.nodes_tree', '.node_folder', function(evt) {
+    Alchemy.on('click', '.nodes_tree', '.node_folder', function(evt) {
       var nodeId = this.dataset.nodeId
       var menu_item = this.closest('li.menu-item')
       var url = '/admin/nodes/' + nodeId + '/toggle.html'
@@ -68,21 +68,6 @@ Alchemy.NodeTree = {
     });
   },
 
-  registerDelegatingEventHandler: function(eventName, baseSelector, targetSelector, callback) {
-    var baseNode = document.querySelector(baseSelector)
-    baseNode.addEventListener(eventName, function(evt) {
-      var targets = Array.from(baseNode.querySelectorAll(targetSelector))
-      var currentNode = evt.target
-      while (currentNode !== baseNode) {
-        if (targets.includes(currentNode)) {
-          callback.call(currentNode, evt)
-          return
-        }
-        currentNode = currentNode.parentElement
-      }
-    });
-  },
-
   init: function() {
     this.handleNodeFolders()
     this.displayNodeFolders()
diff --git a/app/assets/javascripts/alchemy/alchemy.utils.js b/app/assets/javascripts/alchemy/alchemy.utils.js
new file mode 100644
index 0000000000..42ebbd610c
--- /dev/null
+++ b/app/assets/javascripts/alchemy/alchemy.utils.js
@@ -0,0 +1,14 @@
+Alchemy.on = function (eventName, baseSelector, targetSelector, callback) {
+  var baseNode = document.querySelector(baseSelector)
+  baseNode.addEventListener(eventName, function (evt) {
+    var targets = Array.from(baseNode.querySelectorAll(targetSelector))
+    var currentNode = evt.target
+    while (currentNode !== baseNode) {
+      if (targets.includes(currentNode)) {
+        callback.call(currentNode, evt)
+        return
+      }
+      currentNode = currentNode.parentElement
+    }
+  });
+}

From 36a80cf01166d47361da23a999a11c36f0f3a51f Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 11:28:22 +0100
Subject: [PATCH 07/14] Refactor Folder template to Handlebars template

---
 app/assets/javascripts/alchemy/alchemy.node_tree.js    | 10 +++-------
 app/assets/javascripts/alchemy/templates/index.js      |  1 +
 .../javascripts/alchemy/templates/node_folder.hbs      |  3 +++
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/alchemy/templates/node_folder.hbs

diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index a8d46828f4..baeb0143b2 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -25,17 +25,13 @@ Alchemy.NodeTree = {
   },
 
   displayNodeFolders: function () {
-    var generate_link = function (node_id, folded) {
-      var icon = folded === "true" ? 'plus' : 'minus';
-      return '<a class="node_folder" data-node-id="' + node_id + '"><i class="far fa-' + icon + '-square fa-fw"></i></a>'
-    }
-
     document.querySelectorAll('li.menu-item').forEach(function (el) {
       var leftIconArea = el.querySelector('.nodes_tree-left_images')
       var list = el.querySelector('ul')
+      var node = { folded: el.dataset.folded === 'true', id: el.dataset.id }
 
-      if (list.children.length > 0 || el.dataset.folded === 'true' ) {
-        leftIconArea.innerHTML = generate_link(el.dataset.id, el.dataset.folded)
+      if (list.children.length > 0 || node.folded ) {
+        leftIconArea.innerHTML = HandlebarsTemplates.node_folder({ node: node })
       } else {
         leftIconArea.innerHTML = '&nbsp;'
       }
diff --git a/app/assets/javascripts/alchemy/templates/index.js b/app/assets/javascripts/alchemy/templates/index.js
index 384b6348b5..0405d22de6 100644
--- a/app/assets/javascripts/alchemy/templates/index.js
+++ b/app/assets/javascripts/alchemy/templates/index.js
@@ -1,2 +1,3 @@
 //= require alchemy/templates/spinner
 //= require alchemy/templates/page
+//= require alchemy/templates/node_folder
diff --git a/app/assets/javascripts/alchemy/templates/node_folder.hbs b/app/assets/javascripts/alchemy/templates/node_folder.hbs
new file mode 100644
index 0000000000..d4c80680f9
--- /dev/null
+++ b/app/assets/javascripts/alchemy/templates/node_folder.hbs
@@ -0,0 +1,3 @@
+<a class="node_folder" data-node-id="{{ node.id }}">
+  <i class="far fa-{{#if node.folded }}plus{{else}}minus{{/if}}-square fa-fw"></i>
+</a>

From 66759de34ac27ef25ff4fbd3c300b6a30543b2d4 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 11:41:47 +0100
Subject: [PATCH 08/14] Add tiny helper function to add Alchemy stuff to XHR

---
 .../javascripts/alchemy/alchemy.node_tree.js       | 14 +++-----------
 app/assets/javascripts/alchemy/alchemy.utils.js    | 10 ++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index baeb0143b2..75b0f36616 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -1,16 +1,13 @@
 Alchemy.NodeTree = {
   onFinishDragging: function (evt) {
     var url = '/api/nodes/' + evt.item.dataset.id + '/move.json'
-    var xhr = new XMLHttpRequest()
-    var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+    var xhr = Alchemy.xhr('PATCH', url)
     var data = {
       target_parent_id: evt.to.dataset.nodeId,
       new_position: evt.newIndex
     };
     var json = JSON.stringify(data)
-    xhr.open("PATCH", url);
-    xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
-    xhr.setRequestHeader('X-CSRF-Token', token)
+
     evt.to.parentElement.dataset.folded = 'false'
     evt.to.classList.remove('folded')
     xhr.onload = function () {
@@ -44,12 +41,7 @@ Alchemy.NodeTree = {
       var menu_item = this.closest('li.menu-item')
       var url = '/admin/nodes/' + nodeId + '/toggle.html'
       var list = menu_item.querySelector('.children')
-      var xhr = new XMLHttpRequest()
-      var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
-
-      xhr.open("PATCH", url);
-      xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
-      xhr.setRequestHeader('X-CSRF-Token', token)
+      var xhr = Alchemy.xhr('PATCH', url)
 
       xhr.onload = function () {
         if (xhr.readyState == 4 && xhr.status == "200") {
diff --git a/app/assets/javascripts/alchemy/alchemy.utils.js b/app/assets/javascripts/alchemy/alchemy.utils.js
index 42ebbd610c..ebe86b61cf 100644
--- a/app/assets/javascripts/alchemy/alchemy.utils.js
+++ b/app/assets/javascripts/alchemy/alchemy.utils.js
@@ -12,3 +12,13 @@ Alchemy.on = function (eventName, baseSelector, targetSelector, callback) {
     }
   });
 }
+
+Alchemy.xhr = function(method, url) {
+  var xhr = new XMLHttpRequest()
+  var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+  xhr.open(method, url);
+  xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
+  xhr.setRequestHeader('X-CSRF-Token', token)
+
+  return xhr;
+}

From f6cd9acd3250a2c249eef68822705fb9b0a5fe6e Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 11:52:16 +0100
Subject: [PATCH 09/14] Move Admin::NodesController#toggle to API

Now it also returns a bit of JSON about the toggled node.
---
 .../javascripts/alchemy/alchemy.node_tree.js  |  2 +-
 .../alchemy/admin/nodes_controller.rb         |  6 ----
 .../alchemy/api/nodes_controller.rb           |  5 +++
 config/routes.rb                              |  7 ++--
 .../alchemy/admin/nodes_controller_spec.rb    | 35 ------------------
 .../alchemy/api/nodes_controller_spec.rb      | 36 +++++++++++++++++++
 6 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index 75b0f36616..b701e039e4 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -39,7 +39,7 @@ Alchemy.NodeTree = {
     Alchemy.on('click', '.nodes_tree', '.node_folder', function(evt) {
       var nodeId = this.dataset.nodeId
       var menu_item = this.closest('li.menu-item')
-      var url = '/admin/nodes/' + nodeId + '/toggle.html'
+      var url = '/api/nodes/' + nodeId + '/toggle_folded.json'
       var list = menu_item.querySelector('.children')
       var xhr = Alchemy.xhr('PATCH', url)
 
diff --git a/app/controllers/alchemy/admin/nodes_controller.rb b/app/controllers/alchemy/admin/nodes_controller.rb
index 29d29ac304..912c03d2a5 100644
--- a/app/controllers/alchemy/admin/nodes_controller.rb
+++ b/app/controllers/alchemy/admin/nodes_controller.rb
@@ -15,12 +15,6 @@ def new
         )
       end
 
-      def toggle
-        node = Node.find(params[:id])
-        node.update(folded: !node.folded)
-        head :ok
-      end
-
       private
 
       def resource_params
diff --git a/app/controllers/alchemy/api/nodes_controller.rb b/app/controllers/alchemy/api/nodes_controller.rb
index 351b5d200f..26d89cb2fb 100644
--- a/app/controllers/alchemy/api/nodes_controller.rb
+++ b/app/controllers/alchemy/api/nodes_controller.rb
@@ -10,6 +10,11 @@ def move
       render json: @node, serializer: NodeSerializer
     end
 
+    def toggle_folded
+      @node.update(folded: !@node.folded)
+      render json: @node, serializer: NodeSerializer
+    end
+
     private
 
     def load_node
diff --git a/config/routes.rb b/config/routes.rb
index f4c7a60a04..1cf0de3483 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,11 +18,7 @@
   namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
     resources :contents, only: [:create]
 
-    resources :nodes do
-      member do
-        patch :toggle
-      end
-    end
+    resources :nodes
 
     resources :pages do
       resources :elements
@@ -157,6 +153,7 @@
     resources :nodes, only: [] do
       member do
         patch :move
+        patch :toggle_folded
       end
     end
   end
diff --git a/spec/controllers/alchemy/admin/nodes_controller_spec.rb b/spec/controllers/alchemy/admin/nodes_controller_spec.rb
index cf0ba30fdf..862d69b8b5 100644
--- a/spec/controllers/alchemy/admin/nodes_controller_spec.rb
+++ b/spec/controllers/alchemy/admin/nodes_controller_spec.rb
@@ -60,40 +60,5 @@ module Alchemy
         end
       end
     end
-
-    describe '#toggle' do
-      context 'with expanded node' do
-        let(:node) { create(:alchemy_node, folded: false) }
-
-        it "folds node" do
-          expect {
-            patch :toggle, params: { id: node.id }
-          }.to change { node.reload.folded }.to(true)
-        end
-      end
-
-      context 'with folded node' do
-        let(:node) { create(:alchemy_node, folded: true) }
-
-        it "expands node" do
-          expect {
-            patch :toggle, params: { id: node.id }
-          }.to change { node.reload.folded }.to(false)
-        end
-
-        context 'with node having children' do
-          before do
-            create(:alchemy_node, parent: node)
-          end
-
-          render_views
-
-          it "returns success" do
-            patch :toggle, params: { id: node.id }
-            expect(response).to be_successful
-          end
-        end
-      end
-    end
   end
 end
diff --git a/spec/requests/alchemy/api/nodes_controller_spec.rb b/spec/requests/alchemy/api/nodes_controller_spec.rb
index 2d5cdf63ba..956df15f2c 100644
--- a/spec/requests/alchemy/api/nodes_controller_spec.rb
+++ b/spec/requests/alchemy/api/nodes_controller_spec.rb
@@ -23,5 +23,41 @@ module Alchemy
         expect(page_node.children).to include(url_node)
       end
     end
+
+
+    describe '#toggle_folded' do
+      context 'with expanded node' do
+        let(:node) { create(:alchemy_node, folded: false) }
+
+        it "folds node" do
+          expect {
+            patch alchemy.toggle_folded_api_node_path(node)
+          }.to change { node.reload.folded }.to(true)
+        end
+      end
+
+      context 'with folded node' do
+        let(:node) { create(:alchemy_node, folded: true) }
+
+        it "expands node" do
+          expect {
+            patch alchemy.toggle_folded_api_node_path(node)
+          }.to change { node.reload.folded }.to(false)
+        end
+
+        context 'with node having children' do
+          before do
+            create(:alchemy_node, parent: node)
+          end
+
+          it "returns success" do
+            patch alchemy.toggle_folded_api_node_path(node)
+            expect(response).to be_successful
+            response_json = JSON.parse(response.body)
+            expect(response_json['id']).to eq(node.id)
+          end
+        end
+      end
+    end
   end
 end

From fbd5498a46e5cf4cf1b9e71a8f3c4f6ed8b78894 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 11:59:32 +0100
Subject: [PATCH 10/14] Use programmatic paths in Node Tree JS

---
 app/assets/javascripts/alchemy/alchemy.node_tree.js | 4 ++--
 app/views/alchemy/admin/partials/_routes.html.erb   | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index b701e039e4..db2b060b43 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -1,6 +1,6 @@
 Alchemy.NodeTree = {
   onFinishDragging: function (evt) {
-    var url = '/api/nodes/' + evt.item.dataset.id + '/move.json'
+    var url = Alchemy.routes.move_api_node_path(evt.item.dataset.id)
     var xhr = Alchemy.xhr('PATCH', url)
     var data = {
       target_parent_id: evt.to.dataset.nodeId,
@@ -39,7 +39,7 @@ Alchemy.NodeTree = {
     Alchemy.on('click', '.nodes_tree', '.node_folder', function(evt) {
       var nodeId = this.dataset.nodeId
       var menu_item = this.closest('li.menu-item')
-      var url = '/api/nodes/' + nodeId + '/toggle_folded.json'
+      var url = Alchemy.routes.toggle_folded_api_node_path(nodeId)
       var list = menu_item.querySelector('.children')
       var xhr = Alchemy.xhr('PATCH', url)
 
diff --git a/app/views/alchemy/admin/partials/_routes.html.erb b/app/views/alchemy/admin/partials/_routes.html.erb
index d196af0a19..b35cb08475 100644
--- a/app/views/alchemy/admin/partials/_routes.html.erb
+++ b/app/views/alchemy/admin/partials/_routes.html.erb
@@ -15,6 +15,14 @@
       return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
     },
 
+    toggle_folded_api_node_path: function(id) {
+      return '<%= alchemy.toggle_folded_api_node_path(id: 1) %>'.replace(/1/, id);
+    },
+
+    move_api_node_path: function(id) {
+      return '<%= alchemy.move_api_node_path(id: 1) %>'.replace(/1/, id);
+    },
+
     order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
     order_admin_pages_path: '<%= alchemy.order_admin_pages_path %>',
     link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>',

From 3dd1d5419f7e3ddc075f14a862ca2fc05329fe4b Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 24 Mar 2020 12:00:45 +0100
Subject: [PATCH 11/14] Add Accept: application/json to Alchemy.xhr

---
 app/assets/javascripts/alchemy/alchemy.utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/alchemy/alchemy.utils.js b/app/assets/javascripts/alchemy/alchemy.utils.js
index ebe86b61cf..e4341dbd14 100644
--- a/app/assets/javascripts/alchemy/alchemy.utils.js
+++ b/app/assets/javascripts/alchemy/alchemy.utils.js
@@ -18,6 +18,7 @@ Alchemy.xhr = function(method, url) {
   var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
   xhr.open(method, url);
   xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
+  xhr.setRequestHeader('Accept', 'application/json');
   xhr.setRequestHeader('X-CSRF-Token', token)
 
   return xhr;

From 1dba3650f6ef530826c09c532d537b06592710d9 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Wed, 25 Mar 2020 10:19:33 +0100
Subject: [PATCH 12/14] Add authorization to API Nodes Controller

---
 .../alchemy/api/nodes_controller.rb           |  5 ++
 .../alchemy/api/nodes_controller_spec.rb      | 78 +++++++++++++++----
 2 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/app/controllers/alchemy/api/nodes_controller.rb b/app/controllers/alchemy/api/nodes_controller.rb
index 26d89cb2fb..3e61059fb5 100644
--- a/app/controllers/alchemy/api/nodes_controller.rb
+++ b/app/controllers/alchemy/api/nodes_controller.rb
@@ -3,6 +3,7 @@
 module Alchemy
   class Api::NodesController < Api::BaseController
     before_action :load_node
+    before_action :authorize_access, only: [:move, :toggle_folded]
 
     def move
       target_parent_node = Node.find(params[:target_parent_id])
@@ -20,5 +21,9 @@ def toggle_folded
     def load_node
       @node = Node.find(params[:id])
     end
+
+    def authorize_access
+      authorize! :update, @node
+    end
   end
 end
diff --git a/spec/requests/alchemy/api/nodes_controller_spec.rb b/spec/requests/alchemy/api/nodes_controller_spec.rb
index 956df15f2c..2f2b6d19fd 100644
--- a/spec/requests/alchemy/api/nodes_controller_spec.rb
+++ b/spec/requests/alchemy/api/nodes_controller_spec.rb
@@ -10,17 +10,39 @@ module Alchemy
       let!(:page_node_2) { create(:alchemy_node, :with_page, parent: root_node) }
       let!(:url_node) { create(:alchemy_node, :with_url, parent: root_node) }
 
-      it 'returns JSON and moves the node' do
-        expect(page_node.children).to be_empty
-        expect(url_node.lft).to eq(6)
-        patch alchemy.move_api_node_path(url_node, format: :json), params: {
-          target_parent_id: page_node.id,
-          new_position: 0
-        }
-        expect(response.status).to eq(200)
-        response_json = JSON.parse(response.body)
-        expect(response_json['parent_id']).to eq(page_node.id)
-        expect(page_node.children).to include(url_node)
+      context 'with authorized access' do
+        before do
+          authorize_user(:as_admin)
+        end
+
+        it 'returns JSON and moves the node' do
+          expect(page_node.children).to be_empty
+          expect(url_node.lft).to eq(6)
+          patch alchemy.move_api_node_path(url_node, format: :json), params: {
+            target_parent_id: page_node.id,
+            new_position: 0
+          }
+          expect(response.status).to eq(200)
+          response_json = JSON.parse(response.body)
+          expect(response_json['parent_id']).to eq(page_node.id)
+          expect(page_node.children).to include(url_node)
+        end
+      end
+
+      context 'with unauthorized access' do
+        before do
+          authorize_user
+        end
+
+        it 'returns an unauthorized error' do
+          patch alchemy.move_api_node_path(url_node, format: :json), params: {
+            target_parent_id: page_node.id,
+            new_position: 0
+          }
+          expect(response).to be_forbidden
+          response_json = JSON.parse(response.body)
+          expect(response_json['error']).to eq('Not authorized')
+        end
       end
     end
 
@@ -29,16 +51,42 @@ module Alchemy
       context 'with expanded node' do
         let(:node) { create(:alchemy_node, folded: false) }
 
-        it "folds node" do
-          expect {
-            patch alchemy.toggle_folded_api_node_path(node)
-          }.to change { node.reload.folded }.to(true)
+        context 'with authorized access' do
+          before do
+            authorize_user(:as_admin)
+          end
+
+          it "folds node" do
+            expect {
+              patch alchemy.toggle_folded_api_node_path(node)
+            }.to change { node.reload.folded }.to(true)
+          end
+        end
+
+        context 'with unauthorized access' do
+          before do
+            authorize_user
+          end
+
+          it "returns an unauthorized error" do
+            expect {
+              patch alchemy.toggle_folded_api_node_path(node)
+            }.not_to change { node.reload.folded }
+
+            expect(response).to be_forbidden
+            response_json = JSON.parse(response.body)
+            expect(response_json['error']).to eq('Not authorized')
+          end
         end
       end
 
       context 'with folded node' do
         let(:node) { create(:alchemy_node, folded: true) }
 
+        before do
+          authorize_user(:as_admin)
+        end
+
         it "expands node" do
           expect {
             patch alchemy.toggle_folded_api_node_path(node)

From c9075bbead35e7a41af78674ed79c8f4e1d4720c Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Wed, 25 Mar 2020 10:56:35 +0100
Subject: [PATCH 13/14] Set Move Cursor on Node Names

To make the dragging functionality more obvious.
---
 app/assets/stylesheets/alchemy/nodes.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/alchemy/nodes.scss b/app/assets/stylesheets/alchemy/nodes.scss
index 6d2464aca7..c35731998c 100644
--- a/app/assets/stylesheets/alchemy/nodes.scss
+++ b/app/assets/stylesheets/alchemy/nodes.scss
@@ -110,6 +110,7 @@
     text-decoration: none;
     overflow: hidden;
     background-color: $sitemap-page-background-color;
+    cursor: move;
 
     &.without-status {
       @include border-right-radius($default-border-radius);

From 36fb0aab5e9848b1ddaa9c1cbad998f5ecacfbf6 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Wed, 25 Mar 2020 10:57:01 +0100
Subject: [PATCH 14/14] Refactor Alchemy.xhr to use Promises

---
 .../javascripts/alchemy/alchemy.node_tree.js  | 39 +++++++------------
 .../javascripts/alchemy/alchemy.utils.js      | 24 +++++++++++-
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/alchemy/alchemy.node_tree.js b/app/assets/javascripts/alchemy/alchemy.node_tree.js
index db2b060b43..9213d8bb70 100644
--- a/app/assets/javascripts/alchemy/alchemy.node_tree.js
+++ b/app/assets/javascripts/alchemy/alchemy.node_tree.js
@@ -1,24 +1,18 @@
 Alchemy.NodeTree = {
   onFinishDragging: function (evt) {
     var url = Alchemy.routes.move_api_node_path(evt.item.dataset.id)
-    var xhr = Alchemy.xhr('PATCH', url)
     var data = {
       target_parent_id: evt.to.dataset.nodeId,
       new_position: evt.newIndex
     };
-    var json = JSON.stringify(data)
+    var ajax = Alchemy.ajax('PATCH', url, data)
 
-    evt.to.parentElement.dataset.folded = 'false'
-    evt.to.classList.remove('folded')
-    xhr.onload = function () {
-      response_json = JSON.parse(xhr.responseText)
-      if (xhr.readyState == 4 && xhr.status == "200") {
-        Alchemy.NodeTree.displayNodeFolders()
-      } else {
-        Alchemy.growl(response_json.error, 'error');
-      }
-    }
-    xhr.send(json)
+    ajax.then(function(response) {
+      Alchemy.growl('Successfully moved menu item.')
+      Alchemy.NodeTree.displayNodeFolders()
+    }).catch(function() {
+      Alchemy.growl(error.message || error);
+    })
   },
 
   displayNodeFolders: function () {
@@ -41,18 +35,15 @@ Alchemy.NodeTree = {
       var menu_item = this.closest('li.menu-item')
       var url = Alchemy.routes.toggle_folded_api_node_path(nodeId)
       var list = menu_item.querySelector('.children')
-      var xhr = Alchemy.xhr('PATCH', url)
+      var ajax = Alchemy.ajax('PATCH', url)
 
-      xhr.onload = function () {
-        if (xhr.readyState == 4 && xhr.status == "200") {
-          list.classList.toggle('folded')
-          menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true'
-          Alchemy.NodeTree.displayNodeFolders();
-        } else {
-          Alchemy.growl('error folding');
-        }
-      }
-      xhr.send()
+      ajax.then(function() {
+        list.classList.toggle('folded')
+        menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true'
+        Alchemy.NodeTree.displayNodeFolders();
+      }).catch(function(error){
+        Alchemy.growl(error.message || error);
+      });
     });
   },
 
diff --git a/app/assets/javascripts/alchemy/alchemy.utils.js b/app/assets/javascripts/alchemy/alchemy.utils.js
index e4341dbd14..5c35fa08e0 100644
--- a/app/assets/javascripts/alchemy/alchemy.utils.js
+++ b/app/assets/javascripts/alchemy/alchemy.utils.js
@@ -13,13 +13,33 @@ Alchemy.on = function (eventName, baseSelector, targetSelector, callback) {
   });
 }
 
-Alchemy.xhr = function(method, url) {
+Alchemy.ajax = function(method, url, data) {
   var xhr = new XMLHttpRequest()
   var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+  var promise = new Promise(function (resolve, reject) {
+    xhr.onload = function() {
+      try {
+        resolve({
+          data: JSON.parse(xhr.responseText),
+          status: xhr.status
+        })
+      } catch (error) {
+        reject(new Error(JSON.parse(xhr.responseText).error))
+      }
+    };
+    xhr.onerror = function() {
+      reject(new Error(xhr.statusText))
+    }
+  });
   xhr.open(method, url);
   xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
   xhr.setRequestHeader('Accept', 'application/json');
   xhr.setRequestHeader('X-CSRF-Token', token)
+  if (data) {
+    xhr.send(JSON.stringify(data))
+  } else {
+    xhr.send()
+  }
 
-  return xhr;
+  return promise
 }