- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin. To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin. To view sessions from a course in recycle bin, restore the course first.
@@ -205,7 +205,7 @@ exports[`InstructorSessionsPageComponent should snap when feedback sessions are
class="col-12 text-muted"
>
- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin. To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin. To view sessions from a course in recycle bin, restore the course first.
@@ -377,7 +377,7 @@ exports[`InstructorSessionsPageComponent should snap when new session form is ex
>
here
- to create or unarchive a course.
+ to create a course.
@@ -1201,7 +1201,7 @@ exports[`InstructorSessionsPageComponent should snap when new session form is ex
class="text-danger margin-top-20px"
>
- You need to have an active(unarchived) course to create a session!
+ You need to have an active course to create a session!
@@ -1243,7 +1243,7 @@ exports[`InstructorSessionsPageComponent should snap when new session form is ex
class="col-12 text-muted"
>
- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin. To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin. To view sessions from a course in recycle bin, restore the course first.
@@ -1359,7 +1359,7 @@ exports[`InstructorSessionsPageComponent should snap when recycle bin section is
class="col-12 text-muted"
>
- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin. To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin. To view sessions from a course in recycle bin, restore the course first.
@@ -1475,7 +1475,7 @@ exports[`InstructorSessionsPageComponent should snap with active sessions 1`] =
class="col-12 text-muted"
>
- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin. To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin. To view sessions from a course in recycle bin, restore the course first.
@@ -1591,7 +1591,7 @@ exports[`InstructorSessionsPageComponent should snap with default fields 1`] = `
class="col-12 text-muted"
>
- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin. To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin. To view sessions from a course in recycle bin, restore the course first.
You have not created any courses yet, or you have no active courses. Go here to create or unarchive a course.
+ tmRouterLink="/web/instructor/courses">here to create a course.
@@ -56,9 +56,8 @@
- Note: The table above doesn't contain sessions from archived courses and courses in recycle bin.
- To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle
- bin, restore the course first.
+ Note: The table above doesn't contain sessions from courses in recycle bin.
+ To view sessions from a course in recycle bin, restore the course first.
diff --git a/src/web/services/course.service.spec.ts b/src/web/services/course.service.spec.ts
index 89c55fccb7af..4460da5d6ed2 100644
--- a/src/web/services/course.service.spec.ts
+++ b/src/web/services/course.service.spec.ts
@@ -5,7 +5,7 @@ import { CourseService } from './course.service';
import { HttpRequestService } from './http-request.service';
import createSpyFromClass from '../test-helpers/create-spy-from-class';
import { ResourceEndpoints } from '../types/api-const';
-import { CourseArchiveRequest, CourseCreateRequest, CourseUpdateRequest } from '../types/api-request';
+import { CourseCreateRequest, CourseUpdateRequest } from '../types/api-request';
describe('CourseService', () => {
let spyHttpRequestService: any;
@@ -82,14 +82,8 @@ describe('CourseService', () => {
entitytype: 'instructor',
user: googleId,
};
- const archivedCoursesParamMap: { [key: string]: string } = {
- coursestatus: 'archived',
- entitytype: 'instructor',
- user: googleId,
- };
service.getInstructorCoursesInMasqueradeMode(googleId);
expect(spyHttpRequestService.get).toHaveBeenCalledWith(ResourceEndpoints.COURSES, activeCoursesParamMap);
- expect(spyHttpRequestService.get).toHaveBeenCalledWith(ResourceEndpoints.COURSES, archivedCoursesParamMap);
});
it('should execute GET when getting all active instructor courses', () => {
@@ -132,17 +126,6 @@ describe('CourseService', () => {
expect(spyHttpRequestService.delete).toHaveBeenCalledWith(ResourceEndpoints.COURSE, paramMap);
});
- it('should execute PUT to archive course', () => {
- const courseid: string = 'test-id';
- const request: CourseArchiveRequest = {
- archiveStatus: true,
- };
- const paramMap: { [key: string]: string } = { courseid };
- service.changeArchiveStatus(courseid, request);
- expect(spyHttpRequestService.put)
- .toHaveBeenCalledWith(ResourceEndpoints.COURSE_ARCHIVE, paramMap, request);
- });
-
it('should execute PUT to bin course', () => {
const courseid: string = 'test-id';
const paramMap: { [key: string]: string } = { courseid };
diff --git a/src/web/services/course.service.ts b/src/web/services/course.service.ts
index 676a112f557a..bde8496dc9df 100644
--- a/src/web/services/course.service.ts
+++ b/src/web/services/course.service.ts
@@ -1,10 +1,9 @@
import { Injectable } from '@angular/core';
-import { forkJoin, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
import { HttpRequestService } from './http-request.service';
import { ResourceEndpoints } from '../types/api-const';
-import { Course, CourseArchive, Courses, HasResponses, JoinStatus, MessageOutput, Student } from '../types/api-output';
-import { CourseArchiveRequest, CourseCreateRequest, CourseUpdateRequest } from '../types/api-request';
+import { Course, Courses, HasResponses, JoinStatus, MessageOutput, Student } from '../types/api-output';
+import { CourseCreateRequest, CourseUpdateRequest } from '../types/api-request';
/**
* The statistics of a course
@@ -95,22 +94,8 @@ export class CourseService {
entitytype: 'instructor',
user: googleId,
};
- const archivedCoursesParamMap: Record = {
- coursestatus: 'archived',
- entitytype: 'instructor',
- user: googleId,
- };
- return forkJoin([
- this.httpRequestService.get(ResourceEndpoints.COURSES, activeCoursesParamMap),
- this.httpRequestService.get(ResourceEndpoints.COURSES, archivedCoursesParamMap),
- ]).pipe(
- map((vals: Courses[]) => {
- return {
- courses: vals[0].courses.concat(vals[1].courses),
- };
- }),
- );
+ return this.httpRequestService.get(ResourceEndpoints.COURSES, activeCoursesParamMap);
}
/**
@@ -149,14 +134,6 @@ export class CourseService {
return this.httpRequestService.delete(ResourceEndpoints.COURSE, paramMap);
}
- /**
- * Changes the archive status of a course by calling API.
- */
- changeArchiveStatus(courseid: string, request: CourseArchiveRequest): Observable {
- const paramMap: Record = { courseid };
- return this.httpRequestService.put(ResourceEndpoints.COURSE_ARCHIVE, paramMap, request);
- }
-
/**
* Bin (soft-delete) a course by calling API.
*/