Development: Fix DOM event name conflicts (#9589)

ls1intum · Oct 27, 2024 · 7346de1 · 7346de1
1 parent 432efc3
commit 7346de1
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 49 deletions.
diff --git a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.html b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.html
@@ -115,7 +115,7 @@ <h3 class="top-container flex-wrap flex-lg-nowrap">
                     <button
                         id="submit"
                         class="btn m-1 btn-success"
-                        (click)="submit.emit(); sendSubmitAssessmentEventToAnalytics()"
+                        (click)="onSubmit.emit(); sendSubmitAssessmentEventToAnalytics()"
                         [disabled]="submitDisabled"
                         [ngbTooltip]="('artemisApp.assessment.button.control' | artemisTranslate) + ' + Enter'"
                     >
@@ -127,7 +127,7 @@ <h3 class="top-container flex-wrap flex-lg-nowrap">
                     @if (!isTestRun) {
                         <button
                             class="btn m-1 btn-danger"
-                            (click)="cancel.emit()"
+                            (click)="onCancel.emit()"
                             [disabled]="!(exercise?.isAtLeastInstructor || isAssessor) || saveBusy || submitBusy || cancelBusy"
                         >
                             @if (cancelBusy) {
@@ -140,7 +140,7 @@ <h3 class="top-container flex-wrap flex-lg-nowrap">
                 @if (overrideVisible) {
                     <button
                         class="btn m-1 btn-danger"
-                        (click)="submit.emit()"
+                        (click)="onSubmit.emit()"
                         [disabled]="overrideDisabled"
                         [ngbTooltip]="('artemisApp.assessment.button.control' | artemisTranslate) + ' + Enter'"
                     >

diff --git a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts
@@ -47,10 +47,8 @@ export class AssessmentHeaderComponent {
     @Input() isProgrammingExercise = false; // remove once diff view activated for programming exercises
 
     @Output() save = new EventEmitter<void>();
-    // eslint-disable-next-line @angular-eslint/no-output-native
-    @Output() submit = new EventEmitter<void>();
-    // eslint-disable-next-line @angular-eslint/no-output-native
-    @Output() cancel = new EventEmitter<void>();
+    @Output() onSubmit = new EventEmitter<void>();
+    @Output() onCancel = new EventEmitter<void>();
     @Output() nextSubmission = new EventEmitter<void>();
     @Output() highlightDifferencesChange = new EventEmitter<boolean>();
     @Output() useAsExampleSubmission = new EventEmitter<void>();
@@ -143,9 +141,9 @@ export class AssessmentHeaderComponent {
     submitOnControlAndEnter(event: KeyboardEvent) {
         event.preventDefault();
         if (!this.overrideDisabled) {
-            this.submit.emit();
+            this.onSubmit.emit();
         } else if (!this.submitDisabled) {
-            this.submit.emit();
+            this.onSubmit.emit();
             this.sendSubmitAssessmentEventToAnalytics();
         }
     }

diff --git a/src/main/webapp/app/assessment/assessment-layout/assessment-layout.component.html b/src/main/webapp/app/assessment/assessment-layout/assessment-layout.component.html
@@ -18,8 +18,8 @@
     [correctionRound]="correctionRound"
     [isProgrammingExercise]="isProgrammingExercise"
     (save)="save.emit()"
-    (submit)="submit.emit()"
-    (cancel)="cancel.emit()"
+    (onSubmit)="onSubmit.emit()"
+    (onCancel)="onCancel.emit()"
     [(highlightDifferences)]="highlightDifferences"
     (nextSubmission)="nextSubmission.emit()"
     [hasComplaint]="!!complaint"

diff --git a/src/main/webapp/app/assessment/assessment-layout/assessment-layout.component.ts b/src/main/webapp/app/assessment/assessment-layout/assessment-layout.component.ts
@@ -62,10 +62,8 @@ export class AssessmentLayoutComponent {
     }
 
     @Output() save = new EventEmitter<void>();
-    // eslint-disable-next-line @angular-eslint/no-output-native
-    @Output() submit = new EventEmitter<void>();
-    // eslint-disable-next-line @angular-eslint/no-output-native
-    @Output() cancel = new EventEmitter<void>();
+    @Output() onSubmit = new EventEmitter<void>();
+    @Output() onCancel = new EventEmitter<void>();
     @Output() nextSubmission = new EventEmitter<void>();
     @Output() updateAssessmentAfterComplaint = new EventEmitter<AssessmentAfterComplaint>();
     @Output() highlightDifferencesChange = new EventEmitter<boolean>();

diff --git a/...main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html b/...main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html
@@ -54,7 +54,7 @@
                     [examId]="exam?.id!"
                     [complaintType]="formComplaintType"
                     [isCurrentUserSubmissionAuthor]="isCorrectUserToFileAction"
-                    (submit)="loadPotentialComplaint()"
+                    (onSubmit)="loadPotentialComplaint()"
                 />
             </div>
         }

diff --git a/src/main/webapp/app/complaints/form/complaints-form.component.ts b/src/main/webapp/app/complaints/form/complaints-form.component.ts
@@ -19,8 +19,7 @@ export class ComplaintsFormComponent implements OnInit {
     @Input() examId?: number;
     @Input() complaintType: ComplaintType;
     @Input() isCurrentUserSubmissionAuthor = false;
-    // eslint-disable-next-line @angular-eslint/no-output-native
-    @Output() submit: EventEmitter<void> = new EventEmitter();
+    @Output() onSubmit: EventEmitter<void> = new EventEmitter();
     maxComplaintsPerCourse = 1;
     maxComplaintTextLimit: number;
     complaintText?: string;
@@ -63,7 +62,7 @@ export class ComplaintsFormComponent implements OnInit {
 
         this.complaintService.create(complaintRequest).subscribe({
             next: () => {
-                this.submit.emit();
+                this.onSubmit.emit();
             },
             error: (err: HttpErrorResponse) => {
                 if (err?.error?.errorKey === 'tooManyComplaints') {

diff --git a/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html b/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html
@@ -15,8 +15,8 @@
     [correctionRound]="correctionRound"
     [(highlightDifferences)]="highlightDifferences"
     (save)="onSaveAssessment()"
-    (submit)="onSubmitAssessment()"
-    (cancel)="onCancelAssessment()"
+    (onSubmit)="onSubmitAssessment()"
+    (onCancel)="onCancelAssessment()"
     (nextSubmission)="assessNext()"
     (updateAssessmentAfterComplaint)="onUpdateAssessmentAfterComplaint($event)"
 >

diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html
@@ -230,7 +230,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
         [isDisabled]="
             !!(editForm.form.invalid || fileUploadExercise.dueDateError || fileUploadExercise.assessmentDueDateError || fileUploadExercise.exampleSolutionPublicationDateError)
         "
-        (cancel)="previousState()"
+        (onCancel)="previousState()"
         (save)="save()"
         [(notificationText)]="notificationText"
     />

diff --git a/...ises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.html b/...ises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.html
@@ -14,8 +14,8 @@
     [submission]="submission"
     [hasAssessmentDueDatePassed]="hasAssessmentDueDatePassed"
     (save)="onSaveAssessment()"
-    (submit)="onSubmitAssessment()"
-    (cancel)="onCancelAssessment()"
+    (onSubmit)="onSubmitAssessment()"
+    (onCancel)="onCancelAssessment()"
     (nextSubmission)="assessNext()"
     (updateAssessmentAfterComplaint)="onUpdateAssessmentAfterComplaint($event)"
     [(highlightDifferences)]="highlightDifferences"

diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html
@@ -275,7 +275,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
         [isCreation]="!modelingExercise.id"
         [isSaving]="isSaving"
         [isDisabled]="!!(editForm.form.invalid || modelingExercise.dueDateError || modelingExercise.assessmentDueDateError || modelingExercise.exampleSolutionPublicationDateError)"
-        (cancel)="previousState()"
+        (onCancel)="previousState()"
         (save)="save()"
         [(notificationText)]="notificationText"
     />

diff --git a/...pp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html b/...pp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html
@@ -39,8 +39,8 @@
         [correctionRound]="correctionRound"
         [isProgrammingExercise]="true"
         (save)="save()"
-        (submit)="submit()"
-        (cancel)="cancel()"
+        (onSubmit)="submit()"
+        (onCancel)="cancel()"
         (nextSubmission)="nextSubmission()"
         (updateAssessmentAfterComplaint)="onUpdateAssessmentAfterComplaint($event)"
     >

diff --git a/...webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html b/...webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html
@@ -50,7 +50,7 @@ <h2 id="jhi-programming-exercise-heading-import" jhiTranslate="artemisApp.progra
                 [isSaving]="isSaving"
                 [invalidReasons]="getInvalidReasons()"
                 (save)="save()"
-                (cancel)="previousState()"
+                (onCancel)="previousState()"
                 [(notificationText)]="notificationText"
             />
         </div>

diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.html b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.html
@@ -18,8 +18,8 @@
     [hasAssessmentDueDatePassed]="hasAssessmentDueDatePassed"
     [correctionRound]="correctionRound"
     (save)="save()"
-    (submit)="submit()"
-    (cancel)="cancel()"
+    (onSubmit)="submit()"
+    (onCancel)="cancel()"
     (nextSubmission)="nextSubmission()"
     [(highlightDifferences)]="highlightDifferences"
     (updateAssessmentAfterComplaint)="updateAssessmentAfterComplaint($event)"

diff --git a/.../exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.html b/.../exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.html
@@ -22,7 +22,7 @@
         class="guided-tour-text-assessment"
         (click)="select(false)"
         (onFocus)="select(false)"
-        (close)="unselect()"
+        (onClose)="unselect()"
         (feedbackChange)="feedbackDidChange()"
         [readOnly]="readOnly"
         [highlightDifferences]="highlightDifferences"

diff --git a/...pp/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts b/...pp/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts
@@ -21,7 +21,7 @@ export class TextblockFeedbackEditorComponent implements AfterViewInit {
     @Input() textBlock: TextBlock = new TextBlock();
     @Input() feedback: Feedback = new Feedback();
     @Output() feedbackChange = new EventEmitter<Feedback>();
-    @Output() close = new EventEmitter<void>();
+    @Output() onClose = new EventEmitter<void>();
     @Output() onFocus = new EventEmitter<void>();
     @ViewChild('detailText') textareaRef: ElementRef;
     @ViewChild(ConfirmIconComponent) confirmIconComponent: ConfirmIconComponent;
@@ -95,7 +95,7 @@ export class TextblockFeedbackEditorComponent implements AfterViewInit {
      * Dismiss changes in feedback editor
      */
     dismiss(): void {
-        this.close.emit();
+        this.onClose.emit();
         this.textAssessmentAnalytics.sendAssessmentEvent(TextAssessmentEventType.DELETE_FEEDBACK, this.feedback.type, this.textBlock.type);
     }
 

diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html
@@ -220,7 +220,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
         [isImport]="isImport"
         [isSaving]="isSaving"
         [isDisabled]="!!(editForm.form.invalid || textExercise.dueDateError || textExercise.assessmentDueDateError || textExercise.exampleSolutionPublicationDateError)"
-        (cancel)="previousState()"
+        (onCancel)="previousState()"
         (save)="save()"
         [(notificationText)]="notificationText"
     />

diff --git a/src/main/webapp/app/forms/form-footer/form-footer.component.html b/src/main/webapp/app/forms/form-footer/form-footer.component.html
@@ -21,7 +21,7 @@
                 <span class="d-none d-md-inline">({{ invalidReasons.length }})</span>
             </div>
         }
-        <button type="button" id="cancel-save" class="btn btn-sm btn-secondary" (click)="cancel.next()">
+        <button type="button" id="cancel-save" class="btn btn-sm btn-secondary" (click)="onCancel.next()">
             <fa-icon [fixedWidth]="true" [icon]="faBan" class="sm" />
             <span class="d-none d-sm-inline" jhiTranslate="entity.action.cancel"></span>
         </button>

diff --git a/src/main/webapp/app/forms/form-footer/form-footer.component.ts b/src/main/webapp/app/forms/form-footer/form-footer.component.ts
@@ -10,8 +10,8 @@ import { ButtonSize } from 'app/shared/components/button.component';
 })
 export class FormFooterComponent {
     @Output() save = new EventEmitter<void>();
-    // eslint-disable-next-line @angular-eslint/no-output-native
-    @Output() cancel = new EventEmitter<void>();
+
+    @Output() onCancel = new EventEmitter<void>();
 
     @Input() isSaving: boolean = false;
     @Input() isDisabled: boolean = false;

diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts
@@ -159,14 +159,14 @@ describe('AssessmentHeaderComponent', () => {
         saveButtonSpan.nativeElement.click();
         expect(component.save.emit).toHaveBeenCalledOnce();
 
-        jest.spyOn(component.submit, 'emit');
+        jest.spyOn(component.onSubmit, 'emit');
         submitButtonSpan.nativeElement.click();
-        expect(component.submit.emit).toHaveBeenCalledOnce();
+        expect(component.onSubmit.emit).toHaveBeenCalledOnce();
 
         const cancelButtonSpan = fixture.debugElement.query(By.css('[jhiTranslate$=cancel]'));
-        jest.spyOn(component.cancel, 'emit');
+        jest.spyOn(component.onCancel, 'emit');
         cancelButtonSpan.nativeElement.click();
-        expect(component.cancel.emit).toHaveBeenCalledOnce();
+        expect(component.onCancel.emit).toHaveBeenCalledOnce();
     });
 
     it('should show override button when result is present', () => {
@@ -189,9 +189,9 @@ describe('AssessmentHeaderComponent', () => {
         overrideAssessmentButtonSpan = fixture.debugElement.query(By.css('[jhiTranslate$=overrideAssessment]'));
         expect(overrideAssessmentButtonSpan).toBeTruthy();
 
-        jest.spyOn(component.submit, 'emit');
+        jest.spyOn(component.onSubmit, 'emit');
         overrideAssessmentButtonSpan.nativeElement.click();
-        expect(component.submit.emit).toHaveBeenCalledOnce();
+        expect(component.onSubmit.emit).toHaveBeenCalledOnce();
     });
 
     it('should show next submission if assessor or instructor, result is present and no complaint', () => {
@@ -345,7 +345,7 @@ describe('AssessmentHeaderComponent', () => {
 
         const eventMock = new KeyboardEvent('keydown', { ctrlKey: true, key: 'Enter' });
         const spyOnControlAndEnter = jest.spyOn(component, 'submitOnControlAndEnter');
-        const submitSpy = jest.spyOn(component.submit, 'emit');
+        const submitSpy = jest.spyOn(component.onSubmit, 'emit');
         document.dispatchEvent(eventMock);
 
         expect(spyOnControlAndEnter).toHaveBeenCalledOnce();
@@ -362,7 +362,7 @@ describe('AssessmentHeaderComponent', () => {
 
         const eventMock = new KeyboardEvent('keydown', { ctrlKey: true, key: 'Enter' });
         const spyOnControlAndEnter = jest.spyOn(component, 'submitOnControlAndEnter');
-        const submitSpy = jest.spyOn(component.submit, 'emit');
+        const submitSpy = jest.spyOn(component.onSubmit, 'emit');
         document.dispatchEvent(eventMock);
 
         expect(spyOnControlAndEnter).toHaveBeenCalledOnce();

diff --git a/src/test/javascript/spec/component/complaints/complaints-form.component.spec.ts b/src/test/javascript/spec/component/complaints/complaints-form.component.spec.ts
@@ -84,7 +84,7 @@ describe('ComplaintsFormComponent', () => {
 
     it('should submit after complaint creation', () => {
         const createMock = jest.spyOn(complaintService, 'create').mockReturnValue(of({} as EntityResponseType));
-        const submitSpy = jest.spyOn(component.submit, 'emit');
+        const submitSpy = jest.spyOn(component.onSubmit, 'emit');
         component.createComplaint();
         expect(createMock).toHaveBeenCalledOnce();
         expect(submitSpy).toHaveBeenCalledOnce();
@@ -93,7 +93,7 @@ describe('ComplaintsFormComponent', () => {
 
     it('should throw unknown error after complaint creation', () => {
         const createMock = jest.spyOn(complaintService, 'create').mockReturnValue(throwError(() => ({ status: 400 })));
-        const submitSpy = jest.spyOn(component.submit, 'emit');
+        const submitSpy = jest.spyOn(component.onSubmit, 'emit');
         const errorSpy = jest.spyOn(alertService, 'error');
         component.createComplaint();
         expect(createMock).toHaveBeenCalledOnce();
@@ -104,7 +104,7 @@ describe('ComplaintsFormComponent', () => {
     it('should throw known error after complaint creation', () => {
         const error = { error: { errorKey: 'tooManyComplaints' } } as HttpErrorResponse;
         const createMock = jest.spyOn(complaintService, 'create').mockReturnValue(throwError(() => error));
-        const submitSpy = jest.spyOn(component.submit, 'emit');
+        const submitSpy = jest.spyOn(component.onSubmit, 'emit');
         const errorSpy = jest.spyOn(alertService, 'error');
         const numberOfComplaints = 42;
         component.maxComplaintsPerCourse = numberOfComplaints;
@@ -120,7 +120,7 @@ describe('ComplaintsFormComponent', () => {
         component.exercise = courseExercise;
         component.ngOnInit();
 
-        const submitSpy = jest.spyOn(component.submit, 'emit');
+        const submitSpy = jest.spyOn(component.onSubmit, 'emit');
         const errorSpy = jest.spyOn(alertService, 'error');
         // 26 characters
         component.complaintText = 'abcdefghijklmnopqrstuvwxyz';