FixSetDefaultPerPage (rappasoft#2067)

* FixSetDefaultPerPage

* Update getDefaultPerPage to respect getPerPageAccepted

* Fix missing )

* Fix styling

* Add test fix

* Add final tests

---------

Co-authored-by: lrljoe <[email protected]>

Author: lrljoe

src/Traits/Configuration/PaginationConfiguration.php

@@ -107,6 +107,13 @@ public function setPerPage(int $perPage): self
         return $this;
     }
 
+    public function unsetPerPage(): self
+    {
+        $this->perPage = null;
+
+        return $this;
+    }
+
     public function setPaginationMethod(string $paginationMethod): self
     {
         $this->paginationMethod = $paginationMethod;
@@ -138,12 +145,10 @@ public function setDisplayPaginationDetailsDisabled(): self
     /**
      * Set a default per-page value (if not set already by session or querystring)
      */
-    public function setDefaultPerPage(int $perPage): self
+    public function setDefaultPerPage(int $defaultPerPage): self
     {
-        $defaultPerPage = $perPage;
-
-        if ($this->perPage == 10) {
-            $this->setPerPage($perPage);
+        if (in_array((int) $defaultPerPage, $this->getPerPageAccepted())) {
+            $this->defaultPerPage = $defaultPerPage;
         }
 
         return $this;

src/Traits/Helpers/PaginationHelpers.php

@@ -69,7 +69,12 @@ public function getComputedPageName(): string
 
     public function getPerPage(): int
     {
-        return $this->perPage;
+        return $this->perPage ?? $this->getDefaultPerPage();
+    }
+
+    public function getDefaultPerPage(): int
+    {
+        return in_array((int) $this->defaultPerPage, $this->getPerPageAccepted()) ? $this->defaultPerPage : ($this->getPerPageAccepted()[0] ?? 10);
     }
 
     /**
@@ -128,7 +133,7 @@ public function setupPagination(): void
         if (in_array(session($this->getPerPagePaginationSessionKey(), $this->getPerPage()), $this->getPerPageAccepted(), true)) {
             $this->setPerPage(session($this->getPerPagePaginationSessionKey(), $this->getPerPage()));
         } else {
-            $this->setPerPage($this->getPerPageAccepted()[0] ?? 10);
+            $this->setPerPage($this->getDefaultPerPage());
         }
     }
 

src/Traits/WithPagination.php

@@ -15,7 +15,10 @@ trait WithPagination
 
     public ?string $pageName = null;
 
-    public int $perPage = 10;
+    public ?int $perPage;
+
+    #[Locked]
+    public int $defaultPerPage = 10;
 
     #[Locked]
     public array $perPageAccepted = [10, 25, 50];
@@ -57,9 +60,9 @@ trait WithPagination
 
     public function mountWithPagination(): void
     {
-        $sessionPerPage = session()->get($this->getPerPagePaginationSessionKey(), $this->getPerPageAccepted()[0] ?? 10);
+        $sessionPerPage = session()->get($this->getPerPagePaginationSessionKey(), $this->getPerPage());
         if (! in_array((int) $sessionPerPage, $this->getPerPageAccepted(), false)) {
-            $sessionPerPage = $this->getPerPageAccepted()[0] ?? 10;
+            $sessionPerPage = $this->getDefaultPerPage();
         }
         $this->setPerPage($sessionPerPage);
     }
@@ -68,7 +71,7 @@ public function mountWithPagination(): void
     public function updatedPerPage(int|string $value): void
     {
         if (! in_array((int) $value, $this->getPerPageAccepted(), false)) {
-            $value = $this->getPerPageAccepted()[0] ?? 10;
+            $value = $this->getDefaultPerPage();
         }
 
         if (in_array(session($this->getPerPagePaginationSessionKey(), (int) $value), $this->getPerPageAccepted(), true)) {

tests/Unit/Traits/Configuration/PaginationConfigurationTest.php

@@ -113,10 +113,18 @@ public function test_can_set_per_page_manually(): void
 
     public function test_can_set_default_per_page(): void
     {
-        $this->assertSame(10, $this->unpaginatedTable->getPerPage());
-        $this->unpaginatedTable->setDefaultPerPage(50);
-        $this->assertSame(50, $this->unpaginatedTable->getPerPage());
-        $this->unpaginatedTable->perPage = 25;
-        $this->assertSame(25, $this->unpaginatedTable->getPerPage());
+        $this->assertSame(10, $this->basicTable->getPerPage());
+        $this->basicTable->unsetPerPage();
+        $this->basicTable->setDefaultPerPage(50);
+        $this->assertSame(50, $this->basicTable->getDefaultPerPage());
+        $this->assertSame(50, $this->basicTable->getPerPage());
+        $this->basicTable->perPage = 25;
+        $this->assertSame(25, $this->basicTable->getPerPage());
+        $this->basicTable->setPerPage(10);
+        $this->assertSame(10, $this->basicTable->getPerPage());
+        $this->assertSame(50, $this->basicTable->getDefaultPerPage());
+        $this->basicTable->unsetPerPage();
+        $this->assertSame(50, $this->basicTable->getPerPage());
+
     }
 }