Add sorting by Status (CATcher-org#318)

Co-authored-by: Misra Aditya <[email protected]>
Co-authored-by: Nguyen <[email protected]>

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

@@ -56,6 +56,9 @@
           <mat-option value="date">
             <span mat-sort-header="date">Date Updated</span>
           </mat-option>
+          <mat-option value="status">
+            <span mat-sort-header="status">Status</span>
+          </mat-option>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="standard">

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

@@ -14,6 +14,8 @@ export function applySort(sort: Sort, data: Issue[]): Issue[] {
       return data.sort((a, b) => direction * compareByIntegerValue(a.id, b.id));
     case 'date':
       return data.sort((a, b) => direction * compareByDateValue(a.updated_at, b.updated_at));
+    case 'status':
+      return data.sort((a, b) => direction * compareByIssueType(a, b));
     default:
       // title, responseTag are string values
       return data.sort((a, b) => direction * compareByStringValue(a[sort.active], b[sort.active]));
@@ -33,3 +35,24 @@ function compareByIntegerValue(valueA: number, valueB: number): number {
 function compareByDateValue(valueA: string, valueB: string): number {
   return moment(valueA).isBefore(valueB) ? -1 : 1;
 }
+
+function compareByIssueType(valueA: Issue, valueB: Issue): number {
+  const sortOrder = {
+    'OPEN PullRequest': 0,
+    'OPEN Issue': 1,
+    'MERGED PullRequest': 2,
+    'CLOSED Issue': 3,
+    'CLOSED PullRequest': 4
+  };
+
+  const aOrder = sortOrder[valueA.state + ' ' + valueA.issueOrPr] || -1;
+  const bOrder = sortOrder[valueB.state + ' ' + valueB.issueOrPr] || -1;
+
+  if (aOrder === bOrder) {
+    return compareByStringValue(valueA.title, valueB.title);
+  } else if (aOrder > bOrder) {
+    return 1;
+  } else {
+    return -1;
+  }
+}