From 1cf3ba9bb8573a4b9ffe82dd1822320fbabd7587 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 22 Feb 2023 14:18:56 +0530 Subject: [PATCH 1/2] Issue #ED-1309 fix: Fixed blank screen when user clicks on 'Start learning' button --- .../enrolled-course-details-page.ts | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.ts b/src/app/enrolled-course-details-page/enrolled-course-details-page.ts index 16c659f4fa..772028d147 100644 --- a/src/app/enrolled-course-details-page/enrolled-course-details-page.ts +++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.ts @@ -1406,10 +1406,14 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo private async startContent() { if (this.courseHeirarchy && this.courseHeirarchy.children && this.courseHeirarchy.children.length && !this.isBatchNotStarted) { - if (this.nextContent && !this.nextContent) { - this.initNextContent(); + if (!this.nextContent) { + await this.getContentState(true).then(() => { + this.navigateToContentDetails(this.nextContent, 1); + }); + } else { + this.navigateToContentDetails(this.nextContent, 1); } - this.navigateToContentDetails(this.nextContent, 1); + // this.navigateToContentDetails(this.nextContent, 1); } else { this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE', this.datePipe.transform(this.courseStartDate, 'mediumDate'))); @@ -1420,7 +1424,13 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo * Function gets executed when user click on resume course button. */ async resumeContent(): Promise { - this.navigateToContentDetails(this.nextContent, 1); + if (!this.nextContent) { + await this.getContentState(true).then(() => { + this.navigateToContentDetails(this.nextContent, 1); + }); + } else { + this.navigateToContentDetails(this.nextContent, 1); + } this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.RESUME_CLICKED, @@ -1907,7 +1917,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo this.courseUtilService.showCredits(this.course, this.pageId, undefined, this.corRelationList); } - getContentState(returnRefresh: boolean) { + async getContentState(returnRefresh: boolean) { if (this.courseCardData.batchId) { const request: GetContentStateRequest = { userId: this.appGlobalService.getUserId(), @@ -1917,7 +1927,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo batchId: this.courseCardData.batchId, fields: ['progress', 'score'] }; - this.courseService.getContentState(request).toPromise() + await this.courseService.getContentState(request).toPromise() .then((contentStateResponse: ContentStateResponse) => { this.contentStatusData = contentStateResponse; From 12d1514e65c340c8ab0ce7ca60d93babca5bdc0a Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 22 Feb 2023 14:34:15 +0530 Subject: [PATCH 2/2] Issue #ED-1309 text: Fixed unit test --- .../enrolled-course-details-page.spec.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts b/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts index 058c90f600..07de6d69df 100644 --- a/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts +++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts @@ -2065,6 +2065,9 @@ describe('EnrolledCourseDetailsPage', () => { } ] }; + jest.spyOn(enrolledCourseDetailsPage, 'getContentState').mockImplementation(() => { + return Promise.resolve(); + }); enrolledCourseDetailsPage.contentStatusData = { contentList: [ {