avo 2.20.0 → 2.21.0

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/app/views/avo/base/_multiple_select_filter.html.erb

@@ -13,7 +13,7 @@
     %>
     <div class="flex justify-end">
       <%= a_button class: 'mt-4', color: :primary, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
-        Filter by <%=filter.name %>
+        <%= "#{t("avo.filter_by")} #{filter.name}" %>
       <% end %>
     </div>
     <%= link_to 'url_redirect', request.url, data: { 'multiple-select-filter-target': 'urlRedirect', 'turbo-frame': params[:turbo_frame] }, style: 'hidden', class: 'hidden' %>

data/app/views/avo/partials/_resource_search.html.erb

@@ -2,7 +2,7 @@
   <div class="w-full"
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"
-    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>", "placeholder": "<%= I18n.translate 'avo.search.placeholder' %>", "cancel_button": "<%= I18n.translate 'avo.search.cancel_button' %>"}'
     <% if via_reflection.present? %>
       data-via-association="<%= via_reflection[:association] %>"
       data-via-association-id="<%= via_reflection[:association_id] %>"

data/config/i18n-tasks.yml

@@ -3,7 +3,7 @@
 # The "main" locale.
 base_locale: en
 ## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-locales: [en, fr, nb, nn, pt-BR, ro, tr]
+locales: [en, fr, nb, nn, pt-BR, pt, ro, tr]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 

data/config/initializers/pagy.rb

@@ -1 +1,17 @@
 require "pagy/extras/trim"
+
+# For locales without native pagy i18n support
+def pagy_locale_path(file_name)
+  Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "pagy", file_name)
+end
+
+Pagy::I18n.load(
+  { locale: 'en' },
+  { locale: 'fr' },
+  { locale: 'nb' },
+  { locale: 'pt-BR' },
+  { locale: 'pt' },
+  { locale: 'tr' },
+  { locale: 'nn', filepath: pagy_locale_path("nn.yml") },
+  { locale: 'ro', filepath: pagy_locale_path("ro.yml") },
+)

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,10 +10,10 @@ 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
+      include Avo::Fields::Concerns::IsDisabled
       include Avo::Fields::Concerns::HasDefault
 
       delegate :view_context, to: ::Avo::App
@@ -65,6 +65,7 @@ module Avo
         @block = block
         @required = args.dig(:required) # Value if :required present on args, nil otherwise
         @readonly = args[:readonly] || false
+        @disabled = args[:disabled] || false
         @sortable = args[:sortable] || false
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]

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

@@ -0,0 +1,19 @@
+module Avo
+  module Fields
+    module Concerns
+      module IsDisabled
+        extend ActiveSupport::Concern
+
+        attr_reader :disabled
+
+        def is_disabled?
+          if disabled.respond_to? :call
+            Avo::Hosts::ResourceViewRecordHost.new(block: disabled, record: model, view: view, resource: resource).handle
+          else
+            disabled
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/fields/select_field.rb

@@ -58,7 +58,7 @@ module Avo
 
       # Cache options as options given on block or as options received from arguments
       def options
-        @options ||= if options_from_args.respond_to? :call
+        if options_from_args.respond_to? :call
           options_from_args.call model: model, resource: resource, view: view, field: self
         else
           options_from_args

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.20.0" unless const_defined?(:VERSION)
+  VERSION = "2.21.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/field/components/edit_component.html.erb.tt

@@ -2,5 +2,5 @@
   <%%= @form.text_field @field.id,
     class: classes("w-full"),
     placeholder: @field.placeholder,
-    disabled: @field.is_readonly? %>
+    disabled: disabled? %>
 <%% end %>

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

@@ -46,6 +46,7 @@ en:
         one: peep
         other: peeps
         zero: peeps
+    filter_by: Filter by
     filters: Filters
     go_back: Go back
     grid_view: Grid view
@@ -62,9 +63,9 @@ en:
     new: new
     next_page: Next page
     no_cards_present: No cards present
-    no_item_found: No %{item} found
+    no_item_found: No record found
     no_options_available: No options available
-    no_related_item_found: No related %{item} found
+    no_related_item_found: No related record found
     not_authorized: You are not authorized to perform this action.
     number_of_items:
       one: one %{item}

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

@@ -46,6 +46,7 @@ fr:
         one: personne
         other: personnes
         zero: personne
+    filter_by: Filtrer par
     filters: Filtres
     go_back: Retourner en arrière
     grid_view: Vue grille
@@ -62,9 +63,9 @@ fr:
     new: Nouveau
     next_page: Page suivante
     no_cards_present: Aucune carte présente
-    no_item_found: Aucun %{item} trouvé
+    no_item_found: Enregistrement non trouvé
     no_options_available: Aucune option disponible
-    no_related_item_found: Aucun %{item} apparenté n'a été trouvé
+    no_related_item_found: Enregistrement connexe introuvable
     not_authorized: Vous n'êtes pas autorisé à effectuer cette action.
     number_of_items:
       one: un %{item}

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

@@ -46,6 +46,7 @@ nb:
         one: person
         other: personer
         zero: personer
+    filter_by: Filtrer etter
     filters: Filter
     go_back: Gå tilbake
     grid_view: Grid visning
@@ -62,9 +63,9 @@ nb:
     new: ny
     next_page: Neste side
     no_cards_present: Ingen kort til stede
-    no_item_found: Ingen %{item} funnet
+    no_item_found: Ingen funnet
     no_options_available: Ingen tilgjengelige alternativer
-    no_related_item_found: Ingen relaterte %{item} funnet
+    no_related_item_found: Ingen relaterte funnet
     not_authorized: Du er ikke autorisert til å gjøre denne handlingen.
     number_of_items:
       one: en %{item}

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

@@ -46,6 +46,7 @@ nn:
         one: person
         other: personar
         zero: personar
+    filter_by: Filtrer etter
     filters: Filter
     go_back: Gå tilbake
     grid_view: Gridvisning
@@ -62,9 +63,9 @@ nn:
     new: ny
     next_page: Neste side
     no_cards_present: Ingen kort til stades
-    no_item_found: Fann ingen %{item}
+    no_item_found: Fann ingen
     no_options_available: Ingen tilgjengelege alternativ
-    no_related_item_found: Fann ingen relaterte %{item}
+    no_related_item_found: Fann ingen relaterte
     not_authorized: Du er ikkje autorisert til å gjere denne handlinga.
     number_of_items:
       one: en %{item}

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

@@ -46,6 +46,7 @@ pt-BR:
         one: pessoa
         other: pessoas
         zero: ninguém
+    filter_by: Filtrar por
     filters: Filtros
     go_back: Voltar
     grid_view: Visualização em grade
@@ -62,9 +63,9 @@ pt-BR:
     new: novo
     next_page: Próxima página
     no_cards_present: Nenhum cartão presente
-    no_item_found: Nenhum %{item} encontrado
+    no_item_found: Nenhum registro encontrado
     no_options_available: Nenhuma opção disponível
-    no_related_item_found: Nenhum %{item} relacionado encontrado
+    no_related_item_found: Nenhum registro relacionado encontrado
     not_authorized: Você não está autorizado à executar essa ação.
     number_of_items:
       one: um %{item}

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

@@ -0,0 +1,120 @@
+---
+pt:
+  avo:
+    action_ran_successfully: Ação executada com sucesso!
+    actions: Ações
+    and_x_other_resources: e %{count} outros recursos
+    are_you_sure: Tem a certeza?
+    are_you_sure_detach_item: Tem a certeza que deseja separar este %{item}.
+    are_you_sure_you_want_to_run_this_option: Tem a certeza que deseja executar esta ação?
+    attach: Anexar
+    attach_and_attach_another: Anexar & anexar outro
+    attach_item: Anexar %{item}
+    attachment_class_attached: "%{attachment_class} anexado."
+    attachment_class_detached: "%{attachment_class} separado."
+    attachment_destroyed: Anexo destruído
+    cancel: Cancelar
+    choose_a_country: Escolha um país
+    choose_an_option: Escolha uma opção
+    choose_item: Escolher %{item}
+    clear_value: Apagar valor
+    click_to_reveal_filters: Clique para mostrar os filtros
+    confirm: Confirmar
+    create_new_item: Criar novo %{item}
+    dashboard: Painel
+    dashboards: Painéis
+    delete: apagar
+    delete_file: Apagar arquivo
+    delete_item: Apagar %{item}
+    detach_item: separar %{item}
+    details: detalhe
+    download: Download
+    download_file: Download do ficheiro
+    download_item: Download %{item}
+    edit: editar
+    edit_item: editar %{item}
+    empty_dashboard_message: Adicionar cartões a este painel
+    failed: Falhou
+    failed_to_find_attachment: Falha ao encontrar anexo
+    failed_to_load: Falhou ao carregar
+    field_translations:
+      file:
+        one: ficheiro
+        other: ficheiros
+        zero: ficheiros
+      people:
+        one: pessoa
+        other: pessoas
+        zero: ninguém
+    filter_by: Filtrar por
+    filters: Filtros
+    go_back: Voltar
+    grid_view: Visualização em grelha
+    hide_content: Esconder conteúdo
+    home: Início
+    key_value_field:
+      add_row: Adicionar linha
+      delete_row: Apagar linha
+      key: Chave
+      value: Valor
+    list_is_empty: Lista vazia
+    loading: A carregar
+    more: Mais
+    new: novo
+    next_page: Próxima página
+    no_cards_present: Nenhum cartão presente
+    no_item_found: Nenhum registro encontrado
+    no_options_available: Nenhuma opção disponível
+    no_related_item_found: Nenhum registro relacionado encontrado
+    not_authorized: Não está autorizado a executar essa ação.
+    number_of_items:
+      one: um %{item}
+      other: "%{count} %{item}"
+      zero: sem %{item}
+    oops_nothing_found: Oops! Nada encontrado...
+    order:
+      higher: Mover recurso para cima
+      lower: Mover recuros para baixo
+      reorder_record: Reordenar recurso
+      to_bottom: Mover recurso para o fundo
+      to_top: Mover recurso para o topo
+    per_page: Por página
+    prev_page: Página anterior
+    remove_selection: Remover seleção
+    reset_filters: Limpar filtros
+    resource_created: Recurso criado
+    resource_destroyed: Recurso destruído
+    resource_translations:
+      user:
+        one: utilizador
+        other: utilizadores
+        zero: utilizadores
+    resource_updated: Recurso atualizado
+    resources: Recursos
+    run: Executar
+    save: Guardar
+    search:
+      cancel_button: Cancelar
+      placeholder: Procurar
+    select_all: Selecionar tudo
+    select_all_matching: Selecionar todas as correspondências
+    select_item: Selecionar item
+    show_content: Mostrar conteúdo
+    sign_out: Terminar sessão
+    switch_to_view: Alterar para visão %{view_type}
+    table_view: Visualização em tabela
+    tools: Ferramentas
+    type_to_search: Escreva para pesquisar.
+    unauthorized: Não autorizado
+    undo: desfazer
+    view: Ver
+    view_item: ver %{item}
+    was_successfully_created: foi criado com sucesso
+    was_successfully_updated: foi atualizado com sucesso
+    x_items_more:
+      one: mais um item
+      other: "%{count} mais items"
+      zero: mais nenhum item
+    x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> itens selecionados nesta página de um total de <span class="font-bold text-gray-700">%{count}</span>
+    x_records_selected_from_all_pages_html: <span class="font-bold text-gray-700">%{count}</span> itens selecionados de todas as páginas
+    you_missed_something_check_form: Pode ter-se esquecido algo. Por favor, verifique o formulário.