From 663dec3e90481c31c1411b2cd3f1829795c686f2 Mon Sep 17 00:00:00 2001 From: NereusWB922 <107099783+NereusWB922@users.noreply.github.com> Date: Wed, 20 Mar 2024 21:26:58 +0800 Subject: [PATCH 1/8] Refactor Phase Service and remove Phase (#291) The concept of "Phase" is inherited from CATcher. Instead of "Phase", WATcher provides different "Views" of contributions in a repository. Let's replace "Phase" with "View". --- src/app/app.module.ts | 6 +- src/app/auth/auth.component.ts | 8 +- src/app/core/models/issue.model.ts | 2 +- src/app/core/models/phase.model.ts | 8 -- src/app/core/models/session.model.ts | 26 +++--- src/app/core/models/view.model.ts | 4 + src/app/core/services/auth.service.ts | 29 +++---- .../factories/factory.auth.service.ts | 8 +- .../factories/factory.issue.service.ts | 8 +- src/app/core/services/github.service.ts | 6 +- src/app/core/services/issue.service.ts | 12 +-- .../{phase.service.ts => view.service.ts} | 76 ++++++++-------- .../issues-viewer.component.html | 2 +- .../issues-viewer/issues-viewer.component.ts | 10 +-- .../shared/filter-bar/filter-bar.component.ts | 6 +- src/app/shared/layout/header.component.html | 29 +++---- src/app/shared/layout/header.component.ts | 58 ++++++------- tests/app/core/models/session-model.spec.ts | 28 +++--- tests/constants/label.constants.ts | 1 - tests/constants/session.constants.ts | 6 +- ...e.service.spec.ts => view.service.spec.ts} | 86 +++++++++---------- 21 files changed, 203 insertions(+), 216 deletions(-) delete mode 100644 src/app/core/models/phase.model.ts create mode 100644 src/app/core/models/view.model.ts rename src/app/core/services/{phase.service.ts => view.service.ts} (72%) rename tests/services/{phase.service.spec.ts => view.service.spec.ts} (64%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 98e6fd8cb..48a6671f6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -27,9 +27,9 @@ import { GithubEventService } from './core/services/githubevent.service'; import { IssueService } from './core/services/issue.service'; import { LabelService } from './core/services/label.service'; import { LoggingService } from './core/services/logging.service'; -import { PhaseService } from './core/services/phase.service'; import { RepoSessionStorageService } from './core/services/repo-session-storage.service'; import { UserService } from './core/services/user.service'; +import { ViewService } from './core/services/view.service'; import { IssuesViewerModule } from './issues-viewer/issues-viewer.module'; import { LabelDefinitionPopupComponent } from './shared/label-definition-popup/label-definition-popup.component'; import { HeaderComponent } from './shared/layout'; @@ -64,7 +64,7 @@ import { SharedModule } from './shared/shared.module'; UserService, IssueService, LabelService, - PhaseService, + ViewService, GithubEventService, Title, ErrorHandlingService, @@ -74,7 +74,7 @@ import { SharedModule } from './shared/shared.module'; { provide: IssueService, useFactory: IssueServiceFactory, - deps: [GithubService, UserService, PhaseService] + deps: [GithubService, UserService, ViewService] }, { provide: ErrorHandler, diff --git a/src/app/auth/auth.component.ts b/src/app/auth/auth.component.ts index 08795668a..651f56143 100644 --- a/src/app/auth/auth.component.ts +++ b/src/app/auth/auth.component.ts @@ -10,8 +10,8 @@ import { AuthService, AuthState } from '../core/services/auth.service'; import { ErrorHandlingService } from '../core/services/error-handling.service'; import { ErrorMessageService } from '../core/services/error-message.service'; import { LoggingService } from '../core/services/logging.service'; -import { PhaseService } from '../core/services/phase.service'; import { UserService } from '../core/services/user.service'; +import { ViewService } from '../core/services/view.service'; @Component({ selector: 'app-auth', @@ -33,7 +33,7 @@ export class AuthComponent implements OnInit, OnDestroy { private userService: UserService, private errorHandlingService: ErrorHandlingService, private router: Router, - private phaseService: PhaseService, + private viewService: ViewService, private ngZone: NgZone, private activatedRoute: ActivatedRoute, private logger: LoggingService @@ -46,7 +46,7 @@ export class AuthComponent implements OnInit, OnDestroy { const state = this.activatedRoute.snapshot.queryParamMap.get('state'); if (this.authService.isAuthenticated()) { - this.router.navigate([this.phaseService.currentPhase]); + this.router.navigate([this.viewService.currentView]); return; } this.initAccessTokenSubscription(); @@ -141,7 +141,7 @@ export class AuthComponent implements OnInit, OnDestroy { } isRepoSet(): boolean { - return this.phaseService.isRepoSet(); + return this.viewService.isRepoSet(); } get currentSessionOrg(): string { diff --git a/src/app/core/models/issue.model.ts b/src/app/core/models/issue.model.ts index 19af1f018..7233a35b8 100644 --- a/src/app/core/models/issue.model.ts +++ b/src/app/core/models/issue.model.ts @@ -24,7 +24,7 @@ export class Issue { author: string; isDraft: boolean; - /** Depending on the phase, assignees attribute can be derived from Github's assignee feature OR from the Github's issue description */ + /** Depending on the view, assignees attribute can be derived from Github's assignee feature OR from the Github's issue description */ assignees?: string[]; labels?: string[]; githubLabels?: GithubLabel[]; diff --git a/src/app/core/models/phase.model.ts b/src/app/core/models/phase.model.ts deleted file mode 100644 index be6521060..000000000 --- a/src/app/core/models/phase.model.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * A phase is terminology brought over from CATcher. - * It refers to a feature in WATcher. - */ -export enum Phase { - issuesViewer = 'issuesViewer', - activityDashboard = 'activityDashboard' -} diff --git a/src/app/core/models/session.model.ts b/src/app/core/models/session.model.ts index bdb88a8c5..fde7e0507 100644 --- a/src/app/core/models/session.model.ts +++ b/src/app/core/models/session.model.ts @@ -1,13 +1,13 @@ import { pipe } from 'rxjs'; import { throwIfFalse } from '../../shared/lib/custom-ops'; -import { Phase } from './phase.model'; import { Repo } from './repo.model'; +import { View } from './view.model'; /** - * Session repository comprises the phase and its corresponding repository array. + * Session repository comprises the view and its corresponding repository array. */ export interface SessionRepo { - phase: Phase; + view: View; repos: Repo[]; } @@ -20,8 +20,8 @@ export interface SessionData { export const SESSION_DATA_UNAVAILABLE = 'Session data does not exist.'; export const SESSION_DATA_MISSING_FIELDS = 'Session data does not contain any repositories.'; -export const NO_VALID_OPEN_PHASES = 'Invalid phases in Session data.'; -export const OPENED_PHASE_REPO_UNDEFINED = 'Phase has no repo defined.'; +export const NO_VALID_OPEN_VIEWS = 'Invalid views in Session data.'; +export const OPENED_VIEW_REPO_UNDEFINED = 'View has no repo defined.'; export function assertSessionDataIntegrity() { return pipe( @@ -30,8 +30,8 @@ export function assertSessionDataIntegrity() { () => new Error(SESSION_DATA_UNAVAILABLE) ), throwIfFalse(hasSessionRepo, () => new Error(SESSION_DATA_MISSING_FIELDS)), - throwIfFalse(arePhasesValid, () => new Error(NO_VALID_OPEN_PHASES)), - throwIfFalse(areReposDefined, () => new Error(OPENED_PHASE_REPO_UNDEFINED)) + throwIfFalse(areViewsValid, () => new Error(NO_VALID_OPEN_VIEWS)), + throwIfFalse(areReposDefined, () => new Error(OPENED_VIEW_REPO_UNDEFINED)) ); } @@ -44,24 +44,24 @@ function hasSessionRepo(sessionData: SessionData): boolean { } /** - * Checks if Phases belong to a pre-defined Phase. + * Checks if Views belong to a pre-defined View. * @param sessionData */ -function arePhasesValid(sessionData: SessionData): boolean { +function areViewsValid(sessionData: SessionData): boolean { return sessionData.sessionRepo.reduce( - (isPhaseValidSoFar: boolean, currentPhaseRepo: SessionRepo) => isPhaseValidSoFar && currentPhaseRepo.phase in Phase, + (isViewValidSoFar: boolean, currentViewRepo: SessionRepo) => isViewValidSoFar && currentViewRepo.view in View, true ); } /** - * Checks if each Phase has an associated repo defined as well. + * Checks if each View has an associated repo defined as well. * @param sessionData */ function areReposDefined(sessionData: SessionData): boolean { return sessionData.sessionRepo.reduce( - (isPhaseRepoDefinedSoFar: boolean, currentPhaseRepo: SessionRepo) => - isPhaseRepoDefinedSoFar && !!currentPhaseRepo.repos && Array.isArray(currentPhaseRepo.repos) && currentPhaseRepo.repos.length > 0, + (isViewRepoDefinedSoFar: boolean, currentViewRepo: SessionRepo) => + isViewRepoDefinedSoFar && !!currentViewRepo.repos && Array.isArray(currentViewRepo.repos) && currentViewRepo.repos.length > 0, true ); } diff --git a/src/app/core/models/view.model.ts b/src/app/core/models/view.model.ts new file mode 100644 index 000000000..5fdc2809e --- /dev/null +++ b/src/app/core/models/view.model.ts @@ -0,0 +1,4 @@ +export enum View { + issuesViewer = 'issuesViewer', + activityDashboard = 'activityDashboard' +} diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts index 662a4776f..02bebbb24 100644 --- a/src/app/core/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -1,5 +1,4 @@ -import { Injectable } from '@angular/core'; -import { NgZone } from '@angular/core'; +import { Injectable, NgZone } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { Router, RouterStateSnapshot } from '@angular/router'; import { BehaviorSubject, from, Observable, of } from 'rxjs'; @@ -7,15 +6,15 @@ import { catchError, map, mergeMap } from 'rxjs/operators'; import { AppConfig } from '../../../environments/environment'; import { generateSessionId } from '../../shared/lib/session'; import { uuid } from '../../shared/lib/uuid'; -import { Phase } from '../models/phase.model'; +import { View } from '../models/view.model'; import { ErrorHandlingService } from './error-handling.service'; import { GithubService } from './github.service'; import { GithubEventService } from './githubevent.service'; import { IssueService } from './issue.service'; import { LabelService } from './label.service'; import { LoggingService } from './logging.service'; -import { PhaseService } from './phase.service'; import { UserService } from './user.service'; +import { ViewService } from './view.service'; export enum AuthState { 'NotAuthenticated', @@ -50,7 +49,7 @@ export class AuthService { private userService: UserService, private issueService: IssueService, private labelService: LabelService, - private phaseService: PhaseService, + private viewService: ViewService, private githubEventService: GithubEventService, private titleService: Title, private errorHandlingService: ErrorHandlingService, @@ -118,7 +117,7 @@ export class AuthService { */ redirectToNext() { const next = sessionStorage.getItem(AuthService.SESSION_NEXT_KEY); - this.phaseService + this.viewService .setupFromUrl(next) .pipe( mergeMap(() => this.setRepo()), @@ -156,7 +155,7 @@ export class AuthService { this.userService.reset(); this.issueService.reset(true); this.labelService.reset(); - this.phaseService.reset(); + this.viewService.reset(); this.githubEventService.reset(); this.logger.reset(); this.setLandingPageTitle(); @@ -164,9 +163,9 @@ export class AuthService { this.reset(); } - setTitleWithPhaseDetail(): void { + setTitleWithViewDetail(): void { const appSetting = require('../../../../package.json'); - const title = `${appSetting.name} ${appSetting.version} - ${this.phaseService.getCurrentRepositoryURL()}`; + const title = `${appSetting.name} ${appSetting.version} - ${this.viewService.getCurrentRepositoryURL()}`; this.logger.info(`AuthService: Setting Title as ${title}`); this.titleService.setTitle(title); } @@ -234,10 +233,10 @@ export class AuthService { * Handles the clean up required after authentication and setting up of repository is completed. */ handleSetRepoSuccess(repoName: string) { - this.setTitleWithPhaseDetail(); - this.router.navigate([Phase.issuesViewer], { + this.setTitleWithViewDetail(); + this.router.navigate([View.issuesViewer], { queryParams: { - [PhaseService.REPO_QUERY_PARAM_KEY]: repoName + [ViewService.REPO_QUERY_PARAM_KEY]: repoName } }); } @@ -246,13 +245,13 @@ export class AuthService { * Setup repository after authentication. */ setRepo(): Observable { - return from(this.phaseService.initializeCurrentRepository()).pipe( + return from(this.viewService.initializeCurrentRepository()).pipe( map(() => { - if (!this.phaseService.currentRepo) { + if (!this.viewService.currentRepo) { return false; } this.githubEventService.setLatestChangeEvent(); - this.handleSetRepoSuccess(this.phaseService.currentRepo.toString()); + this.handleSetRepoSuccess(this.viewService.currentRepo.toString()); return true; }), catchError((error) => { diff --git a/src/app/core/services/factories/factory.auth.service.ts b/src/app/core/services/factories/factory.auth.service.ts index aabdcadaa..2aa915b76 100644 --- a/src/app/core/services/factories/factory.auth.service.ts +++ b/src/app/core/services/factories/factory.auth.service.ts @@ -10,8 +10,8 @@ import { IssueService } from '../issue.service'; import { LabelService } from '../label.service'; import { LoggingService } from '../logging.service'; // import { MockAuthService } from '../mocks/mock.auth.service'; -import { PhaseService } from '../phase.service'; import { UserService } from '../user.service'; +import { ViewService } from '../view.service'; export function AuthServiceFactory( router: Router, @@ -20,7 +20,7 @@ export function AuthServiceFactory( userService: UserService, issueService: IssueService, labelService: LabelService, - phaseService: PhaseService, + viewService: ViewService, githubEventService: GithubEventService, titleService: Title, errorHandlingService: ErrorHandlingService, @@ -35,7 +35,7 @@ export function AuthServiceFactory( // userService, // issueService, // labelService, - // phaseService, + // viewService, // githubEventService, // titleService, // logger @@ -48,7 +48,7 @@ export function AuthServiceFactory( userService, issueService, labelService, - phaseService, + viewService, githubEventService, titleService, errorHandlingService, diff --git a/src/app/core/services/factories/factory.issue.service.ts b/src/app/core/services/factories/factory.issue.service.ts index da4a64399..719bc9038 100644 --- a/src/app/core/services/factories/factory.issue.service.ts +++ b/src/app/core/services/factories/factory.issue.service.ts @@ -2,13 +2,13 @@ import { GithubService } from '../github.service'; import { IssueService } from '../issue.service'; // import { MockIssueService } from '../mocks/mock.issue.service'; -import { PhaseService } from '../phase.service'; import { UserService } from '../user.service'; +import { ViewService } from '../view.service'; -export function IssueServiceFactory(githubService: GithubService, userService: UserService, phaseService: PhaseService) { +export function IssueServiceFactory(githubService: GithubService, userService: UserService, viewService: ViewService) { // TODO: Write Mocks // if (AppConfig.test) { - // return new MockIssueService(githubService, phaseService, dataService); + // return new MockIssueService(githubService, viewService, dataService); // } - return new IssueService(githubService, userService, phaseService); + return new IssueService(githubService, userService, viewService); } diff --git a/src/app/core/services/github.service.ts b/src/app/core/services/github.service.ts index 26dd9122f..6518ffec9 100644 --- a/src/app/core/services/github.service.ts +++ b/src/app/core/services/github.service.ts @@ -95,12 +95,12 @@ export class GithubService { /** * Sets repository to watch. This repository is used for fetching from Github. - * @param phaseRepoOwner Repository owner + * @param viewRepoOwner Repository owner * @param repoName Repository name */ - storePhaseDetails(phaseRepoOwner: string, repoName: string) { + storeViewDetails(viewRepoOwner: string, repoName: string) { REPO = repoName; - ORG_NAME = phaseRepoOwner; + ORG_NAME = viewRepoOwner; } /** diff --git a/src/app/core/services/issue.service.ts b/src/app/core/services/issue.service.ts index 4f001bef3..4bc7bb835 100644 --- a/src/app/core/services/issue.service.ts +++ b/src/app/core/services/issue.service.ts @@ -4,10 +4,10 @@ import { catchError, exhaustMap, finalize, map } from 'rxjs/operators'; import RestGithubIssueFilter from '../models/github/github-issue-filter.model'; import { GithubIssue } from '../models/github/github-issue.model'; import { Issue, Issues, IssuesFilter } from '../models/issue.model'; -import { Phase } from '../models/phase.model'; +import { View } from '../models/view.model'; import { GithubService } from './github.service'; -import { PhaseService } from './phase.service'; import { UserService } from './user.service'; +import { ViewService } from './view.service'; @Injectable({ providedIn: 'root' @@ -29,7 +29,7 @@ export class IssueService { /** Whether the IssueService is downloading the data from Github*/ public isLoading = new BehaviorSubject(false); - constructor(private githubService: GithubService, private userService: UserService, private phaseService: PhaseService) { + constructor(private githubService: GithubService, private userService: UserService, private viewService: ViewService) { this.issues$ = new BehaviorSubject(new Array()); } @@ -112,7 +112,7 @@ export class IssueService { private initializeData(): Observable { let issuesAPICallsByFilter: Observable>; - switch (IssuesFilter[this.phaseService.currentPhase][this.userService.currentUser.role]) { + switch (IssuesFilter[this.viewService.currentView][this.userService.currentUser.role]) { case 'FILTER_BY_CREATOR': issuesAPICallsByFilter = this.githubService.fetchIssuesGraphql( new RestGithubIssueFilter({ creator: this.userService.currentUser.loginId }) @@ -195,8 +195,8 @@ export class IssueService { } private createIssueModel(githubIssue: GithubIssue): Issue { - switch (this.phaseService.currentPhase) { - case Phase.issuesViewer: + switch (this.viewService.currentView) { + case View.issuesViewer: return Issue.createPhaseBugReportingIssue(githubIssue); default: return; diff --git a/src/app/core/services/phase.service.ts b/src/app/core/services/view.service.ts similarity index 72% rename from src/app/core/services/phase.service.ts rename to src/app/core/services/view.service.ts index f29a7043a..ac0dad288 100644 --- a/src/app/core/services/phase.service.ts +++ b/src/app/core/services/view.service.ts @@ -3,9 +3,9 @@ import { Router } from '@angular/router'; import { BehaviorSubject, Observable, of, Subject } from 'rxjs'; import { map } from 'rxjs/operators'; import { STORAGE_KEYS } from '../constants/storage-keys.constants'; -import { Phase } from '../models/phase.model'; import { Repo } from '../models/repo.model'; import { SessionData } from '../models/session.model'; +import { View } from '../models/view.model'; import { ErrorMessageService } from './error-message.service'; import { GithubService } from './github.service'; import { LoggingService } from './logging.service'; @@ -14,25 +14,25 @@ import { RepoUrlCacheService } from './repo-url-cache.service'; export const SESSION_AVALIABILITY_FIX_FAILED = 'Session Availability Fix failed.'; /** - * The title of each phase that appears in the header bar. + * The title of each view that appears in the header bar. */ -export const PhaseDescription = { - [Phase.issuesViewer]: 'Issues Dashboard', - [Phase.activityDashboard]: 'Activity Dashboard' +export const ViewDescription = { + [View.issuesViewer]: 'Issues Dashboard', + [View.activityDashboard]: 'Activity Dashboard' }; /** * All data of the session. - * Add accessible phases here. + * Add accessible views here. */ export const STARTING_SESSION_DATA: SessionData = { sessionRepo: [ - { phase: Phase.issuesViewer, repos: [] } - // { phase: Phase.activityDashboard, repos: [] } + { view: View.issuesViewer, repos: [] } + // { view: View.activityDashboard, repos: [] } ] }; -export const STARTING_PHASE = Phase.issuesViewer; +export const STARTING_VIEW = View.issuesViewer; @Injectable({ providedIn: 'root' @@ -41,15 +41,13 @@ export const STARTING_PHASE = Phase.issuesViewer; /** * Responsible for managing the current selected feature of WATcher as well as the * current session data and repository details related to the session. - * - * A phase is terminology from CATcher, in WATcher it refers to a feature of WATcher. */ -export class PhaseService { +export class ViewService { public static readonly REPO_QUERY_PARAM_KEY = 'repo'; - public currentPhase: Phase = STARTING_PHASE; - public currentRepo: Repo; // current or main repository of current phase - public otherRepos: Repo[]; // more repositories relevant to this phase + public currentView: View = STARTING_VIEW; + public currentRepo: Repo; // current or main repository of current view + public otherRepos: Repo[]; // more repositories relevant to this view repoSetSource = new BehaviorSubject(false); repoSetState = this.repoSetSource.asObservable(); @@ -62,7 +60,7 @@ export class PhaseService { */ public repoChanged$: Subject = new Subject(); - /** Whether the PhaseService is changing the repository */ + /** Whether the ViewService is changing the repository */ public isChangingRepo = new BehaviorSubject(false); public sessionData = STARTING_SESSION_DATA; // stores session data for the session @@ -76,7 +74,7 @@ export class PhaseService { /** * Sets the current main repository and additional repos if any. - * Updates session data in Phase Service and local storage. + * Updates session data in View Service and local storage. * Updates Github Service with current repository. * @param repo Main current repository * @param repos Additional repositories @@ -84,12 +82,12 @@ export class PhaseService { setRepository(repo: Repo, repos?: Repo[]): void { this.currentRepo = repo; this.otherRepos = repos ? repos : []; - this.sessionData.sessionRepo.find((x) => x.phase === this.currentPhase).repos = this.getRepository(); - this.githubService.storePhaseDetails(this.currentRepo.owner, this.currentRepo.name); + this.sessionData.sessionRepo.find((x) => x.view === this.currentView).repos = this.getRepository(); + this.githubService.storeViewDetails(this.currentRepo.owner, this.currentRepo.name); localStorage.setItem('sessionData', JSON.stringify(this.sessionData)); this.router.navigate(['issuesViewer'], { queryParams: { - [PhaseService.REPO_QUERY_PARAM_KEY]: repo.toString() + [ViewService.REPO_QUERY_PARAM_KEY]: repo.toString() } }); } @@ -99,10 +97,10 @@ export class PhaseService { * @param repo New current repository */ private changeCurrentRepository(repo: Repo): void { - this.logger.info(`PhaseService: Changing current repository to '${repo}'`); + this.logger.info(`ViewService: Changing current repository to '${repo}'`); - if (this.currentPhase === Phase.issuesViewer) { - /** Adds past repositories to phase */ + if (this.currentView === View.issuesViewer) { + /** Adds past repositories to view */ (this.otherRepos || []).push(this.currentRepo); } this.setRepository(repo, this.otherRepos); @@ -142,7 +140,7 @@ export class PhaseService { async initializeCurrentRepository() { const org = window.localStorage.getItem(STORAGE_KEYS.ORG); const repoName = window.localStorage.getItem(STORAGE_KEYS.DATA_REPO); - this.logger.info(`PhaseService: received initial org (${org}) and initial name (${repoName})`); + this.logger.info(`ViewService: received initial org (${org}) and initial name (${repoName})`); let repo: Repo; if (!org || !repoName) { repo = Repo.ofEmptyRepo(); @@ -153,20 +151,20 @@ export class PhaseService { if (!isValidRepository) { throw new Error(ErrorMessageService.repositoryNotPresentMessage()); } - this.logger.info(`PhaseService: Repo is ${repo}`); + this.logger.info(`ViewService: Repo is ${repo}`); this.setRepository(repo); this.repoSetSource.next(true); } /** * Set items in the local storage corresponding to the next URL. - * This includes checking if the phase is valid, and if the repo is of the correct format. + * This includes checking if the view is valid, and if the repo is of the correct format. * @param url The partial URL without the host, e.g. `/issuesViewer?repo=CATcher%2FWATcher. */ setupFromUrl(url: string): Observable { - return of(this.getPhaseAndRepoFromUrl(url)).pipe( - map(([phaseName, repoName]) => { - if (!this.isPhaseAllowed(phaseName)) { + return of(this.getViewAndRepoFromUrl(url)).pipe( + map(([viewName, repoName]) => { + if (!this.isViewAllowed(viewName)) { throw new Error(ErrorMessageService.invalidUrlMessage()); } @@ -184,15 +182,15 @@ export class PhaseService { ); } - getPhaseAndRepoFromUrl(url: string): [string, string] { + getViewAndRepoFromUrl(url: string): [string, string] { const urlObject = new URL(`${location.protocol}//${location.host}${url}`); const pathname = urlObject.pathname; - const reponame = urlObject.searchParams.get(PhaseService.REPO_QUERY_PARAM_KEY); + const reponame = urlObject.searchParams.get(ViewService.REPO_QUERY_PARAM_KEY); return [pathname, reponame]; } - isPhaseAllowed(phaseName: string) { - return phaseName === '/' + Phase.issuesViewer; + isViewAllowed(viewName: string) { + return viewName === '/' + View.issuesViewer; } isRepoSet(): boolean { @@ -200,14 +198,14 @@ export class PhaseService { } /** - * Changes phase and updates Phase Service's properties. - * @param phase New phase + * Changes view and updates View Service's properties. + * @param view New view */ - changePhase(phase: Phase) { - this.currentPhase = phase; + changeView(view: View) { + this.currentView = view; // For now, assumes repository stays the same - this.githubService.storePhaseDetails(this.currentRepo.owner, this.currentRepo.name); + this.githubService.storeViewDetails(this.currentRepo.owner, this.currentRepo.name); } public getCurrentRepositoryURL() { @@ -215,6 +213,6 @@ export class PhaseService { } reset() { - this.currentPhase = STARTING_PHASE; + this.currentView = STARTING_VIEW; } } diff --git a/src/app/issues-viewer/issues-viewer.component.html b/src/app/issues-viewer/issues-viewer.component.html index ad5d99cf0..6750b5e05 100644 --- a/src/app/issues-viewer/issues-viewer.component.html +++ b/src/app/issues-viewer/issues-viewer.component.html @@ -1,5 +1,5 @@
-
diff --git a/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts b/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts index 6d4326277..38adeec95 100644 --- a/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts +++ b/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts @@ -1,5 +1,4 @@ import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { MatListOption, MatSelectionList } from '@angular/material/list'; import { Observable, Subscription } from 'rxjs'; import { SimpleLabel } from '../../../core/models/label.model'; import { FiltersService } from '../../../core/services/filters.service'; @@ -12,11 +11,14 @@ import { LoggingService } from '../../../core/services/logging.service'; styleUrls: ['./label-filter-bar.component.css'] }) export class LabelFilterBarComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild(MatSelectionList) matSelectionList; + private static readonly DEFAULT_LABEL_COLOR: string = 'transparent'; + private static readonly DESELECTED_LABEL_COLOR: string = '#b00020'; + private static readonly SELECTED_LABEL_COLOR: string = '#41c300'; labels$: Observable; allLabels: SimpleLabel[]; - selectedLabelNames: string[] = []; + selectedLabelNames: Set = new Set(); + deselectedLabelNames: Set = new Set(); hiddenLabelNames: Set = new Set(); loaded = false; @@ -35,7 +37,7 @@ export class LabelFilterBarComponent implements OnInit, AfterViewInit, OnDestroy this.labels$.subscribe((labels) => { this.allLabels = labels; this.filtersService.sanitizeLabels(this.allLabels); - this.selectedLabelNames = this.filtersService.filter$.value.labels; + this.selectedLabelNames = new Set(this.filtersService.filter$.value.labels); this.hiddenLabelNames = this.filtersService.filter$.value.hiddenLabels; }); }); @@ -64,16 +66,34 @@ export class LabelFilterBarComponent implements OnInit, AfterViewInit, OnDestroy } /** - * chip as of the current project version consumes click events - * this method is used as an workaround the issue. - * https://github.com/angular/components/issues/19759 + * Change label to the next state. + * Label has the following state rotation: default -> selected -> deselected. + * @param label The label to change state */ - simulateClick(el: MatListOption): void { - if (el.disabled) { - return; + changeLabelState(label: SimpleLabel) { + if (this.selectedLabelNames.has(label.name)) { + this.selectedLabelNames.delete(label.name); + this.deselectedLabelNames.add(label.name); + } else if (this.deselectedLabelNames.has(label.name)) { + this.deselectedLabelNames.delete(label.name); + } else { + this.selectedLabelNames.add(label.name); + } + this.updateSelection(); + } + + /** + * Returns the border color of the label. + * The border color represents the state of the label. + */ + getColor(label: SimpleLabel): string { + if (this.selectedLabelNames.has(label.name)) { + return LabelFilterBarComponent.SELECTED_LABEL_COLOR; + } else if (this.deselectedLabelNames.has(label.name)) { + return LabelFilterBarComponent.DESELECTED_LABEL_COLOR; + } else { + return LabelFilterBarComponent.DEFAULT_LABEL_COLOR; } - el.toggle(); - this.updateSelection([el]); } /** loads in the labels in the repository */ @@ -101,22 +121,16 @@ export class LabelFilterBarComponent implements OnInit, AfterViewInit, OnDestroy return this.allLabels.some((label) => !this.filter(filter, label.name)); } - updateSelection(options: MatListOption[]): void { - options.forEach((option) => { - if (option.selected && !this.selectedLabelNames.includes(option.value)) { - this.selectedLabelNames.push(option.value); - } - if (!option.selected && this.selectedLabelNames.includes(option.value)) { - const index = this.selectedLabelNames.indexOf(option.value); - this.selectedLabelNames.splice(index, 1); - } + updateSelection(): void { + this.filtersService.updateFilters({ + labels: Array.from(this.selectedLabelNames), + deselectedLabels: this.deselectedLabelNames }); - this.filtersService.updateFilters({ labels: this.selectedLabelNames }); } removeAllSelection(): void { - this.matSelectionList.deselectAll(); - this.selectedLabelNames = []; - this.filtersService.updateFilters({ labels: this.selectedLabelNames }); + this.selectedLabelNames = new Set(); + this.deselectedLabelNames = new Set(); + this.updateSelection(); } } diff --git a/src/app/shared/issue-tables/dropdownfilter.ts b/src/app/shared/issue-tables/dropdownfilter.ts index 0b9e8ebef..e1f122f77 100644 --- a/src/app/shared/issue-tables/dropdownfilter.ts +++ b/src/app/shared/issue-tables/dropdownfilter.ts @@ -27,7 +27,7 @@ export function applyDropdownFilter(filter: Filter, data: Issue[]): Issue[] { } ret = ret && filter.milestones.some((milestone) => issue.milestone.title === milestone); - + ret = ret && issue.labels.every((label) => !filter.deselectedLabels.has(label)); return ret && filter.labels.every((label) => issue.labels.includes(label)); }); return filteredData; diff --git a/tests/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.spec.ts b/tests/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.spec.ts index 9ee9bfd31..d0d85a591 100644 --- a/tests/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.spec.ts +++ b/tests/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.spec.ts @@ -119,23 +119,19 @@ describe('LabelFilterBarComponent', () => { describe('updateSelection', () => { it('should update filters service with selected labels', () => { const selectedLabels = [LABEL_NAME_SEVERITY_HIGH, LABEL_NAME_SEVERITY_LOW]; - component.selectedLabelNames = selectedLabels; + component.selectedLabelNames = new Set(selectedLabels); - component.updateSelection([]); + component.updateSelection(); - expect(filtersServiceSpy.updateFilters).toHaveBeenCalledWith({ labels: selectedLabels }); + expect(filtersServiceSpy.updateFilters).toHaveBeenCalledWith({ labels: selectedLabels, deselectedLabels: new Set() }); }); }); describe('removeAllSelection', () => { it('should deselect all labels and update the filter', () => { - const matSelectionListSpy = jasmine.createSpyObj('MatSelectionList', ['deselectAll']); - component.matSelectionList = matSelectionListSpy; - component.removeAllSelection(); - - expect(matSelectionListSpy.deselectAll).toHaveBeenCalled(); - expect(filtersServiceSpy.updateFilters).toHaveBeenCalledWith({ labels: [] }); + expect(component.selectedLabelNames).toEqual(new Set()); + expect(component.deselectedLabelNames).toEqual(new Set()); }); }); }); From a65bb59578c4157be05f3c38fd712e411e43a155 Mon Sep 17 00:00:00 2001 From: Nguyen <87511888+nknguyenhc@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:04:08 +0800 Subject: [PATCH 6/8] Status filter checkboxes (#310) We implement checkboxes for status, so that multiple types of PRs/issues can be viewed concurrently. --- src/app/core/services/filters.service.ts | 41 ++++++------------- .../filter-bar/filter-bar.component.html | 11 ++--- .../shared/filter-bar/filter-bar.component.ts | 8 +++- .../label-filter-bar.component.ts | 1 + src/app/shared/issue-tables/dropdownfilter.ts | 28 +++++++++---- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/app/core/services/filters.service.ts b/src/app/core/services/filters.service.ts index 583d0ea31..2f3c81bf0 100644 --- a/src/app/core/services/filters.service.ts +++ b/src/app/core/services/filters.service.ts @@ -5,7 +5,7 @@ import { SimpleLabel } from '../models/label.model'; export type Filter = { title: string; - status: string; + status: string[]; type: string; sort: Sort; labels: string[]; @@ -16,7 +16,7 @@ export type Filter = { export const DEFAULT_FILTER: Filter = { title: '', - status: 'all', + status: ['open pullrequest', 'merged pullrequest', 'open issue', 'closed issue'], type: 'all', sort: { active: 'id', direction: 'asc' }, labels: [], @@ -35,21 +35,16 @@ export const DEFAULT_FILTER: Filter = { export class FiltersService { public filter$ = new BehaviorSubject(DEFAULT_FILTER); - private _validateFilter = pipe(this.updateStatusPairing, this.updateTypePairing); - clearFilters(): void { this.filter$.next(DEFAULT_FILTER); } updateFilters(newFilters: Partial): void { - let nextFilter: Filter = { + const nextDropdownFilter: Filter = { ...this.filter$.value, ...newFilters }; - - nextFilter = this._validateFilter(nextFilter); - - this.filter$.next(nextFilter); + this.filter$.next(nextDropdownFilter); } sanitizeLabels(allLabels: SimpleLabel[]) { @@ -62,27 +57,15 @@ export class FiltersService { } } - const newLabels = this.filter$.value.labels.filter((label) => allLabelsSet.has(label)); - - this.updateFilters({ labels: newLabels, hiddenLabels: newHiddenLabels }); - } - /** - * Changes type to a valid, default value when an incompatible combination of type and status is encountered. - */ - updateTypePairing(filter: Filter): Filter { - if (filter.status === 'merged') { - filter.type = 'pullrequest'; + const newDeselectedLabels: Set = new Set(); + for (const deselectedLabel of this.filter$.value.deselectedLabels) { + if (allLabelsSet.has(deselectedLabel)) { + newDeselectedLabels.add(deselectedLabel); + } } - return filter; - } - /** - * Changes status to a valid, default value when an incompatible combination of type and status is encountered. - */ - updateStatusPairing(filter: Filter): Filter { - if (filter.status === 'merged' && filter.type === 'issue') { - filter.status = 'all'; - } - return filter; + const newLabels = this.filter$.value.labels.filter((label) => allLabelsSet.has(label)); + + this.updateFilters({ labels: newLabels, hiddenLabels: newHiddenLabels, deselectedLabels: newDeselectedLabels }); } } diff --git a/src/app/shared/filter-bar/filter-bar.component.html b/src/app/shared/filter-bar/filter-bar.component.html index c968fd97d..8ffe621f9 100644 --- a/src/app/shared/filter-bar/filter-bar.component.html +++ b/src/app/shared/filter-bar/filter-bar.component.html @@ -14,11 +14,12 @@
Status - - All - Open - Closed - Merged + + Open Pull Requests + Merged Pull Requests + Closed Pull Request + Open Issues + Closed Issues diff --git a/src/app/shared/filter-bar/filter-bar.component.ts b/src/app/shared/filter-bar/filter-bar.component.ts index cb5320392..ebc8dbdc7 100644 --- a/src/app/shared/filter-bar/filter-bar.component.ts +++ b/src/app/shared/filter-bar/filter-bar.component.ts @@ -68,8 +68,12 @@ export class FilterBarComponent implements OnInit, OnDestroy { /** * Checks if program is filtering by type issue. */ - isNotFilterIssue() { - return this.filter.type !== 'issue'; + isFilterIssue() { + return this.filter.type === 'issue' || this.filter.type === 'all'; + } + + isFilterPullRequest() { + return this.filter.type === 'pullrequest' || this.filter.type === 'all'; } /** diff --git a/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts b/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts index 38adeec95..bf86435d3 100644 --- a/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts +++ b/src/app/shared/filter-bar/label-filter-bar/label-filter-bar.component.ts @@ -38,6 +38,7 @@ export class LabelFilterBarComponent implements OnInit, AfterViewInit, OnDestroy this.allLabels = labels; this.filtersService.sanitizeLabels(this.allLabels); this.selectedLabelNames = new Set(this.filtersService.filter$.value.labels); + this.deselectedLabelNames = this.filtersService.filter$.value.deselectedLabels; this.hiddenLabelNames = this.filtersService.filter$.value.hiddenLabels; }); }); diff --git a/src/app/shared/issue-tables/dropdownfilter.ts b/src/app/shared/issue-tables/dropdownfilter.ts index e1f122f77..abe9322a2 100644 --- a/src/app/shared/issue-tables/dropdownfilter.ts +++ b/src/app/shared/issue-tables/dropdownfilter.ts @@ -1,6 +1,19 @@ import { Issue } from '../../core/models/issue.model'; import { Filter } from '../../core/services/filters.service'; +type StatusInfo = { + type: string; + status: string; +}; + +/** + * Converts a status string into an info object + */ +const infoFromStatus = (statusString: string): StatusInfo => { + const [status, type] = statusString.split(' '); + return { status, type }; +}; + /** * This module serves to improve separation of concerns in IssuesDataTable.ts and IssueList.ts module by containing the logic for * applying dropdownFilter to the issues data table in this module. @@ -11,14 +24,13 @@ export function applyDropdownFilter(filter: Filter, data: Issue[]): Issue[] { const filteredData: Issue[] = data.filter((issue) => { let ret = true; - if (filter.status === 'open') { - ret = ret && issue.state === 'OPEN'; - } else if (filter.status === 'closed') { - // there is apparently also a status called 'all' based on github api - ret = ret && issue.state === 'CLOSED'; - } else if (filter.status === 'merged') { - ret = ret && issue.state === 'MERGED'; - } + // status can either be 'open', 'closed', or 'merged' + ret = + ret && + filter.status.some((item) => { + const statusInfo = infoFromStatus(item); + return statusInfo.status === issue.state.toLowerCase() && statusInfo.type === issue.issueOrPr.toLowerCase(); + }); if (filter.type === 'issue') { ret = ret && issue.issueOrPr === 'Issue'; From 43ea689bd406857d7dae518ab089bf4d3029b564 Mon Sep 17 00:00:00 2001 From: AdityaMisra <114080910+MadLamprey@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:11:27 +0800 Subject: [PATCH 7/8] Create tests for Error Handling service (#304) Co-authored-by: Misra Aditya --- tests/constants/error.constants.ts | 24 ++++++ tests/services/error-handling.service.spec.ts | 77 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 tests/constants/error.constants.ts create mode 100644 tests/services/error-handling.service.spec.ts diff --git a/tests/constants/error.constants.ts b/tests/constants/error.constants.ts new file mode 100644 index 000000000..0a2ca5a4f --- /dev/null +++ b/tests/constants/error.constants.ts @@ -0,0 +1,24 @@ +import { HttpErrorResponse } from '@angular/common/http'; +import { RequestError } from '@octokit/request-error'; + +export const STANDARD_ERROR = new Error('This is a normal error'); + +export const ERROR_WITH_NO_MESSAGE = new Error(); + +export const HTTP_304_ERROR = new HttpErrorResponse({ status: 304 }); + +export const HTTP_422_ERROR = new HttpErrorResponse({ status: 422 }); + +export const HTTP_500_ERROR = new HttpErrorResponse({ status: 500 }); + +export const HTTP_400_ERROR = new HttpErrorResponse({ status: 400 }); + +export const HTTP_401_ERROR = new HttpErrorResponse({ status: 401 }); + +export const HTTP_404_ERROR = new HttpErrorResponse({ status: 404 }); + +export const HTTP_UNKNOWN_ERROR = new HttpErrorResponse({ status: 999 }); + +export const OCTOKIT_REQUEST_ERROR = new RequestError('This is an octokit request error', 400, { + request: { method: 'GET', url: '', headers: {} } +}); diff --git a/tests/services/error-handling.service.spec.ts b/tests/services/error-handling.service.spec.ts new file mode 100644 index 000000000..2eddf7717 --- /dev/null +++ b/tests/services/error-handling.service.spec.ts @@ -0,0 +1,77 @@ +import { ErrorHandlingService } from '../../src/app/core/services/error-handling.service'; +import { FormErrorComponent } from '../../src/app/shared/error-toasters/form-error/form-error.component'; +import { GeneralMessageErrorComponent } from '../../src/app/shared/error-toasters/general-message-error/general-message-error.component'; +import { + ERROR_WITH_NO_MESSAGE, + HTTP_304_ERROR, + HTTP_400_ERROR, + HTTP_401_ERROR, + HTTP_404_ERROR, + HTTP_422_ERROR, + HTTP_500_ERROR, + HTTP_UNKNOWN_ERROR, + OCTOKIT_REQUEST_ERROR, + STANDARD_ERROR +} from '../constants/error.constants'; + +let errorHandlingService: ErrorHandlingService; +let mockLoggingService; +let mockSnackBar; + +describe('ErrorHandlingService', () => { + beforeEach(() => { + mockLoggingService = jasmine.createSpyObj('LoggingService', ['error', 'debug']); + mockSnackBar = jasmine.createSpyObj('MatSnackBar', ['openFromComponent']); + errorHandlingService = new ErrorHandlingService(mockSnackBar, mockLoggingService); + }); + + describe('ErrorHandlingService: handleError()', () => { + it('should log errors when handling errors', () => { + errorHandlingService.handleError(STANDARD_ERROR); + expect(mockLoggingService.error).toHaveBeenCalledWith(STANDARD_ERROR); + }); + + it('should use the GeneralMessageErrorComponent when handling Errors', () => { + errorHandlingService.handleError(STANDARD_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { + data: { message: STANDARD_ERROR.message } + }); + }); + + it('should stringify Errors if there is no message before displaying', () => { + errorHandlingService.handleError(ERROR_WITH_NO_MESSAGE); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { + data: { message: JSON.stringify(ERROR_WITH_NO_MESSAGE) } + }); + }); + + it('should not open the snackbar when handling http status 304 errors', () => { + errorHandlingService.handleError(HTTP_304_ERROR); + expect(mockSnackBar.openFromComponent).not.toHaveBeenCalled(); + }); + + it('should use the FormErrorComponent when handling http status 422 errors', () => { + errorHandlingService.handleError(HTTP_422_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(FormErrorComponent, { data: HTTP_422_ERROR }); + }); + + it('should use the GeneralMessageErrorComponent when handling other http errors', () => { + errorHandlingService.handleError(HTTP_500_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { data: HTTP_500_ERROR }); + errorHandlingService.handleError(HTTP_400_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { data: HTTP_400_ERROR }); + errorHandlingService.handleError(HTTP_401_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { data: HTTP_401_ERROR }); + errorHandlingService.handleError(HTTP_404_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { data: HTTP_404_ERROR }); + errorHandlingService.handleError(HTTP_UNKNOWN_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { data: HTTP_UNKNOWN_ERROR }); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledTimes(5); + }); + + it('should treat octokit request errors as http errors', () => { + errorHandlingService.handleError(OCTOKIT_REQUEST_ERROR); + expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(GeneralMessageErrorComponent, { data: OCTOKIT_REQUEST_ERROR }); + }); + }); +}); From 1fa6138cd5d66d33203fcab810011e9eaefab9c9 Mon Sep 17 00:00:00 2001 From: AdityaMisra <114080910+MadLamprey@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:11:42 +0800 Subject: [PATCH 8/8] Create tests for Milestone service (#303) Co-authored-by: Misra Aditya --- tests/services/milestone.service.spec.ts | 55 ++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 tests/services/milestone.service.spec.ts diff --git a/tests/services/milestone.service.spec.ts b/tests/services/milestone.service.spec.ts new file mode 100644 index 000000000..2fc1d9b0b --- /dev/null +++ b/tests/services/milestone.service.spec.ts @@ -0,0 +1,55 @@ +import { of } from 'rxjs'; +import { Milestone } from '../../src/app/core/models/milestone.model'; +import { GithubService } from '../../src/app/core/services/github.service'; +import { MilestoneService } from '../../src/app/core/services/milestone.service'; + +let milestoneService: MilestoneService; +let githubServiceSpy: jasmine.SpyObj; + +describe('MilestoneService', () => { + beforeEach(() => { + githubServiceSpy = jasmine.createSpyObj('GithubService', ['fetchAllMilestones']); + milestoneService = new MilestoneService(githubServiceSpy); + }); + + describe('MilestoneService: fetchMilestones()', () => { + it('should fetch all milestones', (done) => { + const mockMilestones = [{ title: 'Milestone 1' }, { title: 'Milestone 2' }]; + githubServiceSpy.fetchAllMilestones.and.returnValue(of(mockMilestones)); + milestoneService.fetchMilestones().subscribe((response) => { + expect(githubServiceSpy.fetchAllMilestones).toHaveBeenCalled(); + expect(milestoneService.milestones.length).toBe(3); + expect(milestoneService.milestones[0].title).toBe('Milestone 1'); + expect(milestoneService.hasNoMilestones).toBeFalse(); + + done(); + }); + }); + + it('should handle no milestones', (done) => { + githubServiceSpy.fetchAllMilestones.and.returnValue(of([])); + milestoneService.fetchMilestones().subscribe((response) => { + expect(githubServiceSpy.fetchAllMilestones).toHaveBeenCalled(); + expect(milestoneService.milestones.length).toBe(1); + expect(milestoneService.hasNoMilestones).toBeTrue(); + + done(); + }); + }); + }); + + describe('MilestoneService: parseMilestoneData()', () => { + it('should parse milestone data correctly', () => { + const mockMilestones = [{ title: 'Milestone 2' }, { title: 'Milestone 1' }]; + const parsedMilestones = milestoneService.parseMilestoneData(mockMilestones); + + for (const milestone of parsedMilestones) { + expect(milestone).toBeInstanceOf(Milestone); + } + + expect(parsedMilestones.length).toBe(3); + expect(parsedMilestones[0].title).toBe('Milestone 1'); + expect(parsedMilestones[parsedMilestones.length - 1]).toBe(Milestone.DefaultMilestone); + }); + }); +});