From 7f14a72002ff8400676d7c9f226682e09d364ca3 Mon Sep 17 00:00:00 2001
From: execsuroot <developer@execsuroot.com>
Date: Fri, 3 Jul 2026 03:15:20 +0300
Subject: [PATCH] Fix activity log event filter query and add missing timestamp
 index (#2429)

---
 .../Resources/Activities/ActivityResource.php |  2 +-
 ...4_add_index_to_activity_logs_timestamp.php | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2026_07_03_023804_add_index_to_activity_logs_timestamp.php

diff --git a/app/Filament/Server/Resources/Activities/ActivityResource.php b/app/Filament/Server/Resources/Activities/ActivityResource.php
index 36512959a..c63d996c8 100644
--- a/app/Filament/Server/Resources/Activities/ActivityResource.php
+++ b/app/Filament/Server/Resources/Activities/ActivityResource.php
@@ -133,7 +133,7 @@ class ActivityResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('event')
-                    ->options(fn (Table $table) => $table->getQuery()->pluck('event', 'event')->unique()->sort())
+                    ->options(fn (Table $table) => $table->getQuery()->select('event')->distinct()->orderBy('event')->pluck('event', 'event'))
                     ->searchable()
                     ->preload(),
             ]);
diff --git a/database/migrations/2026_07_03_023804_add_index_to_activity_logs_timestamp.php b/database/migrations/2026_07_03_023804_add_index_to_activity_logs_timestamp.php
new file mode 100644
index 000000000..5c870ac4d
--- /dev/null
+++ b/database/migrations/2026_07_03_023804_add_index_to_activity_logs_timestamp.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('activity_logs', function (Blueprint $table) {
+            $table->index('timestamp');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('activity_logs', function (Blueprint $table) {
+            $table->dropIndex(['timestamp']);
+        });
+    }
+};