avo 3.0.0.pre14 → 3.0.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b96922b610c34442f4ef39940c378a6b5acc2638954c7eae30217fcfef32c4
-  data.tar.gz: '092dfa026329552be2be791d9493b4c0ca8db46caf72f7bb494e59aceab32275'
+  metadata.gz: 2b1b68ed3a24e1223b230516bb904a16816ad0f27a3bf2419120a603cd7e26d4
+  data.tar.gz: 07b958d68bff512090a9dbedf6762cfe6cc39ea04e6da075a470ac8deed681d8
 SHA512:
-  metadata.gz: d1a47cfffce993596d1fd2edb977c4207ced53a597e174917848f69d3586a8d337dfcf7b131c4720cef4119ce5ff8d16577304533c4776e3e807b6307606396c
-  data.tar.gz: 94699f2123e35d23c0572d73137c86e025fa493c6f0637d9b7ea04ecbb93daef27ecaac42e818f3cdf01aba2dc2420aed7b18de6bb72cd87d8995afb29026ad1
+  metadata.gz: 5891cb96687009033562eb024652abee10398d7a093ae8475ee5d06001dd4e578ab941980d8a657cae1a9824548a28e46f9cc0a53a74c2671c6ef7b6b98024d5
+  data.tar.gz: 58611c02f92e01e5fb35845c06c3fe4fb3164ed00971af40a6591c5f6cf009ad77df8037d629ca661575f8053dcd9f7a35153f0e3f482e6189609036f20593e1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.0.pre14)
+    avo (3.0.0.pre15)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/index/resource_table_component.rb

@@ -17,7 +17,7 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
 
   def encrypted_query
     # TODO: move this to the resource where we can apply the adapter pattern
-    serialized_query = if query.instance_of?(Ransack::Search)
+    serialized_query = if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
       query.context.object.to_sql
     else
       return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)

data/app/components/avo/resource_component.rb

@@ -113,7 +113,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
-      resource = Avo.resource_manager.get_resource_by_model_class(@reflection.active_record.name).new(params: helpers.params, view: view, user: helpers.current_user)
+      resource = Avo.resource_manager.get_resource_by_model_class(@reflection.active_record.name).new(params: helpers.params, view: view, user: helpers._current_user)
       fields = resource.get_field_definitions
       filtered_fields = fields.filter { |f| f.id == @reflection.name }
     else

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

@@ -34,7 +34,7 @@
         <div class="text-black space-y-4">
           <% Avo.profile_menu.items.each do |item| %>
             <% if item.is_a? Avo::Menu::Link %>
-              <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon %>
+              <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon, method: item.method, params: item.params %>
             <% end %>
           <% end %>
         </div>

data/app/controllers/avo/actions_controller.rb

@@ -20,14 +20,10 @@ module Avo
     end
 
     def handle
-      # puts ["action_params->", action_params].inspect
       resource_ids = action_params[:fields][:avo_resource_ids].split(",")
       @selected_query = action_params[:fields][:avo_selected_query]
 
-      # puts ["action_params[:fields]->", action_params[:fields]].inspect
-
       fields = action_params[:fields].except(:avo_resource_ids, :avo_selected_query)
-      # puts ["fields->", fields.to_h].inspect
 
       args = {
         fields: fields,
@@ -41,8 +37,6 @@ module Avo
         @resource.find_record resource_ids, params: params
       end
 
-      puts ["args->", args].inspect
-
       performed_action = @action.handle_action(**args)
 
       respond performed_action.response

data/app/controllers/avo/base_controller.rb

@@ -67,18 +67,7 @@ module Avo
       end
 
       safe_call :set_and_apply_scopes
-
-      if Avo.avo_filters_installed? && params[Avo::DynamicFilters.configuration.param_key].present?
-        # Apply dynamic filters
-        query_builder = Avo::DynamicFilters::QueryBuilder.new(resource: @resource, params: params, query: @query)
-        @query = @query.ransack(**query_builder.ransack_query)
-      end
-
-      pagy_query = if @query.instance_of?(Ransack::Search)
-        @query.result(distinct: false)
-      else
-        @query
-      end
+      safe_call :apply_dynamic_filters
 
       @pagy, @records = pagy(pagy_query, items: @index_params[:per_page], link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", size: [1, 2, 2, 1], params: extra_pagy_params)
 
@@ -547,5 +536,9 @@ module Avo
     def safe_call(method)
       send(method) if respond_to?(method, true)
     end
+
+    def pagy_query
+      @query
+    end
   end
 end

data/app/controllers/concerns/avo/initializes_avo.rb

@@ -3,7 +3,7 @@ module Avo
     def init_app
       Avo::Current.license = Avo::Licensing::NilLicense.new
       Avo::Current.context = context
-      Avo::Current.current_user = _current_user
+      Avo::Current.user = _current_user
       Avo::Current.view_context = view_context
       Avo.init
       Avo::Current.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license

data/lib/avo/base_action.rb

@@ -24,7 +24,9 @@ module Avo
     delegate :view, to: :class
     # TODO: find a differnet way to delegate this to the uninitialized Current variable
     delegate :context, to: Avo::Current
-    delegate :current_user, to: Avo::Current
+    def curent_user
+      Avo::Current.user
+    end
     delegate :params, to: Avo::Current
     delegate :view_context, to: Avo::Current
     delegate :avo, to: :view_context
@@ -101,15 +103,12 @@ module Avo
       records, fields, current_user, resource = args.values_at(:records, :fields, :current_user, :resource)
       # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
       action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
-      puts ["action_fields->", action_fields].inspect
 
       # For some fields, like belongs_to, the id and database_id differ (user vs user_id).
       # That's why we need to fetch the database_id for when we process the action.
       action_fields_by_database_id = action_fields.map do |id, value|
         [value.database_id.to_sym, value]
       end.to_h
-      puts ["action_fields_by_database_id->", action_fields_by_database_id].inspect
-      abort 1.inspect
 
       if fields.present?
         processed_fields = fields.to_unsafe_h.map do |name, value|

data/lib/avo/base_resource.rb

@@ -12,7 +12,9 @@ module Avo
 
     # Avo::Current methods
     delegate :context, to: Avo::Current
-    delegate :current_user, to: Avo::Current
+    def curent_user
+      Avo::Current.user
+    end
     delegate :params, to: Avo::Current
     delegate :request, to: Avo::Current
     delegate :view_context, to: Avo::Current
@@ -101,7 +103,7 @@ module Avo
       end
 
       def authorization
-        Avo::Services::AuthorizationService.new Avo::Current.current_user, model_class, policy_class: authorization_policy
+        Avo::Services::AuthorizationService.new Avo::Current.user, model_class, policy_class: authorization_policy
       end
 
       def get_record_associations(record)
@@ -404,7 +406,7 @@ module Avo
     end
 
     def authorization(user: nil)
-      current_user = user || Avo::Current.current_user
+      current_user = user || Avo::Current.user
       Avo::Services::AuthorizationService.new(current_user, record || model_class, policy_class: authorization_policy)
     end
 

data/lib/avo/current.rb

@@ -19,7 +19,7 @@ class Avo::Current < ActiveSupport::CurrentAttributes
 
   attribute :app
   attribute :license
-  attribute :context, :current_user, :view_context
+  attribute :context, :user, :view_context
   attribute :error_manager
   attribute :resource_manager
   attribute :tool_manager
@@ -30,4 +30,10 @@ class Avo::Current < ActiveSupport::CurrentAttributes
   def request
     view_context.request || ActionDispatch::Request.empty
   end
+
+  def current_user
+    Rails.logger.warn "DEPRECATION WARNING: Avo::Current.current_user become deprecated and will become obsolete on futhure versions. Please use Avo::Current.user instead."
+
+    user
+  end
 end

data/lib/avo/execution_context.rb

@@ -20,7 +20,7 @@ module Avo
 
       # Set defaults on not initialized accessors
       @context ||= Avo::Current.context
-      @current_user ||= Avo::Current.current_user
+      @current_user ||= Avo::Current.user
       @params ||= Avo::Current.params
       @request ||= Avo::Current.request
       @view_context ||= Avo::Current.view_context

data/lib/avo/filters/base_filter.rb

@@ -15,7 +15,9 @@ module Avo
       delegate :params, to: Avo::Current
       delegate :request, to: Avo::Current
       delegate :view_context, to: Avo::Current
-      delegate :current_user, to: Avo::Current
+      def curent_user
+        Avo::Current.user
+      end
 
       class << self
         def decode_filters(filter_params)

data/lib/avo/html/builder.rb

@@ -22,7 +22,9 @@ class Avo::HTML::Builder
   delegate :app, to: Avo::Current
   delegate :root_path, to: :app
   delegate :params, to: Avo::Current
-  delegate :current_user, to: Avo::Current
+  def curent_user
+    Avo::Current.user
+  end
 
   def initialize(record: nil, resource: nil)
     @wrapper_stack = {}

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre14" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre15" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre14
+  version: 3.0.0.pre15
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord