Merge pull request #1536 from moonshine-software/fix-table-lazy

fix: Table lazy
moonshine-software · Feb 12, 2025 · 9940514 · 9940514
2 parents c61c69e + 2bc8ec8
commit 9940514
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Laravel/src/Pages/Crud/IndexPage.php b/src/Laravel/src/Pages/Crud/IndexPage.php
@@ -208,8 +208,10 @@ protected function getItemsComponent(iterable $items, Fields $fields): Component
             )
             ->buttons($this->getResource()->getIndexButtons())
             ->clickAction($this->getResource()->getClickAction())
-            ->when($this->getResource()->isAsync(), static function (TableBuilderContract $table): void {
-                $table->async()->pushState();
+            ->when($this->getResource()->isAsync(), function (TableBuilderContract $table): void {
+                $table->async(
+                    url: fn() => $this->getRouter()->getEndpoints()->component(name: $table->getName(), additionally: request()->query())
+                )->pushState();
             })
             ->when($this->getResource()->isStickyTable(), function (TableBuilderContract $table): void {
                 $table->sticky();

diff --git a/src/UI/resources/js/Request/Sets.js b/src/UI/resources/js/Request/Sets.js
@@ -54,7 +54,11 @@ export function listComponentRequest(component, pushState = false) {
   let componentRequestData = new ComponentRequestData()
   componentRequestData
     .withBeforeHandleResponse(function (data, t) {
-      const query = originalUrl.slice(originalUrl.indexOf('?') + 1)
+      let query = originalUrl.slice(originalUrl.indexOf('?') + 1)
+      const params = new URLSearchParams(query)
+      params.delete('_component_name')
+
+      query = params.toString()
 
       if (pushState) {
         history.pushState({}, '', query ? '?' + query : location.pathname)