avo 1.3.4 → 1.4.1

data/lib/avo/fields/country_field.rb

@@ -4,13 +4,10 @@ module Avo
       attr_reader :countries
       attr_reader :display_code
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "country-field",
-          placeholder: I18n.t("avo.choose_a_country")
-        }
+      def initialize(id, **args, &block)
+        args[:placeholder] ||= I18n.t("avo.choose_a_country")
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         @countries = ISO3166::Country.translations.sort_by { |code, name| name }.to_h
         @display_code = args[:display_code].present? ? args[:display_code] : false

data/lib/avo/fields/currency_field.rb

@@ -1,24 +1,15 @@
 module Avo
   module Fields
     class CurrencyField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "currency-field",
-          computable: true
-        }
+      attr_reader :currency
+      attr_reader :locale
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         @currency = args[:currency].present? ? args[:currency].to_s : Avo.configuration.currency
         @locale = args[:locale].present? ? args[:locale].to_s : Avo.configuration.locale
       end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          currency: @currency,
-          locale: @locale
-        }
-      end
     end
   end
 end

data/lib/avo/fields/date_field.rb

@@ -4,20 +4,14 @@ module Avo
       attr_reader :first_day_of_week
       attr_reader :picker_format
       attr_reader :format
-      attr_reader :placeholder
       attr_reader :relative
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "date-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         @first_day_of_week = args[:first_day_of_week].present? ? args[:first_day_of_week].to_i : 0
         @picker_format = args[:picker_format].present? ? args[:picker_format] : "Y-m-d"
         @format = args[:format].present? ? args[:format] : :long
-        @placeholder = args[:placeholder].present? ? args[:placeholder] : ""
         @relative = args[:relative].present? ? args[:relative] : false
       end
 

data/lib/avo/fields/date_time_field.rb

@@ -5,10 +5,9 @@ module Avo
       attr_reader :time_24hr
       attr_reader :timezone
 
-      def initialize(name, **args, &block)
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
-        @partial_name = "date-time-field"
         @picker_format = args[:picker_format].present? ? args[:picker_format] : "Y-m-d H:i:S"
         @time_24hr = args[:time_24hr].present? ? args[:time_24hr] : false
         @timezone = args[:timezone].present? ? args[:timezone] : Rails.application.config.time_zone

data/lib/avo/fields/external_image_field.rb

@@ -5,13 +5,8 @@ module Avo
       attr_reader :height
       attr_reader :radius
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "external-image-field",
-          computable: true
-        }.merge(@defaults || {})
-
-        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
 

data/lib/avo/fields/file_field.rb

@@ -1,20 +1,16 @@
 module Avo
   module Fields
     class FileField < BaseField
+      attr_accessor :link_to_resource
       attr_accessor :is_avatar
       attr_accessor :is_image
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "file-field"
-        }.merge(@defaults || {})
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
-        super(name, **args, &block)
-
-        @file_field = true
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
         @is_avatar = args[:is_avatar].present? ? args[:is_avatar] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
       def path

data/lib/avo/fields/files_field.rb

@@ -3,18 +3,16 @@ module Avo
     class FilesField < BaseField
       attr_accessor :is_image
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "files-field"
-        }.merge(@defaults || {})
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
-        super(name, **args, &block)
-
-        @is_array_param = true
-        @file_field = true
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
       end
 
+      def view_component_name
+        "FilesField"
+      end
+
       def to_permitted_param
         {"#{id}": []}
       end

data/lib/avo/fields/gravatar_field.rb

@@ -4,25 +4,22 @@ require "erb"
 module Avo
   module Fields
     class GravatarField < BaseField
-      attr_reader :size
+      attr_reader :link_to_resource
       attr_reader :rounded
+      attr_reader :size
       attr_reader :default
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "gravatar-field",
-          name: "Avatar",
-          id: args[:id].present? ? args[:id] : "email"
-        }
+      def initialize(id, **args, &block)
+        args[:name] ||= "Avatar"
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         hide_on [:edit, :new]
 
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
         @rounded = args[:rounded].present? ? args[:rounded] : true
         @size = args[:size].present? ? args[:size].to_i : 40
         @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ""
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
       def md5

data/lib/avo/fields/has_and_belongs_to_many_field.rb

@@ -1,18 +1,17 @@
 module Avo
   module Fields
     class HasAndBelongsToManyField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          updatable: false,
-          partial_name: "has-many-field"
-        }
+      def initialize(id, **args, &block)
+        args[:updatable] = false
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         hide_on :all
         show_on :show
+      end
 
-        @resource = args[:resource]
+      def view_component_name
+        "HasManyField"
       end
 
       def turbo_frame

data/lib/avo/fields/has_many_field.rb

@@ -1,19 +1,13 @@
 module Avo
   module Fields
     class HasManyField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          updatable: false,
-          partial_name: "has-many-field"
-        }
-        @through = args[:through]
+      def initialize(id, **args, &block)
+        args[:updatable] = false
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         hide_on :all
         show_on :show
-
-        @resource = args[:resource]
       end
 
       def turbo_frame

data/lib/avo/fields/has_one_field.rb

@@ -4,17 +4,12 @@ module Avo
       attr_accessor :relation_method
       attr_accessor :display
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          updatable: true,
-          partial_name: "has-one-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :new, :edit
 
-        @placeholder = I18n.t "avo.choose_an_option"
+        @placeholder ||= I18n.t "avo.choose_an_option"
 
         @relation_method = name.to_s.parameterize.underscore
         @display = args[:display].present? ? args[:display] : :show

data/lib/avo/fields/heading_field.rb

@@ -1,18 +1,20 @@
 module Avo
   module Fields
     class HeadingField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          updatable: false,
-          partial_name: "heading-field",
-          id: "heading_" + name.to_s.parameterize.underscore
-        }
+      attr_reader :as_html
 
-        super(name, **args, &block)
+      def initialize(content, **args, &block)
+        args[:updatable] = false
+
+        super(content, **args, &block)
 
         hide_on :index
 
-        @meta[:as_html] = args[:as_html].present? ? args[:as_html] : false
+        @as_html = args[:as_html].present? ? args[:as_html] : false
+      end
+
+      def id
+        "heading_#{name.to_s.parameterize.underscore}"
       end
     end
   end

data/lib/avo/fields/hidden_field.rb

@@ -1,12 +1,8 @@
 module Avo
   module Fields
     class HiddenField < TextField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "hidden-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         only_on [:edit, :new]
       end

data/lib/avo/fields/id_field.rb

@@ -1,27 +1,15 @@
 module Avo
   module Fields
     class IdField < BaseField
-      def initialize(name, **args, &block)
-        default_value = "id"
+      attr_reader :link_to_resource
 
-        if name.nil?
-          @name = name = default_value
-        elsif !name.is_a?(String) && !name.is_a?(Symbol)
-          args_copy = name
-          @name = name = default_value
-          args = args_copy
-        end
-
-        @defaults = {
-          id: name.to_sym,
-          readonly: true,
-          sortable: true,
-          partial_name: "id-field"
-        }
+      def initialize(id, **args, &block)
+        args[:readonly] = true
+        args[:sortable] = true
 
         hide_on [:edit, :new]
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end

data/lib/avo/fields/key_value_field.rb

@@ -3,12 +3,15 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "key-value-field"
-        }
+      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
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 
@@ -33,7 +36,13 @@ module Avo
         [:"#{id}", "#{id}": {}]
       end
 
-      def hydrate_field(fields, model, resource, view)
+      def parsed_value
+        value.to_json
+      rescue
+        {}
+      end
+
+      def options
         {
           key_label: @key_label,
           value_label: @value_label,
@@ -44,6 +53,18 @@ module Avo
           disable_deleting_rows: @disable_deleting_rows
         }
       end
+
+      def fill_field(model, key, value)
+        begin
+          new_value = JSON.parse(value)
+        rescue
+          new_value = {}
+        end
+
+        model[key] = new_value
+
+        model
+      end
     end
   end
 end

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