feat(tickets): add desktop filter controls to tickets2

app/Models/Ticket.php

@@ -163,15 +163,6 @@ public function scopeAwaitingDeveloper(Builder $query): Builder
         return $query->where('state', TicketState::Open);
     }
 
-    /**
-     * @param Builder<Ticket> $query
-     * @return Builder<Ticket>
-     */
-    public function scopeResolved(Builder $query): Builder
-    {
-        return $query->whereIn('state', [TicketState::Resolved, TicketState::Closed]);
-    }
-
     /**
      * @param Builder<Ticket> $query
      * @return Builder<Ticket>

app/Platform/Actions/BuildTicketListAction.php

@@ -29,7 +29,7 @@ class BuildTicketListAction
     private const PER_PAGE = 50;
 
     /**
-     * @return array{paginatedTickets: PaginatedData, stateCounts: TicketListStateCountsData}
+     * @return array{paginatedTickets: PaginatedData, stateCounts: TicketListStateCountsData, facetCounts: array<string, array<string, int>>}
      */
     public function execute(
         TicketListScope $scope,
@@ -41,18 +41,28 @@ public function execute(
         $filterOptions = $service->getFilterOptions($request, $scope->defaultStatusFilter());
         $comparisonUser = $scope->comparisonUser($target);
 
-        $base = $scope->baseQuery($target)->withLiveTicketable();
-        $stateCounts = $service->getStateCounts($filterOptions, clone $base, $comparisonUser);
+        $scopedTickets = $scope->baseQuery($target);
+        $renderableTickets = (clone $scopedTickets)->withLiveTicketable();
+
+        $stateCounts = $service->getStateCounts($filterOptions, clone $scopedTickets, $comparisonUser);
 
         $total = TicketListStatusFilter::from($filterOptions['status'])->filteredTotal($stateCounts);
+
+        $facetCounts = $service->getFacetCounts(
+            $filterOptions,
+            clone $scopedTickets,
+            $scope->filterKinds(),
+            $comparisonUser,
+            $total,
+        );
         $lastPage = max(1, (int) ceil($total / self::PER_PAGE));
         $page = $request->getPage();
 
         if ($page > $lastPage) {
             $page = 1;
         }
 
-        $query = $service->applyFilters(clone $base, $filterOptions, $comparisonUser);
+        $query = $service->applyFilters(clone $renderableTickets, $filterOptions, $comparisonUser);
         $this->applySort($query, $request->getSort());
         $this->applyTicketListEntryEagerLoads($query);
 
@@ -64,14 +74,19 @@ public function execute(
             options: ['path' => $request->url(), 'query' => $request->query()],
         );
 
+        $unfilteredTotal = $service->hasNonStatusFilters($filterOptions)
+            ? (clone $scopedTickets)->count()
+            : $stateCounts['all'];
+
         $paginatedTickets = PaginatedData::fromLengthAwarePaginator(
             $paginator,
-            unfilteredTotal: (clone $base)->count(),
+            unfilteredTotal: $unfilteredTotal,
         );
 
         return [
             'paginatedTickets' => $paginatedTickets,
             'stateCounts' => TicketListStateCountsData::fromCounts($stateCounts),
+            'facetCounts' => $facetCounts,
         ];
     }
 

app/Platform/Controllers/Api/TicketApiController.php

@@ -27,6 +27,7 @@ public function index(TicketListApiRequest $request): JsonResponse
         return response()->json([
             'paginatedTickets' => $result['paginatedTickets'],
             'stateCounts' => $result['stateCounts'],
+            'facetCounts' => $result['facetCounts'],
         ]);
     }
 

app/Platform/Controllers/TicketController.php

@@ -40,6 +40,7 @@ public function index(TicketListRequest $request): InertiaResponse
             paginatedTickets: $result['paginatedTickets'],
             stateCounts: $result['stateCounts'],
             availableFilters: $action->getAvailableFilters(TicketListScope::All),
+            facetCounts: $result['facetCounts'],
         );
 
         return Inertia::render('tickets', $props);

app/Platform/Data/TicketListPagePropsData.php

@@ -16,6 +16,7 @@ class TicketListPagePropsData extends Data
 {
     /**
      * @param TicketListFilterData[] $availableFilters
+     * @param array<string, array<string, int>> $facetCounts
      */
     public function __construct(
         public TicketListScope $scope,
@@ -24,6 +25,8 @@ public function __construct(
         public TicketListStateCountsData $stateCounts,
         #[LiteralTypeScriptType('App.Platform.Data.TicketListFilter[]')]
         public array $availableFilters,
+        #[LiteralTypeScriptType('Record<string, Record<string, number>>')]
+        public array $facetCounts,
         public ?GameData $game = null,
         public ?AchievementData $achievement = null,
         public ?UserData $user = null,

app/Platform/Data/TicketListStateCountsData.php

@@ -14,20 +14,22 @@ public function __construct(
         public int $unresolved,
         public int $request,
         public int $resolved,
+        public int $closed,
         public int $quarantined,
         public int $all,
     ) {
     }
 
     /**
-     * @param array{unresolved: int, request: int, resolved: int, quarantined: int, all: int} $counts
+     * @param array{unresolved: int, request: int, resolved: int, closed: int, quarantined: int, all: int} $counts
      */
     public static function fromCounts(array $counts): self
     {
         return new self(
             unresolved: $counts['unresolved'],
             request: $counts['request'],
             resolved: $counts['resolved'],
+            closed: $counts['closed'],
             quarantined: $counts['quarantined'],
             all: $counts['all'],
         );

app/Platform/Enums/TicketListFilterKind.php

@@ -42,6 +42,11 @@ public function values(?int $systemId = null): array
         };
     }
 
+    public function noFilterValue(): int|string
+    {
+        return $this === self::Type ? 0 : 'all';
+    }
+
     /**
      * @return array<int, string|\Illuminate\Validation\Rules\In>
      */

app/Platform/Enums/TicketListScope.php

@@ -4,6 +4,7 @@
 
 namespace App\Platform\Enums;
 
+use App\Community\Enums\TicketState;
 use App\Models\Achievement;
 use App\Models\Game;
 use App\Models\Ticket;
@@ -53,7 +54,8 @@ public function baseQuery(Game|Achievement|User|null $target): Builder
             self::AwaitingReporter => Ticket::query()
                 ->where('reporter_id', $target->id),
             self::ResolvedBy => Ticket::query()
-                ->where('resolver_id', $target->id),
+                ->where('resolver_id', $target->id)
+                ->whereIn('state', [TicketState::Resolved, TicketState::Closed]),
         };
     }
 
@@ -98,7 +100,8 @@ public function filterKinds(): array
     public function defaultStatusFilter(): TicketListStatusFilter
     {
         return match ($this) {
-            self::ResolvedBy => TicketListStatusFilter::Resolved,
+            self::ResolvedBy => TicketListStatusFilter::All,
+
             self::AwaitingReporter => TicketListStatusFilter::Request,
             default => TicketListStatusFilter::Unresolved,
         };

app/Platform/Enums/TicketListStatusFilter.php

@@ -13,18 +13,19 @@ enum TicketListStatusFilter: string
     case Unresolved = 'unresolved';
     case Request = 'request';
     case Resolved = 'resolved';
+    case Closed = 'closed';
     case Quarantined = 'quarantined';
 
     /**
-     * @return 'all'|'unresolved'|'request'|'resolved'|'quarantined'
+     * @return 'all'|'unresolved'|'request'|'resolved'|'closed'|'quarantined'
      */
     public function stateCountsBucket(): string
     {
         return $this->value;
     }
 
     /**
-     * @param array{unresolved: int, request: int, resolved: int, quarantined: int, all: int} $stateCounts
+     * @param array{unresolved: int, request: int, resolved: int, closed: int, quarantined: int, all: int} $stateCounts
      */
     public function filteredTotal(array $stateCounts): int
     {