alchemy_cms 7.2.0.rc2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab8abb53948898989f3d8a8b597737a63da7e541ef5cd0de08a23d505fb7729
-  data.tar.gz: ce85ac778f47134d757d46c9c4d56879d98cb456b32ebe3a1d8133f757643b8b
+  metadata.gz: fc42b823b465bcd27da5afbf252cfe85cca0067e909a41bdd62e11f26b19ddc9
+  data.tar.gz: d46785e2a9f7c6e6af086ad315d5e354c3db098530103ee6a94e5ef63802fff4
 SHA512:
-  metadata.gz: e6e1a233177adbdac5ae8a61fae4653f392fe458938e1b87752dc3c1317ad881fd0e6270e8a612bb8f7b45e31430584f8bd27e018ec7d0fb702a6518483daf34
-  data.tar.gz: 1effffc22e22464f9cf4cf0d1e22107746d93cbac01a2610f7e29707de7f25b186e3c87bc2527dfe820fbb611e4cf65c1dfb1c6d3ba062e0ae3cb7bc0224a0de
+  metadata.gz: 7e931bc107d3ed406e7d718c6a56c1a09a3ed78548b2d30415d0ffb31ce5838a4abfd08f641961889b66813989d25254f0235de5ceeb3fe9e7656d812086cd11
+  data.tar.gz: c6bcdbbacadbfdc5ca9ac22b66fdf0d5d99403a2c99add0877e537053afacd53343d0e9534184ede0bdb07976c4eadaa6aa82be51eb520d96c5a59d6bc42c067

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 7.2.0 (2024-05-28)
+
+- Remove responders gem [#2901](https://github.com/AlchemyCMS/alchemy_cms/pull/2901) ([tvdeyen](https://github.com/tvdeyen))
+- Add Language and Site serializers [#2900](https://github.com/AlchemyCMS/alchemy_cms/pull/2900) ([tvdeyen](https://github.com/tvdeyen))
+- PageSelect: Move URL to bottom [#2899](https://github.com/AlchemyCMS/alchemy_cms/pull/2899) ([tvdeyen](https://github.com/tvdeyen))
+- Highlight search terms in RemoteSelect [#2898](https://github.com/AlchemyCMS/alchemy_cms/pull/2898) ([tvdeyen](https://github.com/tvdeyen))
+- fix(InternalTab): Fix for urls with trailing slash and no locale [#2897](https://github.com/AlchemyCMS/alchemy_cms/pull/2897) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.2.0.rc2 (2024-05-27)
 
 - Harden specs [#2896](https://github.com/AlchemyCMS/alchemy_cms/pull/2896) ([tvdeyen](https://github.com/tvdeyen))

data/alchemy_cms.gemspec

@@ -46,7 +46,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
   gem.add_runtime_dependency "originator", ["~> 3.1"]
   gem.add_runtime_dependency "ransack", [">= 1.8", "< 5.0"]
-  gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
   gem.add_runtime_dependency "simple_form", [">= 4.0", "< 6"]
   gem.add_runtime_dependency "sprockets", [">= 3.0", "< 5"]

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

@@ -10,9 +10,12 @@
   display: flex;
   flex-direction: column;
 
-  .icon {
-    margin: 0 $default-margin;
-    fill: currentColor;
+  alchemy-icon {
+    margin-right: $default-margin;
+
+    .icon {
+      fill: currentColor;
+    }
   }
 }
 
@@ -25,11 +28,12 @@
 
 .page-select--bottom {
   font-size: $small-font-size;
-  padding-left: $default-padding;
+  padding-left: $default-padding / 2;
 }
 
-.page-select--site-name {
+.page-select--page-urlname {
   color: $muted-text-color;
+  padding-right: $default-padding;
 
   .select2-highlighted & {
     color: $medium-gray;
@@ -42,6 +46,7 @@
   margin-left: auto;
   border-radius: $default-border-radius;
   padding: $default-padding / 2 $default-padding;
+  text-transform: uppercase;
 
   .select2-highlighted & {
     color: $select-hover-bg-color;
@@ -49,9 +54,9 @@
   }
 }
 
-.page-select--page-urlname {
+.page-select--site-name {
   margin-left: auto;
-  padding: $default-padding 2 * $default-padding;
+  padding: $default-padding 0 $default-padding 2 * $default-padding;
   color: $dark-gray;
   font-size: $small-font-size;
 

data/app/components/alchemy/admin/link_dialog/internal_tab.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Admin
     module LinkDialog
       class InternalTab < BaseTab
-        PAGE_URL_PATTERN = /\A\/(?<locale>[a-z]{2})?(?<slash>\/)?(?<urlname>.*?)(?<trailing-slash>\/)?\z/
+        PAGE_URL_PATTERN = /^\/(?:(?<locale>[a-z]{2})(?:\/|$))?(?<urlname>.*?)(?:\/|$)?(?:#(?<fragment>.*))?$/
 
         def title
           Alchemy.t("link_overlay_tab_label.internal")
@@ -49,7 +49,7 @@ module Alchemy
         end
 
         def page_attributes
-          locale, _, urlname, _ = uri.path.match(PAGE_URL_PATTERN)&.captures
+          locale, urlname, _fragment = uri.path.match(PAGE_URL_PATTERN)&.captures
 
           if locale && urlname.present?
             {language_code: locale, urlname: urlname}

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

@@ -3,7 +3,6 @@
 module Alchemy
   class Api::BaseController < Alchemy::BaseController
     layout false
-    respond_to :json
 
     rescue_from CanCan::AccessDenied, with: :render_not_authorized
     rescue_from ActiveRecord::RecordNotFound, with: :render_not_found

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

@@ -37,7 +37,7 @@ module Alchemy
     def show
       @element = Element.where(id: params[:id]).includes(*element_includes).first
       authorize! :show, @element
-      respond_with @element
+      render json: @element, serializer: ElementSerializer
     end
 
     private

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

@@ -43,7 +43,7 @@ module Alchemy
     #
     def show
       authorize! :show, @page
-      respond_with @page
+      render json: @page, serializer: PageSerializer
     end
 
     def move

data/app/javascript/alchemy_admin/components/attachment_select.js

@@ -8,14 +8,15 @@ class AttachmentSelect extends RemoteSelect {
   /**
    * html template for each list entry
    * @param {object} page
+   * @param {string} term
    * @returns {string}
    * @private
    */
-  _renderListEntry(attachment) {
+  _renderListEntry(attachment, term) {
     return `
       <div class="attachment-select--attachment">
         <alchemy-icon name="${attachment.icon_css_class}"></alchemy-icon>
-        <span class="attachment-select--attachment-name">${attachment.name}</span>
+        <span class="attachment-select--attachment-name">${this._hightlightTerm(attachment.name, term)}</span>
       </div>
     `
   }

data/app/javascript/alchemy_admin/components/node_select.js

@@ -18,10 +18,11 @@ class NodeSelect extends RemoteSelect {
   /**
    * html template for each list entry
    * @param {object} node
+   * @param {string} term
    * @returns {string}
    * @private
    */
-  _renderListEntry(node) {
+  _renderListEntry(node, term) {
     const ancestors = node.ancestors.map((a) => a.name)
     const seperator = `<alchemy-icon name="arrow-right-s"></alchemy-icon>`
 
@@ -33,7 +34,7 @@ class NodeSelect extends RemoteSelect {
             ${ancestors.length > 0 ? ancestors.join(seperator) + seperator : ""}
           </span>
           <span class="node-select--node-name">
-            ${node.name}
+            ${this._hightlightTerm(node.name, term)}
           </span>
         </div>
         <div class="node-select--node-url">

data/app/javascript/alchemy_admin/components/page_select.js

@@ -36,20 +36,21 @@ class PageSelect extends RemoteSelect {
   /**
    * html template for each list entry
    * @param {object} page
+   * @param {string} term
    * @returns {string}
    * @private
    */
-  _renderListEntry(page) {
+  _renderListEntry(page, term) {
     return `
       <div class="page-select--page">
         <div class="page-select--top">
           <alchemy-icon name="file-3"></alchemy-icon>
-          <span class="page-select--page-name">${page.name}</span>
-          <span class="page-select--page-urlname">${page.url_path}</span>
+          <span class="page-select--page-name">${this._hightlightTerm(page.name, term)}</span>
+          <span class="page-select--site-name">${page.site.name}</span>
         </div>
         <div class="page-select--bottom">
-          <span class="page-select--site-name">${page.site.name}</span>
-          <span class="page-select--language-code">${page.language.name}</span>
+          <span class="page-select--page-urlname">${page.url_path}</span>
+          <span class="page-select--language-code">${page.language_code}</span>
         </div>
       </div>
     `

data/app/javascript/alchemy_admin/components/remote_select.js

@@ -62,7 +62,8 @@ export class RemoteSelect extends AlchemyHTMLElement {
       },
       ajax: this.ajaxConfig,
       formatSelection: (item) => this._renderResult(item),
-      formatResult: (item) => this._renderListEntry(item)
+      formatResult: (item, _el, query) =>
+        this._renderListEntry(item, query.term)
     }
   }
 
@@ -126,6 +127,7 @@ export class RemoteSelect extends AlchemyHTMLElement {
   /**
    * html template for each list entry
    * @param {object} item
+   * @param {string} term
    * @returns {string}
    * @private
    */
@@ -134,4 +136,15 @@ export class RemoteSelect extends AlchemyHTMLElement {
       "You need to define a _renderListEntry function on your sub class!"
     )
   }
+
+  /**
+   * hightlighted search term
+   * @param {string} name
+   * @param {string} term
+   * @returns {string}
+   * @private
+   */
+  _hightlightTerm(name, term) {
+    return name.replace(new RegExp(term, "gi"), (match) => `<em>${match}</em>`)
+  }
 }

data/app/serializers/alchemy/language_serializer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class LanguageSerializer < ActiveModel::Serializer
+    attributes :id,
+      :name
+  end
+end

data/app/serializers/alchemy/site_serializer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class SiteSerializer < ActiveModel::Serializer
+    attributes :id,
+      :name
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.2.0.rc2"
+  VERSION = "7.2.0"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -17,7 +17,6 @@ require "jquery-rails"
 require "kaminari"
 require "non_stupid_digest_assets"
 require "ransack"
-require "responders"
 require "sassc-rails"
 require "simple_form"
 require "turbo-rails"

data/vendor/assets/stylesheets/alchemy_admin/select2.scss

@@ -396,6 +396,7 @@ html[dir="rtl"] .select2-results {
 .select2-results li em {
   background: #feffde;
   font-style: normal;
+  text-decoration: underline;
 }
 
 .select2-results .select2-highlighted em {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.2.0.rc2
+  version: 7.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-27 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -413,26 +413,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: responders
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1015,11 +995,13 @@ files:
 - app/serializers/alchemy/base_serializer.rb
 - app/serializers/alchemy/element_serializer.rb
 - app/serializers/alchemy/ingredient_serializer.rb
+- app/serializers/alchemy/language_serializer.rb
 - app/serializers/alchemy/node_serializer.rb
 - app/serializers/alchemy/page_node_serializer.rb
 - app/serializers/alchemy/page_serializer.rb
 - app/serializers/alchemy/page_tree_serializer.rb
 - app/serializers/alchemy/picture_serializer.rb
+- app/serializers/alchemy/site_serializer.rb
 - app/services/alchemy/copy_page.rb
 - app/services/alchemy/delete_elements.rb
 - app/services/alchemy/duplicate_element.rb