alchemy_cms 4.6.7 → 5.0.0.beta1

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

@@ -179,8 +179,6 @@ Alchemy.ElementEditors =
     if data.message == 'Alchemy.focusElementEditor'
       $element = $("#element_#{data.element_id}")
       Alchemy.ElementEditors.focusElement($element)
-    else
-      console.warn 'Unknown message received!', data
 
   onClickBody: (e) ->
     element = $(e.target).parents('.element-editor')[0]

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

@@ -1,24 +1,24 @@
-Alchemy.PageSorter = function() {
-  var $sortables = $('ul#sitemap').find('ul.level_1_children');
+Alchemy.PageSorter = function () {
+  var $sortables = $("ul#sitemap").find("ul.level_0_children")
 
   $sortables.nestedSortable({
-    disableNesting: 'no-nest',
+    disableNesting: "no-nest",
     forcePlaceholderSize: true,
-    handle: '.handle',
-    items: 'li',
-    listType: 'ul',
+    handle: ".handle",
+    items: "li",
+    listType: "ul",
     opacity: 0.5,
-    placeholder: 'placeholder',
+    placeholder: "placeholder",
     tabSize: 16,
-    tolerance: 'pointer',
-    toleranceElement: '> div'
-  });
+    tolerance: "pointer",
+    toleranceElement: "> div"
+  })
 
-  $('#save_page_order').click(function(e) {
-    e.preventDefault();
-    Alchemy.Buttons.disable(this);
+  $("#save_page_order").click(function (e) {
+    e.preventDefault()
+    Alchemy.Buttons.disable(this)
     $.post(Alchemy.routes.order_admin_pages_path, {
-      set: JSON.stringify($sortables.nestedSortable('toHierarchy'))
-    });
-  });
-};
+      set: JSON.stringify($sortables.nestedSortable("toHierarchy"))
+    })
+  })
+}

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

@@ -0,0 +1,39 @@
+$.fn.alchemyNodeSelect = function (options) {
+  var renderNodeTemplate = function (node) {
+    return HandlebarsTemplates.node({ node: node })
+  }
+  var queryParamsFromTerm = function (term) {
+    return {
+      filter: Object.assign(
+        { name_or_page_name_cont: term },
+        options.query_params
+      )
+    }
+  }
+  var resultsFromResponse = function (response) {
+    var meta = response.meta
+    var data = response.data
+    var more = meta.page * meta.per_page < meta.total_count
+    return { results: data, more: more }
+  }
+
+  return this.select2({
+    placeholder: options.placeholder,
+    allowClear: true,
+    minimumInputLength: 3,
+    initSelection: function (_$el, callback) {
+      if (options.initialSelection) {
+        callback(options.initialSelection)
+      }
+    },
+    ajax: {
+      url: options.url,
+      datatype: "json",
+      quietMillis: 300,
+      data: queryParamsFromTerm,
+      results: resultsFromResponse
+    },
+    formatSelection: renderNodeTemplate,
+    formatResult: renderNodeTemplate
+  })
+}

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

@@ -1,3 +1,4 @@
 //= require alchemy/templates/spinner
 //= require alchemy/templates/page
 //= require alchemy/templates/node_folder
+//= require alchemy/templates/node

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

@@ -0,0 +1,16 @@
+<div class="node-select--node">
+  <i class="icon fas fa-list fa-lg"></i>
+  <div class="node-select--node-display_name">
+    <span class="node-select--node-ancestors">
+      {{#each node.ancestors}}
+        {{ this.name }} /&nbsp;
+      {{/each}}
+    </span>
+    <span class="node-select--node-name">
+      {{ node.name }}
+    </span>
+  </div>
+  <div class="node-select--node-url">
+    {{ node.url }}
+  </div>
+</div>

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

@@ -5,8 +5,8 @@
  */
 
 @import "fontawesome/fontawesome";
-@import "fontawesome/fa-regular";
-@import "fontawesome/fa-solid";
+@import "fontawesome/regular";
+@import "fontawesome/solid";
 @import "alchemy/defaults";
 @import "alchemy/archive";
 @import "alchemy/navigation";
@@ -31,6 +31,7 @@
 @import "alchemy/image_library";
 @import "alchemy/labels";
 @import "alchemy/nodes";
+@import "alchemy/node-select";
 @import "alchemy/notices";
 @import "alchemy/page-select";
 @import "alchemy/pagination";

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

@@ -83,7 +83,6 @@ hr {
   max-width: 500px;
   margin: 2em auto;
   padding: 4*$default-padding;
-  border: $default-border;
   background: $medium-gray;
   border-radius: $default-border-radius;
 }

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

@@ -718,7 +718,7 @@ textarea.has_tinymce {
   visibility: hidden;
 }
 
-.essence_html_editor textarea {
+.essence_html textarea {
   font-family: $mono-font-family;
   resize: vertical;
   font-size: $form-field-font-size;

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

@@ -173,6 +173,11 @@ form {
   .input .hint {
     @include form-hint;
     margin-left: $form-left-width;
+
+    a[href] {
+      color: $very-dark-gray;
+      text-decoration: underline;
+    }
   }
 
   .submit {

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

@@ -0,0 +1,43 @@
+.node-select--node,
+.node-select--node-url {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.node-select--node {
+  display: flex;
+  align-items: center;
+
+  .icon {
+    margin: 0 8px 0 4px;
+
+    .select2-highlighted & {
+      color: $white
+    }
+  }
+}
+
+.node-select--node-name {
+  font-weight: bold;
+}
+
+.node-select--node-url {
+  margin-left: auto;
+  padding: $default-padding 2*$default-padding;
+  color: $dark-gray;
+  font-size: $small-font-size;
+
+  .select2-highlighted & {
+    color: $white
+  }
+}
+
+// The container of the rendered node is slightly larger than other a line of
+// text, as it would be for the Alchemy::EssencePage. Reducing the padding here from 0.6em
+// to 0.4em centers the content nicely.
+.essence_node {
+  .select2-container.alchemy_selectbox .select2-choice {
+    padding: 0.4em 0.75em;
+  }
+}

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

@@ -64,7 +64,7 @@
     margin: 0;
     padding: 0;
 
-    .folded > li {
+    &.folded > li {
       display: none;
     }
   }

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

@@ -197,6 +197,10 @@ $sitemap-url-xlarge-width: 350px;
 
 .page_status {
   display: inline-block;
+
+  .alchemy-dialog & {
+    display: block;
+  }
 }
 
 #sitemap_heading {
@@ -226,7 +230,7 @@ $sitemap-url-xlarge-width: 350px;
 
   .page_status {
     padding-left: 2 * $default-padding;
-    margin-right: 214px;
+    margin-right: 188px;
     margin-left: auto;
 
     @media screen and (min-width: $large-screen-break-point) {

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

@@ -57,29 +57,6 @@ th {
   vertical-align: top;
   border-bottom: 1px solid $medium-gray;
   font-weight: bold;
-
-  i {
-    font-style: normal;
-    position: absolute;
-    right: 2px;
-    top: 4px;
-    text-shadow: 1px 1px 1px #fff;
-  }
-
-  a {
-
-    &.sortable {
-      display: block;
-      margin: -4px -8px;
-      padding: 4px 18px 4px 8px;
-      text-shadow: 1px 1px 1px #fff;
-    }
-
-    &.sorted {
-      position: relative;
-      background: $medium-gray;
-    }
-  }
 }
 
 tr.even td {
@@ -141,7 +118,7 @@ td {
     width: 80px;
   }
 
-  &.date {
+  &.date, &.datetime {
     width: 150px;
   }
 

data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss

@@ -30,7 +30,7 @@ td,th {
 
 .mce-object {
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/object.gif') no-repeat center;
+  background: #d5d5d5 url(img/object.gif) no-repeat center;
 }
 
 .mce-pagebreak {
@@ -55,7 +55,7 @@ td,th {
   width: 9px!important;
   height: 9px!important;
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/anchor.gif') no-repeat center;
+  background: #d5d5d5 url(img/anchor.gif) no-repeat center;
 }
 
 .mce-nbsp {
@@ -77,7 +77,7 @@ hr {
 }
 
 .mce-spellchecker-word {
-  background: url('tinymce/skins/alchemy/fonts/img/wline.gif') repeat-x bottom left;
+  background: url(img/wline.gif) repeat-x bottom left;
   cursor: default;
 }
 

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -1561,23 +1561,23 @@ i.mce-i-resize {
   opacity: 0.6;
   filter: alpha(opacity=60);
   zoom: 1;
-  background: #fff url('tinymce/skins/alchemy/fonts/img/loader.gif') no-repeat center center;
+  background: #fff url('img/loader.gif') no-repeat center center;
 }
 
 @font-face {
   font-family: 'tinymce';
-  src: url('tinymce/skins/alchemy/fonts/tinymce.woff') format('woff'),
-       url('tinymce/skins/alchemy/fonts/tinymce.ttf') format('truetype'),
-       url('tinymce/skins/alchemy/fonts/tinymce.svg#tinymce') format('svg');
+  src: url('fonts/tinymce.woff') format('woff'),
+       url('fonts/tinymce.ttf') format('truetype'),
+       url('fonts/tinymce.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'tinymce-small';
-  src: url('tinymce/skins/alchemy/fonts/tinymce-small.woff') format('woff'),
-       url('tinymce/skins/alchemy/fonts/tinymce-small.ttf') format('truetype'),
-       url('tinymce/skins/alchemy/fonts/tinymce-small.svg#tinymce') format('svg');
+  src: url('fonts/tinymce-small.woff') format('woff'),
+       url('fonts/tinymce-small.ttf') format('truetype'),
+       url('fonts/tinymce-small.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }

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

@@ -6,10 +6,11 @@ module Alchemy
       include UploaderResponses
       include ArchiveOverlay
 
-      helper 'alchemy/admin/tags'
+      helper "alchemy/admin/tags"
 
       def index
         @query = Attachment.ransack(search_filter_params[:q])
+        @query.sorts = "name asc" if @query.sorts.empty?
         @attachments = @query.result
 
         if search_filter_params[:tagged_with].present?
@@ -41,13 +42,13 @@ module Alchemy
 
       def update
         @attachment.update(attachment_attributes)
-        if attachment_attributes['file'].present?
+        if attachment_attributes["file"].present?
           handle_uploader_response(status: :accepted)
         else
           render_errors_or_redirect(
             @attachment,
             admin_attachments_path(search_filter_params),
-            Alchemy.t("File successfully updated")
+            Alchemy.t("File successfully updated"),
           )
         end
       end
@@ -56,14 +57,14 @@ module Alchemy
         name = @attachment.name
         @attachment.destroy
         @url = admin_attachments_url(search_filter_params)
-        flash[:notice] = Alchemy.t('File deleted successfully', name: name)
+        flash[:notice] = Alchemy.t("File deleted successfully", name: name)
       end
 
       def download
         @attachment = Attachment.find(params[:id])
         send_file @attachment.file.path, {
           filename: @attachment.file_name,
-          type: @attachment.file_mime_type
+          type: @attachment.file_mime_type,
         }
       end
 
@@ -73,8 +74,8 @@ module Alchemy
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
             :file_type,
-            :content_id
-          ]
+            :content_id,
+          ],
         )
       end
 

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

@@ -6,11 +6,9 @@ module Alchemy
       include Userstamp
       include Locale
 
-      before_action { enforce_ssl if ssl_required? && !request.ssl? }
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?,
-        :options_from_params
+      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
 
       check_authorization
 
@@ -28,21 +26,23 @@ module Alchemy
 
       def leave
         authorize! :leave, :alchemy_admin
-        render template: '/alchemy/admin/leave', layout: !request.xhr?
+        render template: "/alchemy/admin/leave", layout: !request.xhr?
       end
 
       private
 
       # Disable layout rendering for xhr requests.
       def set_layout
-        request.xhr? ? false : 'alchemy/admin'
+        request.xhr? ? false : "alchemy/admin"
       end
 
       # Handles exceptions
       def exception_handler(error)
         exception_logger(error)
         show_error_notice(error)
-        notify_error_tracker(error)
+        if defined?(Airbrake)
+          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
+        end
       end
 
       # Displays an error notice in the Alchemy backend.
@@ -54,7 +54,7 @@ module Alchemy
         if request.xhr?
           render action: "error_notice"
         else
-          render '500', status: 500
+          render "500", status: 500
         end
       end
 
@@ -88,6 +88,7 @@ module Alchemy
       # Returns true if the current_alchemy_user (The logged-in Alchemy User) has the admin role.
       def is_admin?
         return false if !current_alchemy_user
+
         current_alchemy_user.admin?
       end
 
@@ -103,22 +104,15 @@ module Alchemy
           flash[:notice] = Alchemy.t(flash_notice)
           do_redirect_to redirect_url
         else
-          render action: (params[:action] == 'update' ? 'edit' : 'new')
+          render action: (params[:action] == "update" ? "edit" : "new")
         end
       end
 
-      def per_page_value_for_screen_size
-        Alchemy::Deprecation.warn("#per_page_value_for_screen_size is deprecated, please use #items_per_page instead")
-        return items_per_page if session[:screen_size].blank?
-        screen_height = session[:screen_size].split('x').last.to_i
-        (screen_height / 50) - 12
-      end
-
       # Does redirects for html and js requests
       #
       def do_redirect_to(url_or_path)
         respond_to do |format|
-          format.js   {
+          format.js {
             @redirect_url = url_or_path
             render :redirect
           }
@@ -126,18 +120,6 @@ module Alchemy
         end
       end
 
-      # Extracts options from params and permits all keys
-      #
-      # If no options are present it returns an empty parameters hash.
-      #
-      # @returns [ActionController::Parameters]
-      def options_from_params
-        @_options_from_params ||= begin
-          (params[:options] || ActionController::Parameters.new).permit!
-        end
-      end
-      deprecate :options_from_params, deprecator: Alchemy::Deprecation
-
       # This method decides if we want to raise an exception or not.
       #
       # I.e. in test environment.
@@ -148,7 +130,7 @@ module Alchemy
 
       # Are we currently in the page edit mode page preview.
       def is_page_preview?
-        controller_path == 'alchemy/admin/pages' && action_name == 'show'
+        controller_path == "alchemy/admin/pages" && action_name == "show"
       end
 
       def load_locked_pages
@@ -159,19 +141,11 @@ module Alchemy
       #
       def current_alchemy_site
         @current_alchemy_site ||= begin
-          site_id = params[:site_id] || session[:alchemy_site_id]
-          site = Site.find_by(id: site_id) || super
-          session[:alchemy_site_id] = site.id
-          site
-        end
-      end
-
-      def notify_error_tracker(exception)
-        if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
-          ::Alchemy::ErrorTracking.notification_handler.call(exception)
-        else
-          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
-        end
+            site_id = params[:site_id] || session[:alchemy_site_id]
+            site = Site.find_by(id: site_id) || super
+            session[:alchemy_site_id] = site&.id
+            site
+          end
       end
     end
   end

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

@@ -17,10 +17,10 @@ module Alchemy
 
       def insert
         @item = model_class.find(remarkable_params[:remarkable_id])
-        unless @clipboard.detect { |item| item['id'] == remarkable_params[:remarkable_id] }
+        unless @clipboard.detect { |item| item["id"] == remarkable_params[:remarkable_id] }
           @clipboard << {
-            'id' => remarkable_params[:remarkable_id],
-            'action' => params[:remove] ? 'cut' : 'copy'
+            "id" => remarkable_params[:remarkable_id],
+            "action" => params[:remove] ? "cut" : "copy",
           }
         end
         respond_to do |format|
@@ -30,7 +30,7 @@ module Alchemy
 
       def remove
         @item = model_class.find(remarkable_params[:remarkable_id])
-        @clipboard.delete_if { |item| item['id'] == remarkable_params[:remarkable_id] }
+        @clipboard.delete_if { |item| item["id"] == remarkable_params[:remarkable_id] }
         respond_to do |format|
           format.js
         end
@@ -48,6 +48,7 @@ module Alchemy
 
       def model_class
         raise ActionController::BadRequest unless remarkable_type
+
         "alchemy/#{remarkable_type}".classify.constantize
       end
 

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

@@ -3,13 +3,12 @@
 module Alchemy
   module Admin
     class ContentsController < Alchemy::Admin::BaseController
-      helper 'alchemy/admin/essences'
+      helper "alchemy/admin/essences"
 
       authorize_resource class: Alchemy::Content
 
       def create
         @content = Content.create(content_params)
-        @html_options = params[:html_options] || {}
       end
 
       private

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require 'alchemy/version'
+require "net/http"
+require "alchemy/version"
 
 module Alchemy
   module Admin
@@ -28,9 +28,9 @@ module Alchemy
       def update_check
         @alchemy_version = Alchemy.version
         if @alchemy_version < latest_alchemy_version
-          render plain: 'true'
+          render plain: "true"
         else
-          render plain: 'false'
+          render plain: "false"
         end
       rescue UpdateServiceUnavailable => e
         render plain: e, status: 503
@@ -41,7 +41,8 @@ module Alchemy
       # Returns latest alchemy version.
       def latest_alchemy_version
         versions = get_alchemy_versions
-        return '' if versions.blank?
+        return "" if versions.blank?
+
         # reject any non release version
         versions.reject! { |v| v =~ /[a-z]/ }
         versions.max
@@ -53,14 +54,14 @@ module Alchemy
         response = query_rubygems
         if response.code == "200"
           alchemy_versions = JSON.parse(response.body)
-          alchemy_versions.collect { |h| h['number'] }.sort
+          alchemy_versions.collect { |h| h["number"] }.sort
         else
           # rubygems.org not available?
           # then we try github
           response = query_github
           if response.code == "200"
             alchemy_tags = JSON.parse(response.body)
-            alchemy_tags.collect { |h| h['name'].tr('v', '') }.sort
+            alchemy_tags.collect { |h| h["name"].tr("v", "") }.sort
           else
             # no luck at all?
             raise UpdateServiceUnavailable
@@ -70,12 +71,12 @@ module Alchemy
 
       # Query the RubyGems API for Alchemy versions.
       def query_rubygems
-        make_api_request('https://rubygems.org/api/v1/versions/alchemy_cms.json')
+        make_api_request("https://rubygems.org/api/v1/versions/alchemy_cms.json")
       end
 
       # Query the GitHub API for Alchemy tags.
       def query_github
-        make_api_request('https://api.github.com/repos/AlchemyCMS/alchemy_cms/tags')
+        make_api_request("https://api.github.com/repos/AlchemyCMS/alchemy_cms/tags")
       end
 
       # Make a HTTP API request for given request url.