avo 2.13.5.pre.2 → 2.13.6.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac27367850b66ed5118891624a6480086e08d5e781a186cc766af138cff1c77
-  data.tar.gz: 59c4765ea8e68bbfc5e088c6b9a3bad11c3f8ece23f3090793299ea414094086
+  metadata.gz: 5c3d594c867fc840c703aff831b7a39e66ca678d525ce66a698014979197fa8d
+  data.tar.gz: c8d325159aadabb979c15df783595b68ad2c1ea5c150779f85de66255b1ba221
 SHA512:
-  metadata.gz: ce476b0f388b16f1f27e96e94499a30fe35a59acea7997aa5a72f16ba0e85bf86d1b2f79481b69eb32504bcb58a27f7355a4e004983072e216fd117b9c836e67
-  data.tar.gz: 413d0a5063903155f3915a309d8291d5cea91192d971b4899b7ed5a8a21eae7f295458aacb34eaa10f2ccea76656a0c9b01393a4048769d9b7587882f3bc6ce2
+  metadata.gz: 3abe727bca4823198022bd9e79ccadc9c2b79b1cc8d6ab1070b57e9761e93620ee457dfa45b45a9847258640c551865b9d830bfd73326372a355c7c3fabbaf60
+  data.tar.gz: f7107a8cb2b0dbc072a50eaa5faa3b92ad565642c835a11ee30bbcde0f601c94bbc56694f39c4c363592194203144a78215e9bade5c478433a2603a8486f1251

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.13.5.pre.2)
+    avo (2.13.6.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/components/avo/base_component.rb

@@ -9,9 +9,10 @@ class Avo::BaseComponent < ViewComponent::Base
 
   private
 
-  # Use the @parent_resource to fetch the field using the @reflection name.
+  # Figure out what is the corresponding field for this @reflection
   def field
-    @parent_resource.get_field_definitions.find { |f| f.id == @reflection.name }
+    fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
+    fields.find { |f| f.id == @reflection.name }
   rescue
     nil
   end

data/app/components/avo/fields/common/single_file_viewer_component.html.erb

@@ -21,7 +21,7 @@
     <div class="flex space-x-2">
       <div class="flex">
         <% if @resource.authorization.authorize_action(:download_attachments?, raise_exception: false) %>
-          <%= a_link helpers.main_app.url_for(file),
+          <%= a_link file.url(disposition: :attachment),
             icon: 'heroicons/outline/download',
             color: :primary,
             download: true,

data/app/components/avo/resource_component.rb

@@ -4,7 +4,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
   attr_reader :has_many_panels
   attr_reader :has_as_belongs_to_many_panels
   attr_reader :resource_tools
-  attr_reader :resource
   attr_reader :view
 
   def can_create?
@@ -20,7 +19,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def can_detach?
-    authorize_association_for(:detach)
+    authorize_association_for("detach")
   end
 
   def detach_path
@@ -54,7 +53,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
     if @reflection.present?
       # Fetch the appropiate resource
-      reflection_resource = field.resource
+      reflection_resource = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name)
       # Fetch the model
       # Hydrate the resource with the model if we have one
       reflection_resource.hydrate(model: @parent_model) if @parent_model.present?

data/app/components/avo/views/resource_edit_component.rb

@@ -4,6 +4,8 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
+  attr_reader :view
+
   def initialize(resource: nil, model: nil, actions: [], view: :edit)
     @resource = resource
     @model = model

data/app/javascript/js/controllers/fields/date_field_controller.js

@@ -117,7 +117,11 @@ export default class extends Controller {
 
     flatpickr(this.fakeInputTarget, options)
 
-    this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())
+    if (this.enableTimeValue) {
+      this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())
+    } else {
+      this.updateRealInput(universalTimestamp(this.initialValue))
+    }
   }
 
   onChange(selectedDates) {

data/lib/avo/base_resource.rb

@@ -20,6 +20,7 @@ module Avo
     delegate :context, to: ::Avo::App
 
     attr_accessor :view
+    attr_accessor :model
     attr_accessor :reflection
     attr_accessor :user
     attr_accessor :params
@@ -110,11 +111,6 @@ module Avo
       end
     end
 
-    def record
-      @model
-    end
-    alias :model :record
-
     def hydrate(model: nil, view: nil, user: nil, params: nil)
       @view = view if view.present?
       @user = user if user.present?

data/lib/avo/concerns/fetches_things.rb

@@ -51,15 +51,10 @@ module Avo
         #
         # get_resource_by_name('User') => UserResource
         # get_resource_by_name(User) => UserResource
-        def get_resource_by_model_name(klass)
-          # Fetch the mappings imposed by the user.
-          # If they are present, use those ones.
-          mapping = get_mapping_for_model klass
-          return get_resource(mapping) if mapping.present?
-
+        def get_resource_by_model_name(name)
           valid_resources
             .find do |resource|
-              resource.model_class.model_name.name == klass.to_s
+              resource.model_class.model_name.name == name.to_s
             end
         end
 
@@ -133,12 +128,6 @@ module Avo
 
           get_sidebar_partials
         end
-
-        private
-
-        def get_mapping_for_model(klass)
-          (Avo.configuration.model_resource_mapping || {}).stringify_keys.transform_values(&:to_s)[klass.to_s]
-        end
       end
     end
   end

data/lib/avo/configuration.rb

@@ -34,7 +34,6 @@ module Avo
     attr_accessor :buttons_on_form_footers
     attr_accessor :main_menu
     attr_accessor :profile_menu
-    attr_accessor :model_resource_mapping
 
     def initialize
       @root_path = "/avo"
@@ -79,7 +78,6 @@ module Avo
       @buttons_on_form_footers = false
       @main_menu = nil
       @profile_menu = nil
-      @model_resource_mapping = {}
     end
 
     def current_user_method(&block)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.5.pre.2" unless const_defined?(:VERSION)
+  VERSION = "2.13.6.pre.1" unless const_defined?(:VERSION)
 end

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

@@ -34,27 +34,25 @@ Avo.configure do |config|
   ## == Localization ==
   # config.locale = 'en-US'
 
-  ## == Resource options ==
-  # config.resource_controls = :right
-  # config.model_resource_mapping = {}
-  # config.default_view_type = :table
-  # config.per_page = 24
-  # config.per_page_steps = [12, 24, 48, 72]
-  # config.via_per_page = 8
-  # config.id_links_to_resource = false
-  # config.cache_resources_on_index_view = true
-
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
+  # config.per_page = 24
+  # config.per_page_steps = [12, 24, 48, 72]
+  # config.via_per_page = 8
+  # config.default_view_type = :table
   # config.hide_layout_when_printing = false
+  # config.id_links_to_resource = false
   # config.full_width_container = false
   # config.full_width_index_view = false
+  # config.cache_resources_on_index_view = true
   # config.search_debounce = 300
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
+  # config.resource_controls = :right
+
 
   ## == Breadcrumbs ==
   # config.display_breadcrumbs = true