avo 2.43.0 → 2.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46a221f03c28ba77e3a9ab32d841176eb9ecf7125161742ad0e1c222063d1b0
-  data.tar.gz: 53a6aced2acfe8347472915e2d1c757ab7125b4189c333b1a849b23e51e306f5
+  metadata.gz: 3eeaf7c4479bd7cd5c0e45ca017ab8527a0d0ddf5fe625bc0bee728d5be654eb
+  data.tar.gz: 6f8538be2082861d11a2c150cd670733978d8631885aa7693c0d6b9770a97535
 SHA512:
-  metadata.gz: 6c911463f13e7556ac9a9340ab45d67e18ee9130a542d5d12db3d728dbf62e4abe74f09ffc6cf9bfb4fa5b578396461715ba47ffc2a006680a6460ec25e748bd
-  data.tar.gz: 7399602dd68b5442f19ed38a483373c95cde447a43fba2108e6e3e76905888f547841fd81675700c7467d0f035aab5a5563cc2a870ced29faf74581818266396
+  metadata.gz: 48a019b6179859de05f19839922ae41f391f08112f436c0946a526c5b36bc027855f5220c118c0588c66fecaea0d5ba59978d98803b1311884261f472f267efc
+  data.tar.gz: a5e00b21b9c62e5825718aec9bff93d8759b67f318edd93ba488a3f2caa2d7af3d7143f25917b6d475557b5d52648dc8f23bdb09d95194bc8278531be653e722

data/Gemfile

@@ -167,3 +167,5 @@ gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 
 gem "mapkick-rb", "~> 0.1.4"
+
+gem "turbo_power", "~> 0.5.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.43.0)
+    avo (2.45.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -13,6 +13,7 @@ PATH
       meta-tags
       pagy
       turbo-rails
+      turbo_power (~> 0.5.0)
       view_component (>= 2.54.0)
       zeitwerk (>= 2.6.2)
 
@@ -419,6 +420,8 @@ GEM
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
+    turbo_power (0.5.0)
+      turbo-rails (~> 1.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
@@ -518,6 +521,7 @@ DEPENDENCIES
   sprockets-rails
   standard
   test-prof
+  turbo_power (~> 0.5.0)
   tzinfo-data
   web-console (>= 3.3.0)
   webdrivers (>= 5.3.0)

data/app/components/avo/index/resource_table_component.html.erb

@@ -11,7 +11,7 @@
     <div class="absolute z-30 w-full ml-10 pt-px hidden" data-item-select-all-target="selectAllOverlay">
       <div class="bg-white flex items-center h-9 mt-0.5">
         <div class="mt-1.5" data-item-select-all-target="unselectedMessage">
-          <%= t "avo.x_records_selected_from_a_total_of_x_html", selected: pagy.in, count: pagy.count %>
+          <%= selected_page_label %>
           <%= a_link request.url,
             size: :xs,
             color: :primary,
@@ -22,7 +22,7 @@
           <% end %>
         </div>
         <div class="mt-1.5" data-item-select-all-target="selectedMessage" class="hidden">
-          <%= t "avo.x_records_selected_from_all_pages_html", count: pagy.count %>
+          <%= selected_all_label %>
           <%= a_link request.url,
             size: :xs,
             color: :primary,

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

@@ -22,4 +22,20 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
       purpose: :select_all
     )
   end
+
+  def selected_page_label
+    if @resource.pagination_type.countless?
+      t "avo.x_records_selected_from_page_html", selected: pagy.in
+    else
+      t "avo.x_records_selected_from_a_total_of_x_html", selected: pagy.in, count: pagy.count
+    end
+  end
+
+  def selected_all_label
+    if @resource.pagination_type.countless?
+      t "avo.records_selected_from_all_pages_html"
+    else
+      t "avo.x_records_selected_from_all_pages_html", count: pagy.count
+    end
+  end
 end

data/app/components/avo/paginator_component.html.erb

@@ -1,47 +1,36 @@
-<%
-  per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, index_params[:per_page].to_i]
-
-  if parent_model.present?
-    per_page_options.prepend Avo.configuration.via_per_page
-  end
-
-  per_page_options = per_page_options.sort.uniq
-%>
-<% unless @pagy.pages <= 1 && discreet_pagination %>
-  <div class="flex flex-col sm:flex-row items-center justify-between aborder-t aborder-slate-200 rounded-xl space-y-2 sm:space-y-0">
-    <div class="flex-2 sm:flex sm:items-center sm:justify-between">
-      <div>
-        <div class="text-sm leading-5 text-slate-600 flex items-center">
-          <div data-controller="per-page">
-            <div class="flex items-center">
-              <%= select_tag 'per_page',
-                options_for_select(per_page_options, index_params[:per_page]),
-                class: 'appearance-none inline-flex bg-white-100 disabled:bg-white-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
-                data: {
-                  'turbo-frame': turbo_frame,
-                  'per-page-target': 'selector',
-                  action: 'change->per-page#reload'
-                }
-              %> <%= t('avo.per_page').downcase %>
-            </div>
-            <% per_page_options.each do |option| %>
-              <%= link_to "Change to #{option} items per page", change_items_per_page_url(option), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
-            <% end %>
+<div class="flex flex-col sm:flex-row items-center justify-between aborder-t aborder-slate-200 rounded-xl space-y-2 sm:space-y-0">
+  <div class="flex-2 sm:flex sm:items-center sm:justify-between">
+    <div>
+      <div class="text-sm leading-5 text-slate-600 flex items-center">
+        <div data-controller="per-page">
+          <div class="flex items-center">
+            <%= select_tag 'per_page',
+              options_for_select(per_page_options, index_params[:per_page]),
+              class: 'appearance-none inline-flex bg-white-100 disabled:bg-white-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
+              data: {
+                'turbo-frame': turbo_frame,
+                'per-page-target': 'selector',
+                action: 'change->per-page#reload'
+              }
+            %> <%= t('avo.per_page').downcase %>
           </div>
+          <% per_page_options.each do |option| %>
+            <%= link_to "Change to #{option} items per page", change_items_per_page_url(option), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+          <% end %>
         </div>
       </div>
     </div>
-    <div class="flex">
-      <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
-        <% if @pagy.count > 0 %>
-          <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
-        <% end %>
+  </div>
+  <div class="flex">
+    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
+      <% if @resource.pagination_type.default? %>
+        <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
+      <% end %>
 
-        <% if @pagy.pages > 1 %>
-          <%# @todo: add first & last page. make the first and last buttons rounded %>
-          <%== helpers.pagy_nav @pagy %>
-        <% end %>
-      </div>
+      <% if pagy.pages > 1 %>
+        <%# @todo: add first & last page. make the first and last buttons rounded %>
+        <%== helpers.pagy_nav @pagy %>
+      <% end %>
     </div>
   </div>
-<% end %>
+</div>

data/app/components/avo/paginator_component.rb

@@ -24,4 +24,22 @@ class Avo::PaginatorComponent < ViewComponent::Base
       helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1)
     end
   end
+
+  def render?
+    return false if discreet_pagination && pagy.pages <= 1
+
+    @pagy.items > 0
+  end
+
+  def per_page_options
+    @per_page_options ||= begin
+      options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, index_params[:per_page].to_i]
+
+      if parent_model.present?
+        options.prepend Avo.configuration.via_per_page
+      end
+
+      options.sort.uniq
+    end
+  end
 end

data/app/components/avo/views/resource_edit_component.html.erb

@@ -81,10 +81,12 @@
         <% if Avo.configuration.buttons_on_form_footers %>
           <% c.with_footer_tools do %>
             <div class="mt-4">
-              <%= a_link back_path,
-              style: :text,
-              icon: 'arrow-left' do %>
-                <%= t('avo.cancel').capitalize %>
+              <% if back_path.present? %>
+                <%= a_link back_path,
+                style: :text,
+                icon: 'arrow-left' do %>
+                  <%= t('avo.cancel').capitalize %>
+                <% end %>
               <% end %>
               <% if can_see_the_save_button? %>
                 <%= a_button color: :primary,

data/app/controllers/avo/actions_controller.rb

@@ -16,7 +16,6 @@ module Avo
       @view = :new
 
       @resource.hydrate(model: @model, view: @view, user: _current_user, params: params)
-      @model = ActionModel.new @action.get_attributes_for_action
     end
 
     def handle
@@ -79,19 +78,18 @@ module Avo
       end
 
       respond_to do |format|
-        format.html do
+        format.turbo_stream do
           # Flash the messages collected from the action
           flash_messages messages
 
           if response[:type] == :redirect
-            path = response[:path]
-
-            if path.respond_to? :call
-              path = instance_eval(&path)
-            end
-
-            redirect_to path, **{allow_other_host: response[:allow_other_host], status: response[:status]}.compact
-          elsif response[:type] == :reload
+            render turbo_stream: turbo_stream.redirect_to(
+              Avo::ExecutionContext.new(target: response[:path]).handle,
+              nil,
+              response[:redirect_args][:turbo_frame],
+              **response[:redirect_args].except(:turbo_frame)
+            )
+          else
             redirect_back fallback_location: resources_path(resource: @resource)
           end
         end

data/app/controllers/avo/application_controller.rb

@@ -6,7 +6,6 @@ module Avo
       Avo::ApplicationController.include Pundit
     end
 
-    include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
     include Avo::Concerns::Breadcrumbs

data/app/controllers/avo/associations_controller.rb

@@ -81,7 +81,7 @@ module Avo
       association_name = BaseResource.valid_association_name(@model, params[:related_name])
 
       if reflection_class == "HasManyReflection"
-        @model.send(association_name).destroy @attachment_model
+        @model.send(association_name).delete @attachment_model
       else
         @model.send("#{association_name}=", nil)
       end

data/app/controllers/avo/base_controller.rb

@@ -65,14 +65,7 @@ module Avo
         ).apply_query request, @query, filter_value
       end
 
-      extra_pagy_params = {}
-
-      # Reset open filters when a user navigates to a new page
-      extra_pagy_params[:keep_filters_panel_open] = if params[:keep_filters_panel_open] == "1"
-        "0"
-      end
-
-      @pagy, @models = pagy(@query, items: @index_params[:per_page], link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", size: [1, 2, 2, 1], params: extra_pagy_params)
+      apply_pagination
 
       # Create resources for each model
       @resources = @models.map do |model|
@@ -504,8 +497,10 @@ module Avo
     end
 
     def destroy_fail_action
+      flash[:error] = destroy_fail_message
+
       respond_to do |format|
-        format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: destroy_fail_message }
+        format.turbo_stream { render partial: "avo/partials/flash_alerts" }
       end
     end
 
@@ -541,5 +536,9 @@ module Avo
     def set_pagy_locale
       @pagy_locale = locale.to_s || Avo.configuration.locale || "en"
     end
+
+    def apply_pagination
+      @pagy, @models = @resource.apply_pagination(index_params: @index_params, query: @query)
+    end
   end
 end

data/app/javascript/js/application.js

@@ -2,6 +2,9 @@ import 'mapkick/bundle'
 
 import { Alert, Popover } from 'tailwindcss-stimulus-components'
 import { Application } from '@hotwired/stimulus'
+import TurboPower from 'turbo_power'
+
+TurboPower.initialize(Turbo.StreamActions)
 
 const application = Application.start()
 

data/app/javascript/js/controllers/action_controller.js

@@ -2,7 +2,7 @@ import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../helpers/cast_boolean'
 
 export default class extends Controller {
-  static targets = ['controllerDiv', 'resourceIds', 'form', 'selectedAllQuery']
+  static targets = ['controllerDiv', 'resourceIds', 'submit', 'selectedAllQuery']
 
   connect() {
     this.resourceIdsTarget.value = this.resourceIds
@@ -13,7 +13,7 @@ export default class extends Controller {
     }
 
     if (this.noConfirmation) {
-      this.formTarget.submit()
+      this.submitTarget.click()
     } else {
       this.controllerDivTarget.classList.remove('hidden')
     }

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

@@ -7,8 +7,7 @@
     data-resource-id="<%= params[:id] %>"
     class="hidden text-slate-800"
   >
-    <%= form_with model: @model,
-      scope: 'fields',
+    <%= form_with scope: 'fields',
       url: Avo::Services::URIService.parse(@resource.records_path).append_paths("actions").to_s,
       local: true,
       data: @action.class.form_data_attributes do |form|

data/app/views/avo/partials/_flash_alerts.turbo_stream.erb

@@ -1,3 +1,3 @@
 <%= turbo_stream.append "alerts" do %>
-  <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+  <%= render Avo::FlashAlertsComponent.new flashes: flash.discard %>
 <% end %>

data/avo.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "active_link_to"
   spec.add_dependency "view_component", ">= 2.54.0"
   spec.add_dependency "turbo-rails"
+  spec.add_dependency "turbo_power", "~> 0.5.0"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "dry-initializer"

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, pt, ro, tr]
+locales: [ar, en, es, fr, nb, nn, pt-BR, pt, ro, tr]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 

data/config/initializers/pagy.rb

@@ -1,4 +1,5 @@
 require "pagy/extras/trim"
+require "pagy/extras/countless"
 
 # For locales without native pagy i18n support
 def pagy_locale_path(file_name)
@@ -7,6 +8,7 @@ end
 
 extra_locales = [
   {locale: "en"},
+  {locale: "es"},
   {locale: "fr"},
   {locale: "nb"},
   {locale: "pt-BR"},

data/lib/avo/base_action.rb

@@ -7,22 +7,18 @@ module Avo
     class_attribute :confirm_button_label
     class_attribute :cancel_button_label
     class_attribute :no_confirmation, default: false
-    class_attribute :model
-    class_attribute :view
-    class_attribute :user
-    class_attribute :resource
     class_attribute :standalone, default: false
     class_attribute :visible
     class_attribute :may_download_file, default: false
     class_attribute :turbo
 
+    attr_accessor :view
     attr_accessor :response
     attr_accessor :model
     attr_accessor :resource
     attr_accessor :user
     attr_reader :arguments
 
-    delegate :view, to: :class
     delegate :context, to: ::Avo::App
     delegate :current_user, to: ::Avo::App
     delegate :params, to: ::Avo::App
@@ -36,19 +32,21 @@ module Avo
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
-          {turbo: turbo || false, remote: false, action_target: :form}
+          {turbo: turbo || false, remote: false}
         else
-          {turbo: turbo, turbo_frame: :_top, action_target: :form}.compact
+          {turbo: turbo, turbo_frame: :_top}.compact
         end
       end
 
       # We can't respond with a file download from Turbo se we disable close the modal manually after a while (it's a hack, we know)
       def submit_button_data_attributes
+        attributes = { action_target: "submit" }
+
         if may_download_file
-          {action: "click->modal#delayedClose"}
-        else
-          {}
+          attributes[:action] = "click->modal#delayedClose"
         end
+
+        attributes
       end
     end
 
@@ -59,10 +57,10 @@ module Avo
     end
 
     def initialize(model: nil, resource: nil, user: nil, view: nil, arguments: {})
-      self.class.model = model
-      self.class.resource = resource
-      self.class.user = user
-      self.class.view = view
+      @model = model
+      @resource = resource
+      @user = user
+      @view = view
       @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
@@ -75,23 +73,12 @@ module Avo
 
     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
+        Avo::Hosts::ResourceRecordHost.new(block: self.class.message, record: @model, resource: @resource).handle
       else
         self.class.message
       end
     end
 
-    def get_attributes_for_action
-      get_fields.map do |field|
-        default_value = if field.default.respond_to? :call
-          Avo::Hosts::ResourceViewRecordHost.new(block: field.default, record: self.class.model, view: view, resource: self.class.resource).handle
-        else
-          field.default
-        end
-        [field.id, field.value || default_value]
-      end.to_h
-    end
-
     def handle_action(**args)
       models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
       # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
@@ -144,8 +131,8 @@ module Avo
         block: visible,
         params: params,
         parent_resource: parent_resource,
-        resource: self.class.resource,
-        view: self.class.view,
+        resource: @resource,
+        view: @view,
         arguments: arguments
       ).handle
     end
@@ -197,10 +184,9 @@ module Avo
       self
     end
 
-    def redirect_to(path = nil, allow_other_host: nil, status: nil, &block)
+    def redirect_to(path = nil, **args, &block)
       response[:type] = :redirect
-      response[:allow_other_host] = allow_other_host
-      response[:status] = status
+      response[:redirect_args] = args
       response[:path] = if block.present?
         block
       else

data/lib/avo/base_resource.rb

@@ -8,6 +8,7 @@ module Avo
     include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
+    include Avo::Concerns::Pagination
 
     delegate :view_context, to: ::Avo::App
     delegate :current_user, to: ::Avo::App

data/lib/avo/concerns/pagination.rb

@@ -0,0 +1,53 @@
+module Avo
+  module Concerns
+    module Pagination
+      extend ActiveSupport::Concern
+
+      included do
+        include Pagy::Backend
+
+        class_attribute :pagination, default: {}
+
+        PAGINATION_METHOD = {
+          default: :pagy,
+          countless: :pagy_countless,
+        } unless defined? PAGINATION_METHOD
+
+        PAGINATION_DEFAULTS = {
+          type: :default,
+          size: [1, 2, 2, 1],
+        } unless defined? PAGINATION_DEFAULTS
+      end
+
+      def pagination_type
+        @pagination_type ||= ActiveSupport::StringInquirer.new(pagination_hash[:type].to_s)
+      end
+
+      def apply_pagination(index_params:, query:)
+        extra_pagy_params = {}
+
+        # Reset open filters when a user navigates to a new page
+        extra_pagy_params[:keep_filters_panel_open] = if params[:keep_filters_panel_open] == "1"
+          "0"
+        end
+
+        send PAGINATION_METHOD[pagination_type.to_sym],
+          query,
+          items: index_params[:per_page],
+          link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"",
+          params: extra_pagy_params,
+          size: pagination_hash[:size]
+      end
+
+      private
+
+      def pagination_hash
+        @pagination ||= PAGINATION_DEFAULTS.merge Avo::ExecutionContext.new(
+          target: pagination,
+          resource: self,
+          view: @view
+        ).handle
+      end
+    end
+  end
+end

data/lib/avo/fields/base_field.rb

@@ -99,14 +99,20 @@ module Avo
         except_on args[:except_on] if args[:except_on].present?
       end
 
-      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
-        @model = model if model.present?
-        @view = view if view.present?
-        @resource = resource if resource.present?
-        @action = action if action.present?
-        @user = user if user.present?
-        @panel_name = panel_name if panel_name.present?
+      def hydrate(**kwargs)
+        # List of permitted keyword argument keys as symbols
+        permited_kwargs_keys = %i[model resource action view panel_name user]
 
+        # Check for unrecognized keys
+        unrecognized_keys = kwargs.keys - permited_kwargs_keys
+        raise ArgumentError, "Unrecognized argument(s): #{unrecognized_keys.join(', ')}" if unrecognized_keys.any?
+
+        # Set instance variables with provided values
+        kwargs.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
+
+        # Return self for method chaining, if desired
         self
       end
 

data/lib/avo/version.rb

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

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

@@ -1,7 +1,7 @@
 ---
 ar:
   avo:
-    action_ran_successfully: 'تم تنفيذ الأمر بنجاح!'
+    action_ran_successfully: تم تنفيذ الأمر بنجاح!
     actions: أوامر
     and_x_other_resources: و %{count} موارد أخرى
     are_you_sure: هل أنت متأكد؟
@@ -10,8 +10,8 @@ ar:
     attach: ربط
     attach_and_attach_another: ربط وربط آخر
     attach_item: ربط %{item}
-    attachment_class_attached: '%{attachment_class} تم ربط'
-    attachment_class_detached: '%{attachment_class} تم فصل'
+    attachment_class_attached: "%{attachment_class} تم ربط"
+    attachment_class_detached: "%{attachment_class} تم فصل"
     attachment_destroyed: تم حذف المرفق
     cancel: إلغاء
     choose_a_country: اختر دولة
@@ -80,6 +80,7 @@ ar:
       to_top: حرك السجل للأعلى بشكل كامل
     per_page: لكل صفحة
     prev_page: الصفحة السابقة
+    records_selected_from_all_pages_html: جميع السجلات مختارة من جميع الصفحات
     remove_selection: إزالة التحديد
     reset_filters: إعادة تعيين الفلاتر
     resource_created: تم إنشاء السجل
@@ -121,6 +122,5 @@ ar:
       zero: لا توجد عناصر إضافية
     x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> السجلات المحددة في هذه الصفحة من إجمالي<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> السجلات المحددة من كل الصفحات
+    x_records_selected_from_page_html: <span class="font-bold text-gray-700">%{selected}</span> السجلات المختارة في هذه الصفحة
     you_missed_something_check_form: ربما نسيت شيئًا، يرجى التحقق من البيانات.
-
-

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

@@ -80,6 +80,7 @@ en:
       to_top: Move record to top
     per_page: Per page
     prev_page: Previous page
+    records_selected_from_all_pages_html: All records selected from all pages
     remove_selection: Remove selection
     reset_filters: Reset filters
     resource_created: Record created
@@ -121,4 +122,5 @@ en:
       zero: no more items
     x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> records selected on this page from a total of <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> records selected from all pages
+    x_records_selected_from_page_html: <span class="font-bold text-gray-700">%{selected}</span> records selected on this page
     you_missed_something_check_form: You might have missed something. Please check the form.