avo 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14566ebb055bf03bf8ed662ab5cc9e92fd426b62e170a62df3593d798e0e54c8
-  data.tar.gz: ba1262a02c6302a5f877073d04d0db06d0df47b559cdaa60c79e6e33321a6fab
+  metadata.gz: 58201ebf40ea090bc7ff03e588ae9dba48c913c4d39b16eaa4d0068a99c45211
+  data.tar.gz: 2c3efea520399494770be31f454086cc4ea6aa24eaa16c735099ef336e059e8d
 SHA512:
-  metadata.gz: eecde64af0facc9fdfed0c6c840e4b030ba2f7b72891c0aa240b7e9617393b1a79126d783218409d16c6f6133bab241b3cbd1b391976a99b653db3b4e04e25f6
-  data.tar.gz: 8719d1f98d148a95f2d7c2bcd7a56a471e010d0253e1e3c78e7151f9e7e3d22d5e563aa22ab07119d9c2acee1d867cf644839074aaf41de3deb2b4058252a251
+  metadata.gz: 5ab96094a881dea361ab8c88817030bf277dc737e70f5f273da59545f1db19e6145aaa14877db6bc6b8aa91347df5c2099a1c57183dc52f6ed10dd896831f852
+  data.tar.gz: 404d1af6a00033fc33b3e242fb5e10a1c9a66a0b79771615586466848c6022a3a495ca6ec3e890d394f8c3f5c02c28817c30f30e6563dd443aa1cf0cdd7a7084

data/Gemfile.lock

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

data/app/assets/builds/avo.base.css

@@ -7029,6 +7029,10 @@ tag.tagify__tag{
   width:1rem
 }
 
+.w-screen{
+  width:100vw
+}
+
 .w-auto{
   width:auto
 }

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/concerns/has_items.rb

@@ -101,6 +101,13 @@ module Avo
             if item.is_sidebar?
               fields << extract_fields(item)
             end
+          else
+            # When `item.is_main_panel? == true` then also `item.is_panel? == true`
+            # But when only_root == true we want to extract main_panel items
+            # In all other circumstances items will get extracted when checking for `item.is_panel?`
+            if item.is_main_panel?
+              fields << extract_fields(item)
+            end
           end
 
           if item.is_field?
@@ -110,10 +117,6 @@ module Avo
           if item.is_row?
             fields << extract_fields(tab)
           end
-
-          if item.is_main_panel?
-            fields << extract_fields(item)
-          end
         end
 
         fields.flatten

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.1" unless const_defined?(:VERSION)
+  VERSION = "3.1.3" 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.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord