avo 2.5.2.pre.6 → 2.6.1.pre.1

data/lib/avo/concerns/handles_field_args.rb

@@ -0,0 +1,36 @@
+module Avo
+  module Concerns
+    module HandlesFieldArgs
+      extend ActiveSupport::Concern
+
+      private
+
+      # Add an instance variable from args
+      # That may be a string, boolean, or array
+      # Each args should also have a default value
+      def add_prop_from_args(args = {}, name: nil, type: :string, default: nil)
+        value = default
+
+        if type == :boolean
+          value = args[name.to_sym] == true
+        else
+          value = args[name.to_sym] unless args.dig(name.to_sym).nil?
+        end
+
+        instance_variable_set(:"@#{name}", value)
+      end
+
+      def add_boolean_prop(args, name, default = false)
+        add_prop_from_args args, name: name, default: default, type: :boolean
+      end
+
+      def add_array_prop(args, name, default = [])
+        add_prop_from_args args, name: name, default: default, type: :array
+      end
+
+      def add_string_prop(args, name, default = [])
+        add_prop_from_args args, name: name, default: default, type: :string
+      end
+    end
+  end
+end

data/lib/avo/fields/base_field.rb

@@ -4,8 +4,9 @@ module Avo
       extend ActiveSupport::DescendantsTracker
       extend Avo::Fields::FieldExtensions::HasFieldName
 
-      include ActionView::Helpers::UrlHelper
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
+      include Avo::Concerns::HandlesFieldArgs
+      include ActionView::Helpers::UrlHelper
 
       delegate :view_context, to: "Avo::App"
       delegate :main_app, to: :view_context

data/lib/avo/fields/tags_field.rb

@@ -0,0 +1,82 @@
+module Avo
+  module Fields
+    class TagsField < BaseField
+      attr_reader :acts_as_taggable_on
+      attr_reader :close_on_select
+      attr_reader :delimiters
+      attr_reader :enforce_suggestions
+
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
+
+        add_boolean_prop args, :close_on_select
+        add_boolean_prop args, :enforce_suggestions
+        add_string_prop args, :acts_as_taggable_on
+        add_array_prop args, :disallowed
+        add_array_prop args, :delimiters, [","]
+        add_array_prop args, :suggestions
+      end
+
+      def field_value
+        return json_value if acts_as_taggable_on.present?
+
+        value || []
+      end
+
+      def json_value
+        value.map do |item|
+          {
+            value: item.name
+          }
+        end.as_json
+      end
+
+      def fill_field(model, key, value, params)
+        if acts_as_taggable_on.present?
+          model.send(act_as_taggable_attribute(key), parsed_value(value))
+        else
+          model.send("#{key}=", parsed_value(value))
+        end
+
+        model
+      end
+
+      def suggestions
+        return @suggestions if @suggestions.is_a? Array
+
+        if @suggestions.respond_to? :call
+          return Avo::Hosts::RecordHost.new(block: @suggestions, record: model).handle
+        end
+
+        []
+      end
+
+      def disallowed
+        return @disallowed if @disallowed.is_a? Array
+
+        if @disallowed.respond_to? :call
+          return Avo::Hosts::RecordHost.new(block: @disallowed, record: model).handle
+        end
+
+        []
+      end
+
+      private
+
+      def act_as_taggable_attribute(key)
+        "#{key.singularize}_list="
+      end
+
+      def parsed_value(value)
+        JSON.parse(value).pluck("value")
+      rescue
+        []
+      end
+
+      private
+
+      def parse_suggestions_from_args(args)
+      end
+    end
+  end
+end

data/lib/avo/hosts/association_scope_host.rb

@@ -2,6 +2,7 @@ module Avo
   module Hosts
     class AssociationScopeHost < BaseHost
       option :parent
+      option :grandparent
       option :query
     end
   end

data/lib/avo/hosts/base_host.rb

@@ -12,6 +12,8 @@ module Avo
       option :current_user, default: proc { Avo::App.current_user }
       option :block, optional: true
 
+      delegate :authorize, to: Avo::Services::AuthorizationService
+
       def handle
         instance_exec(&block)
       end

data/lib/avo/hosts/record_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class RecordHost < BaseHost
+      option :record
+    end
+  end
+end

data/lib/avo/licensing/pro_license.rb

@@ -12,7 +12,8 @@ module Avo
           :searchable_associations,
           :resource_ordering,
           :dashboards,
-          :menu_editor
+          :menu_editor,
+          :advanced_fields
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.5.2.pre.6" unless const_defined?(:VERSION)
+  VERSION = "2.6.1.pre.1" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/cards/chartkick_card.tt

@@ -3,7 +3,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart
 
-  query do
+  def query
     data = 3.times.map do |index|
       {
         name: "Batch #{index}",

data/lib/generators/avo/templates/cards/chartkick_card_sample.tt

@@ -9,7 +9,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   # self.chart_options = { library: { plugins: { legend: { display: true } } } }
   # self.flush = true
 
-  query do
+  def query
     points = 16
     i = Time.new.year.to_i - points
     base_data = Array.new(points).map do

data/lib/generators/avo/templates/cards/metric_card.tt

@@ -2,7 +2,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
 
-  query do
+  def query
     result 101
   end
 end

data/lib/generators/avo/templates/cards/metric_card_sample.tt

@@ -8,7 +8,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::MetricCard
   # self.prefix = ""
   # self.suffix = ""
 
-  query do
+  def query
     # from = Date.today.midnight - 1.week
     # to = DateTime.current
 

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -39,6 +39,10 @@ en:
       zero: 'no %{item}'
       one: 'one %{item}'
       other: '%{count} %{item}'
+    x_items_more:
+      zero: 'no more items'
+      one: 'one more item'
+      other: '%{count} more items'
     are_you_sure: 'Are you sure?'
     filters: 'Filters'
     per_page: 'Per page'

data/lib/tasks/avo_tasks.rake

@@ -5,11 +5,14 @@
 
 desc 'Installs Avo assets and bundles them for when you want to use the GitHub repo in your app'
 task 'avo:build-assets' do
+  spec = get_gem_spec 'avo'
+  # Uncomment to enable only when the source is github.com
+  # enabled = spec.source.to_s.include?('https://github.com/avo-hq/avo')
   enabled = true
 
   if enabled
     puts "Starting avo:build-assets"
-    path = locate_gem 'avo'
+    path = spec.full_gem_path
 
     Dir.chdir(path) do
       system 'yarn'
@@ -24,11 +27,12 @@ end
 
 # From
 # https://stackoverflow.com/questions/9322078/programmatically-determine-gems-path-using-bundler
-def locate_gem(name)
+def get_gem_spec(name)
   spec = Bundler.load.specs.find{|s| s.name == name }
   raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
   if spec.name == 'bundler'
     return File.expand_path('../../../', __FILE__)
   end
-  spec.full_gem_path
+
+  spec
 end