avo 2.26.2.pre.pr1579 → 2.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9b60d0d2f1fc8e8f3536899e3559d78886342441ab558991dc2b374fbc45ac
-  data.tar.gz: 3bab366736547f5d041c5e1283b76b569d8ae788d25eafc4bf919ffb17d3a3e8
+  metadata.gz: 5aeea2a89ba96a4f920fe402b22ad5ec878c68f538d93d85e7c9e294a417fd20
+  data.tar.gz: cc521cbc9e8e6ac23b56af74f29222bdfacef50bc0adec8eb4e3bae29684ab45
 SHA512:
-  metadata.gz: b159c53be13567f56c149d7cf5d7c16af84dcf1f55f69662d09317c54b5151b628798fc26cf02175a6dd9b19b734e7a4fc3918cbf4b860aff50f53f82d1b9f46
-  data.tar.gz: e74aa9525374ede47f68c0ca70b0ecf4824ddaae4bb2430538462c4226d53a431f35dbfd54ed6dfbd8dad528e21174ada30f9dec34459a5480ad3dd0ebb71a23
+  metadata.gz: f01a90d325dff0c0143e9a2ce3194c49b51ad42c4435621999be67463a33e201c94072b25a6d369f8230c76476e27bcaaef35de67aca1e88cff94a685aa1dbaf
+  data.tar.gz: 9368a51618b19f713d94f9f83e4922dbb307e5963d581a7ad55d8f10511f49befa28e95ab4a304c3ee7dbfab06748e3e64c0b4ea3907f308f34832bafb9e29c4

data/Gemfile

@@ -80,8 +80,9 @@ group :development do
   gem "brakeman"
 end
 
+gem "awesome_print"
+
 group :development, :test do
-  gem "awesome_print"
   gem "faker", require: false
   gem "i18n-tasks", "~> 1.0.12"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.26.2.pre.pr1579)
+    avo (2.27.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -273,7 +273,7 @@ GEM
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (6.0.1)
+    pagy (6.0.2)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)

data/app/components/avo/index/ordering/buttons_component.html.erb

@@ -1,4 +1,4 @@
-<div class="flex items-center justify-center">
+<div class="flex items-center justify-center" data-component="<%= self.class.to_s.underscore %>">
   <% if display_inline? %>
     <div class="flex max-w-xs rounded">
       <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :higher, svg: 'arrow-up' %>

data/app/components/avo/index/resource_controls_component.html.erb

@@ -1,6 +1,9 @@
 <div class="space-x-2 flex flex-row justify-around w-full">
   <% button_classes = "text-gray-600 h-6 hover:text-gray-600" %>
-  <%= render Avo::Index::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type %>
+
+  <% if can_reorder? %>
+    <%= render Avo::Index::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type %>
+  <% end %>
 
   <% if can_view? %>
     <%= link_to helpers.svg('eye', class: button_classes),

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

@@ -31,6 +31,12 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action(:show, raise_exception: false)
   end
 
+  def can_reorder?
+    return authorize_association_for(:reorder) if @reflection.present?
+
+    @resource.authorization.authorize_action(:reorder, raise_exception: false)
+  end
+
   def show_path
     args = {}
 

data/app/views/layouts/avo/application.html.erb

@@ -36,7 +36,7 @@
             <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
               <%= render partial: "avo/partials/custom_tools_alert" %>
               <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
-                <%= yield %>
+                <%= yield.force_encoding('UTF-8') %>
                 <%= render partial: "avo/partials/footer" %>
               </div>
             </div>

data/bin/prod

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+PORT="${PORT:-3030}"
+export PORT
+
+if command -v overmind &> /dev/null; then
+  overmind start -f Procfile "$@"
+else
+  foreman start -f Procfile "$@"
+fi

data/config/i18n-tasks.yml

@@ -117,6 +117,7 @@ ignore_missing:
   - 'avo.field_translations.people'
   - 'avo.number_of_items'
   - 'avo.resource_translations.user'
+  - 'avo.resource_translations.team_members'
   - 'avo.x_items_more'
 
 # - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'

data/lib/avo/app.rb

@@ -115,8 +115,45 @@ module Avo
         end
       end
 
+      # Fetches the resources available to the application.
+      # We have two ways of doing that.
+      #
+      # 1. Through eager loading.
+      # We automatically eager load the resources directory and fetch the descendants from the scanned files.
+      # This is the simple way to get started.
+      #
+      # 2. Manually, declared by the user.
+      # We have this option to load the resources because when they are loaded automatically through eager loading,
+      # those Resource classes and their methods may trigger loading other classes. And that may disrupt Rails booting process.
+      # Ex: AdminResource may use self.model_class = User. That will trigger Ruby to load the User class and itself load
+      # other classes in a chain reaction.
+      # The scenario that comes up most often is when Rails boots, the routes are being computed which eager loads the resource files.
+      # At that boot time some migration might have not been run yet, but Rails tries to access them through model associations,
+      # and they are not available.
+      #
+      # To enable this feature add a `resources` array config in your Avo initializer.
+      # config.resources = [
+      #   "UserResource",
+      #   "FishResource",
+      # ]
+      def fetch_resources
+        resources = if Avo.configuration.resources.nil?
+          BaseResource.descendants
+        else
+          Avo.configuration.resources
+        end
+
+        resources.map do |resource|
+          if resource.is_a?(Class)
+            resource
+          else
+            resource.to_s.safe_constantize
+          end
+        end
+      end
+
       def init_resources
-        self.resources = BaseResource.descendants
+        self.resources = fetch_resources
           .select do |resource|
             # Remove the BaseResource. We only need the descendants
             resource != BaseResource

data/lib/avo/concerns/has_fields.rb

@@ -264,6 +264,10 @@ module Avo
         panelfull_items = []
 
         items.each do |item|
+          if item.respond_to? :hydrate
+            item.hydrate(view: view)
+          end
+
           # fields and tabs can be hidden on some views
           if item.respond_to? :visible_on?
             next unless item.visible_on?(view)

data/lib/avo/concerns/visible_items.rb

@@ -13,6 +13,13 @@ module Avo
 
       def visible_items
         items
+          .map do |item|
+            if item.respond_to? :hydrate
+              item.hydrate(view: view)
+            end
+
+            item
+          end
           .map do |item|
             visible(item) ? item : nil
           end

data/lib/avo/configuration.rb

@@ -41,6 +41,7 @@ module Avo
     attr_accessor :authorization_client
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
+    attr_accessor :resources
     attr_writer :branding
 
     def initialize
@@ -92,6 +93,7 @@ module Avo
       @resource_default_view = :show
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
+      @resources = nil
     end
 
     def current_user_method(&block)

data/lib/avo/dynamic_router.rb

@@ -3,9 +3,13 @@ module Avo
     def self.routes
       Avo::Engine.routes.draw do
         scope "resources", as: "resources" do
-          Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+          # Check if the user chose to manually register the resource files.
+          # If so, eager_load the resources dir.
+          if Avo.configuration.resources.nil?
+            Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+          end
 
-          BaseResource.descendants
+          Avo::App.fetch_resources
             .select do |resource|
               resource != :BaseResource
             end

data/lib/avo/tab.rb

@@ -6,7 +6,6 @@ class Avo::Tab
   class_attribute :item_type, default: :tab
   delegate :items, :add_item, to: :items_holder
 
-  attr_reader :name
   attr_reader :view
   attr_accessor :description
   attr_accessor :items_holder
@@ -28,6 +27,14 @@ class Avo::Tab
     except_on args[:except_on] if args[:except_on].present?
   end
 
+  def name
+    if @name.respond_to?(:call)
+      Avo::Hosts::BaseHost.new(block: @name).handle
+    else
+      @name
+    end
+  end
+
   def hydrate(view: nil)
     @view = view
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.26.2.pre.pr1579" unless const_defined?(:VERSION)
+  VERSION = "2.27.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/resource_generator.rb

@@ -214,7 +214,7 @@ module Generators
       end
 
       def field(name, type)
-        names_mapping[name.to_sym] || fields_mapping[type.to_sym] || {field: "text"}
+        names_mapping[name.to_sym] || fields_mapping[type&.to_sym] || {field: "text"}
       end
 
       def associations_mapping

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -85,6 +85,10 @@ en:
     resource_created: Record created
     resource_destroyed: Record destroyed
     resource_translations:
+      team_members:
+        one: team member
+        other: team memberz
+        zero: team memberz
       user:
         one: user
         other: users

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.26.2.pre.pr1579
+  version: 2.27.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1686,6 +1686,7 @@ files:
 - bin/dev
 - bin/helpers.rb
 - bin/init
+- bin/prod
 - bin/rails
 - bin/rspec
 - bin/spring
@@ -1695,7 +1696,6 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
-- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1951,9 +1951,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key: 

data/config/master.key

@@ -1 +0,0 @@
-2aeb23d82b909d9c6b5abb62f7058c2a