avo 2.4.0 → 2.5.1

data/lib/avo/fields/belongs_to_field.rb

@@ -62,6 +62,8 @@ module Avo
       attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
       attr_reader :allow_via_detaching
+      attr_reader :scope
+      attr_reader :polymorphic_help
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -73,6 +75,8 @@ module Avo
         @types = args[:types]
         @relation_method = id.to_s.parameterize.underscore
         @allow_via_detaching = args[:allow_via_detaching] == true
+        @scope = args[:scope]
+        @polymorphic_help = args[:polymorphic_help]
       end
 
       def searchable
@@ -111,7 +115,13 @@ module Avo
         resource = target_resource
         resource = App.get_resource_by_model_name model if model.present?
 
-        ::Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope).all.map do |model|
+        query = Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope)
+
+        if scope.present?
+          query = Avo::Hosts::AssociationScopeHost.new(block: scope, query: query, parent: get_model).handle
+        end
+
+        query.all.map do |model|
           [model.send(resource.class.title), model.id]
         end
       end

data/lib/avo/fields/has_base_field.rb

@@ -3,6 +3,7 @@ module Avo
     class HasBaseField < BaseField
       attr_accessor :display
       attr_accessor :scope
+      attr_accessor :description
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -10,6 +11,7 @@ module Avo
         @scope = args[:scope].present? ? args[:scope] : nil
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
+        @description = args[:description]
       end
 
       def searchable

data/lib/avo/filters/base_filter.rb

@@ -1,10 +1,27 @@
 module Avo
   module Filters
     class BaseFilter
+      PARAM_KEY = :filters unless const_defined?(:PARAM_KEY)
+
       class_attribute :name, default: "Filter"
       class_attribute :component, default: "boolean-filter"
       class_attribute :default, default: nil
       class_attribute :template, default: "avo/base/select_filter"
+      class_attribute :empty_message
+
+      delegate :params, to: Avo::App
+
+      class << self
+        def decode_filters(filter_params)
+          JSON.parse(Base64.decode64(filter_params))
+        rescue
+          {}
+        end
+
+        def get_empty_message
+          empty_message || I18n.t("avo.no_options_available")
+        end
+      end
 
       def apply_query(request, query, value)
         value.stringify_keys! if value.is_a? Hash
@@ -30,6 +47,11 @@ module Avo
       rescue
         default
       end
+
+      # Fetch the applied filters from the params
+      def applied_filters
+        self.class.decode_filters params[PARAM_KEY]
+      end
     end
   end
 end

data/lib/avo/hosts/association_scope_host.rb

@@ -0,0 +1,8 @@
+module Avo
+  module Hosts
+    class AssociationScopeHost < BaseHost
+      option :parent
+      option :query
+    end
+  end
+end

data/lib/avo/services/authorization_service.rb

@@ -71,13 +71,13 @@ module Avo
           # 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
+            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? '?'
+          action = "#{action}?" unless action.end_with? "?"
 
           authorize user, record, action, **args
         end
@@ -110,14 +110,12 @@ module Avo
         end
 
         def defined_methods(user, record, **args)
-          begin
-            Pundit.policy!(user, record).methods
-          rescue => error
-            if args[:raise_exception] == false
-              []
-            else
-              raise error
-            end
+          Pundit.policy!(user, record).methods
+        rescue => error
+          if args[:raise_exception] == false
+            []
+          else
+            raise error
           end
         end
       end

data/lib/avo/version.rb

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

data/lib/generators/avo/eject_generator.rb

@@ -11,13 +11,12 @@ module Generators
       namespace "avo:eject"
 
       TEMPLATES = {
-        sidebar: "app/views/avo/sidebar/_sidebar.html.erb",
         logo: "app/views/avo/partials/_logo.html.erb",
         head: "app/views/avo/partials/_head.html.erb",
         header: "app/views/avo/partials/_header.html.erb",
-        profile_dropdown: "app/views/avo/partials/_profile_dropdown.html.erb",
         footer: "app/views/avo/partials/_footer.html.erb",
-        scripts: "app/views/avo/partials/_scripts.html.erb"
+        scripts: "app/views/avo/partials/_scripts.html.erb",
+        sidebar_extra: "app/views/avo/partials/_sidebar_extra.html.erb",
       }
 
       def handle

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -107,4 +107,5 @@ en:
       to_top: Move record to top
       to_bottom: Move record to bottom
     empty_dashboard_message: Add cards to this dashboard
-    no_cards_present: 'No cards present'
+    no_cards_present: No cards present
+    no_options_available: No options available

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -83,5 +83,6 @@ nb-NO:
     sign_out: 'Logg ut'
     tools: Redskapene
     empty_dashboard_message: Legg til kort i dette dashbordet
-    no_cards_present: 'Ingen kort til stede'
+    no_cards_present: Ingen kort til stede
+    no_options_available: Ingen tilgjengelige alternativer
 

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -85,4 +85,5 @@ pt-BR:
     sign_out: 'sair'
     tools: Ferramentas
     empty_dashboard_message: Adicionar cartões a este painel
-    no_cards_present: 'Nenhum cartão presente'
+    no_cards_present: Nenhum cartão presente
+    no_options_available: Nenhuma opção disponível

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -81,4 +81,5 @@ ro:
     was_successfully_updated: 'a fost actualizat'
     tools: Instrumente
     empty_dashboard_message: Adauga carduri in acest dashboard
-    no_cards_present: 'Niciun card disponibil'
+    no_cards_present: Niciun card disponibil
+    no_options_available: Nicio optiune disponibila