Merge branch 'tweak_active_request_pagination' into 'main'

reset pagination default to 20, fix object errors

See merge request !1332

apps/cli/executables/pexable/productfetcher/setup.py

@@ -34,7 +34,7 @@ requires = [
     "beautifulsoup4>=4.9.1,<5.0",
     "lxml>=4.3.2,<5.0",
     "psycopg2>=2.8.5,<3.0",
-    "requests>=2.23,<3.0",
+    "requests>=2.23,<2.30.0",
     "requests-mock",
     "marshmallow",
     "pex==2.1.119",

apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html

@@ -118,13 +118,13 @@
         </button>
       </th>
       <th>Current Processing Start Time</th>
-      <th *ngIf="capability.requires_qa">
+      <th *ngIf="capability && capability.requires_qa">
         Stage 1 Reviewer
         <button class="btn bg-transparent border-0 btn-light btn-sm" (click)="toggleFilterMenu()">
           <span><i class="text-dark small fas fa-filter"></i></span>
         </button>
       </th>
-      <th *ngIf="capability.requires_qa">
+      <th *ngIf="capability && capability.requires_qa">
         Stage 2 Reviewer
         <button class="btn bg-transparent border-0 btn-light btn-sm" (click)="toggleFilterMenu()">
           <span><i class="text-dark small fas fa-filter"></i></span>
@@ -197,7 +197,7 @@
       >
         Processing has not started
       </td>
-      <td *ngIf="capability.requires_qa"
+      <td *ngIf="capability && capability.requires_qa"
         [ngClass]="{
         'staff-assigned' : request.stage_1_reviewer,
         'staff-unassigned' : !request.stage_1_reviewer
@@ -245,7 +245,7 @@
         </span>
       </td>
       <!-- for non-srdp entries, DAs want AOD color highlighting to match the DA one -->
-      <td *ngIf="capability.requires_qa"
+      <td *ngIf="capability && capability.requires_qa"
         [ngClass]="{
         'staff-assigned' : (getMetadata(request).is_srdp && request.stage_2_reviewer) || (!getMetadata(request).is_srdp && request.stage_1_reviewer),
         'staff-unassigned' : (getMetadata(request).is_srdp && !request.stage_2_reviewer) || (!getMetadata(request).is_srdp && !request.stage_1_reviewer)

apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts

@@ -171,7 +171,7 @@ export class ActiveCapabilityRequestsComponent implements OnInit, OnDestroy {
   pageStop: number;
   pageAllVal: number;
   getPageSizeOptions(): number[] {
-    const pageSizes = [5, 10, 20, 40];
+    const pageSizes = [20, 40];
     const pageSizeOptions = [this.pageAllVal];
 
     pageSizes.forEach((size) => {