avo 1.18.0.pre.3 → 1.18.2

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/app/views/avo/partials/_profile_dropdown.html.erb

@@ -1,4 +1,6 @@
-<div <% if main_app.respond_to?(:destroy_user_session_path) %> data-controller="toggle-panel" <% end %>>
+<% destroy_user_session_path = "destroy_#{Avo.configuration.current_user_resource_name}_session_path".to_sym %>
+
+<div <% if main_app.respond_to?(destroy_user_session_path) %> data-controller="toggle-panel" <% end %>>
   <a href="javascript:void(0);" class="flex items-center cursor-pointer font-semibold text-gray-700" data-action="click->toggle-panel#togglePanel">
     <% if _current_user.respond_to?(:avatar) &&  _current_user.avatar.present? %>
       <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" %>
@@ -10,14 +12,14 @@
     <% else %>
       Avo user
     <% end %>
-    <% if main_app.respond_to?(:destroy_user_session_path) %>
+    <% if main_app.respond_to?(destroy_user_session_path) %>
       <%= svg 'chevron-down', class: "ml-1 h-4" %>
     <% end %>
   </a>
 
-  <% if main_app.respond_to?(:destroy_user_session_path) %>
-    <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-      <%= button_to t('avo.sign_out'), main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+  <% if main_app.respond_to?(destroy_user_session_path) %>
+    <div class="hidden absolute inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
+      <%= button_to t('avo.sign_out'), main_app.send(:destroy_user_session_path), method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
     </div>
   <% end %>
 </div>

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/app.rb

@@ -32,7 +32,11 @@ module Avo
 
         # Set the current host for ActiveStorage
         begin
-          ActiveStorage::Current.url_options = request.base_url
+          if Rails::VERSION::MAJOR === 6
+            ActiveStorage::Current.host = request.base_url
+          elsif Rails::VERSION::MAJOR === 7
+            ActiveStorage::Current.url_options = request.base_url
+          end
         rescue => exception
           Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
         end
@@ -121,8 +125,8 @@ module Avo
 
       def get_available_resources(user = nil)
         resources.select do |resource|
-            Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
-          end
+          Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+        end
           .sort_by { |r| r.name }
       end
 
@@ -145,7 +149,7 @@ module Avo
             # remove the leading underscore (_)
             filename[0] = ""
             # remove the extension
-            filename.gsub!('.html.erb', '')
+            filename.gsub!(".html.erb", "")
             filename
           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/configuration.rb

@@ -25,6 +25,7 @@ module Avo
     attr_accessor :search_debounce
     attr_accessor :view_component_path
     attr_accessor :display_license_request_timeout_error
+    attr_accessor :current_user_resource_name
 
     def initialize
       @root_path = "/avo"
@@ -62,6 +63,7 @@ module Avo
       @search_debounce = 300
       @view_component_path = "app/components"
       @display_license_request_timeout_error = true
+      @current_user_resource_name = "user"
     end
 
     def locale_tag

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/fields/text_field.rb

@@ -2,11 +2,13 @@ module Avo
   module Fields
     class TextField < BaseField
       attr_reader :link_to_resource
+      attr_reader :as_html
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @as_html = args[:as_html].present? ? args[:as_html] : false
       end
     end
   end

data/lib/avo/version.rb

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