avo 3.29.1 → 3.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86cf659cddf676d34648a053c832654ce670b40a7bb67c191baf337d7d10bba
-  data.tar.gz: b2735bb819605098ccf7140d9f33f2aed09b534d42e84ec568dab42266a0500f
+  metadata.gz: 381ab579d675357bd7e3ec288df2f56d8c80db211b55e3ca9bffeda3a74c82ce
+  data.tar.gz: d485e192ea98b5e5f84a5bc6f906c175dbe5eb755cd4aa7b94a275f24d9c5937
 SHA512:
-  metadata.gz: c32bd3bdc9a375977f08e0c1bcc59a8ceb0022d9f9e6f898a038246405714cbb961d6b24dcc1f40d33f244810f8c9cb27e20eb20f0f519f4ccad2e5145f32cec
-  data.tar.gz: f7e57d7fcf36745e12ed4d957ffbaaa41bd51f79e97d70066f287e0faa757c4ebc5f6b71c035247babff0bb4301a55700a68116d8e9a9c85a946a2e48ef03e49
+  metadata.gz: 8b76ac1bb168ec995a0e88e9cee6b87fa624cce346c0cd07339d895c777181862ce890b375ba679e67436947a055d918f345656e48bf6fd766433c586d1f55e2
+  data.tar.gz: 576a88f74323ac640e183136d9865ff4f5e7ce675373e697f2ceb32036cd43e34c36bf6f39f5bd4911ea7477047620edd52bfd0235a0e188d849d0f4f783a3a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.29.1)
+    avo (3.30.0)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -284,7 +284,7 @@ GEM
       railties (>= 6.1.0)
     faker (3.5.3)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -369,7 +369,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.17.1)
+    json (2.18.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -416,7 +416,7 @@ GEM
       railties (>= 3.0)
     msgpack (1.8.0)
     multipart-post (2.4.1)
-    net-http (0.8.0)
+    net-http (0.9.1)
       uri (>= 0.11.1)
     net-imap (0.5.12)
       date
@@ -428,11 +428,11 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.18.10-aarch64-linux-gnu)
+    nokogiri (1.19.1-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     orm_adapter (0.5.0)
@@ -463,7 +463,7 @@ GEM
     puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

data/app/components/avo/filters_component.html.erb

@@ -1,4 +1,4 @@
-<div data-controller="toggle" data-component-name="<%= self.class.to_s.underscore %>">
+<div data-controller="toggle" data-toggle-exemption-containers-value='[".flatpickr-calendar"]' data-component-name="<%= self.class.to_s.underscore %>">
   <div class="relative w-full flex justify-between">
     <%= a_button class: 'focus:outline-none',
       color: :primary,

data/app/components/avo/items/panel_component.html.erb

@@ -8,7 +8,7 @@
   <% end %>
    <% c.with_body do %>
     <% content_tag :div, class: "divide-y overflow-auto" do %>
-      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form %>
+      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form, reflection: @reflection %>
     <% end %>
   <% end %>
    <% if sidebars.any? { |sidebar| sidebar.visible_items.any? } %>

data/app/components/avo/items/switcher_component.html.erb

@@ -11,7 +11,7 @@
 <% elsif item.is_row? %>
   <%= render Avo::RowComponent.new(divider: item.divider) do |c| %>
     <% c.with_body do %>
-      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form %>
+      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form, reflection: @reflection %>
     <% end %>
   <% end %>
 <% elsif item.is_collaboration? %>

data/app/components/avo/items/switcher_component.rb

@@ -42,7 +42,7 @@ class Avo::Items::SwitcherComponent < Avo::BaseComponent
   def render?
     # Stops rendering if the field should be hidden in reflections
     if item.is_field?
-      return false if in_reflection? && item.hidden_in_reflection?
+      return false if in_reflection? && item.hidden_in_reflection?(@reflection)
     end
 
     true

data/app/components/avo/items/visible_items_component.html.erb

@@ -1,6 +1,7 @@
 <% @item.visible_items.each_with_index do |field, index| %>
   <%= render Avo::Items::SwitcherComponent.new(
     resource: @resource,
+    reflection: @reflection,
     item: field,
     index: index,
     view: @view,

data/app/components/avo/items/visible_items_component.rb

@@ -5,5 +5,6 @@ class Avo::Items::VisibleItemsComponent < Avo::BaseComponent
   prop :item
   prop :view
   prop :form
+  prop :reflection, default: nil
   prop :field_component_extra_args, default: {}.freeze
 end

data/app/controllers/avo/base_controller.rb

@@ -7,7 +7,6 @@ module Avo
 
     before_action :set_resource_name
     before_action :set_resource
-    before_action :set_applied_filters, only: :index
     before_action :set_record, only: [:show, :edit, :destroy, :update, :preview]
     before_action :set_record_to_fill, only: [:new, :edit, :create, :update]
     before_action :detect_fields
@@ -26,6 +25,7 @@ module Avo
       end
       add_breadcrumb @resource.plural_name.humanize
 
+      set_applied_filters
       set_index_params
       set_filters
       set_actions
@@ -92,7 +92,6 @@ module Avo
         add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       end
 
-
       add_breadcrumb @resource.record_title
       add_breadcrumb I18n.t("avo.details").upcase_first
 

data/app/javascript/js/controllers/fields/date_field_controller.js

@@ -138,6 +138,7 @@ export default class extends Controller {
       },
       altInput: true,
       onChange: this.onChange.bind(this),
+      onClose: this.onClose.bind(this),
       noCalendar: false,
       ...this.pickerOptionsValue,
     }
@@ -223,6 +224,17 @@ export default class extends Controller {
     this.updateRealInput(value)
   }
 
+  onClose(selectedDates, dateStr, instance) {
+    if (instance.config.allowInput && instance.altInput.value) {
+      const value = instance.altInput.value
+      if (value) {
+        instance.setDate(value, true, instance.config.altFormat)
+      } else {
+        this.updateRealInput('')
+      }
+    }
+  }
+
   // Value should be a string
   updateRealInput(value) {
     this.inputTarget.value = value

data/app/javascript/js/controllers/fields/easy_mde_controller.js

@@ -28,9 +28,16 @@ export default class extends Controller {
       options.status = false
     }
 
-    const easyMde = new EasyMDE(options)
+    this.easyMde = new EasyMDE(options)
     if (this.view === 'show') {
-      easyMde.codemirror.options.readOnly = true
+      this.easyMde.codemirror.options.readOnly = true
+    }
+  }
+
+  disconnect() {
+    if (this.easyMde) {
+      this.easyMde.toTextArea()
+      this.easyMde = null
     }
   }
 }

data/app/javascript/js/controllers/fields/key_value_controller.js

@@ -151,6 +151,15 @@ export default class extends Controller {
     return result
   }
 
+  escapeAttribute(str) {
+    if (str === null || str === undefined) return ''
+    return String(str)
+      .replace(/&/g, '&')
+      .replace(/"/g, '"')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+  }
+
   inputField(id = 'key', index, key, value) {
     const inputValue = id === 'key' ? key : value
 
@@ -160,7 +169,7 @@ export default class extends Controller {
   placeholder="${this.options[`${id}_label`]}"
   data-index="${index}"
   ${this[`${id}InputDisabled`] ? "disabled='disabled'" : ''}
-  value="${typeof inputValue === 'undefined' || inputValue === null ? '' : inputValue}"
+  value="${this.escapeAttribute(inputValue)}"
 />`
   }
 

data/app/javascript/js/controllers/fields/tags_field_controller.js

@@ -79,6 +79,13 @@ export default class extends Controller {
     }
   }
 
+  disconnect() {
+    if (this.tagify) {
+      this.tagify.destroy()
+      this.tagify = null
+    }
+  }
+
   initTagify() {
     this.tagify = new Tagify(this.inputTarget, this.tagifyOptions)
     const that = this

data/app/javascript/js/controllers/media_library_attach_controller.js

@@ -77,6 +77,13 @@ export default class extends Controller {
     this.setupFileInput()
   }
 
+  disconnect() {
+    if (this.fileInput) {
+      this.fileInput.remove()
+      this.fileInput = null
+    }
+  }
+
   setupFileInput() {
     // Create a hidden file input element
     this.fileInput = document.createElement('input')

data/app/javascript/js/controllers/preview_controller.js

@@ -9,7 +9,7 @@ export default class extends Controller {
   connect() {
     const vm = this;
 
-    tippy(vm.context.element, {
+    this.tippyInstance = tippy(vm.context.element, {
       content: "loading...",
       allowHTML: true,
       theme: 'light',
@@ -21,4 +21,11 @@ export default class extends Controller {
       },
     })
   }
+
+  disconnect() {
+    if (this.tippyInstance) {
+      this.tippyInstance.destroy()
+      this.tippyInstance = null
+    }
+  }
 }

data/app/javascript/js/controllers/record_selector_controller.js

@@ -82,10 +82,14 @@ export default class extends Controller {
   }
 
   #addEventListeners() {
+    // Create bound handler references so the same functions are used for add and remove
+    this.boundMouseenterHandler = this.#selectorMouseenterHandler.bind(this)
+    this.boundMouseleaveHandler = this.#selectorMouseleaveHandler.bind(this)
+
     // Attach event listeners to item selector cells
     Array.from(this.itemSelectorCells).forEach((itemSelectorCell) => {
-      itemSelectorCell.addEventListener('mouseenter', this.#selectorMouseenterHandler.bind(this))
-      itemSelectorCell.addEventListener('mouseleave', this.#selectorMouseleaveHandler.bind(this))
+      itemSelectorCell.addEventListener('mouseenter', this.boundMouseenterHandler)
+      itemSelectorCell.addEventListener('mouseleave', this.boundMouseleaveHandler)
     })
 
     // Attach event listeners to keyboard events
@@ -94,13 +98,13 @@ export default class extends Controller {
   }
 
   #removeEventListeners() {
-    // Remove event listeners
+    // Remove event listeners using the same bound references from #addEventListeners
     Array.from(this.itemSelectorCells).forEach((itemSelectorCell) => {
-      itemSelectorCell.removeEventListener('mouseenter', this.#selectorMouseenterHandler.bind(this))
-      itemSelectorCell.removeEventListener('mouseleave', this.#selectorMouseleaveHandler.bind(this))
+      itemSelectorCell.removeEventListener('mouseenter', this.boundMouseenterHandler)
+      itemSelectorCell.removeEventListener('mouseleave', this.boundMouseleaveHandler)
     })
-    document.removeEventListener('keydown', this.#keydownHandler.bind(this))
-    document.removeEventListener('keyup', this.#keyupHandler.bind(this))
+    document.removeEventListener('keydown', this.#keydownHandler)
+    document.removeEventListener('keyup', this.#keyupHandler)
   }
 
   #selectorMouseenterHandler(event) {

data/app/javascript/js/controllers/search_controller.js

@@ -127,6 +127,10 @@ export default class extends Controller {
   }
 
   disconnect() {
+    if (this.isGlobalSearch) {
+      Mousetrap.unbind(['command+k', 'ctrl+k'])
+    }
+
     // Don't leave open autocompletes around when disconnected. Otherwise it will still
     // be visible when navigating back to this page.
     if (this.destroyMethod) {

data/app/javascript/js/controllers/table_row_controller.js

@@ -3,7 +3,15 @@ import { Controller } from '@hotwired/stimulus'
 export default class extends Controller {
   connect() {
     this.isSelecting = false
-    this.#bindSelectionEvents()
+    this.boundHandleMouseDown = this.#handleMouseDown.bind(this)
+    this.boundHandleMouseMove = this.#handleMouseMove.bind(this)
+    this.element.addEventListener('mousedown', this.boundHandleMouseDown)
+    this.element.addEventListener('mousemove', this.boundHandleMouseMove)
+  }
+
+  disconnect() {
+    this.element.removeEventListener('mousedown', this.boundHandleMouseDown)
+    this.element.removeEventListener('mousemove', this.boundHandleMouseMove)
   }
 
   visitRecord(event) {
@@ -42,11 +50,6 @@ export default class extends Controller {
     }
   }
 
-  #bindSelectionEvents() {
-    this.element.addEventListener('mousedown', this.#handleMouseDown.bind(this))
-    this.element.addEventListener('mousemove', this.#handleMouseMove.bind(this))
-  }
-
   #handleMouseDown() {
     this.isSelecting = false
   }

data/app/javascript/js/controllers/tippy_controller.js

@@ -5,10 +5,17 @@ export default class extends Controller {
   static targets = ['source', 'content']
 
   connect() {
-    tippy(this.sourceTarget, {
+    this.tippyInstance = tippy(this.sourceTarget, {
       content: this.contentTarget.innerHTML,
       allowHTML: true,
       theme: 'light',
     })
   }
+
+  disconnect() {
+    if (this.tippyInstance) {
+      this.tippyInstance.destroy()
+      this.tippyInstance = null
+    }
+  }
 }

data/app/javascript/js/controllers/toggle_controller.js

@@ -11,7 +11,7 @@ export default class extends Controller {
   }
 
   get exemptionContainerTargets() {
-    return this.exemptionContainersValue.map((selector) => document.querySelector(selector)).filter(Boolean)
+    return this.exemptionContainersValue.flatMap((selector) => [...document.querySelectorAll(selector)])
   }
 
   connect() {

data/lib/avo/fields/base_field.rb

@@ -272,12 +272,12 @@ module Avo
         true
       end
 
-      def visible_in_reflection?
+      def visible_in_reflection?(reflection = nil)
         true
       end
 
-      def hidden_in_reflection?
-        !visible_in_reflection?
+      def hidden_in_reflection?(reflection = nil)
+        !visible_in_reflection?(reflection)
       end
 
       def options_for_filter

data/lib/avo/fields/belongs_to_field.rb

@@ -308,6 +308,21 @@ module Avo
         "#{id}_type"
       end
 
+      # When displayed inside a has_one/has_many reflection, hide this field if it
+      # points back to the parent record (i.e., it is the inverse of the reflection).
+      # This mirrors the filtering logic in Avo::Concerns::HasItems#get_fields.
+      def visible_in_reflection?(reflection = nil)
+        return true if reflection.nil?
+        return true unless respond_to?(:foreign_key)
+        return true unless reflection.inverse_of.present?
+        return true unless reflection.inverse_of.respond_to?(:foreign_key)
+
+        inverse_fk = reflection.inverse_of.foreign_key
+        self_fk = is_polymorphic? ? self.reflection&.foreign_key : foreign_key
+
+        inverse_fk != self_fk
+      end
+
       private
 
       def get_model_class(record)

data/lib/avo/fields/frame_base_field.rb

@@ -64,7 +64,7 @@ module Avo
         true
       end
 
-      def visible_in_reflection?
+      def visible_in_reflection?(reflection = nil)
         false
       end
 

data/lib/avo/test_helpers.rb

@@ -204,6 +204,12 @@ module Avo
       find(".flatpickr-second").set(value)
     end
 
+    def set_picker_text_input(value)
+      element = find("input.form-control[type='text']")
+      # Set value without firing input/change events
+      page.execute_script("arguments[0].value = arguments[1]", element.native, value)
+    end
+
     def open_picker
       text_input.click
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.29.1" unless const_defined?(:VERSION)
+  VERSION = "3.30.0" unless const_defined?(:VERSION)
 end

data/public/avo-assets/avo.base.css

@@ -1779,7 +1779,7 @@ span.flatpickr-weekday {
   }
 }
 
-/*! @algolia/autocomplete-theme-classic 1.19.5 | MIT License | © Algolia, Inc. and contributors | https://github.com/algolia/autocomplete */
+/*! @algolia/autocomplete-theme-classic 1.19.6 | MIT License | © Algolia, Inc. and contributors | https://github.com/algolia/autocomplete */
 
 /* ----------------*/