CSCEXAM-1291 No toast when canceling question import

- Also force absolute paths in typescript imports - Makes it easier to move files around
CSCfi · May 27, 2024 · a20dace · a20dace
1 parent d60ccc0
commit a20dace
Show file tree

Hide file tree

Showing 223 changed files with 916 additions and 898 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,6 +70,7 @@
     "@typescript-eslint/parser": "^6.10.0",
     "eslint": "^8.53.0",
     "eslint-plugin-deprecation": "^2.0.0",
+    "eslint-plugin-no-relative-import-paths": "^1.5.4",
     "karma": "^6.3.0",
     "lefthook": "^1.6.1",
     "prettier": "^3.0.0",

diff --git a/ui/.eslintrc.json b/ui/.eslintrc.json
@@ -15,6 +15,7 @@
                 "plugin:@angular-eslint/template/process-inline-templates",
                 "plugin:deprecation/recommended"
             ],
+            "plugins": ["no-relative-import-paths"],
             "rules": {
                 "@typescript-eslint/no-explicit-any": "error",
                 "@angular-eslint/directive-selector": [
@@ -33,7 +34,11 @@
                         "style": "kebab-case"
                     }
                 ],
-                "@typescript-eslint/member-ordering": "error"
+                "@typescript-eslint/member-ordering": "error",
+                "no-relative-import-paths/no-relative-import-paths": [
+                    "error",
+                    { "allowSameFolder": true, "rootDir": "ui" }
+                  ]
             }
         },
         {

diff --git a/ui/src/app/administrative/reports/categories/answers-report.component.ts b/ui/src/app/administrative/reports/categories/answers-report.component.ts
@@ -16,8 +16,8 @@ import { Component } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { format } from 'date-fns';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
 import { FileService } from 'src/app/shared/file/file.service';
-import { DatePickerComponent } from '../../../shared/date/date-picker.component';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/enrolments-report.component.ts b/ui/src/app/administrative/reports/categories/enrolments-report.component.ts
@@ -17,8 +17,8 @@ import { Component, Input } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
-import { FileService } from '../../../shared/file/file.service';
-import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown-select.component';
+import { FileService } from 'src/app/shared/file/file.service';
+import { DropdownSelectComponent, Option } from 'src/app/shared/select/dropdown-select.component';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/exams-report.component.ts b/ui/src/app/administrative/reports/categories/exams-report.component.ts
@@ -17,8 +17,8 @@ import { Component, Input } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
-import { FileService } from '../../../shared/file/file.service';
-import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown-select.component';
+import { FileService } from 'src/app/shared/file/file.service';
+import { DropdownSelectComponent, Option } from 'src/app/shared/select/dropdown-select.component';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/records-report.component.ts b/ui/src/app/administrative/reports/categories/records-report.component.ts
@@ -15,8 +15,8 @@
 import { Component } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { DatePickerComponent } from '../../../shared/date/date-picker.component';
-import { FileService } from '../../../shared/file/file.service';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
+import { FileService } from 'src/app/shared/file/file.service';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/reviews-report.component.ts b/ui/src/app/administrative/reports/categories/reviews-report.component.ts
@@ -16,8 +16,8 @@ import { Component } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { format } from 'date-fns';
-import { DatePickerComponent } from '../../../shared/date/date-picker.component';
-import { FileService } from '../../../shared/file/file.service';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
+import { FileService } from 'src/app/shared/file/file.service';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/rooms-report.component.ts b/ui/src/app/administrative/reports/categories/rooms-report.component.ts
@@ -18,10 +18,10 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { ToastrService } from 'ngx-toastr';
-import type { ExamRoom } from '../../../reservation/reservation.model';
-import { DatePickerComponent } from '../../../shared/date/date-picker.component';
-import { FileService } from '../../../shared/file/file.service';
-import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown-select.component';
+import type { ExamRoom } from 'src/app/reservation/reservation.model';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
+import { FileService } from 'src/app/shared/file/file.service';
+import { DropdownSelectComponent, Option } from 'src/app/shared/select/dropdown-select.component';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/students-report.component.ts b/ui/src/app/administrative/reports/categories/students-report.component.ts
@@ -17,10 +17,10 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { ToastrService } from 'ngx-toastr';
-import type { User } from '../../../session/session.service';
-import { DatePickerComponent } from '../../../shared/date/date-picker.component';
-import { FileService } from '../../../shared/file/file.service';
-import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown-select.component';
+import type { User } from 'src/app/session/session.service';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
+import { FileService } from 'src/app/shared/file/file.service';
+import { DropdownSelectComponent, Option } from 'src/app/shared/select/dropdown-select.component';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/categories/teachers-report.component.ts b/ui/src/app/administrative/reports/categories/teachers-report.component.ts
@@ -18,10 +18,10 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { format } from 'date-fns';
 import { ToastrService } from 'ngx-toastr';
-import type { User } from '../../../session/session.service';
-import { DatePickerComponent } from '../../../shared/date/date-picker.component';
-import { FileService } from '../../../shared/file/file.service';
-import { DropdownSelectComponent, Option } from '../../../shared/select/dropdown-select.component';
+import type { User } from 'src/app/session/session.service';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
+import { FileService } from 'src/app/shared/file/file.service';
+import { DropdownSelectComponent, Option } from 'src/app/shared/select/dropdown-select.component';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/reports/reports.component.ts b/ui/src/app/administrative/reports/reports.component.ts
@@ -16,13 +16,13 @@
 import type { OnInit } from '@angular/core';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
+import { RoomService } from 'src/app/facility/rooms/room.service';
+import { ExamRoom } from 'src/app/reservation/reservation.model';
+import { User } from 'src/app/session/session.service';
 import { PageContentComponent } from 'src/app/shared/components/page-content.component';
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
-import { RoomService } from '../../facility/rooms/room.service';
-import { ExamRoom } from '../../reservation/reservation.model';
-import { User } from '../../session/session.service';
-import { Option } from '../../shared/select/dropdown-select.component';
-import { UserService } from '../../shared/user/user.service';
+import { Option } from 'src/app/shared/select/dropdown-select.component';
+import { UserService } from 'src/app/shared/user/user.service';
 import { AnswersReportComponent } from './categories/answers-report.component';
 import { EnrolmentsReportComponent } from './categories/enrolments-report.component';
 import { ExamsReportComponent } from './categories/exams-report.component';

diff --git a/ui/src/app/administrative/settings/settings.component.ts b/ui/src/app/administrative/settings/settings.component.ts
@@ -5,9 +5,9 @@ import { FormsModule } from '@angular/forms';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
+import { CKEditorComponent } from 'src/app/shared/ckeditor/ckeditor.component';
 import { PageContentComponent } from 'src/app/shared/components/page-content.component';
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
-import { CKEditorComponent } from '../../shared/ckeditor/ckeditor.component';
 import { AppConfig, SettingsService } from './settings.service';
 
 @Component({

diff --git a/ui/src/app/administrative/statistics/categories/exam-statistics.component.ts b/ui/src/app/administrative/statistics/categories/exam-statistics.component.ts
@@ -1,8 +1,8 @@
 import type { OnInit } from '@angular/core';
 import { Component, Input } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import type { ExamInfo, QueryParams } from '../statistics.service';
-import { StatisticsService } from '../statistics.service';
+import type { ExamInfo, QueryParams } from 'src/app/administrative/statistics/statistics.service';
+import { StatisticsService } from 'src/app/administrative/statistics/statistics.service';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/statistics/categories/reservation-statistics.component.ts b/ui/src/app/administrative/statistics/categories/reservation-statistics.component.ts
@@ -15,8 +15,8 @@
 import type { OnInit } from '@angular/core';
 import { Component, Input } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import type { QueryParams } from '../statistics.service';
-import { StatisticsService } from '../statistics.service';
+import type { QueryParams } from 'src/app/administrative/statistics/statistics.service';
+import { StatisticsService } from 'src/app/administrative/statistics/statistics.service';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/statistics/categories/response-statistics.component.ts b/ui/src/app/administrative/statistics/categories/response-statistics.component.ts
@@ -15,9 +15,9 @@
 import type { OnInit } from '@angular/core';
 import { Component, Input } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import type { Exam } from '../../../exam/exam.model';
-import type { QueryParams } from '../statistics.service';
-import { StatisticsService } from '../statistics.service';
+import type { QueryParams } from 'src/app/administrative/statistics/statistics.service';
+import { StatisticsService } from 'src/app/administrative/statistics/statistics.service';
+import type { Exam } from 'src/app/exam/exam.model';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/statistics/categories/room-statistics.component.ts b/ui/src/app/administrative/statistics/categories/room-statistics.component.ts
@@ -15,9 +15,9 @@
 import { DatePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import type { ExamParticipation } from '../../../exam/exam.model';
-import type { Participations, QueryParams } from '../statistics.service';
-import { StatisticsService } from '../statistics.service';
+import type { Participations, QueryParams } from 'src/app/administrative/statistics/statistics.service';
+import { StatisticsService } from 'src/app/administrative/statistics/statistics.service';
+import type { ExamParticipation } from 'src/app/exam/exam.model';
 
 @Component({
     template: `

diff --git a/ui/src/app/administrative/statistics/statistics.component.ts b/ui/src/app/administrative/statistics/statistics.component.ts
@@ -29,7 +29,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import { PageContentComponent } from 'src/app/shared/components/page-content.component';
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
-import { DatePickerComponent } from '../../shared/date/date-picker.component';
+import { DatePickerComponent } from 'src/app/shared/date/date-picker.component';
 import { ExamStatisticsComponent } from './categories/exam-statistics.component';
 import { ReservationStatisticsComponent } from './categories/reservation-statistics.component';
 import { ResponseStatisticsComponent } from './categories/response-statistics.component';

diff --git a/ui/src/app/administrative/users/users.component.ts b/ui/src/app/administrative/users/users.component.ts
@@ -13,11 +13,11 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ToastrService } from 'ngx-toastr';
 import { Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
+import type { User } from 'src/app/session/session.service';
+import { SessionService } from 'src/app/session/session.service';
 import { PageContentComponent } from 'src/app/shared/components/page-content.component';
 import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
-import type { User } from '../../session/session.service';
-import { SessionService } from '../../session/session.service';
-import { PaginatorComponent } from '../../shared/paginator/paginator.component';
+import { PaginatorComponent } from 'src/app/shared/paginator/paginator.component';
 import type { Permission } from './users.service';
 import { PermissionType, UserManagementService } from './users.service';
 

diff --git a/ui/src/app/administrative/users/users.service.ts b/ui/src/app/administrative/users/users.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import type { Role, User } from '../../session/session.service';
+import type { Role, User } from 'src/app/session/session.service';
 
 export enum PermissionType {
     CAN_INSPECT_LANGUAGE = 'CAN_INSPECT_LANGUAGE',

diff --git a/ui/src/app/calendar/booking-calendar.component.ts b/ui/src/app/calendar/booking-calendar.component.ts
@@ -35,7 +35,7 @@ import luxon2Plugin from '@fullcalendar/luxon2';
 import timeGridPlugin from '@fullcalendar/timegrid';
 import { TranslateService } from '@ngx-translate/core';
 import { DateTime } from 'luxon';
-import type { Accessibility, ExamRoom } from '../reservation/reservation.model';
+import type { Accessibility, ExamRoom } from 'src/app/reservation/reservation.model';
 import { CalendarService } from './calendar.service';
 
 @Component({

diff --git a/ui/src/app/calendar/calendar.component.ts b/ui/src/app/calendar/calendar.component.ts
@@ -20,15 +20,15 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { DateTime } from 'luxon';
 import { ToastrService } from 'ngx-toastr';
 import { switchMap, tap } from 'rxjs/operators';
-import { ExamEnrolment } from '../enrolment/enrolment.model';
-import type { Accessibility, ExamRoom } from '../reservation/reservation.model';
-import { PageContentComponent } from '../shared/components/page-content.component';
-import { PageHeaderComponent } from '../shared/components/page-header.component';
-import { DateTimeService } from '../shared/date/date.service';
-import { ConfirmationDialogService } from '../shared/dialogs/confirmation-dialog.service';
-import { HistoryBackComponent } from '../shared/history/history-back.component';
-import { CourseCodeComponent } from '../shared/miscellaneous/course-code.component';
-import { AutoFocusDirective } from '../shared/select/auto-focus.directive';
+import { ExamEnrolment } from 'src/app/enrolment/enrolment.model';
+import type { Accessibility, ExamRoom } from 'src/app/reservation/reservation.model';
+import { PageContentComponent } from 'src/app/shared/components/page-content.component';
+import { PageHeaderComponent } from 'src/app/shared/components/page-header.component';
+import { DateTimeService } from 'src/app/shared/date/date.service';
+import { ConfirmationDialogService } from 'src/app/shared/dialogs/confirmation-dialog.service';
+import { HistoryBackComponent } from 'src/app/shared/history/history-back.component';
+import { CourseCodeComponent } from 'src/app/shared/miscellaneous/course-code.component';
+import { AutoFocusDirective } from 'src/app/shared/select/auto-focus.directive';
 import { CalendarService, ExamInfo, Organisation } from './calendar.service';
 import { CalendarExamInfoComponent } from './helpers/exam-info.component';
 import { OptionalSectionsComponent } from './helpers/optional-sections.component';

diff --git a/ui/src/app/calendar/calendar.service.ts b/ui/src/app/calendar/calendar.service.ts
@@ -16,16 +16,16 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { DateTime, Interval } from 'luxon';
 import type { Observable } from 'rxjs';
-import { ExamEnrolment } from '../enrolment/enrolment.model';
-import { Course, Exam, ExamSection, MaintenancePeriod } from '../exam/exam.model';
+import { ExamEnrolment } from 'src/app/enrolment/enrolment.model';
+import { Course, Exam, ExamSection, MaintenancePeriod } from 'src/app/exam/exam.model';
 import type {
     Accessibility,
     DefaultWorkingHours,
     ExamRoom,
     ExceptionWorkingHours,
-} from '../reservation/reservation.model';
-import { SessionService } from '../session/session.service';
-import { DateTimeService } from '../shared/date/date.service';
+} from 'src/app/reservation/reservation.model';
+import { SessionService } from 'src/app/session/session.service';
+import { DateTimeService } from 'src/app/shared/date/date.service';
 
 type WeekdayNames = Record<string, { ord: number; name: string }>;
 

diff --git a/ui/src/app/calendar/helpers/exam-info.component.ts b/ui/src/app/calendar/helpers/exam-info.component.ts
@@ -2,10 +2,10 @@ import { DatePipe } from '@angular/common';
 import { Component, Input, OnInit, computed, signal } from '@angular/core';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { DateTime } from 'luxon';
-import { DateTimeService } from '../../shared/date/date.service';
-import { MathJaxDirective } from '../../shared/math/math-jax.directive';
-import { CourseCodeComponent } from '../../shared/miscellaneous/course-code.component';
-import type { ExamInfo } from '../calendar.service';
+import type { ExamInfo } from 'src/app/calendar/calendar.service';
+import { DateTimeService } from 'src/app/shared/date/date.service';
+import { MathJaxDirective } from 'src/app/shared/math/math-jax.directive';
+import { CourseCodeComponent } from 'src/app/shared/miscellaneous/course-code.component';
 
 @Component({
     selector: 'xm-calendar-exam-info',

diff --git a/ui/src/app/calendar/helpers/optional-sections.component.ts b/ui/src/app/calendar/helpers/optional-sections.component.ts
@@ -2,7 +2,7 @@ import { NgClass, UpperCasePipe } from '@angular/common';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
-import type { ExamInfo } from '../calendar.service';
+import type { ExamInfo } from 'src/app/calendar/calendar.service';
 
 @Component({
     selector: 'xm-calendar-optional-sections',

diff --git a/ui/src/app/calendar/helpers/organisation-picker.component.ts b/ui/src/app/calendar/helpers/organisation-picker.component.ts
@@ -2,8 +2,8 @@ import { NgClass } from '@angular/common';
 import { Component, EventEmitter, Input, OnInit, Output, signal } from '@angular/core';
 import { NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import type { Organisation } from '../calendar.service';
-import { CalendarService } from '../calendar.service';
+import type { Organisation } from 'src/app/calendar/calendar.service';
+import { CalendarService } from 'src/app/calendar/calendar.service';
 
 @Component({
     selector: 'xm-calendar-organisation-picker',

diff --git a/ui/src/app/calendar/helpers/selected-room.component.ts b/ui/src/app/calendar/helpers/selected-room.component.ts
@@ -3,11 +3,11 @@ import { Component, Input, OnChanges, OnInit, signal } from '@angular/core';
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { DateTime } from 'luxon';
-import { MaintenancePeriod } from '../../exam/exam.model';
-import type { ExamRoom, ExceptionWorkingHours } from '../../reservation/reservation.model';
-import { OrderByPipe } from '../../shared/sorting/order-by.pipe';
-import type { OpeningHours } from '../calendar.service';
-import { CalendarService } from '../calendar.service';
+import type { OpeningHours } from 'src/app/calendar/calendar.service';
+import { CalendarService } from 'src/app/calendar/calendar.service';
+import { MaintenancePeriod } from 'src/app/exam/exam.model';
+import type { ExamRoom, ExceptionWorkingHours } from 'src/app/reservation/reservation.model';
+import { OrderByPipe } from 'src/app/shared/sorting/order-by.pipe';
 
 @Component({
     selector: 'xm-calendar-selected-room',