avo 2.21.1.pre.issue1450 → 2.21.1.pre.pr1476

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebf134b0ec573fefe33360ace54658cdaafcf1904a0d88f63e89398f12e34377
-  data.tar.gz: 4c1ccd709c542910c2590e4b508a549463d0777b33e3baff83a63e4c97a834f9
+  metadata.gz: 8f832c5802957b7d88c4271b886cfcb0a727ad98b1d200dc1f8e6d7a5a779067
+  data.tar.gz: bb639aec120f3881847aa5ce53bd4bc399da0ae3fde37d01aad77ef13c017cbc
 SHA512:
-  metadata.gz: e8bb307e086e09eb90b5cbfcddaee9f0f7fd4437ee742a98a0eaeea24171c68828dfa664a0076c332ce9df0955fb931bd3fe34c41941b4988ebe850d2e7cc682
-  data.tar.gz: e8169c3475feda95dcf85a9532c26b7157fe598e9544a033684fa343bb15aac0c68f5da776c7120a61d52dc2816ea84b7ac059444f4520e549aeaa09e694f017
+  metadata.gz: 53180bdf4636c4dffd120fb8bb0f9ab0dacbbb9aad7e5ac3b906329144510b12b719591ebedb1dd2fb20d81a69d3a4932933d6500b4451e46947e9c3261885f0
+  data.tar.gz: 16f6f89ae35d3b8d1c491af4d3b35eee7148d56ee2dcfcdd7ec3a0b0bd16919a0f0424d93c6863f3a1d22acbb1d2be6cf02007122804fed43a11bd6229de491f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.21.1.pre.issue1450)
+    avo (2.21.1.pre.pr1476)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/fields/trix_field/edit_component.html.erb

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= content_tag :div, class: "relative block overflow-x-auto max-w-full",
+  <%= content_tag :div,
+    class: "relative block overflow-x-auto max-w-full",
     data: {
       controller: "trix-field",
       trix_field_target: "controller",

data/app/components/avo/fields/trix_field/edit_component.rb

@@ -20,6 +20,10 @@ class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
   end
 
   def trix_id
-    "trix_#{resource_name}_#{@field.id}"
+    if resource_name.present?
+      "trix_#{resource_name}_#{@field.id}"
+    elsif form.present?
+      "trix_#{form.index}_#{@field.id}"
+    end
   end
 end

data/app/components/avo/index/resource_table_component.rb

@@ -2,7 +2,7 @@
 
 class Avo::Index::ResourceTableComponent < ViewComponent::Base
   include Avo::ApplicationHelper
-  attr_reader :pagy
+  attr_reader :pagy, :query
 
   def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, pagy: nil, query: nil)
     @resources = resources
@@ -15,10 +15,10 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
   end
 
   def encrypted_query
-    return if @query.nil?
+    return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)
 
     Avo::Services::EncryptionService.encrypt(
-      message: @query.all.to_sql,
+      message: query.all.to_sql,
       purpose: :select_all
     )
   end

data/app/components/avo/resource_component.rb

@@ -53,6 +53,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
   end
 
+  # Ex: A Post has many Comments
   def authorize_association_for(policy_method)
     policy_result = true
 
@@ -67,11 +68,12 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
       if association_name.present?
         method_name = "#{policy_method}_#{association_name}?".to_sym
-        # Prepare the authorization service
+        # Use the policy methods from the parent (Post)
         service = reflection_resource.authorization
 
         if service.has_method?(method_name, raise_exception: false)
-          policy_result = service.authorize_action(method_name, raise_exception: false)
+          # Override the record with the child record (Comment not Post)
+          policy_result = service.authorize_action(method_name, record: resource.model, raise_exception: false)
         end
       end
     end

data/app/controllers/avo/application_controller.rb

@@ -172,11 +172,11 @@ module Avo
     end
 
     def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user)
+      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
     end
 
     def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @related_model)
     end
 
     def authorize_base_action

data/app/controllers/avo/associations_controller.rb

@@ -3,12 +3,13 @@ require_dependency "avo/base_controller"
 module Avo
   class AssociationsController < BaseController
     before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :hydrate_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_authorization
     before_action :set_reflection_field
-    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_related_model, only: [:show, :order]
+    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy, :order]

data/app/controllers/avo/attachments_controller.rb

@@ -10,6 +10,10 @@ module Avo
       blob = ActiveStorage::Blob.create_and_upload! io: params[:file], filename: params[:filename]
       association_name = BaseResource.valid_attachment_name(@model, params[:attachment_key])
 
+      if association_name.blank?
+        raise ActionController::BadRequest.new("Could not find the attachment association for #{params[:attachment_key]} (check the `attachment_key` for this Trix field)")
+      end
+
       @model.send(association_name).attach blob
 
       render json: {

data/app/controllers/avo/base_controller.rb

@@ -315,7 +315,7 @@ module Avo
           filter[:class].new arguments: filter[:arguments]
         end
         .select do |filter|
-          filter.visible_in_view(resource: @resource, parent_model: @parent_model, parent_resource: @parent_resource)
+          filter.visible_in_view(resource: @resource, parent_resource: @parent_resource)
         end
     end
 
@@ -326,7 +326,7 @@ module Avo
           action[:class].new(model: @model, resource: @resource, view: @view, arguments: action[:arguments])
         end
         .select do |action|
-          action.visible_in_view(parent_model: @parent_model, parent_resource: @parent_resource)
+          action.visible_in_view(parent_resource: @parent_resource)
         end
     end
 

data/app/controllers/avo/dashboards/cards_controller.rb

@@ -21,7 +21,7 @@ module Avo
 
       def set_card
         @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
-          card.hydrate(dashboard: @dashboard, params: params)
+          card.hydrate(dashboard: @dashboard)
         end
       end
 

data/app/controllers/avo/search_controller.rb

@@ -44,27 +44,33 @@ module Avo
     end
 
     def search_resource(resource)
-      query =  Avo::Hosts::SearchScopeHost.new(
+      query = Avo::Hosts::SearchScopeHost.new(
         block: resource.search_query,
         params: params,
-        scope: resource.class.scope.limit(8)
+        scope: resource.class.scope
       ).handle
 
+      # Get the count
+      results_count = query.count
+
+      # Get the results
+      query = query.limit(8)
+
       query = apply_scope(query) if should_apply_any_scope?
 
       results = apply_search_metadata(query, resource)
 
       header = resource.plural_name
 
-      if results.length > 0
-        header += " (#{results.length})"
+      if results_count > 0
+        header = "#{header} (#{results_count})"
       end
 
       result_object = {
         header: header,
         help: resource.class.search_query_help,
         results: results,
-        count: results.length
+        count: results_count
       }
 
       [resource.name.pluralize.downcase, result_object]

data/app/javascript/js/controllers/fields/trix_field_controller.js

@@ -55,7 +55,7 @@ export default class extends Controller {
         }
 
         // Prevent file uploads for resources that haven't been saved yet.
-        if (this.resourceId === '') {
+        if (!this.resourceId) {
           event.preventDefault()
           alert("You can't upload files into the Trix editor until you save the resource.")
 
@@ -63,7 +63,7 @@ export default class extends Controller {
         }
 
         // Prevent file uploads for fields without an attachment key.
-        if (this.attachmentKey === '') {
+        if (!this.attachmentKey) {
           event.preventDefault()
           alert("You haven't set an `attachment_key` to this Trix field.")
         }
@@ -93,7 +93,10 @@ export default class extends Controller {
 
     xhr.open('POST', this.uploadUrl, true)
 
-    xhr.setRequestHeader('X-CSRF-Token', document.querySelector('meta[name="csrf-token"]').content)
+    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content
+    if (csrfToken) {
+      xhr.setRequestHeader('X-CSRF-Token', csrfToken)
+    }
 
     xhr.upload.addEventListener('progress', (event) => {
       // eslint-disable-next-line no-mixed-operators

data/app/javascript/js/controllers/item_select_all_controller.js

@@ -18,8 +18,7 @@ export default class extends Controller {
     document.querySelectorAll(`[data-controller="item-selector"][data-resource-name="${this.resourceName}"] input[type=checkbox]`)
       .forEach((checkbox) => checkbox.checked !== checked && checkbox.click())
 
-    // Only run "all matching" if there are more pages available
-    if (this.pageCountValue > 1) {
+    if (this.selectAllEnabled()) {
       this.selectAllOverlay(checked)
 
       // When de-selecting everything, ensure the selectAll toggle is false and hide overlay.
@@ -35,8 +34,7 @@ export default class extends Controller {
     this.itemCheckboxTargets.forEach((checkbox) => allSelected = allSelected && checkbox.checked)
     this.checkboxTarget.checked = allSelected
 
-    // Only run "all matching" if there are more pages available
-    if (this.pageCountValue > 1) {
+    if (this.selectAllEnabled()) {
       this.selectAllOverlay(allSelected)
       this.resetUnselected()
     }
@@ -63,4 +61,9 @@ export default class extends Controller {
       this.selectAllOverlayTarget.classList.add('hidden')
     }
   }
+
+  // True if there are more pages available and if query encryption run successfully
+  selectAllEnabled() {
+    return this.pageCountValue > 1 && this.selectedAllQueryValue !== 'select_all_disabled'
+  }
 }

data/app/views/avo/actions/show.html.erb

@@ -18,7 +18,7 @@
         <%= @action.action_name %>
       <% end %>
       <div class="flex-1 flex">
-        <%= @action.message %>
+        <%= @action.get_message %>
       </div>
       <%= form.hidden_field :avo_resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
       <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>

data/lib/avo/base_action.rb

@@ -72,6 +72,14 @@ module Avo
       @response[:messages] = []
     end
 
+    def get_message
+      if self.class.message.respond_to? :call
+        Avo::Hosts::ResourceRecordHost.new(block: self.class.message, record: self.class.model, resource: self.class.resource).handle
+      else
+        self.class.message
+      end
+    end
+
     def get_attributes_for_action
       get_fields.map do |field|
         [field.id, field.value || field.default]
@@ -116,7 +124,7 @@ module Avo
       self
     end
 
-    def visible_in_view(parent_model: nil, parent_resource: nil)
+    def visible_in_view(parent_resource: nil)
       if visible.blank?
         # Hide on the :new view by default
         return false if view == :new
@@ -128,9 +136,7 @@ module Avo
       # Run the visible block if available
       Avo::Hosts::VisibilityHost.new(
         block: visible,
-        model: self.class.model,
         params: params,
-        parent_model: parent_model,
         parent_resource: parent_resource,
         resource: self.class.resource,
         view: self.class.view,

data/lib/avo/base_card.rb

@@ -20,6 +20,10 @@ module Avo
     attr_accessor :params
 
     delegate :context, to: ::Avo::App
+    delegate :current_user, to: ::Avo::App
+    delegate :view_context, to: ::Avo::App
+    delegate :params, to: ::Avo::App
+    delegate :request, to: ::Avo::App
 
     class << self
       def query(&block)
@@ -106,9 +110,8 @@ module Avo
       self
     end
 
-    def hydrate(dashboard: nil, params: nil)
+    def hydrate(dashboard: nil)
       @dashboard = dashboard if dashboard.present?
-      @params = params if params.present?
 
       self
     end

data/lib/avo/base_resource.rb

@@ -117,9 +117,10 @@ module Avo
       end
 
       def valid_attachment_name(record, association_name)
-        get_record_associations(record).keys.each do |name|
-          return association_name if name == "#{association_name}_attachment" || name == "#{association_name}_attachments"
+        association_exists = get_record_associations(record).keys.any? do |name|
+          name == "#{association_name}_attachment" || name == "#{association_name}_attachments"
         end
+        return association_name if association_exists
       end
 
       def get_available_models

data/lib/avo/concerns/handles_field_args.rb

@@ -12,7 +12,14 @@ module Avo
         value = default
 
         if type == :boolean
-          value = args[name.to_sym] == true
+          case args[name.to_sym]
+          when nil
+            value = default
+          when false
+            value = false
+          when true
+            value = true
+          end
         else
           value = args[name.to_sym] unless args.dig(name.to_sym).nil?
         end

data/lib/avo/fields/base_field.rb

@@ -10,7 +10,6 @@ module Avo
       include ActionView::Helpers::UrlHelper
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
-      include Avo::Concerns::HandlesFieldArgs
       include Avo::Concerns::HasHTMLAttributes
       include Avo::Fields::Concerns::IsRequired
       include Avo::Fields::Concerns::IsReadonly

data/lib/avo/filters/base_filter.rb

@@ -60,14 +60,13 @@ module Avo
         self.class.decode_filters params[PARAM_KEY]
       end
 
-      def visible_in_view(resource: nil, parent_model: nil, parent_resource: nil)
+      def visible_in_view(resource: nil, parent_resource: nil)
         return true if visible.blank?
 
         # Run the visible block if available
         Avo::Hosts::VisibilityHost.new(
           block: visible,
           params: params,
-          parent_model: parent_model,
           parent_resource: parent_resource,
           resource: resource,
           arguments: arguments

data/lib/avo/hosts/resource_record_host.rb

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

data/lib/avo/hosts/visibility_host.rb

@@ -1,7 +1,6 @@
 module Avo
   module Hosts
     class VisibilityHost < BaseHost
-      option :parent_model
       option :parent_resource
       option :resource
       option :arguments

data/lib/avo/services/authorization_service.rb

@@ -119,7 +119,7 @@ module Avo
       end
 
       def authorize_action(action, **args)
-        self.class.authorize_action(user, record, action, policy_class: policy_class, **args)
+        self.class.authorize_action(user, args[:record] || record, action, policy_class: policy_class, **args)
       end
 
       def apply_policy(model)
@@ -131,7 +131,7 @@ module Avo
       end
 
       def has_method?(method, **args)
-        defined_methods(record, **args).include? method.to_sym
+        defined_methods(args[:record] || record, **args).include? method.to_sym
       end
     end
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.21.1.pre.issue1450" unless const_defined?(:VERSION)
+  VERSION = "2.21.1.pre.pr1476" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/locales/pagy/nn.yml

@@ -0,0 +1,15 @@
+nn:
+  pagy:
+    item_name:
+      one: "resultat"
+      other: "resultat"
+    nav:
+      prev: "‹ Førre"
+      next: "Neste ›"
+      gap: "…"
+    info:
+      no_items: "Ingen %{item_name} funne"
+      single_page: "Viser <b>%{count}</b> %{item_name}"
+      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
+    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
+    items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"