feat: implement draft filtering for plugins

filamentphp · Jan 7, 2025 · e840691 · e840691
1 parent 99a807d
commit e840691
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/app/Actions/GetPluginsListData.php b/app/Actions/GetPluginsListData.php
@@ -28,16 +28,13 @@ function () use ($plugins): array {
                     ->get()
                     ->pluck('count', 'starrable_id');
 
-                return Plugin::query()
+                return Plugin::with(['author'])
+                    ->draft(false)
                     ->when(
                         $plugins,
                         fn (EloquentBuilder $query) => $query->whereKey($plugins),
                     )
-                    ->where(
-                        fn (EloquentBuilder $query) => $query->whereNull('is_draft')->orWhere('is_draft', false)
-                    )
                     ->orderByDesc('publish_date')
-                    ->with(['author'])
                     ->get()
                     ->map(fn (Plugin $plugin): array => [
                         ...$plugin->getDataArray(),

diff --git a/app/Http/Controllers/Api/PluginController.php b/app/Http/Controllers/Api/PluginController.php
@@ -4,12 +4,19 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Plugin;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
 
 class PluginController extends Controller
 {
-    public function index()
+    public function index(Request $request)
     {
-        return Plugin::paginate();
+        return Plugin::query()
+            ->when(
+                $request->boolean('draft'),
+                fn (Builder $query, bool $condition) => $query->draft($condition)
+            )
+            ->paginate();
     }
 
     public function show(Plugin $plugin)

diff --git a/app/Models/Plugin.php b/app/Models/Plugin.php
@@ -69,6 +69,15 @@ public function stars(): MorphMany
         return $this->morphMany(Star::class, 'starrable');
     }
 
+    public function scopeDraft(Builder $query, bool $condition = true): Builder
+    {
+        if (! $condition) {
+            return $query->whereNull('is_draft')->orWhere('is_draft', false);
+        }
+
+        return $query->where('is_draft', true);
+    }
+
     public function getDocUrl(string $version = null): ?string
     {
         if (filled($this->docs_url)) {

diff --git a/resources/views/plugins/view-plugin.blade.php b/resources/views/plugins/view-plugin.blade.php
@@ -545,7 +545,7 @@ class="absolute inset-0 -z-10 h-full w-full -translate-x-1.5 translate-y-1.5 rou
                     </div>
                 </div>
 
-                @if (count($otherPlugins = $plugin->author->plugins()->where('slug', '!=', $plugin->slug)->inRandomOrder()->limit(3)->get()))
+                @if (count($otherPlugins = $plugin->author->plugins()->draft(false)->where('slug', '!=', $plugin->slug)->inRandomOrder()->limit(3)->get()))
                     {{-- More From This Author --}}
                     <div>
                         <div class="text-lg font-extrabold">