avo 2.18.1 → 2.19.0

data/lib/avo/fields/concerns/is_required.rb

@@ -6,7 +6,7 @@ module Avo
 
         def is_required?
           if required.respond_to? :call
-            Avo::Hosts::ViewRecordHost.new(block: required, record: model, view: view).handle
+            Avo::Hosts::ResourceViewRecordHost.new(block: required, record: model, view: view, resource: resource).handle
           else
             required.nil? ? required_from_validators : required
           end
@@ -18,7 +18,7 @@ module Avo
           return false if model.nil?
 
           validators.any? do |validator|
-            validator.kind_of? ActiveModel::Validations::PresenceValidator
+            validator.is_a? ActiveModel::Validations::PresenceValidator
           end
         end
 

data/lib/avo/fields/has_base_field.rb

@@ -7,6 +7,7 @@ module Avo
       attr_accessor :description
       attr_accessor :discreet_pagination
       attr_accessor :hide_search_input
+      attr_reader :link_to_child_resource
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -19,6 +20,7 @@ module Avo
         @description = args[:description]
         @use_resource = args[:use_resource] || nil
         @discreet_pagination = args[:discreet_pagination] || false
+        @link_to_child_resource = args[:link_to_child_resource] || false
       end
 
       def searchable

data/lib/avo/fields/key_value_field.rb

@@ -81,7 +81,7 @@ module Avo
           new_value = {}
         end
 
-        model[key] = new_value
+        model.send("#{key}=", new_value)
 
         model
       end

data/lib/avo/filters/base_filter.rb

@@ -3,11 +3,12 @@ module Avo
     class BaseFilter
       PARAM_KEY = :filters unless const_defined?(:PARAM_KEY)
 
-      class_attribute :name, default: "Filter"
       class_attribute :component, default: "boolean-filter"
       class_attribute :default, default: nil
-      class_attribute :template, default: "avo/base/select_filter"
       class_attribute :empty_message
+      class_attribute :name, default: "Filter"
+      class_attribute :template, default: "avo/base/select_filter"
+      class_attribute :visible
 
       delegate :params, to: Avo::App
 
@@ -52,6 +53,20 @@ module Avo
       def applied_filters
         self.class.decode_filters params[PARAM_KEY]
       end
+
+      def visible_in_view(resource: nil, parent_model: nil, parent_resource: nil)
+        return true if visible.blank?
+
+        # Run the visible block if available
+        Avo::Hosts::VisibilityHost.new(
+          block: visible,
+          params: params,
+          parent_model: parent_model,
+          parent_resource: parent_resource,
+          resource: resource
+        ).handle
+
+      end
     end
   end
 end

data/lib/avo/hosts/resource_view_record_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class ResourceViewRecordHost < ViewRecordHost
+      option :resource
+    end
+  end
+end

data/lib/avo/hosts/visibility_host.rb

@@ -0,0 +1,11 @@
+module Avo
+  module Hosts
+    class VisibilityHost < BaseHost
+      option :parent_model
+      option :parent_resource
+      option :resource
+      # View is optional because in filter context the view is always :index
+      option :view, optional: true
+    end
+  end
+end

data/lib/avo/panel.rb

@@ -1,16 +1,19 @@
 class Avo::Panel
   include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
 
   class_attribute :item_type, default: :panel
 
   attr_reader :name
+  attr_reader :view
   attr_reader :description
   attr_accessor :items_holder
 
   delegate :items, :add_item, to: :items_holder
 
-  def initialize(name: nil, description: nil)
+  def initialize(name: nil, description: nil, view: nil)
     @name = name
+    @view = view
     @description = description
     @items_holder = Avo::ItemsHolder.new
   end

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

@@ -14,9 +14,7 @@ module Avo
         end
 
         def action
-          return @instance if @instance.present?
-
-          @instance = @klass.new(model: @model, resource: @resource, view: @view)
+          @instance ||= @klass.new(model: @model, resource: @resource, view: @view)
         end
 
         def path

data/lib/avo/sidebar.rb

@@ -1,5 +1,6 @@
 class Avo::Sidebar
   include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
   include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
   class_attribute :item_type, default: :sidebar
@@ -23,38 +24,7 @@ class Avo::Sidebar
     except_on args[:except_on] if args[:except_on].present?
   end
 
-  def hydrate(view: nil)
-    @view = view
-
-    self
-  end
-
   def empty?
     visible_items.blank?
   end
-
-  def items
-    if self.items_holder.present?
-      self.items_holder.items
-    else
-      []
-    end
-  end
-
-  def visible_items
-    items.map do |item|
-      # Remove the fields that shouldn't be visible in this view
-      # eg: has_many fields on edit
-      if not_visible_field(item)
-        nil
-      else
-        item
-      end
-    end
-    .compact
-  end
-
-  def not_visible_field(item)
-    item.is_field? && !item.visible_on?(view)
-  end
 end

data/lib/avo/tab.rb

@@ -1,5 +1,6 @@
 class Avo::Tab
   include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
   include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
   class_attribute :item_type, default: :tab
@@ -30,6 +31,10 @@ class Avo::Tab
   def hydrate(view: nil)
     @view = view
 
+    items_holder.items.grep(Avo::Panel).each do |panel|
+      panel.hydrate(view: view)
+    end
+
     self
   end
 
@@ -53,26 +58,4 @@ class Avo::Tab
       super(view)
     end
   end
-
-  def items
-    if self.items_holder.present?
-      self.items_holder.items
-    else
-      []
-    end
-  end
-
-  def visible_items
-    items.map do |item|
-      if item.is_field?
-        visible = item.visible_on?(view)
-        # Remove the fields that shouldn't be visible in this view
-        # eg: has_many fields on edit
-        item = nil unless visible
-      end
-
-      item
-    end
-    .compact
-  end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.18.1" unless const_defined?(:VERSION)
+  VERSION = "2.19.0" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -40,6 +40,15 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
   COOKIES_KEY = "avo"
+  ENTITIES = {
+    cards: ["app", "avo", "cards"],
+    fields: ["app", "avo", "fields"],
+    filters: ["app", "avo", "filters"],
+    actions: ["app", "avo", "actions"],
+    resources: ["app", "avo", "resources"],
+    dashboards: ["app", "avo", "dashboards"],
+    resource_tools: ["app", "avo", "resource_tools"]
+  }
 
   class LicenseVerificationTemperedError < StandardError; end
 

data/lib/generators/avo/resource_generator.rb

@@ -7,6 +7,11 @@ module Generators
 
       namespace "avo:resource"
 
+      class_option "model-class",
+        type: :string,
+        required: false,
+        desc: "The name of the model."
+
       def create
         template "resource/resource.tt", "app/avo/resources/#{resource_name}.rb"
         template "resource/controller.tt", "app/controllers/avo/#{controller_name}.rb"
@@ -33,6 +38,282 @@ module Generators
           model.capitalize.singularize.camelize
         end
       end
+
+      def class_from_args
+        @class_from_args ||= options["model-class"]&.capitalize
+      end
+
+      def model_class_from_args
+        "\n  self.model_class = ::#{class_from_args}" if class_from_args.present?
+      end
+
+      private
+
+      def model_class
+        @model_class ||= class_from_args || singular_name
+      end
+
+      def model
+        @model ||= model_class.classify.safe_constantize
+      end
+
+      def model_db_columns
+        @model_db_columns ||= model.columns_hash.reject { |name, _| db_columns_to_ignore.include? name }
+      end
+
+      def db_columns_to_ignore
+        %w[id encrypted_password reset_password_token reset_password_sent_at remember_created_at created_at updated_at]
+      end
+
+      def reflections
+        @reflections ||= model.reflections.reject do |name, _|
+          reflections_sufixes_to_ignore.include?(name.split("_").pop) || reflections_to_ignore.include?(name)
+        end
+      end
+
+      def reflections_sufixes_to_ignore
+        %w[blob blobs tags]
+      end
+
+      def reflections_to_ignore
+        %w[taggings]
+      end
+
+      def attachments
+        @attachments ||= reflections.select do |_, reflection|
+          reflection.options[:class_name] == "ActiveStorage::Attachment"
+        end
+      end
+
+      def tags
+        @tags ||= reflections.select { |_, reflection| reflection.options[:as] == :taggable }
+      end
+
+      def associations
+        @associations ||= reflections.reject { |key| attachments.key?(key) || tags.key?(key) }
+      end
+
+      def fields
+        @fields ||= {}
+      end
+
+      def invoked_by_model_generator?
+        @options.dig("from_model_generator")
+      end
+
+      def generate_fields
+        return generate_fields_from_args if invoked_by_model_generator?
+
+        if model.blank?
+          puts "Can't generate fields from model. '#{model_class}.rb' not found!"
+          return
+        end
+
+        fields_from_model_db_columns
+        fields_from_model_enums
+        fields_from_model_attachements
+        fields_from_model_associations
+        fields_from_model_tags
+
+        generated_fields_template
+      end
+
+      def generated_fields_template
+        return if fields.blank?
+
+        fields_string = "\n  # Fields generated from the model"
+
+        fields.each do |field_name, field_options|
+          options = ""
+          field_options[:options].each { |k, v| options += ", #{k}: #{v}" } if field_options[:options].present?
+
+          fields_string += "\n  #{field_string field_name, field_options[:field], options}"
+        end
+
+        fields_string
+      end
+
+      def field_string(name, type, options)
+        "field :#{name}, as: :#{type}#{options}"
+      end
+
+      def generate_fields_from_args
+        @args.each do |arg|
+          name, type = arg.split(":")
+          type = "string" if type.blank?
+          fields[name] = field(name, type.to_sym)
+        end
+
+        generated_fields_template
+      end
+
+      def fields_from_model_tags
+        tags.each do |name, _|
+          fields[(remove_last_word_from name).pluralize] = {field: "tags"}
+        end
+      end
+
+      def fields_from_model_associations
+        associations.each do |name, association|
+          fields[name] = associations_mapping[association.class]
+
+          if association.is_a? ActiveRecord::Reflection::ThroughReflection
+            fields[name][:options][:through] = ":#{association.options[:through]}"
+          end
+        end
+      end
+
+      def fields_from_model_attachements
+        attachments.each do |name, attachment|
+          fields[remove_last_word_from name] = attachments_mapping[attachment.class]
+        end
+      end
+
+      # "hello_world_hehe".split('_') => ['hello', 'world', 'hehe']
+      # ['hello', 'world', 'hehe'].pop => ['hello', 'world']
+      # ['hello', 'world'].join('_') => "hello_world"
+      def remove_last_word_from(snake_case_string)
+        snake_case_string = snake_case_string.split("_")
+        snake_case_string.pop
+        snake_case_string.join("_")
+      end
+
+      def fields_from_model_enums
+        model.defined_enums.each_key do |enum|
+          fields[enum] = {
+            field: "select",
+            options: {
+              enum: "::#{model_class.capitalize}.#{enum.pluralize}"
+            }
+          }
+        end
+      end
+
+      def fields_from_model_db_columns
+        model_db_columns.each do |name, data|
+          fields[name] = field(name, data.type)
+        end
+      end
+
+      def field(name, type)
+        names_mapping[name.to_sym] || fields_mapping[type.to_sym] || {field: "text"}
+      end
+
+      def associations_mapping
+        {
+          ActiveRecord::Reflection::BelongsToReflection => {
+            field: "belongs_to"
+          },
+          ActiveRecord::Reflection::HasOneReflection => {
+            field: "has_one"
+          },
+          ActiveRecord::Reflection::HasManyReflection => {
+            field: "has_many"
+          },
+          ActiveRecord::Reflection::ThroughReflection => {
+            field: "has_many",
+            options: {
+              through: ":..."
+            }
+          },
+          ActiveRecord::Reflection::HasAndBelongsToManyReflection => {
+            field: "has_and_belongs_to_many"
+          }
+        }
+      end
+
+      def attachments_mapping
+        {
+          ActiveRecord::Reflection::HasOneReflection => {
+            field: "file"
+          },
+          ActiveRecord::Reflection::HasManyReflection => {
+            field: "files"
+          }
+        }
+      end
+
+      def names_mapping
+        {
+          id: {
+            field: "id"
+          },
+          description: {
+            field: "textarea"
+          },
+          gravatar: {
+            field: "gravatar"
+          },
+          email: {
+            field: "text"
+          },
+          password: {
+            field: "password"
+          },
+          password_confirmation: {
+            field: "password"
+          },
+          stage: {
+            field: "select"
+          },
+          budget: {
+            field: "currency"
+          },
+          money: {
+            field: "currency"
+          },
+          country: {
+            field: "country"
+          }
+        }
+      end
+
+      def fields_mapping
+        {
+          primary_key: {
+            field: "id"
+          },
+          string: {
+            field: "text"
+          },
+          text: {
+            field: "textarea"
+          },
+          integer: {
+            field: "number"
+          },
+          float: {
+            field: "number"
+          },
+          decimal: {
+            field: "number"
+          },
+          datetime: {
+            field: "datetime"
+          },
+          timestamp: {
+            field: "datetime"
+          },
+          time: {
+            field: "datetime"
+          },
+          date: {
+            field: "date"
+          },
+          binary: {
+            field: "number"
+          },
+          boolean: {
+            field: "boolean"
+          },
+          references: {
+            field: "belongs_to"
+          },
+          json: {
+            field: "code"
+          }
+        }
+      end
     end
   end
 end

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

@@ -1,5 +1,8 @@
 class <%= class_name.camelize %> < Avo::BaseAction
   self.name = "<%= name.underscore.humanize %>"
+  # self.visible = -> do
+  #   true
+  # end
 
   def handle(**args)
     models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)

data/lib/generators/avo/templates/filters/boolean_filter.tt

@@ -1,5 +1,8 @@
 class <%= class_name.camelize %> < Avo::Filters::BooleanFilter
   self.name = "<%= name.underscore.humanize %>"
+  # self.visible = -> do
+  #   true
+  # end
 
   def apply(request, query, values)
     query

data/lib/generators/avo/templates/filters/multiple_select_filter.tt

@@ -1,5 +1,8 @@
 class <%= class_name.camelize %> < Avo::Filters::MultipleSelectFilter
   self.name = "<%= name.underscore.humanize %>"
+  # self.visible = -> do
+  #   true
+  # end
 
   def apply(request, query, value)
     query

data/lib/generators/avo/templates/filters/select_filter.tt

@@ -1,5 +1,8 @@
 class <%= class_name.camelize %> < Avo::Filters::SelectFilter
   self.name = "<%= name.underscore.humanize %>"
+  # self.visible = -> do
+  #   true
+  # end
 
   def apply(request, query, value)
     query

data/lib/generators/avo/templates/filters/text_filter.tt

@@ -1,6 +1,9 @@
 class <%= class_name.camelize %> < Avo::Filters::TextFilter
   self.name = "<%= name.underscore.humanize %>"
   self.button_label = 'Filter by <%= class_name.underscore.humanize.downcase.gsub(' filter', '') %>'
+  # self.visible = -> do
+  #   true
+  # end
 
   def apply(request, query, value)
     query

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

@@ -44,6 +44,10 @@ Avo.configure do |config|
   # config.via_per_page = 8
   # config.id_links_to_resource = false
   # config.cache_resources_on_index_view = true
+  ## 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?}
 
   ## == Customization ==
   # config.app_name = 'Avocadelicious'

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

@@ -1,4 +1,4 @@
 # This controller has been generated to enable Rails' resource routes.
-# You shouldn't need to modify it in order to use Avo.
+# More information on https://docs.avohq.io/2.0/controllers.html
 class <%= controller_class %> < Avo::ResourcesController
 end

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

@@ -1,10 +1,10 @@
 class <%= resource_class %> < Avo::BaseResource
   self.title = :id
-  self.includes = []
+  self.includes = []<%= model_class_from_args %>
   # self.search_query = -> do
   #   scope.ransack(id_eq: params[:q], m: "or").result(distinct: false)
   # end
 
-  field :id, as: :id
+  field :id, as: :id<%= generate_fields %>
   # add fields here
 end

data/lib/generators/model_generator.rb

@@ -0,0 +1,10 @@
+require 'rails/generators'
+require 'rails/generators/rails/model/model_generator'
+
+module Rails
+  module Generators
+    class ModelGenerator
+      hook_for :avo_resource, type: :boolean, default: true unless ARGV.include?("--skip-avo-resource")
+    end
+  end
+end

data/lib/generators/rails/avo_resource_generator.rb

@@ -0,0 +1,11 @@
+require 'rails/generators/active_record/model/model_generator'
+
+module Rails
+  module Generators
+    class AvoResourceGenerator < ::Rails::Generators::Base
+      def invoke_avo_command
+        invoke "avo:resource", @args, {from_model_generator: true}
+      end
+    end
+  end
+end

data/public/avo-assets/avo.base.css

@@ -7783,16 +7783,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   line-height:1.5rem
 }
 
-.text-3xl{
-  font-size:1.875rem;
-  line-height:2.25rem
-}
-
-.text-5xl{
-  font-size:3rem;
-  line-height:1
-}
-
 .text-xl{
   font-size:1.25rem;
   line-height:1.75rem
@@ -7803,6 +7793,16 @@ trix-toolbar .trix-button-group:not(:first-child){
   line-height:1rem
 }
 
+.text-3xl{
+  font-size:1.875rem;
+  line-height:2.25rem
+}
+
+.text-5xl{
+  font-size:3rem;
+  line-height:1
+}
+
 .text-2xl{
   font-size:1.5rem;
   line-height:2rem