alchemy_cms 7.0.15 → 7.1.0.pre.b1

data/lib/alchemy/forms/builder.rb

@@ -9,20 +9,25 @@ module Alchemy
         options[:wrapper] = :alchemy
 
         if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name)
-          options[:disabled] = true
-          options[:input_html] = options.fetch(:input_html, {}).merge(
-            "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name)
-          )
+          tooltip_options = {
+            content: Alchemy.t(:attribute_fixed, attribute: attribute_name),
+            class: "like-hint-tooltip",
+            placement: "bottom-start"
+          }
+          template.content_tag(:div, class: "input") do
+            label(attribute_name) +
+              template.content_tag("sl-tooltip", tooltip_options) do
+                input_field(attribute_name, disabled: true)
+              end
+          end
+        else
+          super
         end
-
-        super
       end
 
       # Renders a simple_form input that displays a datepicker
       #
       def datepicker(attribute_name, options = {})
-        options[:wrapper] = :alchemy
-
         type = options[:as] || :date
         value = options.fetch(:input_html, {}).delete(:value)
         date = value || object.send(attribute_name.to_sym).presence
@@ -31,21 +36,22 @@ module Alchemy
         input_options = {
           type: :text,
           class: type,
-          data: {datepicker_type: type},
           value: date&.iso8601
         }.merge(options[:input_html] || {})
 
-        input attribute_name, as: :string, input_html: input_options
+        date_field = input attribute_name, as: :string, input_html: input_options
+        template.content_tag("alchemy-datepicker", date_field, type: type)
       end
 
       # Renders a button tag wrapped in a div with 'submit' class.
       #
       def submit(label, options = {})
         options = {
-          wrapper_html: {class: "submit"}
+          wrapper_html: {class: "submit"},
+          input_html: {is: "alchemy-button"}
         }.update(options)
         template.content_tag("div", options.delete(:wrapper_html)) do
-          template.content_tag("button", label, options.delete(:input_html))
+          template.button_tag(label, options.delete(:input_html))
         end
       end
     end

data/lib/alchemy/modules.rb

@@ -35,7 +35,7 @@ module Alchemy
             defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
           end
 
-          validate_controllers_existence(defined_controllers, definition_hash)
+          validate_controllers_existence(defined_controllers)
         end
 
         @@alchemy_modules |= [definition_hash]
@@ -43,7 +43,7 @@ module Alchemy
 
       private
 
-      def validate_controllers_existence(controllers, definition_hash)
+      def validate_controllers_existence(controllers)
         controllers.each do |controller_val|
           next if controller_val.blank?
 

data/lib/alchemy/permissions.rb

@@ -96,7 +96,7 @@ module Alchemy
         can :leave, :alchemy_admin
         can [:info, :help], :alchemy_admin_dashboard
         can :manage, :alchemy_admin_clipboard
-        can :update, :alchemy_admin_layoutpages
+        can :edit, :alchemy_admin_layoutpages
         can :tree, :alchemy_admin_pages
 
         # Resources

data/lib/alchemy/resources_helper.rb

@@ -160,10 +160,10 @@ module Alchemy
     #
     # NOTE: Alchemy gives you a local variable named like your resource
     #
-    def render_resources
-      render partial: resource_name, collection: resources_instance_variable
+    def render_resources(icon: nil)
+      render partial: resource_name, collection: resources_instance_variable, locals: {icon: icon}
     rescue ActionView::MissingTemplate
-      render partial: "resource", collection: resources_instance_variable
+      render partial: "resource", collection: resources_instance_variable, locals: {icon: icon}
     end
 
     def resource_has_tags

data/lib/alchemy/routing_constraints.rb

@@ -27,7 +27,7 @@ module Alchemy
     # because it could be a legacy route that needs to be redirected.
     #
     def handable_format?
-      @request.format.symbol.nil? || @request.format.html?
+      @request.format.symbol.nil? || (@request.format.symbol == :html)
     end
 
     # We don't want to handle the Rails info routes.

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -46,11 +46,12 @@ module Alchemy
         end
       end
 
-      def click_button_with_label(label)
-        label = find("label", text: label)
-        within label.first(:xpath, ".//..") do
-          first("button").click
-        end
+      def click_button_with_tooltip(content)
+        find(%([content="#{content}"] > button)).click
+      end
+
+      def click_link_with_tooltip(content)
+        find(%([content="#{content}"] > a)).click
       end
 
       private
@@ -63,6 +64,8 @@ module Alchemy
         find "label:not(.select2-offscreen)",
           text: /#{Regexp.escape(text)}/i,
           match: :one
+      rescue Capybara::ElementNotFound
+        find %([content="#{text}"]), match: :one
       end
     end
   end

data/lib/alchemy/test_support/rspec_matchers.rb

@@ -0,0 +1,14 @@
+RSpec::Matchers.define :have_link_with_tooltip do |content|
+  match do |session|
+    session.has_css?(%([content="#{content}"] a))
+  end
+end
+
+# Here's a tiny custom matcher making it a bit easier to check the
+# current session for a language configuration.
+#
+RSpec::Matchers.define :include_language_information_for do |expected|
+  match do |actual|
+    actual[:alchemy_language_id] == expected.id
+  end
+end

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -6,7 +6,7 @@ RSpec.shared_examples_for "having a json uploader error message" do
     expect(response.media_type).to eq("application/json")
     expect(response.status).to eq(422)
     json = JSON.parse(response.body)
-    expect(json).to have_key("growl_message")
+    expect(json).to have_key("message")
     expect(json).to have_key("files")
   end
 end

data/lib/alchemy/tinymce.rb

@@ -4,13 +4,14 @@ module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins
 
-    @@plugins = %w[alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table]
+    DEFAULT_PLUGINS = %w[anchor charmap code directionality fullscreen hr link lists paste tabfocus table]
+
+    @@plugins = DEFAULT_PLUGINS + %w[alchemy_link]
     @@init = {
       skin: "alchemy",
       width: "auto",
       resize: true,
-      autoresize_min_height: "105",
-      autoresize_max_height: "480",
+      min_height: 220,
       menubar: false,
       statusbar: true,
       toolbar: [
@@ -33,6 +34,10 @@ module Alchemy
       def init
         @@init
       end
+
+      def preloadable_plugins
+        @@plugins - DEFAULT_PLUGINS
+      end
     end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.15"
+  VERSION = "7.1.0-b1"
 
   def self.version
     VERSION

data/lib/tasks/alchemy/tidy.rake

@@ -7,6 +7,7 @@ namespace :alchemy do
     desc "Tidy up Alchemy database."
     task :up do
       Rake::Task["alchemy:tidy:element_positions"].invoke
+      Rake::Task["alchemy:tidy:content_positions"].invoke
       Rake::Task["alchemy:tidy:remove_orphaned_records"].invoke
       Rake::Task["alchemy:tidy:remove_trashed_elements"].invoke
       Rake::Task["alchemy:tidy:remove_duplicate_legacy_urls"].invoke

data/package.json

@@ -7,14 +7,18 @@
   "keywords": [],
   "author": "Thomas von Deyen",
   "license": "BSD-3-Clause",
+  "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "babel-jest": "^29.0.1",
+    "@babel/core": "^7.22.11",
+    "@babel/preset-env": "^7.22.11",
+    "babel-jest": "^29.6.4",
     "flatpickr": "^4.6.9",
-    "jest": "^25.2.7",
+    "jest": "^29.6.4",
+    "jest-environment-jsdom": "^29.6.4",
+    "jquery": "^3.7.1",
+    "jsdom-testing-mocks": "^1.11.0",
     "lodash-es": "^4.17.21",
-    "prettier": "^2.0.2",
+    "prettier": "^3.0.0",
     "sortablejs": "^1.10.2",
     "xhr-mock": "^2.5.1"
   },
@@ -22,6 +26,11 @@
     "globals": {
       "Alchemy": {}
     },
+    "moduleNameMapper": {
+      "alchemy_admin/(.*)": "<rootDir>/app/javascript/alchemy_admin/$1",
+      "vendor/(.*)": "<rootDir>/vendor/assets/javascripts/$1"
+    },
+    "testEnvironment": "jsdom",
     "roots": [
       "spec/javascript/alchemy_admin"
     ]