avo 2.2.0 → 2.3.0

data/app/views/avo/base/_boolean_filter.html.erb

@@ -11,7 +11,7 @@
   end
   set_value = {} if set_value.nil?
 %>
-<div data-controller="boolean-filter">
+<div data-controller="boolean-filter" data-filter-name="<%= filter.name %>">
   <%= filter_wrapper name: filter.name do %>
     <div class="flex items-center">
       <div class="space-y-2">

data/app/views/avo/base/_multiple_select_filter.html.erb

@@ -1,12 +1,15 @@
 <%
+  set_value = filter.default.present? ? filter.default.select { |key, value| value }.keys.map(&:to_sym) : {}
+
   begin
     decoded_filters_param = JSON.parse(Base64.decode64(params[:filters]))
-    set_value = decoded_filters_param[filter.class.to_s]
-  rescue => exception
-    set_value = filter.options.keys
+    if decoded_filters_param[filter.class.to_s].present?
+      set_value = decoded_filters_param[filter.class.to_s]
+    end
+  rescue
   end
 %>
-<div data-controller="multiple-select-filter">
+<div data-controller="multiple-select-filter" data-filter-name="<%= filter.name %>">
   <%= filter_wrapper name: filter.name do %>
     <%= select_tag filter.id, options_for_select(filter.options.invert, set_value),
       class: input_classes('w-full mb-0'),

data/app/views/avo/base/_select_filter.html.erb

@@ -6,7 +6,7 @@
     set_value = filter.default
   end
 %>
-<div data-controller="select-filter">
+<div data-controller="select-filter" data-filter-name="<%= filter.name %>">
   <%= filter_wrapper name: filter.name do %>
     <%= select_tag filter.id, options_for_select(filter.options.invert, set_value),
       class: input_classes('w-full mb-0'),

data/app/views/avo/base/_text_filter.html.erb

@@ -6,7 +6,7 @@
     set_value = filter.default
   end
 %>
-<div data-controller="text-filter">
+<div data-controller="text-filter" data-filter-name="<%= filter.name %>">
   <%= filter_wrapper name: filter.name do %>
     <%= text_field_tag filter.id, set_value,
       class: input_classes('w-full mb-0'),

data/avo.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "breadcrumbs_on_rails"
   spec.add_dependency "chartkick"
   spec.add_dependency "dry-initializer"
+  spec.add_dependency "docile"
 end

data/lib/avo/app.rb

@@ -1,5 +1,7 @@
 module Avo
   class App
+    include Avo::Concerns::FetchesThings
+
     class_attribute :resources, default: []
     class_attribute :dashboards, default: []
     class_attribute :cache_store, default: nil
@@ -102,96 +104,16 @@ module Avo
           end
       end
 
-      # Returns the Avo dashboard by id
-      def get_dashboard_by_id(id)
-        dashboards.find do |dashboard|
-          dashboard.id == id
-        end
-      end
-
-      # Returns the Avo resource by camelized name
-      #
-      # get_resource_by_name('User') => UserResource
-      def get_resource(resource)
-        resources.find do |available_resource|
-          "#{resource}Resource".safe_constantize == available_resource.class
-        end
-      end
-
-      # Returns the Avo resource by singular snake_cased name
-      #
-      # get_resource_by_name('user') => UserResource
-      def get_resource_by_name(name)
-        get_resource name.singularize.camelize
-      end
-
-      # Returns the Avo resource by singular snake_cased name
-      #
-      # 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
-      end
-
-      # Returns the Avo resource by singular snake_cased name
-      #
-      # 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
-      end
-
-      # Returns the Rails model class by singular snake_cased name
-      #
-      # get_model_class_by_name('user') => User
-      def get_model_class_by_name(name)
-        name.to_s.camelize.singularize
-      end
+      def main_menu
+        return nil if Avo::App.license.lacks_with_trial(:menu_builder)
 
-      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
-          .sort_by { |r| r.name }
+        Avo::Menu::Builder.parse_menu(&Avo.configuration.main_menu)
       end
 
-      def get_available_dashboards(user = nil)
-        dashboards.sort_by { |r| r.name }
-      end
+      def profile_menu
+        return nil if Avo::App.license.lacks_with_trial(:menu_builder)
 
-      def resources_navigation(user = nil)
-        get_available_resources(user)
-          .select do |resource|
-            resource.model_class.present?
-          end
-          .select do |resource|
-            resource.visible_on_sidebar
-          end
-      end
-
-      def get_dashboards(user = nil)
-        return [] unless App.license.has_with_trial(:resource_ordering)
-
-        get_available_dashboards(user)
-      end
-
-      # Insert any partials that we find in app/views/avo/sidebar/items.
-      def get_sidebar_partials
-        Dir.glob(Rails.root.join("app", "views", "avo", "sidebar", "items", "*.html.erb"))
-          .map do |path|
-            File.basename path
-          end
-          .map do |filename|
-            # remove the leading underscore (_)
-            filename[0] = ""
-            # remove the extension
-            filename.gsub!(".html.erb", "")
-            filename
-          end
+        Avo::Menu::Builder.parse_menu(&Avo.configuration.profile_menu)
       end
     end
   end

data/lib/avo/concerns/fetches_things.rb

@@ -0,0 +1,127 @@
+module Avo
+  module Concerns
+    module FetchesThings
+      extend ActiveSupport::Concern
+
+      class_methods do
+        # Returns the Avo dashboard by id
+        #
+        # get_dashboard_by_id(:dashy) -> Dashy
+        def get_dashboard_by_id(id)
+          dashboards.find do |dashboard|
+            dashboard.id == id
+          end
+        end
+
+        # Returns the Avo dashboard by name
+        #
+        # get_dashboard_by_name(:dashy) -> Dashy
+        def get_dashboard_by_name(name)
+          dashboards.find do |dashboard|
+            dashboard.name == name
+          end
+        end
+
+        # Returns the Avo resource by camelized name
+        #
+        # get_resource_by_name('User') => UserResource
+        def get_resource(resource)
+          possible_resource = "#{resource}Resource".gsub "ResourceResource", "Resource"
+
+          resources.find do |available_resource|
+            possible_resource.safe_constantize == available_resource.class
+          end
+        end
+
+        # Returns the Avo resource by singular snake_cased name
+        #
+        # get_resource_by_name('user') => UserResource
+        def get_resource_by_name(name)
+          get_resource name.singularize.camelize
+        end
+
+        # Returns the Avo resource by singular snake_cased name
+        #
+        # 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
+        end
+
+        # Returns the Avo resource by singular snake_cased name
+        #
+        # 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
+        end
+
+        # Returns the Avo resource by some name
+        def guess_resource(name)
+          get_resource_by_name(name.to_s) || get_resource_by_model_name(name)
+        end
+
+        # Returns the Rails model class by singular snake_cased name
+        #
+        # get_model_class_by_name('user') => User
+        def get_model_class_by_name(name)
+          name.to_s.camelize.singularize
+        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
+            .sort_by { |r| r.name }
+        end
+
+        def get_available_dashboards(user = nil)
+          dashboards.sort_by { |r| r.name }
+        end
+
+        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
+        end
+
+        def dashboards_for_navigation(user = nil)
+          return [] if App.license.lacks_with_trial(:resource_ordering)
+
+          get_available_dashboards(user).select do |dashboard|
+            dashboard.is_visible?
+          end
+        end
+
+        # Insert any partials that we find in app/views/avo/sidebar/items.
+        def get_sidebar_partials
+          Dir.glob(Rails.root.join("app", "views", "avo", "sidebar", "items", "*.html.erb"))
+            .map do |path|
+              File.basename path
+            end
+            .map do |filename|
+              # remove the leading underscore (_)
+              filename[0] = ""
+              # remove the extension
+              filename.gsub!(".html.erb", "")
+              filename
+            end
+        end
+
+        def tools_for_navigation
+          return [] if Avo::App.license.lacks_with_trial(:custom_tools)
+
+          get_sidebar_partials
+        end
+      end
+    end
+  end
+end

data/lib/avo/configuration.rb

@@ -29,6 +29,8 @@ module Avo
     attr_accessor :raise_error_on_missing_policy
     attr_accessor :disabled_features
     attr_accessor :buttons_on_form_footers
+    attr_accessor :main_menu
+    attr_accessor :profile_menu
 
     def initialize
       @root_path = "/avo"
@@ -70,6 +72,8 @@ module Avo
       @raise_error_on_missing_policy = false
       @disabled_features = []
       @buttons_on_form_footers = false
+      @main_menu = nil
+      @profile_menu = nil
     end
 
     def locale_tag

data/lib/avo/fields/base_field.rb

@@ -26,6 +26,7 @@ module Avo
       attr_reader :as_label
       attr_reader :as_avatar
       attr_reader :as_description
+      attr_reader :index_text_align
 
       # Private options
       attr_reader :updatable
@@ -64,6 +65,7 @@ module Avo
         @as_label = args[:as_label] || false
         @as_avatar = args[:as_avatar] || false
         @as_description = args[:as_description] || false
+        @index_text_align = args[:index_text_align] || :left
 
         @updatable = true
         @computable = true

data/lib/avo/hosts/base_host.rb

@@ -0,0 +1,20 @@
+require "dry-initializer"
+
+# This object holds some data tha is usually needed to compute blocks around the app.
+module Avo
+  module Hosts
+    class BaseHost
+      extend Dry::Initializer
+
+      option :context, default: proc { Avo::App.context }
+      option :params, default: proc { Avo::App.params }
+      option :view_context, default: proc { Avo::App.view_context }
+      option :current_user, default: proc { Avo::App.current_user }
+      option :block, optional: true
+
+      def handle
+        instance_exec(&block)
+      end
+    end
+  end
+end

data/lib/avo/licensing/pro_license.rb

@@ -11,7 +11,8 @@ module Avo
           :enhanced_search_results,
           :searchable_associations,
           :resource_ordering,
-          :dashboards
+          :dashboards,
+          :menu_editor
         ]
       end
     end

data/lib/avo/menu/base_item.rb

@@ -0,0 +1,20 @@
+require "dry-initializer"
+
+class Avo::Menu::BaseItem
+  extend Dry::Initializer
+
+  option :collapsable, default: proc { false }
+  option :collapsed, default: proc { false }
+  option :icon, optional: true
+  option :items, default: proc { [] }
+  option :name, default: proc { "" }
+  option :visible, default: proc { true }
+
+  def visible?
+    return visible if visible.in? [true, false]
+
+    if visible.respond_to? :call
+      Avo::Hosts::BaseHost.new(block: visible).handle
+    end
+  end
+end

data/lib/avo/menu/builder.rb

@@ -0,0 +1,77 @@
+class Avo::Menu::Builder
+  class << self
+    def parse_menu(&block)
+      Docile.dsl_eval(Avo::Menu::Builder.new, &block).build
+    end
+  end
+
+  def initialize(name: nil, items: [])
+    @menu = Avo::Menu::Menu.new
+
+    @menu.name = name
+    @menu.items = items
+  end
+
+  # Adds a link
+  def link(name, **args)
+    @menu.items << Avo::Menu::Link.new(name: name, **args)
+  end
+
+  # Validates and adds a resource
+  def resource(name, **args)
+    name = name.to_s.singularize
+    res = Avo::App.guess_resource(name)
+
+    if res.present?
+      @menu.items << Avo::Menu::Resource.new(resource: name, **args)
+    end
+  end
+  alias_method :resources, :resource
+
+  # Adds a dashboard
+  def dashboard(dashboard, **args)
+    @menu.items << Avo::Menu::Dashboard.new(dashboard: dashboard, **args)
+  end
+
+  # Adds a section
+  def section(name = nil, **args, &block)
+    @menu.items << Avo::Menu::Section.new(name: name, **args, items: self.class.parse_menu(&block).items)
+  end
+
+  # Adds a group
+  def group(name = nil, **args, &block)
+    @menu.items << Avo::Menu::Group.new(name: name, **args, items: self.class.parse_menu(&block).items)
+  end
+
+  # Add all the resources
+  def all_resources(**args)
+    Avo::App.resources_for_navigation.each do |res|
+      resource res.model_class, **args
+    end
+  end
+
+  # Add all the dashboards
+  def all_dashboards(**args)
+    Avo::App.dashboards_for_navigation.each do |dash|
+      dashboard dash.id, **args
+    end
+  end
+
+  # Add all the tools
+  def all_tools(**args)
+    Avo::App.tools_for_navigation.each do |tool|
+      link tool.humanize, path: "#{root_path}/#{tool}"
+    end
+  end
+
+  # Fetch the menu
+  def build
+    @menu
+  end
+
+  protected
+
+  def root_path
+    Avo::App.root_path
+  end
+end

data/lib/avo/menu/dashboard.rb

@@ -0,0 +1,17 @@
+class Avo::Menu::Dashboard < Avo::Menu::BaseItem
+  extend Dry::Initializer
+
+  option :dashboard
+
+  def parsed_dashboard
+    dashboard_by_id || dashboard_by_name
+  end
+
+  def dashboard_by_name
+    Avo::App.get_dashboard_by_name dashboard.to_s
+  end
+
+  def dashboard_by_id
+    Avo::App.get_dashboard_by_id dashboard.to_s
+  end
+end

data/lib/avo/menu/group.rb

@@ -0,0 +1,2 @@
+class Avo::Menu::Group < Avo::Menu::BaseItem
+end

data/lib/avo/menu/link.rb

@@ -0,0 +1,4 @@
+class Avo::Menu::Link < Avo::Menu::BaseItem
+  option :path, default: proc { "" }
+  option :target, optional: true
+end

data/lib/avo/menu/menu.rb

@@ -0,0 +1,2 @@
+class Avo::Menu::Menu < OpenStruct
+end

data/lib/avo/menu/resource.rb

@@ -0,0 +1,9 @@
+class Avo::Menu::Resource < Avo::Menu::BaseItem
+  extend Dry::Initializer
+
+  option :resource
+
+  def parsed_resource
+    Avo::App.guess_resource resource.to_s
+  end
+end

data/lib/avo/menu/section.rb

@@ -0,0 +1,2 @@
+class Avo::Menu::Section < Avo::Menu::BaseItem
+end

data/lib/avo/reloader.rb

@@ -3,11 +3,19 @@ class Avo::Reloader
 
   def reload!
     # reload all files declared in paths
-    files.each { |file| load file }
+    files.each do |file|
+      if File.exist? file
+        load file
+      end
+    end
 
     # reload all files declared in each directory
     directories.keys.each do |dir|
-      Dir.glob("#{dir}/**/*.rb".to_s).each { |file| load file }
+      Dir.glob("#{dir}/**/*.rb".to_s).each do |file|
+        if File.exist? file
+          load file
+        end
+      end
     end
   end
 

data/lib/avo/services/authorization_service.rb

@@ -68,11 +68,17 @@ module Avo
         def authorize_action(user, record, action, **args)
           action = Avo.configuration.authorization_methods.stringify_keys[action.to_s] || action
 
+          # If no action passed we should raise error if the user wants that.
+          # If not, just allow it.
+          if action.nil?
+            raise Pundit::NotDefinedError.new 'Policy method is missing' if Avo.configuration.raise_error_on_missing_policy
+
+            return true
+          end
+
           # Add the question mark if it's missing
           action = "#{action}?" unless action.end_with? '?'
 
-          return true if action.nil?
-
           authorize user, record, action, **args
         end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/generators/avo/filter_generator.rb

@@ -4,6 +4,7 @@ module Generators
   module Avo
     class FilterGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("templates", __dir__)
+      class_option :multiple_select, type: :boolean
       class_option :select, type: :boolean
       class_option :text, type: :boolean
 
@@ -12,6 +13,7 @@ module Generators
       def create_resource_file
         type = "boolean"
 
+        type = "multiple_select" if options[:multiple_select]
         type = "select" if options[:select]
         type = "text" if options[:text]
 

data/lib/generators/avo/templates/filters/boolean_filter.tt

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::Filters::BooleanFilter
-  self.name = '<%= name.underscore.humanize %>'
+  self.name = "<%= name.underscore.humanize %>"
 
   def apply(request, query, values)
     query

data/lib/generators/avo/templates/filters/multiple_select_filter.tt

@@ -0,0 +1,11 @@
+class <%= class_name.camelize %> < Avo::Filters::MultipleSelectFilter
+  self.name = "<%= name.underscore.humanize %>"
+
+  def apply(request, query, value)
+    query
+  end
+
+  def options
+    {}
+  end
+end

data/lib/generators/avo/templates/filters/select_filter.tt

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::Filters::SelectFilter
-  self.name = '<%= name.underscore.humanize %>'
+  self.name = "<%= name.underscore.humanize %>"
 
   def apply(request, query, value)
     query

data/lib/generators/avo/templates/filters/text_filter.tt

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::Filters::TextFilter
-  self.name = '<%= name.underscore.humanize %>'
+  self.name = "<%= name.underscore.humanize %>"
   self.button_label = 'Filter by <%= class_name.underscore.humanize.downcase.gsub(' filter', '') %>'
 
   def apply(request, query, value)

data/lib/generators/avo/templates/tool/sidebar_item.tt

@@ -1 +1 @@
-<%%= render Avo::SidebarItemComponent.new label: '<%= human_name %>', path: "#{avo.root_path}<%= file_name %>" %>
+<%%= render Avo::Sidebar::LinkComponent.new label: '<%= human_name %>', path: "#{avo.root_path}<%= file_name %>" %>

data/public/avo-assets/avo.css

@@ -6449,6 +6449,10 @@ progress[value]::-moz-progress-bar{
   margin-left:50%
 }
 
+.ml-auto{
+  margin-left:auto
+}
+
 .-mb-2{
   margin-bottom:-0.5rem
 }
@@ -6677,6 +6681,10 @@ progress[value]::-moz-progress-bar{
   min-width:200px
 }
 
+.min-w-\[20px\]{
+  min-width:20px
+}
+
 .max-w-168{
   max-width:42rem
 }
@@ -7381,6 +7389,11 @@ progress[value]::-moz-progress-bar{
   padding-bottom:6rem
 }
 
+.px-10{
+  padding-left:2.5rem;
+  padding-right:2.5rem
+}
+
 .py-8{
   padding-top:2rem;
   padding-bottom:2rem
@@ -7418,6 +7431,10 @@ progress[value]::-moz-progress-bar{
   padding-bottom:75%
 }
 
+.pt-2{
+  padding-top:0.5rem
+}
+
 .text-left{
   text-align:left
 }
@@ -8007,14 +8024,14 @@ trix-editor {
   background-color:rgb(6 95 158 / var(--tw-bg-opacity))
 }
 
-.hover\:bg-gray-150:hover{
+.hover\:bg-blue-50:hover{
   --tw-bg-opacity:1;
-  background-color:rgb(233 234 236 / var(--tw-bg-opacity))
+  background-color:rgb(251 253 255 / var(--tw-bg-opacity))
 }
 
-.hover\:bg-blue-50:hover{
+.hover\:bg-gray-150:hover{
   --tw-bg-opacity:1;
-  background-color:rgb(251 253 255 / var(--tw-bg-opacity))
+  background-color:rgb(233 234 236 / var(--tw-bg-opacity))
 }
 
 .hover\:text-gray-500:hover{