feat(table,runs,sessions): add server-side sorting and pagination
- add sortable column support to Table with asc/desc/unsorted icons - active sort icon uses --color-primary; no header background change - Table supports server-side mode via total/page/onPageChange props - wire server-side sort+pagination in ScenariosPage, AllRunsPage, RunsPage, SessionsPage - remove steps count column from run tables - fix server: RunsQueryDto now extends PaginationQueryDto with orderBy/orderDir - fix findAllRuns to use QueryBuilder; sort by scenario.name via JOIN - add per-resource typed query DTOs with @IsIn allowlist on orderBy - prevents SQL injection and returns 400 for unknown orderBy values
This commit is contained in:
1 parent
f268d0e3eb
commit
ad155e269c
20 files changed
+456
-125
No files matched your search
@@ -1 +1,15 @@
|
||||
import { ApiPropertyOptional } from "@nestjs/swagger";
|
||||
import { IsIn, IsOptional } from "class-validator";
|
||||
import { PaginationQueryDto } from "../../common/dto/pagination.dto";
|
||||
import { ScenarioOrderBy } from "../scenario.service";
|
||||
|
||||
export { PaginationQueryDto } from "../../common/dto/pagination.dto";
|
||||
|
||||
const SCENARIO_ORDER_BY: ScenarioOrderBy[] = ["id", "name", "createdAt", "updatedAt"];
|
||||
|
||||
export class ScenarioQueryDto extends PaginationQueryDto<ScenarioOrderBy> {
|
||||
@ApiPropertyOptional({ enum: SCENARIO_ORDER_BY })
|
||||
@IsOptional()
|
||||
@IsIn(SCENARIO_ORDER_BY)
|
||||
declare orderBy?: ScenarioOrderBy;
|
||||
}
|
||||
@@ -1,22 +1,17 @@
|
||||
import { ApiPropertyOptional } from "@nestjs/swagger";
|
||||
import { Type } from "class-transformer";
|
||||
import { IsIn, IsInt, IsOptional, Min } from "class-validator";
|
||||
import { IsIn, IsOptional } from "class-validator";
|
||||
import { RunStatus } from "../scenario-run.entity";
|
||||
import { PaginationQueryDto } from "../../common/dto/pagination.dto";
|
||||
|
||||
export class RunsQueryDto {
|
||||
@ApiPropertyOptional({ example: 1, default: 1 })
|
||||
@IsOptional()
|
||||
@Type(() => Number)
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
page?: number = 1;
|
||||
export type RunOrderBy = "createdAt" | "status" | "scenario.name";
|
||||
|
||||
@ApiPropertyOptional({ example: 20, default: 20 })
|
||||
const RUN_ORDER_BY: RunOrderBy[] = ["createdAt", "status", "scenario.name"];
|
||||
|
||||
export class RunsQueryDto extends PaginationQueryDto<RunOrderBy> {
|
||||
@ApiPropertyOptional({ enum: RUN_ORDER_BY })
|
||||
@IsOptional()
|
||||
@Type(() => Number)
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
limit?: number = 20;
|
||||
@IsIn(RUN_ORDER_BY)
|
||||
declare orderBy?: RunOrderBy;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
enum: ["pending", "in_progress", "pass", "fail"],
|
||||
|
||||
@@ -18,12 +18,12 @@ import { AddScenarioCredentialDto } from "./dto/add-scenario-credential.dto";
|
||||
import { CreateScenarioRunDto } from "./dto/create-scenario-run.dto";
|
||||
import { CreateScenarioStepDto } from "./dto/create-scenario-step.dto";
|
||||
import { CreateScenarioDto } from "./dto/create-scenario.dto";
|
||||
import { PaginationQueryDto } from "./dto/pagination-query.dto";
|
||||
import { ScenarioQueryDto } from "./dto/pagination-query.dto";
|
||||
import { RunsQueryDto } from "./dto/runs-query.dto";
|
||||
import { ExportEntity } from "./dto/scenario-export.dto";
|
||||
import { UpdateScenarioStepDto } from "./dto/update-scenario-step.dto";
|
||||
import { UpdateScenarioDto } from "./dto/update-scenario.dto";
|
||||
import { ScenarioOrderBy, ScenarioService } from "./scenario.service";
|
||||
import { ScenarioService } from "./scenario.service";
|
||||
|
||||
@ApiTags("scenarios")
|
||||
@Controller("scenarios")
|
||||
@@ -49,7 +49,7 @@ export class ScenarioController {
|
||||
@Get()
|
||||
@ApiOperation({ summary: "List all scenarios (paginated)" })
|
||||
@ApiResponse({ status: 200 })
|
||||
findAll(@Query() query: PaginationQueryDto<ScenarioOrderBy>) {
|
||||
findAll(@Query() query: ScenarioQueryDto) {
|
||||
return this.scenarioService.findAll(query);
|
||||
}
|
||||
|
||||
|
||||
@@ -287,12 +287,13 @@ export class ScenarioService {
|
||||
await this.findOne(scenarioId); // 404 guard
|
||||
const page = query.page ?? 1;
|
||||
const limit = query.limit ?? 20;
|
||||
const orderBy = query.orderBy ?? "createdAt";
|
||||
const orderDir = query.orderDir ?? "DESC";
|
||||
const where: Record<string, unknown> = { scenarioId };
|
||||
if (query.status) where["status"] = query.status;
|
||||
const [data, total] = await this.runRepo.findAndCount({
|
||||
where,
|
||||
relations: ["stepRuns"],
|
||||
order: { createdAt: "DESC" },
|
||||
order: { [orderBy]: orderDir },
|
||||
skip: (page - 1) * limit,
|
||||
take: limit,
|
||||
});
|
||||
@@ -306,15 +307,19 @@ export class ScenarioService {
|
||||
> {
|
||||
const page = query.page ?? 1;
|
||||
const limit = query.limit ?? 20;
|
||||
const where: Record<string, unknown> = {};
|
||||
if (query.status) where["status"] = query.status;
|
||||
const [data, total] = await this.runRepo.findAndCount({
|
||||
where,
|
||||
relations: ["stepRuns", "scenario"],
|
||||
order: { createdAt: "DESC" },
|
||||
skip: (page - 1) * limit,
|
||||
take: limit,
|
||||
});
|
||||
const orderBy = query.orderBy ?? "createdAt";
|
||||
const orderDir = query.orderDir ?? "DESC";
|
||||
const qb = this.runRepo
|
||||
.createQueryBuilder("run")
|
||||
.leftJoinAndSelect("run.scenario", "scenario");
|
||||
if (query.status) qb.where("run.status = :status", { status: query.status });
|
||||
if (orderBy === "scenario.name") {
|
||||
qb.orderBy("scenario.name", orderDir);
|
||||
} else {
|
||||
qb.orderBy(`run.${orderBy}`, orderDir);
|
||||
}
|
||||
qb.skip((page - 1) * limit).take(limit);
|
||||
const [data, total] = await qb.getManyAndCount();
|
||||
return { data, total, page, limit } as PaginatedResult<
|
||||
ScenarioRunEntity & { scenario: ScenarioEntity }
|
||||
>;
|
||||
|
||||
Reference in new issue
Block a user