headmin 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085821452a1ab6c16440f422dd5db566a3bb78a230496c15251d273264870c2f'
-  data.tar.gz: 0e826df821082477c7f4a5d975f22e621abf55cdf19670cac74e005f8bab8913
+  metadata.gz: 3445263c38deb23953f15bd095f0ab4d35acdba03e57863990afc270b3b0ec2d
+  data.tar.gz: 7ff3cbb8b497e7abfec49ee1222f3980b08779627179d788cd332794076c3ec7
 SHA512:
-  metadata.gz: b4697f00acea6b4b874168997aedee42032154deb32fdec90c61e676b22f4902337867651880c31c02fa1fbff673dbd7eddf4e0cb4bbc80b0b0f4f5ff565fdae
-  data.tar.gz: bcb2d2c203bf82f642cb65c5444b8bd412a30072f7a78b90b2416fbc00b244eed4864b539fcd506eec5a28177aa3684b851b4210633eb90131c784b36b947147
+  metadata.gz: 6b6d3c45da2fc0d1e3d9d3f69daccfdb689eae2785cc46d19fdec80ffff497987193fcb251eb2576f95d2d7927179d2c0264fa0548c3363240193a0c51e7efcc
+  data.tar.gz: 1badf3f039045aaf9ddee10bcf1f2686bd3cd44f0e04db6f893c8e61c4cf8974b3464a427bcf6c66cbc7bfd03e2b502d48bd4edd8a4c26527484feefac74691b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.5.2)
+    headmin (0.5.4)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)

data/app/assets/javascripts/headmin/controllers/media_controller.js

@@ -14,7 +14,7 @@ export default class extends Controller {
     })
 
     // Init sorting
-    if(this.hasSorting()) {
+    if (this.hasSorting()) {
       this.initSortable()
     }
 
@@ -46,7 +46,7 @@ export default class extends Controller {
   }
 
   // Methods
-  initSortable() {
+  initSortable () {
     Sortable.create(this.thumbnailsTarget, {
       handle: '.media-drag-sort-handle',
       onEnd: (event) => {
@@ -55,8 +55,8 @@ export default class extends Controller {
     })
   }
 
-  hasSorting() {
-    return this.element.dataset.sort === "true"
+  hasSorting () {
+    return this.element.dataset.sort === 'true'
   }
 
   destroyItem (item) {
@@ -90,7 +90,7 @@ export default class extends Controller {
 
   validate () {
     this.clearValidation()
-    if (this.element.dataset.required === "0") return
+    if (this.element.dataset.required === '0') return
     this.validateMinimum()
     this.validateMaximum()
   }
@@ -162,7 +162,7 @@ export default class extends Controller {
   }
 
   enableItem (item) {
-    item.querySelector(`input[name*='_destroy']`).value = false
+    item.querySelector('input[name*=\'_destroy\']').value = false
     item.classList.remove('d-none')
   }
 
@@ -174,11 +174,11 @@ export default class extends Controller {
 
     // Set new values
     const newItem = this.itemTargets.pop()
-    newItem.querySelector(`input[name*="[blob_id]"]`).value = item.blobId
-    newItem.querySelector(`input[name*="[_destroy]"]`).value = false
+    newItem.querySelector('input[name*="[blob_id]"]').value = item.blobId
+    newItem.querySelector('input[name*="[_destroy]"]').value = false
 
     // Update edit button url
-    const editButton = newItem.querySelector(`[data-media-target="editButton"]`)
+    const editButton = newItem.querySelector('[data-media-target="editButton"]')
     editButton.setAttribute('href', editButton.getAttribute('href').replace('$1', item.blobId))
 
     // Copy thumbnail
@@ -204,7 +204,7 @@ export default class extends Controller {
   }
 
   removeItem (item) {
-    item.querySelector(`input[name*='_destroy']`).value = 1
+    item.querySelector('input[name*=\'_destroy\']').value = 1
     item.classList.add('d-none')
 
     // Reset positions
@@ -219,19 +219,19 @@ export default class extends Controller {
 
   itemByBlobId (blobId) {
     return this.itemTargets.find((item) => {
-      return item.querySelector(`input[name*='blob_id']`).value === blobId
+      return item.querySelector('input[name*=\'blob_id\']').value === blobId
     })
   }
 
   activeItems () {
     return this.itemTargets.filter((item) => {
-      return item.querySelector(`input[name$='[_destroy]']`).value === 'false'
+      return item.querySelector('input[name$=\'[_destroy]\']').value === 'false'
     })
   }
 
   activeIds () {
     return this.activeItems().map((item) => {
-      return item.querySelector(`input[name$='[blob_id]']`).value
+      return item.querySelector('input[name$=\'[blob_id]\']').value
     })
   }
-}
+}

data/app/assets/javascripts/headmin/controllers/media_modal_controller.js

@@ -27,11 +27,11 @@ export default class extends Controller {
   }
 
   // Methods
-  hidePlaceholder() {
+  hidePlaceholder () {
     this.placeholderTarget.classList.add('d-none')
   }
 
-  handleInputChange() {
+  handleInputChange () {
     this.validate()
   }
 
@@ -104,7 +104,7 @@ export default class extends Controller {
     return count >= this.minSelectedItems() && count <= this.maxSelectedItems()
   }
 
-  updateCount() {
-    this.countTarget.innerHTML = this.idCheckboxTargets.filter(checkbox => checkbox.checked).length;
+  updateCount () {
+    this.countTarget.innerHTML = this.idCheckboxTargets.filter(checkbox => checkbox.checked).length
   }
-}
+}

data/app/assets/javascripts/headmin/controllers/remote_modal_controller.js

@@ -2,9 +2,8 @@ import { Controller } from '@hotwired/stimulus'
 import { Modal } from 'bootstrap'
 
 export default class extends Controller {
-
   connect () {
     this.modal = new Modal(this.element)
     this.modal.show()
   }
-}
+}

data/app/assets/javascripts/headmin/controllers/textarea_controller.js

@@ -26,9 +26,9 @@ export default class extends Controller {
   }
 
   updateCountLength () {
-    const current_length = this.textareaTarget.value.length
-    const maximum_length = this.textareaTarget.getAttribute('maxlength')
+    const currentLength = this.textareaTarget.value.length
+    const maximumLength = this.textareaTarget.getAttribute('maxlength')
 
-    this.countTarget.textContent = `${current_length}/${maximum_length}`
+    this.countTarget.textContent = `${currentLength}/${maximumLength}`
   }
 }

data/app/assets/javascripts/headmin.js

@@ -10211,7 +10211,7 @@ var media_controller_default = class extends Controller {
     this.placeholderTarget.classList.add("d-none");
   }
   enableItem(item) {
-    item.querySelector(`input[name*='_destroy']`).value = false;
+    item.querySelector("input[name*='_destroy']").value = false;
     item.classList.remove("d-none");
   }
   createItem(item) {
@@ -10219,9 +10219,9 @@ var media_controller_default = class extends Controller {
     const html = this.randomizeIds(template);
     this.thumbnailsTarget.insertAdjacentHTML("beforeend", html);
     const newItem = this.itemTargets.pop();
-    newItem.querySelector(`input[name*="[blob_id]"]`).value = item.blobId;
-    newItem.querySelector(`input[name*="[_destroy]"]`).value = false;
-    const editButton = newItem.querySelector(`[data-media-target="editButton"]`);
+    newItem.querySelector('input[name*="[blob_id]"]').value = item.blobId;
+    newItem.querySelector('input[name*="[_destroy]"]').value = false;
+    const editButton = newItem.querySelector('[data-media-target="editButton"]');
     editButton.setAttribute("href", editButton.getAttribute("href").replace("$1", item.blobId));
     const oldThumbnail = newItem.querySelector(".h-thumbnail");
     const newThumbnail = item.thumbnail.cloneNode(true);
@@ -10241,7 +10241,7 @@ var media_controller_default = class extends Controller {
     });
   }
   removeItem(item) {
-    item.querySelector(`input[name*='_destroy']`).value = 1;
+    item.querySelector("input[name*='_destroy']").value = 1;
     item.classList.add("d-none");
     this.resetPositions();
     this.syncIds();
@@ -10249,17 +10249,17 @@ var media_controller_default = class extends Controller {
   }
   itemByBlobId(blobId) {
     return this.itemTargets.find((item) => {
-      return item.querySelector(`input[name*='blob_id']`).value === blobId;
+      return item.querySelector("input[name*='blob_id']").value === blobId;
     });
   }
   activeItems() {
     return this.itemTargets.filter((item) => {
-      return item.querySelector(`input[name$='[_destroy]']`).value === "false";
+      return item.querySelector("input[name$='[_destroy]']").value === "false";
     });
   }
   activeIds() {
     return this.activeItems().map((item) => {
-      return item.querySelector(`input[name$='[blob_id]']`).value;
+      return item.querySelector("input[name$='[blob_id]']").value;
     });
   }
 };
@@ -15864,9 +15864,9 @@ var textarea_controller_default = class extends Controller {
     }
   }
   updateCountLength() {
-    const current_length = this.textareaTarget.value.length;
-    const maximum_length = this.textareaTarget.getAttribute("maxlength");
-    this.countTarget.textContent = `${current_length}/${maximum_length}`;
+    const currentLength = this.textareaTarget.value.length;
+    const maximumLength = this.textareaTarget.getAttribute("maxlength");
+    this.countTarget.textContent = `${currentLength}/${maximumLength}`;
   }
 };
 

data/app/assets/stylesheets/headmin/forms/repeater.scss

@@ -18,10 +18,6 @@
       visibility: visible;
     }
   }
-
-  .mb-3:last-of-type {
-    margin-bottom: 0 !important;
-  }
 }
 
 .repeater-row-remove {

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

@@ -5,12 +5,6 @@
   }
 }
 
-.card-body {
-  .mb-3:last-child {
-    margin-bottom: 0 !important;
-  }
-}
-
 @import "forms/autocomplete";
 @import "forms/file";
 @import "forms/media";

data/app/assets/stylesheets/headmin/overrides/redactorx.scss

@@ -40,7 +40,7 @@
   padding: $input-padding-y $input-padding-x !important;
   position: relative;
 
-  p {
+  p, ul li, ol li, td {
     @include font-size($input-font-size);
     line-height: $input-line-height;
     color: $input-color;

data/app/assets/stylesheets/headmin/vendor/{tom-select-bootstrap.css → tom-select-bootstrap.scss}

@@ -516,7 +516,6 @@
 .ts-wrapper.form-select {
   padding: 0;
   height: auto;
-  box-shadow: none;
 }
 .ts-wrapper.form-select .ts-control, .ts-wrapper.form-select.single.input-active .ts-control {
   border: none !important;

data/app/assets/stylesheets/headmin.css

@@ -10180,7 +10180,6 @@ fieldset:disabled .btn {
 .ts-wrapper.form-select {
   padding: 0;
   height: auto;
-  box-shadow: none;
 }
 .ts-wrapper.form-select .ts-control,
 .ts-wrapper.form-select.single.input-active .ts-control {
@@ -12944,7 +12943,10 @@ span.flatpickr-weekday {
   padding: 0.375rem 0.75rem !important;
   position: relative;
 }
-.rx-content p {
+.rx-content p,
+.rx-content ul li,
+.rx-content ol li,
+.rx-content td {
   font-size: 0.9rem;
   line-height: 1.5;
   color: #212529;
@@ -12971,9 +12973,6 @@ span.flatpickr-weekday {
   content: " *";
   color: #dc3545;
 }
-.card-body .mb-3:last-child {
-  margin-bottom: 0 !important;
-}
 .h-autocomplete {
   position: absolute;
   top: calc(100% + 2px);
@@ -13100,9 +13099,6 @@ span.flatpickr-weekday {
 .repeater-row:hover .repeater-row-handle {
   visibility: visible;
 }
-.repeater-row .mb-3:last-of-type {
-  margin-bottom: 0 !important;
-}
 .repeater-row-remove {
   position: absolute;
   top: calc(50% - 17px);

data/app/controllers/concerns/headmin/pagination.rb

@@ -2,7 +2,11 @@ module Headmin
   module Pagination
     def paginate(collection)
       @records_filtered = collection.count
-      collection.page(page).per(per_page)
+      if collection.is_a?(Array)
+        Kaminari.paginate_array(collection).page(page).per(per_page)
+      else
+        collection.page(page).per(per_page)
+      end
     end
 
     def page

data/app/models/concerns/headmin/field.rb

@@ -13,7 +13,7 @@ module Headmin
       accepts_nested_attributes_for :fields, allow_destroy: true
 
       # field_type: :files, :file
-      has_many_attached :files
+      has_many_attached :files, dependent: :detach
       accepts_nested_attributes_for :files_attachments, allow_destroy: true
     end
   end

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

@@ -0,0 +1,86 @@
+module Headmin
+  module Filter
+    class Association < Headmin::Filter::Base
+      OPERATORS = %w[in not_in]
+
+      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 if necessary
+        collection = collection.joins(attribute) if has_many?
+
+        # Build query and execute
+        query = nil
+        @instructions.each do |instruction|
+          query = build_query(query, collection, instruction)
+        end
+        collection.where(query)
+      end
+
+      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 = association_column.send(query_operator, query_value)
+
+        query ? query.send(instruction[:conditional], new_query) : new_query
+      end
+
+      def display_value(value)
+        if value.is_a? Array
+          value.first.to_s
+        else
+          value
+        end
+      end
+
+      def reflection
+        @parent_class.reflect_on_association(attribute)
+      end
+
+      def macro
+        reflection.macro
+      end
+
+      def association_class
+        reflection.klass
+      end
+
+      def foreign_key
+        reflection.foreign_key
+      end
+
+      def association_column
+        if has_many?
+          association_class.arel_table[:id]
+        else
+          @parent_class.arel_table[foreign_key]
+        end
+      end
+
+      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_view.rb

@@ -0,0 +1,74 @@
+module Headmin
+  module Filter
+    class AssociationView < 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 label
+        @label || I18n.t("attributes.#{attribute}", default: association_model.model_name.human(count: collection? ? 2 : 1))
+      end
+
+      def reflection
+        form.object.class.reflect_on_association(attribute)
+      end
+
+      def collection?
+        reflection.collection?
+      end
+
+      def default_base_options
+        {
+          label: label,
+          name: attribute,
+          display_values: collection,
+          filter: Headmin::Filter::Association.new(name, @params),
+          allowed_operators: Headmin::Filter::Association::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-select"
+        }
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Headmin
 
       OPERATORS_CONVERT_TO = {
         convert_to_range: %w[between not_between],
-        convert_to_array: %w[in not_in],
+        convert_to_array: %w[in not_in in_all in_any],
         convert_to_value: %w[eq not_eq gt gteq lt lteq matches does_not_match is_null is_not_null starts_with ends_with]
       }
 
@@ -21,12 +21,13 @@ module Headmin
       }
 
       # Methods
-      def initialize(attribute, params)
-        @raw_value = params[attribute]
-        @attribute = attribute
+      def initialize(attribute, params, association: nil)
+        @attribute = association ? "#{association}_#{attribute}".to_sym : attribute
+        @raw_value = params[@attribute]
+        @association = association
         @instructions = []
 
-        if params.key?(attribute)
+        if params.key?(@attribute)
           parse(@raw_value)
         end
       end
@@ -61,7 +62,8 @@ module Headmin
           query = build_query(query, collection, instruction)
         end
 
-        collection.where(query)
+        collection = collection.joins(@association) if @association
+        collection.distinct.where(query)
       end
 
       def cast_value(value)
@@ -74,6 +76,30 @@ module Headmin
         value
       end
 
+      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)
+
+        model = collection.is_a?(Class) ? collection : collection.model
+
+        if @association
+          # Association attributes are passed through as {association}_{attribute}, so we need to transform this into {attribute}
+          new_attribute = attribute.to_s.gsub("#{@association}_", "").to_sym
+          new_model = model.reflect_on_association(@association)
+
+          # In case the association cannot be found, raise a well defined error
+          raise UnknownAssociation if new_model.nil?
+
+          new_query = new_model.klass.arel_table[new_attribute].send(query_operator, query_value)
+        else
+          new_query = model.arel_table[attribute].send(query_operator, query_value)
+        end
+
+        query ? query.send(instruction[:conditional], new_query) : new_query
+      end
+
       private
 
       def parse(string)
@@ -139,18 +165,6 @@ module Headmin
         process_value(string, operator)
       end
 
-      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)
-
-        model = collection.is_a?(Class) ? collection : collection.model
-        new_query = model.arel_table[attribute].send(query_operator, query_value)
-
-        query ? query.send(instruction[:conditional], new_query) : new_query
-      end
-
       def process_null_operators(operator, value)
         # In case of null operators (is_null and is_not_null), we have to intercept the operator and value values
         # and transform them to the correct operator (eq or not_eq) and value (nil)
@@ -215,7 +229,10 @@ module Headmin
       def build_instruction_string(instruction, display_values)
         conditional = instruction[:conditional].present? ? "#{I18n.t("headmin.filters.conditionals.#{instruction[:conditional]}")} " : nil
         operator = I18n.t("headmin.filters.operators.#{instruction[:operator]}")
-        value = display_values[:display_values].find { |item| item.second == instruction[:value] }
+
+        display_value = instruction[:value].is_a?(Array) ? instruction[:value].first.to_s : instruction[:value]
+
+        value = display_values[:display_values].find { |item| item.second.to_s == display_value }
         value = value.present? ? value.first : instruction[:value]
 
         value = if instruction[:operator] == "is_null" || instruction[:operator] == "is_not_null"
@@ -234,5 +251,8 @@ module Headmin
 
     class NotImplementedMethodError < StandardError
     end
+
+    class UnknownAssociation < StandardError
+    end
   end
 end

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

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class BooleanView < ViewModel
+    class BooleanView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -28,10 +28,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,
@@ -47,6 +43,7 @@ module Headmin
           label: false,
           wrapper: false,
           id: id,
+          name: nil,
           collection: [[I18n.t("headmin.filters.values.true"), 1], [I18n.t("headmin.filters.values.false"), 0]],
           selected: value ? 1 : 0,
           data: {

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

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class DateView < ViewModel
+    class DateView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -23,10 +23,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,
@@ -41,6 +37,7 @@ module Headmin
           label: false,
           wrapper: false,
           id: id,
+          name: nil,
           data: {action: "change->filter#updateHiddenValue",
                  filter_target: "value",
                  filter_row_target: "original"},