avo 3.0.0.pre11 → 3.0.0.pre13

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
-        value.send(target_resource.class.title)
+        target_resource.hydrate(record: value).record_title
       rescue
         nil
       end

data/lib/avo/resources/controls/actions_list.rb

@@ -2,13 +2,14 @@ module Avo
   module Resources
     module Controls
       class ActionsList < BaseControl
-        attr_reader :color, :exclude, :style
+        attr_reader :color, :exclude, :include, :style
 
         def initialize(**args)
           super(**args)
 
           @color = args[:color] || :primary
           @exclude = args[:exclude] || []
+          @include = args[:include] || []
           @style = args[:style] || :outline
         end
       end

data/lib/avo/services/debug_service.rb

@@ -55,7 +55,7 @@ class Avo::Services::DebugService
         fields_per_resource: fields_per_resource,
         custom_fields_count: custom_fields_count,
         field_types: field_types,
-        **other_metadata(:actions),
+        # **other_metadata(:actions), #FIEXME: this is fetching actions without hydration
         **other_metadata(:filters),
         main_menu_present: Avo.configuration.main_menu.present?,
         profile_menu_present: Avo.configuration.profile_menu.present?,

data/lib/avo/version.rb

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

data/lib/generators/avo/eject_generator.rb

@@ -17,6 +17,7 @@ module Generators
         pre_head: "app/views/avo/partials/_pre_head.html.erb",
         scripts: "app/views/avo/partials/_scripts.html.erb",
         sidebar_extra: "app/views/avo/partials/_sidebar_extra.html.erb",
+        profile_menu_extra: "app/views/avo/partials/_profile_menu_extra.html.erb",
       }
 
       def handle

data/lib/generators/avo/install_generator.rb

@@ -13,7 +13,6 @@ module Generators
         route "mount Avo::Engine, at: Avo.configuration.root_path"
 
         template "initializer/avo.tt", "config/initializers/avo.rb"
-        directory File.join(__dir__, "templates", "locales"), "config/locales"
         create_resources
       end
 

data/lib/generators/avo/resource_generator.rb

@@ -135,6 +135,9 @@ module Generators
         fields_string = ""
 
         fields.each do |field_name, field_options|
+          # if field_options are not available (likely a missing resource for an association), skip the field
+          fields_string += "\n  # Could not generate a field for #{field_name}" and next unless field_options
+
           options = ""
           field_options[:options].each { |k, v| options += ", #{k}: #{v}" } if field_options[:options].present?
 
@@ -181,7 +184,7 @@ module Generators
       end
 
       def field_from_through_association(association)
-        if association.through_reflection.is_a? ActiveRecord::Reflection::HasManyReflection
+        if association.through_reflection.is_a?(ActiveRecord::Reflection::HasManyReflection) || association.through_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
           {
             field: "has_many",
             options: {

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

@@ -51,7 +51,7 @@ Avo.configure do |config|
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false
   ## provide a lambda to enable or disable cache_resource_filters per user/resource.
-  # config.cache_resource_filters = ->(current_user:, resource:) { current_user.cache_resource_filters?}
+  # config.cache_resource_filters = -> { current_user.cache_resource_filters? }
 
   ## == Customization ==
   # config.app_name = 'Avocadelicious'

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

@@ -1,9 +1,8 @@
 class Avo::Resources::<%= resource_class %> < Avo::BaseResource
-  self.title = :id
   self.includes = []<%= model_class_from_args %>
-  # self.search_query = -> do
-  #   query.ransack(id_eq: params[:q], m: "or").result(distinct: false)
-  # end
+  # self.search = {
+  #   query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
+  # }
 
   def fields
     field :id, as: :id<%= generate_fields %>

data/lib/tasks/avo_tasks.rake

@@ -63,3 +63,30 @@ task "avo:gem_paths" do
   # avo:/Users/adrian/work/avocado/avo-3,avo_filters:/Users/adrian/work/avocado/advanced/avo_filters
   puts result
 end
+
+desc "Symlink registered gems in `./tmp/gems` so their views, etc. can be inspected by Tailwind CSS."
+task "avo:link" do
+  Avo::App.boot
+  abort Avo.plugin_manager.plugins.inspect
+  if Dir.exist?("tmp/gems")
+    puts "Removing previously linked gems."
+    `rm -f tmp/gems/*`
+  else
+    if File.exist?("tmp/gems")
+      raise "A file named `tmp/gems` already exists? It has to be removed before we can create the required directory."
+    end
+
+    puts "Creating 'tmp/gems' directory."
+    `mkdir tmp/gems`
+  end
+
+  `touch tmp/gems/.keep`
+
+  Avo.plugin_manager.plugins.each do |linked_gem|
+    target = `bundle show #{linked_gem}`.chomp
+    if target.present?
+      puts "Linking '#{linked_gem}' to '#{target}'."
+      `ln -s #{target} tmp/gems/#{linked_gem}`
+    end
+  end
+end