From 63db4647ad0e048e134f24791dc098881aa02709 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.france@cws-studio.com>
Date: Wed, 15 May 2024 11:26:15 +0200
Subject: [PATCH] :bug: Fix label & method countResults to display good things
 with simple pager

---
 src/Datagrid/PagerInterface.php               |  2 ++
 src/Datagrid/SimplePager.php                  | 28 ++++++++++++++++---
 src/Resources/views/CRUD/base_list.html.twig  |  2 +-
 .../Pager/simple_pager_results.html.twig      |  3 +-
 tests/App/Datagrid/Pager.php                  |  5 ++++
 tests/Datagrid/PagerTest.php                  |  2 +-
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/Datagrid/PagerInterface.php b/src/Datagrid/PagerInterface.php
index 4a9395dc5e..b7de84d825 100644
--- a/src/Datagrid/PagerInterface.php
+++ b/src/Datagrid/PagerInterface.php
@@ -81,6 +81,8 @@ public function getCurrentPageResults(): iterable;
 
     public function countResults(): int;
 
+    public function displayCountResults(bool $rendering = true): int|string;
+
     /**
      * Returns an array of page numbers to use in pagination links.
      *
diff --git a/src/Datagrid/SimplePager.php b/src/Datagrid/SimplePager.php
index 582da46d39..f25af1d30d 100644
--- a/src/Datagrid/SimplePager.php
+++ b/src/Datagrid/SimplePager.php
@@ -15,6 +15,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Sonata\AdminBundle\Util\TraversableToCollection;
+use Traversable;
 
 /**
  * @author Lukas Kahwe Smith <smith@pooteeweet.org>
@@ -44,10 +45,8 @@ final class SimplePager extends Pager
      * If set to 3 the pager will generate links to the next three pages
      * etc.
      */
-    public function __construct(
-        int $maxPerPage = 10,
-        private int $threshold = 1
-    ) {
+    public function __construct(int $maxPerPage = 10, private int $threshold = 1)
+    {
         parent::__construct($maxPerPage);
     }
 
@@ -56,6 +55,27 @@ public function countResults(): int
         return ($this->getPage() - 1) * $this->getMaxPerPage() + ($this->thresholdCount ?? 0);
     }
 
+    public function displayCountResults(bool $rendering = true): int|string
+    {
+        $countResults = $this->countResults() > $this->getMaxPerPage()
+            ? $this->getMaxPerPage()
+            : $this->countResults();
+
+        if ($this->getPage() > 1) {
+            $countResults = $this->countResults();
+        }
+
+        if ($this->getLastPage() === $this->getPage()) {
+            $rendering = false;
+        }
+
+        if (!$rendering) {
+            return $countResults;
+        }
+
+        return sprintf('%s+', $countResults);
+    }
+
     public function getCurrentPageResults(): iterable
     {
         if (null !== $this->results) {
diff --git a/src/Resources/views/CRUD/base_list.html.twig b/src/Resources/views/CRUD/base_list.html.twig
index 5692b296e2..8fad584e5b 100644
--- a/src/Resources/views/CRUD/base_list.html.twig
+++ b/src/Resources/views/CRUD/base_list.html.twig
@@ -186,7 +186,7 @@ file that was distributed with this source code.
                                             <label class="checkbox" for="{{ admin.uniqid }}_all_elements">
                                                 <input type="checkbox" name="all_elements" id="{{ admin.uniqid }}_all_elements">
                                                 {{ 'all_elements'|trans({}, 'SonataAdminBundle') }}
-                                                ({{ admin.datagrid.pager.countResults() }})
+                                                ({{ admin.datagrid.pager.displayCountResults() }})
                                             </label>
 
                                             <select name="action" style="width: auto; height: auto" class="form-control">
diff --git a/src/Resources/views/Pager/simple_pager_results.html.twig b/src/Resources/views/Pager/simple_pager_results.html.twig
index 3660ce5f70..79c0d9bf56 100644
--- a/src/Resources/views/Pager/simple_pager_results.html.twig
+++ b/src/Resources/views/Pager/simple_pager_results.html.twig
@@ -15,7 +15,8 @@ file that was distributed with this source code.
     {% if admin.datagrid.pager.lastPage != admin.datagrid.pager.page %}
         {{ 'list_results_count_prefix'|trans({}, 'SonataAdminBundle') }}
     {% endif %}
-    {% trans with {'%count%': admin.datagrid.pager.countResults()} from 'SonataAdminBundle' %}list_results_count{% endtrans %}
+    {% set rendering_count_results = false %}
+    {% trans with {'%count%': admin.datagrid.pager.displayCountResults(rendering_count_results)} from 'SonataAdminBundle' %}list_results_count{% endtrans %}
     &nbsp;-&nbsp;
 {% endblock %}
 
diff --git a/tests/App/Datagrid/Pager.php b/tests/App/Datagrid/Pager.php
index b764006595..da79c3dfb1 100644
--- a/tests/App/Datagrid/Pager.php
+++ b/tests/App/Datagrid/Pager.php
@@ -106,6 +106,11 @@ public function countResults(): int
         return 1;
     }
 
+    public function displayCountResults(bool $rendering = true): int|string
+    {
+        return 1;
+    }
+
     public function getLinks(?int $nbLinks = null): array
     {
         return [];
diff --git a/tests/Datagrid/PagerTest.php b/tests/Datagrid/PagerTest.php
index 36358d9cb2..ca73bb5ece 100644
--- a/tests/Datagrid/PagerTest.php
+++ b/tests/Datagrid/PagerTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
             true,
             true,
             true,
-            ['countResults']
+            ['countResults', 'displayCountResults']
         );
     }