Merge branch 'master' into default-main

CATcher-org · Feb 3, 2024 · 0cd1148 · 0cd1148
2 parents b60a182 + d4b5422
commit 0cd1148
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 15 deletions.
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -12,7 +12,8 @@ const routes: Routes = [
   { path: 'phaseBugReporting', loadChildren: () => PhaseBugReportingModule, canLoad: [AuthGuard] },
   { path: 'phaseTeamResponse', loadChildren: () => PhaseTeamResponseModule, canLoad: [AuthGuard] },
   { path: 'phaseTesterResponse', loadChildren: () => PhaseTesterResponseModule, canLoad: [AuthGuard] },
-  { path: 'phaseModeration', loadChildren: () => PhaseModerationModule, canLoad: [AuthGuard] }
+  { path: 'phaseModeration', loadChildren: () => PhaseModerationModule, canLoad: [AuthGuard] },
+  { path: '**', redirectTo: '' }
 ];
 
 @NgModule({

diff --git a/src/app/core/directives/internal-link-disable.directive.ts b/src/app/core/directives/internal-link-disable.directive.ts
@@ -0,0 +1,32 @@
+import { Directive, HostListener } from '@angular/core';
+import { ErrorHandlingService } from '../services/error-handling.service';
+
+class InvalidLinkError extends Error {
+  constructor() {
+    super('Invalid link!');
+    Object.setPrototypeOf(this, InvalidLinkError.prototype);
+  }
+}
+
+@Directive({
+  selector: '[disableInternalLink]'
+})
+export class InternalLinkDisableDirective {
+  constructor(private errorHandlingService: ErrorHandlingService) {}
+
+  @HostListener('click', ['$event'])
+  public onClick(e: MouseEvent): void {
+    const srcElement = e.target;
+
+    if (srcElement instanceof HTMLAnchorElement) {
+      const baseURI = srcElement.baseURI;
+      const href = srcElement.href;
+
+      if (href.startsWith(baseURI)) {
+        this.errorHandlingService.handleError(new InvalidLinkError());
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    }
+  }
+}
diff --git a/src/app/core/validators/noWhitespace.validator.ts b/src/app/core/validators/noWhitespace.validator.ts
@@ -0,0 +1,10 @@
+import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+
+export function noWhitespace(): ValidatorFn {
+  return (title: AbstractControl): ValidationErrors | null => {
+    if (title.value && title.value.trim() === '') {
+      return { whitespace: true };
+    }
+    return null;
+  };
+}
diff --git a/src/app/phase-bug-reporting/new-issue/new-issue.component.html b/src/app/phase-bug-reporting/new-issue/new-issue.component.html
@@ -7,6 +7,7 @@ <h1 class="mat-display-1 title">New Issue</h1>
         <mat-form-field>
           <input id="title" formControlName="title" matInput placeholder="Title" required maxlength="256" />
           <mat-error *ngIf="title.errors && title.errors['required'] && (title.touched || title.dirty)"> Title required. </mat-error>
+          <mat-error *ngIf="title.errors && title.errors['whitespace']"> Title cannot contain only whitespaces. </mat-error>
           <mat-error *ngIf="title.errors && title.errors['maxlength']"> Title cannot exceed 256 characters. </mat-error>
           <mat-hint *ngIf="title.value?.length >= 206"> {{ 256 - title.value?.length }} characters remaining. </mat-hint>
         </mat-form-field>

diff --git a/src/app/phase-bug-reporting/new-issue/new-issue.component.ts b/src/app/phase-bug-reporting/new-issue/new-issue.component.ts
@@ -6,6 +6,7 @@ import { Issue } from '../../core/models/issue.model';
 import { ErrorHandlingService } from '../../core/services/error-handling.service';
 import { IssueService } from '../../core/services/issue.service';
 import { LabelService } from '../../core/services/label.service';
+import { noWhitespace } from '../../core/validators/noWhitespace.validator';
 import { SUBMIT_BUTTON_TEXT } from '../../shared/view-issue/view-issue.component';
 
 @Component({
@@ -28,7 +29,7 @@ export class NewIssueComponent implements OnInit {
 
   ngOnInit() {
     this.newIssueForm = this.formBuilder.group({
-      title: ['', [Validators.required, Validators.maxLength(256)]],
+      title: ['', [Validators.required, Validators.maxLength(256), noWhitespace()]],
       description: [''],
       severity: ['', Validators.required],
       type: ['', Validators.required]
@@ -41,6 +42,7 @@ export class NewIssueComponent implements OnInit {
     if (this.newIssueForm.invalid) {
       return;
     }
+
     this.isFormPending = true;
     this.issueService
       .createIssue(this.title.value, Issue.updateDescription(this.description.value), this.severity.value, this.type.value)

diff --git a/src/app/shared/comment-editor/comment-editor.component.html b/src/app/shared/comment-editor/comment-editor.component.html
@@ -57,7 +57,7 @@
     </mat-tab>
     <mat-tab label="Preview">
       <div class="tab-content" style="min-height: 228px">
-        <markdown #markdownArea *ngIf="commentField.value !== ''" [data]="sanitize(commentField.value)"></markdown>
+        <markdown #markdownArea *ngIf="commentField.value !== ''" [data]="sanitize(commentField.value)" disableInternalLink></markdown>
         <div *ngIf="commentField.value === ''">Nothing to preview.</div>
       </div>
     </mat-tab>

diff --git a/src/app/shared/issue/description/description.component.html b/src/app/shared/issue/description/description.component.html
@@ -8,7 +8,7 @@ <h3 class="mat-title">{{ descriptionTitle }}</h3>
       </button>
     </div>
     <div *ngIf="!isEditing" class="comment">
-      <markdown [data]="issue.description"></markdown>
+      <markdown [data]="issue.description" disableInternalLink></markdown>
     </div>
     <div *ngIf="isEditing">
       <app-comment-editor

diff --git a/src/app/shared/issue/duplicatedIssues/duplicated-issues.component.html b/src/app/shared/issue/duplicatedIssues/duplicated-issues.component.html
@@ -8,7 +8,7 @@
       matTooltipPosition="above"
       (removed)="removeDuplicateStatus(duplicatedIssue)"
     >
-      <a class="no-underline link-grey-dark" [routerLink]="['./' + duplicatedIssue.id]"> #{{ duplicatedIssue.id }} </a>
+      <a class="no-underline link-grey-dark" [routerLink]="['../' + duplicatedIssue.id]"> #{{ duplicatedIssue.id }} </a>
       <mat-icon *ngIf="permissions.isTeamResponseEditable() || permissions.isTutorResponseEditable()" matChipRemove>cancel</mat-icon>
     </mat-chip>
   </mat-chip-list>

diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
@@ -4,15 +4,17 @@ import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { FormDisableControlDirective } from '../core/directives/form-disable-control.directive';
+import { InternalLinkDisableDirective } from '../core/directives/internal-link-disable.directive';
 import { ActionToasterModule } from './action-toasters/action-toasters.module';
 import { ErrorToasterModule } from './error-toasters/error-toaster.module';
 import { MaterialModule } from './material.module';
 
 @NgModule({
   imports: [CommonModule, FormsModule, ReactiveFormsModule, HttpClientModule, RouterModule, MaterialModule, ErrorToasterModule],
-  declarations: [FormDisableControlDirective],
+  declarations: [FormDisableControlDirective, InternalLinkDisableDirective],
   exports: [
     FormDisableControlDirective,
+    InternalLinkDisableDirective,
     CommonModule,
     FormsModule,
     ReactiveFormsModule,

diff --git a/src/app/shared/view-issue/issue-dispute/issue-dispute.component.html b/src/app/shared/view-issue/issue-dispute/issue-dispute.component.html
@@ -9,10 +9,10 @@ <h3 class="mat-title">Disputes</h3>
       <div class="container" *ngFor="let dispute of issue.issueDisputes; index as i; trackBy: trackDisputeList">
         <div style="display: flex; align-items: center">
           <div class="question-mark">?</div>
-          <markdown [data]="this.getItemTitleText(dispute.title)"></markdown>
+          <markdown [data]="this.getItemTitleText(dispute.title)" disableInternalLink></markdown>
         </div>
         <br />
-        <markdown [data]="dispute.description"></markdown>
+        <markdown [data]="dispute.description" disableInternalLink></markdown>
         <br />
         <div>
           <mat-checkbox
@@ -27,7 +27,7 @@ <h3 class="mat-title">Disputes</h3>
         <br />
         <div>
           <markdown data="### Tutor's Response: "></markdown>
-          <markdown [data]="dispute.tutorResponse" *ngIf="!isEditing"></markdown>
+          <markdown [data]="dispute.tutorResponse" *ngIf="!isEditing" disableInternalLink></markdown>
         </div>
         <div *ngIf="isEditing">
           <app-comment-editor

diff --git a/src/app/shared/view-issue/team-response/team-response.component.html b/src/app/shared/view-issue/team-response/team-response.component.html
@@ -6,7 +6,7 @@ <h3 class="mat-title">Team's Response</h3>
       <button style="float: right" mat-button *ngIf="canEditIssue() && !isEditing" (click)="changeToEditMode()">Edit</button>
     </div>
     <div *ngIf="!isEditing" class="comment">
-      <markdown [data]="issue.teamResponse"></markdown>
+      <markdown [data]="issue.teamResponse" disableInternalLink></markdown>
     </div>
     <div *ngIf="isEditing">
       <app-comment-editor

diff --git a/src/app/shared/view-issue/tester-response/conflict-dialog/conflict-dialog.component.html b/src/app/shared/view-issue/tester-response/conflict-dialog/conflict-dialog.component.html
@@ -14,7 +14,7 @@ <h1 mat-dialog-title style="margin: 0">{{ 'The content you are editing has chang
       <mat-expansion-panel-header>
         <mat-panel-title class="response-title">
           <div class="question-mark">?</div>
-          <markdown [data]="data.updatedResponses[i].getTitleInMarkDown()"></markdown>
+          <markdown [data]="data.updatedResponses[i].getTitleInMarkDown()" disableInternalLink></markdown>
         </mat-panel-title>
         <mat-panel-description>
           <mat-chip-list>
@@ -25,7 +25,7 @@ <h1 mat-dialog-title style="margin: 0">{{ 'The content you are editing has chang
         </mat-panel-description>
       </mat-expansion-panel-header>
       <br />
-      <markdown [data]="data.updatedResponses[i].description"></markdown>
+      <markdown [data]="data.updatedResponses[i].description" disableInternalLink></markdown>
       <br />
       <div
         *ngIf="data.updatedResponses[i].isDisagree() === data.outdatedResponses[i].isDisagree() || !showDiff"

diff --git a/src/app/shared/view-issue/tester-response/tester-response.component.html b/src/app/shared/view-issue/tester-response/tester-response.component.html
@@ -10,10 +10,10 @@ <h3 class="mat-title">Tester's Response</h3>
       <div class="container" *ngFor="let response of issue.testerResponses; index as i; trackBy: trackDisagreeList">
         <div style="display: flex; align-items: center">
           <div class="question-mark">?</div>
-          <markdown [data]="response.getTitleInMarkDown()"></markdown>
+          <markdown [data]="response.getTitleInMarkDown()" disableInternalLink></markdown>
         </div>
         <br />
-        <markdown [data]="response.description"></markdown>
+        <markdown [data]="response.description" disableInternalLink></markdown>
         <br />
         <div>
           <mat-radio-group
@@ -31,7 +31,7 @@ <h3 class="mat-title">Tester's Response</h3>
         <div *ngIf="testerResponseForm.get(getDisagreeRadioFormId(i)).value">
           <div>
             <p style="font-weight: 500">Reason for Disagreement:</p>
-            <markdown [data]="response.reasonForDisagreement" *ngIf="!isEditing"></markdown>
+            <markdown [data]="response.reasonForDisagreement" *ngIf="!isEditing" disableInternalLink></markdown>
           </div>
           <div *ngIf="isEditing">
             <app-comment-editor