avo 1.24.2 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4990a8b947c8086e635f9a4efedf7b58692ffbeebcd7bbc5ee002f8526a0e1fc
-  data.tar.gz: 80f48c2eaf8dbe17271afbb64dfb07e3c7b2710371dd049d293981ed0ddf2cb3
+  metadata.gz: 371a5db5091d8aad3fd0109c8640a06b10ee5cb61d9b16c5a98d25e566b54787
+  data.tar.gz: 8c15d927349aed0e15ccda76f656883e51ca8c3d33ba703c2646ff7a59695a1a
 SHA512:
-  metadata.gz: 53cdb462a0b8dbb76060ab440760115b309c05d16dbbde23108811b1b369eeb4a59763d908ff4f5466fe15596f35427817443c146994d9c4466cb2955cdbb6e0
-  data.tar.gz: 83afde6824181a8354d20fb8d9197734abc3d162200625731a47f2adf17501f43f1d08abf897f3e60fbe01960893d2ad71ef2ba4fee540b2c4f943859199eb2a
+  metadata.gz: ab631914363eb8bd77a5f1053d9c568d6e36f2cdd8c05a84845e4726e3d069394afc1be9778dcc3ad051a91839cb1ef050b12711e165cf8140014cb844096c8c
+  data.tar.gz: 8cbbe3db1bd3e0b77b548706eb696f0ee0bb455cdb2d5ccab6047e4747a0eeae9eff167456bd214ab392825b6c356d061be07c15c7732ef213bc4fa64753c3df

data/Gemfile

@@ -39,7 +39,7 @@ gem "puma", "~> 5.6.2"
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use Active Storage variant
-gem "image_processing", "~> 1.2"
+gem "image_processing", "~> 1.12"
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.24.2)
+    avo (1.25.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -187,7 +187,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
-    image_processing (1.12.1)
+    image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-wait (0.2.1)
@@ -370,7 +370,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    view_component (2.48.0)
+    view_component (2.49.1)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -425,7 +425,7 @@ DEPENDENCIES
   hotwire-rails
   htmlbeautifier
   httparty
-  image_processing (~> 1.2)
+  image_processing (~> 1.12)
   iso
   jsbundling-rails
   launchy

data/app/components/avo/fields/belongs_to_field/autocomplete_component.html.erb

@@ -6,7 +6,7 @@
     data-via-association="belongs_to"
   ></div>
   <div class="relative w-full" autocomplete="off">
-    <%= @form.text_field @field.foreign_key,
+    <%= @form.text_field @foreign_key,
       value: field_label,
       class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
       placeholder: @field.placeholder,

data/app/components/avo/fields/belongs_to_field/autocomplete_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
-  def initialize(form:, field:, model_key:, foreign_key:, disabled:, type: nil, resource: nil, polymorphic_record: nil)
+  def initialize(form:, field:, model_key:, foreign_key:, disabled: false, type: nil, resource: nil, polymorphic_record: nil)
     @form = form
     @field = field
     @type = type
@@ -37,7 +37,15 @@ class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
   private
 
   def should_prefill?
-    @field.is_polymorphic? && searchable? && !(new_record? && has_polymorphic_association?)
+    # default this conditional to true
+    is_polymorphic = true
+
+    # if this is a field that can be polymorphic (belongs_to)
+    if @field.respond_to? :is_polymorphic?
+      is_polymorphic = @field.is_polymorphic?
+    end
+
+    is_polymorphic && searchable? && !(new_record? && has_polymorphic_association?)
   end
 
   def searchable?

data/app/controllers/avo/relations_controller.rb

@@ -34,10 +34,20 @@ module Avo
     end
 
     def new
-      query = @authorization.apply_policy @attachment_class
+      @resource.hydrate(model: @model)
 
-      @options = query.all.map do |model|
-        [model.send(@attachment_resource.class.title), model.id]
+      begin
+        @field = @resource.get_field_definitions.find { |f| f.id == @related_resource_name.to_sym }
+        @field.hydrate(resource: @resource, model: @model, view: :new)
+      rescue
+      end
+
+      if @field.present? && !@field.searchable
+        query = @authorization.apply_policy @attachment_class
+
+        @options = query.all.map do |model|
+          [model.send(@attachment_resource.class.title), model.id]
+        end
       end
     end
 
@@ -50,7 +60,7 @@ module Avo
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @attachment_class) }
+          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
           format.json { render :show, status: :created, location: resource_path(model: @model, resource: @resource) }
         else
           format.html { render :new }

data/app/views/avo/relations/new.html.erb

@@ -6,22 +6,25 @@
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.heading do %>
-        <%= t 'avo.choose_item', item: params[:related_name].downcase %>
+        <%= t 'avo.choose_item', item: @related_resource.name.downcase %>
       <% end %>
-
       <div class="flex-1 flex items-center justify-center px-8 text-lg mt-8 mb-12">
-        <div class="flex-1 flex flex-col items-center justify-center px-24 text-base">
-          <%= form.select :related_id, options_for_select(@options, nil),
-            {
-              include_blank: t('avo.choose_an_option'),
-            },
-            {
-              class: input_classes('w-full'),
-            }
+        <% if @field.searchable %>
+          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: form,
+            field: @field,
+            model_key: @field.target_resource&.model_key,
+            foreign_key: 'related_id',
+            resource: @resource
           %>
-        </div>
+        <% else %>
+          <div class="flex-1 flex flex-col items-center justify-center px-24 text-base">
+            <%= form.select :related_id, options_for_select(@options, nil),
+              { include_blank: t('avo.choose_an_option') },
+              { class: input_classes('w-full') }
+            %>
+          </div>
+        <% end %>
       </div>
-
       <% c.controls do %>
         <%= a_button t('avo.cancel'), 'data-action': 'click->modal#close', size: :sm %>
         <%= a_button t('avo.attach'), type: :submit, color: :green, size: :sm %>

data/lib/avo/base_resource.rb

@@ -143,16 +143,16 @@ module Avo
             # we're matching the reflection inverse_of foriegn key with the field's foreign_key
             if field.is_a?(Avo::Fields::BelongsToField)
               if field.respond_to?(:foreign_key) &&
-                reflection.inverse_of.present? &&
-                reflection.inverse_of.foreign_key == field.foreign_key
+                  reflection.inverse_of.present? &&
+                  reflection.inverse_of.foreign_key == field.foreign_key
                 is_valid = false
               end
 
               # polymorphic association
               if field.respond_to?(:foreign_key) &&
-                field.is_polymorphic? &&
-                reflection.respond_to?(:polymorphic?) &&
-                reflection.inverse_of.foreign_key == field.reflection.foreign_key
+                  field.is_polymorphic? &&
+                  reflection.respond_to?(:polymorphic?) &&
+                  reflection.inverse_of.foreign_key == field.reflection.foreign_key
                 is_valid = false
               end
             end

data/lib/avo/fields/base_field.rb

@@ -7,7 +7,7 @@ module Avo
       include ActionView::Helpers::UrlHelper
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
-      delegate :view_context, to: 'Avo::App'
+      delegate :view_context, to: "Avo::App"
       delegate :main_app, to: :view_context
       delegate :avo, to: :view_context
 

data/lib/avo/fields/belongs_to_field.rb

@@ -74,7 +74,7 @@ module Avo
       end
 
       def searchable
-        @searchable && ::Avo::App.license.has_with_trial(:searchable_belongs_to)
+        @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
       end
 
       def value

data/lib/avo/fields/has_base_field.rb

@@ -7,8 +7,13 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @display = args[:display].present? ? args[:display] : :show
         @scope = args[:scope].present? ? args[:scope] : nil
+        @display = args[:display].present? ? args[:display] : :show
+        @searchable = args[:searchable] == true
+      end
+
+      def searchable
+        @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
       end
 
       def resource
@@ -23,6 +28,20 @@ module Avo
         "#{@resource.record_path}/#{id}?turbo_frame=#{turbo_frame}"
       end
 
+      # The value
+      def field_value
+        value.send(database_value)
+      rescue
+        nil
+      end
+
+      # What the user sees in the text field
+      def field_label
+        value.send(target_resource.class.title)
+      rescue
+        nil
+      end
+
       def target_resource
         if @model._reflections[id.to_s].klass.present?
           Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
@@ -32,6 +51,10 @@ module Avo
           Avo::App.get_resource_by_name id.to_s
         end
       end
+
+      def placeholder
+        @placeholder || I18n.t("avo.choose_an_option")
+      end
     end
   end
 end

data/lib/avo/licensing/pro_license.rb

@@ -8,8 +8,8 @@ module Avo
           :custom_fields,
           :global_search,
           :enhanced_search_results,
-          :searchable_belongs_to,
-          :resource_ordering,
+          :searchable_associations,
+          :resource_ordering
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.24.2"
+  VERSION = "1.25.0"
 end

data/public/avo-assets/avo.js

@@ -17916,7 +17916,7 @@
         function isInteger(value) {
           return /^[0-9]+$/.test(value);
         }
-        URI3.version = "1.19.7";
+        URI3.version = "1.19.10";
         var p2 = URI3.prototype;
         var hasOwn = Object.prototype.hasOwnProperty;
         function escapeRegEx(string) {
@@ -18026,6 +18026,7 @@
           trim: /[`!()\[\]{};:'".,<>?«»“”„‘’]+$/,
           parens: /(\([^\)]*\)|\[[^\]]*\]|\{[^}]*\}|<[^>]*>)/g
         };
+        URI3.leading_whitespace_expression = /^[\x00-\x20\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+/;
         URI3.defaultPorts = {
           http: "80",
           https: "443",
@@ -18223,6 +18224,7 @@
               preventInvalidHostname: URI3.preventInvalidHostname
             };
           }
+          string = string.replace(URI3.leading_whitespace_expression, "");
           pos = string.indexOf("#");
           if (pos > -1) {
             parts.fragment = string.substring(pos + 1) || null;
@@ -18233,7 +18235,7 @@
             parts.query = string.substring(pos + 1) || null;
             string = string.substring(0, pos);
           }
-          string = string.replace(/^(https?|ftp|wss?)?:[/\\]*/, "$1://");
+          string = string.replace(/^(https?|ftp|wss?)?:+[/\\]*/i, "$1://");
           if (string.substring(0, 2) === "//") {
             parts.protocol = null;
             string = string.substring(2);
@@ -88687,7 +88689,7 @@
 /*!
  * URI.js - Mutating URLs
  *
- * Version: 1.19.7
+ * Version: 1.19.10
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/
@@ -88700,7 +88702,7 @@
  * URI.js - Mutating URLs
  * IPv6 Support
  *
- * Version: 1.19.7
+ * Version: 1.19.10
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/
@@ -88713,7 +88715,7 @@
  * URI.js - Mutating URLs
  * Second Level Domain (SLD) Support
  *
- * Version: 1.19.7
+ * Version: 1.19.10
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/