Merge pull request #364 from cisagov/343-ui-update-admin-tools-scan-h…

…istory-table 343 UI Update Admin Tools Scan History table
cisagov · Jun 26, 2024 · cae8335 · cae8335
2 parents 14b9561 + 25e1c91
commit cae8335
Show file tree

Hide file tree

Showing 2 changed files with 400 additions and 164 deletions.
diff --git a/backend/src/api/scan-tasks.ts b/backend/src/api/scan-tasks.ts
@@ -20,7 +20,7 @@ import {
 } from './auth';
 import ECSClient from '../tasks/ecs-client';
 
-const PAGE_SIZE = parseInt(process.env.PAGE_SIZE ?? '') || 25;
+const PAGE_SIZE = 15;
 
 class ScanTaskFilters {
   @IsString()
@@ -59,6 +59,11 @@ class ScanTaskSearch {
   @IsOptional()
   filters?: ScanTaskFilters;
 
+  @IsInt()
+  @IsOptional()
+  // If set to -1, returns all results.
+  pageSize?: number;
+
   async filterResultQueryset(qs: SelectQueryBuilder<ScanTask>, event) {
     if (this.filters?.name) {
       qs.andWhere('scan.name ILIKE :name', {
@@ -84,12 +89,16 @@ class ScanTaskSearch {
   }
 
   async getResults(event) {
+    const pageSize = this.pageSize || PAGE_SIZE;
+
     const qs = ScanTask.createQueryBuilder('scan_task')
       .leftJoinAndSelect('scan_task.scan', 'scan')
       .leftJoinAndSelect('scan_task.organizations', 'organization')
-      .orderBy(`scan_task.${this.sort}`, this.order)
-      .skip(PAGE_SIZE * (this.page - 1))
-      .take(PAGE_SIZE);
+      .orderBy(`scan_task.${this.sort}`, this.order);
+
+    if (pageSize !== -1) {
+      qs.skip(pageSize * (this.page - 1)).take(pageSize);
+    }
 
     await this.filterResultQueryset(qs, event);
     return qs.getManyAndCount();