From 83c73de9f02e312c2f6e94057eaaec5bbf6d9d3e Mon Sep 17 00:00:00 2001 From: ublefo <90136978+ublefo@users.noreply.github.com> Date: Tue, 14 May 2024 13:16:09 +1000 Subject: [PATCH] fix: remove unused imports --- src/app/ajs-upgraded-providers.ts | 4 ++-- src/app/api/models/groups/group-set.ts | 2 +- src/app/api/models/overseer/overseer-image.ts | 1 - src/app/api/models/task-comment/task-comment.ts | 1 - src/app/api/models/tii-action.ts | 4 +--- src/app/api/models/tutorial-enrolment.ts | 2 +- src/app/api/models/tutorial/tutorial.ts | 3 +-- src/app/api/services/authentication.service.ts | 2 +- src/app/api/services/task-outcome-alignment.service.ts | 1 - src/app/api/services/teaching-period.service.ts | 2 +- src/app/api/services/tii-action.service.ts | 6 ++---- src/app/api/services/unit.service.ts | 2 +- src/app/api/services/webcal.service.ts | 2 +- src/app/common/filters/task-definition-name.pipe.ts | 2 +- .../header/unit-dropdown/unit-dropdown.component.ts | 1 - .../modals/calendar-modal/calendar-modal.service.ts | 2 +- .../task-assessment-modal.service.ts | 2 +- src/app/common/obect-select/object-select.component.ts | 2 +- src/app/common/pipes/safe.pipe.spec.ts | 2 -- .../project-progress-bar.component.ts | 3 +-- src/app/common/services/task-submission.service.ts | 2 +- src/app/common/status-icon/status-icon.component.ts | 2 +- src/app/doubtfire-angular.module.ts | 1 - .../service-worker-updater/check-for-update.service.ts | 3 --- src/app/sessions/states/sign-in/sign-in.component.ts | 2 +- .../extension-comment/extension-comment.component.ts | 2 +- .../task-submission-history.component.ts | 2 +- .../student-campus-select.component.ts | 2 +- .../task-definition-resources.component.ts | 2 +- .../task-definition-upload.component.ts | 4 ++-- .../unit-tasks-editor/unit-task-editor.component.ts | 10 +++++----- .../unit-tutorials-list.component.ts | 4 ++-- .../unit-tutorials-manager.component.ts | 2 +- src/app/units/states/tasks/tasks-viewer.service.ts | 2 +- 34 files changed, 35 insertions(+), 51 deletions(-) diff --git a/src/app/ajs-upgraded-providers.ts b/src/app/ajs-upgraded-providers.ts index 8942eb39a..be2619189 100644 --- a/src/app/ajs-upgraded-providers.ts +++ b/src/app/ajs-upgraded-providers.ts @@ -11,7 +11,7 @@ export const audioRecorder = new InjectionToken('audioRecorder'); export const audioRecorderService = new InjectionToken('recorderService'); export const csvUploadModalService = new InjectionToken('CsvUploadModalAngular'); export const csvResultModalService = new InjectionToken('CsvResultModalAngular'); -export const confirmationModal = new InjectionToken('ConfirmationModal'); +export const confirmationModalService = new InjectionToken('ConfirmationModal'); export const unitStudentEnrolmentModal = new InjectionToken('UnitStudentEnrolmentModalAngular'); export const commentsModal = new InjectionToken('CommentsModal'); export const visualisations = new InjectionToken('Visualisation'); @@ -113,7 +113,7 @@ export const CsvResultModalProvider = { }; export const ConfirmationModalProvider = { - provide: confirmationModal, + provide: confirmationModalService, useFactory: (i) => i.get('ConfirmationModal'), deps: ['$injector'], }; diff --git a/src/app/api/models/groups/group-set.ts b/src/app/api/models/groups/group-set.ts index 42882017d..f4be92fa7 100644 --- a/src/app/api/models/groups/group-set.ts +++ b/src/app/api/models/groups/group-set.ts @@ -1,7 +1,7 @@ import { Entity, EntityCache, EntityMapping } from 'ngx-entity-service'; import { AppInjector } from 'src/app/app-injector'; import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants'; -import { Group, Unit, User } from '../doubtfire-model'; +import { Group, Unit } from '../doubtfire-model'; export class GroupSet extends Entity { diff --git a/src/app/api/models/overseer/overseer-image.ts b/src/app/api/models/overseer/overseer-image.ts index 277c3df42..02facbe4b 100644 --- a/src/app/api/models/overseer/overseer-image.ts +++ b/src/app/api/models/overseer/overseer-image.ts @@ -1,4 +1,3 @@ -import { StringNullableChain } from 'lodash'; import { Entity, EntityMapping } from 'ngx-entity-service'; export class OverseerImage extends Entity { diff --git a/src/app/api/models/task-comment/task-comment.ts b/src/app/api/models/task-comment/task-comment.ts index 03b7ea455..c60a1e414 100644 --- a/src/app/api/models/task-comment/task-comment.ts +++ b/src/app/api/models/task-comment/task-comment.ts @@ -2,7 +2,6 @@ import { AppInjector } from 'src/app/app-injector'; import { Entity } from 'ngx-entity-service'; import { Project, Task, TaskCommentService, User } from 'src/app/api/models/doubtfire-model'; import { UserService } from '../../services/user.service'; -import API_URL from 'src/app/config/constants/apiURL'; import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants'; import { AlertService } from 'src/app/common/services/alert.service'; diff --git a/src/app/api/models/tii-action.ts b/src/app/api/models/tii-action.ts index 0f0ed3d59..fe89554f9 100644 --- a/src/app/api/models/tii-action.ts +++ b/src/app/api/models/tii-action.ts @@ -1,6 +1,4 @@ -import { Entity, EntityCache, EntityMapping } from 'ngx-entity-service'; -import { Observable } from 'rxjs'; -import { Unit } from './doubtfire-model'; +import { Entity } from 'ngx-entity-service'; export class TiiAction extends Entity { id: number; diff --git a/src/app/api/models/tutorial-enrolment.ts b/src/app/api/models/tutorial-enrolment.ts index 746317536..53bd17913 100644 --- a/src/app/api/models/tutorial-enrolment.ts +++ b/src/app/api/models/tutorial-enrolment.ts @@ -1,5 +1,5 @@ import { Entity } from 'ngx-entity-service'; -import { Tutorial, User } from './doubtfire-model'; +import { Tutorial } from './doubtfire-model'; export class TutorialEnrolment extends Entity { diff --git a/src/app/api/models/tutorial/tutorial.ts b/src/app/api/models/tutorial/tutorial.ts index 181b1ec0d..a30514b69 100644 --- a/src/app/api/models/tutorial/tutorial.ts +++ b/src/app/api/models/tutorial/tutorial.ts @@ -1,6 +1,5 @@ import { Entity, EntityMapping } from 'ngx-entity-service'; -import { AppInjector } from '../../../app-injector'; -import { User, Campus, UserService, CampusService, TutorialStream } from 'src/app/api/models/doubtfire-model'; +import { User, Campus, TutorialStream } from 'src/app/api/models/doubtfire-model'; import { Unit } from '../unit'; export class Tutorial extends Entity { diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts index 5b8ca5c1e..87ba1a73c 100644 --- a/src/app/api/services/authentication.service.ts +++ b/src/app/api/services/authentication.service.ts @@ -1,5 +1,5 @@ import {User, UserService} from 'src/app/api/models/doubtfire-model'; -import {Inject, Injectable} from '@angular/core'; +import {Injectable} from '@angular/core'; import {HttpClient} from '@angular/common/http'; import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants'; import {StateService, UIRouter, UIRouterGlobals} from '@uirouter/angular'; diff --git a/src/app/api/services/task-outcome-alignment.service.ts b/src/app/api/services/task-outcome-alignment.service.ts index 061f14a91..92bddbf96 100644 --- a/src/app/api/services/task-outcome-alignment.service.ts +++ b/src/app/api/services/task-outcome-alignment.service.ts @@ -3,7 +3,6 @@ import { CachedEntityService } from 'ngx-entity-service'; import { Project, TaskOutcomeAlignment, Unit } from 'src/app/api/models/doubtfire-model'; import { Injectable } from '@angular/core'; import API_URL from 'src/app/config/constants/apiURL'; -import { UnitTutorialsListComponent } from 'src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component'; @Injectable() export class TaskOutcomeAlignmentService extends CachedEntityService { diff --git a/src/app/api/services/teaching-period.service.ts b/src/app/api/services/teaching-period.service.ts index ab75f72ad..d9d1159cd 100644 --- a/src/app/api/services/teaching-period.service.ts +++ b/src/app/api/services/teaching-period.service.ts @@ -1,5 +1,5 @@ import { HttpClient } from '@angular/common/http'; -import { CachedEntityService, Entity } from 'ngx-entity-service'; +import { CachedEntityService } from 'ngx-entity-service'; import { TeachingPeriod, TeachingPeriodBreakService, UnitService } from 'src/app/api/models/doubtfire-model'; import { Injectable } from '@angular/core'; import API_URL from 'src/app/config/constants/apiURL'; diff --git a/src/app/api/services/tii-action.service.ts b/src/app/api/services/tii-action.service.ts index a90e54014..117632e75 100644 --- a/src/app/api/services/tii-action.service.ts +++ b/src/app/api/services/tii-action.service.ts @@ -1,11 +1,9 @@ import { HttpClient } from '@angular/common/http'; -import { CachedEntityService, Entity } from 'ngx-entity-service'; -import { TiiAction, Unit, UnitService, UserService } from 'src/app/api/models/doubtfire-model'; +import { CachedEntityService } from 'ngx-entity-service'; +import { TiiAction } from 'src/app/api/models/doubtfire-model'; import { Injectable } from '@angular/core'; import API_URL from 'src/app/config/constants/apiURL'; -import { AppInjector } from 'src/app/app-injector'; import { MappingFunctions } from './mapping-fn'; -import { MappingProcess } from 'ngx-entity-service/lib/mapping-process'; @Injectable() export class TiiActionService extends CachedEntityService { diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts index 740e9b6cc..4a405c359 100644 --- a/src/app/api/services/unit.service.ts +++ b/src/app/api/services/unit.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { GroupSetService, LearningOutcomeService, TaskOutcomeAlignmentService, TeachingPeriodService, TutorialService, TutorialStreamService, Unit, UserService } from 'src/app/api/models/doubtfire-model'; -import { CachedEntityService, Entity, EntityMapping } from 'ngx-entity-service'; +import { CachedEntityService } from 'ngx-entity-service'; import API_URL from 'src/app/config/constants/apiURL'; import { UnitRoleService } from './unit-role.service'; import { AppInjector } from 'src/app/app-injector'; diff --git a/src/app/api/services/webcal.service.ts b/src/app/api/services/webcal.service.ts index 0823ff736..1bd855898 100644 --- a/src/app/api/services/webcal.service.ts +++ b/src/app/api/services/webcal.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Webcal } from '../models/webcal/webcal'; -import { Entity, EntityService } from 'ngx-entity-service'; +import { EntityService } from 'ngx-entity-service'; import { HttpClient } from '@angular/common/http'; import API_URL from 'src/app/config/constants/apiURL'; diff --git a/src/app/common/filters/task-definition-name.pipe.ts b/src/app/common/filters/task-definition-name.pipe.ts index 155595d2f..8b44a63df 100644 --- a/src/app/common/filters/task-definition-name.pipe.ts +++ b/src/app/common/filters/task-definition-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { Task, TaskDefinition } from '../../api/models/doubtfire-model'; +import { TaskDefinition } from '../../api/models/doubtfire-model'; @Pipe({ name: 'taskDefinitionName', diff --git a/src/app/common/header/unit-dropdown/unit-dropdown.component.ts b/src/app/common/header/unit-dropdown/unit-dropdown.component.ts index abd289cde..eb072d91c 100644 --- a/src/app/common/header/unit-dropdown/unit-dropdown.component.ts +++ b/src/app/common/header/unit-dropdown/unit-dropdown.component.ts @@ -1,5 +1,4 @@ import { Component, Inject, Input, OnInit } from '@angular/core'; -import { UIRouter } from '@uirouter/angular'; import { dateService } from 'src/app/ajs-upgraded-providers'; import { Project, Unit, UnitRole } from 'src/app/api/models/doubtfire-model'; import { MediaObserver } from 'ng-flex-layout'; diff --git a/src/app/common/modals/calendar-modal/calendar-modal.service.ts b/src/app/common/modals/calendar-modal/calendar-modal.service.ts index 37ddb1d51..7e8469b08 100644 --- a/src/app/common/modals/calendar-modal/calendar-modal.service.ts +++ b/src/app/common/modals/calendar-modal/calendar-modal.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; +import { MatDialogRef, MatDialog } from '@angular/material/dialog'; import { CalendarModalComponent } from './calendar-modal.component'; @Injectable({ diff --git a/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts b/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts index 927c861a0..0863fc2b2 100644 --- a/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts +++ b/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; +import { MatDialogRef, MatDialog } from '@angular/material/dialog'; import {TaskAssessmentModalComponent} from './task-assessment-modal.component'; @Injectable({ diff --git a/src/app/common/obect-select/object-select.component.ts b/src/app/common/obect-select/object-select.component.ts index 278925d7a..c1ebbfc85 100644 --- a/src/app/common/obect-select/object-select.component.ts +++ b/src/app/common/obect-select/object-select.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatSelectChange } from '@angular/material/select'; /** diff --git a/src/app/common/pipes/safe.pipe.spec.ts b/src/app/common/pipes/safe.pipe.spec.ts index 283c5ece0..34d0794aa 100644 --- a/src/app/common/pipes/safe.pipe.spec.ts +++ b/src/app/common/pipes/safe.pipe.spec.ts @@ -1,5 +1,3 @@ -import { Sanitizer } from '@angular/core'; -import { DomSanitizer } from '@angular/platform-browser'; import { SafePipe } from './safe.pipe'; describe('SafePipe', () => { diff --git a/src/app/common/project-progress-bar/project-progress-bar.component.ts b/src/app/common/project-progress-bar/project-progress-bar.component.ts index ff9b79ff7..293800b28 100644 --- a/src/app/common/project-progress-bar/project-progress-bar.component.ts +++ b/src/app/common/project-progress-bar/project-progress-bar.component.ts @@ -1,5 +1,4 @@ -import { Component, Input, OnInit, SimpleChanges } from '@angular/core'; -import { Project } from 'src/app/api/models/project'; +import { Component, Input, SimpleChanges } from '@angular/core'; @Component({ selector: 'f-project-progress-bar', diff --git a/src/app/common/services/task-submission.service.ts b/src/app/common/services/task-submission.service.ts index 47249fd97..44d28ddb9 100644 --- a/src/app/common/services/task-submission.service.ts +++ b/src/app/common/services/task-submission.service.ts @@ -1,4 +1,4 @@ -import {Injectable, Inject} from '@angular/core'; +import {Injectable} from '@angular/core'; import {HttpClient} from '@angular/common/http'; import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants'; import {Observable} from 'rxjs'; diff --git a/src/app/common/status-icon/status-icon.component.ts b/src/app/common/status-icon/status-icon.component.ts index 57811fa15..678d00cab 100644 --- a/src/app/common/status-icon/status-icon.component.ts +++ b/src/app/common/status-icon/status-icon.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Inject, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { TaskStatus, TaskStatusEnum } from 'src/app/api/models/task-status'; @Component({ diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts index 5f250b661..079a29bac 100644 --- a/src/app/doubtfire-angular.module.ts +++ b/src/app/doubtfire-angular.module.ts @@ -11,7 +11,6 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; // Lottie animation module import {LottieModule, LottieCacheModule} from 'ngx-lottie'; // eslint-disable-next-line @typescript-eslint/no-unused-vars -import player from 'lottie-web'; import {ClipboardModule} from '@angular/cdk/clipboard'; import {DragDropModule} from '@angular/cdk/drag-drop'; diff --git a/src/app/sessions/service-worker-updater/check-for-update.service.ts b/src/app/sessions/service-worker-updater/check-for-update.service.ts index 409e44471..9ae227cc2 100644 --- a/src/app/sessions/service-worker-updater/check-for-update.service.ts +++ b/src/app/sessions/service-worker-updater/check-for-update.service.ts @@ -1,9 +1,6 @@ import { ApplicationRef, Injectable } from '@angular/core'; import { SwUpdate } from '@angular/service-worker'; -import { interval } from 'rxjs'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { delay } from 'rxjs/operators'; -import { concat } from 'rxjs'; @Injectable() export class CheckForUpdateService { diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts index f41b94401..bbacdbb31 100644 --- a/src/app/sessions/states/sign-in/sign-in.component.ts +++ b/src/app/sessions/states/sign-in/sign-in.component.ts @@ -1,5 +1,5 @@ import { HttpClient } from '@angular/common/http'; -import { Component, Inject, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { StateService, Transition } from '@uirouter/core'; import { AuthenticationService } from 'src/app/api/services/authentication.service'; import { AlertService } from 'src/app/common/services/alert.service'; diff --git a/src/app/tasks/task-comments-viewer/extension-comment/extension-comment.component.ts b/src/app/tasks/task-comments-viewer/extension-comment/extension-comment.component.ts index 27d437d92..5b0f104f6 100644 --- a/src/app/tasks/task-comments-viewer/extension-comment/extension-comment.component.ts +++ b/src/app/tasks/task-comments-viewer/extension-comment/extension-comment.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, Input, Inject} from '@angular/core'; +import {Component, OnInit, Input} from '@angular/core'; import {TaskComment, Task} from 'src/app/api/models/doubtfire-model'; import {ExtensionComment} from 'src/app/api/models/task-comment/extension-comment'; import {AlertService} from 'src/app/common/services/alert.service'; diff --git a/src/app/tasks/task-submission-history/task-submission-history.component.ts b/src/app/tasks/task-submission-history/task-submission-history.component.ts index 916c6cd04..a95619e5e 100644 --- a/src/app/tasks/task-submission-history/task-submission-history.component.ts +++ b/src/app/tasks/task-submission-history/task-submission-history.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, Inject, Input, Output, EventEmitter} from '@angular/core'; +import {Component, OnInit, Input, Output, EventEmitter} from '@angular/core'; import {TaskSubmissionService} from 'src/app/common/services/task-submission.service'; import {Subject} from 'rxjs'; import {OverseerAssessmentService, Task} from 'src/app/api/models/doubtfire-model'; diff --git a/src/app/units/states/edit/directives/unit-students-editor/student-campus-select/student-campus-select.component.ts b/src/app/units/states/edit/directives/unit-students-editor/student-campus-select/student-campus-select.component.ts index 92a80265a..d9c7742b3 100644 --- a/src/app/units/states/edit/directives/unit-students-editor/student-campus-select/student-campus-select.component.ts +++ b/src/app/units/states/edit/directives/unit-students-editor/student-campus-select/student-campus-select.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, Input, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Campus, CampusService, Project, Unit } from 'src/app/api/models/doubtfire-model'; import { MatSelectChange } from '@angular/material/select'; import { AlertService } from 'src/app/common/services/alert.service'; diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts index addb94d83..d4fd6dab9 100644 --- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts +++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject, Input} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {TaskDefinition} from 'src/app/api/models/task-definition'; import {Unit} from 'src/app/api/models/unit'; import {TaskDefinitionService} from 'src/app/api/services/task-definition.service'; diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts index a8915d843..7385e2511 100644 --- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts +++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts @@ -1,5 +1,5 @@ -import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; -import { MatTable, MatTableDataSource } from '@angular/material/table'; +import { Component, Input, ViewChild } from '@angular/core'; +import { MatTable } from '@angular/material/table'; import { TaskDefinition, UploadRequirement } from 'src/app/api/models/task-definition'; import { Unit } from 'src/app/api/models/unit'; diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts index ee0f135c2..ee72dba42 100644 --- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts +++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts @@ -3,7 +3,7 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort, Sort } from '@angular/material/sort'; import { MatTable, MatTableDataSource } from '@angular/material/table'; import { Subscription } from 'rxjs'; -import { confirmationModal, csvResultModalService, csvUploadModalService } from 'src/app/ajs-upgraded-providers'; +import { confirmationModalService, csvResultModalService, csvUploadModalService } from 'src/app/ajs-upgraded-providers'; import { TaskDefinition } from 'src/app/api/models/task-definition'; import { Unit } from 'src/app/api/models/unit'; import { TaskDefinitionService } from 'src/app/api/services/task-definition.service'; @@ -29,9 +29,9 @@ export class UnitTaskEditorComponent implements AfterViewInit { constructor( private taskDefinitionService: TaskDefinitionService, private alerts: AlertService, - @Inject(csvResultModalService) private csvResultModalService: any, + @Inject(csvResultModalService) private csvResultModal: any, @Inject(csvUploadModalService) private csvUploadModal: any, - @Inject(confirmationModal) private confirmationModal: any + @Inject(confirmationModalService) private confirmationModal: any ) {} ngAfterViewInit(): void { @@ -151,7 +151,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { this.unit.getTaskDefinitionBatchUploadUrl(), (response: any) => { // at least one student? - this.csvResultModalService.show('Task Definition Import Results', response); + this.csvResultModal.show('Task Definition Import Results', response); if (response.success.length > 0) { this.unit.refresh(); } @@ -167,7 +167,7 @@ export class UnitTaskEditorComponent implements AfterViewInit { this.unit.taskUploadUrl, (response: any) => { // at least one student? - this.csvResultModalService.show('Task Sheet and Resources Import Results', response); + this.csvResultModal.show('Task Sheet and Resources Import Results', response); if (response.success.length > 0) { this.unit.refresh(); } diff --git a/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.ts b/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.ts index 614021941..a0dd9620b 100644 --- a/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.ts +++ b/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.ts @@ -1,5 +1,5 @@ import { Component, Input, Inject, ViewChild, AfterViewInit } from '@angular/core'; -import { confirmationModal } from 'src/app/ajs-upgraded-providers'; +import { confirmationModalService } from 'src/app/ajs-upgraded-providers'; import { MatSort, Sort } from '@angular/material/sort'; import { MatTableDataSource, MatTable } from '@angular/material/table'; import { @@ -46,7 +46,7 @@ export class UnitTutorialsListComponent extends EntityFormComponent im private tutorialService: TutorialService, private tutorialStreamService: TutorialStreamService, private campusService: CampusService, - @Inject(confirmationModal) private confirmationModal: any, + @Inject(confirmationModalService) private confirmationModal: any, private alerts: AlertService, ) { super( diff --git a/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.ts b/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.ts index 9c558e2e7..256c530fe 100644 --- a/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.ts +++ b/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject, Input} from '@angular/core'; +import {Component, Input} from '@angular/core'; import { ActivityType, ActivityTypeService, diff --git a/src/app/units/states/tasks/tasks-viewer.service.ts b/src/app/units/states/tasks/tasks-viewer.service.ts index f2b2b627e..c3c4485ca 100644 --- a/src/app/units/states/tasks/tasks-viewer.service.ts +++ b/src/app/units/states/tasks/tasks-viewer.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; +import { Subject } from 'rxjs'; import { TaskDefinition } from 'src/app/api/models/task-definition'; @Injectable({