Skip to content

Commit 368a204

Browse files
fix(Create Run Dialog): Show spinner when run is being created (#2174)
1 parent 0ffc146 commit 368a204

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

src/app/teacher/create-run-dialog/create-run-dialog.component.spec.ts

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ import { TeacherService } from '../teacher.service';
33
import { CreateRunDialogComponent } from './create-run-dialog.component';
44
import { MatDialogRef, MatDialog } from '@angular/material/dialog';
55
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
6-
import { MatCheckboxModule } from '@angular/material/checkbox';
7-
import { MatRadioModule } from '@angular/material/radio';
8-
import { ReactiveFormsModule } from '@angular/forms';
96
import { Observable } from 'rxjs';
107
import { of } from 'rxjs';
118
import { Project } from '../../domain/project';
129
import { Run } from '../../domain/run';
13-
import { NO_ERRORS_SCHEMA } from '@angular/core';
1410
import { By } from '@angular/platform-browser';
1511
import { Course } from '../../domain/course';
1612
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
@@ -40,7 +36,7 @@ export class MockTeacherService {
4036
const courses: Course[] = [];
4137
const course = new Course({ id: '1', name: 'Test' });
4238
courses.push(course);
43-
return Observable.create((observer) => {
39+
return new Observable((observer) => {
4440
observer.next(courses);
4541
observer.complete();
4642
});
@@ -106,24 +102,22 @@ describe('CreateRunDialogComponent', () => {
106102
{
107103
provide: MatDialogRef,
108104
useValue: {
109-
afterClosed: () => {
110-
return Observable.create((observer) => {
105+
afterClosed: () =>
106+
new Observable((observer) => {
111107
observer.next({});
112108
observer.complete();
113-
});
114-
},
109+
}),
115110
close: () => {}
116111
}
117112
},
118113
{ provide: MAT_DIALOG_DATA, useValue: { project: project } },
119114
{ provide: Router, useClass: MockRouter }
120-
],
121-
schemas: [NO_ERRORS_SCHEMA]
115+
]
122116
});
123117
fixture = TestBed.createComponent(CreateRunDialogComponent);
124118
component = fixture.componentInstance;
125119
component.project = project;
126-
component.dialog = TestBed.get(MatDialog);
120+
component.dialog = TestBed.inject(MatDialog);
127121
spyOn(component.dialog, 'closeAll').and.callThrough();
128122
fixture.detectChanges();
129123
});

src/app/teacher/create-run-dialog/create-run-dialog.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { provideNativeDateAdapter } from '@angular/material/core';
2323
import { MatIconModule } from '@angular/material/icon';
2424
import { MatTooltipModule } from '@angular/material/tooltip';
2525
import { MatFormFieldModule } from '@angular/material/form-field';
26-
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
2726
import { MatCardModule } from '@angular/material/card';
2827
import { Router } from '@angular/router';
2928
import { finalize } from 'rxjs/operators';
@@ -35,6 +34,7 @@ import { ListClassroomCoursesDialogComponent } from '../list-classroom-courses-d
3534
import { TeacherRun } from '../teacher-run';
3635
import { MatDividerModule } from '@angular/material/divider';
3736
import { MatRadioModule } from '@angular/material/radio';
37+
import { MatProgressBarModule } from '@angular/material/progress-bar';
3838

3939
@Component({
4040
imports: [
@@ -51,7 +51,7 @@ import { MatRadioModule } from '@angular/material/radio';
5151
MatRadioModule,
5252
MatTooltipModule,
5353
MatFormFieldModule,
54-
MatProgressSpinnerModule,
54+
MatProgressBarModule,
5555
MatCardModule
5656
],
5757
providers: [provideNativeDateAdapter()],

0 commit comments

Comments
 (0)