Merge pull request #3674 from swetha-aggidevara/test_release_2.8.0

Issue #SB-18079 fix: changed terms of use message

src/app/client/projects/desktop/src/app/modules/user-profile/components/about-us/about-us.component.spec.data.ts

@@ -33,9 +33,10 @@ export const appInfoResponse = {
         stmsg: {
             m0129: 'Loading the Terms and Conditions.',
         },
-        emsg: {
-            desktop: {
-                termsOfUse: 'Unable to get Terms Of Use. Please Try Again Later...'
+        desktop: {
+            emsg: {
+                termsOfUse: 'Unable to get Terms Of Use. Please Try Again Later...',
+                noConnectionTerms: 'Connect to the Internet to view the Terms of Use'
             }
         }
     }

src/app/client/projects/desktop/src/app/modules/user-profile/components/about-us/about-us.component.spec.ts

@@ -95,18 +95,28 @@ describe('AboutUsComponent', () => {
   });
 
   it('should display terms and conditions loader', () => {
+    component.isConnected = true;
     component.toggleTocModal();
     expect(component.showLoader).toBeTruthy();
     expect(component.showModal).toBeTruthy();
   });
 
-  it('should change display modal', () => {
+  it('should change display modal and message to be termsOfUse', () => {
     component.termsIframe = {nativeElement: {contentWindow: {document: {title: 'Error'}}}};
     spyOn(component['toasterService'], 'error');
     component.isIFrameLoaded();
     expect(component.showLoader).toBeFalsy();
     expect(component.showModal).toBeFalsy();
-    expect(component['toasterService'].error).toHaveBeenCalledWith(appInfoResponse.resourceBundle.messages.emsg.desktop.termsOfUse);
+    expect(component['toasterService'].error).toHaveBeenCalledWith(appInfoResponse.resourceBundle.messages.desktop.emsg.termsOfUse);
+  });
+
+  it('should change display modal and message to be noConnectionTerms ', () => {
+    spyOn(component['toasterService'], 'error');
+    component.isConnected = false;
+    component.toggleTocModal();
+    expect(component.showLoader).toBeFalsy();
+    expect(component.showModal).toBeFalsy();
+    expect(component['toasterService'].error).toHaveBeenCalledWith(appInfoResponse.resourceBundle.messages.desktop.emsg.noConnectionTerms);
   });
 
 });

src/app/client/projects/desktop/src/app/modules/user-profile/components/about-us/about-us.component.ts

@@ -4,7 +4,7 @@ import { takeUntil } from 'rxjs/operators';
 import { ResourceService, ServerResponse, ILoaderMessage, ToasterService } from '@sunbird/shared';
 import { Component, OnInit, OnDestroy, ElementRef, ViewChild } from '@angular/core';
 import * as _ from 'lodash-es';
-import { AppUpdateService } from './../../../offline/services';
+import { AppUpdateService, ConnectionService } from './../../../offline/services';
 import { Subject } from 'rxjs';
 import { Router, ActivatedRoute } from '@angular/router';
 @Component({
@@ -22,13 +22,15 @@ export class AboutUsComponent implements OnInit, OnDestroy {
   public telemetryTermsOfUseEData: IInteractEventEdata;
   showModal = false;
   showLoader = true;
+  isConnected;
   loaderMessage: ILoaderMessage = {};
   currentYear;
   @ViewChild('termsIframe') termsIframe: ElementRef;
 
   constructor(public resourceService: ResourceService, private appUpdateService: AppUpdateService,
     private router: Router, public activatedRoute: ActivatedRoute,
-    private toasterService: ToasterService
+    private toasterService: ToasterService,
+    private connectionService: ConnectionService
     ) {}
 
   ngOnInit() {
@@ -38,7 +40,13 @@ export class AboutUsComponent implements OnInit, OnDestroy {
     };
     this.instance = _.upperCase(this.resourceService.instance);
     this.getAppInfo();
+    this.checkOnlineStatus();
+  }
 
+  checkOnlineStatus() {
+    this.connectionService.monitor().pipe(takeUntil(this.unsubscribe$)).subscribe(isConnected => {
+      this.isConnected = isConnected;
+    });
   }
 
   getAppInfo() {
@@ -58,14 +66,17 @@ export class AboutUsComponent implements OnInit, OnDestroy {
   }
 
   toggleTocModal() {
-      this.showLoader = this.showModal = true;
+    this.showLoader = this.showModal = this.isConnected;
+    if (!this.isConnected) {
+      this.toasterService.error(this.resourceService.messages.desktop.emsg.noConnectionTerms);
+    }
   }
 
   isIFrameLoaded() {
     this.showLoader = false;
     if (this.termsIframe.nativeElement.contentWindow.document.title === 'Error') {
       this.showModal = false;
-      this.toasterService.error(this.resourceService.messages.emsg.desktop.termsOfUse);
+      this.toasterService.error(this.resourceService.messages.desktop.emsg.termsOfUse);
     }
   }
 

src/app/resourcebundles/data/consumption/en.properties

@@ -1128,8 +1128,6 @@ frmelmnts.lbl.downloadAppRecommended = Recommended for your PC
 frmelmnts.lbl.downloadAppOtherversions = Other versions
 frmelmnts.lbl.desktop.telemetry = Telemetry
 frmelmnts.lbl.desktop.termsOfUse = Terms of Use
-messages.emsg.desktop.termsOfUse = Unable to display Terms Of Use. Try again \
-    later
 frmelmnts.lbl.section = Section
 frmelmnts.lbl.desktop.storageSpaceRunningOutHeader = Insufficient storage space
 frmelmnts.lbl.desktop.failedListLabel = Could not download or import file(s). Remove unwanted files from your computer and try again
@@ -1148,5 +1146,8 @@ frmelmnts.btn.addedToLibrary = Added To Library
 frmelmnts.lbl.useThis = Use this:
 frmelmnts.lbl.noResultFoundFor = No results found for "{query}" from
 frmelmnts.lbl.content.COPYRIGHT = COPYRIGHT
+frmelmnts.desktop.btn.completing = completing
 messages.emsg.m0076= No data available to download 
-frmelmnts.desktop.btn.completing = completing
\ No newline at end of file
+messages.desktop.emsg.termsOfUse = Unable to display Terms Of Use. Try again \
+    later
+messages.desktop.emsg.noConnectionTerms = Connect to the Internet to view the Terms of Use
\ No newline at end of file