avo 0.4.6 → 0.5.0.beta1

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

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

@@ -5,7 +5,7 @@ module Avo
     class PasswordField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'password-field',
+          partial_name: 'password-field',
         }
 
         show_on :forms

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

@@ -1,27 +1,50 @@
 module Avo
   module Fields
     class SelectField < Field
+      attr_reader :options
+      attr_reader :enum
+      attr_reader :display_value
+
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'select-field',
+          partial_name: 'select-field',
         }
 
         super(name, **args, &block)
 
-        @options = args[:options].present? ? args[: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 hydrate_field(fields, model, resource, view)
-        {
-          options: @options,
-          enum: @enum,
-          display_value: @display_value,
-          placeholder: @placeholder,
-        }
+      def options_for_select
+        if enum.present?
+          if display_value
+            options.invert
+          else
+            options.map { |label, value| [label, label] }.to_h
+          end
+        else
+          if display_value
+            options.map { |label, value| [value, value] }.to_h
+          else
+            options
+          end
+        end
+      end
+
+      def label
+        if display_value
+          value
+        else
+          if enum.present?
+            options[value]
+          else
+            options.invert[value]
+          end
+        end
       end
     end
   end

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

@@ -3,8 +3,7 @@ module Avo
     class StatusField < Field
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'status-field',
+          partial_name: 'status-field',
         }
 
         super(name, **args, &block)
@@ -13,11 +12,14 @@ module Avo
         @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten : [:failed]
       end
 
-      def hydrate_field(fields, model, resource, view)
-        {
-          loading_when: @loading_when,
-          failed_when: @failed_when,
-        }
+      def status
+        status = 'success'
+        if value.present?
+          status = 'failed' if @failed_when.include? value.to_sym
+          status = 'loading' if @loading_when.include? value.to_sym
+        end
+
+        status
       end
     end
   end

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

@@ -3,8 +3,7 @@ module Avo
     class TextField < Field
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'text-field',
+          partial_name: 'text-field',
           computable: true,
         }.merge(@defaults || {})
 
@@ -12,12 +11,6 @@ module Avo
 
         @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/textarea_field.rb

@@ -5,8 +5,7 @@ module Avo
     class TextareaField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          sortable: true,
-          component: 'textarea-field',
+          partial_name: 'textarea-field',
           computable: true,
         }
 
@@ -14,13 +13,7 @@ module Avo
 
         hide_on :index
 
-        @rows = args[:rows].present? ? args[:rows].to_i : 5
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          rows: @rows
-        }
+        @meta[:rows] = args[:rows].present? ? args[:rows].to_i : 5
       end
     end
   end

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

@@ -3,9 +3,11 @@ require_relative 'field'
 module Avo
   module Fields
     class TrixField < Field
+      attr_reader :always_show
+
       def initialize(name, **args, &block)
         @defaults = {
-          component: 'trix-field',
+          partial_name: 'trix-field',
         }
 
         super(name, **args, &block)
@@ -14,12 +16,6 @@ module Avo
 
         @always_show = args[:always_show].present? ? args[:always_show] : false
       end
-
-      def hydrate_field(fields, model, resource, view)
-        {
-          always_show: @always_show
-        }
-      end
     end
   end
 end

data/lib/avo/app/fields_loader.rb

@@ -0,0 +1,29 @@
+class Avo::FieldsLoader
+  attr_accessor :bag
+
+  def initialize
+    @bag = []
+  end
+
+  def add_field(field)
+    @bag.push field
+  end
+
+  def method_missing(method, *args, &block)
+    matched_field = Avo::App.fields.find do |field|
+      field[:name].to_s == method.to_s
+    end
+
+    if matched_field.present? and matched_field[:class].present?
+      klass = matched_field[:class]
+
+      if block.present?
+        field = klass::new(args[0], **args[1] || {}, &block)
+      else
+        field = klass::new(args[0], **args[1] || {})
+      end
+
+      add_field field
+    end
+  end
+end

data/lib/avo/app/licensing/hq.rb

@@ -2,9 +2,9 @@ module Avo
   class HQ
     attr_accessor :current_request
 
-    ENDPOINT = 'https://avohq.io/api/v1/licenses/check'
-    CACHE_KEY = 'avo.hq.response'
-    REQUEST_TIMEOUT = 5 # seconds
+    ENDPOINT = 'https://avohq.io/api/v1/licenses/check' unless const_defined?(:ENDPOINT)
+    CACHE_KEY = 'avo.hq.response' unless const_defined?(:CACHE_KEY)
+    REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
 
     def initialize(current_request)
       @current_request = current_request

data/lib/avo/app/licensing/license.rb

@@ -27,7 +27,7 @@ module Avo
     end
 
     def properties
-      @response.slice 'valid', 'id', 'error'
+      @response.slice('valid', 'id', 'error').symbolize_keys
     end
 
     def abilities

data/lib/avo/app/resource.rb

@@ -1,107 +1,151 @@
-require_relative 'resource_fields'
 require_relative 'resource_grid_fields'
-require_relative 'resource_filters'
-require_relative 'resource_actions'
 require_relative 'fields/field'
 
 module Avo
   module Resources
     class Resource
-      attr_reader :required
-      attr_reader :includes
-      attr_reader :default_view_type
-
-      class << self
-        def hydrate_resource(model:, resource:, view: :index, user:)
-          case view
-          when :show
-            panel_name = I18n.t 'avo.resource_details', name: resource.name.downcase.upcase_first
-          when :edit
-            panel_name = I18n.t('avo.edit_item', item: resource.name.downcase).upcase_first
-          when :create
-            panel_name = I18n.t('avo.create_new_item', item: resource.name.downcase).upcase_first
-          end
-
-          resource_with_fields = {
-            id: model.id,
-            authorization: get_authorization(user, model),
-            singular_name: resource.singular_name,
-            plural_name: resource.plural_name,
-            title: model[resource.title],
-            translation_key: resource.translation_key,
-            path: resource.url,
-            fields: [],
-            grid_fields: {},
-            panels: [{
-              name: panel_name,
-              component: 'panel',
-            }]
-          }
+      attr_writer :name
+
+      attr_accessor :id
+      attr_accessor :title
+      attr_accessor :search
+      attr_accessor :includes
+      attr_accessor :translation_key
+      attr_accessor :default_view_type
+      attr_accessor :devise_password_optional
+      attr_accessor :view
+      attr_accessor :model
+      attr_accessor :user
+      attr_accessor :fields_loader
+      attr_accessor :grid_loader
+      attr_accessor :actions_loader
+      attr_accessor :filters_loader
+      attr_accessor :params
+
+      alias :field :fields_loader
+      alias :f :field
+      alias :g :grid_loader
+      alias :action :actions_loader
+      alias :a :action
+      alias :filter :filters_loader
+
+      def initialize(request = nil)
+        @id = :id
+        @title = 'Resource'
+        @search = []
+        @includes = []
+        @translation_key = nil
+        @default_view_type = :table
+        @devise_password_optional = false
+
+        configure
+        boot_fields request
+      end
 
-          grid_fields = resource.get_grid_fields
-          grid_fields_by_required_field = grid_fields.map { |grid_field_id, field| [field.id, grid_field_id] }.to_h
+      def boot_fields(request)
+        @fields_loader = Avo::FieldsLoader.new
+        fields request
 
-          resource.get_fields.each do |field|
-            field_is_required_in_grid_view = grid_fields.map { |grid_field_id, field| field.id }.include?(field.id)
-            required_in_current_view = field.send("show_on_#{view.to_s}")
+        @grid_loader = Avo::FieldsLoader.new
+        grid request if self.respond_to? :grid
 
-            next unless required_in_current_view or field_is_required_in_grid_view
+        @actions_loader = Avo::ActionsLoader.new
+        actions request if self.respond_to? :actions
 
-            furnished_field = field.fetch_for_resource(model, resource, view)
+        @filters_loader = Avo::ActionsLoader.new
+        filters request if self.respond_to? :filters
+      end
 
-            next unless field_resource_authorized field, furnished_field, user
+      def hydrate(model: nil, view: nil, user: nil, params: nil)
+        @view = view if view.present?
+        @user = user if user.present?
+        @params = params if params.present?
 
-            next if furnished_field.blank?
+        if model.present?
+          @model = model
 
-            furnished_field[:panel_name] = panel_name
-            furnished_field[:show_on_show] = field.show_on_show
+          hydrate_model_with_default_values if @view == :new
+        end
 
-            if field.has_own_panel?
-              furnished_field[:panel_name] = field.name.to_s.pluralize
-            end
+        self
+      end
 
-            if field_is_required_in_grid_view
-              required_field = grid_fields_by_required_field[field.id]
-              resource_with_fields[:grid_fields][required_field] = furnished_field
+      def get_fields(panel: nil, view_type: :table, reflection: nil)
+        case view_type.to_sym
+        when :table
+          fields = get_field_definitions.select do |field|
+            field.send("show_on_#{@view.to_s}")
+          end
+          .select do |field|
+            field.can_see.present? ? field.can_see.call : true
+          end
+          .select do |field|
+            unless field.respond_to?(:foreign_key) &&
+              reflection.present? &&
+              reflection.respond_to?(:foreign_key) &&
+              reflection.foreign_key == field.foreign_key
+              true
             end
 
-            if required_in_current_view
-              resource_with_fields[:fields] << furnished_field
-            end
           end
+        when :grid
+          fields = @grid_loader.bag
+        end
 
-          resource_with_fields
+        if panel.present?
+          fields = fields.select do |field|
+            field.panel_name == panel
+          end
         end
 
-        def show_path(resource)
-          "/resources/#{resource.class.model_name.plural}/#{resource.id}"
+        fields = fields.map do |field|
+          field.hydrate(model: @model, view: @view, resource: self)
         end
 
-        def index_path(resource_or_class)
-          if resource_or_class.class == String
-            url = resource_or_class.underscore.pluralize
-          else
-            url = resource_or_class.class.name.demodulize.underscore.pluralize
-          end
+        fields
+      end
 
-          "/resources/#{url}"
+      def get_field_definitions
+        @fields_loader.bag.map do |field|
+          field.hydrate(resource: self, panel_name: default_panel_name, user: user)
         end
+      end
+
+      def default_panel_name
+        return @params[:related_name].capitalize if @params[:related_name].present?
 
-        def get_authorization(user, model)
-          [:create, :edit, :update, :show, :destroy].map do |action|
-            [action, AuthorizationService::authorize_action(user, model, action)]
-          end.to_h
+        case @view
+        when :show
+          I18n.t('avo.resource_details', item: self.name.downcase, title: model_title).upcase_first
+        when :edit
+          I18n.t('avo.update_item', item: self.name.downcase, title: model_title).upcase_first
+        when :new
+          I18n.t('avo.create_new_item', item: self.name.downcase).upcase_first
         end
+      end
+
+      def panels
+        panels = [
+          {
+            name: default_panel_name,
+            type: :fields,
+            in_panel: true,
+          }
+        ]
 
-        def field_resource_authorized(field, furnished_field, user)
-          if [Avo::Fields::HasManyField, Avo::Fields::HasAndBelongsToManyField].include? field.class
-            return true if furnished_field[:relationship_model].nil?
+        panels
+      end
 
-            AuthorizationService.authorize user, furnished_field[:relationship_model].safe_constantize, Avo.configuration.authorization_methods.stringify_keys['index']
-          else
-            true
-          end
-        end
+      def model_class
+        return @model.class if @model.present?
+
+        self.class.name.demodulize.safe_constantize
+      end
+
+      def model_title
+        return @model.send title if @model.present?
+
+        name
       end
 
       def name
@@ -113,8 +157,6 @@ module Avo
       end
 
       def singular_name
-        return I18n.t(@translation_key, count: 1).capitalize if @translation_key
-
         name
       end
 
@@ -130,56 +172,26 @@ module Avo
         self.class.name.demodulize.underscore
       end
 
-      def url
-        return @url if @url.present?
-
-        self.class.name.demodulize.underscore.pluralize
-      end
-
-      def title
-        return @title if @title.present?
-
-        'id'
-      end
-
-      def translation_key
-        @translation_key
-      end
-
-      def model
-        return @model if @model.present?
-
-        underscore_name.to_s.camelize.singularize
-      end
-
-      def get_fields
-        self.class.get_fields
-      end
-
-      def get_grid_fields
-        self.class.get_grid_fields
-      end
-
       def available_view_types
-        get_grid_fields.length > 0 ? [:grid, :table] : [:table]
+        get_fields(view_type: :grid).length > 0 ? [:grid, :table] : [:table]
       end
 
       def get_filters
-        self.class.get_filters
+        @filters_loader.bag
       end
 
       def get_actions
-        self.class.get_actions
+        @actions_loader.bag
       end
 
-      def search
-        @search
+      def route_key
+        model_class.model_name.route_key
       end
 
       def query_search(query: '', via_resource_name: , via_resource_id:, user:)
-        model_class = self.model
+        # model_class = self.model
 
-        db_query = AuthorizationService.with_policy(user, model_class)
+        db_query = AuthorizationService.apply_policy(user, model_class)
 
         if via_resource_name.present?
           related_model = App.get_resource_by_name(via_resource_name).model
@@ -198,25 +210,15 @@ module Avo
         db_query.where(new_query.join(' '))
       end
 
-      def model
-        return @model if @model.present?
-
-        self.class.name.demodulize.safe_constantize
-      end
-
       def attached_file_fields
-        get_fields.select do |field|
+        get_field_definitions.select do |field|
           [Avo::Fields::FileField, Avo::Fields::FilesField].include? field.class
         end
       end
 
-      def has_devise_password
-        @has_devise_password or false
-      end
-
       def fill_model(model, params)
         # Map the received params to their actual fields
-        fields_by_database_id = self.get_fields.map { |field| [field.database_id(model).to_s, field] }.to_h
+        fields_by_database_id = self.get_field_definitions.map { |field| [field.database_id(model).to_s, field] }.to_h
 
         params.each do |key, value|
           field = fields_by_database_id[key]
@@ -228,6 +230,62 @@ module Avo
 
         model
       end
+
+      def authorization
+        AuthorizationService.new(user, model)
+      end
+
+      def file_hash
+        content_to_be_hashed = ''
+
+        # resource file hash
+        resource_path = Rails.root.join('app', 'avo', 'resources', "#{name.underscore}.rb").to_s
+        if File.file? resource_path
+          content_to_be_hashed += File.read(resource_path)
+        end
+
+        # policy file hash
+        policy_path = Rails.root.join('app', 'policies', "#{name.underscore}_policy.rb").to_s
+        if File.file? policy_path
+          content_to_be_hashed += File.read(policy_path)
+        end
+
+        Digest::MD5.hexdigest(content_to_be_hashed)
+      end
+
+      # For :new views we're hydrating the model with the values from the resource's default attribute.
+      # We will not overwrite any attributes that come pre-filled in the model.
+      def hydrate_model_with_default_values
+        default_values = get_fields.select do |field|
+          !field.computed
+        end
+        .map do |field|
+          id = field.id
+          value = field.value
+
+          if field.respond_to? :foreign_key
+            id = field.foreign_key.to_sym
+
+            reflection = @model._reflections[@params[:via_relation]]
+
+            if reflection.present? && reflection.foreign_key.present?
+              value = @params[:via_resource_id]
+            end
+          end
+
+          [id, value]
+        end
+        .to_h
+        .select do |id, value|
+          value.present?
+        end
+
+        default_values.each do |id, value|
+          if @model.send(id).nil?
+            @model.send("#{id}=", value)
+          end
+        end
+      end
     end
   end
 end