[#11030] Batch download for session-table component

src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap

@@ -19,6 +19,7 @@ exports[`InstructorHomePageComponent should snap when courses are still loading
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -85,6 +86,7 @@ exports[`InstructorHomePageComponent should snap with default fields 1`] = `
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -151,6 +153,7 @@ exports[`InstructorHomePageComponent should snap with one course with error load
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -305,6 +308,7 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -829,6 +833,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -1482,6 +1487,7 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -1743,6 +1749,7 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}
@@ -2032,6 +2039,7 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
   isSendReminderLoading="false"
   navigationService={[Function NavigationService]}
   ngbModal={[Function NgbModal]}
+  progressBarService={[Function ProgressBarService]}
   publishUnpublishRetryAttempts={[Function Number]}
   router={[Function Router]}
   simpleModalService={[Function SimpleModalService]}

src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts

@@ -8,6 +8,7 @@ import { FeedbackQuestionsService } from '../../../services/feedback-questions.s
 import { FeedbackSessionsService } from '../../../services/feedback-sessions.service';
 import { InstructorService } from '../../../services/instructor.service';
 import { NavigationService } from '../../../services/navigation.service';
+import { ProgressBarService } from '../../../services/progress-bar.service';
 import { SimpleModalService } from '../../../services/simple-modal.service';
 import { StatusMessageService } from '../../../services/status-message.service';
 import { StudentService } from '../../../services/student.service';
@@ -84,10 +85,12 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo
               studentService: StudentService,
               instructorService: InstructorService,
               tableComparatorService: TableComparatorService,
-              private simpleModalService: SimpleModalService,
+              simpleModalService: SimpleModalService,
+              progressBarService: ProgressBarService,
               private courseService: CourseService) {
     super(router, instructorService, statusMessageService, navigationService, feedbackSessionsService,
-        feedbackQuestionsService, tableComparatorService, ngbModal, studentService);
+        feedbackQuestionsService, tableComparatorService, ngbModal, simpleModalService,
+        progressBarService, studentService);
   }
 
   ngOnInit(): void {

src/web/app/pages-instructor/instructor-session-base-page.component.ts

@@ -1,12 +1,14 @@
 import { Router } from '@angular/router';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { saveAs } from 'file-saver';
-import { from, Observable, of } from 'rxjs';
-import { catchError, concatMap, finalize, last, switchMap } from 'rxjs/operators';
+import { concat, from, Observable, of } from 'rxjs';
+import { catchError, concatMap, finalize, last, switchMap, takeWhile } from 'rxjs/operators';
 import { FeedbackQuestionsService } from '../../services/feedback-questions.service';
 import { FeedbackSessionsService } from '../../services/feedback-sessions.service';
 import { InstructorService } from '../../services/instructor.service';
 import { NavigationService } from '../../services/navigation.service';
+import { ProgressBarService } from '../../services/progress-bar.service';
+import { SimpleModalService } from '../../services/simple-modal.service';
 import { StatusMessageService } from '../../services/status-message.service';
 import { TableComparatorService } from '../../services/table-comparator.service';
 import {
@@ -21,6 +23,7 @@ import { SortBy, SortOrder } from '../../types/sort-properties';
 import { CopySessionModalResult } from '../components/copy-session-modal/copy-session-modal-model';
 import { ErrorReportComponent } from '../components/error-report/error-report.component';
 import { CopySessionResult, SessionsTableRowModel } from '../components/sessions-table/sessions-table-model';
+import { SimpleModalType } from '../components/simple-modal/simple-modal-type';
 import { ErrorMessageOutput } from '../error-message-output';
 
 /**
@@ -41,7 +44,9 @@ export abstract class InstructorSessionBasePageComponent {
                         protected feedbackSessionsService: FeedbackSessionsService,
                         protected feedbackQuestionsService: FeedbackQuestionsService,
                         protected tableComparatorService: TableComparatorService,
-                        protected ngbModal: NgbModal) { }
+                        protected ngbModal: NgbModal,
+                        protected simpleModalService: SimpleModalService,
+                        protected progressBarService: ProgressBarService) { }
 
   /**
    * Copies a feedback session.
@@ -278,23 +283,65 @@ export abstract class InstructorSessionBasePageComponent {
    * Downloads the result of a feedback session in csv.
    */
   downloadSessionResult(model: SessionsTableRowModel): void {
+    this.feedbackQuestionsService.getFeedbackQuestions({
+      courseId: model.feedbackSession.courseId,
+      feedbackSessionName: model.feedbackSession.feedbackSessionName,
+      intent: Intent.INSTRUCTOR_RESULT,
+    }).subscribe((feedbackQuestions: FeedbackQuestions) => {
+      const questions: FeedbackQuestion[] = feedbackQuestions.questions;
+      this.downloadSessionResultHelper(questions, model);
+    });
+  }
+
+  downloadSessionResultHelper(questions: FeedbackQuestion[], model: SessionsTableRowModel): void {
     this.isResultActionLoading = true;
     const filename: string =
         `${model.feedbackSession.courseId}_${model.feedbackSession.feedbackSessionName}_result.csv`;
     let blob: any;
+    let downloadAborted: boolean = false;
+    const outputData: string[] = [];
+
+    const modalContent: string = 'Downloading the results of your feedback session...';
+    const loadingModal: NgbModalRef = this.simpleModalService.openLoadingModal(
+        'Download Progress', SimpleModalType.LOAD, modalContent);
+    loadingModal.result.then(() => {
+      this.isResultActionLoading = false;
+      downloadAborted = true;
+    });
 
-    this.feedbackSessionsService.downloadSessionResults(
-      model.feedbackSession.courseId,
-      model.feedbackSession.feedbackSessionName,
-      Intent.INSTRUCTOR_RESULT,
-      true,
-      true,
-    ) .pipe(finalize(() => this.isResultActionLoading = false))
-      .subscribe((resp: string) => {
-        blob = new Blob([resp], { type: 'text/csv' });
-        saveAs(blob, filename);
-      }, (resp: ErrorMessageOutput) => {
-        this.statusMessageService.showErrorToast(resp.error.message);
+    concat(
+      ...questions.map((question: FeedbackQuestion) =>
+        this.feedbackSessionsService.downloadSessionResults(
+            model.feedbackSession.courseId,
+            model.feedbackSession.feedbackSessionName,
+            Intent.INSTRUCTOR_RESULT,
+            true,
+            true,
+            question.feedbackQuestionId,
+        ),
+      ),
+    ).pipe(finalize(() => this.isResultActionLoading = false))
+      .pipe(takeWhile(() => this.isResultActionLoading && !downloadAborted))
+      .subscribe({
+        next: (resp: string) => {
+          outputData.push(resp);
+          const numberOfQuestionsDownloaded: number = outputData.length;
+          const totalNumberOfQuestions: number = questions.length;
+          const progressPercentage: number = Math.round(100 * numberOfQuestionsDownloaded / totalNumberOfQuestions);
+          this.progressBarService.updateProgress(progressPercentage);
+        },
+        complete: () => {
+          if (downloadAborted) {
+            return;
+          }
+          loadingModal.close();
+          blob = new Blob(outputData, { type: 'text/csv' });
+          saveAs(blob, filename);
+        },
+        error: (resp: ErrorMessageOutput) => {
+          this.statusMessageService.showErrorToast(resp.error.message);
+          loadingModal.close();
+        },
       });
   }
 

src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts

@@ -13,6 +13,7 @@ import {
 import { FeedbackSessionsService } from '../../../services/feedback-sessions.service';
 import { InstructorService } from '../../../services/instructor.service';
 import { NavigationService } from '../../../services/navigation.service';
+import { ProgressBarService } from '../../../services/progress-bar.service';
 import { SimpleModalService } from '../../../services/simple-modal.service';
 import { StatusMessageService } from '../../../services/status-message.service';
 import { StudentService } from '../../../services/student.service';
@@ -189,14 +190,16 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag
               feedbackQuestionsService: FeedbackQuestionsService,
               tableComparatorService: TableComparatorService,
               ngbModal: NgbModal,
+              simpleModalService: SimpleModalService,
+              progressBarService: ProgressBarService,
               private studentService: StudentService,
               private courseService: CourseService,
               private route: ActivatedRoute,
               private timezoneService: TimezoneService,
-              private simpleModalService: SimpleModalService,
               private changeDetectorRef: ChangeDetectorRef) {
     super(router, instructorService, statusMessageService, navigationService,
-        feedbackSessionsService, feedbackQuestionsService, tableComparatorService, ngbModal);
+        feedbackSessionsService, feedbackQuestionsService, tableComparatorService,
+        ngbModal, simpleModalService, progressBarService);
   }
 
   ngOnInit(): void {

src/web/app/pages-instructor/instructor-session-modal-page.component.ts

@@ -6,6 +6,8 @@ import { FeedbackQuestionsService } from '../../services/feedback-questions.serv
 import { FeedbackSessionsService } from '../../services/feedback-sessions.service';
 import { InstructorService } from '../../services/instructor.service';
 import { NavigationService } from '../../services/navigation.service';
+import { ProgressBarService } from '../../services/progress-bar.service';
+import { SimpleModalService } from '../../services/simple-modal.service';
 import { StatusMessageService } from '../../services/status-message.service';
 import { StudentService } from '../../services/student.service';
 import { TableComparatorService } from '../../services/table-comparator.service';
@@ -47,9 +49,12 @@ export abstract class InstructorSessionModalPageComponent extends InstructorSess
                         feedbackQuestionsService: FeedbackQuestionsService,
                         tableComparatorService: TableComparatorService,
                         ngbModal: NgbModal,
+                        simpleModalService: SimpleModalService,
+                        progressBarService: ProgressBarService,
                         protected studentService: StudentService) {
     super(router, instructorService, statusMessageService, navigationService,
-        feedbackSessionsService, feedbackQuestionsService, tableComparatorService, ngbModal);
+        feedbackSessionsService, feedbackQuestionsService, tableComparatorService,
+        ngbModal, simpleModalService, progressBarService);
   }
 
   /**

src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts

@@ -9,6 +9,8 @@ import { FeedbackQuestionsService } from '../../../services/feedback-questions.s
 import { FeedbackSessionsService, TemplateSession } from '../../../services/feedback-sessions.service';
 import { InstructorService } from '../../../services/instructor.service';
 import { NavigationService } from '../../../services/navigation.service';
+import { ProgressBarService } from '../../../services/progress-bar.service';
+import { SimpleModalService } from '../../../services/simple-modal.service';
 import { StatusMessageService } from '../../../services/status-message.service';
 import { StudentService } from '../../../services/student.service';
 import { TableComparatorService } from '../../../services/table-comparator.service';
@@ -152,11 +154,14 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC
               studentService: StudentService,
               instructorService: InstructorService,
               tableComparatorService: TableComparatorService,
+              simpleModalService: SimpleModalService,
+              progressBarService: ProgressBarService,
               private courseService: CourseService,
               private route: ActivatedRoute,
               private timezoneService: TimezoneService) {
     super(router, instructorService, statusMessageService, navigationService, feedbackSessionsService,
-        feedbackQuestionsService, tableComparatorService, ngbModalService, studentService);
+        feedbackQuestionsService, tableComparatorService, ngbModalService,
+        simpleModalService, progressBarService, studentService);
   }
 
   ngOnInit(): void {