headmin 0.6.1 → 0.6.2

data/app/assets/javascripts/headmin.js

@@ -7718,7 +7718,6 @@ var filter_controller_default = class extends Controller {
   }
   connect() {
     this.element.controller = this;
-    this.updateHiddenValue();
   }
   toggle(event) {
     const expanded = this.buttonTarget.getAttribute("aria-expanded") === "true";
@@ -7776,7 +7775,14 @@ var filter_controller_default = class extends Controller {
     for (const row of this.rowTargets) {
       const conditional = row.previousElementSibling ? row.previousElementSibling.querySelector('[data-filter-target="conditional"]').value : null;
       const operator = row.querySelector('[data-filter-target="operator"]').value;
-      const value = row.querySelector('[data-filter-target="value"]').value;
+      let values = Array.from(row.querySelectorAll('[data-filter-target="value"]'));
+      values = values.filter((element) => {
+        return element.style.display;
+      });
+      values = values.map((element) => {
+        return element.value;
+      });
+      const value = values.join(",");
       string += `${conditional || ""}${operator}:${value}`;
     }
     return string;
@@ -7799,16 +7805,25 @@ var filter_row_controller_default = class extends Controller {
   handleOperatorChange() {
     if (this.operatorTarget.value === "is_null" || this.operatorTarget.value === "is_not_null") {
       this.toggleNullInput();
+    } else if (this.operatorTarget.value === "between" || this.operatorTarget.value === "not_between") {
+      this.toggleSecondaryInput();
     } else {
       this.toggleOriginalInput();
     }
   }
   toggleNullInput() {
     this.hideOriginal();
+    this.hideSecondary();
     this.showNull();
   }
   toggleOriginalInput() {
     this.showOriginal();
+    this.hideSecondary();
+    this.hideNull();
+  }
+  toggleSecondaryInput() {
+    this.showSecondary();
+    this.hideOriginal();
     this.hideNull();
   }
   hideOriginal() {
@@ -7819,6 +7834,22 @@ var filter_row_controller_default = class extends Controller {
     this.originalTarget.style.display = "block";
     this.originalTarget.setAttribute("data-filter-target", "value");
   }
+  hideSecondary() {
+    for (const [index2, value] of this.originalTargets.entries()) {
+      if (index2 != 0) {
+        value.style.display = "none";
+        value.setAttribute("data-filter-target", "value_original");
+      }
+    }
+  }
+  showSecondary() {
+    for (const [index2, value] of this.originalTargets.entries()) {
+      if (index2 != 0) {
+        value.style.display = "block";
+        value.setAttribute("data-filter-target", "value");
+      }
+    }
+  }
   hideNull() {
     this.nullTarget.style.display = "none";
     this.nullTarget.setAttribute("data-filter-target", "value_null");
@@ -10093,6 +10124,29 @@ var hello_controller_default = class extends Controller {
   }
 };
 
+// app/assets/javascripts/headmin/controllers/infinite_scroller_controller.js
+var infinite_scroller_controller_default = class extends Controller {
+  connect() {
+    this.clickWhenInViewport();
+    document.querySelector(".modal-body").addEventListener("scroll", () => {
+      this.clickWhenInViewport();
+    });
+  }
+  clickWhenInViewport() {
+    if (!this.isLoading() && this.isInViewport()) {
+      this.element.setAttribute("clicked", 1);
+      this.element.click();
+    }
+  }
+  isLoading() {
+    return this.element.hasAttribute("clicked");
+  }
+  isInViewport() {
+    const rect = this.element.getBoundingClientRect();
+    return rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth);
+  }
+};
+
 // app/assets/javascripts/headmin/controllers/media_controller.js
 var media_controller_default = class extends Controller {
   static get targets() {
@@ -10140,8 +10194,8 @@ var media_controller_default = class extends Controller {
     this.postProcess();
   }
   selectItems(items) {
-    this.removeAllItems();
-    this.addItems(items);
+    this.removeAllDeselectedItems(items);
+    this.addNewItems(items);
     this.postProcess();
   }
   postProcess() {
@@ -10184,8 +10238,16 @@ var media_controller_default = class extends Controller {
       }
     });
   }
-  addItems(items) {
-    items.forEach((item) => this.addItem(item));
+  addNewItems(items) {
+    const itemTargetIds = this.itemTargets.map((i) => {
+      return parseInt(i.querySelectorAll("input")[1].value);
+    });
+    items.forEach((item) => {
+      if (itemTargetIds.includes(item.blobId)) {
+        return;
+      }
+      this.addItem(item);
+    });
   }
   addItem(item) {
     const currentItem = this.itemByBlobId(item.blobId);
@@ -10230,11 +10292,18 @@ var media_controller_default = class extends Controller {
     const randomNumber = Math.floor(1e8 + Math.random() * 9e8);
     return template.innerHTML.replace(regex, randomNumber);
   }
-  removeAllItems() {
-    this.removeItems(this.itemTargets);
+  removeAllDeselectedItems(items) {
+    this.removeDeselectedItems(items, this.itemTargets);
   }
-  removeItems(items) {
+  removeDeselectedItems(elements, items) {
+    const returnedBlobIds = elements.map((e) => {
+      return e.blobId;
+    });
     items.forEach((item) => {
+      const blobId = parseInt(item.querySelectorAll("input")[1].value);
+      if (returnedBlobIds.includes(blobId)) {
+        return;
+      }
       this.removeItem(item);
     });
   }
@@ -10267,6 +10336,9 @@ var media_modal_controller_default = class extends Controller {
   static get targets() {
     return ["idCheckbox", "item", "form", "selectButton", "placeholder", "count"];
   }
+  static get values() {
+    return { ids: Array };
+  }
   connect() {
     this.validate();
     this.updateCount();
@@ -10278,34 +10350,64 @@ var media_modal_controller_default = class extends Controller {
     this.hidePlaceholder();
     this.triggerFormSubmission();
   }
-  inputChange() {
-    this.handleInputChange();
+  inputChange(event) {
+    this.handleIdsUpdate(event.target);
     this.updateCount();
   }
   hidePlaceholder() {
     this.placeholderTarget.classList.add("d-none");
   }
-  handleInputChange() {
+  handleIdsUpdate(element) {
+    if (element.checked) {
+      let arr = this.idsValue;
+      arr.push(element.value);
+      this.idsValue = arr;
+    } else {
+      this.idsValue = this.idsValue.filter((value) => {
+        return element.value !== value;
+      });
+    }
+  }
+  itemTargetConnected(element) {
+    this.updateItem(element.querySelector("input"));
+  }
+  updateItem(element) {
+    const arr = this.idsValue;
+    if (arr.includes(element.value)) {
+      element.checked = true;
+    } else {
+      element.checked = false;
+    }
+  }
+  idsValueChanged() {
+    for (const item of this.itemTargets) {
+      this.updateItem(item.querySelector("input"));
+    }
     this.validate();
   }
   dispatchSelectionEvent() {
     document.dispatchEvent(new CustomEvent("mediaSelectionSubmitted", {
       detail: {
         name: this.element.dataset.name,
-        items: this.renderItemsForEvent(this.selectedItems())
+        items: this.renderItemsForEvent()
       }
     }));
   }
   triggerFormSubmission() {
     this.formTarget.requestSubmit();
   }
-  renderItemsForEvent(items) {
-    return items.map((item) => this.renderItemForEvent(item));
+  renderItemsForEvent() {
+    return this.idsValue.map((item) => this.renderItemForEvent(item)).filter((i) => {
+      return i !== void 0;
+    });
   }
   renderItemForEvent(item) {
+    const id = parseInt(item);
+    const blob_id = `#blob_${id}`;
+    const element = this.element.querySelector(blob_id);
     return {
-      blobId: item.querySelector('input[type="checkbox"]').value,
-      thumbnail: item.querySelector(".h-thumbnail")
+      blobId: id,
+      thumbnail: element ? element.querySelector(".h-thumbnail") : ""
     };
   }
   selectedItems() {
@@ -10315,7 +10417,7 @@ var media_modal_controller_default = class extends Controller {
     });
   }
   selectedItemsCount() {
-    return this.selectedItems().length;
+    return this.idsValue.length;
   }
   minSelectedItems() {
     return parseInt(this.element.dataset.min, 10) || 0;
@@ -10341,7 +10443,7 @@ var media_modal_controller_default = class extends Controller {
     return count >= this.minSelectedItems() && count <= this.maxSelectedItems();
   }
   updateCount() {
-    this.countTarget.innerHTML = this.idCheckboxTargets.filter((checkbox) => checkbox.checked).length;
+    this.countTarget.innerHTML = this.selectedItemsCount();
   }
 };
 
@@ -15901,6 +16003,7 @@ var Headmin = class {
     Stimulus.register("filters", filters_controller_default);
     Stimulus.register("flatpickr", flatpickr_controller_default);
     Stimulus.register("hello", hello_controller_default);
+    Stimulus.register("infinite-scroller", infinite_scroller_controller_default);
     Stimulus.register("media", media_controller_default);
     Stimulus.register("media-modal", media_modal_controller_default);
     Stimulus.register("notification", notification_controller_default);

data/app/assets/stylesheets/headmin.css

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 @import "https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css";
 
-/* sass-plugin-0:/opt/homebrew/var/www/headmin/src/scss/headmin.scss */
+/* sass-plugin-0:/usr/local/var/www/headmin/src/scss/headmin.scss */
 :root {
   --bs-blue: #0d6efd;
   --bs-indigo: #6610f2;

data/app/controllers/headmin/media_controller.rb

@@ -1,4 +1,5 @@
 class Headmin::MediaController < HeadminController
+  include Headmin::Pagination
   layout false
 
   def index
@@ -9,7 +10,13 @@ class Headmin::MediaController < HeadminController
         .order(created_at: :desc)
         .group(:id)
         .all
+    @blobs = paginate(@blobs)
     @mimetypes = media_params[:mimetype]
+
+    respond_to do |format|
+      format.html
+      format.turbo_stream
+    end
   end
 
   def create
@@ -38,6 +45,10 @@ class Headmin::MediaController < HeadminController
     end
   end
 
+  def thumbnail
+    @blob = ActiveStorage::Blob.find(params[:id])
+  end
+
   private
 
   def media_params

data/app/helpers/headmin/form_helper.rb

@@ -1,16 +1,5 @@
 module Headmin
   module FormHelper
-    # TODO: cleanup after input field refactoring
-    def form_field_validation_id(form, name)
-      [form.object_name, name.to_s, "validation"].join("_").parameterize.underscore
-    end
-
-    # TODO: cleanup after input field refactoring
-    def form_field_validation_class(form, name)
-      return nil if request.get?
-      form.object.errors.has_key?(name) ? "is-invalid" : "is-valid"
-    end
-
     # Outputs currently present query parameters as hidden fields for a given form
     #
     # https://example.com/products?amount=1&type[]=food&type[]=beverage

data/app/models/headmin/filter/association.rb

@@ -69,18 +69,6 @@ module Headmin
       def has_many?
         macro == :has_many
       end
-
-      private
-
-      def is_i?(value)
-        # Regex: this selects signed digits (\d) only, it is then checked to the value, e.g.:
-        # is_i?("3") = true
-        # is_i?("-3") = true
-        # is_i?("3a") = false
-        # is_i?("3.2") = false
-
-        /\A[-+]?\d+\z/.match(value)
-      end
     end
   end
 end

data/app/models/headmin/filter/association_count.rb

@@ -0,0 +1,50 @@
+module Headmin
+  module Filter
+    class AssociationCount < Headmin::Filter::Base
+      OPERATORS = %w[eq not_eq gt gteq lt lteq]
+
+      def cast_value(value)
+        is_i?(value) ? value.to_i : 0
+      end
+
+      def query(collection)
+        return collection unless @instructions.any?
+
+        # Store the collections' class for later use
+        @parent_class = collection.is_a?(Class) ? collection : collection.klass
+
+        # Join table and group on primary key if necessary
+        collection = collection.left_joins(reflection.name).group(primary_key)
+
+        # Build query and execute
+        query = nil
+        @instructions.each do |instruction|
+          query = build_query(query, collection, instruction)
+        end
+        collection.having(query)
+      end
+
+      private
+
+      def build_query(query, collection, instruction)
+        query_operator = convert_to_query_operator(instruction[:operator])
+        query_value = convert_to_query_value(instruction[:value], instruction[:operator])
+
+        query_operator, query_value = process_null_operators(query_operator, query_value)
+        new_query = reflection.klass.arel_table[reflection.foreign_key.to_sym].count.send(query_operator, query_value)
+        query ? query.send(instruction[:conditional], new_query) : new_query
+      end
+
+      def reflection
+        reflection = @parent_class.reflect_on_association(attribute.to_s.split("_")[0].to_sym)
+        raise UnknownAssociation if reflection.nil?
+
+        reflection
+      end
+
+      def primary_key
+        "#{@parent_class.table_name}.#{@parent_class.primary_key}"
+      end
+    end
+  end
+end

data/app/models/headmin/filter/association_count_view.rb

@@ -0,0 +1,78 @@
+module Headmin
+  module Filter
+    class AssociationCountView < FilterView
+      def base_options
+        keys = %i[name label form]
+        options = to_h.slice(*keys)
+        default_base_options.merge(options)
+      end
+
+      def input_options
+        keys = %i[form]
+        options = to_h.slice(*keys)
+        default_input_options.merge(options)
+      end
+
+      def collection
+        @collection || association_model.all.map { |record| [record.to_s, record.id] }
+      end
+
+      def association_model
+        reflection.klass
+      end
+
+      private
+
+      def id
+        "#{name}_value"
+      end
+
+      def name
+        @name || attribute
+      end
+
+      def attribute
+        "#{@association}_count"
+      end
+
+      def label
+        @label || I18n.t("attributes.#{attribute}", default: "#{I18n.t("attributes.count")} #{association_model.model_name.human(count: collection? ? 2 : 1)}")
+      end
+
+      def reflection
+        form.object.class.reflect_on_association(@association)
+      end
+
+      def collection?
+        reflection.collection?
+      end
+
+      def default_base_options
+        {
+          label: label,
+          name: attribute,
+          display_values: collection,
+          filter: Headmin::Filter::AssociationCount.new(name, @params),
+          allowed_operators: Headmin::Filter::AssociationCount::OPERATORS
+        }
+      end
+
+      def default_input_options
+        {
+          label: false,
+          wrapper: false,
+          name: nil,
+          id: id,
+          data: {
+            action: "change->filter#updateHiddenValue",
+            filter_target: "value",
+            filter_row_target: "original"
+          },
+          collection: collection,
+          selected: selected,
+          class: "form-control"
+        }
+      end
+    end
+  end
+end

data/app/models/headmin/filter/base.rb

@@ -100,6 +100,16 @@ module Headmin
         query ? query.send(instruction[:conditional], new_query) : new_query
       end
 
+      def is_i?(value)
+        # Regex: this selects signed digits (\d) only, it is then checked to the value, e.g.:
+        # is_i?("3") = true
+        # is_i?("-3") = true
+        # is_i?("3a") = false
+        # is_i?("3.2") = false
+
+        /\A[-+]?\d+\z/.match(value)
+      end
+
       private
 
       def parse(string)

data/app/models/headmin/filter/date.rb

@@ -56,8 +56,15 @@ module Headmin
       def display_value(value)
         # This uses the default date format of headmin.
         # Can be overwritten by setting default date format of the application.
-        if value.class.to_s == "Range"
+
+        current_operator = instructions.find { |instruction| instruction[:value] == value }[:operator]
+
+        # To make the operators eq and not_eq work, we pass a range.
+        # However, display value should return this as a date and not a range.
+        if value.class.to_s == "Range" && (current_operator == "eq" || current_operator == "not_eq")
           I18n.l(value.last.to_date)
+        elsif values.class.to_s
+          "#{I18n.l(value.first.to_date)} - #{I18n.l(value.last.to_date)}"
         else
           I18n.l(value.to_date)
         end

data/app/models/headmin/filter/date_view.rb

@@ -28,7 +28,7 @@ module Headmin
           label: label,
           name: attribute,
           filter: Headmin::Filter::Date.new(name, @params),
-          allowed_operators: Headmin::Filter::Date::OPERATORS - %w[in not_in between not_between]
+          allowed_operators: Headmin::Filter::Date::OPERATORS - %w[in not_in]
         }
       end
 

data/app/models/headmin/filter/number.rb

@@ -10,18 +10,6 @@ module Headmin
       def to_s
         string
       end
-
-      private
-
-      def is_i?(value)
-        # Regex: this selects signed digits (\d) only, it is then checked to the value, e.g.:
-        # is_i?("3") = true
-        # is_i?("-3") = true
-        # is_i?("3a") = false
-        # is_i?("3.2") = false
-
-        /\A[-+]?\d+\z/.match(value)
-      end
     end
   end
 end

data/app/models/headmin/filter/operator_view.rb

@@ -24,7 +24,9 @@ module Headmin
           is_null: "○ #{I18n.t("headmin.filters.operators.is_null")}",
           is_not_null: "● #{I18n.t("headmin.filters.operators.is_not_null")}",
           in: "∋ #{I18n.t("headmin.filters.operators.in")}",
-          not_in: "∌ #{I18n.t("headmin.filters.operators.not_in")}"
+          not_in: "∌ #{I18n.t("headmin.filters.operators.not_in")}",
+          between: "↔ #{I18n.t("headmin.filters.operators.between")}",
+          not_between: "⥈ #{I18n.t("headmin.filters.operators.not_between")}"
         }
       end
     end

data/app/views/headmin/_filters.html.erb

@@ -23,7 +23,7 @@
 
   <!-- Default parameters (e.g. sorting, pagination) -->
   <% default_params.except("page").each do |name, value| %>
-    <%= form.hidden_field name.to_sym, value: value %>
+    <%= hidden_field_tag(name, value) %>
   <% end %>
 
   <div class="d-flex flex-column flex-md-row align-content-start align-items-md-start">

data/app/views/headmin/filters/_association_count.html.erb

@@ -0,0 +1,28 @@
+<%
+  # headmin/filters/association_count
+  #
+  # ==== Required parameters
+  # * +association+ - Name of the association that has to be counted
+  # * +form+ - Form object
+  #
+  # ==== Optional parameters
+  # * +label+ - Display label
+  # * +name+ - Name of the filter parameter
+  #
+  # ==== Examples
+  #   Basic version (one-to-many)
+  #   <%= render "headmin/filters", url: admin_orders_path do |form| %#>
+  #     <%= render "headmin/filters/association_count", form: form, association: :beverages %#>
+  #   <% end  %#>
+  #
+  #   Basic version (one-to-one)
+  #   <%= render "headmin/filters", url: admin_orders_path do |form| %#>
+  #     <%= render "headmin/filters/association_count", form: form, association: :beverage %#>
+  #   <% end  %#>
+
+  number = Headmin::Filter::AssociationCountView.new(local_assigns.merge(params: params))
+%>
+
+<%= render "headmin/filters/base", number.base_options do |value| %>
+  <%= render "headmin/forms/number", number.input_options.merge({value: value}) %>
+<% end %>

data/app/views/headmin/filters/_date.html.erb

@@ -20,4 +20,5 @@
 
 <%= render "headmin/filters/base", date.base_options do |value| %>
   <%= render "headmin/forms/date", date.input_options.merge({value: value}) %>
+  <%= render "headmin/forms/date_range", date.input_options.merge({start: {value: value.class.to_s == "Range" ? value.first : value}, end: {value: value.class.to_s == "Range" ? value.last : value}}) %>
 <% end %>

data/app/views/headmin/media/_modal.html.erb

@@ -1,4 +1,4 @@
-<div class="media-modal modal fade" tabindex="-1" data-controller="remote-modal media-modal" data-name="<%= name %>" data-min="<%= min %>" data-max="<%= max %>">
+<div class="media-modal modal fade" tabindex="-1" data-controller="remote-modal media-modal" data-media-modal-ids-value="<%= params[:ids] ? params[:ids] : [] %>" data-name="<%= name %>" data-min="<%= min %>" data-max="<%= max %>">
   <div class="modal-dialog modal-lg modal-dialog-scrollable">
     <div class="modal-content">
       <div class="modal-header">
@@ -10,15 +10,20 @@
       <div class="modal-body">
         <%= turbo_frame_tag "thumbnails", class: "d-flex flex-wrap gap-2" do %>
           <% @blobs.each do |blob| %>
-            <%= render "headmin/media/item", blob: blob %>
+            <%= turbo_frame_tag blob, src: headmin_media_item_thumbnail_path(blob), loading: "lazy" do %>
+              <%= render "thumbnail" %>
+            <% end %>
           <% end %>
           <div data-media-modal-target="placeholder" class="<%= "d-none" if !@blobs.empty? %>">
             <p><%= t(".placeholder") %></p>
           </div>
         <% end %>
+        <div class="mt-3">
+          <%= render "headmin/pagination/infinite", items: @blobs %>
+        </div>
       </div>
       <div class="modal-footer">
-        <%= form_with url: headmin_media_path, multipart: true, data: {"media-modal-target": "form"}, class: "me-auto" do |form| %>
+        <%= form_with url: headmin_new_media_path, multipart: true, data: {"media-modal-target": "form"}, class: "me-auto" do |form| %>
           <%= form.label :files, class: "btn h-btn-outline-light" do %>
             <%= bootstrap_icon("upload") %>
             <%= t(".upload") %>

data/app/views/headmin/media/_thumbnail.html.erb

@@ -0,0 +1,20 @@
+<% blob = local_assigns.has_key?(:blob) ? local_assigns[:blob] : nil %>
+<% if blob.present? %>
+  <div data-media-modal-target="item" title="<%= "#{blob.filename} (#{l(blob.created_at, format: :long)})" %>">
+    <!-- Input -->
+    <input
+      id="media-item-<%= blob.id %>"
+      type="checkbox"
+      value="<%= blob.id %>"
+      data-action="change->media-modal#inputChange"
+      data-media-modal-target="idCheckbox"
+      hidden>
+
+    <!-- Label -->
+    <label for="media-item-<%= blob.id %>">
+      <%= render "headmin/thumbnail", file: blob %>
+    </label>
+  </div>
+<% else %>
+  <%= render "headmin/thumbnail", file: nil %>
+<% end %>

data/app/views/headmin/media/create.turbo_stream.erb

@@ -1,5 +1,5 @@
 <%= turbo_stream.prepend "thumbnails" do %>
   <% @blobs.each do |blob| %>
-    <%= render "headmin/media/item", blob: blob %>
+    <%= render "headmin/media/thumbnail", blob: blob %>
   <% end %>
 <% end %>

data/app/views/headmin/media/index.turbo_stream.erb

@@ -0,0 +1,11 @@
+<%= turbo_stream.append "thumbnails" do %>
+  <% @blobs.each do |blob| %>
+    <%= turbo_frame_tag blob, src: headmin_media_item_thumbnail_path(blob), loading: "lazy" do %>
+      <%= render 'thumbnail' %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= turbo_stream.replace "infinite" do %>
+    <%= render "headmin/pagination/infinite", items: @blobs %>
+<% end %>

data/app/views/headmin/media/thumbnail.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag @blob do %>
+ <%= render "thumbnail", blob: @blob %>
+<% end %>