Issue #ED-2783 merge: Merge pull request #3478 from Ajoymaity/releas…

…e-6.0.0_v13 Issue #ED-2783 fix: Fixed multiple issue for profile update navigation, content player back button issue and update profile
Sunbird-Ed · Sep 4, 2023 · 225abf2 · 225abf2
2 parents e02fbc5 + e0e0071
commit 225abf2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/app/content-details/content-details.page.spec.ts b/src/app/content-details/content-details.page.spec.ts
@@ -899,6 +899,7 @@ describe('ContentDetailsPage', () => {
             mockContentService.getContentDetails = jest.fn(() => of({ contentData: { size: '12KB', status: 'Retired' } }));
             mockCommonUtilService.showToast = jest.fn();
             mockLocation.back = jest.fn();
+            contentDetailsPage.navigateBackFlag = false; 
             jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
             jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
                 return Promise.resolve();
@@ -937,6 +938,7 @@ describe('ContentDetailsPage', () => {
                 dismiss: dismissFn,
             }));
             contentDetailsPage.isDownloadStarted = false;
+            contentDetailsPage.navigateBackFlag = false; 
             mockLocation.back = jest.fn();
             // act
             contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
@@ -964,6 +966,7 @@ describe('ContentDetailsPage', () => {
                 dismiss: dismissFn,
             }));
             contentDetailsPage.isDownloadStarted = true;
+            contentDetailsPage.navigateBackFlag = false; 
             mockLocation.back = jest.fn();
             // act
             contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
@@ -991,6 +994,7 @@ describe('ContentDetailsPage', () => {
                 dismiss: dismissFn,
             }));
             contentDetailsPage.isDownloadStarted = true;
+            contentDetailsPage.navigateBackFlag = false; 
             mockLocation.back = jest.fn();
             // act
             contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);

diff --git a/src/app/content-details/content-details.page.ts b/src/app/content-details/content-details.page.ts
@@ -195,6 +195,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
   nextContentToBePlayed: any;
   isPlayerPlaying = false;
   showMoreFlag: any = false;
+  navigateBackFlag = false;
   @ViewChild('video') video: ElementRef | undefined;
 
   constructor(
@@ -537,7 +538,10 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
         } else {
           this.commonUtilService.showToast('ERROR_CONTENT_NOT_AVAILABLE');
         }
-        this.location.back();
+        if (!this.navigateBackFlag) {
+          this.navigateBackFlag = true;
+          this.location.back();
+        }
       });
   }
 

diff --git a/src/app/district-mapping/district-mapping.page.ts b/src/app/district-mapping/district-mapping.page.ts
@@ -275,7 +275,7 @@ export class DistrictMappingPage implements OnDestroy {
                 this.location.back();
             } else if (this.profile && this.source === PageId.PROFILE) {
                 this.location.back();
-                this.events.publish('UPDATE_TABS', {type: 'SWITCH_TABS_USERTYPE'});
+              //  this.events.publish('UPDATE_TABS', {type: 'SWITCH_TABS_USERTYPE'});
             } else {
               if (this.profile && !isSSOUser) {
                 await this.appGlobalService.showYearOfBirthPopup(this.profile.serverProfile);