avo 0.4.7 → 0.5.0.beta2

data/lib/avo/app/fields/code_field.rb

@@ -1,9 +1,16 @@
 module Avo
   module Fields
     class CodeField < Field
+      attr_reader :height
+      attr_reader :language
+      attr_reader :theme
+      attr_reader :tab_size
+      attr_reader :indent_with_tabs
+      attr_reader :line_wrapping
+
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'code-field',
+          partial_name: 'code-field',
         }
 
         hide_on :index
@@ -13,14 +20,9 @@ module Avo
         @language = args[:language].present? ? args[:language].to_s : 'javascript'
         @theme = args[:theme].present? ? args[:theme].to_s : 'material-darker'
         @height = args[:height].present? ? args[:height].to_s : 'auto'
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          language: @language,
-          theme: @theme,
-          height: @height,
-        }
+        @tab_size = args[:tab_size].present? ? args[:tab_size] : 2
+        @indent_with_tabs = args[:indent_with_tabs].present? ? args[:indent_with_tabs] : false
+        @line_wrapping = args[:line_wrapping].present? ? args[:line_wrapping] : true
       end
     end
   end

data/lib/avo/app/fields/country_field.rb

@@ -1,10 +1,12 @@
 module Avo
   module Fields
     class CountryField < Field
+      attr_reader :countries
+      attr_reader :display_code
+
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'country-field',
+          partial_name: 'country-field',
           placeholder: I18n.t('avo.choose_a_country'),
         }
 
@@ -14,27 +16,16 @@ module Avo
         @display_code = args[:display_code].present? ? args[:display_code] : false
       end
 
-      def hydrate_field(fields, model, resource, view)
-        if [:show, :index].include? view
-          value = fields[:computed_value] || fields[:value]
-
-          # Just return the DB code.
-          if @display_code
-            return {
-              value: value
-            }
+      def select_options
+        if @display_code
+          countries.map do |code, name|
+            [code, code]
+          end
+        else
+          countries.map do |code, name|
+            [name, code]
           end
-
-          # Compute and get the translated value.
-          return {
-            value: @countries[value],
-          }
         end
-
-        {
-          countries: @countries,
-          display_code: @display_code
-        }
       end
     end
   end

data/lib/avo/app/fields/currency_field.rb

@@ -3,8 +3,7 @@ module Avo
     class CurrencyField < Field
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'currency-field',
+          partial_name: 'currency-field',
           computable: true,
         }
 

data/lib/avo/app/fields/date_field.rb

@@ -3,29 +3,34 @@ require_relative 'text_field'
 module Avo
   module Fields
     class DateField < TextField
+      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 = {
-          sortable: true,
-          component: 'datetime-field',
+          partial_name: 'date-field',
         }
 
         super(name, **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] : 'YYYY-MM-DD'
+        @format = args[:format].present? ? args[:format] : :long
         @placeholder = args[:placeholder].present? ? args[:placeholder] : ''
         @relative = args[:relative].present? ? args[:relative] : false
       end
 
-      def hydrate_field(fields, model, resource, view)
-        {
-          first_day_of_week: @first_day_of_week,
-          picker_format: @picker_format,
-          format: @format,
-          placeholder: @placeholder,
-          relative: @relative,
-        }
+      def formatted_value
+        return if value.blank?
+
+        if @format.is_a?(Symbol)
+          value.to_s(@format)
+        else
+          value.strftime(@format)
+        end
       end
     end
   end

data/lib/avo/app/fields/date_time_field.rb

@@ -0,0 +1,38 @@
+require_relative 'date_field'
+
+module Avo
+  module Fields
+    class DateTimeField < DateField
+      attr_reader :format
+      attr_reader :time_24hr
+      attr_reader :timezone
+
+      def initialize(name, **args, &block)
+        super(name, **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
+      end
+
+      def formatted_value
+        return nil if value.nil?
+
+        if @format.is_a?(Symbol)
+          value.to_time.in_time_zone(timezone).to_s(@format)
+        else
+          value.to_time.in_time_zone(timezone).strftime(@format)
+        end
+      end
+
+      def fill_field(model, key, value)
+        return model if value.blank?
+
+        model[id] = value.to_time.in_time_zone(Rails.application.config.time_zone)
+
+        model
+      end
+    end
+  end
+end

data/lib/avo/app/fields/external_image_field.rb

@@ -0,0 +1,24 @@
+module Avo
+  module Fields
+    class ExternalImageField < Field
+      attr_reader :width
+      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)
+
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+
+        @width = args[:width].present? ? args[:width] : 32
+        @height = args[:height].present? ? args[:height] : 32
+        @radius = args[:radius].present? ? args[:radius] : 0
+      end
+    end
+  end
+end

data/lib/avo/app/fields/field.rb

@@ -10,7 +10,8 @@ module Avo
       attr_accessor :id
       attr_accessor :name
       attr_accessor :translation_key
-      attr_accessor :component
+      attr_accessor :partial_name
+      attr_accessor :partial_path
       attr_accessor :updatable
       attr_accessor :sortable
       attr_accessor :required
@@ -18,13 +19,25 @@ module Avo
       attr_accessor :nullable
       attr_accessor :null_values
       attr_accessor :format_using
-      attr_accessor :computable
-      attr_accessor :is_array_param
-      attr_accessor :is_object_param
+      attr_accessor :computed # if block is present
+      attr_accessor :computable # if allowed to be computable
+      attr_accessor :computed_value # the value after computation
       attr_accessor :block
       attr_accessor :placeholder
       attr_accessor :help
       attr_accessor :default
+      attr_accessor :can_see
+      attr_accessor :model
+      attr_accessor :resource
+      attr_accessor :view
+      attr_accessor :user
+      attr_accessor :action
+      attr_accessor :grid_position
+      attr_accessor :meta
+      attr_accessor :panel_name
+      attr_accessor :link_to_resource
+
+      @meta = {}
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -39,7 +52,7 @@ module Avo
           name: id.to_s.humanize(keep_id_suffix: true),
           translation_key: nil,
           block: block,
-          component: 'field',
+          partial_name: 'field',
           required: false,
           readonly: false,
           updatable: true,
@@ -47,11 +60,16 @@ module Avo
           nullable: false,
           null_values: null_values,
           computable: true,
-          is_array_param: false,
+          computed: block.present?,
+          computed_value: false,
           format_using: false,
-          placeholder: id.to_s.camelize,
+          placeholder: id.to_s.humanize,
           help: nil,
           default: nil,
+          can_see: nil,
+          grid_position: false,
+          meta: {},
+          panel_name: nil,
         }
 
         # Set the values in the following order
@@ -68,94 +86,44 @@ module Avo
         hide_on args[:hide_on] if args[:hide_on].present?
         only_on args[:only_on] if args[:only_on].present?
         except_on args[:except_on] if args[:except_on].present?
+
+        if args[:use_partials].present?
+          @custom_partials = args[:use_partials]
+        end
       end
 
-      def fetch_for_resource(model, resource, view)
-        fields = {
-          id: id,
-          computed: block.present?,
-        }
+      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
+        @model = model if model.present?
+        @view = view if view.present?
+        @resource = resource if resource.present?
+        @action = action if action.present?
+        @user = user if user.present?
+        @panel_name = panel_name if panel_name.present?
 
-        # Fill the properties with values
-        @field_properties.each do |name, value|
-          fields[name] = self.send(name)
-        end
+        self
+      end
 
-        # Set model value
-        fields[:value] = model.send(id) if model_or_class(model) == 'model' and model.methods.include? id
+      def value
+        # Get model value
+        value = @model.send(id) if model_or_class(@model) == 'model' and @model.respond_to? id
 
-        # Set default value for create view
-        if view === :create
-          if fields[:default].present? and fields[:default].respond_to? :call
-            fields[:value] = fields[:default].call model, resource, view, self
+        if @view === :new or @action.present?
+          if default.present? and default.respond_to? :call
+            value = default.call @model, @resource, @view, self
           else
-            fields[:value] = fields[:default]
+            value = default
           end
         end
 
         # Run callback block if present
-        if computable and @block.present?
-          fields[:computed_value] = @block.call model, resource, view, self
-
-          fields[:value] = fields[:computed_value]
+        if computable and block.present?
+          value = block.call @model, @resource, @view, self
         end
 
-        # Run each field's custom hydration
-        fields.merge! self.hydrate_field(fields, model, resource, view)
-
         # Run the value through resolver if present
-        fields[:value] = @format_using.call fields[:value] if @format_using.present?
-
-        fields
-      end
-
-      def fetch_for_action(model, resource)
-        fields = {
-          id: id,
-          # computed: block.present?,
-        }
-
-        # Fill the properties with values
-        @field_properties.each do |name, value|
-          fields[name] = self.send(name)
-        end
-
-        # Set initial value
-        # fields[:value] = model.send(id) if model_or_class(model) == 'model' and model.methods.include? id
-
-        # Set default value for create view
-        if fields[:default].present? and fields[:default].respond_to? :call
-          fields[:value] = fields[:default].call model, resource, self
-        else
-          fields[:value] = fields[:default]
-        end
-
-        # Run callback block if present
-        # if computable and @block.present?
-        #   fields[:computed_value] = @block.call model, resource, self
-
-        #   fields[:value] = fields[:computed_value]
-        # end
+        value = @format_using.call value if @format_using.present?
 
-        # Run each field's custom hydration
-        fields.merge! self.hydrate_field(fields, model, resource, :create)
-
-        # Run the value through resolver if present
-        fields[:value] = @format_using.call fields[:value] if @format_using.present?
-
-        fields
-      end
-
-      def hydrate_field(fields, model, resource)
-        final_value = fields[:value]
-
-        if fields[:computed_value].present?
-          final_value = fields[:computed_value]
-        end
-
-        {
-          value: final_value
-        }
+        value
       end
 
       def fill_field(model, key, value)
@@ -166,10 +134,16 @@ module Avo
         model
       end
 
+      def partial_path_for(view)
+        return @custom_partials[view] if @custom_partials.present? and @custom_partials[view].present?
+
+        "avo/fields/#{view}/#{partial_name}"
+      end
+
       # Try to see if the field has a different database ID than it's name
       def database_id(model)
         begin
-          foreign_key(model)
+          foreign_key
         rescue => exception
           id
         end
@@ -183,12 +157,30 @@ module Avo
         value
       end
 
+      def to_permitted_param
+        id.to_sym
+      end
+
+      def component_name(view = :index)
+        "Avo::#{view.to_s.classify}::Fields::#{partial_name.gsub('-field', '').underscore.camelize}FieldComponent"
+      end
+
+      def model_errors
+        return {} if model.nil?
+
+        model.errors
+      end
+
+      def type
+        self.class.name.demodulize.to_s.underscore
+      end
+
       private
         def model_or_class(model)
           if model.class == String
-            return 'class'
+            'class'
           else
-            return 'model'
+            'model'
           end
         end
     end

data/lib/avo/app/fields/field_extensions/visible_in_different_views.rb

@@ -4,13 +4,13 @@ module Avo
       module VisibleOnDifferentViews
         attr_accessor :show_on_index
         attr_accessor :show_on_show
-        attr_accessor :show_on_create
+        attr_accessor :show_on_new
         attr_accessor :show_on_edit
 
         def initialize(id, **args, &block)
           @show_on_index = @show_on_index.nil? ? true : @show_on_index
           @show_on_show = @show_on_show.nil? ? true : @show_on_show
-          @show_on_create = @show_on_create.nil? ? true : @show_on_create
+          @show_on_new = @show_on_new.nil? ? true : @show_on_new
           @show_on_edit = @show_on_edit.nil? ? true : @show_on_edit
         end
 
@@ -67,14 +67,14 @@ module Avo
             @show_on_index = true
             @show_on_show = true
             @show_on_edit = true
-            @show_on_create = true
+            @show_on_new = true
           end
 
           def hide_on_all
             @show_on_index = false
             @show_on_show = false
             @show_on_edit = false
-            @show_on_create = false
+            @show_on_new = false
           end
 
           def normalize_views(*views_and_groups)
@@ -82,7 +82,7 @@ module Avo
 
             if forms.present?
               views_and_groups = views_and_groups - forms
-              views_and_groups = views_and_groups + [:create, :edit]
+              views_and_groups = views_and_groups + [:new, :edit]
             end
 
             views_and_groups.flatten.uniq