Merge branch 'prod-release-new-home-design' of https://github.com/Sph…

…ere/eagle-fusion into feature/optmization-ui

jest.config.js

@@ -45,7 +45,8 @@ module.exports = {
     '@ws-widget/collection/src/lib/_constants/widget-content.constants': '<rootDir>/library/ws-widget/collection/src/lib/_constants/widget-content.constants.ts',
     '@ws/author/src/public-api': '<rootDir>/project/ws/author/src/public-api.ts',
     '@ws/author$': '<rootDir>/project/ws/author/src/public-api.ts',
-    '@ws-widget/utils/src/lib/services/utility.service': '<rootDir>/library/ws-widget/utils/src/lib/services/utility.service.ts'
+    '@ws-widget/utils/src/lib/services/utility.service': '<rootDir>/library/ws-widget/utils/src/lib/services/utility.service.ts',
+    '^project/ws/app/src/lib/routes/org/org-service.service': '<rootDir>/project/ws/app/src/lib/routes/org/org-service.service.ts'
 
 
 

library/ws-widget/collection/src/lib/_services/widget-content.model.ts

@@ -205,6 +205,8 @@ export namespace NsContent {
     progress: number
     status: number
     userId: string
+    sourceName: string
+    issueCertificate: any
   }
 
   export interface IContentMinimal {

library/ws-widget/collection/src/lib/_services/widget-content.service.ts

@@ -21,7 +21,7 @@ const API_END_POINTS = {
   FETCH_WEB_MODULE_FILES: `${PROTECTED_SLAG_V8}/content/getWebModuleFiles`,
   MULTIPLE_CONTENT: `${PROTECTED_SLAG_V8}/content/multiple`,
   CONTENT_SEARCH_V5: `${PROTECTED_SLAG_V8}/content/searchV5`,
-  PUBLIC_CONTENT_SEARCH: `${PUBLIC_SLAG}/publicSearch/getCourses`,
+  PUBLIC_CONTENT_SEARCH: `${PUBLIC_SLAG}/ratingsSearch/getCourses`,
   CONTENT_SEARCH_V6: `/apis/proxies/v8/sunbirdigot/read`,
   CONTENT_SEARCH_REGION_RECOMMENDATION: `${PROTECTED_SLAG_V8}/content/searchRegionRecommendation`,
   CONTENT_HISTORY: `${PROTECTED_SLAG_V8}/user/history`,
@@ -41,7 +41,7 @@ const API_END_POINTS = {
   LOGIN_USER: `/apis/public/v8/emailMobile/auth`,
   FETCH_USER_ENROLLMENT_LIST: (userId: string | undefined) =>
     // tslint:disable-next-line: max-line-length
-    `/apis/proxies/v8/learner/course/v1/user/enrollment/list/${userId}?orgdetails=orgName,email&licenseDetails=name,description,url&fields=contentType,topic,name,channel,mimeType,appIcon,gradeLevel,resourceType,thumbnail,identifier,medium,pkgVersion,board,subject,trackable,posterImage,duration,creatorLogo,license&batchDetails=name,endDate,startDate,status,enrollmentType,createdBy,certificates`,
+    `/apis/proxies/v8/learner/course/v1/user/enrollment/list/${userId}?orgdetails=orgName,email&licenseDetails=name,description,url&fields=contentType,sourceName,issueCertification,topic,name,channel,mimeType,appIcon,gradeLevel,resourceType,thumbnail,identifier,medium,pkgVersion,board,subject,trackable,posterImage,duration,creatorLogo,license&batchDetails=name,endDate,startDate,status,enrollmentType,createdBy,certificates`,
   COURSE_RECOMENDATION: (profession: string) =>
     `${PUBLIC_SLAG}/mobileApp/courseRemommendationv2?profession=${profession}`,
 }

library/ws-widget/collection/src/lib/_services/widget-user.service.ts

@@ -11,7 +11,7 @@ const API_END_POINTS = {
     `${PROTECTED_SLAG_V8}/user/group/fetchUserGroup?userId=${userId}`,
   FETCH_USER_ENROLLMENT_LIST: (userId: string | undefined) =>
     // tslint:disable-next-line: max-line-length
-    `/apis/proxies/v8/learner/course/v1/user/enrollment/list/${userId}?orgdetails=orgName,email&licenseDetails=name,description,url&fields=contentType,topic,name,channel,mimeType,appIcon,gradeLevel,resourceType,identifier,medium,pkgVersion,thumbnail,board,subject,trackable,posterImage,duration,creatorLogo,license&batchDetails=name,endDate,startDate,status,enrollmentType,createdBy,certificates`,
+    `/apis/proxies/v8/learner/course/v1/user/enrollment/list/${userId}?orgdetails=orgName,email&licenseDetails=name,description,url&fields=contentType,topic,name,channel,mimeType,appIcon,gradeLevel,resourceType,identifier,medium,pkgVersion,thumbnail,board,subject,trackable,posterImage,duration,creatorLogo,license,sourceName,issueCertification&batchDetails=name,endDate,startDate,status,enrollmentType,createdBy,certificates`,
   // tslint:disable-next-line:max-line-length
   FETCH_USER_ENROLLMENT_LIST_V2: (userId: string | undefined, orgdetails: string, licenseDetails: string, fields: string, batchDetails: string) =>
     // tslint:disable-next-line:max-line-length

library/ws-widget/collection/src/lib/btn-feature/btn-feature.component.ts

@@ -9,7 +9,6 @@ import { MobileAppsService } from '../../../../../../src/app/services/mobile-app
 import { BtnFeatureService } from './btn-feature.service'
 import { SearchApiService } from '@ws/app/src/lib/routes/search/apis/search-api.service'
 import { SignupService } from 'src/app/routes/signup/signup.service'
-import { Location } from '@angular/common'
 import { appNavBarService } from 'src/app/component/app-nav-bar/app-nav-bar.service'
 
 export const typeMap = {
@@ -64,7 +63,6 @@ export class BtnFeatureComponent extends WidgetBaseComponent
     // private tour: CustomTourService,
     private searchApi: SearchApiService,
     private signupService: SignupService,
-    location: Location,
     public navOption: appNavBarService
   ) {
     super()
@@ -85,7 +83,6 @@ export class BtnFeatureComponent extends WidgetBaseComponent
       }
     })
 
-    console.log(location.path(), window.location.href, 'btn-feature')
     if (window.location.href.includes('/app/profile-view')) {
       if (window.location.href.includes('/hi/app/profile-view')) {
         this.currentText = 'अकाउंट'
@@ -119,7 +116,6 @@ export class BtnFeatureComponent extends WidgetBaseComponent
     } else {
       this.currentText = ''
     }
-    console.log(this.currentText, 'btn-122')
   }
 
   updateBadge() {
@@ -141,7 +137,6 @@ export class BtnFeatureComponent extends WidgetBaseComponent
   async redirect(text: any) {
     let local = (this.configSvc.unMappedUser && this.configSvc.unMappedUser!.profileDetails && this.configSvc.unMappedUser!.profileDetails!.preferences && this.configSvc.unMappedUser!.profileDetails!.preferences!.language !== undefined) ? this.configSvc.unMappedUser.profileDetails.preferences.language : location.href.includes('/hi/') === true ? 'hi' : 'en'
     let url1 = local === 'hi' ? 'hi' : ""
-    console.log(url1)
     let url3 = `${document.baseURI}`
     if (url3.includes('hi')) {
       url3 = url3.replace(/hi\//g, '')
@@ -178,9 +173,7 @@ export class BtnFeatureComponent extends WidgetBaseComponent
       let url = `${text.url}`
       location.href = `${url3}${url1}${url}`
     } else {
-      console.log(this.configSvc.unMappedUser!.profileDetails!.profileReq!.personalDetails!)
       let result = await this.signupService.getUserData()
-      console.log(result)
       if (result && result.profileDetails!.profileReq!.personalDetails!.dob) {
         this.currentText = text.name
         let url = '/app/profile-view'