From 406ebb3b66ba66c2e4a34aa92cc091f67fd84ac5 Mon Sep 17 00:00:00 2001
From: Josephineeeee <weiyu.yan@vanderbilt.edu>
Date: Sun, 21 Apr 2024 16:00:15 -0500
Subject: [PATCH 1/4] no whitespace alone

---
 .../copy-session-modal.component.html                |  2 +-
 .../copy-session-modal.component.ts                  | 12 ++++++++++++
 .../copy-session-modal/whitespace-validator.ts       | 10 ++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 src/web/app/components/copy-session-modal/whitespace-validator.ts

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..817f558e505 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
@@ -12,7 +12,7 @@ <h5 class="modal-title">
         <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">
-        <div [hidden]="newSessionName.valid || (newSessionName.pristine && newSessionName.untouched)" class="invalid-field">
+        <div [hidden]="(newSessionName.valid && noWhitespace(newSessionName.value)) || (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>
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..54283b5fc73 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
@@ -27,6 +27,10 @@ export class CopySessionModalComponent {
 
   constructor(public activeModal: NgbActiveModal) {}
 
+  form = new FormGroup({  
+    newFeedbackSessionName: new FormControl('', [Validators.required, WhitespaceValidator.cannotContainWhitespace]),  
+  });  
+
   /**
    * Fires the copy event.
    */
@@ -48,4 +52,12 @@ export class CopySessionModalComponent {
       this.copyToCourseSet.add(courseId);
     }
   }
+  /**
+   * Checks whether the Feedback Session name entered by user is whitespace or not
+   * @param newFeedbackSessionName a string variable
+   * @returns boolean
+   */
+  noWhitespace(newFeedbackSessionName: string): boolean {
+    return (!(newFeedbackSessionName.trim().length === 0 && newFeedbackSessionName !== ''));
+  }
 }
diff --git a/src/web/app/components/copy-session-modal/whitespace-validator.ts b/src/web/app/components/copy-session-modal/whitespace-validator.ts
new file mode 100644
index 00000000000..ffe1798e68d
--- /dev/null
+++ b/src/web/app/components/copy-session-modal/whitespace-validator.ts
@@ -0,0 +1,10 @@
+import { AbstractControl, ValidationErrors } from '@angular/forms';
+
+export class WhitespaceValidator {
+  static cannotContainWhitespace(control: AbstractControl): ValidationErrors | null {
+    if (typeof control.value === 'string' && control.value.trim().length === 0) {
+      return { cannotContainWhitespace: true };
+    }
+    return null;
+  }
+}

From 4827c51a75fe8af3157f762c55b39adee5340e84 Mon Sep 17 00:00:00 2001
From: Josephineeeee <weiyu.yan@vanderbilt.edu>
Date: Sun, 21 Apr 2024 16:28:09 -0500
Subject: [PATCH 2/4] adding the missing imports

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

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 54283b5fc73..d551402251d 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
@@ -2,6 +2,8 @@ import { Component, Input } 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';
+import { FormGroup, FormControl, Validators} from '@angular/forms';  
+import { WhitespaceValidator } from './whitespace-validator';
 
 /**
  * Copy current session modal.

From 22a46a6c707075d5091188a1eec7c5637753ac8b Mon Sep 17 00:00:00 2001
From: Josephineeeee <weiyu.yan@vanderbilt.edu>
Date: Sun, 21 Apr 2024 18:05:43 -0500
Subject: [PATCH 3/4] trying to fix the errors

---
 .../copy-session-modal/copy-session-modal.component.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d551402251d..ad6a1f80212 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,9 +1,9 @@
 import { Component, Input } from '@angular/core';
+import { FormGroup, FormControl, Validators } from '@angular/forms'; 
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { WhitespaceValidator } from './whitespace-validator';
 import { Course } from '../../../types/api-output';
 import { FEEDBACK_SESSION_NAME_MAX_LENGTH } from '../../../types/field-validator';
-import { FormGroup, FormControl, Validators} from '@angular/forms';  
-import { WhitespaceValidator } from './whitespace-validator';
 
 /**
  * Copy current session modal.

From 5a6ad7d5a6c51ea8766562299a04143ff01efe0d Mon Sep 17 00:00:00 2001
From: Josephineeeee <weiyu.yan@vanderbilt.edu>
Date: Sun, 21 Apr 2024 18:19:53 -0500
Subject: [PATCH 4/4] adding modifications to copy course modal

---
 .../copy-course-modal.component.html             | 16 ++++++++++++----
 .../copy-course-modal.component.scss             |  5 +++++
 .../copy-session-modal.component.spec.ts.snap    | 10 +++++-----
 .../copy-session-modal.component.ts              |  9 +++++----
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/web/app/components/copy-course-modal/copy-course-modal.component.html b/src/web/app/components/copy-course-modal/copy-course-modal.component.html
index 7e1cf0ac636..976f0d967b2 100644
--- a/src/web/app/components/copy-course-modal/copy-course-modal.component.html
+++ b/src/web/app/components/copy-course-modal/copy-course-modal.component.html
@@ -13,14 +13,22 @@ <h5 class="modal-title">
       </div>
       <div class="form-group">
         <label>Course ID:</label>
-        <input [class.invalid]="newCourseIdIsConflicting" id="copy-course-id" type="text" class="form-control" placeholder="e.g. CS3215-2013Semester1"
-          [(ngModel)]="newCourseId" [maxlength]="COURSE_ID_MAX_LENGTH" (focus)="this.newCourseIdIsConflicting = false">
+        <input [class.invalid]="newCourseIdIsConflicting" id="copy-course-id" name="Id" type="text" class="form-control" placeholder="e.g. CS3215-2013Semester1"
+          #Id="ngModel" [(ngModel)]="newCourseId" [maxlength]="COURSE_ID_MAX_LENGTH" (focus)="this.newCourseIdIsConflicting = false" required>
+          <div [hidden]="Id.valid || (Id.pristine && Id.untouched)" class="invalid-field" required>
+            <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+            The field Course ID should not be empty.
+          </div>
         <span>{{ COURSE_ID_MAX_LENGTH - newCourseId.length }} characters left</span>
       </div>
       <div class="form-group">
         <label>Course Name:</label>
-        <input id="copy-course-name" class="form-control" type="text" placeholder="e.g. Software Engineering" [(ngModel)]="newCourseName"
-          [maxlength]="COURSE_NAME_MAX_LENGTH"/>
+        <input id="copy-course-name" name="courseName" class="form-control" type="text" placeholder="e.g. Software Engineering" #courseName="ngModel" [(ngModel)]="newCourseName"
+          [maxlength]="COURSE_NAME_MAX_LENGTH" required/>
+          <div [hidden]="courseName.valid || (courseName.pristine && courseName.untouched)" class="invalid-field" required>
+            <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+            The field Course Name should not be empty.
+          </div>
         <span>{{ COURSE_NAME_MAX_LENGTH - newCourseName.length }} characters left</span>
       </div>
       <div class="form-group">
diff --git a/src/web/app/components/copy-course-modal/copy-course-modal.component.scss b/src/web/app/components/copy-course-modal/copy-course-modal.component.scss
index c48da2399ff..f766658d9ad 100644
--- a/src/web/app/components/copy-course-modal/copy-course-modal.component.scss
+++ b/src/web/app/components/copy-course-modal/copy-course-modal.component.scss
@@ -7,3 +7,8 @@ hr.solid-divider {
 .invalid {
   border: red 1px solid;
 }
+
+.invalid-field {
+  padding-top: 5px;
+  color: #b50000;
+}
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..c8ab2763f56 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
@@ -61,7 +61,7 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
               aria-hidden="true"
               class="fa fa-exclamation-circle"
             />
-             The field "Name for copied session" should not be empty. 
+             The field "Name for copied session" should not be empty.
           </div>
           <span>
             64 characters left
@@ -151,7 +151,7 @@ exports[`CopySessionModalComponent should snap with some session and courses can
               aria-hidden="true"
               class="fa fa-exclamation-circle"
             />
-             The field "Name for copied session" should not be empty. 
+             The field "Name for copied session" should not be empty.
           </div>
           <span>
             52 characters left
@@ -174,11 +174,11 @@ exports[`CopySessionModalComponent should snap with some session and courses can
             >
               Test01
             </span>
-            ] : Sample Course 101 
+            ] : Sample Course 101
             <span
               class="text-danger"
             >
-               {Session currently in this course} 
+               {Session currently in this course}
             </span>
           </label>
         </div>
@@ -197,7 +197,7 @@ exports[`CopySessionModalComponent should snap with some session and courses can
             <span>
               Test02
             </span>
-            ] : Sample Course 202 
+            ] : Sample Course 202
           </label>
         </div>
       </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 ad6a1f80212..06bab030801 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,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { FormGroup, FormControl, Validators } from '@angular/forms'; 
+import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { WhitespaceValidator } from './whitespace-validator';
 import { Course } from '../../../types/api-output';
@@ -29,9 +29,9 @@ export class CopySessionModalComponent {
 
   constructor(public activeModal: NgbActiveModal) {}
 
-  form = new FormGroup({  
-    newFeedbackSessionName: new FormControl('', [Validators.required, WhitespaceValidator.cannotContainWhitespace]),  
-  });  
+  form = new FormGroup({
+    newFeedbackSessionName: new FormControl('', [Validators.required, WhitespaceValidator.cannotContainWhitespace]),
+  });
 
   /**
    * Fires the copy event.
@@ -56,6 +56,7 @@ export class CopySessionModalComponent {
   }
   /**
    * Checks whether the Feedback Session name entered by user is whitespace or not
+   *
    * @param newFeedbackSessionName a string variable
    * @returns boolean
    */