From 8b25ef17c8aedc28fe4227d76c89e71c76027c5d Mon Sep 17 00:00:00 2001
From: Respirayson <raysonyeap4c@gmail.com>
Date: Sat, 20 Jul 2024 02:08:42 +0800
Subject: [PATCH 1/5] Add logic to prepend Copy of when copying to same course
 id

---
 .../copy-session-modal.component.spec.ts.snap     |  2 ++
 .../copy-session-modal.component.ts               | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
index c1f6c2edfbc..d20cc648230 100644
--- a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
+++ b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
@@ -7,6 +7,7 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
   copyToCourseSet={[Function Set]}
   courseCandidates={[Function Array]}
   newFeedbackSessionName=""
+  originalSessionName=""
   sessionToCopyCourseId=""
 >
   <div
@@ -97,6 +98,7 @@ exports[`CopySessionModalComponent should snap with some session and courses can
   copyToCourseSet={[Function Set]}
   courseCandidates={[Function Array]}
   newFeedbackSessionName={[Function String]}
+  originalSessionName=""
   sessionToCopyCourseId={[Function String]}
 >
   <div
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
index d2a0a8beca1..652dacc8869 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Course } from '../../../types/api-output';
 import { FEEDBACK_SESSION_NAME_MAX_LENGTH } from '../../../types/field-validator';
@@ -11,7 +11,7 @@ import { FEEDBACK_SESSION_NAME_MAX_LENGTH } from '../../../types/field-validator
   templateUrl: './copy-session-modal.component.html',
   styleUrls: ['./copy-session-modal.component.scss'],
 })
-export class CopySessionModalComponent {
+export class CopySessionModalComponent implements OnInit {
 
   // const
   FEEDBACK_SESSION_NAME_MAX_LENGTH: number = FEEDBACK_SESSION_NAME_MAX_LENGTH;
@@ -24,9 +24,14 @@ export class CopySessionModalComponent {
 
   newFeedbackSessionName: string = '';
   copyToCourseSet: Set<string> = new Set<string>();
+  originalSessionName: string = '';
 
   constructor(public activeModal: NgbActiveModal) {}
 
+  ngOnInit(): void {
+    this.originalSessionName = this.newFeedbackSessionName;
+  }
+
   /**
    * Fires the copy event.
    */
@@ -44,8 +49,14 @@ export class CopySessionModalComponent {
   select(courseId: string): void {
     if (this.copyToCourseSet.has(courseId)) {
       this.copyToCourseSet.delete(courseId);
+      if (courseId === this.sessionToCopyCourseId) {
+        this.newFeedbackSessionName = this.originalSessionName;
+      }
     } else {
       this.copyToCourseSet.add(courseId);
+      if (courseId === this.sessionToCopyCourseId) {
+        this.newFeedbackSessionName = `Copy of ${this.originalSessionName}`;
+      }
     }
   }
 }

From c21e4345e9e9edeb53a5cdcd72cba2852c07eb22 Mon Sep 17 00:00:00 2001
From: Respirayson <raysonyeap4c@gmail.com>
Date: Sat, 20 Jul 2024 02:08:59 +0800
Subject: [PATCH 2/5] Add unit tests

---
 .../copy-session-modal.component.spec.ts      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts b/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts
index 55ff79cf730..00fb3c33d76 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts
@@ -146,4 +146,34 @@ describe('CopySessionModalComponent', () => {
     expect(component.copyToCourseSet.has(courseId)).toBe(false);
   });
 
+  it('should update session name to "Copy of ..." when the same course is selected', () => {
+    component.newFeedbackSessionName = feedbackSessionToCopy.feedbackSessionName;
+    component.originalSessionName = feedbackSessionToCopy.feedbackSessionName;
+    component.sessionToCopyCourseId = courseSessionIn.courseId;
+    component.courseCandidates = [courseSessionIn, courseCopyTo];
+    fixture.detectChanges();
+
+    const options: DebugElement[] = fixture.debugElement.queryAll(By.css('input[type="checkbox"]'));
+    const firstOption: any = options[0];
+    firstOption.triggerEventHandler('click', { target: firstOption.nativeElement });
+    fixture.detectChanges();
+
+    expect(component.newFeedbackSessionName).toBe(`Copy of ${feedbackSessionToCopy.feedbackSessionName}`);
+  });
+
+  it('should restore the original session name when the same course is deselected', () => {
+    component.newFeedbackSessionName = `Copy of ${feedbackSessionToCopy.feedbackSessionName}`;
+    component.originalSessionName = feedbackSessionToCopy.feedbackSessionName;
+    component.sessionToCopyCourseId = courseSessionIn.courseId;
+    component.courseCandidates = [courseSessionIn, courseCopyTo];
+    component.copyToCourseSet.add(courseSessionIn.courseId);
+    fixture.detectChanges();
+
+    const options: DebugElement[] = fixture.debugElement.queryAll(By.css('input[type="checkbox"]'));
+    const firstOption: any = options[0];
+    firstOption.triggerEventHandler('click', { target: firstOption.nativeElement });
+    fixture.detectChanges();
+
+    expect(component.newFeedbackSessionName).toBe(feedbackSessionToCopy.feedbackSessionName);
+  });
 });

From aa8906e5e2743035eda7bcbb5b69340065fa9c20 Mon Sep 17 00:00:00 2001
From: Respirayson <raysonyeap4c@gmail.com>
Date: Sat, 20 Jul 2024 03:17:14 +0800
Subject: [PATCH 3/5] Add check so it doesnt override changed names

---
 .../copy-session-modal/copy-session-modal.component.ts     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
index 652dacc8869..3a3dacc218c 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
@@ -49,12 +49,13 @@ export class CopySessionModalComponent implements OnInit {
   select(courseId: string): void {
     if (this.copyToCourseSet.has(courseId)) {
       this.copyToCourseSet.delete(courseId);
-      if (courseId === this.sessionToCopyCourseId) {
-        this.newFeedbackSessionName = this.originalSessionName;
+      if (courseId === this.sessionToCopyCourseId
+        && this.newFeedbackSessionName === `Copy of ${this.originalSessionName}`) {
+          this.newFeedbackSessionName = this.originalSessionName;
       }
     } else {
       this.copyToCourseSet.add(courseId);
-      if (courseId === this.sessionToCopyCourseId) {
+      if (courseId === this.sessionToCopyCourseId && this.newFeedbackSessionName === this.originalSessionName) {
         this.newFeedbackSessionName = `Copy of ${this.originalSessionName}`;
       }
     }

From 3882c41405cbb50bb1eccbfe30ab03964d79fdb5 Mon Sep 17 00:00:00 2001
From: Respirayson <raysonyeap4c@gmail.com>
Date: Sat, 3 Aug 2024 14:27:03 +0800
Subject: [PATCH 4/5] Replace copy of functionality with alert

---
 .../copy-session-modal.component.html         |  7 +++++--
 .../copy-session-modal.component.ts           | 21 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.html b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
index 79ac691daef..9600c3420f6 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.html
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
@@ -11,13 +11,16 @@ <h5 class="modal-title">
       <div class="form-group">
         <label><b>Name for copied session*</b></label>
         <input id="copy-session-name" type="text" class="form-control" [(ngModel)]="newFeedbackSessionName" [maxlength]="FEEDBACK_SESSION_NAME_MAX_LENGTH"
-               required #newSessionName="ngModel">
+               required #newSessionName="ngModel" (input)="checkNameCollision()">
         <div [hidden]="newSessionName.valid || (newSessionName.pristine && newSessionName.untouched)" class="invalid-field">
             <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
             The field "Name for copied session" should not be empty.
         </div>
         <span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
       </div>
+      <div *ngIf="isNameCollision" class="alert alert-danger">
+        The new session name and course match the original session. Please change the session name to avoid duplication.
+      </div>
       <div class="form-check" *ngFor="let course of courseCandidates">
         <label class="form-check-label text-break">
           <input type="checkbox" name="copySessionChooseCourse" class="form-check-input"
@@ -35,5 +38,5 @@ <h5 class="modal-title">
 <div class="modal-footer">
   <button type="button" class="btn btn-light" (click)="activeModal.dismiss()">Cancel</button>
   <button id="btn-confirm-copy-course" type="button" class="btn btn-primary" (click)="copy()"
-          [disabled]="!newFeedbackSessionName || copyToCourseSet.size < 1">Copy</button>
+          [disabled]="!newFeedbackSessionName || copyToCourseSet.size < 1 || isNameCollision">Copy</button>
 </div>
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
index 3a3dacc218c..c667d3567a8 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
@@ -25,17 +25,22 @@ export class CopySessionModalComponent implements OnInit {
   newFeedbackSessionName: string = '';
   copyToCourseSet: Set<string> = new Set<string>();
   originalSessionName: string = '';
+  isNameCollision: boolean = false;
 
   constructor(public activeModal: NgbActiveModal) {}
 
   ngOnInit(): void {
     this.originalSessionName = this.newFeedbackSessionName;
+    this.checkNameCollision();
   }
 
   /**
    * Fires the copy event.
    */
   copy(): void {
+    if (this.isNameCollision) {
+      return;
+    }
     this.activeModal.close({
       newFeedbackSessionName: this.newFeedbackSessionName,
       sessionToCopyCourseId: this.sessionToCopyCourseId,
@@ -49,15 +54,17 @@ export class CopySessionModalComponent implements OnInit {
   select(courseId: string): void {
     if (this.copyToCourseSet.has(courseId)) {
       this.copyToCourseSet.delete(courseId);
-      if (courseId === this.sessionToCopyCourseId
-        && this.newFeedbackSessionName === `Copy of ${this.originalSessionName}`) {
-          this.newFeedbackSessionName = this.originalSessionName;
-      }
     } else {
       this.copyToCourseSet.add(courseId);
-      if (courseId === this.sessionToCopyCourseId && this.newFeedbackSessionName === this.originalSessionName) {
-        this.newFeedbackSessionName = `Copy of ${this.originalSessionName}`;
-      }
     }
+    this.checkNameCollision();
+  }
+
+  /**
+   * Checks for name collision.
+   */
+  checkNameCollision(): void {
+    this.isNameCollision = this.newFeedbackSessionName === this.originalSessionName 
+      && this.copyToCourseSet.has(this.sessionToCopyCourseId);
   }
 }

From 6778fa8ec2a91f2a7a972c2262c281e1ac4703af Mon Sep 17 00:00:00 2001
From: Respirayson <raysonyeap4c@gmail.com>
Date: Sat, 3 Aug 2024 14:47:57 +0800
Subject: [PATCH 5/5] Update snapshots and fix linting

---
 .../copy-session-modal.component.spec.ts.snap |  2 +
 .../copy-session-modal.component.spec.ts      | 74 +++++++++++++------
 .../copy-session-modal.component.ts           |  2 +-
 3 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
index d20cc648230..e3ebdc37d75 100644
--- a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
+++ b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
@@ -6,6 +6,7 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
   activeModal={[Function NgbActiveModal]}
   copyToCourseSet={[Function Set]}
   courseCandidates={[Function Array]}
+  isNameCollision="false"
   newFeedbackSessionName=""
   originalSessionName=""
   sessionToCopyCourseId=""
@@ -97,6 +98,7 @@ exports[`CopySessionModalComponent should snap with some session and courses can
   activeModal={[Function NgbActiveModal]}
   copyToCourseSet={[Function Set]}
   courseCandidates={[Function Array]}
+  isNameCollision="false"
   newFeedbackSessionName={[Function String]}
   originalSessionName=""
   sessionToCopyCourseId={[Function String]}
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts b/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts
index 00fb3c33d76..2ac335674d1 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.spec.ts
@@ -146,34 +146,66 @@ describe('CopySessionModalComponent', () => {
     expect(component.copyToCourseSet.has(courseId)).toBe(false);
   });
 
-  it('should update session name to "Copy of ..." when the same course is selected', () => {
-    component.newFeedbackSessionName = feedbackSessionToCopy.feedbackSessionName;
-    component.originalSessionName = feedbackSessionToCopy.feedbackSessionName;
-    component.sessionToCopyCourseId = courseSessionIn.courseId;
-    component.courseCandidates = [courseSessionIn, courseCopyTo];
-    fixture.detectChanges();
+  it('should detect name collision correctly', () => {
+    component.newFeedbackSessionName = 'Test Feedback Session';
+    component.originalSessionName = 'Test Feedback Session';
+    component.sessionToCopyCourseId = 'TestCourseID';
+    component.select('TestCourseID');
+    expect(component.isNameCollision).toBe(true);
+  });
 
-    const options: DebugElement[] = fixture.debugElement.queryAll(By.css('input[type="checkbox"]'));
-    const firstOption: any = options[0];
-    firstOption.triggerEventHandler('click', { target: firstOption.nativeElement });
-    fixture.detectChanges();
+  it('should not detect name collision when new name is different', () => {
+    component.newFeedbackSessionName = 'New Feedback Session';
+    component.originalSessionName = 'Test Feedback Session';
+    component.sessionToCopyCourseId = 'TestCourseID';
+    component.select('TestCourseID');
+    expect(component.isNameCollision).toBe(false);
+  });
 
-    expect(component.newFeedbackSessionName).toBe(`Copy of ${feedbackSessionToCopy.feedbackSessionName}`);
+  it('should not detect name collision when selected course is different', () => {
+    component.newFeedbackSessionName = 'Test Feedback Session';
+    component.originalSessionName = 'Test Feedback Session';
+    component.sessionToCopyCourseId = 'TestCourseID';
+    component.select('DifferentCourseID');
+    expect(component.isNameCollision).toBe(false);
   });
 
-  it('should restore the original session name when the same course is deselected', () => {
-    component.newFeedbackSessionName = `Copy of ${feedbackSessionToCopy.feedbackSessionName}`;
-    component.originalSessionName = feedbackSessionToCopy.feedbackSessionName;
-    component.sessionToCopyCourseId = courseSessionIn.courseId;
-    component.courseCandidates = [courseSessionIn, courseCopyTo];
-    component.copyToCourseSet.add(courseSessionIn.courseId);
+  it('should detect name collision when name matches original session and courseId is selected', () => {
+    component.newFeedbackSessionName = 'Test session';
+    component.originalSessionName = 'Test session';
+    component.sessionToCopyCourseId = 'Test01';
+    component.select('Test01');
     fixture.detectChanges();
+    expect(component.isNameCollision).toBe(true);
+  });
 
-    const options: DebugElement[] = fixture.debugElement.queryAll(By.css('input[type="checkbox"]'));
-    const firstOption: any = options[0];
-    firstOption.triggerEventHandler('click', { target: firstOption.nativeElement });
+  it('should not detect name collision when name matches original session but courseId is not selected', () => {
+    component.newFeedbackSessionName = 'Test session';
+    component.originalSessionName = 'Test session';
+    component.sessionToCopyCourseId = 'Test01';
+    component.select('Test02');
     fixture.detectChanges();
+    expect(component.isNameCollision).toBe(false);
+  });
 
-    expect(component.newFeedbackSessionName).toBe(feedbackSessionToCopy.feedbackSessionName);
+  it('should update name collision status on input change', () => {
+    component.newFeedbackSessionName = 'Test session';
+    component.originalSessionName = 'Test session';
+    component.sessionToCopyCourseId = 'Test01';
+    component.select('Test01');
+    component.newFeedbackSessionName = 'New session name';
+    component.checkNameCollision();
+    fixture.detectChanges();
+    expect(component.isNameCollision).toBe(false);
+  });
+
+  it('should update name collision status on course selection change', () => {
+    component.newFeedbackSessionName = 'Test session';
+    component.originalSessionName = 'Test session';
+    component.sessionToCopyCourseId = 'Test01';
+    component.select('Test01');
+    component.select('Test01');
+    fixture.detectChanges();
+    expect(component.isNameCollision).toBe(false);
   });
 });
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
index c667d3567a8..fa22c2ca7ab 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.ts
@@ -64,7 +64,7 @@ export class CopySessionModalComponent implements OnInit {
    * Checks for name collision.
    */
   checkNameCollision(): void {
-    this.isNameCollision = this.newFeedbackSessionName === this.originalSessionName 
+    this.isNameCollision = this.newFeedbackSessionName === this.originalSessionName
       && this.copyToCourseSet.has(this.sessionToCopyCourseId);
   }
 }