brick 1.0.199 → 1.0.201

data/lib/brick/frameworks/rails/engine.rb

@@ -296,13 +296,13 @@ function linkSchemas() {
             end
 
             module UrlHelpers
-              alias _brick_resource_path resource_path
+              alias _brick_resources_path resources_path
               # Accommodate STI resources
-              def resource_path(model:, resource:, **args)
-                resource ||= if (klass = model&.class)
+              def resources_path(resource:, **kwargs)
+                resource ||= if (klass = resource.model_class)
                                Avo::App.resources.find { |r| r.model_class > klass }
                              end
-                _brick_resource_path(model: model, resource: resource, **args)
+                _brick_resources_path(resource: resource, **kwargs)
               end
             end
 
@@ -329,31 +329,50 @@ function linkSchemas() {
             #   end
             # end
 
-            (self::App.respond_to?(:eager_load) ? App : DynamicRouter).class_exec do
-              class << self
-                alias _brick_eager_load eager_load
-                def eager_load(entity)
-                  _brick_eager_load(entity)
-                  if entity == :resources
-                    possible_schema, _x1, _x2 = ::Brick.get_possible_schemas
-                    if possible_schema
-                      orig_tenant = Apartment::Tenant.current
-                      Apartment::Tenant.switch!(possible_schema)
-                    end
-                    existing = Avo::BaseResource.descendants.each_with_object({}) do |r, s|
-                                 s[r.name[0..-9]] = nil if r.name.end_with?('Resource')
-                               end
-                    ::Brick.relations.each do |k, v|
-                      unless k.is_a?(Symbol) || existing.key?(class_name = v[:class_name]) || Brick.config.exclude_tables.include?(k) ||
-                             class_name.blank? || class_name.include?('::') ||
-                             ['ActiveAdminComment', 'MotorAlert', 'MotorAlertLock', 'MotorApiConfig', 'MotorAudit', 'MotorConfig', 'MotorDashboard', 'MotorForm', 'MotorNote', 'MotorNoteTag', 'MotorNoteTagTag', 'MotorNotification', 'MotorQuery', 'MotorReminder', 'MotorResource', 'MotorTag', 'MotorTaggableTag'].include?(class_name)
-                        Object.const_get("#{class_name}Resource")
-                      end
-                    end
-                    Apartment::Tenant.switch!(orig_tenant) if orig_tenant
+            if self.const_defined?('Resources') &&
+               self::Resources.const_defined?('ResourceManager') # Avo 3.x?
+              self::Resources::ResourceManager.class_exec do
+                class << self
+                  alias _brick_fetch_resources fetch_resources
+                  def fetch_resources
+                    Avo._brick_avo_resources
+                    _brick_fetch_resources
+                  end
+                end
+              end
+            else # Avo 2.x
+              (self::App.respond_to?(:eager_load) ? App : DynamicRouter).class_exec do
+                class << self
+                  alias _brick_eager_load eager_load
+                  def eager_load(entity)
+                    Avo._brick_avo_resources(true) if entity == :resources
+                    _brick_eager_load(entity)
+                  end
+                end
+              end
+            end
+
+            def self._brick_avo_resources(is_2x = nil)
+              possible_schema, _x1, _x2 = ::Brick.get_possible_schemas
+              if possible_schema
+                orig_tenant = Apartment::Tenant.current
+                Apartment::Tenant.switch!(possible_schema)
+              end
+              existing = Avo::BaseResource.descendants.each_with_object({}) do |r, s|
+                           s[r.name[0..-9]] = nil if r.name.end_with?('Resource')
+                         end
+              ::Brick.relations.each do |k, v|
+                unless k.is_a?(Symbol) || existing.key?(class_name = v[:class_name]) || Brick.config.exclude_tables.include?(k) ||
+                       class_name.blank? || class_name.include?('::') ||
+                       ['ActiveAdminComment', 'MotorAlert', 'MotorAlertLock', 'MotorApiConfig', 'MotorAudit', 'MotorConfig', 'MotorDashboard', 'MotorForm', 'MotorNote', 'MotorNoteTag', 'MotorNoteTagTag', 'MotorNotification', 'MotorQuery', 'MotorReminder', 'MotorResource', 'MotorTag', 'MotorTaggableTag'].include?(class_name)
+                  if is_2x # Avo 2.x?
+                    "::#{class_name}Resource".constantize
+                  else # Avo 3.x
+                    ::Brick.avo_3x_resource(Object.const_get(class_name), class_name) unless ::Avo::BaseResource.constants.include?(class_name.to_sym)
                   end
                 end
               end
+              Apartment::Tenant.switch!(orig_tenant) if orig_tenant
             end
 
             # Add our schema link Javascript code when the TurboFrameWrapper is rendered so it ends up on all index / show / etc
@@ -409,18 +428,21 @@ window.addEventListener(\"popstate\", linkSchemas);
             class Fields::IndexComponent
               alias _brick_resource_view_path resource_view_path
               def resource_view_path
-                return if @resource.model&.class&.is_view?
+                mdl_class = @resource.respond_to?(:model_class) ? @resource.model_class : @resource.model&.class
+                return if mdl_class&.is_view?
 
                 _brick_resource_view_path
               end
             end
 
             module Concerns::HasFields
-              class_methods do
-                alias _brick_field field
-                def field(name, *args, **kwargs, &block)
-                  kwargs.merge!(args.pop) if args.last.is_a?(Hash)
-                  _brick_field(name, **kwargs, &block)
+              class << self
+                if respond_to?(:field)
+                  alias _brick_field field
+                  def field(name, *args, **kwargs, &block)
+                    kwargs.merge!(args.pop) if args.last.is_a?(Hash)
+                    _brick_field(name, **kwargs, &block)
+                  end
                 end
               end
             end
@@ -794,7 +816,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                                 if (rowcount = rel.last.fetch(:rowcount, nil))
                                   rowcount = rowcount > 0 ? " (#{rowcount})" : nil
                                 end
-                                s << "<option value=\"#{::Brick._brick_index(rel.first, nil, '/')}\">#{rel.first}#{rowcount}</option>"
+                                s << "<option value=\"#{::Brick._brick_index(rel.first, nil, '/', nil, true)}\">#{rel.first}#{rowcount}</option>"
                               end.html_safe
               prefix = "#{::Brick.config.path_prefix}/" if ::Brick.config.path_prefix
               table_options << "<option value=\"#{prefix}brick_status\">(Status)</option>".html_safe if ::Brick.config.add_status
@@ -1955,34 +1977,6 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
           end # TemplateRenderer
         end
 
-        if ::Brick.enable_routes?
-          require 'brick/route_mapper'
-          ActionDispatch::Routing::RouteSet.class_exec do
-            # In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
-            prepend ::Brick::RouteSet
-          end
-          ActionDispatch::Routing::Mapper.class_exec do
-            include ::Brick::RouteMapper
-          end
-
-          # Do the root route before the Rails Welcome one would otherwise take precedence
-          if (route = ::Brick.config.default_route_fallback).present?
-            action = "#{route}#{'#index' unless route.index('#')}"
-            if ::Brick.config.path_prefix
-              ::Rails.application.routes.append do
-                send(:namespace, ::Brick.config.path_prefix) do
-                  send(:root, action)
-                end
-              end
-            elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
-              ::Rails.application.routes.append do
-                send(:root, action)
-              end
-            end
-            ::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
-          end
-        end
-
         # Just in case it hadn't been done previously when we tried to load the brick initialiser,
         # go make sure we've loaded additional references (virtual foreign keys and polymorphic associations).
         # (This should only happen if for whatever reason the initializer file was not exactly config/initializers/brick.rb.)

data/lib/brick/frameworks/rails/form_tags.rb

@@ -222,7 +222,7 @@ module Brick::Rails::FormTags
                 out << link_to(ho_txt, send("#{hm_klass.base_class._brick_index(:singular)}_path".to_sym, ho_id))
               end
             elsif obj.respond_to?(ct_col = hms_col[1].to_sym) && (ct = obj.send(ct_col)&.to_i)&.positive?
-              predicates = hms_col[2].each_with_object({}) { |v, s| s["__#{v.first}"] = v.last.is_a?(String) ? v.last : obj.send(v.last) }
+              predicates = hms_col[2].each_with_object({}) { |v, s| s["__#{v.first}"] = v.last.is_a?(String) ? v.last : obj.send(v.last) if v.last }
               predicates.each { |k, v| predicates[k] = klass.name if v == '[sti_type]' }
               out << "#{link_to("#{ct || 'View'} #{hms_col.first}",
                                 send("#{hm_klass._brick_index}_path".to_sym, predicates))}\n"
@@ -592,11 +592,11 @@ function onImagesLoaded(event) {
       relation = ::Brick.relations.fetch(rel_name || klass.table_name, nil)
       if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
          (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
-        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation), action: :index)}#{filter}"
+        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation, true), action: :index)}#{filter}"
         lt_args = [text || "Index for #{klass_or_obj.name.pluralize}", path]
       else
         # If there are multiple incoming parameters then last one is probably the actual ID, and first few might be some nested tree of stuff leading up to it
-        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/', relation), action: :show, id: klass_or_obj)}#{filter}"
+        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/', relation, true), action: :show, id: klass_or_obj)}#{filter}"
         lt_args = [text || "Show this #{klass_or_obj.class.name}", path]
       end
       kwargs.delete(:visited)