Improve performance lazy loading (#1335)

* wip * Fix lazy loading performance * remove debug * Fix phpstan * Add rootMargin
Power-Components · Jan 18, 2024 · 7fab9dc · 7fab9dc
1 parent 786132e
commit 7fab9dc
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 61 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,6 @@
         "composer/composer": "^2.6.6",
         "laravel/pint": "^1.13.8",
         "laradumps/laradumps-core": "^1.1",
-        "spaze/phpstan-disallowed-calls": "^2.16.1",
         "larastan/larastan": "^2.8.1",
         "pestphp/pest": "^2.30.0",
         "orchestra/testbench": "8.19|^9.0"

diff --git a/dist/mix-manifest.json b/dist/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/powergrid.js": "/powergrid.js?id=3a880f256bcc04019bd6cf2f13f37474",
+    "/powergrid.js": "/powergrid.js?id=8762f1711fdcea9fbabfbf095ffd50fe",
     "/bootstrap5.css": "/bootstrap5.css?id=03aba1df82c23db07c1d1096efcd42ae",
     "/tailwind.css": "/tailwind.css?id=8186118970c318f469b566567b8fa4b9",
     "/tom-select.css": "/tom-select.css?id=7af730d2c4bf937316d4002948b1571d",

diff --git a/dist/powergrid.js b/dist/powergrid.js
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,36 +1,8 @@
 includes:
     - ./vendor/larastan/larastan/extension.neon
-    - ./vendor/spaze/phpstan-disallowed-calls/extension.neon
 
 parameters:
 
-    disallowedFunctionCalls:
-        -
-            function: 'ds()'
-            message: 'You should not be printing or dumping any logs'
-        -
-            function: 'dump()'
-            message: 'You should not be printing or dumping any logs'
-        -
-            function: 'logger()'
-            message: 'You should not be printing or dumping any logs'
-        -
-            function: 'logger()'
-            message: 'You should not be printing or dumping any logs'
-        -
-            function: 'var_dump()'
-            message: 'You should not be printing or dumping any logs'
-        -
-            function: 'print_r()'
-            message: 'You should not be printing or dumping any logs'
-
-    disallowedNamespaces:
-        -
-            class: 'Illuminate\Support\Facades\Log'
-            message: 'PowerGrid should not register any log'
-            allowIn:
-                - 'src/Commands/UpdateCommand.php'
-
     ignoreErrors:
         - '#Cannot call method [a-zA-Z0-9\\_]#'
         - '#Variable \$title might not be defined.#'

diff --git a/resources/js/components/pg-load-more.js b/resources/js/components/pg-load-more.js
@@ -11,6 +11,8 @@ export default () => ({
             if (entries[0].isIntersecting) {
                 this.$wire.call('loadMore')
             }
+        }, {
+            rootMargin: '300px'
         });
 
         observer.observe(this.$el)

diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php
@@ -29,20 +29,20 @@
                     @endif
                     @php
                         $rowId = data_get($row, $primaryKey);
-                        
+
                         $class = data_get($theme, 'table.trBodyClass');
-                        
+
                         $rulesValues = $actionRulesClass->recoverFromAction($row, 'pg:rows');
-                        
+
                         $applyRulesLoop = true;
-                        
+
                         $trAttributesBag = new \Illuminate\View\ComponentAttributeBag();
                         $trAttributesBag = $trAttributesBag->merge(['class' => $class]);
-                        
+
                         if (method_exists($this, 'actionRules')) {
                             $applyRulesLoop = $actionRulesClass->loop($this->actionRules($row), $loop);
                         }
-                        
+
                         if (filled($rulesValues['setAttributes']) && $applyRulesLoop) {
                             foreach ($rulesValues['setAttributes'] as $rulesAttributes) {
                                 $trAttributesBag = $trAttributesBag->merge([
@@ -91,6 +91,7 @@
                             $skip = $item * data_get($setUp, 'lazy.rowsPerChildren');
                             $take = data_get($setUp, 'lazy.rowsPerChildren');
                         @endphp
+
                         <livewire:lazy-child
                             key="{{ $this->getLazyKeys }}"
                             :child-index="$item"
@@ -104,7 +105,7 @@
                             :$tableName
                             :parentName="$this->getName()"
                             :columns="$this->visibleColumns"
-                            :data="$this->getCachedData->skip($skip)->take($take)"
+                            :data="\PowerComponents\LivewirePowerGrid\ProcessDataSource::transform($data->skip($skip)->take($take), $this)"
                         />
                     @endforeach
                 </div>

diff --git a/src/Livewire/LazyChild.php b/src/Livewire/LazyChild.php
@@ -22,7 +22,7 @@ class LazyChild extends Component
 
     public string $radioAttribute = 'id';
 
-    public mixed $data;
+    private Collection $data;
 
     public array $theme;
 
@@ -38,8 +38,10 @@ class LazyChild extends Component
 
     public string|int $childIndex;
 
-    public function mount(): void
+    public function mount(Collection $data): void
     {
+        $this->data = $data;
+
         $this->resolveDetailRow($this->data);
     }
 
@@ -54,6 +56,8 @@ public function afterToggleDetail(string $id, string $state): void
 
     public function render(): View
     {
-        return view('livewire-powergrid::livewire.lazy-child');
+        $data = $this->data;
+
+        return view('livewire-powergrid::livewire.lazy-child', compact('data'));
     }
 }
diff --git a/src/PowerGridComponent.php b/src/PowerGridComponent.php
@@ -253,7 +253,7 @@ public function visibleColumns(): BaseCollection
             ->where('forceHidden', false);
     }
 
-    #[Computed]
+    #[Computed(persist: true)]
     protected function getCachedData(): mixed
     {
         if (!Cache::supportsTags() || !boolval(data_get($this->setUp, 'cache.enabled'))) {

diff --git a/src/ProcessDataSource.php b/src/ProcessDataSource.php
@@ -14,7 +14,6 @@
 use PowerComponents\LivewirePowerGrid\DataSource\{Support\Sql};
 use PowerComponents\LivewirePowerGrid\Traits\SoftDeletes;
 
-/** @internal  */
 class ProcessDataSource
 {
     use SoftDeletes;
@@ -86,7 +85,7 @@ private function processCollection(mixed $datasource): \Illuminate\Pagination\Le
             $this->component->filtered = $results->pluck($this->component->primaryKey)->toArray();
 
             $paginated = Collection::paginate($results, intval(data_get($this->component->setUp, 'footer.perPage')));
-            $results   = $paginated->setCollection($this->transform($paginated->getCollection()));
+            $results   = $paginated->setCollection($this->transform($paginated->getCollection(), $this->component));
         };
 
         return $results;
@@ -124,11 +123,15 @@ private function processModel(EloquentBuilder|MorphToMany|QueryBuilder|BaseColle
 
         $this->setTotalCount($results);
 
+        if (filled(data_get($this->component, 'setUp.lazy'))) {
+            return $results;
+        }
+
         /** @phpstan-ignore-next-line */
         $collection = $results->getCollection();
 
         /** @phpstan-ignore-next-line */
-        return $results->setCollection($this->transform($collection));
+        return $results->setCollection($this->transform($collection, $this->component));
     }
 
     /**
@@ -246,23 +249,23 @@ protected function resolveCollection(array|BaseCollection|EloquentBuilder|QueryB
         });
     }
 
-    public function transform(BaseCollection $results): BaseCollection
+    public static function transform(BaseCollection $results, PowerGridComponent $component): BaseCollection
     {
         $processedResults = collect();
 
         $results->chunk(3)
-            ->each(function (BaseCollection $collection) use (&$processedResults) {
-                $processedBatch   = $this->processBatch($collection);
+            ->each(function (BaseCollection $collection) use (&$processedResults, $component) {
+                $processedBatch   = self::processBatch($collection, $component);
                 $processedResults = $processedResults->concat($processedBatch);
             });
 
         return $processedResults;
     }
 
-    private function processBatch(BaseCollection $collection): BaseCollection
+    private static function processBatch(BaseCollection $collection, PowerGridComponent $component): BaseCollection
     {
-        return $collection->map(function ($row, $index) {
-            $addColumns = $this->component->addColumns();
+        return $collection->map(function ($row, $index) use ($component) {
+            $addColumns = $component->addColumns();
             $columns    = $addColumns->columns;
             $columns    = collect($columns);
 
@@ -272,14 +275,14 @@ private function processBatch(BaseCollection $collection): BaseCollection
             $prepareRules = collect();
             $actions      = collect();
 
-            if (method_exists($this->component, 'actionRules')) {
+            if (method_exists($component, 'actionRules')) {
                 $prepareRules = resolve(RulesController::class)
-                    ->execute($this->component->actionRules($row), (object)$row);
+                    ->execute($component->actionRules($row), (object)$row);
             }
 
-            if (method_exists($this->component, 'actions')) {
-                $actions = (new ActionsController($this->component, $prepareRules))
-                    ->execute($this->component->actions($row), (object)$row);
+            if (method_exists($component, 'actions')) {
+                $actions = (new ActionsController($component, $prepareRules))
+                    ->execute($component->actions($row), (object)$row);
             }
 
             $mergedData = $data->merge([

diff --git a/src/Traits/ExportableJob.php b/src/Traits/ExportableJob.php
@@ -58,6 +58,6 @@ private function prepareToExport(): Eloquent\Collection|Collection
             ->orderBy($sortField, $processDataSource->component->sortDirection)
             ->get();
 
-        return $processDataSource->transform($results);
+        return $processDataSource->transform($results, $this->componentTable);
     }
 }
diff --git a/src/Traits/LazyManager.php b/src/Traits/LazyManager.php
@@ -2,7 +2,7 @@
 
 namespace PowerComponents\LivewirePowerGrid\Traits;
 
-use Livewire\Attributes\{Computed, On};
+use Livewire\Attributes\Computed;
 
 /**
  * @property-read bool $hasLazyEnabled

diff --git a/src/Traits/WithExport.php b/src/Traits/WithExport.php
@@ -171,10 +171,10 @@ public function prepareToExport(bool $selected = false): Eloquent\Collection|Sup
             if ($inClause) {
                 $results = $processDataSource->get()->whereIn($this->primaryKey, $inClause);
 
-                return $processDataSource->transform($results);
+                return $processDataSource->transform($results, $this);
             }
 
-            return $processDataSource->transform($processDataSource->resolveCollection());
+            return $processDataSource->transform($processDataSource->resolveCollection(), $this);
         }
 
         /** @phpstan-ignore-next-line */
@@ -194,7 +194,7 @@ public function prepareToExport(bool $selected = false): Eloquent\Collection|Sup
             ->orderBy($sortField, $processDataSource->component->sortDirection)
             ->get();
 
-        return $processDataSource->transform($results);
+        return $processDataSource->transform($results, $processDataSource->component);
     }
 
     /**