avo 1.18.0.pre.2 → 1.18.2.pre.0

data/app/controllers/avo/application_controller.rb

@@ -2,6 +2,8 @@ module Avo
   class ApplicationController < ::ActionController::Base
     include Pundit
     include Pagy::Backend
+    include Avo::ApplicationHelper
+
     protect_from_forgery with: :exception
     before_action :init_app
     before_action :check_avo_license
@@ -71,6 +73,8 @@ module Avo
     def resources_path(model, keep_query_params: false, **args)
       return if model.nil?
 
+      model_class = get_model_class model
+
       existing_params = {}
 
       begin
@@ -78,7 +82,7 @@ module Avo
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
       rescue; end
-      avo.send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
+      avo.send :"resources_#{model_class.base_class.model_name.route_key}_path", **existing_params, **args
     end
 
     def related_resources_path(parent_model, model, keep_query_params: false, **args)
@@ -283,23 +287,5 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
-
-    def get_model_class(model)
-      if model.instance_of?(Class)
-        model
-      else
-        model.class
-      end
-    end
-
-    def singular_name(model_or_class)
-      model_class = get_model_class model_or_class
-
-      if ActiveModel::Naming.uncountable? model_class
-        model_class.model_name.route_key.singularize.gsub('_index', '')
-      else
-        model_class.model_name.route_key.singularize
-      end
-    end
   end
 end

data/app/controllers/avo/attachments_controller.rb

@@ -21,7 +21,8 @@ module Avo
     end
 
     def destroy
-      attachment = ActiveStorage::Attachment.find(params[:signed_attachment_id])
+      blob = ActiveStorage::Blob.find(params[:signed_attachment_id])
+      attachment = blob.attachments.find_by record_id: params[:id], record_type: @model.class.to_s
 
       if attachment.present?
         attachment.destroy

data/app/helpers/avo/application_helper.rb

@@ -154,5 +154,23 @@ module Avo
 
       classes
     end
+
+    def get_model_class(model)
+      if model.instance_of?(Class)
+        model
+      else
+        model.class.base_class
+      end
+    end
+
+    def singular_name(model_or_class)
+      model_class = get_model_class model_or_class
+
+      if ActiveModel::Naming.uncountable? model_class
+        model_class.base_class.model_name.route_key.singularize.gsub('_index', '')
+      else
+        model_class.base_class.model_name.route_key.singularize
+      end
+    end
   end
 end

data/db/factories.rb

@@ -44,4 +44,13 @@ FactoryBot.define do
   factory :comment do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
   end
+
+  factory :person do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+  end
+
+  factory :spouse do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+    type { "Spouse" }
+  end
 end

data/lib/avo/base_resource.rb

@@ -74,7 +74,7 @@ module Avo
     end
 
     def initialize
-      self.class.model_class = model_class
+      self.class.model_class = model_class.base_class
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -198,10 +198,13 @@ module Avo
     end
 
     def model_class
+      # get the model class off of the static property
       return self.class.model_class if self.class.model_class.present?
 
-      return @model.class if @model.present?
+      # get the model class off of the model
+      return @model.base_class if @model.present?
 
+      # generate a model class
       class_name_without_resource.safe_constantize
     end
 
@@ -410,5 +413,9 @@ module Avo
     rescue
       nil
     end
+
+    def form_scope
+      model.class.base_class.to_s.downcase
+    end
   end
 end

data/lib/avo/engine.rb

@@ -3,6 +3,11 @@ Gem.loaded_specs["avo"].dependencies.each do |d|
   require d.name
 end
 
+# In development we should load the engine so we get the autoload for components
+if ENV["RAILS_ENV"] === "development"
+  require "view_component/engine"
+end
+
 module Avo
   class Engine < ::Rails::Engine
     isolate_namespace Avo

data/lib/avo/fields/files_field.rb

@@ -25,8 +25,6 @@ module Avo
         value.each do |file|
           # Skip empty values
           next unless file.present?
-          # Keep only String values
-          next unless file.class === String
 
           model.send(key).attach file
         end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.18.0.pre.2"
+  VERSION = "1.18.2.pre.0"
 end