Improve buckets

area17 · Mar 12, 2024 · 25f091b · 25f091b
1 parent a248b3b
commit 25f091b
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/Http/Controllers/Admin/FeaturedController.php b/src/Http/Controllers/Admin/FeaturedController.php
@@ -135,13 +135,13 @@ private function getFeaturedItemsByBucket($featuredSection, $featuredSectionKey)
      */
     private function getFeaturedSources(Request $request, $featuredSection, string $search = null, string $contentType = null)
     {
-        $fetchedModules = [];
         $featuredSources = [];
 
         foreach ($featuredSection['buckets'] as $bucket) {
             foreach ($bucket['bucketables'] as $bucketable) {
                 $module = $bucketable['module'];
-                if ($contentType !== null && $module !== $contentType) {
+
+                if ((!empty($contentType) && $module !== $contentType) || isset($featuredSources[$module])) {
                     continue;
                 }
 
@@ -154,25 +154,27 @@ private function getFeaturedSources(Request $request, $featuredSection, string $
                     $scopes[$searchField] = $search;
                 }
 
-                $items = $fetchedModules[$module] ?? $repository->get(
-                    $bucketable['with'] ?? [],
-                    ($bucketable['scopes'] ?? []) + ($scopes ?? []),
-                    $bucketable['orders'] ?? [],
-                    $bucketable['per_page'] ?? $request->get('offset') ?? 10,
-                    true
-                )->appends('bucketable', $module);
+                $items = null;
+                if (!empty($contentType) || empty($fetchedModules)) {
+                    $items = $repository->get(
+                        $bucketable['with'] ?? [],
+                        ($bucketable['scopes'] ?? []) + ($scopes ?? []),
+                        $bucketable['orders'] ?? [],
+                        $bucketable['per_page'] ?? $request->get('offset') ?? 10,
+                        true
+                    )->appends('bucketable', $module);
+                }
 
                 $morphClass = $repository->getBaseModel()->getMorphClass();
 
-                $fetchedModules[$module] = $items;
                 $name = $bucketable['name'] ?? ucfirst($module);
 
                 $featuredSources[$module] = [
                     'name' => $name,
                     'type' => $morphClass,
-                    'maxPage' => $items->lastPage(),
-                    'offset' => $items->perPage(),
-                    'items' => $items->map(function ($item) use ($morphClass, $name, $translated, $withImage) {
+                    'maxPage' => $items?->lastPage(),
+                    'offset' => $items?->perPage(),
+                    'items' => $items?->map(function ($item) use ($morphClass, $name, $translated, $withImage) {
                         return [
                                 'id' => $item->id,
                                 'name' => $item->titleInBucket ?? $item->title,