Filter for 'Merged'

src/app/shared/filter-bar/filter-bar.component.html

@@ -9,15 +9,16 @@
     <div class="dropdown-filters">
       <mat-form-field appearance="standard">
         <mat-label>Status</mat-label>
-        <mat-select [(value)]="this.dropdownFilter.status" (selectionChange)="applyDropdownFilter()">
+        <mat-select [(value)]="this.dropdownFilter.status" (selectionChange)="updateTypePairing(); applyDropdownFilter()">
           <mat-option value="all">All</mat-option>
           <mat-option value="open">Open</mat-option>
           <mat-option value="closed">Closed</mat-option>
+          <mat-option value="merged" *ngIf="isNotFilterIssue()">Merged</mat-option>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="standard">
         <mat-label>Type</mat-label>
-        <mat-select [(value)]="this.dropdownFilter.type" (selectionChange)="applyDropdownFilter()">
+        <mat-select [(value)]="this.dropdownFilter.type" (selectionChange)="updateStatusPairing(); applyDropdownFilter()">
           <mat-option value="all">All</mat-option>
           <mat-option value="issue">Issue</mat-option>
           <mat-option value="pullrequest">Pull Request</mat-option>

src/app/shared/filter-bar/filter-bar.component.ts

@@ -80,13 +80,38 @@ export class FilterBarComponent implements OnInit, AfterViewInit, OnDestroy {
     this.views$?.value?.forEach((v) => (v.retrieveFilterable().filter = filterValue));
   }
 
+  /**
+   * Changes type to a valid, default value when an incompatible combination of type and status is encountered.
+   */
+  updateTypePairing() {
+    if (this.dropdownFilter.status === 'merged') {
+      this.dropdownFilter.type = 'pullrequest';
+    }
+  }
+
+  /**
+   * Changes status to a valid, default value when an incompatible combination of type and status is encountered.
+   */
+  updateStatusPairing() {
+    if (this.dropdownFilter.status === 'merged' && this.dropdownFilter.type === 'issue') {
+      this.dropdownFilter.status = 'all';
+    }
+  }
+
   /**
    * Signals to IssuesDataTable that a change has occurred in dropdown filter.
    */
   applyDropdownFilter() {
     this.views$?.value?.forEach((v) => (v.retrieveFilterable().dropdownFilter = this.dropdownFilter));
   }
 
+  /**
+   * Checks if program is filtering by type issue.
+   */
+  isNotFilterIssue() {
+    return this.dropdownFilter.type !== 'issue';
+  }
+
   /**
    * Fetch and initialize all information from repository to populate Issue Dashboard.
    */

src/app/shared/issue-tables/dropdownfilter.ts

@@ -32,6 +32,8 @@ export function applyDropdownFilter(dropdownFilter: DropdownFilter): (a: Issue)
     } else if (dropdownFilter.status === 'closed') {
       // there is apparently also a status called 'all' based on github api
       ret = ret && issue.state === 'CLOSED';
+    } else if (dropdownFilter.status === 'merged') {
+      ret = ret && issue.state === 'MERGED';
     }
 
     if (dropdownFilter.type === 'issue') {