Merge remote-tracking branch 'upstream/release-1.7' into content-permission

dial-code-page/public/script.js

@@ -7,20 +7,18 @@
     tenantId = getUrlParameter('tenant');
     $('#loader').hide(); // hide loader on page load
     $('#noResultMessage').hide(); // hide no result found message
-    if (dialcode) {
-      $('#searchSection').hide();
-      $('#resultSection').show();
-      $('#resultPageHeader').text("Dial Code '" + dialcode + "'");
-    } else {
-      $('#searchSection').show();
-      $('#resultSection').hide();
-    }
+    dialcode ? navigateToResultPage() : navigateToSearchPage()
     getTenantInfo(tenantId);
     getOrgInfo(tenantId).done(function () {
       initTelemetryService();
       logImpressionEvent();
     });
-    if (typeof dialcode === "string") searchDialCode(dialcode);
+    searchDialCode(dialcode);
+  }
+
+  function navigateToSearchPage() {
+    $('#searchSection').show();
+    $('#resultSection').hide();
   }
 
   function getUrlParameter(param) {
@@ -37,18 +35,22 @@
   // Attach keypress event to search input
   $("#searchInput").keypress(function (event) {
     if (event.which == 13) {
-      var dialCode = $("#searchInput").val();
-      if (dialCode.length === 6) {
-        searchDialCode(dialCode);
-        $('#searchSection').hide();
-        $('#resultSection').show(); //show result page
-        $('#resultPageHeader').text("Dial Code '" + dialCode + "'");
-        // log impression event on navigating to result page
+      dialcode = $("#searchInput").val();
+      if (dialcode.length === 6) {
+        searchDialCode(dialcode);
+        navigateToResultPage();
+        // on navigate generate Impression event
         logImpressionEvent();
       }
     }
   });
 
+  function navigateToResultPage() {
+    $('#searchSection').hide();
+    $('#resultSection').show(); //show result page
+    $('#resultPageHeader').text("Dial Code '" + dialcode + "'");
+  }
+
   // to search dial code
   function searchDialCode(id) {
     $('#loader').show();
@@ -66,7 +68,7 @@
     })
       .done(function (response) {
         $('#loader').hide();
-        console.log('composite search response', response);
+        // console.log('composite search response', response);
         if (response && response.responseCode === "OK") {
           response.result.count && response.result.content.forEach(function (data) {
             createCard(data);
@@ -156,7 +158,7 @@
       uid: 'anonymous',
       sid: window.uuidv1(),
       channel: orgInfo.channel,
-      env: 'dialcode-search-page',
+      env: 'public',
       enableValidation: true
     }
   }
@@ -169,25 +171,25 @@
   function logImpressionEvent() {
     var options = {
       context: {
-        env: 'dialcode-search-page',
+        env: 'public',
         channel: orgInfo.channel,
         uid: 'anonymous',
         cdata: [],
         rollup: getRollupData([orgInfo.rootOrgId])
       },
-      object: {
+      object: dialcode ? {
         id: dialcode,
         type: 'dialcode',
         ver: '1.0',
         rollup: {}
-      },
+      } : {},
       tags: [orgInfo.rootOrgId]
     };
     var edata = {
       type: 'view',
       pageid: 'get',
       subtype: 'paginate',
-      uri: window.location.href || "",
+      uri: '/get',
       visits: []
     };
     window.EkTelemetry.impression(edata, options);

src/app/client/src/app/modules/core/components/main-header/main-header.component.html

@@ -66,7 +66,7 @@
         <div class="one wide tablet computer only column"></div>
     </div>
 </div>
-<app-main-menu></app-main-menu>
+<span *ngIf="!showExploreHeader"><app-main-menu></app-main-menu></span>
 
 <div *ngIf="showExploreHeader" class="ui fluid container">
     <div class="ui grid margin-none">
@@ -76,7 +76,7 @@
                 <div class="one wide column"></div>
                 <div class="two wide column">
                     <a (click)="navigateToHome()">
-                        <img [class.header-logo-before-login]="!userService.userid" [class.header-logo]="userService.userid" class="image centered"
+                        <img class="image centered header-logo-before-login"
                             alt={{tenantName}} src="{{logo}}">
                     </a>
                 </div>
@@ -107,7 +107,7 @@
             <div class="ui grid margin-none">
                 <div class="three wide column padding-10">
                     <a (click)="navigateToHome()">
-                        <img [class.header-logo-before-login]="!userService.userid" [class.header-logo]="userService.userid" class="image centered"
+                        <img class="image centered header-logo-before-login"
                             alt={{tenantName}} src="{{logo}}">
                     </a>
                 </div>

src/app/client/src/app/modules/public/components/public-collection-player/public-collection-player.component.html

@@ -52,3 +52,4 @@
     <div class="one wide column"></div>
   </div>
 </div>
+<app-public-footer *ngIf="showFooter"></app-public-footer>

src/app/client/src/app/modules/public/components/public-collection-player/public-collection-player.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
 import { PublicPlayerService } from './../../services';
 import { Observable } from 'rxjs/Observable';
 import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
+import { DeviceDetectorService } from 'ngx-device-detector';
 import {
   WindowScrollService, RouterNavigationService, ILoaderMessage, PlayerConfig,
   ICollectionTreeOptions, NavigationHelperService, ResourceService
@@ -55,6 +56,8 @@ export class PublicCollectionPlayerComponent implements OnInit, OnDestroy {
 
   public loader: Boolean = true;
 
+  public showFooter: Boolean = false;
+
   private subsrciption: Subscription;
   public closeCollectionPlayerInteractEdata: IInteractEventEdata;
   public telemetryInteractObject: IInteractEventObject;
@@ -81,7 +84,7 @@ export class PublicCollectionPlayerComponent implements OnInit, OnDestroy {
 
   constructor(contentService: ContentService, route: ActivatedRoute, playerService: PublicPlayerService,
     windowScrollService: WindowScrollService, router: Router, public navigationHelperService: NavigationHelperService,
-    public resourceService: ResourceService, private activatedRoute: ActivatedRoute) {
+    public resourceService: ResourceService, private activatedRoute: ActivatedRoute, private deviceDetectorService: DeviceDetectorService) {
     this.contentService = contentService;
     this.route = route;
     this.playerService = playerService;
@@ -92,6 +95,7 @@ export class PublicCollectionPlayerComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.getContent();
     this.setInteractEventData();
+    this.deviceDetector();
   }
   setTelemetryData() {
     this.telemetryImpression = {
@@ -220,4 +224,10 @@ export class PublicCollectionPlayerComponent implements OnInit, OnDestroy {
       ver: '1.0'
     };
   }
+  deviceDetector() {
+    const deviceInfo = this.deviceDetectorService.getDeviceInfo();
+    if ( deviceInfo.device === 'android' || deviceInfo.os === 'android') {
+      this.showFooter = true;
+    }
+  }
 }

src/app/client/src/app/modules/public/components/public-content-player/public-content-player.component.html

@@ -82,3 +82,4 @@
   </div>
   <div class="one wide column"></div>
 </div>
+<app-public-footer *ngIf="showFooter"></app-public-footer>

src/app/client/src/app/modules/public/components/public-content-player/public-content-player.component.ts

@@ -2,6 +2,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ContentService, UserService } from '@sunbird/core';
+import { DeviceDetectorService } from 'ngx-device-detector';
 import * as _ from 'lodash';
 import { Observable } from 'rxjs/Observable';
 import {
@@ -46,11 +47,13 @@ export class PublicContentPlayerComponent implements OnInit {
    */
   selectedLanguage: string;
   queryParams: any;
+
+  public showFooter: Boolean = false;
   contentData: ContentData;
   constructor(public activatedRoute: ActivatedRoute, public userService: UserService,
     public resourceService: ResourceService, public toasterService: ToasterService,
     public windowScrollService: WindowScrollService, public playerService: PublicPlayerService,
-    public navigationHelperService: NavigationHelperService, public router: Router
+    public navigationHelperService: NavigationHelperService, public router: Router, private deviceDetectorService: DeviceDetectorService
   ) {
   }
   /**
@@ -62,6 +65,7 @@ export class PublicContentPlayerComponent implements OnInit {
       this.contentId = params.contentId;
       this.setTelemetryData();
       this.getContent();
+      this.deviceDetector();
     });
   }
   setTelemetryData() {
@@ -117,4 +121,11 @@ export class PublicContentPlayerComponent implements OnInit {
   close() {
     this.navigationHelperService.navigateToResource('/explore/1');
   }
+
+  deviceDetector() {
+    const deviceInfo = this.deviceDetectorService.getDeviceInfo();
+    if ( deviceInfo.device === 'android' || deviceInfo.os === 'android') {
+      this.showFooter = true;
+    }
+  }
 }

src/app/client/src/app/modules/public/public.module.ts

@@ -17,6 +17,8 @@ import { SharedModule } from '@sunbird/shared';
 import { PublicRoutingModule } from './public-routing.module';
 import { TelemetryModule } from '@sunbird/telemetry';
 import { NgInviewModule } from 'angular-inport';
+import { DeviceDetectorModule } from 'ngx-device-detector';
+import { DeviceDetectorService } from 'ngx-device-detector';
 
 @NgModule({
   imports: [
@@ -29,10 +31,11 @@ import { NgInviewModule } from 'angular-inport';
     // DiscussionModule,
     PublicRoutingModule,
     TelemetryModule,
-    NgInviewModule
+    NgInviewModule,
+    DeviceDetectorModule
   ],
   declarations: [LandingPageComponent, SignupComponent, GetComponent, DialCodeComponent,
     PublicFooterComponent, PublicContentPlayerComponent, PublicCollectionPlayerComponent, ExploreContentComponent],
-  providers: [SignupService, PublicPlayerService, OrgManagementService]
+  providers: [SignupService, PublicPlayerService, OrgManagementService, DeviceDetectorService]
 })
 export class PublicModule { }

src/app/client/src/app/modules/search/components/user-filter/user-filter.component.html

@@ -27,7 +27,7 @@
                 </div>
                 <div class="two wide column ">
                   <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Grades" [options]="options" [hasLabels]=false
-                  placeholder="Grades"  #multiSelect>
+                  placeholder="Class"  #multiSelect>
                     <sui-select-option *ngFor="let grades of searchGrades" [value]="grades"> </sui-select-option>
                   </sui-multi-select>