avo 2.8.0 → 2.9.0

data/lib/avo/concerns/fetches_things.rb

@@ -22,6 +22,13 @@ module Avo
           end
         end
 
+        # Filters out the resources that are missing the model_class
+        def valid_resources
+          resources.select do |resource|
+            resource.model_class.present?
+          end
+        end
+
         # Returns the Avo resource by camelized name
         #
         # get_resource_by_name('User') => UserResource
@@ -45,9 +52,10 @@ module Avo
         # get_resource_by_name('User') => UserResource
         # get_resource_by_name(User) => UserResource
         def get_resource_by_model_name(name)
-          resources.find do |resource|
-            resource.model_class.model_name.name == name.to_s
-          end
+          valid_resources
+            .find do |resource|
+              resource.model_class.model_name.name == name.to_s
+            end
         end
 
         # Returns the Avo resource by singular snake_cased name
@@ -55,9 +63,10 @@ module Avo
         # get_resource_by_controller_name('delayed_backend_active_record_jobs') => DelayedJobResource
         # get_resource_by_controller_name('users') => UserResource
         def get_resource_by_controller_name(name)
-          resources.find do |resource|
-            resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
-          end
+          valid_resources
+            .find do |resource|
+              resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
+            end
         end
 
         # Returns the Avo resource by some name
@@ -73,9 +82,10 @@ module Avo
         end
 
         def get_available_resources(user = nil)
-          resources.select do |resource|
-            Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
-          end
+          valid_resources
+            .select do |resource|
+              Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+            end
             .sort_by { |r| r.name }
         end
 
@@ -85,9 +95,6 @@ module Avo
 
         def resources_for_navigation(user = nil)
           get_available_resources(current_user)
-            .select do |resource|
-              resource.model_class.present?
-            end
             .select do |resource|
               resource.visible_on_sidebar
             end

data/lib/avo/concerns/has_model.rb

@@ -0,0 +1,11 @@
+module Avo
+  module Concerns
+    module HasModel
+      extend ActiveSupport::Concern
+
+      def has_model_id?
+        model.present? && model.id.present?
+      end
+    end
+  end
+end

data/lib/avo/dynamic_router.rb

@@ -14,7 +14,7 @@ module Avo
         #   resource.model_class.present?
         # end
         .map do |resource|
-          router.resources resource.new.model_key
+          router.resources resource.new.route_key
         end
     end
   end

data/lib/avo/engine.rb

@@ -17,8 +17,6 @@ module Avo
       ::Avo::App.boot
     end
 
-    config.i18n.load_path += Dir[Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "*.{rb,yml}")]
-
     initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],
@@ -73,7 +71,7 @@ module Avo
         begin
           Licensing::HQ.new.clear_response
         rescue => exception
-          puts "Failed to clear Avo HQ response: #{e.message}"
+          puts "Failed to clear Avo HQ response: #{exception.message}"
         end
       end
     end

data/lib/avo/fields/base_field.rb

@@ -9,6 +9,7 @@ module Avo
 
       include Avo::Concerns::HandlesFieldArgs
       include Avo::Concerns::HasHTMLAttributes
+      include Avo::Fields::Concerns::IsRequired
 
       delegate :view_context, to: ::Avo::App
       delegate :simple_format, :content_tag, to: :view_context

data/lib/avo/fields/concerns/is_required.rb

@@ -0,0 +1,17 @@
+module Avo
+  module Fields
+    module Concerns
+      module IsRequired
+        extend ActiveSupport::Concern
+
+        def is_required?
+          if required.respond_to? :call
+            Avo::Hosts::ViewRecordHost.new(block: required, record: model, view: view).handle
+          else
+            required
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/hosts/view_record_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class ViewRecordHost < RecordHost
+      option :view
+    end
+  end
+end

data/lib/avo/menu/base_item.rb

@@ -17,4 +17,8 @@ class Avo::Menu::BaseItem
       Avo::Hosts::BaseHost.new(block: visible).handle
     end
   end
+
+  def navigation_label
+    label || entity_label
+  end
 end

data/lib/avo/menu/dashboard.rb

@@ -2,6 +2,7 @@ class Avo::Menu::Dashboard < Avo::Menu::BaseItem
   extend Dry::Initializer
 
   option :dashboard
+  option :label, optional: true
 
   def parsed_dashboard
     dashboard_by_id || dashboard_by_name
@@ -14,4 +15,8 @@ class Avo::Menu::Dashboard < Avo::Menu::BaseItem
   def dashboard_by_id
     Avo::App.get_dashboard_by_id dashboard.to_s
   end
+
+  def entity_label
+    parsed_dashboard.navigation_label
+  end
 end

data/lib/avo/menu/resource.rb

@@ -2,8 +2,13 @@ class Avo::Menu::Resource < Avo::Menu::BaseItem
   extend Dry::Initializer
 
   option :resource
+  option :label, optional: true
 
   def parsed_resource
     Avo::App.guess_resource resource.to_s
   end
+
+  def entity_label
+    parsed_resource.navigation_label
+  end
 end

data/lib/avo/version.rb

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

data/lib/avo.rb

@@ -7,6 +7,7 @@ loader.inflector.inflect(
   "html" => "HTML",
   "has_html_attributes" => "HasHTMLAttributes"
 )
+loader.ignore("#{__dir__}/generators")
 loader.setup
 
 #                                      .//*,,.....,,*/(*

data/lib/generators/avo/install_generator.rb

@@ -13,10 +13,7 @@ module Generators
         route "mount Avo::Engine, at: Avo.configuration.root_path"
 
         template "initializer/avo.tt", "config/initializers/avo.rb"
-        template "locales/avo.en.yml", "config/locales/avo.en.yml"
-        template "locales/avo.nb-NO.yml", "config/locales/avo.nb-NO.yml"
-        template "locales/avo.pt-BR.yml", "config/locales/avo.pt-BR.yml"
-        template "locales/avo.ro.yml", "config/locales/avo.ro.yml"
+        directory File.join(__dir__, "templates", "locales"), "config/locales"
       end
     end
   end