alchemy_cms 8.0.0.a → 8.0.0.b

data/app/views/alchemy/admin/attachments/_files_list.html.erb

@@ -60,16 +60,26 @@
         object: attachment,
         file_attribute: 'file' %>
     <% end %>
-    <% table.with_action(:destroy, Alchemy.t(:delete_file)) do |attachment| %>
-      <%= link_to_confirm_dialog render_icon(:minus),
-        Alchemy.t(:confirm_to_delete_file),
-        alchemy.admin_attachment_path(
-          id: attachment,
-          q: search_filter_params[:q],
-          page: params[:page],
-          per_page: params[:per_page]
-        ),
-        class: "icon_button" %>
+    <% table.with_action(:destroy) do |attachment| %>
+      <% if attachment.deletable? %>
+        <sl-tooltip content="<%= Alchemy.t(:delete_file) %>">
+          <%= link_to_confirm_dialog render_icon(:minus),
+            Alchemy.t(:confirm_to_delete_file),
+            alchemy.admin_attachment_path(
+              id: attachment,
+              q: search_filter_params[:q],
+              page: params[:page],
+              per_page: params[:per_page]
+            ),
+            class: "icon_button" %>
+        </sl-tooltip>
+      <% else %>
+        <sl-tooltip content="<%= Alchemy.t(:in_use) %>">
+          <button class="icon_button disabled">
+            <%= render_icon(:minus) %>
+          </button>
+        </sl-tooltip>
+      <% end %>
     <% end %>
     <% table.with_action(:edit, Alchemy.t(:rename_file)) do |attachment| %>
       <%= link_to_dialog render_icon(:edit),

data/app/views/alchemy/admin/attachments/assign.js.erb

@@ -5,10 +5,11 @@
   $form_field.parent().find("> .file_name").text("<%= @attachment.name %>")
   $form_field.parent().find("> .file_icon").html("<%= j render_icon(@attachment.icon_css_class) %>")
   $form_field.parent().find("> .remove_file_link").removeClass("hidden")
-  Alchemy.closeCurrentDialog(function() {
-    var elementEditor = $form_field[0].closest("alchemy-element-editor")
+  Alchemy.closeCurrentDialog(() => {
+    const field = $form_field[0]
+    const elementEditor = field.closest("alchemy-element-editor")
     if (elementEditor) {
-      elementEditor.setDirty()
+      elementEditor.setDirty(field)
     }
   })
 })()

data/app/views/alchemy/admin/attachments/show.html.erb

@@ -1,45 +1,57 @@
-<div class="resource_info">
-  <div class="value">
-    <label>
-      <%= render_icon @attachment.icon_css_class %>
-    </label>
-    <p><%= @attachment.file_name %></p>
-  </div>
-  <div class="value with-icon">
-    <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
-    <p><%= @attachment.url %></p>
-    <alchemy-clipboard-button
-      content="<%= @attachment.url %>"
-      success-text="<%= Alchemy.t("Copied to clipboard") %>"
-      class="icon_button--right"
-    ></alchemy-clipboard-button>
-  </div>
-  <div class="value with-icon">
-    <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
-    <p><%= @attachment.url(download: true) %></p>
-    <alchemy-clipboard-button
-      content="<%= @attachment.url(download: true) %>"
-      success-text="<%= Alchemy.t("Copied to clipboard") %>"
-      class="icon_button--right"
-    ></alchemy-clipboard-button>
-  </div>
-</div>
+<div class="resource-details">
+  <aside>
+    <div class="resource_info">
+      <div class="value">
+        <label>
+          <%= render_icon @attachment.icon_css_class %>
+        </label>
+        <p><%= @attachment.file_name %></p>
+      </div>
+      <div class="value with-icon">
+        <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
+        <p><%= @attachment.url %></p>
+        <alchemy-clipboard-button
+          content="<%= @attachment.url %>"
+          success-text="<%= Alchemy.t("Copied to clipboard") %>"
+          class="icon_button--right"
+        ></alchemy-clipboard-button>
+      </div>
+      <div class="value with-icon">
+        <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
+        <p><%= @attachment.url(download: true) %></p>
+        <alchemy-clipboard-button
+          content="<%= @attachment.url(download: true) %>"
+          success-text="<%= Alchemy.t("Copied to clipboard") %>"
+          class="icon_button--right"
+        ></alchemy-clipboard-button>
+      </div>
+    </div>
 
-<% case @attachment.file_mime_type %>
-<% when *Alchemy::Filetypes::IMAGE_FILE_TYPES %>
-<div class="attachment_preview_container image-preview">
-  <%= image_tag(@attachment.url, class: "full_width") %>
-</div>
-<% when *Alchemy::Filetypes::AUDIO_FILE_TYPES %>
-<div class="attachment_preview_container player-preview">
-  <%= audio_tag(@attachment.url, preload: "none", controls: true, class: "full_width") %>
-</div>
-<% when *Alchemy::Filetypes::VIDEO_FILE_TYPES %>
-<div class="attachment_preview_container player-preview">
-  <%= video_tag(@attachment.url, preload: "metadata", controls: true, class: "full_width") %>
+    <hr>
+
+    <%= render "alchemy/admin/resources/resource_usage_info",
+      assignments: @assignments,
+      resource_name: :attachment %>
+  </aside>
+
+  <%# We need to use the `tag` helper for the div to be really empty for
+      the CSS `:empty` selector to work in order to hide this div if there is no preview %>
+  <%= tag.div(class: "resource-preview") do %>
+    <% case @attachment.file_mime_type %>
+    <% when *Alchemy::Filetypes::IMAGE_FILE_TYPES %>
+    <div class="attachment_preview_container">
+      <%= image_tag(@attachment.url) %>
+    </div>
+    <% when *Alchemy::Filetypes::AUDIO_FILE_TYPES %>
+    <div class="attachment_preview_container">
+      <%= audio_tag(@attachment.url, preload: "metadata", controls: true) %>
+    </div>
+    <% when *Alchemy::Filetypes::VIDEO_FILE_TYPES %>
+    <div class="attachment_preview_container">
+      <%= video_tag(@attachment.url, preload: "metadata", controls: true) %>
+    </div>
+    <% when "application/pdf" %>
+    <iframe src="<%= @attachment.url %>" frameborder="0"></iframe>
+    <% end %>
+  <% end %>
 </div>
-<% when "application/pdf" %>
-<iframe src="<%= @attachment.url %>" frameborder=0 class="full-iframe">
-  Your browser does not support frames.
-</iframe>
-<% end %>

data/app/views/alchemy/admin/crop.html.erb

@@ -12,7 +12,7 @@
   </div>
   <form>
     <%= button_tag Alchemy.t(:apply), type: 'submit' %>
-    <%= button_tag Alchemy.t('Reset Imagemask'), class: 'reset_mask', type: 'reset' %>
+    <%= button_tag Alchemy.t('Reset Imagemask'), class: 'reset_mask secondary', type: 'reset' %>
   </form>
 </div>
 <% end %>

data/app/views/alchemy/admin/elements/_form.html.erb

@@ -6,15 +6,15 @@
   <%= turbo_frame_tag @element do %>
     <%= alchemy_form_for [:admin, @element], remote: false do |form| %>
       <%= form.hidden_field :page_version_id %>
-      <%= form.input :name,
-        label: Alchemy.t(:element_of_type),
-        collection: elements_for_select(@elements),
-        prompt: Alchemy.t(:select_element),
-        selected: (@elements.first if @elements.count == 1),
-        input_html: {is: 'alchemy-select', autofocus: true} %>
-      <% if @elements.count == 1 %>
-        <%= form.hidden_field :name, value: @elements.first.name %>
-      <% end %>
+      <div class="input">
+        <%= form.label(:name, class: "control-label required") do %>
+          <%= Alchemy.t(:element_of_type) %><abbr>*</abbr>
+        <% end %>
+        <%= render Alchemy::Admin::ElementSelect.new(
+          @elements,
+          field_name: form.field_name(:name)
+        ) %>
+      </div>
       <%= form.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
       <%= form.submit Alchemy.t(:add) %>
     <%- end -%>

data/app/views/alchemy/admin/elements/_header.html.erb

@@ -5,7 +5,10 @@
     <% elsif element.deprecated? %>
       <%= hint_with_tooltip element.deprecation_notice %>
     <% else %>
-      <%= render_icon('draggable', style: false, class: 'element', fixed_width: false) %>
+      <span class="icon element">
+        <%= element.definition.icon_file %>
+      </span>
+      <%= render_icon(:draggable, style: false, fixed_width: false) %>
     <% end %>
   </span>
   <span class="element-title">

data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb

@@ -15,7 +15,7 @@
       then css_classes
     else
       css_classes.map do |klass|
-        [Alchemy.t(klass, scope: "picture_ingredients.css_classes", default: picture_editor.css_class.camelcase), klass]
+        [Alchemy.t(klass, scope: "picture_ingredients.css_classes", default: ingredient.css_class&.camelcase), klass]
       end
     end %>
   <%= f.input :css_class, collection: css_classes_collection, include_blank: false %>

data/app/views/alchemy/admin/pages/info.html.erb

@@ -15,7 +15,7 @@
   </div>
   <div class="value">
     <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
-    <p><%= "/#{@page.urlname}" %></p>
+    <p><%= @page.url_path %></p>
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_status) %></label>

data/app/views/alchemy/admin/partials/_search_form.html.erb

@@ -8,6 +8,7 @@
       <%= render_icon('search') %>
     </button>
     <%= f.search_field resource_handler.search_field_name,
+      value: params.dig(:q, resource_handler.search_field_name),
       class: 'search_input_field',
       placeholder: Alchemy.t(:search) %>
     <%= link_to render_icon(:times, size: '1x'), url,

data/app/views/alchemy/admin/pictures/_archive.html.erb

@@ -1,23 +1,19 @@
-<div id="library_sidebar">
-  <%= render 'filter_bar' if resource_has_filters %>
+<%= render "library_sidebar" %>
 
-  <% if Alchemy::Picture.tag_counts.any? %>
-    <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">
-      <%= render 'tag_list' %>
-    </div>
-  <% end %>
-</div>
+<% forwarded_params = search_filter_params.merge(
+  page: params[:page],
+  size: @size.presence
+).to_h %>
 
-<%= form_tag delete_multiple_admin_pictures_path, method: :delete do %>
+<%= form_tag delete_multiple_admin_pictures_path(forwarded_params), method: :delete do %>
   <div class="selected_item_tools hidden">
     <h3><%= Alchemy.t(:edit_selected_pictures) %></h3>
     <%= link_to(
       render_icon(:edit, size: '1x') + Alchemy.t("Edit"),
-      edit_multiple_admin_pictures_path,
+      edit_multiple_admin_pictures_path(forwarded_params),
       class: 'button with_icon',
       title: Alchemy.t('Edit multiple pictures'),
-      id: 'edit_multiple_pictures',
-      style: 'float: none'
+      id: 'edit_multiple_pictures'
     ) %>
     <%= button_tag render_icon("delete-bin-2", size: '1x') + Alchemy.t("Delete"),
       'data-turbo-confirm': Alchemy.t(:confirm_to_delete_images_from_server),
@@ -25,21 +21,15 @@
     &nbsp;<%= Alchemy.t(:or) %>&nbsp;
     <%= link_to(
       render_icon(:close) + Alchemy.t("Clear selection"),
-      admin_pictures_path(
-        q: search_filter_params[:q],
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
-      ),
-      class: 'secondary button with_icon',
-      style: 'float: none'
+      admin_pictures_path(forwarded_params),
+      class: 'secondary button with_icon'
     ) %>
   </div>
-  <% if @pictures.blank? and @recent_pictures.blank? and search_filter_params[:q].blank? %>
+  <% if @pictures.blank? && @recent_pictures.blank? && search_filter_params[:q].blank? %>
     <%= render_message do %>
       <%= Alchemy.t(:no_images_in_archive) %>
     <% end %>
-  <% elsif @pictures.blank? and @recent_pictures.blank? %>
+  <% elsif @pictures.blank? && @recent_pictures.blank? %>
     <%= render_message do %>
       <%= Alchemy.t(:no_search_results) %>
     <% end %>

data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb

@@ -2,12 +2,7 @@
   <%= render 'filter_and_size_bar' %>
 </div>
 <div id="assign_image_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
-  <div id="library_sidebar">
-    <%= render 'filter_bar' if resource_has_filters %>
-    <div class="tag-list">
-      <%= render 'tag_list' %>
-    </div>
-  </div>
+  <%= render "library_sidebar" %>
   <% if @pictures.empty? %>
     <%= render_message do %>
       <% if search_filter_params.empty? %>

data/app/views/alchemy/admin/pictures/_form.html.erb

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag(@picture) do %>
-  <%= alchemy_form_for [alchemy, :admin, @picture] do |f| %>
+  <%= alchemy_form_for [alchemy, :admin, @picture], class: "picture-form" do |f| %>
     <%= f.input :name %>
     <%= render "alchemy/admin/pictures/picture_description_field", f: f %>
     <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>

data/app/views/alchemy/admin/pictures/_infos.html.erb

@@ -1,55 +1,24 @@
-<div class="resource_info">
-  <div class="picture-file-infos">
-    <div class="value">
-      <label><%= Alchemy::Picture.human_attribute_name(:image_file_name) %></label>
-      <p><%= @picture.image_file_name %></p>
-    </div>
-    <div class="value">
-      <label><%= Alchemy::Picture.human_attribute_name(:image_file_dimensions) %></label>
-      <p><%= @picture.image_file_dimensions %>px</p>
-    </div>
-    <div class="value">
-      <label><%= Alchemy::Picture.human_attribute_name(:image_file_size) %></label>
-      <p><%= number_to_human_size @picture.image_file_size %></p>
-    </div>
+<div class="resource_info file-infos">
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:image_file_name) %></label>
+    <p><%= @picture.image_file_name %></p>
   </div>
-</div>
-
-<div class="picture-usage-info resource_info">
-  <h3>
-    <%= Alchemy.t(:this_picture_is_used_on_these_pages) %>
-  </h3>
-  <div id="pictures_page_list">
-    <% if @assignments.any? %>
-      <ul>
-        <% @assignments.group_by(&:page).each do |page, picture_ingredients| %>
-          <% if page %>
-            <li>
-              <h3>
-                <%= render_icon 'file' %>
-                <p><%= link_to page.name, edit_admin_page_path(page) %></p>
-              </h3>
-              <ul class="list">
-                <% picture_ingredients.group_by(&:element).each do |element, picture_ingredients| %>
-                  <li class="<%= cycle('even', 'odd') %>">
-                    <% page_link = link_to element.display_name_with_preview_text,
-                                   edit_admin_page_path(page, anchor: "element_#{element.id}") %>
-                    <% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
-                    <%= render_icon('draggable', style: false) %>
-                    <p>
-                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
-                    </p>
-                  </li>
-                <% end %>
-              </ul>
-            </li>
-          <% end %>
-        <% end %>
-      </ul>
-    <% else %>
-      <%= render_message do %>
-        <%= Alchemy.t(:picture_not_in_use_yet) %>
-      <% end %>
-    <% end %>
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:image_file_dimensions) %></label>
+    <p><%= @picture.image_file_dimensions %>px</p>
+  </div>
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:image_file_size) %></label>
+    <p><%= number_to_human_size @picture.image_file_size %></p>
+  </div>
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:created_at) %></label>
+    <p><%= l(@picture.created_at, format: :"alchemy.default") %></p>
   </div>
 </div>
+
+<hr>
+
+<%= render "alchemy/admin/resources/resource_usage_info",
+  assignments: @assignments,
+  resource_name: :picture %>

data/app/views/alchemy/admin/pictures/_library_sidebar.html.erb

@@ -0,0 +1,7 @@
+<div id="library_sidebar">
+  <%= render "sorting_select" %>
+  <%= render "filter_bar" if resource_has_filters %>
+  <div class="tag-list">
+    <%= render "tag_list" %>
+  </div>
+</div>

data/app/views/alchemy/admin/pictures/_picture.html.erb

@@ -1,38 +1,32 @@
+<% picture_path = alchemy.admin_picture_path(
+  picture,
+  search_filter_params.merge(
+    page: params[:page],
+    size: @size.presence
+  ).to_h
+) %>
+
 <div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
   <span class="picture_tool select">
     <%= check_box_tag "picture_ids[]", picture.id %>
   </span>
   <% if picture.deletable? && can?(:destroy, picture) %>
-  <span class="picture_tool delete">
+  <div class="picture_tool delete">
     <sl-tooltip content="<%= Alchemy.t('Delete image') %>">
       <%= link_to_confirm_dialog(
         render_icon("delete-bin-2"),
         Alchemy.t(:confirm_to_delete_image_from_server),
-        alchemy.admin_picture_path(
-          id: picture,
-          q: search_filter_params[:q],
-          page: params[:page],
-          tagged_with: search_filter_params[:tagged_with],
-          size: @size,
-          filter: search_filter_params[:filter]
-        )
+        picture_path
       ) -%>
     </sl-tooltip>
-  </span>
+  </div>
   <% end %>
   <% picture_url = picture.thumbnail_url(size: preview_size(@size)) %>
-  <% image = image_tag(picture_url || "alchemy/missing-image.svg", alt: picture.name) %>
-  <% if can?(:edit, picture) && picture_url %>
+  <% image = picture_url ? image_tag(picture_url, alt: picture.name) : '<alchemy-icon name="file-damage"></alchemy-icon>'.html_safe %>
+  <% if can?(:edit, picture) %>
     <%= link_to(
       image,
-      alchemy.admin_picture_path(
-        id: picture,
-        q: search_filter_params[:q],
-        page: params[:page],
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
-      ),
+      picture_path,
       class: 'thumbnail_background'
     ) %>
   <% else %>

data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb

@@ -1,20 +1,24 @@
 <div class="picture_thumbnail" name="<%= picture_to_assign.name %>" id="assignable_<%= picture_to_assign.id %>">
-  <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
-    <%= link_to(
-      image_tag(
-        picture_to_assign.thumbnail_url(size: preview_size(size)) || "alchemy/missing-image.svg",
-        alt: picture_to_assign.name
-      ),
-      alchemy.assign_admin_picture_path(
-        id: picture_to_assign.id,
-        form_field_id: @form_field_id
-      ),
-      remote: true,
-      onclick: '$(self).attr("href", "#").off("click"); return false',
-      method: 'put',
-      class: 'thumbnail_background'
-    ) %>
-  </sl-tooltip>
+  <% if picture_to_assign.image_file %>
+    <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
+      <%= link_to(
+        image_tag(
+          picture_to_assign.thumbnail_url(size: preview_size(size)),
+          alt: picture_to_assign.name
+        ),
+        alchemy.assign_admin_picture_path(
+          id: picture_to_assign.id,
+          form_field_id: @form_field_id
+        ),
+        remote: true,
+        onclick: '$(self).attr("href", "#").off("click"); return false',
+        method: 'put',
+        class: 'thumbnail_background'
+      ) %>
+    </sl-tooltip>
+  <% else %>
+    <alchemy-icon name="file-damage"></alchemy-icon>
+  <% end %>
   <div class="picture_name" title="<%= picture_to_assign.name %>">
     <%= picture_to_assign.name %>
   </div>

data/app/views/alchemy/admin/pictures/_sorting_select.html.erb

@@ -0,0 +1,13 @@
+<div id="sorting_select">
+  <div class="filter-input">
+    <alchemy-auto-submit>
+      <%= label_tag "q[s]", t(".label") %>
+      <%= select_tag "q[s]", options_for_select([
+        [t(".by_latest"), "created_at desc"],
+        [t(".alphabetical"), "name asc"]
+      ], search_filter_params.dig(:q, :s)),
+      form: "resource_search",
+      class: "full_width" %>
+    </alchemy-auto-submit>
+  </div>
+</div>

data/app/views/alchemy/admin/pictures/_tag_list.html.erb

@@ -1,5 +1,5 @@
 <% if Alchemy::Picture.tag_counts.any? %>
-  <h3><%= Alchemy.t("Filter by tag") %></h3>
+  <label><%= Alchemy.t("Filter by tag") %></label>
   <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
   <ul>
     <%= render_tag_list('Alchemy::Picture') %>

data/app/views/alchemy/admin/pictures/edit_multiple.html.erb

@@ -1,9 +1,4 @@
-<%= form_tag update_multiple_admin_pictures_path do %>
-  <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, @size %>
-  <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
-  <%= hidden_field_tag :filter, search_filter_params[:filter] %>
-
+<%= form_tag update_multiple_admin_pictures_path(search_filter_params.merge(size: @size.presence)) do %>
   <% @pictures.pluck(:id).each do |id| %>
   <%= hidden_field_tag "picture_ids[]", id %>
   <% end %>

data/app/views/alchemy/admin/pictures/index.html.erb

@@ -17,10 +17,7 @@
         <%= link_to(
           render_icon('zoom-out'),
           alchemy.admin_pictures_path(
-            size: "small",
-            q: search_filter_params[:q],
-            filter: search_filter_params[:filter],
-            tagged_with: search_filter_params[:tagged_with]
+            search_filter_params.merge(size: "small").to_h
           ),
           class: "icon_button"
         ) %>
@@ -29,10 +26,7 @@
         <%= link_to(
           render_icon('search'),
           alchemy.admin_pictures_path(
-            size: "medium",
-            q: search_filter_params[:q],
-            filter: search_filter_params[:filter],
-            tagged_with: search_filter_params[:tagged_with]
+            search_filter_params.merge(size: "medium").to_h
           ),
           class: "icon_button"
         ) %>
@@ -41,10 +35,7 @@
         <%= link_to(
           render_icon('zoom-in'),
           alchemy.admin_pictures_path(
-            size: "large",
-            q: search_filter_params[:q],
-            filter: search_filter_params[:filter],
-            tagged_with: search_filter_params[:tagged_with]
+            search_filter_params.merge(size: "large").to_h
           ),
           class: "icon_button"
         ) %>

data/app/views/alchemy/admin/pictures/show.html.erb

@@ -1,13 +1,17 @@
 <div class="zoomed-picture-background">
-  <%= image_tag @picture.url || "alchemy/missing-image.svg" %>
+  <% if @picture.image_file %>
+    <%= image_tag @picture.url %>
+  <% else %>
+    <alchemy-icon name="file-damage"></alchemy-icon>
+  <% end %>
 </div>
 
 <div class="picture-overlay-navigation">
   <% if @previous %>
     <%= link_to alchemy.admin_picture_path(
-        id: @previous,
+        id: :previous,
         q: search_filter_params[:q],
-        page: params[:page],
+        page: @previous,
         tagged_with: search_filter_params[:tagged_with],
         size: @size,
         filter: search_filter_params[:filter]
@@ -19,9 +23,9 @@
   <% end %>
   <% if @next %>
     <%= link_to alchemy.admin_picture_path(
-        id: @next,
+        id: :next,
         q: search_filter_params[:q],
-        page: params[:page],
+        page: @next,
         tagged_with: search_filter_params[:tagged_with],
         size: @size,
         filter: search_filter_params[:filter]
@@ -35,6 +39,7 @@
 
 <div class="picture-details-overlay">
   <%= render 'form' %>
+  <hr>
   <%= render 'infos' %>
 </div>
 

data/app/views/alchemy/admin/resources/_filter_bar.html.erb

@@ -1,17 +1,7 @@
 <div id="filter_bar">
-  <% alchemy_filters.each do |filter| %>
-    <%= render filter.input_component(search_filter_params, @query) %>
-  <% end %>
+  <alchemy-auto-submit>
+    <% alchemy_filters.each do |filter| %>
+      <%= render filter.input_component(search_filter_params, @query) %>
+    <% end %>
+  </alchemy-auto-submit>
 </div>
-
-<script type="module">
-  // Still using jQuery here, because select2 does emit the event from
-  // the correct element.
-  $('#filter_bar').on('change', function(event) {
-    // We need to dispatch a submit event, so that Turbo that listens
-    // to it submits the search form us.
-    const submitEvent = new Event("submit", { bubbles: true, cancelable: true });
-    event.target.form.dispatchEvent(submitEvent);
-    return false;
-  });
-</script>