diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html index 7465ef3d7385528a9a4f06803f1a1cf3306d0d18..91299499be8f487d8bdf3c564acaa1be0972f828 100644 --- a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html +++ b/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) diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts index 1557b63c829ba9a6425b5006598342df37fe7b75..e8dce1f718ae050d4b6062bcc86067284717e0bc 100644 --- a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts +++ b/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) => {