alchemy_cms 6.0.11 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9b537e2e01fab999228f1a8813bbd0c905d521639eeeb1413021c70e5add7e
-  data.tar.gz: 6d93f0bb79d91d05a6cda0d9a1f6697fada5cd2de30bc11b7e5c879f98ebd1a4
+  metadata.gz: d85d573a2ae43f5152d2ae9082b0548f6cd4611b51f73aee187d796a037fb55e
+  data.tar.gz: 4d30a22cd1c6945e1fe51fdb68c94d716b623d297c6750643518bb291041fb1a
 SHA512:
-  metadata.gz: 9640f98ba68fb3b85dcdf7edb966911eb148448838259981576f0f5da1e8a6511b2adf6c72753c5396b13ae7d3d42776ac160db9e5793b6b34f4cb5296e28910
-  data.tar.gz: 59ab7f7c6097b79df1971212cae17cc587aadb93338b8e7a8131dfdea73756bb3e0ec0b5fd68726769b829e326b346bd0ce9832764bd613af131a4b21dfb8a76
+  metadata.gz: a2381b9af6f92c97955d9415f6d79160cd6940edfa01be10c28ddf7e1166416216e009d903ebf680fc6d788edb6b60f1019f6cbfdc252c1cc8b7829c49369607
+  data.tar.gz: 19a66a2d66bf5d34020a3e59a440baeb7d305dde3bc9681eb609cfef7862b58b7628b258683185f0b3fdb49d3abc89d3a0a4b1b40e4a7480129ca93f09980845

data/.github/workflows/brakeman-analysis.yml

@@ -5,42 +5,42 @@ name: Brakeman Scan
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [main]
   schedule:
-    - cron: '40 4 * * 2'
+    - cron: "40 4 * * 2"
 
 jobs:
   brakeman-scan:
     name: Brakeman Scan
     runs-on: ubuntu-latest
     steps:
-    # Checkout the repository to the GitHub Actions runner
-    - name: Checkout
-      uses: actions/checkout@v2
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout
+        uses: actions/checkout@v2
 
-    # Customize the ruby version depending on your needs
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: '2.7'
+      # Customize the ruby version depending on your needs
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
 
-    - name: Setup Brakeman
-      env:
-        BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
-      run: |
-        gem install brakeman --version $BRAKEMAN_VERSION
+      - name: Setup Brakeman
+        env:
+          BRAKEMAN_VERSION: "5.4" # SARIF support is provided in Brakeman version 4.10+
+        run: |
+          gem install brakeman --version $BRAKEMAN_VERSION
 
-    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
-    - name: Scan
-      continue-on-error: true
-      run: |
-        brakeman -f sarif -o output.sarif.json .
+      # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+      - name: Scan
+        continue-on-error: true
+        run: |
+          brakeman -f sarif -o output.sarif.json .
 
-    # Upload the SARIF file generated in the previous step
-    - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v1
-      with:
-        sarif_file: output.sarif.json
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: output.sarif.json

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   RSpec:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

data/.github/workflows/stale.yml

@@ -12,6 +12,8 @@ jobs:
       - uses: actions/stale@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-issue-stale: 180
+          days-before-close: 30
           stale-issue-message: |
             This issue has not seen any activity in a long time.
             Please create a pull request with a fix or ask someone of the community if they can help.

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+# Changelog
+
+## 6.1.0 (2023-01-19)
+
+### Features
+
+- Add page layouts repository class option [#2410](https://github.com/AlchemyCMS/alchemy_cms/pull/2410) ([tvdeyen](https://github.com/tvdeyen))
+- Add element definitions repository class option [#2409](https://github.com/AlchemyCMS/alchemy_cms/pull/2409) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to set preview_sources [#2407](https://github.com/AlchemyCMS/alchemy_cms/pull/2407) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to add anchors to ingredients [#2395](https://github.com/AlchemyCMS/alchemy_cms/pull/2395) ([tvdeyen](https://github.com/tvdeyen))
+- Add a error logger exception handler [#2387](https://github.com/AlchemyCMS/alchemy_cms/pull/2387) ([tvdeyen](https://github.com/tvdeyen))
+- Add a element DOM id class [#2373](https://github.com/AlchemyCMS/alchemy_cms/pull/2373) ([tvdeyen](https://github.com/tvdeyen))
+
+### Changes
+
+- Remove old jasmine based javascript specs [#2400](https://github.com/AlchemyCMS/alchemy_cms/pull/2400) ([tvdeyen](https://github.com/tvdeyen))
+- Update bundled Tinymce to 4.9.11 [#2399](https://github.com/AlchemyCMS/alchemy_cms/pull/2399) ([tvdeyen](https://github.com/tvdeyen))
+- Add Headline size and level selects as input addons [#2398](https://github.com/AlchemyCMS/alchemy_cms/pull/2398) ([tvdeyen](https://github.com/tvdeyen))
+- Remove Element.available scope [#2372](https://github.com/AlchemyCMS/alchemy_cms/pull/2372) ([tvdeyen](https://github.com/tvdeyen))
+- Remove element_dom_id helper [#2369](https://github.com/AlchemyCMS/alchemy_cms/pull/2369) ([tvdeyen](https://github.com/tvdeyen))
+- Use position for element dom_id [#2368](https://github.com/AlchemyCMS/alchemy_cms/pull/2368) ([tvdeyen](https://github.com/tvdeyen))
+- Disallow deleting pages if still attached to menu node [#2338](https://github.com/AlchemyCMS/alchemy_cms/pull/2338) ([afdev82](https://github.com/afdev82))
+
+### Fixes
+
+- Add `:contact_form_id` to `messages` params in `messages_controller` [#2403](https://github.com/AlchemyCMS/alchemy_cms/pull/2403) ([chiperific](https://github.com/chiperific))
+- Do not create thumbs for invalid pictures [#2386](https://github.com/AlchemyCMS/alchemy_cms/pull/2386) ([tvdeyen](https://github.com/tvdeyen))
+
+### Misc
+
+- [ruby - main] Upgrade sqlite3 to version 1.6.0 [#2408](https://github.com/AlchemyCMS/alchemy_cms/pull/2408) ([depfu](https://github.com/apps/depfu))
+- [ruby - main] Upgrade puma to version 6.0.1 [#2404](https://github.com/AlchemyCMS/alchemy_cms/pull/2404) ([depfu](https://github.com/apps/depfu))
+- CI: Update brakeman scan [#2390](https://github.com/AlchemyCMS/alchemy_cms/pull/2390) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Upgrade net-imap to version 0.3.1 [#2379](https://github.com/AlchemyCMS/alchemy_cms/pull/2379) ([depfu](https://github.com/apps/depfu))
+- CI: Try ubuntu-latest [#2378](https://github.com/AlchemyCMS/alchemy_cms/pull/2378) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Upgrade sqlite3 to version 1.5.0 [#2374](https://github.com/AlchemyCMS/alchemy_cms/pull/2374) ([depfu](https://github.com/apps/depfu))
+- [js] Upgrade babel-jest to version 29.0.1 [#2362](https://github.com/AlchemyCMS/alchemy_cms/pull/2362) ([depfu](https://github.com/apps/depfu))
+- Use released Rails gems again for local testing [#2355](https://github.com/AlchemyCMS/alchemy_cms/pull/2355) ([tvdeyen](https://github.com/tvdeyen))
+- [js] Upgrade babel-jest to version 28.0.2 [#2324](https://github.com/AlchemyCMS/alchemy_cms/pull/2324) ([depfu](https://github.com/apps/depfu))
+
+## 6.0.12 (2022-11-19)
+
+- More installer options [#2385](https://github.com/AlchemyCMS/alchemy_cms/pull/2385) ([tvdeyen](https://github.com/tvdeyen))
+- Fix custom module installer [#2384](https://github.com/AlchemyCMS/alchemy_cms/pull/2384) ([tvdeyen](https://github.com/tvdeyen))
+- Always provide format with attachment URLs [#2383](https://github.com/AlchemyCMS/alchemy_cms/pull/2383) ([mamhoff](https://github.com/mamhoff))
+
 ## 6.0.11 (2022-09-22)
 
 - Do not touch pages when toggling element [#2377](https://github.com/AlchemyCMS/alchemy_cms/pull/2377) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -7,7 +7,7 @@ rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
 gem "rails", "~> #{rails_version}.0"
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
-  gem "sqlite3", "~> 1.4.1"
+  gem "sqlite3", "~> 1.6.0"
 end
 if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
   gem "mysql2", "~> 0.5.1"
@@ -50,7 +50,7 @@ if Gem.ruby_version >= Gem::Version.new("3.1.0")
   if rails_version.to_s.match?(/6.1/)
     # Rails 6.1 needs this as well
     gem "net-pop", "~> 0.1.0", require: false
-    gem "net-imap", "~> 0.2.0", require: false
+    gem "net-imap", "~> 0.3.1", require: false
   end
   gem "net-smtp", "~> 0.3.0", require: false
 end

data/alchemy_cms.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "capybara", ["~> 3.0"]
   gem.add_development_dependency "capybara-screenshot", ["~> 1.0"]
   gem.add_development_dependency "factory_bot_rails", ["~> 6.0"]
-  gem.add_development_dependency "puma", ["~> 5.0"]
+  gem.add_development_dependency "puma", ["~> 6.0"]
   gem.add_development_dependency "rails-controller-testing", ["~> 1.0"]
   gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
   gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]

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

@@ -100,7 +100,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
           (data) =>
             page = data.pages[0]
             if page
-              @initElementSelect(page.id)
+              @initDomIdSelect(page.id)
               callback
                 id: page.url_path
                 name: page.name
@@ -116,16 +116,19 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
         @$element_anchor.select2('destroy').prop('disabled', true)
       else
         @$element_anchor.val('')
-        @initElementSelect(event.added.page_id)
+        @initDomIdSelect(event.added.page_id)
 
-  # Initializes the select2 based elements select
+  # Initializes the select2 based dom id select
   # reveals after a page has been selected
-  initElementSelect: (page_id) ->
-    $.get Alchemy.routes.api_elements_path, page_id: page_id, (data) =>
+  initDomIdSelect: (page_id) ->
+    $.get Alchemy.routes.api_ingredients_path, page_id: page_id, (data) =>
+      dom_ids = data.ingredients.filter (ingredient) ->
+        ingredient.data?.dom_id
+      .map (ingredient) ->
+        id: ingredient.data.dom_id
+        text: "##{ingredient.data.dom_id}"
       @$element_anchor.prop('disabled', false).removeAttr('placeholder').select2
-        data: [ id: '', text: Alchemy.t('None') ].concat data.elements.map (element) ->
-          id: element.dom_id
-          text: element.display_name
+        data: [ id: '', text: Alchemy.t('None') ].concat(dom_ids)
 
   # Creates a link if no validation errors are present.
   # Otherwise shows an error notice.
@@ -238,11 +241,10 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   # Populates the internal anchors select
   initAnchorLinks: ->
     frame = document.getElementById('alchemy_preview_window')
-    elements = frame.contentDocument?.getElementsByTagName('*') || []
+    elements = frame.contentDocument?.querySelectorAll('[id]') || []
     if elements.length > 0
       for element in elements
-        if element.id
-          @$anchor_link.append("<option value='##{element.id}'>##{element.id}</option>")
+        @$anchor_link.append("<option value='##{element.id}'>##{element.id}</option>")
     else
       @$anchor_link.html("<option>#{Alchemy.t('No anchors found')}</option>")
     return

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

@@ -21,8 +21,10 @@ $anchor-color: $very-dark-orange !default;
 
 $body-background-color: $light-gray !default;
 
-$default-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif !default;
-$mono-font-family: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace !default;
+$default-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode",
+  "Lucida Sans", Verdana, Tahoma, sans-serif !default;
+$mono-font-family: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console",
+  Terminal, monospace !default;
 $base-font-size: 12px !default;
 $default-font-size: 1em !default;
 $small-font-size: 0.9em !default;
@@ -44,15 +46,18 @@ $default-border-color: rgba(#afafaf, 0.5) !default;
 $border-inset-color: lighten($default-border-color, 10%) !default;
 $default-border-width: 1px !default;
 $default-border-style: solid !default;
-$default-border: $default-border-width $default-border-style $default-border-color !default;
+$default-border: $default-border-width $default-border-style
+  $default-border-color !default;
 $default-border-radius: 3px !default;
 
 $form-field-margin: $default-margin 0 !default;
 $form-field-height: 31px !default;
+$form-field-addon-width: 30px !default;
 $form-field-background-color: $white !default;
 $form-field-border-width: $default-border-width !default;
 $form-field-border-style: $default-border-style !default;
-$form-field-border-color: $default-border-color $default-border-color $border-inset-color $border-inset-color !default;
+$form-field-border-color: $default-border-color $default-border-color
+  $border-inset-color $border-inset-color !default;
 $form-field-box-shadow: inset 0px 0 1px $medium-gray !default;
 $form-field-padding: 0.6em 0.75em !default;
 $form-field-font-size: $default-font-size !default;

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

@@ -487,7 +487,7 @@
       $focus-border-color: $focus-color,
       $focus-box-shadow: 0 0 0 2px $focus-color
     );
-    width: 29px;
+    width: $form-field-addon-width;
     height: $form-field-height;
 
     &.disabled,
@@ -601,6 +601,44 @@
   }
 }
 
+.ingredient-editor.headline {
+  &.with-level-select {
+    input[type="text"] {
+      padding-right: $form-field-addon-width + 2 * $default-padding;
+    }
+
+    &.with-anchor {
+      input[type="text"] {
+        padding-right: 22px + $form-field-addon-width + $default-padding;
+      }
+    }
+  }
+
+  &.with-size-select {
+    input[type="text"] {
+      padding-right: $form-field-addon-width + 2 * $default-padding;
+    }
+
+    &.with-anchor {
+      input[type="text"] {
+        padding-right: 22px + $form-field-addon-width + $default-padding;
+      }
+    }
+
+    &.with-level-select {
+      input[type="text"] {
+        padding-right: 2 * ($form-field-addon-width + $default-padding);
+      }
+
+      &.with-anchor {
+        input[type="text"] {
+          padding-right: 16px + 2 * ($form-field-addon-width + $default-padding);
+        }
+      }
+    }
+  }
+}
+
 .content_editor.essence_audio,
 .content_editor.essence_file,
 .content_editor.essence_video,
@@ -690,6 +728,24 @@ select.long {
     width: 100%;
   }
 
+  &.linkable {
+    input[type="text"] {
+      padding-right: 2 * ($form-field-addon-width + $default-padding);
+    }
+
+    &.with-anchor {
+      input[type="text"] {
+        padding-right: 26px + 2 * ($form-field-addon-width + $default-padding);
+      }
+    }
+  }
+
+  &.with-anchor {
+    input[type="text"] {
+      padding-right: 26px;
+    }
+  }
+
   &.missing {
     .message {
       margin: 0;
@@ -936,8 +992,44 @@ textarea.has_tinymce {
 }
 
 .ingredient-date--label,
-.essence_date--label {
+.essence_date--label,
+.edit-ingredient-anchor-link {
   position: absolute;
-  right: 7px;
-  top: 37px;
+  right: 2 * $default-padding;
+  bottom: 15px;
+  margin: 0 !important;
+}
+
+.edit-ingredient-anchor-link {
+  right: $default-padding;
+
+  > a {
+    padding: $default-padding;
+  }
+
+  .linkable & {
+    right: 2 * $form-field-addon-width + $default-padding;
+  }
+
+  .with-size-select & {
+    right: $form-field-addon-width + $default-padding;
+  }
+
+  .with-level-select & {
+    right: $form-field-addon-width + $default-padding;
+  }
+
+  .with-level-select.with-size-select & {
+    right: 2 * $form-field-addon-width + $default-padding;
+  }
+}
+
+.ingredient-properties-link {
+  position: absolute;
+  right: 2px;
+  bottom: 15px;
+
+  > a {
+    padding: $default-padding;
+  }
 }

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

@@ -1,8 +1,7 @@
 form {
-
   #main_content > &.alchemy {
     max-width: 600px;
-    padding: 2*$default-padding;
+    padding: 2 * $default-padding;
     margin: 2em auto;
   }
 
@@ -43,8 +42,8 @@ form {
     }
 
     > .autocomplete_tag_list {
-
-      .select2-container, .select2-choices {
+      .select2-container,
+      .select2-choices {
         width: 100%;
       }
     }
@@ -81,16 +80,16 @@ form {
     }
 
     &.field_with_errors {
-
       input[type="text"],
       input[type="email"],
       input[type="password"],
       textarea,
       .select2-choices {
-        @extend %field-with-error
+        @extend %field-with-error;
       }
 
-      .select2-choice, .select2-choices {
+      .select2-choice,
+      .select2-choices {
         border-color: $error_border_color;
         color: $error_text_color;
         margin-bottom: 4px;
@@ -100,7 +99,9 @@ form {
         }
       }
 
-      label { color: $error_text_color }
+      label {
+        color: $error_text_color;
+      }
     }
 
     small.error {
@@ -115,27 +116,71 @@ form {
 
     &.language_locale small.error {
       @include form-hint(
-      $background-color: $error_background_color,
-      $border-color: $error_border_color
+        $background-color: $error_background_color,
+        $border-color: $error_border_color
       );
       text-align: left;
     }
   }
 
+  .input-addon {
+    width: $form-field-addon-width;
+    position: absolute;
+    bottom: 2 * $default-padding;
+
+    select {
+      width: 100%;
+      padding: 0 2px;
+      text-align: center;
+    }
+
+    &.left {
+      left: 0;
+
+      select {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+    }
+
+    &.right {
+      left: unset;
+      right: 0;
+
+      select {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
+
+      &.second {
+        left: unset;
+        right: $form-field-addon-width;
+
+        select {
+          border-right-width: 0;
+          border-top-right-radius: 0;
+          border-bottom-right-radius: 0;
+        }
+      }
+    }
+  }
+
   .input > .with-hint,
   .checkbox > .with-hint {
     cursor: default;
 
-    input, textarea {
+    input,
+    textarea {
       cursor: not-allowed;
     }
   }
 
   .inline-input {
     @include clearfix;
-    margin: 0 -1*$default-margin;
+    margin: 0 -1 * $default-margin;
 
-    .left-column, .right-column {
+    .left-column,
+    .right-column {
       padding: 0 $default-padding;
     }
 
@@ -192,9 +237,7 @@ form {
   }
 
   .input-row {
-
     .input-column {
-
       &:first-of-type {
         padding-left: 0;
       }
@@ -212,7 +255,6 @@ textarea#essence_picture_caption {
 
 // styles for link overlay selects
 .window_form {
-
   td.checkbox {
     text-align: left;
   }
@@ -224,5 +266,5 @@ textarea#essence_picture_caption {
 
 .input-column > label {
   display: block;
-  margin-top: $default-margin +1;
+  margin-top: $default-margin + 1;
 }

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('tinymce/skins/alchemy/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('tinymce/skins/alchemy/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('tinymce/skins/alchemy/img/wline.gif') repeat-x bottom left;
   cursor: default;
 }
 

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

@@ -19,7 +19,7 @@ module Alchemy
       private
 
       def ingredient_params
-        params.require(:ingredient).permit(@ingredient.class.stored_attributes[:data])
+        params[:ingredient]&.permit(@ingredient.class.stored_attributes[:data]) || {}
       end
 
       def load_croppable_resource

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

@@ -78,9 +78,9 @@ module Alchemy
 
       def new
         @page ||= Page.new(layoutpage: params[:layoutpage] == "true", parent_id: params[:parent_id])
-        @page_layouts = PageLayout.layouts_for_select(@current_language.id, @page.layoutpage?)
+        @page_layouts = Page.layouts_for_select(@current_language.id, layoutpages: @page.layoutpage?)
         @clipboard = get_clipboard("pages")
-        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, @current_language.id, @page.layoutpage?)
+        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, @current_language.id, layoutpages: @page.layoutpage?)
       end
 
       def create
@@ -398,7 +398,7 @@ module Alchemy
       def load_languages_and_layouts
         @language = @current_language
         @languages_with_page_tree = Language.on_current_site.with_root_page
-        @page_layouts = PageLayout.layouts_for_select(@language.id)
+        @page_layouts = Page.layouts_for_select(@language.id)
       end
 
       def set_preview_mode

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Api::IngredientsController < Api::BaseController
+    # Returns all ingredients as json object
+    #
+    # You can either load all or only these for :element_id or :page_id param
+    #
+    def index
+      @ingredients = Alchemy::Ingredient.accessible_by(current_ability, :index)
+
+      if params[:page_id].present?
+        @ingredients = @ingredients
+          .where(alchemy_page_versions: { page_id: params[:page_id] })
+          .merge(Alchemy::PageVersion.drafts)
+          .joins(element: :page_version)
+      end
+
+      render json: @ingredients, adapter: :json, root: "ingredients"
+    end
+  end
+end

data/app/controllers/alchemy/messages_controller.rb

@@ -124,7 +124,7 @@ module Alchemy
     end
 
     def message_params
-      params.require(:message).permit(*mailer_config["fields"])
+      params.require(:message).permit(*mailer_config["fields"], :contact_form_id)
     end
   end
 end

data/app/decorators/alchemy/ingredient_editor.rb

@@ -36,6 +36,10 @@ module Alchemy
         "ingredient-editor",
         partial_name,
         deprecated? ? "deprecated" : nil,
+        respond_to?(:level_options) && level_options.many? ? "with-level-select" : nil,
+        respond_to?(:size_options) && size_options.many? ? "with-size-select" : nil,
+        settings[:linkable] ? "linkable" : nil,
+        settings[:anchor] ? "with-anchor" : nil,
       ].compact
     end
 

data/app/helpers/alchemy/elements_helper.rb

@@ -166,14 +166,6 @@ module Alchemy
       render "alchemy/elements/view_not_found", name: element.name
     end
 
-    # Returns a string for the id attribute of a html element for the given element
-    # @deprecated
-    def element_dom_id(element)
-      element&.dom_id
-    end
-
-    deprecate element_dom_id: "element.dom_id", deprecator: Alchemy::Deprecation
-
     # Renders the HTML tag attributes required for preview mode.
     def element_preview_code(element)
       tag_builder.tag_options(element_preview_code_attributes(element))