avo 0.4.7 → 0.5.0.beta2

data/lib/avo/app/actions_loader.rb

@@ -0,0 +1,11 @@
+class Avo::ActionsLoader
+  attr_accessor :bag
+
+  def initialize
+    @bag = []
+  end
+
+  def use(klass)
+    @bag.push klass
+  end
+end

data/lib/avo/app/app.rb

@@ -11,13 +11,14 @@ module Avo
     @@app = {
       root_path: '',
       resources: [],
-      field_names: {},
       cache_store: nil
     }
     @@license = nil
+    @@fields = []
 
     class << self
       def boot
+        # init_controllers
         @@app[:root_path] = Pathname.new(File.join(__dir__, '..', '..'))
         init_fields
         I18n.locale = Avo.configuration.language_code
@@ -30,7 +31,10 @@ module Avo
       end
 
       def init(current_request = nil)
-        init_resources
+        # Set the current host for ActiveStorage
+        ActiveStorage::Current.host = current_request.base_url
+
+        init_resources current_request
         @@license = LicenseManager.new(HQ.new(current_request).response).license
       end
 
@@ -38,6 +42,10 @@ module Avo
         @@app
       end
 
+      def fields
+        @@fields
+      end
+
       def license
         @@license
       end
@@ -46,12 +54,13 @@ module Avo
         @@app[:cache_store]
       end
 
-      # This method will take all fields available in the Avo::Fields namespace and create a method for them.
+      # This method will find all fields available in the Avo::Fields namespace and add them to a @@fields array
+      # so later we can instantiate them on our resources.
       #
       # If the field has their `def_method` set up it will follow that convention, if not it will snake_case the name:
       #
       # Avo::Fields::TextField -> text
-      # Avo::Fields::TextDateTime -> date_time
+      # Avo::Fields::DateTimeField -> date_time
       def init_fields
         Avo::Fields.constants.each do |class_name|
           next if class_name.to_s == 'Field'
@@ -61,8 +70,6 @@ module Avo
           if class_name.to_s.end_with? 'Field'
             field_class = "Avo::Fields::#{class_name.to_s}".safe_constantize
             method_name = field_class.get_field_name
-
-            next if Avo::Resources::Resource.method_defined? method_name.to_sym
           else
             # Try one level deeper for custom fields
             namespace = class_name
@@ -87,82 +94,87 @@ module Avo
       end
 
       def load_field(method_name, klass)
-        @@app[:field_names][method_name] = klass
-
-        # Load field to concerned classes
-        [Avo::Resources::Resource, Avo::Actions::Action].each do |klass_entity|
-          klass_entity.define_singleton_method method_name.to_sym do |*args, &block|
-            if block.present?
-              field_class = klass::new(args[0], **args[1] || {}, &block)
-            else
-              field_class = klass::new(args[0], **args[1] || {})
-            end
-
-            klass_entity.add_field(self, field_class)
-          end
-        end
-      end
-
-      def get_field_names
-        @@app[:field_names]
+        @@fields.push(
+          name: method_name,
+          class: klass,
+        )
       end
 
-      def init_resources
-        @@app[:resources] = Avo::Resources.constants.select { |r| r != :Resource }.map do |c|
-          if Avo::Resources.const_get(c).is_a? Class
-            "Avo::Resources::#{c}".safe_constantize.new
+      def init_resources(request)
+        @@app[:resources] = Avo::Resources.constants
+          .select do |r|
+            r != :Resource
+          end
+          .map do |c|
+            if Avo::Resources.const_get(c).is_a? Class
+              "Avo::Resources::#{c}".safe_constantize.new request
+            end
           end
-        end
       end
 
       def get_resources
         @@app[:resources]
       end
 
+      # Returns the Avo resource by camelized name
+      #
+      # get_resource_by_name('User') => Avo::Resources::User
       def get_resource(resource)
         @@app[:resources].find do |available_resource|
           "Avo::Resources::#{resource}".safe_constantize == available_resource.class
         end
       end
 
-      # This returns the Avo resource by singular snake_cased name
+      # Returns the Avo resource by singular snake_cased name
       #
       # get_resource_by_name('user') => Avo::Resources::User
       def get_resource_by_name(name)
         self.get_resource name.singularize.camelize
       end
 
-      # This returns the Avo resource by singular snake_cased name
+      # Returns the Avo resource by singular snake_cased name
       #
       # get_resource_by_name('User') => Avo::Resources::User
       # get_resource_by_name(User) => Avo::Resources::User
       def get_resource_by_model_name(name)
         get_resources.find do |resource|
-          resource.class.name.demodulize == name.to_s
+          resource.model_class.model_name.name == name.to_s
         end
       end
 
-      # This returns the Rails model class by singular snake_cased name
+      # Returns the Rails model class by singular snake_cased name
       #
       # get_model_class_by_name('user') => User
       def get_model_class_by_name(name)
         name.to_s.camelize.singularize
       end
 
-      def get_available_resources(user)
+      def get_available_resources(user = nil)
         App.get_resources
-          .select { |resource| AuthorizationService::authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'] }
-          .map do |resource|
-            {
-              label: resource.plural_name.humanize(keep_id_suffix: true),
-              resource_name: resource.url.pluralize,
-              translation_key: resource.translation_key
-            }
+          .select do |resource|
+            AuthorizationService::authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'], raise_exception: false
           end
-          .reject { |i| i.blank? }
-          .to_json
-          .to_s
-          .html_safe
+          .sort_by { |r| r.name }
+      end
+
+      def get_navigation_items(user = nil)
+        get_available_resources(user).select do |resource|
+          resource.model_class.present?
+        end
+      end
+
+      def draw_routes
+        Proc.new do
+          Avo::Resources.constants
+            .select do |r|
+              r != :Resource
+            end
+            .map do |r|
+              if Avo::Resources.const_get(r).is_a? Class
+                resources r.to_s.underscore.downcase.pluralize.to_sym
+              end
+            end
+        end
       end
     end
   end

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

@@ -3,42 +3,15 @@ module Avo
     class BadgeField < Field
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'badge-field',
+          partial_name: 'badge-field',
         }
 
         super(name, **args, &block)
 
-        hide_on [:edit, :create]
+        hide_on [:edit, :new]
 
         default_options = { info: :info, success: :success, danger: :danger, warning: :warning }
-        @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        if fields[:computed_value].present?
-          return {
-            value: fields[:computed_value]
-          }
-        end
-
-        value = {}
-
-        @options.invert.each do |values, type|
-          db_value = model[id] || ''
-
-          if [values].flatten.map { |value| value.to_s }.include? db_value
-            value = {
-              label: db_value,
-              type: type,
-            }
-            next
-          end
-        end
-
-        {
-          value: value
-        }
+        @meta[:options] = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end
   end

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

@@ -1,77 +1,65 @@
 module Avo
   module Fields
     class BelongsToField < Field
-      attr_accessor :searchable
-      attr_accessor :relation_method
-
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'belongs-to-field',
+          partial_name: 'belongs-to-field',
           placeholder: I18n.t('avo.choose_an_option')
         }
 
-        @searchable = args[:searchable] == true ? true : false
-        @relation_method = name.to_s.parameterize.underscore
-
         super(name, **args, &block)
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        return fields if model_or_class(model) == 'class'
 
-        fields[:searchable] = @searchable
-        fields[:is_relation] = true
-        fields[:database_id] = foreign_key model
-
-        target_resource = get_target_resource model
-
-        relation_model = model.public_send(@relation_method)
+        @meta[:searchable] = args[:searchable] == true ? true : false
+        @meta[:relation_method] = name.to_s.parameterize.underscore
+      end
 
-        if relation_model.present?
-          relation_model = model.public_send(@relation_method)
-          fields[:value] = relation_model.send(target_resource.title) if relation_model.present?
-          fields[:database_value] = relation_model[:id] if relation_model.present?
-          fields[:link] = Avo::Resources::Resource.show_path(relation_model)
+      def options
+        target_resource.model_class.all.map do |model|
+          {
+            value: model.id,
+            label: model.send(target_resource.title)
+          }
         end
+      end
 
-        # Populate the options on show and edit
-        fields[:options] = []
+      def database_value
+        target_resource.id
+      end
 
-        if [:edit, :create].include? view
-          if self.searchable
-            fields[:model] = relation_model
+      def foreign_key
+        if @model.present?
+          if @model.class == Class
+            @model.reflections[@meta[:relation_method]].foreign_key
           else
-            fields[:options] = target_resource.model.all.map do |model|
-              {
-                value: model.id,
-                label: model.send(target_resource.title)
-              }
-            end
+            @model.class.reflections[@meta[:relation_method]].foreign_key
           end
+        elsif @resource.present?
+          @resource.model_class.reflections[@meta[:relation_method]].foreign_key
         end
+      end
 
-        fields[:plural_name] = target_resource.plural_name
+      def relation_model_class
+        @resource.model_class
+      end
 
-        fields
+      def label
+        value.send(target_resource.title)
       end
 
-      def foreign_key(model)
-        if model.class == Class
-          model.reflections[@relation_method].foreign_key
-        else
-          model.class.reflections[@relation_method].foreign_key
-        end
+      def to_permitted_param
+        foreign_key.to_sym
       end
 
-      def get_target_resource(model)
-        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 class_name.to_s
+      private
+        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
-      end
     end
   end
 end

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

@@ -1,10 +1,12 @@
 module Avo
   module Fields
     class BooleanField < Field
+      attr_reader :true_value
+      attr_reader :false_value
+
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'boolean-field',
+          partial_name: 'boolean-field',
           computable: true,
         }
 
@@ -14,12 +16,8 @@ module Avo
         @false_value = args[:false_value].present? ? args[:false_value] : false
       end
 
-      def hydrate_field(fields, model, resource, view)
-        {
-          value: resolve_attribute(fields[:value]),
-          true_value: @true_value,
-          false_value: @false_value,
-        }
+      def value
+        resolve_attribute super
       end
 
       def resolve_attribute(value)
@@ -27,11 +25,11 @@ module Avo
       end
 
       def truthy_values
-        ['true', @true_value]
+        ['true', '1', @true_value]
       end
 
       def falsy_values
-        ['false', @false_value]
+        ['false', '0', @false_value]
       end
     end
   end

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

@@ -1,32 +1,34 @@
 module Avo
   module Fields
     class BooleanGroupField < Field
+      attr_reader :options
+
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'boolean-group-field',
+          partial_name: 'boolean-group-field',
           computable: true,
         }
 
         super(name, **args, &block)
 
-        @is_object_param = true
-
         @options = args[:options].present? ? args[:options] : {}
       end
 
-      def hydrate_field(fields, model, resource, view)
-        {
-          options: @options,
-        }
+      def to_permitted_param
+        ["#{id}": [] ]
       end
 
       def fill_field(model, key, value)
-        return model unless value.is_a? ActionController::Parameters
-
         new_value = {}
 
-        value.each do |key, value|
-          new_value[key] = ActiveModel::Type::Boolean.new.cast value
+        # Filter out the empty ("") value boolean group generates
+        value = value.filter do |arr_value|
+          arr_value.present?
+        end
+
+        # Cast values to booleans
+        options.each do |id, label|
+          new_value[id] = value.include? id.to_s
         end
 
         model[id] = new_value