avo 1.4.0.pre.1 → 1.4.4.pre.1

data/lib/avo/fields/key_value_field.rb

@@ -6,14 +6,12 @@ module Avo
       attr_reader :key_label
       attr_reader :value_label
       attr_reader :action_text
+      attr_reader :delete_text
+      attr_reader :disable_editing_keys
       attr_reader :disable_adding_rows
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "key-value-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 

data/lib/avo/fields/markdown_field.rb

@@ -1,12 +1,10 @@
 module Avo
   module Fields
     class MarkdownField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "markdown-field"
-        }
+      attr_reader :options
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 

data/lib/avo/fields/number_field.rb

@@ -1,19 +1,16 @@
 module Avo
   module Fields
     class NumberField < TextField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "number-field",
-          computable: true
-        }
+      attr_reader :min
+      attr_reader :max
+      attr_reader :step
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
-        @meta = {
-          min: args[:min].present? ? args[:min].to_f : nil,
-          max: args[:max].present? ? args[:max].to_f : nil,
-          step: args[:step].present? ? args[:step].to_f : nil
-        }
+        @min = args[:min].present? ? args[:min].to_f : nil
+        @max = args[:max].present? ? args[:max].to_f : nil
+        @step = args[:step].present? ? args[:step].to_f : nil
       end
     end
   end

data/lib/avo/fields/password_field.rb

@@ -1,14 +1,10 @@
 module Avo
   module Fields
     class PasswordField < TextField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "password-field"
-        }
-
+      def initialize(id, **args, &block)
         show_on :forms
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         hide_on [:index, :show]
       end

data/lib/avo/fields/progress_bar_field.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Fields
+    class ProgressBarField < BaseField
+      attr_reader :max
+      attr_reader :step
+      attr_reader :display_value
+      attr_reader :value_suffix
+
+      def initialize(name, **args, &block)
+        super(name, **args, &block)
+
+        @max = args[:max] || 100
+        @step = args[:step] || 1
+        @display_value = args[:display_value] || false
+        @value_suffix = args[:value_suffix] || nil
+      end
+    end
+  end
+end

data/lib/avo/fields/select_field.rb

@@ -5,18 +5,15 @@ module Avo
       attr_reader :enum
       attr_reader :display_value
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "select-field"
-        }
+      def initialize(id, **args, &block)
+        args[:placeholder] ||= I18n.t("avo.choose_an_option")
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
-        @options = args[:options].present? ? args[:options] : args[:enum]
-        @options = ActiveSupport::HashWithIndifferentAccess.new @options
+        options = args[:options].present? ? args[:options] : args[:enum]
+        @options = ActiveSupport::HashWithIndifferentAccess.new options
         @enum = args[:enum].present? ? args[:enum] : nil
         @display_value = args[:display_value].present? ? args[:display_value] : false
-        @placeholder = args[:placeholder].present? ? args[:placeholder].to_s : I18n.t("avo.choose_an_option")
       end
 
       def options_for_select
@@ -34,12 +31,16 @@ module Avo
       end
 
       def label
-        if display_value
+        if enum.present?
+          if display_value
+            options[value]
+          else
+            value
+          end
+        elsif display_value
           value
-        elsif enum.present?
-          options[value]
         else
-          options.invert[value]
+          options.invert.stringify_keys[value]
         end
       end
     end

data/lib/avo/fields/status_field.rb

@@ -1,12 +1,8 @@
 module Avo
   module Fields
     class StatusField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "status-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten : [:waiting, :running]
         @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten : [:failed]

data/lib/avo/fields/text_field.rb

@@ -1,13 +1,10 @@
 module Avo
   module Fields
     class TextField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "text-field",
-          computable: true
-        }.merge(@defaults || {})
+      attr_reader :link_to_resource
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end

data/lib/avo/fields/textarea_field.rb

@@ -1,17 +1,14 @@
 module Avo
   module Fields
     class TextareaField < TextField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "textarea-field",
-          computable: true
-        }
+      attr_reader :rows
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 
-        @meta[:rows] = args[:rows].present? ? args[:rows].to_i : 5
+        @rows = args[:rows].present? ? args[:rows].to_i : 5
       end
     end
   end

data/lib/avo/fields/trix_field.rb

@@ -5,18 +5,14 @@ module Avo
       attr_reader :attachments_disabled
       attr_reader :attachment_key
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "trix-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 
-        @always_show = args[:always_show].present? ? args[:always_show] : false
-        @attachments_disabled = args[:attachments_disabled].present? ? args[:attachments_disabled] : false
-        @attachment_key = args[:attachment_key].present? ? args[:attachment_key] : nil
+        @always_show = args[:always_show] || false
+        @attachments_disabled = args[:attachments_disabled] || false
+        @attachment_key = args[:attachment_key]
       end
     end
   end

data/lib/avo/fields_collector.rb

@@ -1,30 +1,66 @@
+# require "active_support/inflector"
+
 module Avo
   module FieldsCollector
     def field(field_name, as:, **args, &block)
       self.fields ||= []
 
-      self.fields << parse_field(field_name, as: as, **args, &block)
-    end
+      field_instance = parse_field(field_name, as: as, **args, &block)
 
-    def parse_field(field_name, as:, **args, &block)
-      matched_field = Avo::App.fields.find do |field|
-        field[:name].to_s == as.to_s
+      if field_instance.present?
+        self.fields << field_instance
+      else
+        message = "[Avo] The #{field_name} field, as: #{as} from #{self.name} has an invalid configuration."
+        ::Rails.logger.warn message
       end
+    end
 
-      if matched_field.present? && matched_field[:class].present?
-        klass = matched_field[:class]
+    def parse_field(field_name, as:, **args, &block)
+      # The field is passed as a symbol eg: :text, :color_picker, :trix
+      if as.is_a? Symbol
+        field_class = field_class_from_symbol(as)
 
-        if block
-          klass.new(field_name, **args || {}, &block)
+        if field_class.present?
+          # The field has been registered before.
+          instantiate_field(field_name, klass: field_class, **args, &block)
         else
-          klass.new(field_name, **args || {})
-        end
+          # The symbol can be transformed to a class and found.
+          class_name = as.to_s.classify
+          field_class = "#{class_name}Field"
 
+          # Discover & load custom field classes
+          if Object.const_defined? field_class
+            instantiate_field(field_name, klass: field_class.safe_constantize, **args, &block)
+          end
+        end
+      elsif as.is_a? Class
+        # The field has been passed as a class.
+        if Object.const_defined? as.to_s
+          instantiate_field(field_name, klass: as, **args, &block)
+        end
       end
     end
 
     def heading(body, **args)
       self.fields << Avo::Fields::HeadingField.new(body, **args)
     end
+
+    private
+
+    def instantiate_field(field_name, klass:, **args, &block)
+      if block
+        klass.new(field_name, **args || {}, &block)
+      else
+        klass.new(field_name, **args || {})
+      end
+    end
+
+    def field_class_from_symbol(symbol)
+      matched_field = Avo::App.fields.find do |field|
+        field[:name].to_s == symbol.to_s
+      end
+
+      return matched_field[:class] if matched_field.present? && matched_field[:class].present?
+    end
   end
 end

data/lib/avo/licensing/license.rb

@@ -47,6 +47,16 @@ module Avo
 
       alias_method :has, :can
       alias_method :lacks, :cant
+
+      # Returns if has ability and if is a valid license or app is in development.
+      def has_with_trial(ability)
+        can(ability) && (valid? || Rails.env.development? || Rails.env.test?)
+      end
+
+      # Returns if lacks ability and if is a valid license or app is in development.
+      def lacks_with_trial(ability)
+        !can(ability) && (valid? || Rails.env.development? || Rails.env.test?)
+      end
     end
   end
 end

data/lib/avo/licensing/pro_license.rb

@@ -4,7 +4,10 @@ module Avo
       def abilities
         [
           :authorization,
-          :custom_tools
+          :custom_tools,
+          :custom_fields,
+          :global_search,
+          :enhanced_search_results
         ]
       end
     end

data/lib/avo/services/authorization_service.rb

@@ -75,7 +75,7 @@ module Avo
         end
 
         def skip_authorization
-          Avo::App.license.lacks :authorization
+          Avo::App.license.lacks_with_trial :authorization
         end
 
         def authorized_methods(user, record)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.4.0.pre.1"
+  VERSION = "1.4.4.pre.1"
 end

data/lib/generators/avo/eject_generator.rb

@@ -15,6 +15,7 @@ module Generators
         logo: "app/views/avo/partials/_logo.html.erb",
         head: "app/views/avo/partials/_head.html.erb",
         header: "app/views/avo/partials/_header.html.erb",
+        profile_dropdown: "app/views/avo/partials/_profile_dropdown.html.erb",
         footer: "app/views/avo/partials/_footer.html.erb",
         scripts: "app/views/avo/partials/_scripts.html.erb"
       }

data/lib/generators/avo/field_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators"
+
+module Generators
+  module Avo
+    class FieldGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+
+      namespace "avo:field"
+      desc "Add a custom Avo field to your project."
+
+      def handle
+        directory "field/components", "app/components/avo/fields/#{singular_name}_field"
+        template "field/%singular_name%_field.rb.tt", "app/avo/fields/#{singular_name}_field.rb"
+      end
+    end
+  end
+end

data/lib/generators/avo/filter_generator.rb

@@ -13,7 +13,7 @@ module Generators
 
         type = "select" if options[:select]
 
-        template "filters/#{type}_filter.tt", "app/services/avo/filters/#{singular_name}.rb"
+        template "filters/#{type}_filter.tt", "app/avo/filters/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/templates/field/%singular_name%_field.rb.tt

@@ -0,0 +1,5 @@
+class <%= class_name %>Field < Avo::Fields::BaseField
+  def initialize(name, **args, &block)
+    super(name, **args, &block)
+  end
+end

data/lib/generators/avo/templates/field/components/edit_component.html.erb.tt

@@ -0,0 +1,6 @@
+<%%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+  <%%= @form.text_field @field.id,
+    class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+    placeholder: @field.placeholder,
+    disabled: @field.readonly %>
+<%% end %>

data/lib/generators/avo/templates/field/components/edit_component.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::<%= class_name %>Field::EditComponent < Avo::Fields::EditComponent
+end

data/lib/generators/avo/templates/field/components/index_component.html.erb.tt

@@ -0,0 +1,3 @@
+<%%= index_field_wrapper field: @field do %>
+  <%%= @field.value %>
+<%% end %>

data/lib/generators/avo/templates/field/components/index_component.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::<%= class_name %>Field::IndexComponent < Avo::Fields::IndexComponent
+end

data/lib/generators/avo/templates/field/components/show_component.html.erb.tt

@@ -0,0 +1,3 @@
+<%%= show_field_wrapper field: @field, index: @index do %>
+  <%%= @field.value %>
+<%% end %>

data/lib/generators/avo/templates/field/components/show_component.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::<%= class_name %>Field::ShowComponent < Avo::Fields::ShowComponent
+end

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

@@ -43,6 +43,7 @@ Avo.configure do |config|
   # config.full_width_container = false
   # config.full_width_index_view = false
   # config.cache_resources_on_index_view = true
+  # config.search_debounce = 300
 
   # Where should the user be redirected when he hits the `/<%= options[:path] %>` url
   # config.home_path = nil