avo 3.0.0.pre6 → 3.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648d67d19be6d7475617bcc3534cb4a3a534b02cf16b2178d145c31e3ffc9747
-  data.tar.gz: e64cb4bbdd4863c112a61a002a593954ee9794542c46402fb63bb036bc875918
+  metadata.gz: fe5b6765044687c412c2fd89cf479e3e1fe775f6eb0519824cc63c7bd3a651b2
+  data.tar.gz: f65add1a904af96f6464e22bd1c86464111c4a46f03e9a8375452fffd6afce5e
 SHA512:
-  metadata.gz: e3486bc36e7c7bda0997ff00b28b69fbdc100e32e568e34e3e5b230d5fe5e8d13bb45fe815f336d133ac3c797b61fd55bcc38084f260482baa3ea480370ff018
-  data.tar.gz: 71d11d5cd259929fd45283e4b32356a58529b07bf9edddfa95a051eb628ec7adfe087c8b2cc3ee0c2d29b4aeb892113e86f7abb4b4471f42ad14d0ded94af85a
+  metadata.gz: 47d6fe1f910683c701cbdc253c879f2415de5f9744237a496a6abc0237cce464f609f4c6c598870e7f119bf1e71f19f817e223973dc4881d3527f8559030c0f3
+  data.tar.gz: 731535291627256c234a5eeded5ad7854f89a25a399a201b5f76a94d9c74d87793cfb0dd25f44f31ae1b7f590203f3393b28089c080b2fdaca8a8282b2b790e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.0.pre6)
+    avo (3.0.0.pre7)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/assets/svgs/triangle-up.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="21" height="9" role="presentation"><g fill="none" fill-rule="evenodd"><path fill="#8898AA" fill-opacity="0.1" d="M1 9.092h19l-6.402-6.74c-1.717-1.806-4.485-1.8-6.196 0L1 9.093zM20.342 8l-6.02-6.336c-2.108-2.22-5.538-2.218-7.645 0L.658 8h19.684z"></path><path fill="currentcolor" d="M7.402 2.353c1.711-1.801 4.48-1.807 6.196 0L20 9.093H1l6.402-6.74z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="21" height="9" role="presentation"><g fill="none" fill-rule="evenodd"><path fill="#C9CBCF" fill-opacity="1" d="M1 9.092h19l-6.402-6.74c-1.717-1.806-4.485-1.8-6.196 0L1 9.093zM20.342 8l-6.02-6.336c-2.108-2.22-5.538-2.218-7.645 0L.658 8h19.684z"></path><path fill="currentcolor" d="M7.402 2.353c1.711-1.801 4.48-1.807 6.196 0L20 9.093H1l6.402-6.74z"></path></g></svg>

data/app/components/avo/index/field_wrapper_component.rb

@@ -21,7 +21,6 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
       result += " py-3"
     end
 
-    result += " #{text_align_classes}"
     result += " #{@field.get_html(:classes, view: view, element: :wrapper)}"
 
     result
@@ -45,15 +44,4 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
 
     attributes
   end
-
-  private
-
-  def text_align_classes
-    case @field.index_text_align.to_sym
-    when :right
-      "text-right"
-    when :center
-      "text-center"
-    end
-  end
 end

data/app/controllers/avo/search_controller.rb

@@ -37,7 +37,7 @@ module Avo
       query = Avo::ExecutionContext.new(
         target: resource.search_query,
         params: params,
-        scope: resource.class.scope
+        query: resource.class.scope
       ).handle
 
       # Get the count
@@ -101,16 +101,16 @@ module Avo
     # This scope is applied if the search is being performed on a has_many association
     def apply_has_many_scope
       association_name = BaseResource.valid_association_name(parent, params[:via_association_id])
-      scope = parent.send(association_name)
+      query = parent.send(association_name)
 
-      Avo::ExecutionContext.new(target: @resource.search_query, params: params, scope: scope).handle
+      Avo::ExecutionContext.new(target: @resource.search_query, params: params, query: query).handle
     end
 
     def apply_search_metadata(records, avo_resource)
       records.map do |record|
         # TODO: refactor this
         # resource = avo_resource.dup.hydrate(record: record).hydrate_fields
-        resource = avo_resource.dup.hydrate(record: record).hydrate_fields
+        resource = avo_resource.dup.hydrate(record: record)
 
         fetch_result_information record, resource
       end

data/app/views/avo/partials/_table_header.html.erb

@@ -37,14 +37,6 @@
         sort_direction = 'desc'
       end
       classes = "text-gray-500 tracking-tight leading-tight text-xs font-semibold"
-      classes += case field.index_text_align.to_sym
-        when :right
-          " text-right"
-        when :center
-          " text-center"
-        else
-          ""
-        end
     %>
     <%= content_tag :th,
       class: "text-left uppercase px-3 py-3 whitespace-nowrap rounded-l",

data/lib/avo/base_action.rb

@@ -158,12 +158,6 @@ module Avo
       self
     end
 
-    def fail(text)
-      Rails.logger.warn "DEPRECATION WARNING: Action fail method is deprecated in favor of error method and will be removed from Avo version 3.0.0"
-
-      error text
-    end
-
     def error(text)
       add_message text, :error
 

data/lib/avo/base_resource.rb

@@ -57,7 +57,7 @@ module Avo
     class_attribute :resolve_find_scope
     # TODO: refactor this into a Host without args
     class_attribute :find_record_method, default: -> {
-      model_class.find id
+      query.find id
     }
     class_attribute :hide_from_global_search, default: false
     class_attribute :after_create_path, default: :show
@@ -112,7 +112,7 @@ module Avo
       # This resolves the scope when doing "where" queries (not find queries)
       def query_scope
         final_scope = if resolve_index_query.present?
-          Avo::ExecutionContext.new(target: resolve_index_query, model_class: model_class).handle
+          Avo::ExecutionContext.new(target: resolve_index_query, query: model_class).handle
         else
           model_class
         end
@@ -123,7 +123,7 @@ module Avo
       # This resolves the scope when finding records (not "where" queries)
       def find_scope
         final_scope = if resolve_find_scope.present?
-          Avo::ExecutionContext.new(target: resolve_find_scope, model_class: model_class).handle
+          Avo::ExecutionContext.new(target: resolve_find_scope, query: model_class).handle
         else
           model_class
         end
@@ -536,11 +536,9 @@ module Avo
     end
 
     def find_record(id, query: nil, params: nil)
-      query ||= self.class.find_scope
-
       Avo::ExecutionContext.new(
         target: self.class.find_record_method,
-        model_class: query,
+        query: query || self.class.find_scope,
         id: id,
         params: params
       ).handle

data/lib/avo/fields/base_field.rb

@@ -38,7 +38,6 @@ module Avo
       attr_reader :as_label
       attr_reader :as_avatar
       attr_reader :as_description
-      attr_reader :index_text_align
       attr_reader :stacked
       attr_reader :for_presentation_only
 
@@ -75,7 +74,6 @@ module Avo
         @as_label = args[:as_label] || false
         @as_avatar = args[:as_avatar] || false
         @as_description = args[:as_description] || false
-        @index_text_align = args[:index_text_align] || :left
         @html = args[:html] || nil
         @view = args[:view] || nil
         @value = args[:value] || nil
@@ -160,11 +158,28 @@ module Avo
 
         # Run computable callback block if present
         if computable && block.present?
-          final_value = instance_exec(record, @resource, @view, self, &block)
+          final_value = Avo::ExecutionContext.new(
+            target: block,
+            record: record,
+            resource: @resource,
+            view: @view,
+            field: self,
+            include: self.class.included_modules
+          ).handle
         end
 
         # Run the value through resolver if present
-        final_value = instance_exec(final_value, &@format_using) if @format_using.present?
+        if format_using.present?
+          final_value = Avo::ExecutionContext.new(
+            target: format_using,
+            value: final_value,
+            record: record,
+            resource: @resource,
+            view: @view,
+            field: self,
+            include: self.class.included_modules
+          ).handle
+        end
 
         final_value
       end

data/lib/avo/filters/base_filter.rb

@@ -13,6 +13,9 @@ module Avo
       attr_reader :arguments
 
       delegate :params, to: Avo::Current
+      delegate :request, to: Avo::Current
+      delegate :view_context, to: Avo::Current
+      delegate :current_user, to: Avo::Current
 
       class << self
         def decode_filters(filter_params)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre6" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre7" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/resource_generator.rb

@@ -132,7 +132,7 @@ module Generators
       def generated_fields_template
         return if fields.blank?
 
-        fields_string = "\n  # Fields generated from the model"
+        fields_string = ""
 
         fields.each do |field_name, field_options|
           options = ""

data/lib/generators/avo/templates/action.tt

@@ -4,11 +4,13 @@ class Avo::Actions::<%= class_name.camelize %> < Avo::BaseAction
   #   true
   # end
 
-  def handle(**args)
-    models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
+  # def fields
+  #   # Add Action fields here
+  # end
 
-    models.each do |model|
-      # Do something with your models.
+  def handle(records:, fields:, current_user:, resource:)
+    records.each do |model|
+      # Do something with your records.
     end
   end
 end

data/lib/generators/avo/templates/dashboards/dashboard.tt

@@ -7,6 +7,8 @@ class Avo::Dashboards::<%= class_name.camelize %> < AvoDashboards::BaseDashboard
   #   true
   # end
 
-  # cards go here
-  # card UsersCount
+  def cards
+    # cards go here
+    # card UsersCount
+  end
 end

data/lib/generators/avo/templates/resource/resource.tt

@@ -2,9 +2,10 @@ class Avo::Resources::<%= resource_class %> < Avo::BaseResource
   self.title = :id
   self.includes = []<%= model_class_from_args %>
   # self.search_query = -> do
-  #   scope.ransack(id_eq: params[:q], m: "or").result(distinct: false)
+  #   query.ransack(id_eq: params[:q], m: "or").result(distinct: false)
   # end
 
-  field :id, as: :id<%= generate_fields %>
-  # add fields here
+  def fields
+    field :id, as: :id<%= generate_fields %>
+  end
 end

data/lib/generators/avo/templates/standalone_action.tt

@@ -1,8 +1,15 @@
 class Avo::Actions::<%= class_name.camelize %> < Avo::BaseAction
   self.name = "<%= name.underscore.humanize %>"
   self.standalone = true
+  # self.visible = -> do
+  #   true
+  # end
 
-  def handle(fields:)
+  # def fields
+  #   # Add Action fields here
+  # end
+
+  def handle(fields:, current_user:, resource:)
     # Do something here
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre6
+  version: 3.0.0.pre7
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord