avo 3.0.1.beta21 → 3.0.1.beta23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6120157ec07b6653e2988d4ffbd3e766f8543fe553763be4b5972dc2d08939
-  data.tar.gz: edb140cff7638c9ff759dfc3b6275e7e8888cce467406c53493b2ca8aeb0e062
+  metadata.gz: 752167e356e45bd34eb4a0526e250506bc807f5bb9a59dad82959f28864e24a1
+  data.tar.gz: e60fe61fe32893ba186186b5cf7d039be49247ff10aa7106660633968b18b23b
 SHA512:
-  metadata.gz: 35c458ae56fd6ebd17c03e7f4a4fd077a5d13082c66509d9fc0c6d5275511731a918c0a8b5700d7e4112b5cc3c185cb62e8ce8c343da5585e652be39d9d68149
-  data.tar.gz: 8f0b7c84acc843bf4e954d51105634397f90deb47624c7c8dcc517f59185f520d948aa32558ae318142ab87138fec855a5b80b5441512a989adacc37ffcbb4fb
+  metadata.gz: a83d1e966d0369f72cbaff8359747f259ed2abc3b1843038f680010bc1234e7e4401d9d88eabd7c8e4420c9e5be1b6aada7f6021e2ffbe1cf3849c0ee4406499
+  data.tar.gz: 2f36355a106ff0cad99a2fe1c57682ac01daee1990c5801230ecfe173fc886afa34ad822d5f7b01688e5c30a23edc7d01424cefca17df2bc37aeba59b8aa6219

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.1.beta21)
+    avo (3.0.1.beta23)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/views/resource_index_component.html.erb

@@ -33,7 +33,7 @@
               <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: turbo_frame } %>
             </div>
           </div>
-          <% if Avo.avo_filters_installed? && resource.has_filters? %>
+          <% if has_dynamic_filters? %>
             <%= render Avo::DynamicFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
           <% end %>
         </div>

data/app/components/avo/views/resource_index_component.rb

@@ -141,7 +141,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def render_dynamic_filters_button
-    return unless Avo.avo_filters_installed?
+    return unless Avo.avo_dynamic_filters_installed?
     return unless resource.has_filters?
     return if Avo::DynamicFilters.configuration.always_expanded
 
@@ -192,7 +192,11 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def header_visible?
-    search_query_present? || filters_present? || has_many_view_types? || (Avo.avo_filters_installed? && resource.has_filters? && Avo::DynamicFilters.configuration.always_expanded)
+    search_query_present? || filters_present? || has_many_view_types? || has_dynamic_filters?
+  end
+
+  def has_dynamic_filters?
+    Avo.avo_dynamic_filters_installed? && resource.has_filters?
   end
 
   def search_query_present?

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

@@ -4,7 +4,7 @@
   Avo.configuration.root_path = '<%= root_path_without_url %>'
   Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
   Avo.configuration.cookies_key = '<%= Avo::COOKIES_KEY %>'
-  <% if Avo.avo_filters_installed? %>
+  <% if Avo.avo_dynamic_filters_installed? %>
   Avo.configuration.avo_filters = {
     param_key: '<%= Avo::DynamicFilters.configuration.param_key %>'
   }

data/lib/avo/configuration.rb

@@ -5,6 +5,7 @@ module Avo
     attr_writer :app_name
     attr_writer :branding
     attr_writer :root_path
+    attr_writer :cache_store
     attr_accessor :timezone
     attr_accessor :per_page
     attr_accessor :per_page_steps
@@ -95,6 +96,7 @@ module Avo
       @resources = nil
       @resource_parent_controller = "Avo::ResourcesController"
       @mount_avo_engines = true
+      @cache_store = computed_cache_store
     end
 
     def current_user_method(&block)
@@ -164,6 +166,33 @@ module Avo
     def resource_default_view=(view)
       @resource_default_view = Avo::ViewInquirer.new(view.to_s)
     end
+
+    def cache_store
+      Avo::ExecutionContext.new(
+        target: @cache_store,
+        production_rejected_cache_stores: %w[ActiveSupport::Cache::MemoryStore ActiveSupport::Cache::NullStore]
+      ).handle
+    end
+
+    # When not in production or test we'll just use the MemoryStore which is good enough.
+    # When running in production we'll use Rails.cache if it's not ActiveSupport::Cache::MemoryStore or ActiveSupport::Cache::NullStore.
+    # If it's one of rejected cache stores, we'll use the FileStore.
+    # We decided against the MemoryStore in production because it will not be shared between multiple processes (when using Puma).
+    def computed_cache_store
+      -> {
+        if Rails.env.production?
+          if Rails.cache.class.to_s.in?(production_rejected_cache_stores)
+            ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
+          else
+            Rails.cache
+          end
+        elsif Rails.env.test?
+          Rails.cache
+        else
+          ActiveSupport::Cache.lookup_store(:memory_store)
+        end
+      }
+    end
   end
 
   def self.configuration

data/lib/avo/current.rb

@@ -26,9 +26,14 @@ class Avo::Current < ActiveSupport::CurrentAttributes
   attribute :plugin_manager
   attribute :locale
 
-  delegate :params, to: :request
+  # Protect from error #<RuntimeError: Missing rack.input> when request is ActionDispatch::Request.empty
+  def params
+    request.params
+  rescue
+    {}
+  end
 
   def request
-    view_context.request || ActionDispatch::Request.empty
+    view_context&.request || ActionDispatch::Request.empty
   end
 end

data/lib/avo/execution_context.rb

@@ -27,8 +27,8 @@ module Avo
       @request ||= Avo::Current.request
       @view_context ||= Avo::Current.view_context
       @locale ||= Avo::Current.locale
-      @main_app ||= @view_context.main_app
-      @avo ||= @view_context.avo
+      @main_app ||= @view_context&.main_app
+      @avo ||= @view_context&.avo
     end
 
     delegate :result, to: :card

data/lib/avo/fields/has_base_field.rb

@@ -50,7 +50,7 @@ module Avo
 
       # What the user sees in the text field
       def field_label
-        target_resource.hydrate(record: value).record_title
+        target_resource.new(record: value, view: view, user: user).record_title
       rescue
         nil
       end

data/lib/avo/fields/has_one_field.rb

@@ -14,7 +14,7 @@ module Avo
       end
 
       def label
-        value.send(target_resource.title)
+        field_label
       end
 
       def frame_url

data/lib/avo/licensing/h_q.rb

@@ -4,8 +4,7 @@ module Avo
       attr_accessor :current_request
       attr_accessor :cache_store
 
-      # ENDPOINT = "https://v3.avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
-      ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
+      ENDPOINT = "https://v3.avohq.io/api/v3/licenses/check".freeze unless const_defined?(:ENDPOINT)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
       CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
 

data/lib/avo/reloader.rb

@@ -45,7 +45,7 @@ class Avo::Reloader
     # watch the lib directory in Avo development
     if reload_lib?
       dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
-      if Avo.avo_filters_installed?
+      if Avo.avo_dynamic_filters_installed?
         dirs[Avo::DynamicFilters::Engine.root.join("lib", "avo", "dynamic_filters").to_s] = ["rb"]
       end
     end

data/lib/avo/services/debug_service.rb

@@ -33,30 +33,30 @@ class Avo::Services::DebugService
     def avo_metadata
       resources = Avo.resource_manager.all
       dashboards = defined?(Avo::Dashboards) ? Avo::Dashboards.dashboard_manager.all : []
-      field_definitions = resources.map(&:get_field_definitions)
-      fields_count = field_definitions.map(&:count).sum
-      fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
+      # field_definitions = resources.map(&:get_field_definitions)
+      # fields_count = field_definitions.map(&:count).sum
+      # fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
 
-      field_types = {}
-      custom_fields_count = 0
-      field_definitions.each do |fields|
-        fields.each do |field|
-          field_types[field.type] ||= 0
-          field_types[field.type] += 1
+      # field_types = {}
+      # custom_fields_count = 0
+      # field_definitions.each do |fields|
+      #   fields.each do |field|
+      #     field_types[field.type] ||= 0
+      #     field_types[field.type] += 1
 
-          custom_fields_count += 1 if field.custom?
-        end
-      end
+      #     custom_fields_count += 1 if field.custom?
+      #   end
+      # end
 
       {
         resources_count: resources.count,
         dashboards_count: dashboards.count,
-        fields_count: fields_count,
-        fields_per_resource: fields_per_resource,
-        custom_fields_count: custom_fields_count,
-        field_types: field_types,
+        # fields_count: fields_count,
+        # fields_per_resource: fields_per_resource,
+        # custom_fields_count: custom_fields_count,
+        # field_types: field_types,
         # **other_metadata(:actions), # TODO: this is fetching actions without hydration
-        **other_metadata(:filters),
+        # **other_metadata(:filters),
         main_menu_present: Avo.configuration.main_menu.present?,
         profile_menu_present: Avo.configuration.profile_menu.present?,
         cache_store: Avo.cache_store&.class&.to_s,

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.1.beta21" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta23" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -51,7 +51,7 @@ module Avo
     def boot
       boot_logger
       boot_fields
-      @cache_store = get_cache_store
+      @cache_store = Avo.configuration.cache_store
       plugin_manager.boot_plugins
       Avo.run_load_hooks(:boot, self)
     end
@@ -98,7 +98,7 @@ module Avo
       license.valid?
     end
 
-    def avo_filters_installed?
+    def avo_dynamic_filters_installed?
       defined?(Avo::DynamicFilters).present?
     end
 
@@ -143,21 +143,6 @@ module Avo
     def boot_fields
       @field_manager = Avo::Fields::FieldManager.build
     end
-
-    def get_cache_store
-      if Rails.env.production?
-        case Rails.cache.class.to_s
-        when "ActiveSupport::Cache::MemCacheStore", "ActiveSupport::Cache::RedisCacheStore", "SolidCache::Store"
-          Rails.cache
-        else
-          ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
-        end
-      elsif Rails.env.test?
-        Rails.cache
-      else
-        ActiveSupport::Cache.lookup_store(:memory_store)
-      end
-    end
   end
 end
 

data/lib/generators/avo/templates/initializer/avo.tt

@@ -51,6 +51,13 @@ Avo.configure do |config|
   # config.per_page_steps = [12, 24, 48, 72]
   # config.via_per_page = 8
   # config.id_links_to_resource = false
+
+  ## == Cache options ==
+  ## Provide a lambda to customize the cache store used by Avo.
+  ## We compute the cache store by default, this is NOT the default, just an example.
+  # config.cache_store = -> {
+  #   ActiveSupport::Cache.lookup_store(:solid_cache_store)
+  # }
   # config.cache_resources_on_index_view = true
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.1.beta21
+  version: 3.0.1.beta23
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord