avo 2.1.2.pre1 → 2.1.2.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab813d1cba92231f9f5ea655e200739567db3d33a93434add2000d42281f29e
-  data.tar.gz: 6357611e7245cb45e68749b4c0e72c2c97f353d12a509b5b467f9ae7ff7a261d
+  metadata.gz: bde8997aaf953104f34a221e6be3c93b6c7f20bc1b9f125615c0ff994cc6791f
+  data.tar.gz: ca3a39976e8046d165cdb66a8aad6260e98d869981e73eba1d6d121bb57a7580
 SHA512:
-  metadata.gz: c2723ce4a864c153c8ae515c168e50954a4415a9be8aae5b190fbe8d1fbe5d4227f165cb9f9957f606aa757cc3141e33204eacc53d270c22f14d995c0a3f285b
-  data.tar.gz: dff128333e8a5700d12c5d951d1ba29cb9a11980b68beb137916547eb1c1ed9bcb44ccc2e3c167ce772e6e6f976a28d29bed0ffde958936f0833ff1f29427b0a
+  metadata.gz: 50c30c580b89ad850a34c0125ad0079d34a1af72eefbb99193644f605692ea5f3e2bb54e1a0032ef04e219ba84888171cfcf6b69c6da045475f21afc50747680
+  data.tar.gz: 0ce0f8be40b683c2c1ef5b8e963bbbb0d8282e4e0b7d193f4acedee530d9618481a036a0c3955214d4c024876a374009c82df85a788708aebf603943595218c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.1.2.pre1)
+    avo (2.1.2.pre2)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/components/avo/filters_component.html.erb

@@ -7,31 +7,30 @@
       title: t('avo.click_to_reveal_filters'),
       'data-button': 'resource-filters',
       'data-action': 'click->toggle-panel#togglePanel',
-      'data-tippy': 'tooltip' do
-    %>
-    <%= t 'avo.filters' %>
-    <% if params[:filters].present? %>
-      <span class="ml-1">(<%=JSON.parse(Base64.decode64(params[:filters])).count%> applied)</span>
+      'data-tippy': 'tooltip' do %>
+      <%= t 'avo.filters' %>
+      <% if params[:filters].present? %>
+        <span class="ml-1">(<%=JSON.parse(Base64.decode64(params[:filters])).count%> applied)</span>
+      <% end %>
     <% end %>
-  <% end %>
-  <div
+    <div
       class="absolute block inset-auto sm:right-0 top-full bg-white min-w-[300px] mt-2 z-20 shadow-modal rounded hidden divide-y divide-gray-300"
       data-toggle-panel-target="panel"
     >
-    <% @filters.each do |filter| %>
-      <%= render partial: filter.class.template, locals: {filter: filter} %>
-    <% end %>
-    <div class="p-4 border-gray-300 border-t">
-      <% if params[:filters].present? %>
-        <%= a_link helpers.resources_path(resource: @resource, filters: nil, keep_query_params: true), color: :gray, size: :sm, class: 'w-full justify-center' do %>
-          <%= t('avo.reset_filters') %>
-        <% end %>
-      <% else %>
-        <%= a_button class: 'w-full justify-center', disabled: true do %>
-          <%= t('avo.reset_filters') %>
-        <% end %>
+      <% @filters.each do |filter| %>
+        <%= render partial: filter.class.template, locals: {filter: filter} %>
       <% end %>
+      <div class="p-4 border-gray-300 border-t">
+        <% if params[:filters].present? %>
+          <%= a_link helpers.resources_path(resource: @resource, filters: nil, keep_query_params: true), color: :gray, size: :sm, class: 'w-full justify-center' do %>
+            <%= t('avo.reset_filters') %>
+          <% end %>
+        <% else %>
+          <%= a_button class: 'w-full justify-center', disabled: true do %>
+            <%= t('avo.reset_filters') %>
+          <% end %>
+        <% end %>
+      </div>
     </div>
   </div>
 </div>
-</div>

data/app/components/avo/sidebar_profile_component.html.erb

@@ -1,19 +1,23 @@
 <div class="text-black border-t border-gray-200 p-4 flex">
   <div class="flex-1 flex space-x-4">
-    <div class="relative aspect-square w-10 h-10 overflow-hidden rounded">
-      <%= image_tag avatar, class: "object-cover min-w-full min-h-full h-full" %>
-    </div>
+    <% if avatar.present? %>
+      <div class="relative aspect-square w-10 h-10 overflow-hidden rounded">
+        <%= image_tag avatar, class: "object-cover min-w-full min-h-full h-full" %>
+      </div>
+    <% end %>
     <div class="flex flex-col">
       <div class="font-medium">
         <%= name %>
       </div>
-      <div class="text-xs text-gray-500 uppercase">
-        <%= title %>
-      </div>
+      <% if title.present? %>
+        <div class="text-xs text-gray-500 uppercase">
+          <%= title %>
+        </div>
+      <% end %>
     </div>
   </div>
-  <div class="relative" data-controller="toggle-panel">
-    <% if can_destroy_user? %>
+  <% if can_destroy_user? %>
+    <div class="relative" data-controller="toggle-panel">
       <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle-panel#togglePanel">
         <%= helpers.svg 'three-dots', class: 'h-4' %>
       </a>
@@ -31,6 +35,6 @@
           <%= helpers.svg 'logout', class: 'h-4 mr-1' %> <%= t('avo.sign_out') %>
         <% end %>
       </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 </div>

data/lib/avo/app.rb

@@ -79,12 +79,16 @@ module Avo
       def init_resources
         self.resources = BaseResource.descendants
           .select do |resource|
+            # Remove the BaseResource. We only need the descendants
             resource != 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
           .map do |resource|
-            if resource.is_a? Class
-              resource.new
-            end
+            resource.new if resource.is_a? Class
           end
       end
 

data/lib/avo/base_resource.rb

@@ -285,6 +285,9 @@ module Avo
     end
 
     def name
+      # return 'hwhwhw'
+
+
       default = class_name_without_resource.titlecase
 
       return @name if @name.present?

data/lib/avo/dynamic_router.rb

@@ -1,7 +1,7 @@
 module Avo
   module DynamicRouter
     def self.routes(router)
-      Rails.application.eager_load!
+      Rails.application.eager_load! if Rails.env.development?
 
       BaseResource.descendants
         .select do |resource|

data/lib/avo/engine.rb

@@ -19,7 +19,8 @@ module Avo
 
     config.i18n.load_path += Dir[Avo::Engine.root.join('lib', 'generators', 'avo', 'templates', 'locales', '*.{rb,yml}')]
 
-    initializer "avo.autoload", before: :set_autoload_paths do |app|
+    # initializer "avo.autoload", before: :set_autoload_paths do |app|
+    initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],
         ["app", "avo", "filters"],
@@ -41,21 +42,11 @@ module Avo
       ::Avo::App.init_fields
     end
 
-    initializer "avo.reload_avo_files" do |app|
-      if Avo::IN_DEVELOPMENT && ENV["RELOAD_AVO_FILES"]
-        avo_root_path = Avo::Engine.root.to_s
-        # This should only be happening when ENV["RELOAD_AVO_FILES"] is true because it loads all the files into memory on every change and makes rails sluggish.
-        app.config.autoload_paths += [Avo::Engine.root.join("lib", "avo").to_s]
-        # Register reloader
-        app.reloaders << app.config.file_watcher.new([], {
-          Avo::Engine.root.join("lib", "avo").to_s => ["rb"]
-        }) {}
-
-        # What to do on file change
-        config.to_prepare do
-          Dir.glob(avo_root_path + "/lib/avo/**/*.rb".to_s).each { |c| load c }
-          Avo::App.boot
-        end
+    initializer "avo.reloader" do |app|
+      Avo::Reloader.new.tap do |reloader|
+        reloader.execute
+        app.reloaders << reloader
+        app.reloader.to_run { reloader.execute }
       end
     end
 

data/lib/avo/reloader.rb

@@ -0,0 +1,51 @@
+class Avo::Reloader
+  delegate :execute_if_updated, :execute, :updated?, to: :updater
+
+  def reload!
+    # reload all files declared in paths
+    paths.each { |path| load path }
+
+    # reload all files declared in each directory
+    directories.keys.each do |dir|
+      Dir.glob("#{dir}/**/*.rb".to_s).each { |c| load c }
+    end
+  end
+
+  private
+    def updater
+      @updater ||= config.file_watcher.new(paths, directories) { reload! }
+    end
+
+    def paths
+      # we want to watch some files no matter what
+      files = [
+        Rails.root.join("config", "initializers", "avo.rb"),
+      ]
+
+      # we want to watch some files only in Avo development
+      if reload_lib?
+        files += []
+      end
+
+      files
+    end
+
+    def directories
+      dirs = {}
+
+      # watch the lib directory in Avo development
+      if reload_lib?
+        dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
+      end
+
+      dirs
+    end
+
+    def config
+      Rails.application.config
+    end
+
+    def reload_lib?
+      Avo::IN_DEVELOPMENT || ENV['AVO_RELOAD_LIB_DIR']
+    end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.1.2.pre1"
+  VERSION = "2.1.2.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.1.2.pre1
+  version: 2.1.2.pre2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1193,6 +1193,7 @@ files:
 - lib/avo/loaders/fields_loader.rb
 - lib/avo/loaders/filters_loader.rb
 - lib/avo/loaders/loader.rb
+- lib/avo/reloader.rb
 - lib/avo/services/authorization_service.rb
 - lib/avo/tools_manager.rb
 - lib/avo/version.rb