Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Add filtering and search UI

Dave Earley4e29161824cb
diff --git a/backend/app/DomainObjects/CapacityAssignmentDomainObject.php b/backend/app/DomainObjects/CapacityAssignmentDomainObject.php
index 68c5e065c..6048b3e48 100644
--- a/backend/app/DomainObjects/CapacityAssignmentDomainObject.php
+++ b/backend/app/DomainObjects/CapacityAssignmentDomainObject.php
@@ -2,12 +2,52 @@
namespace HiEvents\DomainObjects;
+use HiEvents\DomainObjects\Interfaces\IsSortable;
+use HiEvents\DomainObjects\SortingAndFiltering\AllowedSorts;
use Illuminate\Support\Collection;
-class CapacityAssignmentDomainObject extends Generated\CapacityAssignmentDomainObjectAbstract
+class CapacityAssignmentDomainObject extends Generated\CapacityAssignmentDomainObjectAbstract implements IsSortable
{
public ?Collection $tickets = null;
+ public static function getDefaultSort(): string
+ {
+ return static::CREATED_AT;
+ }
+
+ public static function getDefaultSortDirection(): string
+ {
+ return 'desc';
+ }
+
+ public static function getAllowedSorts(): AllowedSorts
+ {
+ return new AllowedSorts(
+ [
+ self::NAME => [
+ 'asc' => __('Name A-Z'),
+ 'desc' => __('Name Z-A'),
+ ],
+ self::CREATED_AT => [
+ 'asc' => __('Oldest first'),
+ 'desc' => __('Newest first'),
+ ],
+ self::UPDATED_AT => [
+ 'asc' => __('Updated oldest first'),
+ 'desc' => __('Updated newest first'),
+ ],
+ self::USED_CAPACITY => [
+ 'desc' => __('Most capacity used'),
+ 'asc' => __('Least capacity used'),
+ ],
+ self::CAPACITY => [
+ 'desc' => __('Least capacity'),
+ 'asc' => __('Most capacity'),
+ ],
+ ]
+ );
+ }
+
public function getPercentageUsed(): float
{
if (!$this->getCapacity()) {
diff --git a/backend/app/Http/Actions/BaseAction.php b/backend/app/Http/Actions/BaseAction.php
index bfd3f4b9a..0a648701e 100644
--- a/backend/app/Http/Actions/BaseAction.php
+++ b/backend/app/Http/Actions/BaseAction.php
@@ -11,6 +11,7 @@ use HiEvents\DomainObjects\Interfaces\IsFilterable;
use HiEvents\DomainObjects\Interfaces\IsSortable;
use HiEvents\DomainObjects\UserDomainObject;
use HiEvents\Exceptions\UnauthorizedException;
+use HiEvents\Http\DTO\QueryParamsDTO;
use HiEvents\Http\ResponseCodes;
use HiEvents\Resources\BaseResource;
use HiEvents\Services\Domain\Auth\AuthUserService;
@@ -146,7 +147,7 @@ abstract class BaseAction extends Controller
if (Auth::check()) {
/** @var AuthUserService $service */
$service = app(AuthUserService::class);
- $accountId = $service->getAuthenticatedAccountId();
+ $accountId = $service->getAuthenticatedAccountId();
if ($accountId === null) {
throw new UnauthorizedException(__('No account ID found in token'));
@@ -191,4 +192,9 @@ abstract class BaseAction extends Controller
return $request->getClientIp();
}
+
+ public function getPaginationQueryParams(Request $request): QueryParamsDTO
+ {
+ return QueryParamsDTO::fromArray($request->query->all());
+ }
}
diff --git a/backend/app/Http/Actions/CapacityAssignments/GetCapacityAssignmentsAction.php b/backend/app/Http/Actions/CapacityAssignments/GetCapacityAssignmentsAction.php
index 3fa850a8c..35ae5893e 100644
--- a/backend/app/Http/Actions/CapacityAssignments/GetCapacityAssignmentsAction.php
+++ b/backend/app/Http/Actions/CapacityAssignments/GetCapacityAssignmentsAction.php
@@ -2,12 +2,14 @@
namespace HiEvents\Http\Actions\CapacityAssignments;
+use HiEvents\DomainObjects\CapacityAssignmentDomainObject;
use HiEvents\DomainObjects\EventDomainObject;
use HiEvents\Http\Actions\BaseAction;
use HiEvents\Resources\CapacityAssignment\CapacityAssignmentResource;
use HiEvents\Services\Handlers\CapacityAssignment\DTO\GetCapacityAssignmentsDTO;
use HiEvents\Services\Handlers\CapacityAssignment\GetCapacityAssignmentsHandler;
use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
class GetCapacityAssignmentsAction extends BaseAction
{
@@ -17,17 +19,19 @@ class GetCapacityAssignmentsAction extends BaseAction
{
}
- public function __invoke(int $eventId): JsonResponse
+ public function __invoke(int $eventId, Request $request): JsonResponse
{
$this->isActionAuthorized($eventId, EventDomainObject::class);
- return $this->resourceResponse(
+ return $this->filterableResourceResponse(
resource: CapacityAssignmentResource::class,
data: $this->getCapacityAssignmentsHandler->handle(
GetCapacityAssignmentsDTO::fromArray([
'eventId' => $eventId,
+ 'queryParams' => $this->getPaginationQueryParams($request),
]),
),
+ domainObject: CapacityAssignmentDomainObject::class,
);
}
}
diff --git a/backend/app/Repository/Eloquent/CapacityAssignmentRepository.php b/backend/app/Repository/Eloquent/CapacityAssignmentRepository.php
index 050ef6a33..8cc1cab4e 100644
--- a/backend/app/Repository/Eloquent/CapacityAssignmentRepository.php
+++ b/backend/app/Repository/Eloquent/CapacityAssignmentRepository.php
@@ -3,8 +3,12 @@
namespace HiEvents\Repository\Eloquent;
use HiEvents\DomainObjects\CapacityAssignmentDomainObject;
+use HiEvents\DomainObjects\Generated\CapacityAssignmentDomainObjectAbstract;
+use HiEvents\DomainObjects\Generated\TicketDomainObjectAbstract;
+use HiEvents\Http\DTO\QueryParamsDTO;
use HiEvents\Models\CapacityAssignment;
use HiEvents\Repository\Interfaces\CapacityAssignmentRepositoryInterface;
+use Illuminate\Database\Eloquent\Builder;
use Illuminate\Pagination\LengthAwarePaginator;
class CapacityAssignmentRepository extends BaseRepository implements CapacityAssignmentRepositoryInterface
@@ -19,18 +23,28 @@ class CapacityAssignmentRepository extends BaseRepository implements CapacityAss
return CapacityAssignmentDomainObject::class;
}
- public function findCapacityAssignments(int $eventId): LengthAwarePaginator
+ public function findByEventId(int $eventId, QueryParamsDTO $params): LengthAwarePaginator
{
- $this->model->orderBy('created_at', 'desc');
+ $where = [
+ [CapacityAssignmentDomainObjectAbstract::EVENT_ID, '=', $eventId]
+ ];
+
+ if (!empty($params->query)) {
+ $where[] = static function (Builder $builder) use ($params) {
+ $builder
+ ->where(CapacityAssignmentDomainObjectAbstract::NAME, 'ilike', '%' . $params->query . '%');
+ };
+ }
+
+ $this->model = $this->model->orderBy(
+ $params->sort_by ?? CapacityAssignmentDomainObject::getDefaultSort(),
+ $params->sort_direction ?? CapacityAssignmentDomainObject::getDefaultSortDirection(),
+ );
return $this->paginateWhere(
- where: [
- [
- 'event_id', '=', $eventId,
- ],
- ],
- limit: 100,
- page: 1,
+ where: $where,
+ limit: $params->per_page,
+ page: $params->page,
);
}
}
diff --git a/backend/app/Repository/Interfaces/CapacityAssignmentRepositoryInterface.php b/backend/app/Repository/Interfaces/CapacityAssignmentRepositoryInterface.php
index 5d5dae183..ed74c0a69 100644
--- a/backend/app/Repository/Interfaces/CapacityAssignmentRepositoryInterface.php
+++ b/backend/app/Repository/Interfaces/CapacityAssignmentRepositoryInterface.php
@@ -3,6 +3,7 @@
namespace HiEvents\Repository\Interfaces;
use HiEvents\DomainObjects\CapacityAssignmentDomainObject;
+use HiEvents\Http\DTO\QueryParamsDTO;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
/**
@@ -10,5 +11,5 @@ use Illuminate\Contracts\Pagination\LengthAwarePaginator;
*/
interface CapacityAssignmentRepositoryInterface extends RepositoryInterface
{
- public function findCapacityAssignments(int $eventId): LengthAwarePaginator;
+ public function findByEventId(int $eventId, QueryParamsDTO $params): LengthAwarePaginator;
}
diff --git a/backend/app/Services/Handlers/CapacityAssignment/DTO/GetCapacityAssignmentsDTO.php b/backend/app/Services/Handlers/CapacityAssignment/DTO/GetCapacityAssignmentsDTO.php
index 2d0b97cc1..7cc7da5e5 100644
--- a/backend/app/Services/Handlers/CapacityAssignment/DTO/GetCapacityAssignmentsDTO.php
+++ b/backend/app/Services/Handlers/CapacityAssignment/DTO/GetCapacityAssignmentsDTO.php
@@ -3,11 +3,13 @@
namespace HiEvents\Services\Handlers\CapacityAssignment\DTO;
use HiEvents\DataTransferObjects\BaseDTO;
+use HiEvents\Http\DTO\QueryParamsDTO;
class GetCapacityAssignmentsDTO extends BaseDTO
{
public function __construct(
- public int $eventId,
+ public int $eventId,
+ public QueryParamsDTO $queryParams,
)
{
}
diff --git a/backend/app/Services/Handlers/CapacityAssignment/GetCapacityAssignmentsHandler.php b/backend/app/Services/Handlers/CapacityAssignment/GetCapacityAssignmentsHandler.php
index dc058e73a..e4d0434b3 100644
--- a/backend/app/Services/Handlers/CapacityAssignment/GetCapacityAssignmentsHandler.php
+++ b/backend/app/Services/Handlers/CapacityAssignment/GetCapacityAssignmentsHandler.php
@@ -19,6 +19,9 @@ class GetCapacityAssignmentsHandler
{
return $this->capacityAssignmentRepository
->loadRelation(TicketDomainObject::class)
- ->findCapacityAssignments($dto->eventId);
+ ->findByEventId(
+ eventId: $dto->eventId,
+ params: $dto->queryParams,
+ );
}
}
diff --git a/frontend/public/blank-slate/capacity-assignments.svg b/frontend/public/blank-slate/capacity-assignments.svg
new file mode 100644
index 000000000..93c559525
--- /dev/null
+++ b/frontend/public/blank-slate/capacity-assignments.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="a" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="156.27" height="79.94" viewBox="0 0 156.27 79.94">
+ <path d="m31.96,29.32h17.62c4.32,0,7.81-3.51,7.64-7.78-.12-3-2.17-5.65-5.04-6.71-1.5-.55-2.93-.57-4.25-.29-.19-2.78-2.55-4.99-5.44-4.99-1.58,0-3,.66-4,1.71.22-1.05.24-2.18.02-3.33-.68-3.6-3.76-6.42-7.48-6.86-5.08-.61-9.43,3.07-9.8,7.83-1.44-1.87-3.73-3.09-6.31-3.09-4.37,0-7.91,3.47-7.91,7.75,0,.33.03.65.07.96-3.47.71-6.07,3.72-6.07,7.32,0,4.13,3.42,7.48,7.64,7.48h7.08m12.23,0h.72" fill="#fff" stroke-width="0"/>
+ <path d="m49.58,30.32h-17.62c-.55,0-1-.45-1-1s.45-1,1-1h17.62c1.86,0,3.58-.73,4.85-2.05,1.22-1.27,1.86-2.94,1.79-4.69-.1-2.55-1.86-4.88-4.39-5.81-1.2-.45-2.41-.53-3.69-.25-.29.06-.58,0-.81-.18-.23-.18-.38-.44-.4-.73-.15-2.27-2.1-4.05-4.44-4.05-1.25,0-2.41.5-3.27,1.4-.31.32-.79.4-1.19.2-.4-.21-.61-.65-.52-1.09.2-.96.21-1.96.02-2.94-.6-3.17-3.32-5.66-6.62-6.05-2.17-.25-4.29.34-5.94,1.7-1.61,1.32-2.58,3.17-2.74,5.21-.03.41-.31.76-.71.88-.39.12-.82-.02-1.08-.35-1.32-1.71-3.33-2.7-5.52-2.7-3.81,0-6.91,3.03-6.91,6.75,0,.28.02.56.06.83.07.52-.28,1-.79,1.11-3.05.62-5.27,3.29-5.27,6.34,0,3.57,2.98,6.48,6.64,6.48h7.08c.55,0,1,.45,1,1s-.45,1-1,1h-7.08c-4.76,0-8.64-3.8-8.64-8.48,0-3.7,2.48-6.97,6.01-8.08,0-.07,0-.14,0-.21,0-4.82,4-8.75,8.91-8.75,2.11,0,4.1.72,5.68,2.01.54-1.79,1.6-3.38,3.1-4.61C25.78.51,28.43-.26,31.15.08c4.15.5,7.58,3.65,8.34,7.67.09.48.15.96.16,1.45.87-.42,1.83-.64,2.83-.64,3.01,0,5.58,2.06,6.27,4.85,1.29-.12,2.54.04,3.76.49,3.27,1.21,5.56,4.26,5.7,7.61.09,2.3-.74,4.48-2.35,6.15-1.63,1.69-3.92,2.66-6.29,2.66Zm-20.9,0h-.72c-.55,0-1-.45-1-1s.45-1,1-1h.72c.55,0,1,.45,1,1s-.45,1-1,1Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m12.06,18.71c-.23,0-.43-.16-.49-.39-.06-.26-.15-.51-.26-.74-.97-1.97-3.72-2.66-6.13-1.55-.25.12-.55,0-.66-.24-.12-.25,0-.55.24-.66,2.89-1.34,6.23-.43,7.44,2.01.15.3.26.62.34.95.06.27-.11.54-.37.6-.04,0-.08.01-.11.01Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m24.59,30.32h-2.21c-.55,0-1-.45-1-1s.45-1,1-1h2.21c.55,0,1,.45,1,1s-.45,1-1,1Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m46.18,61.66c-5.13,0-9.46-3.51-10.75-8.24-.51.33-1.12.52-1.77.52h-4.91c-1.83,0-3.33-1.5-3.33-3.33v-31.22c0-1.83,1.5-3.33,3.33-3.33h4.91c.65,0,1.26.2,1.77.52,1.29-4.73,5.63-8.24,10.75-8.24h68.41c6.14,0,11.16,5.02,11.16,11.16v31.01c0,6.14-5.02,11.16-11.16,11.16H46.18Z" fill="#f6f4ff" stroke-width="0"/>
+ <path d="m114.59,63.06H46.18c-5.12,0-9.69-3.14-11.61-7.81-.3.06-.61.09-.92.09h-4.91c-2.61,0-4.73-2.12-4.73-4.73v-31.22c0-2.61,2.12-4.73,4.73-4.73h4.91c.31,0,.62.03.92.09,1.91-4.67,6.49-7.81,11.61-7.81h68.41c6.92,0,12.55,5.63,12.55,12.56v31.01c0,6.92-5.63,12.56-12.55,12.56Zm-79.16-11.04c.17,0,.34.03.5.09.42.16.73.51.85.94,1.16,4.25,5.02,7.21,9.4,7.21h68.41c5.38,0,9.75-4.38,9.75-9.76v-31.01c0-5.38-4.38-9.76-9.75-9.76H46.18c-4.38,0-8.24,2.96-9.4,7.21-.12.43-.43.78-.85.94-.41.16-.88.12-1.25-.12-.31-.2-.67-.3-1.02-.3h-4.91c-1.06,0-1.93.87-1.93,1.93v31.22c0,1.07.87,1.93,1.93,1.93h4.91c.35,0,.71-.11,1.02-.3.23-.14.49-.22.75-.22Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m35.8,47.84c-.41,0-.75-.34-.75-.75v-1.49c0-.41.34-.75.75-.75s.75.34.75.75v1.49c0,.41-.34.75-.75.75Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m35.8,44.5c-.41,0-.75-.34-.75-.75v-27.18c0-.41.34-.75.75-.75s.75.34.75.75v27.18c0,.41-.34.75-.75.75Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m35.8,53.76c-.41,0-.75-.34-.75-.75v-2.28c0-.41.34-.75.75-.75s.75.34.75.75v2.28c0,.41-.34.75-.75.75Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m112.51,52.64h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v24.72c0,2.91,2.38,5.29,5.29,5.29Z" fill="#ce942b" stroke-width="0"/>
+ <path d="m112.51,53.39c-3.33,0-6.04-2.71-6.04-6.04v-24.72c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Zm0-35.3c-2.5,0-4.54,2.04-4.54,4.54v24.72c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54Z" fill="#472b29" stroke-width="0"/>
+ <path d="m92.78,52.64h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v24.72c0,2.91,2.38,5.29,5.29,5.29Z" fill="#ce942b" stroke-width="0"/>
+ <path d="m92.77,53.39c-3.33,0-6.04-2.71-6.04-6.04v-24.72c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Zm0-35.3c-2.5,0-4.54,2.04-4.54,4.54v24.72c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54Z" fill="#472b29" stroke-width="0"/>
+ <path d="m73.04,52.64h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v24.72c0,2.91,2.38,5.29,5.29,5.29Z" fill="#ce942b" stroke-width="0"/>
+ <path d="m73.04,53.39c-3.33,0-6.04-2.71-6.04-6.04v-24.72c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Zm0-35.3c-2.5,0-4.54,2.04-4.54,4.54v24.72c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54Z" fill="#472b29" stroke-width="0"/>
+ <path d="m112.51,52.64h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v24.72c0,2.91,2.38,5.29,5.29,5.29Z" fill="#fff" stroke-width="0"/>
+ <path d="m112.51,53.39c-3.33,0-6.04-2.71-6.04-6.04v-24.72c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Zm0-35.3c-2.5,0-4.54,2.04-4.54,4.54v24.72c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m92.77,52.64h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v24.72c0,2.91,2.38,5.29,5.29,5.29Z" fill="#fff" stroke-width="0"/>
+ <path d="m92.77,53.39c-3.33,0-6.04-2.71-6.04-6.04v-24.72c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Zm0-35.3c-2.5,0-4.54,2.04-4.54,4.54v24.72c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m73.04,52.64h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v24.72c0,2.91,2.38,5.29,5.29,5.29Z" fill="#fff" stroke-width="0"/>
+ <path d="m73.04,53.39c-3.33,0-6.04-2.71-6.04-6.04v-24.72c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Zm0-35.3c-2.5,0-4.54,2.04-4.54,4.54v24.72c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m48.02,30.16v17.19c0,2.91,2.38,5.29,5.29,5.29h0c2.91,0,5.29-2.38,5.29-5.29v-24.72c0-2.91-2.38-5.29-5.29-5.29h0c-2.91,0-5.29,2.38-5.29,5.29v1.75" fill="#fff" stroke-width="0"/>
+ <path d="m53.3,53.39c-3.33,0-6.04-2.71-6.04-6.04v-17.19c0-.41.34-.75.75-.75s.75.34.75.75v17.19c0,2.5,2.04,4.54,4.54,4.54s4.54-2.04,4.54-4.54v-24.72c0-2.5-2.04-4.54-4.54-4.54s-4.54,2.04-4.54,4.54v1.75c0,.41-.34.75-.75.75s-.75-.34-.75-.75v-1.75c0-3.33,2.71-6.04,6.04-6.04s6.04,2.71,6.04,6.04v24.72c0,3.33-2.71,6.04-6.04,6.04Z" fill="#aaa8ba" stroke-width="0"/>
+ <path d="m121.97,78.94h23.52c5.4,0,9.78-4.38,9.78-9.78,0-4.71-3.33-8.64-7.77-9.57.05-.41.09-.83.09-1.26,0-5.59-4.53-10.13-10.13-10.13-3.3,0-6.23,1.59-8.07,4.03-.47-6.23-6.03-11.03-12.54-10.23-4.76.58-8.69,4.26-9.57,8.97-.28,1.51-.25,2.98.03,4.35-1.28-1.37-3.09-2.24-5.11-2.24-3.7,0-6.72,2.88-6.96,6.52-1.68-.37-3.51-.35-5.43.38-3.68,1.38-6.3,4.85-6.45,8.77-.22,5.58,4.24,10.17,9.77,10.17h22.54" fill="#fff" stroke-width="0"/>
+ <path d="m145.49,79.94h-23.52c-.55,0-1-.45-1-1s.45-1,1-1h23.52c4.84,0,8.78-3.94,8.78-8.78,0-4.13-2.93-7.75-6.97-8.59-.51-.11-.85-.58-.79-1.1.04-.38.08-.75.08-1.14,0-5.03-4.09-9.12-9.12-9.12-2.88,0-5.53,1.33-7.28,3.64-.25.33-.68.47-1.08.36-.4-.12-.68-.47-.72-.88-.21-2.76-1.56-5.34-3.7-7.1-2.16-1.78-4.9-2.56-7.72-2.22-4.33.53-7.91,3.89-8.71,8.16-.25,1.34-.24,2.67.03,3.97.09.44-.12.88-.52,1.09-.4.21-.88.12-1.19-.21-1.14-1.24-2.7-1.92-4.38-1.92-3.14,0-5.76,2.45-5.96,5.59-.02.29-.16.56-.4.73-.23.18-.54.24-.81.18-1.69-.37-3.28-.26-4.87.33-3.34,1.25-5.67,4.42-5.8,7.88-.1,2.41.77,4.7,2.44,6.44s3.92,2.69,6.33,2.69h22.54c.55,0,1,.45,1,1s-.45,1-1,1h-22.54c-2.96,0-5.72-1.17-7.77-3.31-2.05-2.13-3.12-4.94-3-7.9.17-4.25,3.02-8.14,7.1-9.67,1.6-.6,3.26-.8,4.94-.6.75-3.64,3.99-6.36,7.81-6.36,1.37,0,2.71.36,3.89,1.02,0-.77.07-1.54.21-2.32.95-5.12,5.24-9.14,10.43-9.78,3.36-.42,6.64.53,9.23,2.65,2.01,1.65,3.43,3.9,4.08,6.39,2.02-1.83,4.64-2.85,7.43-2.85,6.13,0,11.12,4.99,11.12,11.12,0,.17,0,.33-.01.5,4.51,1.35,7.7,5.55,7.7,10.33,0,5.94-4.83,10.78-10.77,10.78Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m116.3,57.4c-3.62-.24-6.73,2.26-6.95,5.58-.03.41,0,.82.05,1.21-.7-.79-1.73-1.32-2.92-1.4-2.17-.14-4.04,1.29-4.32,3.24-.39-.11-.81-.18-1.23-.21-3.16-.21-5.89,1.98-6.08,4.88" fill="#fdfcef" stroke-width="0"/>
+ <path d="m94.85,71.2s-.02,0-.03,0c-.28-.02-.48-.26-.46-.53.21-3.17,3.14-5.54,6.62-5.35.27.02.54.05.82.11.55-1.93,2.46-3.32,4.73-3.14.85.05,1.65.32,2.33.76,0-.04,0-.07,0-.11.24-3.59,3.55-6.31,7.48-6.04.28.02.48.26.46.53-.02.26-.24.47-.5.47,0,0-.02,0-.03,0-3.33-.19-6.22,2.08-6.42,5.12-.02.36,0,.73.05,1.1.03.22-.08.43-.28.53-.2.09-.44.04-.59-.12-.63-.72-1.57-1.17-2.57-1.23-1.85-.09-3.55,1.11-3.79,2.81-.02.14-.1.27-.22.35s-.27.1-.41.06c-.38-.1-.76-.17-1.13-.19-2.92-.18-5.38,1.79-5.55,4.42-.01.26-.23.47-.5.47Z" fill="#4b3b5d" stroke-width="0"/>
+ <path d="m149.45,60.74c-3.4-1.6-7.33-.47-8.78,2.53-.18.37-.31.76-.4,1.15" fill="#fdfcef" stroke-width="0"/>
+ <path d="m140.27,64.92s-.07,0-.11-.01c-.27-.06-.44-.33-.38-.6.1-.44.25-.86.44-1.25,1.57-3.24,5.81-4.48,9.44-2.77.25.12.36.42.24.67-.12.25-.42.35-.67.24-3.15-1.48-6.79-.45-8.11,2.3-.16.33-.28.68-.37,1.04-.05.23-.25.39-.48.39Z" fill="#4b3b5d" stroke-width="0"/>
+</svg>
\ No newline at end of file
diff --git a/frontend/src/api/capacity-assignment.client.ts b/frontend/src/api/capacity-assignment.client.ts
index 17c2f03d1..2819cbbfc 100644
--- a/frontend/src/api/capacity-assignment.client.ts
+++ b/frontend/src/api/capacity-assignment.client.ts
@@ -4,8 +4,9 @@ import {
CapacityAssignmentRequest,
GenericDataResponse,
GenericPaginatedResponse,
- IdParam,
+ IdParam, QueryFilters,
} from "../types";
+import {queryParamsHelper} from "../utilites/queryParamsHelper.ts";
export const capacityAssignmentClient = {
create: async (eventId: IdParam, capacityAssignment: CapacityAssignmentRequest) => {
@@ -16,8 +17,8 @@ export const capacityAssignmentClient = {
const response = await api.put<GenericDataResponse<CapacityAssignment>>(`events/${eventId}/capacity-assignments/${capacityAssignmentId}`, capacityAssignment);
return response.data;
},
- all: async (eventId: IdParam) => {
- const response = await api.get<GenericPaginatedResponse<CapacityAssignment>>(`events/${eventId}/capacity-assignments`);
+ all: async (eventId: IdParam, pagination: QueryFilters) => {
+ const response = await api.get<GenericPaginatedResponse<CapacityAssignment>>(`events/${eventId}/capacity-assignments` + queryParamsHelper.buildQueryString(pagination));
return response.data;
},
get: async (eventId: IdParam, capacityAssignmentId: IdParam) => {
diff --git a/frontend/src/components/common/CapacityAssignmentList/CapacityAssignmentList.module.scss b/frontend/src/components/common/CapacityAssignmentList/CapacityAssignmentList.module.scss
index e7cb9227a..f9555532d 100644
--- a/frontend/src/components/common/CapacityAssignmentList/CapacityAssignmentList.module.scss
+++ b/frontend/src/components/common/CapacityAssignmentList/CapacityAssignmentList.module.scss
@@ -13,10 +13,12 @@
.search {
width: 80%;
margin-right: 20px;
+ max-width: 320px;
@include respond-below(md) {
width: 100%;
margin-bottom: 20px;
+ max-width: 100%;
}
}
@@ -44,14 +46,12 @@
}
-
.capacityCard {
display: flex;
flex-direction: column;
justify-content: space-between;
margin-bottom: 0 !important;
-
.capacityAssignmentHeader {
display: flex;
justify-content: space-between;
@@ -67,7 +67,6 @@
align-items: center;
}
}
-
}
.capacityAssignmentName {
diff --git a/frontend/src/components/common/CapacityAssignmentList/index.tsx b/frontend/src/components/common/CapacityAssignmentList/index.tsx
index 2c06c4997..707a75feb 100644
--- a/frontend/src/components/common/CapacityAssignmentList/index.tsx
+++ b/frontend/src/components/common/CapacityAssignmentList/index.tsx
@@ -7,7 +7,6 @@ import {NoResultsSplash} from "../NoResultsSplash";
import classes from './CapacityAssignmentList.module.scss';
import {Card} from "../Card";
import {Popover} from "../Popover";
-import {SearchBar} from "../SearchBar";
import {useState} from "react";
import {ActionMenu} from "../ActionMenu";
import {useDisclosure} from "@mantine/hooks";
@@ -22,7 +21,6 @@ interface CapacityAssignmentListProps {
}
export const CapacityAssignmentList = ({capacityAssignments, openCreateModal}: CapacityAssignmentListProps) => {
- const [searchValue, setSearchValue] = useState<string>('');
const [editModalOpen, {open: openEditModal, close: closeEditModal}] = useDisclosure(false);
const [selectedCapacityAssignmentId, setSelectedCapacityAssignmentId] = useState<IdParam>();
const deleteMutation = useDeleteCapacityAssignment();
@@ -42,23 +40,16 @@ export const CapacityAssignmentList = ({capacityAssignments, openCreateModal}: C
return (
<NoResultsSplash
heading={t`No Capacity Assignments`}
- imageHref={'/blank-slate/attendees.svg'}
+ imageHref={'/blank-slate/capacity-assignments.svg'}
subHeading={(
<>
<p>
<Trans>
<p>
Capacity assignments allow you to manage capacity for specific tickets or the entire
- event.
+ event. Perfect for multi-day events, workshops, or any event where you need to manage
+ capacity.
</p>
-
- Example:
- <Card>
- If you have a <b>Day 1</b> ticket and an <b>All Weekend</b> ticket, you can create a
- capacity assignment called <b>Day 1 Capacity</b> which will ensure you don't go over
- capacity on
- the first day.
- </Card>
</Trans>
</p>
<Button
@@ -75,24 +66,6 @@ export const CapacityAssignmentList = ({capacityAssignments, openCreateModal}: C
return (
<>
- <Card>
- <div className={classes.toolbar}>
- <div className={classes.search}>
- <SearchBar
- placeholder={t`Search capacity assignments`}
- onClear={() => setSearchValue('')}
- value={searchValue}
- onChange={(value) => setSearchValue(value.target.value)}
- />
- </div>
- <div className={classes.button}>
- <Button color={'green'} rightSection={<IconPlus/>} onClick={openCreateModal}>
- {t`Add capacity assignment`}
- </Button>
- </div>
- </div>
- </Card>
-
<div className={classes.capacityAssignmentList}>
{capacityAssignments.map((assignment) => {
const capacityPercentage = assignment.capacity
@@ -100,10 +73,6 @@ export const CapacityAssignmentList = ({capacityAssignments, openCreateModal}: C
: 0;
const capacityColor = capacityPercentage > 80 ? 'red' : capacityPercentage > 50 ? 'yellow' : 'green';
- if (searchValue && !assignment.name.toLowerCase().includes(searchValue.toLowerCase())) {
- return null;
- }
-
return (
<Card className={classes.capacityCard} key={assignment.id}>
<div className={classes.capacityAssignmentHeader}>
diff --git a/frontend/src/components/modals/EditCapacityAssignmentModal/index.tsx b/frontend/src/components/modals/EditCapacityAssignmentModal/index.tsx
index 0ef13d78e..93a32322e 100644
--- a/frontend/src/components/modals/EditCapacityAssignmentModal/index.tsx
+++ b/frontend/src/components/modals/EditCapacityAssignmentModal/index.tsx
@@ -59,7 +59,7 @@ export const EditCapacityAssignmentModal = ({
capacity: capacityAssignment.capacity,
applies_to: capacityAssignment.applies_to,
status: capacityAssignment.status,
- ticket_ids: capacityAssignment.tickets.map(ticket => String(ticket.id)),
+ ticket_ids: capacityAssignment.tickets?.map(ticket => String(ticket.id)),
});
}
}, [capacityAssignment]);
diff --git a/frontend/src/components/routes/event/CapacityAssignments/index.tsx b/frontend/src/components/routes/event/CapacityAssignments/index.tsx
index 41fa6530f..66e99fda1 100644
--- a/frontend/src/components/routes/event/CapacityAssignments/index.tsx
+++ b/frontend/src/components/routes/event/CapacityAssignments/index.tsx
@@ -7,10 +7,22 @@ import {CapacityAssignmentList} from "../../../common/CapacityAssignmentList/ind
import {TableSkeleton} from "../../../common/TableSkeleton";
import {CreateCapacityAssignmentModal} from "../../../modals/CreateCapacityAssignmentModal";
import {useDisclosure} from "@mantine/hooks";
+import {ToolBar} from "../../../common/ToolBar";
+import {SearchBarWrapper} from "../../../common/SearchBar";
+import {Button} from "@mantine/core";
+import {IconPlus} from "@tabler/icons-react";
+import {useFilterQueryParamSync} from "../../../../hooks/useFilterQueryParamSync.ts";
+import {QueryFilters} from "../../../../types.ts";
const CapacityAssignments = () => {
const {eventId} = useParams();
- const {data: capacityAssignments} = useGetEventCapacityAssignments(eventId);
+ const [searchParams, setSearchParams] = useFilterQueryParamSync();
+ const {data: capcityAssignmentsData} = useGetEventCapacityAssignments(
+ eventId,
+ searchParams as QueryFilters,
+ );
+ const capacityAssignments = capcityAssignmentsData?.data;
+ const pagination = capcityAssignmentsData?.meta
const [createModalOpen, {open: openCreateModal, close: closeCreateModal}] = useDisclosure(false);
return (
@@ -19,6 +31,22 @@ const CapacityAssignments = () => {
{t`Capacity Management`}
</PageTitle>
+ <ToolBar searchComponent={() => (
+ <SearchBarWrapper
+ placeholder={t`Search capacity assignments...`}
+ setSearchParams={setSearchParams}
+ searchParams={searchParams}
+ pagination={pagination}
+ />
+ )}>
+ <Button
+ size={'xs'}
+ leftSection={<IconPlus/>}
+ color={'green'}
+ onClick={() => openCreateModal()}>{t`Create Capacity Assignment`}
+ </Button>
+ </ToolBar>
+
<TableSkeleton isVisible={!capacityAssignments}/>
{capacityAssignments && <CapacityAssignmentList
diff --git a/frontend/src/queries/useGetCapacityAssignments.ts b/frontend/src/queries/useGetCapacityAssignments.ts
index 594291b68..ca181cb7d 100644
--- a/frontend/src/queries/useGetCapacityAssignments.ts
+++ b/frontend/src/queries/useGetCapacityAssignments.ts
@@ -1,15 +1,14 @@
import {useQuery} from "@tanstack/react-query";
-import {IdParam} from "../types.ts";
+import {IdParam, QueryFilters} from "../types.ts";
import {capacityAssignmentClient} from "../api/capacity-assignment.client.ts";
export const GET_EVENT_CAPACITY_ASSIGNMENTS_QUERY_KEY = 'getEventCapacityAssignments';
-export const useGetEventCapacityAssignments = (eventId: IdParam) => {
+export const useGetEventCapacityAssignments = (eventId: IdParam, pagination: QueryFilters) => {
return useQuery(
- [GET_EVENT_CAPACITY_ASSIGNMENTS_QUERY_KEY, eventId],
+ [GET_EVENT_CAPACITY_ASSIGNMENTS_QUERY_KEY, eventId, pagination],
async () => {
- const {data} = await capacityAssignmentClient.all(eventId);
- return data;
+ return await capacityAssignmentClient.all(eventId, pagination);
}
)
};