avo 0.4.9 → 0.5.0.beta4

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

@@ -7,29 +7,23 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'file-field',
+          partial_name: 'file-field',
         }.merge(@defaults || {})
 
         super(name, **args, &block)
+
         @file_field = true
         @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 hydrate_field(fields, model, resource, view)
-        storage_field = model.send(id)
-
-        field = {
-          value: nil
-        }
-
-        return field unless storage_field.attached?
-
-        field[:filename] = storage_field.filename
-        field[:value] = rails_blob_url(storage_field, only_path: true)
-        field[:is_image] = self.is_image
+      def path
+        rails_blob_url value
+      end
 
-        field
+      def variant(resize_to_limit: [128, 128])
+        value.variant(resize_to_limit: resize_to_limit).processed.service_url
       end
     end
   end

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

@@ -6,36 +6,28 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'files-field',
+          partial_name: 'files-field',
         }.merge(@defaults || {})
 
         super(name, **args, &block)
+
         @is_array_param = true
         @file_field = true
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
       end
 
-      def hydrate_field(fields, model, resource, view)
-        storage_field = model.send(id)
-
-        field = {
-          value: [],
-          files: [],
-        }
+      def to_permitted_param
+        { "#{id}": [] }
+      end
 
-        return field unless storage_field.attached?
+      def fill_field(model, key, value)
+        return model unless model.methods.include? key.to_sym
 
-        files = storage_field.each do |file|
-          field[:value] << rails_blob_url(file, only_path: true)
-          field[:files] << {
-            id: file.id,
-            filename: file.filename,
-            path: rails_blob_url(file, only_path: true),
-            is_image: self.is_image,
-          }
+        value.each do |file|
+          model.send(key).attach file
         end
 
-        field
+        model
       end
     end
   end

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

@@ -4,16 +4,20 @@ require 'erb'
 module Avo
   module Fields
     class GravatarField < Field
+      attr_reader :size
+      attr_reader :rounded
+      attr_reader :default
+
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'gravatar-field',
+          partial_name: 'gravatar-field',
           name: 'Avatar',
           id: args[:id].present? ? args[:id] : 'email',
         }
 
         super(name, **args, &block)
 
-        hide_on [:edit, :create]
+        hide_on [:edit, :new]
 
         @rounded = args[:rounded].present? ? args[:rounded] : true
         @size = args[:size].present? ? args[:size].to_i : 40
@@ -21,20 +25,21 @@ module Avo
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
-      def hydrate_field(fields, model, resource, view)
-        value = nil
+      def md5
+        return if value.blank?
 
-        if model[id].present?
-          value = Digest::MD5.hexdigest(model[id].strip.downcase)
-        end
+        Digest::MD5.hexdigest(value.strip.downcase)
+      end
 
-        {
-          value: value,
-          rounded: @rounded,
-          default: @default,
-          size: @size,
-          link_to_resource: @link_to_resource,
+      def to_image
+        options = {
+          default: '',
+          size: 340,
         }
+
+        query = options.map { |key, value| "#{key}=#{value}" }.join('&')
+
+        URI::HTTP.build(host: "www.gravatar.com", path: "/avatar/#{md5}", query: query).to_s
       end
     end
   end

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

@@ -4,43 +4,32 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,
-          component: 'has-many-field'
+          partial_name: 'has-many-field'
         }
 
         super(name, **args, &block)
 
-        hide_on :index
+        hide_on :all
+        show_on :show
 
         @resource = args[:resource]
       end
 
-      def hydrate_field(fields, model, resource, view)
-        if view === :create
-          return {
-            relationship: :has_many,
-          }
-        end
-
-        return {} if [:index].include? view
-
-        target_resource = get_target_resource model
-        fields[:relation_class] = target_resource.class.to_s
-        fields[:path] = target_resource.url
-        fields[:relationship] = :has_and_belongs_to_many
-        fields[:relationship_model] = target_resource.model.name
-
-        fields
+      def turbo_frame
+        "#{self.class.name.demodulize.to_s.underscore}_#{id}"
       end
 
-      def has_own_panel?
-        true
+      def frame_url
+        "#{Avo.configuration.root_path}/resources/#{@model.model_name.route_key}/#{@model.id}/#{id}?turbo_frame=#{turbo_frame}"
       end
 
-      def get_target_resource(model)
-        if @resource.present?
-          App.get_resources.find { |r| r.class == @resource }
+      def target_resource
+        if @model._reflections[id.to_s].klass.present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
+        elsif @model._reflections[id.to_s].options[:class_name].present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
         else
-          App.get_resource_by_model_name model._reflections[id.to_s].options[:class_name].present? ? model._reflections[id.to_s].options[:class_name] : model._reflections[id.to_s].klass.name
+          App.get_resource_by_name id.to_s
         end
       end
     end

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

@@ -4,46 +4,33 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,
-          component: 'has-many-field'
+          partial_name: 'has-many-field'
         }
         @through = args[:through]
 
         super(name, **args, &block)
 
-        hide_on :index
+        hide_on :all
+        show_on :show
 
         @resource = args[:resource]
       end
 
-      def hydrate_field(fields, model, resource, view)
-        if view === :create
-          return {
-            relationship: :has_many,
-          }
-        end
-
-        return {} if [:index].include? view
-
-        target_resource = get_target_resource model
-        fields[:relation_class] = target_resource.class.to_s
-        fields[:path] = target_resource.url
-        fields[:relationship] = :has_many
-        fields[:through] = @through
-        fields[:relationship_model] = target_resource.model.name
-
-        fields
+      def turbo_frame
+        "#{self.class.name.demodulize.to_s.underscore}_#{id}"
       end
 
-      def has_own_panel?
-        true
+      def frame_url
+        "#{Avo.configuration.root_path}/resources/#{@model.model_name.route_key}/#{@model.id}/#{id}?turbo_frame=#{turbo_frame}"
       end
 
-      def get_target_resource(model)
-        if @resource.present?
-          App.get_resources.find { |r| r.class == @resource }
+      def target_resource
+        if @model._reflections[id.to_s].klass.present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
+        elsif @model._reflections[id.to_s].options[:class_name].present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
         else
-          class_name = model._reflections[id.to_s].options[:class_name].present? ? model._reflections[id.to_s].options[:class_name] : model._reflections[id.to_s].klass.name
-          App.get_resource_by_model_name class_name
+          App.get_resource_by_name id.to_s
         end
       end
     end

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

@@ -2,55 +2,48 @@ module Avo
   module Fields
     class HasOneField < Field
       attr_accessor :relation_method
+      attr_accessor :display
 
       def initialize(name, **args, &block)
         @defaults = {
           updatable: true,
-          component: 'has-one-field',
+          partial_name: 'has-one-field',
         }
 
         super(name, **args, &block)
 
-        hide_on :create
+        hide_on :new, :edit
 
         @placeholder = I18n.t 'avo.choose_an_option'
 
         @relation_method = name.to_s.parameterize.underscore
+        @display = args[:display].present? ? args[:display] : :show
       end
 
-      def hydrate_field(fields, model, resource, view)
-        target_resource = get_related_resource(resource)
-        fields[:relation_class] = target_resource.class.to_s
-
-        relation_model = model.public_send(@relation_method)
-
-        if relation_model.present?
-          relation_model = model.public_send(@relation_method)
-          fields[:value] = relation_model.send(target_resource.title)
-          fields[:database_value] = relation_model[:id]
-          fields[:link] = Avo::Resources::Resource.show_path(relation_model)
-        end
-
-        # Populate the options on show and edit
-        fields[:options] = []
+      def label
+        value.send(target_resource.title)
+      end
 
-        if [:edit, :create].include? view
-          fields[:options] = target_resource.model.all.map do |model|
-            {
-              value: model.id,
-              label: model.send(target_resource.title)
-            }
-          end
-        end
+      def resource
+        target_resource
+      end
 
-        fields[:plural_name] = target_resource.plural_name
+      def turbo_frame
+        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{id}"
+      end
 
-        fields
+      def frame_url
+        "#{Avo.configuration.root_path}/resources/#{@model.model_name.route_key}/#{@model.id}/#{id}/#{value.id}?turbo_frame=#{turbo_frame}"
       end
 
-      def get_related_resource(resource)
-        class_name = resource.model.reflections[name.to_s.downcase].class_name
-        App.get_resources.find { |r| r.class == "Avo::Resources::#{class_name}".safe_constantize }
+      def target_resource
+        if @model._reflections[id.to_s].klass.present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
+        elsif @model._reflections[id.to_s].options[:class_name].present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
+        else
+          App.get_resource_by_name id.to_s
+        end
       end
 
       def fill_field(model, key, value)

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

@@ -4,7 +4,7 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,
-          component: 'heading-field',
+          partial_name: 'heading-field',
           id: 'heading_' + name.to_s.parameterize.underscore,
         }
 
@@ -12,13 +12,7 @@ module Avo
 
         hide_on :index
 
-        @as_html = args[:as_html].present? ? args[:as_html] : false
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          as_html: @as_html
-        }
+        @meta[:as_html] = args[:as_html].present? ? args[:as_html] : false
       end
     end
   end

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

@@ -5,12 +5,12 @@ module Avo
     class HiddenField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'hidden-field',
+          partial_name: 'hidden-field',
         }
 
         super(name, **args, &block)
 
-        only_on [:edit, :create]
+        only_on [:edit, :new]
       end
     end
   end

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

@@ -16,21 +16,15 @@ module Avo
           id: name.to_sym,
           readonly: true,
           sortable: true,
-          component: 'id-field'
+          partial_name: 'id-field'
         }
 
-        hide_on [:edit, :create]
+        hide_on [:edit, :new]
 
         super(name, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          link_to_resource: @link_to_resource,
-        }
-      end
     end
   end
 end

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

@@ -5,14 +5,13 @@ module Avo
     class KeyValueField < Field
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'key-value-field',
+          partial_name: 'key-value-field',
         }
 
         super(name, **args, &block)
 
         hide_on :index
 
-        @is_object_param = true
         @key_label = args[:key_label].present? ? args[:key_label].to_s : 'Key'
         @value_label = args[:value_label].present? ? args[:value_label].to_s : 'Value'
         @action_text = args[:action_text].present? ? args[:action_text].to_s : 'Add row'
@@ -30,6 +29,10 @@ module Avo
         @disable_deleting_rows = args[:disable_deleting_rows].present? ? args[:disable_deleting_rows] : false
       end
 
+      def to_permitted_param
+        [:"#{id}", "#{id}": {} ]
+      end
+
       def hydrate_field(fields, model, resource, view)
         {
           key_label: @key_label,

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

@@ -5,7 +5,7 @@ module Avo
     class MarkdownField < Field
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'markdown-field',
+          partial_name: 'markdown-field',
         }
 
         super(name, **args, &block)

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

@@ -5,23 +5,16 @@ module Avo
     class NumberField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'number-field',
+          partial_name: 'number-field',
           computable: true,
         }
 
         super(name, **args, &block)
 
-        @min = args[:min].present? ? args[:min].to_i : nil
-        @max = args[:max].present? ? args[:max].to_i : nil
-        @step = args[:step].present? ? args[:step].to_i : nil
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          min: @min,
-          max: @max,
-          step: @step,
+        @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,
         }
       end
     end