From 6d2d7685f61c4ca4170b09835753e98d6583353e Mon Sep 17 00:00:00 2001
From: Nguyen <87511888+nknguyenhc@users.noreply.github.com>
Date: Sat, 30 Mar 2024 23:34:55 +0800
Subject: [PATCH 01/10] Resolve conflicts for 1.2.0 (#329)

Co-authored-by: Gabriel Goh <77230723+gycgabriel@users.noreply.github.com>
Co-authored-by: Arif Khalid <88131400+Arif-Khalid@users.noreply.github.com>
Co-authored-by: NereusWB922 <107099783+NereusWB922@users.noreply.github.com>
Co-authored-by: AdityaMisra <114080910+MadLamprey@users.noreply.github.com>
Co-authored-by: Misra Aditya <e1096355@u.nus.edu>
Co-authored-by: Vignesh Sankar Iyer <68676914+vigneshsankariyer1234567890@users.noreply.github.com>

From 44fd3ca4c69dfd50ee8d825c5c318255530b3963 Mon Sep 17 00:00:00 2001
From: Arif Khalid <88131400+Arif-Khalid@users.noreply.github.com>
Date: Mon, 1 Apr 2024 12:14:43 +0800
Subject: [PATCH 02/10] Fix default preset view (#334)

The default view is custom instead of currently active.

The default view should show the most relevant information
to users. This should be the currently active preset view.

Let's change the default view to be currently active.
---
 src/app/core/services/filters.service.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/core/services/filters.service.ts b/src/app/core/services/filters.service.ts
index 10c48680..1a7541c3 100644
--- a/src/app/core/services/filters.service.ts
+++ b/src/app/core/services/filters.service.ts
@@ -107,6 +107,12 @@ export class FiltersService {
         return;
       }
 
+      // No preset view and no other filters in params, use default view
+      if (!presetView && Object.keys(nextFilter).every((filterName) => queryParams.get(filterName) === null)) {
+        this.updatePresetView('currentlyActive');
+        return;
+      }
+
       for (const filterName of Object.keys(nextFilter)) {
         const stringifiedFilterData = queryParams.get(filterName);
         if (!stringifiedFilterData) {

From b603307a9e30e8bb74773c354fc41e1c36983df9 Mon Sep 17 00:00:00 2001
From: NereusWB922 <107099783+NereusWB922@users.noreply.github.com>
Date: Mon, 1 Apr 2024 13:05:42 +0800
Subject: [PATCH 03/10] Show PRs without milestone in "Currently Active"

PRs without milestone requires urgent action from the user.

Let's show it in the "Currently Active" preset view.
---
 src/app/core/services/filters.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/services/filters.service.ts b/src/app/core/services/filters.service.ts
index 1a7541c3..1df13874 100644
--- a/src/app/core/services/filters.service.ts
+++ b/src/app/core/services/filters.service.ts
@@ -233,14 +233,14 @@ export class FiltersService {
   getMilestonesForCurrentlyActive(): Milestone[] {
     const earliestOpenMilestone = this.milestoneService.getEarliestOpenMilestone();
     if (earliestOpenMilestone) {
-      return [earliestOpenMilestone];
+      return [earliestOpenMilestone, Milestone.PRWithoutMilestone];
     }
 
     const latestClosedMilestone = this.milestoneService.getLatestClosedMilestone();
     if (latestClosedMilestone) {
-      return [latestClosedMilestone];
+      return [latestClosedMilestone, Milestone.PRWithoutMilestone];
     }
 
-    return this.milestoneService.milestones;
+    return [...this.milestoneService.milestones, Milestone.PRWithoutMilestone];
   }
 }

From e7fb0f992c82b05cd5418a1e747351b4a8af254a Mon Sep 17 00:00:00 2001
From: Nguyen <87511888+nknguyenhc@users.noreply.github.com>
Date: Mon, 1 Apr 2024 13:26:24 +0800
Subject: [PATCH 04/10] Fix preset view selection appearance (#338)

For the preset view selection, brackets are removed
and left margin is added to increase visibility.
---
 src/app/shared/layout/header.component.html | 28 ++++++++++-----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/app/shared/layout/header.component.html b/src/app/shared/layout/header.component.html
index a914c022..5c58c5d4 100644
--- a/src/app/shared/layout/header.component.html
+++ b/src/app/shared/layout/header.component.html
@@ -11,8 +11,8 @@
   <a class="mat-toolbar mat-primary" style="text-decoration: none" [routerLink]="viewService.isRepoSet() ? viewService.currentView : null"
     >WATcher v{{ this.getVersion() }}</a
   >
-  <span id="view-descriptor" *ngIf="auth.isAuthenticated()" style="margin-left: 10px">
-    ({{ this.presetViews[this.filtersService.presetView$.value] }})
+  <span id="view-descriptor" *ngIf="auth.isAuthenticated()" style="margin-left: 70px">
+    {{ this.presetViews[this.filtersService.presetView$.value] }}
   </span>
 
   <!-- Gateway to activity dashboard, do not delete -->
@@ -37,19 +37,17 @@
   <div *ngIf="auth.isAuthenticated()">
     <button mat-button [matMenuTriggerFor]="menu"><mat-icon style="color: white">expand_more</mat-icon></button>
     <mat-menu #menu="matMenu">
-      <button
-        mat-menu-item
-        *ngFor="let presetView of this.presetViews | keyvalue"
-        (click)="this.filtersService.updatePresetView(presetView.key)"
-      >
-        <span>
-          <mat-icon
-            [ngStyle]="{ color: 'green', visibility: this.filtersService.presetView$.value === presetView.key ? 'visible' : 'hidden' }"
-            >done</mat-icon
-          >
-          {{ presetView.value }}
-        </span>
-      </button>
+      <div *ngFor="let presetView of this.presetViews | keyvalue">
+        <button mat-menu-item *ngIf="presetView.key !== 'custom'" (click)="this.filtersService.updatePresetView(presetView.key)">
+          <span>
+            <mat-icon
+              [ngStyle]="{ color: 'green', visibility: this.filtersService.presetView$.value === presetView.key ? 'visible' : 'hidden' }"
+              >done</mat-icon
+            >
+            {{ presetView.value }}
+          </span>
+        </button>
+      </div>
     </mat-menu>
   </div>
 

From d92079ba532ffc56283da245efe295f5edb4f203 Mon Sep 17 00:00:00 2001
From: AdityaMisra <114080910+MadLamprey@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:37:33 +0800
Subject: [PATCH 05/10] Add icon for PRs without milestones (#337)

Co-authored-by: Misra Aditya <e1096355@u.nus.edu>
---
 src/app/issues-viewer/card-view/card-view.component.html  | 2 +-
 .../issue-pr-card-milestone.component.html                | 6 +++---
 .../issue-pr-card-milestone.component.ts                  | 1 +
 src/app/shared/issue-pr-card/issue-pr-card.component.html | 5 ++++-
 src/app/shared/issue-pr-card/issue-pr-card.component.ts   | 8 +++++++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/issues-viewer/card-view/card-view.component.html b/src/app/issues-viewer/card-view/card-view.component.html
index 40770db3..37b3e98e 100644
--- a/src/app/issues-viewer/card-view/card-view.component.html
+++ b/src/app/issues-viewer/card-view/card-view.component.html
@@ -6,7 +6,7 @@
   <div class="scrollable-container-wrapper">
     <div class="scrollable-container">
       <div class="issue-pr-cards" *ngFor="let issue of this.issues$ | async; index as i">
-        <app-issue-pr-card [issue]="issue" [filter]="issues.filter"></app-issue-pr-card>
+        <app-issue-pr-card [issue]="issue" [filter]="issues.filter" [milestoneService]="milestoneService"></app-issue-pr-card>
       </div>
       <mat-card class="loading-spinner" *ngIf="this.issues.isLoading$ | async">
         <mat-progress-spinner color="primary" mode="indeterminate" diameter="50" strokeWidth="5"></mat-progress-spinner>
diff --git a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html
index 07ef0ccf..4bde84f8 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html
+++ b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="milestone.state" class="milestone">
-  <span class="octicon-milestone" octicon="milestone" color="grey" size="8"> </span>
-  {{ milestone.title }}
+<div *ngIf="repoHasMilestones" class="milestone" [ngStyle]="{ color: milestone.state ? 'grey' : 'red' }">
+  <span class="octicon-milestone" octicon="milestone" [color]="milestone.state ? 'grey' : 'red'" size="8"> </span>
+  {{ milestone.state ? milestone.title : '???' }}
 </div>
diff --git a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts
index 59cbb8d8..c9772a2d 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts
+++ b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts
@@ -8,6 +8,7 @@ import { Milestone } from '../../../core/models/milestone.model';
 })
 export class IssuePrCardMilestoneComponent {
   @Input() milestone: Milestone;
+  @Input() repoHasMilestones: boolean;
 
   constructor() {}
 }
diff --git a/src/app/shared/issue-pr-card/issue-pr-card.component.html b/src/app/shared/issue-pr-card/issue-pr-card.component.html
index 9c9c36d8..5c7c50a9 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card.component.html
+++ b/src/app/shared/issue-pr-card/issue-pr-card.component.html
@@ -3,7 +3,10 @@
     <span [matTooltip]="this.issue.updated_at">
       <app-issue-pr-card-header [issue]="issue"></app-issue-pr-card-header>
       <mat-card-content>
-        <app-issue-pr-card-milestone [milestone]="issue.milestone"></app-issue-pr-card-milestone>
+        <app-issue-pr-card-milestone
+          [milestone]="issue.milestone"
+          [repoHasMilestones]="!milestoneService.hasNoMilestones"
+        ></app-issue-pr-card-milestone>
         <app-issue-pr-card-labels [labels]="issue.githubLabels" [labelSet]="filter?.hiddenLabels"></app-issue-pr-card-labels>
       </mat-card-content>
     </span>
diff --git a/src/app/shared/issue-pr-card/issue-pr-card.component.ts b/src/app/shared/issue-pr-card/issue-pr-card.component.ts
index 47fbf1a8..4db045ee 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card.component.ts
+++ b/src/app/shared/issue-pr-card/issue-pr-card.component.ts
@@ -4,6 +4,7 @@ import { Filter } from '../../core/services/filters.service';
 import { GithubService } from '../../core/services/github.service';
 import { LabelService } from '../../core/services/label.service';
 import { LoggingService } from '../../core/services/logging.service';
+import { MilestoneService } from '../../core/services/milestone.service';
 
 @Component({
   selector: 'app-issue-pr-card',
@@ -14,7 +15,12 @@ export class IssuePrCardComponent {
   @Input() issue: Issue;
   @Input() filter?: Filter;
 
-  constructor(private logger: LoggingService, private githubService: GithubService, public labelService: LabelService) {}
+  constructor(
+    private logger: LoggingService,
+    private githubService: GithubService,
+    public labelService: LabelService,
+    public milestoneService: MilestoneService
+  ) {}
 
   /** Opens issue in new window */
   viewIssueInBrowser(event: Event) {

From 775e59ce6371251c8ae2cb075f75ccb29ad8b6d2 Mon Sep 17 00:00:00 2001
From: NereusWB922 <107099783+NereusWB922@users.noreply.github.com>
Date: Wed, 3 Apr 2024 13:20:57 +0800
Subject: [PATCH 06/10] Implement dropdown menu for repo change (#347)

Introduce a dropdown menu for repository selection,
simplifying the process of switching between repositories.

This enhancement offers users a quicker and more
intuitive method to navigate to previously visited repositories.
---
 src/app/shared/layout/header.component.css  | 32 +++++++++++++++++++++
 src/app/shared/layout/header.component.html | 30 +++++++++++++++++--
 src/app/shared/layout/header.component.ts   | 17 +++++++++--
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 src/app/shared/layout/header.component.css

diff --git a/src/app/shared/layout/header.component.css b/src/app/shared/layout/header.component.css
new file mode 100644
index 00000000..02c8f9c8
--- /dev/null
+++ b/src/app/shared/layout/header.component.css
@@ -0,0 +1,32 @@
+.repo-menu-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: sticky;
+  bottom: 0;
+  z-index: 1;
+  padding: 10px;
+}
+
+.new-repo-button {
+  flex-grow: 1;
+}
+
+.keep-filter-button {
+  margin-left: 2px;
+}
+
+.repo-options {
+  max-height: 300px;
+  overflow-y: auto;
+}
+
+.repo-options button {
+  font-size: 17px;
+}
+
+/* Overwrite the width of the menu */
+::ng-deep .repo-menu {
+  width: fit-content !important;
+  min-width: 320px !important;
+}
diff --git a/src/app/shared/layout/header.component.html b/src/app/shared/layout/header.component.html
index 5c58c5d4..e0b8c0cf 100644
--- a/src/app/shared/layout/header.component.html
+++ b/src/app/shared/layout/header.component.html
@@ -60,14 +60,40 @@
       {{ this.currentRepo || 'No Repository Set' }}
     </span>
     <button
-      mat-button
+      mat-icon-button
       matTooltip="{{ viewService.isRepoSet() ? 'Change Repository' : 'Select Repository' }}"
-      (click)="this.openChangeRepoDialog()"
+      [matMenuTriggerFor]="repoMenu"
     >
       <mat-icon>edit</mat-icon>
     </button>
   </div>
 
+  <mat-menu #repoMenu xPosition="before" class="repo-menu">
+    <div class="repo-options">
+      <div *ngFor="let repo of this.repoUrlCacheService.suggestions">
+        <button mat-menu-item *ngIf="repo !== this.currentRepo" (click)="this.applyRepoDropdown(repo, true)">
+          {{ repo }}
+        </button>
+      </div>
+    </div>
+
+    <div class="repo-menu-footer">
+      <button mat-flat-button color="primary" class="new-repo-button" (click)="this.openChangeRepoDialog()" matTooltip="Add new repository">
+        <mat-icon>add</mat-icon>
+      </button>
+
+      <button
+        mat-icon-button
+        (click)="toggleKeepFilters($event)"
+        class="keep-filter-button"
+        matTooltip="{{ keepFilters ? 'Keep filter on' : 'Keep filter off' }}"
+        color="{{ keepFilters ? 'primary' : 'warn' }}"
+      >
+        <mat-icon>{{ keepFilters ? 'filter_alt' : 'filter_alt_off' }}</mat-icon>
+      </button>
+    </div>
+  </mat-menu>
+
   <span style="flex: 1 1 auto"></span>
 
   <button mat-button matTooltip="Download WATcher Log" (click)="this.exportLogFile()">
diff --git a/src/app/shared/layout/header.component.ts b/src/app/shared/layout/header.component.ts
index 441a08f6..0ab0bf1b 100644
--- a/src/app/shared/layout/header.component.ts
+++ b/src/app/shared/layout/header.component.ts
@@ -27,7 +27,8 @@ const ISSUE_TRACKER_URL = 'https://github.com/CATcher-org/WATcher/issues';
 
 @Component({
   selector: 'app-layout-header',
-  templateUrl: './header.component.html'
+  templateUrl: './header.component.html',
+  styleUrls: ['./header.component.css']
 })
 export class HeaderComponent implements OnInit {
   private prevUrl;
@@ -55,16 +56,18 @@ export class HeaderComponent implements OnInit {
   /** Model for the displayed repository name */
   currentRepo = '';
 
+  keepFilters = false;
+
   constructor(
     private router: Router,
     public auth: AuthService,
     public viewService: ViewService,
     public userService: UserService,
     public logger: LoggingService,
+    public repoUrlCacheService: RepoUrlCacheService,
     private location: Location,
     private githubEventService: GithubEventService,
     private issueService: IssueService,
-    private repoUrlCacheService: RepoUrlCacheService,
     private labelService: LabelService,
     private errorHandlingService: ErrorHandlingService,
     private githubService: GithubService,
@@ -265,6 +268,16 @@ export class HeaderComponent implements OnInit {
       });
   }
 
+  applyRepoDropdown(repoString: string) {
+    const newRepo = Repo.of(repoString);
+    this.changeRepositoryIfValid(newRepo, newRepo.toString(), this.keepFilters);
+  }
+
+  toggleKeepFilters(event: MouseEvent) {
+    event.stopPropagation();
+    this.keepFilters = !this.keepFilters;
+  }
+
   openChangeRepoDialog() {
     const dialogRef = this.dialogService.openChangeRepoDialog(this.currentRepo);
 

From d356fbe192b4b4761a512afbb9ba7409cc4b1362 Mon Sep 17 00:00:00 2001
From: Nguyen <87511888+nknguyenhc@users.noreply.github.com>
Date: Wed, 3 Apr 2024 16:28:35 +0800
Subject: [PATCH 07/10] Hide column issue count (#346)

We hide the issue column count when there is only one page,
to make space for the issues.
---
 .../card-view/card-view.component.css         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/issues-viewer/card-view/card-view.component.css b/src/app/issues-viewer/card-view/card-view.component.css
index 7a6b0e2f..b1c656be 100644
--- a/src/app/issues-viewer/card-view/card-view.component.css
+++ b/src/app/issues-viewer/card-view/card-view.component.css
@@ -1,5 +1,8 @@
 .card-column {
   margin: 8px;
+  height: 77vh;
+  display: flex;
+  flex-direction: column;
 }
 
 .card {
@@ -45,17 +48,10 @@ div.column-header .mat-card-header {
 }
 
 .scrollable-container {
-  height: 53vh;
-  overflow: auto;
   margin-bottom: 2px;
-  scrollbar-width: none;
   position: relative;
 }
 
-.scrollable-container::-webkit-scrollbar {
-  display: none;
-}
-
 /* Ref: https://css-scroll-shadows.vercel.app */
 .scrollable-container::before {
   pointer-events: none;
@@ -82,6 +78,13 @@ div.column-header .mat-card-header {
 
 .scrollable-container-wrapper {
   position: relative;
+  scrollbar-width: none;
+  overflow: auto;
+  flex-grow: 1;
+}
+
+.scrollable-container-wrapper::-webkit-scrollbar {
+  display: none;
 }
 
 .scrollable-container-wrapper::before {
@@ -142,6 +145,6 @@ div.column-header .mat-card-header {
   display: none !important;
 }
 
-:host ::ng-deep .mat-paginator-range-actions {
-  height: 47px;
+:host ::ng-deep .pagination-hide-arrow .mat-paginator-range-actions {
+  display: none !important;
 }

From 99d2c72e7b7ce4ccffc190e918fb0639ffe020f9 Mon Sep 17 00:00:00 2001
From: Arif Khalid <88131400+Arif-Khalid@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:57:21 +0800
Subject: [PATCH 08/10] Remove quotation marks from url (#345)

Quotation marks and null parameters are present for
filters saved in url.

Quotation marks are unnecessary and empty filters
can be removed from the URL in order to make it
more readable and editable by advanced users.

Let's remove null params and remove quotation marks
from the url.
---
 src/app/core/services/filters.service.ts | 79 +++++++++++++++++++-----
 1 file changed, 65 insertions(+), 14 deletions(-)

diff --git a/src/app/core/services/filters.service.ts b/src/app/core/services/filters.service.ts
index 1df13874..6179fcaf 100644
--- a/src/app/core/services/filters.service.ts
+++ b/src/app/core/services/filters.service.ts
@@ -72,12 +72,46 @@ export class FiltersService {
   ) {}
 
   private pushFiltersToUrl(): void {
-    const queryParams = {};
+    const queryParams = { ...this.route.snapshot.queryParams };
+
     for (const filterName of Object.keys(this.filter$.value)) {
-      if (this.filter$.value[filterName] instanceof Set) {
-        queryParams[filterName] = JSON.stringify([...this.filter$.value[filterName]]);
-      } else {
-        queryParams[filterName] = JSON.stringify(this.filter$.value[filterName]);
+      const filterValue = this.filter$.value[filterName];
+
+      // Don't include empty or null filters
+      // Intended behaviour to reset to default if 0 of a certain filter are selected
+      switch (filterName) {
+        // Strings
+        case 'title':
+        case 'type':
+          if (!filterValue) {
+            delete queryParams[filterName];
+            continue;
+          }
+          queryParams[filterName] = filterValue;
+          break;
+        // Arrays
+        case 'status':
+        case 'labels':
+        case 'milestones':
+          if (filterValue.length === 0) {
+            delete queryParams[filterName];
+            continue;
+          }
+          queryParams[filterName] = filterValue;
+          break;
+        // Sets
+        case 'selectedLabels':
+        case 'deselectedLabels':
+          if (filterValue.size === 0) {
+            delete queryParams[filterName];
+          }
+          queryParams[filterName] = [...filterValue];
+          break;
+        // Objects
+        case 'sort':
+          queryParams[filterName] = JSON.stringify(filterValue);
+          break;
+        default:
       }
     }
     queryParams[FiltersService.PRESET_VIEW_QUERY_PARAM_KEY] = this.presetView$.value;
@@ -85,7 +119,6 @@ export class FiltersService {
     this.router.navigate([], {
       relativeTo: this.route,
       queryParams,
-      queryParamsHandling: 'merge',
       replaceUrl: true
     });
   }
@@ -100,7 +133,6 @@ export class FiltersService {
     const queryParams = this.route.snapshot.queryParamMap;
     try {
       const presetView = queryParams.get(FiltersService.PRESET_VIEW_QUERY_PARAM_KEY);
-
       // Use preset view if set in url
       if (presetView && this.presetViews.hasOwnProperty(presetView) && presetView !== 'custom') {
         this.updatePresetView(presetView);
@@ -114,16 +146,35 @@ export class FiltersService {
       }
 
       for (const filterName of Object.keys(nextFilter)) {
-        const stringifiedFilterData = queryParams.get(filterName);
-        if (!stringifiedFilterData) {
+        // Check if there is no such param in url
+        if (queryParams.get(filterName) === null) {
           continue;
         }
-        const filterData = JSON.parse(stringifiedFilterData);
 
-        if (nextFilter[filterName] instanceof Set) {
-          nextFilter[filterName] = new Set(filterData);
-        } else {
-          nextFilter[filterName] = filterData;
+        const filterData = queryParams.getAll(filterName);
+
+        switch (filterName) {
+          // Strings
+          case 'title':
+          case 'type':
+            nextFilter[filterName] = filterData[0];
+            break;
+          // Arrays
+          case 'status':
+          case 'labels':
+          case 'milestones':
+            nextFilter[filterName] = filterData;
+            break;
+          // Sets
+          case 'selectedLabels':
+          case 'deselectedLabels':
+            nextFilter[filterName] = new Set(filterData);
+            break;
+          // Objects
+          case 'sort':
+            nextFilter[filterName] = JSON.parse(filterData[0]);
+            break;
+          default:
         }
       }
       this.updateFilters(nextFilter);

From 695eabbcd83fee1435d207ce3de9c4c25a6291a6 Mon Sep 17 00:00:00 2001
From: NereusWB922 <107099783+NereusWB922@users.noreply.github.com>
Date: Wed, 3 Apr 2024 21:12:30 +0800
Subject: [PATCH 09/10] Create release V1.2.1 (#349)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 70560949..cab22df9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "WATcher",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "main.js",
   "scripts": {
     "ng": "ng",

From 4dd85619b81d834d0ae444b0ae81f1a67bc3ea06 Mon Sep 17 00:00:00 2001
From: NereusWB922 <107099783+NereusWB922@users.noreply.github.com>
Date: Wed, 3 Apr 2024 21:51:53 +0800
Subject: [PATCH 10/10]  Enable automated testing on deploy branch (#351)

---
 .github/workflows/github-actions.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d849057b..82493340 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -6,9 +6,9 @@ name: Setup Builds and Tests
 
 on:
   push:
-    branches: [main, release]
+    branches: [main, deploy]
   pull_request:
-    branches: [main, release]
+    branches: [main, deploy]
 
 jobs:
   linux-setup-and-tests: