avo 3.1.0 → 3.1.2

data/app/components/avo/fields/belongs_to_field/edit_component.html.erb

@@ -1,137 +1,122 @@
-<div data-controller="reload-belongs-to-field"
-     data-action="turbo:before-stream-render@document->reload-belongs-to-field#beforeStreamRender"
-     data-reload-belongs-to-field-polymorphic-value="<%= is_polymorphic? %>"
-     data-reload-belongs-to-field-searchable-value="<%= @field.is_searchable? %>"
-     data-reload-belongs-to-field-relation-name-value="<%= @field.id %>"
-     data-reload-belongs-to-field-target-name-value="<%= form.object_name %>[<%= @field.id_input_foreign_key %>]"
->
-  <% if is_polymorphic? %>
-    <%
-      # Set the model keys so we can pass them over
-      model_keys = @field.types.map do |type|
-        resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
-        [type.to_s, resource.model_key]
-      end.to_h
-    %>
-    <div class="divide-y"
+<% if is_polymorphic? %>
+  <div class="divide-y"
       data-controller="belongs-to-field"
       data-searchable="<%= @field.is_searchable? %>"
       data-association="<%= @field.id %>"
       data-association-class="<%= @field&.target_resource&.model_class || nil %>"
     >
-      <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
-        <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
-        {
-          value: @field.value,
-          include_blank: @field.placeholder,
+    <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
+      <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
+      {
+        value: @field.value,
+        include_blank: @field.placeholder,
+      },
+      {
+        class: classes("w-full"),
+        data: {
+          **@field.get_html(:data, view: view, element: :input),
+          action: "change->belongs-to-field#changeType #{field_html_action}",
+          'belongs-to-field-target': "select",
         },
-        {
-          class: classes("w-full"),
-          data: {
-            **@field.get_html(:data, view: view, element: :input),
-            action: "change->belongs-to-field#changeType #{field_html_action}",
-            'belongs-to-field-target': "select",
-          },
-          disabled: disabled
-        }
-      %>
-        <%
-          # If the select field is disabled, no value will be sent. It's how HTML works.
-          # Thus the extra hidden field to actually send the related id to the server.
-          if disabled %>
-          <%= @form.hidden_field @field.type_input_foreign_key %>
-        <% end %>
+        disabled: disabled
+      }
+    %>
+      <%
+        # If the select field is disabled, no value will be sent. It's how HTML works.
+        # Thus the extra hidden field to actually send the related id to the server.
+        if disabled %>
+        <%= @form.hidden_field @field.type_input_foreign_key %>
       <% end %>
-      <% @field.types.each do |type| %>
-        <div class="hidden"
-          data-belongs-to-field-target="type"
-          data-type="<%= type %>"
-        >
-          <%= field_wrapper **field_wrapper_args, label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
-            <% if @field.is_searchable? %>
-              <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
-                disabled: disabled,
-                field: @field,
-                foreign_key: @field.id_input_foreign_key,
-                model_key: model_keys[type.to_s],
-                polymorphic_record: polymorphic_record,
-                resource: @resource,
-                style: @field.get_html(:style, view: view, element: :input),
-                type: type,
-                classes: classes("w-full"),
-                view: view
-            %>
-            <% else %>
-              <%= @form.select @field.id_input_foreign_key,
-              options_for_select(@field.values_for_type(type), @resource.present? && @resource.record.present? ? @resource.record[@field.id_input_foreign_key] : nil),
-              {
-                value: @resource.record[@field.id_input_foreign_key].to_s,
-                include_blank: @field.placeholder,
-              },
-              {
-                class: classes("w-full"),
-                data: @field.get_html(:data, view: view, element: :input),
-                disabled: disabled
-              }
-            %>
-              <%
-              # If the select field is disabled, no value will be sent. It's how HTML works.
-              # Thus the extra hidden field to actually send the related id to the server.
-              if disabled %>
-                <%= @form.hidden_field @field.id_input_foreign_key %>
-              <% end %>
+    <% end %>
+    <% @field.types.each do |type| %>
+      <div class="hidden"
+        data-belongs-to-field-target="type"
+        data-type="<%= type %>"
+      >
+        <%= field_wrapper **field_wrapper_args.merge!(data: reload_data), label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
+          <% if @field.is_searchable? %>
+            <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+              disabled: disabled,
+              field: @field,
+              foreign_key: @field.id_input_foreign_key,
+              model_key: model_keys[type.to_s],
+              polymorphic_record: polymorphic_record,
+              resource: @resource,
+              style: @field.get_html(:style, view: view, element: :input),
+              type: type,
+              classes: classes("w-full"),
+              view: view
+          %>
+          <% else %>
+            <%= @form.select @field.id_input_foreign_key,
+            options_for_select(@field.values_for_type(type), @resource.present? && @resource.record.present? ? @resource.record[@field.id_input_foreign_key] : nil),
+            {
+              value: @resource.record[@field.id_input_foreign_key].to_s,
+              include_blank: @field.placeholder,
+            },
+            {
+              class: classes("w-full"),
+              data: @field.get_html(:data, view: view, element: :input),
+              disabled: disabled
+            }
+          %>
+            <%
+            # If the select field is disabled, no value will be sent. It's how HTML works.
+            # Thus the extra hidden field to actually send the related id to the server.
+            if disabled %>
+              <%= @form.hidden_field @field.id_input_foreign_key %>
             <% end %>
-            <% if field.can_create? %>
-              <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
-              <% if !disabled && create_href.present? %>
-                <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
-                            create_href,
-                            class: "text-sm"
-                %>
-              <% end %>
+          <% end %>
+          <% if field.can_create? %>
+            <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
+            <% if !disabled && create_href.present? %>
+              <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
+                          create_href,
+                          class: "text-sm"
+              %>
             <% end %>
           <% end %>
-        </div>
-      <% end %>
-    </div>
-  <% else %>
-    <%= field_wrapper **field_wrapper_args do %>
-      <% if @field.is_searchable? %>
-        <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
-          field: @field,
-          model_key: @field.target_resource&.model_key,
-          foreign_key: @field.id_input_foreign_key,
-          resource: @resource,
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% else %>
+  <%= field_wrapper **field_wrapper_args.merge!(data: reload_data) do %>
+    <% if @field.is_searchable? %>
+      <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+        field: @field,
+        model_key: @field.target_resource&.model_key,
+        foreign_key: @field.id_input_foreign_key,
+        resource: @resource,
+        disabled: disabled,
+        classes: classes("w-full"),
+        view: view,
+        style: @field.get_html(:style, view: view, element: :input)
+      %>
+    <% else %>
+      <%= @form.select @field.id_input_foreign_key, @field.options,
+        {
+          include_blank: @field.placeholder,
+          value: @field.value
+        },
+        {
+          class: classes("w-full"),
+          data: @field.get_html(:data, view: view, element: :input),
           disabled: disabled,
-          classes: classes("w-full"),
-          view: view,
           style: @field.get_html(:style, view: view, element: :input)
-        %>
-      <% else %>
-        <%= @form.select @field.id_input_foreign_key, @field.options,
-          {
-            include_blank: @field.placeholder,
-            value: @field.value
-          },
-          {
-            class: classes("w-full"),
-            data: @field.get_html(:data, view: view, element: :input),
-            disabled: disabled,
-            style: @field.get_html(:style, view: view, element: :input)
-          }
-        %>
-        <%
-          # If the select field is disabled, no value will be sent. It's how HTML works.
-          # Thus the extra hidden field to actually send the related id to the server.
-          if disabled %>
-          <%= @form.hidden_field @field.id_input_foreign_key %>
-        <% end %>
+        }
+      %>
+      <%
+        # If the select field is disabled, no value will be sent. It's how HTML works.
+        # Thus the extra hidden field to actually send the related id to the server.
+        if disabled %>
+        <%= @form.hidden_field @field.id_input_foreign_key %>
       <% end %>
-      <% if field.can_create? %>
-        <% if !disabled && create_path.present? %>
-          <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
-        <% end %>
+    <% end %>
+    <% if field.can_create? %>
+      <% if !disabled && create_path.present? %>
+        <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
       <% end %>
     <% end %>
   <% end %>
-</div>
+<% end %>

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -73,4 +73,22 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   def visit_through_association?
     @field.target_resource.to_s == params[:via_resource_class].to_s
   end
+
+  def model_keys
+    @field.types.map do |type|
+      resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
+      [type.to_s, resource.model_key]
+    end.to_h
+  end
+
+  def reload_data
+    {
+      controller: "reload-belongs-to-field",
+      action: 'turbo:before-stream-render@document->reload-belongs-to-field#beforeStreamRender',
+      reload_belongs_to_field_polymorphic_value: is_polymorphic?,
+      reload_belongs_to_field_searchable_value: @field.is_searchable?,
+      reload_belongs_to_field_relation_name_value: @field.id,
+      reload_belongs_to_field_target_name_value: "#{form.object_name}[#{@field.id_input_foreign_key}]"
+    }
+  end
 end

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -41,6 +41,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     args = {
       via_relation: association_id,
       via_relation_class: @resource.model_class.to_s,
+      via_resource_class: @resource.class,
       via_record_id: @resource.record.to_param,
       via_association_type: :has_one
     }

data/lib/avo/dynamic_router.rb

@@ -1,39 +1,15 @@
 module Avo
   class DynamicRouter
-    def self.eager_load(entity)
-      paths = Avo::ENTITIES.fetch entity
-
-      return unless paths.present?
-
-      pathname = Rails.root.join(*paths)
-      if pathname.directory?
-        Rails.autoloaders.main.eager_load_dir(pathname.to_s)
-      end
-    end
-
     def self.routes
       Avo::Engine.routes.draw do
         scope "resources", as: "resources" do
-          # Check if the user chose to manually register the resource files.
-          # If so, eager_load the resources dir.
-          if Avo.configuration.resources.nil?
-            Avo::DynamicRouter.eager_load(:resources) unless Rails.application.config.eager_load
-          end
-
-          Avo::Resources::ResourceManager.fetch_resources
-            .select do |resource|
-              resource != :BaseResource
-            end
-            .select do |resource|
-              resource.is_a? Class
-            end
-            .map do |resource|
-              resources resource.route_key do
-                member do
-                  get :preview
-                end
+          Avo::Resources::ResourceManager.fetch_resources.map do |resource|
+            resources resource.route_key do
+              member do
+                get :preview
               end
             end
+          end
         end
       end
     end

data/lib/avo/resources/resource_manager.rb

@@ -8,7 +8,6 @@ module Avo
       class << self
         def build
           instance = new
-          instance.init_resources
           instance.check_bad_resources
           instance
         end
@@ -35,37 +34,30 @@ module Avo
         #   "FishResource",
         # ]
         def fetch_resources
-          resources = if Avo.configuration.resources.nil?
-            BaseResource.descendants
+          if Avo.configuration.resources.present?
+            load_configured_resources
           else
-            Avo.configuration.resources
+            load_resources_namespace
           end
 
-          resources.map do |resource|
-            if resource.is_a?(Class)
-              resource
-            else
-              resource.to_s.safe_constantize
-            end
+          BaseResource.descendants
+        end
+
+        def load_resources_namespace
+          Rails.autoloaders.main.eager_load_namespace(Avo::Resources)
+        end
+
+        def load_configured_resources
+          raise 'Resources configuration must be an array' unless Avo.configuration.resources.is_a? Array
+
+          Avo.configuration.resources.each do |resource|
+            resource.to_s.safe_constantize
           end
         end
       end
 
       def initialize
-        @resources = []
-      end
-
-      def init_resources
-        self.resources = self.class.fetch_resources
-          .reject do |resource|
-            # Remove the BaseResource. We only need the descendants
-            resource == Avo::BaseResource
-          end
-          .uniq do |klass|
-            # On invalid resource configuration the resource classes get duplicated in `ObjectSpace`
-            # We need to de-duplicate them
-            klass.name
-          end
+        @resources = self.class.fetch_resources
       end
 
       def check_bad_resources

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.1.0" unless const_defined?(:VERSION)
+  VERSION = "3.1.2" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -18,16 +18,6 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
   COOKIES_KEY = "avo"
-  ENTITIES = {
-    cards: ["app", "avo", "cards"],
-    scopes: ["app", "avo", "scopes"],
-    fields: ["app", "avo", "fields"],
-    filters: ["app", "avo", "filters"],
-    actions: ["app", "avo", "actions"],
-    resources: ["app", "avo", "resources"],
-    dashboards: ["app", "avo", "dashboards"],
-    resource_tools: ["app", "avo", "resource_tools"]
-  }
 
   class LicenseVerificationTemperedError < StandardError; end
 

metadata

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