avo 1.6.4.pre.1 → 1.7.3

data/app/views/avo/partials/_javascript.html.erb

@@ -1,5 +1,5 @@
 <%= javascript_tag nonce: true do %>
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
-  Avo.configuration.root_path = '<%= Avo.configuration.root_path %>'
+  Avo.configuration.root_path = '<%= Avo::App.root_path %>'
 <% end %>

data/app/views/avo/partials/_resource_search.html.erb

@@ -6,5 +6,5 @@
     data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </div>
-  <div class="relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
+  <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
 </div>

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

@@ -1,6 +1,6 @@
 <%= turbo_frame_tag 'attach_modal' do %>
   <%= form_with scope: 'fields',
-    url: "#{Avo.configuration.root_path}/resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    url: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
     data: {
       'turbo-frame': '_top'
     } do |form| %>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -6,7 +6,7 @@
 
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">
-        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: Avo.configuration.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
 
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 

data/db/factories.rb

@@ -40,4 +40,8 @@ FactoryBot.define do
     meta { [{foo: "bar", hey: "hi"}, {bar: "baz"}, {hoho: "hohoho"}].sample }
     progress { Faker::Number.between(from: 0, to: 100) }
   end
+
+  factory :comment do
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
+  end
 end

data/lib/avo/app.rb

@@ -7,6 +7,7 @@ module Avo
     class_attribute :context, default: nil
     class_attribute :license, default: nil
     class_attribute :current_user, default: nil
+    class_attribute :root_path, default: nil
 
     class << self
       def boot
@@ -21,10 +22,11 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:)
+      def init(request:, context:, current_user:, root_path:)
         self.request = request
         self.context = context
         self.current_user = current_user
+        self.root_path = root_path
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
 

data/lib/avo/base_resource.rb

@@ -22,6 +22,7 @@ module Avo
     class_attribute :fields
     class_attribute :grid_loader
     class_attribute :visible_on_sidebar, default: true
+    class_attribute :unscoped_queries_on_index, default: false
 
     class << self
       def grid(&block)
@@ -77,7 +78,7 @@ module Avo
         field.hydrate(resource: self, panel_name: default_panel_name, user: user)
       end
 
-      if Avo::App.license.has_with_trial(:custom_fields)
+      if Avo::App.license.lacks_with_trial(:custom_fields)
         fields = fields.reject do |field|
           field.custom?
         end
@@ -87,20 +88,30 @@ module Avo
     end
 
     def get_fields(panel: nil, reflection: nil)
-      fields = get_field_definitions.select do |field|
-        field.send("show_on_#{@view}")
-      end
+      fields = get_field_definitions
+        .select do |field|
+          field.send("show_on_#{@view}")
+        end
         .select do |field|
-                 field.visible?
-               end
+          field.visible?
+        end
         .select do |field|
-        unless field.respond_to?(:foreign_key) &&
-            reflection.present? &&
-            reflection.respond_to?(:foreign_key) &&
-            reflection.foreign_key == field.foreign_key
+          # Strip out the reflection field in index queries with a parent association.
+          if reflection.present? &&
+              reflection.options.present? &&
+              field.respond_to?(:polymorphic_as) &&
+              field.polymorphic_as.to_s == reflection.options[:as].to_s
+            next
+          end
+          if field.respond_to?(:foreign_key) &&
+              reflection.present? &&
+              reflection.respond_to?(:foreign_key) &&
+              reflection.foreign_key != field.foreign_key
+            next
+          end
+
           true
         end
-      end
 
       if panel.present?
         fields = fields.select do |field|
@@ -216,28 +227,6 @@ module Avo
       self.class.context
     end
 
-    def query_search(via_resource_name:, via_resource_id:, user:, query: "")
-      # model_class = self.model
-
-      db_query = AuthorizationService.apply_policy(user, model_class)
-
-      if via_resource_name.present?
-        related_model = App.get_resource_by_name(via_resource_name).model
-
-        db_query = related_model.find(via_resource_id).public_send(plural_name.downcase)
-      end
-
-      new_query = []
-
-      [search].flatten.each_with_index do |search_by, index|
-        new_query.push "or" if index != 0
-
-        new_query.push "text(#{search_by}) ILIKE '%#{query}%'"
-      end
-
-      db_query.where(new_query.join(" "))
-    end
-
     def attached_file_fields
       get_field_definitions.select do |field|
         [Avo::Fields::FileField, Avo::Fields::FilesField].include? field.class
@@ -250,14 +239,17 @@ module Avo
         .reject do |field|
           field.computed
         end
-        .map { |field| [field.database_id(model).to_s, field] }.to_h
+        .map do |field|
+          [field.database_id(model).to_s, field]
+        end
+        .to_h
 
       params.each do |key, value|
         field = fields_by_database_id[key]
 
         next unless field.present?
 
-        model = field.fill_field model, key, value
+        model = field.fill_field model, key, value, params
       end
 
       model
@@ -295,19 +287,22 @@ module Avo
 
     # We will not overwrite any attributes that come pre-filled in the model.
     def hydrate_model_with_default_values
-      default_values = get_fields.select do |field|
-        !field.computed
-      end
+      default_values = get_fields
+        .select do |field|
+          !field.computed
+        end
         .map do |field|
           id = field.id
           value = field.value
 
-          if field.respond_to? :foreign_key
+          if field.type == "belongs_to"
             id = field.foreign_key.to_sym
 
             reflection = @model._reflections[@params[:via_relation]]
 
-            if reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
+            if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params["via_relation_class"])
+              value = @params["via_relation_class"].safe_constantize.find(@params[:via_resource_id])
+            elsif reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
               value = @params[:via_resource_id]
             end
           end
@@ -316,8 +311,8 @@ module Avo
         end
         .to_h
         .select do |id, value|
-        value.present?
-      end
+          value.present?
+        end
 
       default_values.each do |id, value|
         if @model.send(id).nil?
@@ -327,7 +322,7 @@ module Avo
     end
 
     def avo_path
-      "#{Avo.configuration.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
+      "#{Avo::App.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
     end
 
     def label_field
@@ -355,6 +350,8 @@ module Avo
     def avatar
       return avatar_field.to_image if avatar_field.respond_to? :to_image
 
+      return avatar_field.value.variant(resize_to_limit: [480, 480]) if avatar_field.type == "file"
+
       avatar_field.value
     rescue
       nil

data/lib/avo/configuration.rb

@@ -23,6 +23,7 @@ module Avo
     attr_accessor :initial_breadcrumbs
     attr_accessor :home_path
     attr_accessor :search_debounce
+    attr_accessor :view_component_path
 
     def initialize
       @root_path = "/avo"
@@ -58,6 +59,7 @@ module Avo
       @display_breadcrumbs = true
       @home_path = nil
       @search_debounce = 300
+      @view_component_path = "app/components"
     end
 
     def locale_tag
@@ -91,7 +93,7 @@ module Avo
     end
 
     def namespace
-      root_path.delete "/"
+      computed_root_path.delete "/"
     end
 
     def root_path
@@ -99,6 +101,10 @@ module Avo
 
       @root_path
     end
+
+    def computed_root_path
+      Avo::App.root_path
+    end
   end
 
   def self.configuration

data/lib/avo/fields/base_field.rb

@@ -91,9 +91,11 @@ module Avo
         end
       end
 
-      def value
+      def value(property = nil)
+        property ||= id
+
         # Get model value
-        final_value = @model.send(id) if (model_or_class(@model) == "model") && @model.respond_to?(id)
+        final_value = @model.send(property) if (model_or_class(@model) == "model") && @model.respond_to?(property)
 
         if (@view === :new) || @action.present?
           final_value = if default.present? && default.respond_to?(:call)
@@ -114,7 +116,7 @@ module Avo
         final_value
       end
 
-      def fill_field(model, key, value)
+      def fill_field(model, key, value, params)
         return model unless model.methods.include? key.to_sym
 
         model.send("#{key}=", value)

data/lib/avo/fields/belongs_to_field.rb

@@ -2,7 +2,9 @@ module Avo
   module Fields
     class BelongsToField < BaseField
       attr_reader :searchable
+      attr_reader :polymorphic_as
       attr_reader :relation_method
+      attr_reader :types
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -10,11 +12,17 @@ module Avo
         super(id, **args, &block)
 
         @searchable = args[:searchable] == true
+        @polymorphic_as = args[:polymorphic_as]
+        @types = args[:types]
         @relation_method = name.to_s.parameterize.underscore
       end
 
+      def value
+        super(polymorphic_as)
+      end
+
       def options
-        target_resource.model_class.all.map do |model|
+        ::Avo::Services::AuthorizationService.apply_policy(user, target_resource.model_class).all.map do |model|
           {
             value: model.id,
             label: model.send(target_resource.class.title)
@@ -22,22 +30,32 @@ module Avo
         end
       end
 
+      def values_for_type(type)
+        ::Avo::Services::AuthorizationService.apply_policy(user, type).all.map do |model|
+          [model.send(App.get_resource_by_model_name(type).class.title), model.id]
+        end
+      end
+
       def database_value
         target_resource.id
       end
 
       def foreign_key
+        return polymorphic_as if polymorphic_as.present?
+
         if @model.present?
-          if @model.instance_of?(Class)
-            @model.reflections[@relation_method].foreign_key
-          else
-            @model.class.reflections[@relation_method].foreign_key
-          end
-        elsif @resource.present?
+          get_model_class(@model).reflections[@relation_method].foreign_key
+        elsif @resource.present? && @resource.model_class.reflections[@relation_method].present?
           @resource.model_class.reflections[@relation_method].foreign_key
         end
       end
 
+      def reflection_for_key(key)
+        get_model_class(get_model).reflections[key.to_s]
+      rescue
+        nil
+      end
+
       def relation_model_class
         @resource.model_class
       end
@@ -47,16 +65,82 @@ module Avo
       end
 
       def to_permitted_param
+        if polymorphic_as.present?
+          return ["#{polymorphic_as}_type".to_sym, "#{polymorphic_as}_id".to_sym]
+        end
+
         foreign_key.to_sym
       end
 
+      def fill_field(model, key, value, params)
+        return model unless model.methods.include? key.to_sym
+
+        if polymorphic_as.present?
+          model.send("#{polymorphic_as}_type=", params["#{polymorphic_as}_type"])
+
+          # If the type is blank, reset the id too.
+          if params["#{polymorphic_as}_type"].blank?
+            model.send("#{polymorphic_as}_id=", nil)
+          else
+            model.send("#{polymorphic_as}_id=", params["#{polymorphic_as}_id"])
+          end
+        else
+          model.send("#{key}=", value)
+        end
+
+        model
+      end
+
+      def database_id(model)
+        # If the field is a polymorphic value, return the polymorphic_type as key and pre-fill the _id in fill_field.
+        return "#{polymorphic_as}_type" if polymorphic_as.present?
+
+        foreign_key
+      rescue
+        id
+      end
+
       def target_resource
-        if @model._reflections[id.to_s].klass.present?
-          App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-        elsif @model._reflections[id.to_s].options[:class_name].present?
-          App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
+        if polymorphic_as.present?
+          if value.present?
+            return App.get_resource_by_model_name(value.class)
+          else
+            return nil
+          end
+        end
+
+        reflection_key = polymorphic_as || id
+
+        if @model._reflections[reflection_key.to_s].klass.present?
+          App.get_resource_by_model_name @model._reflections[reflection_key.to_s].klass.to_s
+        elsif @model._reflections[reflection_key.to_s].options[:class_name].present?
+          App.get_resource_by_model_name @model._reflections[reflection_key.to_s].options[:class_name]
+        else
+          App.get_resource_by_name reflection_key.to_s
+        end
+      end
+
+      def get_model
+        return @model if @model.present?
+
+        @resource.model
+      rescue
+        nil
+      end
+
+      def name
+        return polymorphic_as.to_s.humanize if polymorphic_as.present? && view == :index
+
+        super
+      end
+
+      private
+
+      def get_model_class(model)
+        if model.instance_of?(Class)
+          model
         else
-          App.get_resource_by_name id.to_s
+          model.class
         end
       end
     end

data/lib/avo/fields/boolean_group_field.rb

@@ -13,7 +13,7 @@ module Avo
         ["#{id}": []]
       end
 
-      def fill_field(model, key, value)
+      def fill_field(model, key, value, params)
         new_value = {}
 
         # Filter out the empty ("") value boolean group generates