+
+
+ 
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Reply
+
+ ![]()
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ End date : {{ widgetData?.batch?.end | date: "MMM yyyy" }}
+
+
+
Deadline - {{widgetData.content.batch?.endDate | date: "d MMM yyyy"}}
+-
diff --git a/library/ws-widget/collection/src/lib/card-content/card-content.component.scss b/library/ws-widget/collection/src/lib/card-content/card-content.component.scss
index 5fa545555..430595105 100644
--- a/library/ws-widget/collection/src/lib/card-content/card-content.component.scss
+++ b/library/ws-widget/collection/src/lib/card-content/card-content.component.scss
@@ -406,7 +406,7 @@
white-space: initial;
}
- $description-line-count: 3;
+ $description-line-count: 2;
$description-line-height: 21px;
.description-text {
@@ -414,6 +414,8 @@
position: relative;
overflow: hidden;
height: $description-line-count * $description-line-height;
+ white-space: normal;
+ text-overflow: ellipsis;
// line-height: $description-line-height;
}
}
diff --git a/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.html b/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.html
index 8b22bfd59..32d5f810f 100644
--- a/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.html
+++ b/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.html
@@ -83,7 +83,7 @@
View All
- diff --git a/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.ts b/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.ts index 3b4d6261d..d3ae19de0 100644 --- a/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.ts +++ b/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.ts @@ -217,6 +217,7 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent this.fetchFromEnrollmentList(strip, calculateParentStatus) this.fetchRelatedCBP(strip, calculateParentStatus) this.fetchRecommendedCourses(strip, calculateParentStatus) + this.fetchMandatoryCourses(strip, calculateParentStatus) } fetchFromApi(strip: NsContentStripMultiple.IContentStripUnit, calculateParentStatus = true) { if (strip.request && strip.request.api && Object.keys(strip.request.api).length) { @@ -398,9 +399,8 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent ) const viewMoreUrl = showViewMore ? { - path: '/app/globalsearch', + path: '/app/search/learning', queryParams: { - tab: 'Learn', q: strip.request && strip.request.searchV6 && strip.request.searchV6.query, f: strip.request && strip.request.searchV6 && strip.request.searchV6.filters @@ -416,8 +416,9 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent if (courses && courses.length) { content = courses.map(c => { const contentTemp: NsContent.IContent = c.content - contentTemp.completionPercentage = c.completionPercentage || 0 - contentTemp.completionStatus = c.completionStatus || 0 + contentTemp.completionPercentage = c.completionPercentage || c.progress || 0 + contentTemp.completionStatus = c.completionStatus || c.status || 0 + contentTemp.enrolledDate = c.enrolledDate || '' return contentTemp }) } @@ -426,6 +427,7 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent // continue learing strip // if (content && content.length) { // contentNew = content.filter((c: any) => { + // /** commented as both are 0 after enrolll */ // if (c.completionPercentage && c.completionPercentage > 0) { // return c // } @@ -433,7 +435,7 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent // } // To sort in descending order of the enrolled date - contentNew = content.sort((a: any, b: any) => { + contentNew = (content || []).sort((a: any, b: any) => { const dateA: any = new Date(a.enrolledDate || 0) const dateB: any = new Date(b.enrolledDate || 0) return dateB - dateA @@ -531,6 +533,96 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent } } + fetchMandatoryCourses(strip: NsContentStripMultiple.IContentStripUnit, calculateParentStatus = true) { + if (strip.request && strip.request.mandatoryCourses && Object.keys(strip.request.mandatoryCourses).length) { + let userId = '' + let content: NsContent.IContent[] = [] + let contentNew: NsContent.IContent[] = [] + const queryParams = _.get(strip.request.enrollmentList, 'queryParams') + if (this.configSvc.userProfile) { + userId = this.configSvc.userProfile.userId + } + const originalFilters: any = strip.request && + strip.request.mandatoryCourses && + strip.request.mandatoryCourses.request.filters + strip.request.mandatoryCourses.request.filters = this.getFiltersFromArray( + originalFilters, + ) + + this.userSvc.fetchUserBatchList(userId, queryParams).subscribe( + (courses: any) => { + const goals = courses.reduce((acc: any[], cur: any) => { + if (cur && cur.content && cur.content.primaryCategory === NsContent.EPrimaryCategory.MANDATORY_COURSE_GOAL) { + acc.push(cur) + return acc + } + return acc + // tslint:disable-next-line: align + }, []) + const showViewMore = Boolean( + goals.length > 5 && strip.stripConfig && strip.stripConfig.postCardForSearch, + ) + const viewMoreUrl = showViewMore + ? { + path: '/app/learn/mandatory-course', + queryParams: { + tab: 'Learn', + q: strip.request && strip.request.mandatoryCourses && strip.request.mandatoryCourses.query, + f: + strip.request && strip.request.mandatoryCourses && strip.request.mandatoryCourses.filters + ? JSON.stringify( + // this.searchServSvc.transformmandatoryCoursesFilters( + strip.request.mandatoryCourses.filters + // ), + ) + : {}, + }, + } + : null + if (goals && goals.length) { + content = goals.map((c: any) => { + const contentTemp: NsContent.IContent = c.content + contentTemp.batch = c.batch + contentTemp.completionPercentage = c.completionPercentage || 0 + contentTemp.completionStatus = c.completionStatus || 0 + return contentTemp + }) + } + // To filter content with completionPercentage > 0, + // so that only those content will show in home page + // continue learing strip + // if (content && content.length) { + // contentNew = content.filter((c: any) => { + // if (c.completionPercentage && c.completionPercentage > 0) { + // return c + // } + // }) + // } + + // To sort in descending order of the enrolled date + if (content && content.length) { + contentNew = content.sort((a: any, b: any) => { + const dateA: any = new Date(a.enrolledDate || 0) + const dateB: any = new Date(b.enrolledDate || 0) + return dateB - dateA + }) + } + + this.processStrip( + strip, + this.transformContentsToWidgets(contentNew, strip), + 'done', + calculateParentStatus, + viewMoreUrl, + ) + }, + () => { + this.processStrip(strip, [], 'error', calculateParentStatus, null) + } + ) + } + } + fetchRelatedCBP(strip: any, calculateParentStatus = true) { if (strip.request && strip.request.comprelatedCbp && Object.keys(strip.request.comprelatedCbp).length) { // let userId = '' @@ -593,6 +685,7 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent widgetHostClass: 'mb-2', widgetData: { content, + ...(content.batch && { batch: content.batch }), cardSubType: strip.stripConfig && strip.stripConfig.cardSubType, context: { pageSection: strip.key, position: idx }, intranetMode: strip.stripConfig && strip.stripConfig.intranetMode, @@ -728,7 +821,8 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent (strip.request.ids && Object.keys(strip.request.ids).length) || (strip.request.enrollmentList && Object.keys(strip.request.enrollmentList).length) || (strip.request.comprelatedCbp && Object.keys(strip.request.comprelatedCbp).length) || - (strip.request.recommendedCourses && Object.keys(strip.request.recommendedCourses).length) + (strip.request.recommendedCourses && Object.keys(strip.request.recommendedCourses).length) || + (strip.request.mandatoryCourses && Object.keys(strip.request.mandatoryCourses).length) ) ) { return true diff --git a/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.model.ts b/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.model.ts index 41d00ed51..3a58009c2 100644 --- a/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.model.ts +++ b/library/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.model.ts @@ -38,6 +38,7 @@ export namespace NsContentStripMultiple { comprelatedCbp?: any recommendedCourses?: any masterCompetency?: any + mandatoryCourses?: any } searchV6Type?: 'KB' | 'Collections' | 'searchQuery' | null stripBackground?: string diff --git a/library/ws-widget/utils/src/lib/helpers/logout/logout.component.ts b/library/ws-widget/utils/src/lib/helpers/logout/logout.component.ts index 8aefb332a..be45de98d 100644 --- a/library/ws-widget/utils/src/lib/helpers/logout/logout.component.ts +++ b/library/ws-widget/utils/src/lib/helpers/logout/logout.component.ts @@ -30,7 +30,9 @@ export class LogoutComponent implements OnInit { confirmed() { this.disabled = true - this.authSvc.logout() + this.dialogRef.close() + // this.authSvc.logout() + this.authSvc.force_logout() } get isDownloadable() { diff --git a/library/ws-widget/utils/src/lib/services/auth-keycloak.service.ts b/library/ws-widget/utils/src/lib/services/auth-keycloak.service.ts index 52ba68e23..18fcbc145 100644 --- a/library/ws-widget/utils/src/lib/services/auth-keycloak.service.ts +++ b/library/ws-widget/utils/src/lib/services/auth-keycloak.service.ts @@ -138,14 +138,16 @@ export class AuthKeycloakService { redirectUri: redirectUrl, }) } - + /** + * @deprecated this will be depricated + */ async logout(redirectUrl = this.defaultRedirectUrl) { if (storage.getItem('telemetrySessionId')) { storage.removeItem('telemetrySessionId') } try { - sessionStorage.clear(); - localStorage.clear(); + sessionStorage.clear() + localStorage.clear() } catch { } @@ -153,7 +155,7 @@ export class AuthKeycloakService { // alert(`${redirectUrl}apis/reset`) window.location.href = `${redirectUrl}apis/reset` // window.location.href = 'http://localhost:3003/reset' - await this.http.get('/apis/reset').toPromise() + // await this.http.get('/apis/reset').toPromise() // setTimeout(window.location.href = `${redirectUrl}apis/reset`, 13000) // logoutRedirectUrl = redirectUrl // if (this.msAuthSvc.isLogoutRequired) { @@ -162,7 +164,19 @@ export class AuthKeycloakService { // this.keycloakSvc.logout(redirectUrl) // } } + async force_logout() { + if (storage.getItem('telemetrySessionId')) { + storage.removeItem('telemetrySessionId') + } + try { + sessionStorage.clear() + localStorage.clear() + } catch { + } + storage.removeItem(storageKey) + await this.http.get('/apis/reset').toPromise() + } private addKeycloakEventListener() { this.keycloakSvc.keycloakEvents$.subscribe((event: KeycloakEvent) => { switch (event.type) { diff --git a/library/ws-widget/utils/src/lib/services/configurations.service.ts b/library/ws-widget/utils/src/lib/services/configurations.service.ts index 02949dce1..bf7031562 100644 --- a/library/ws-widget/utils/src/lib/services/configurations.service.ts +++ b/library/ws-widget/utils/src/lib/services/configurations.service.ts @@ -63,6 +63,9 @@ export class ConfigurationsService { tourGuideNotifier = new ReplaySubject+ () authChangeNotifier = new ReplaySubject (1) + private updateProfile = new BehaviorSubject(false) + updateProfileObservable = this.updateProfile.asObservable() + // Preference Related Values activeThemeObject: NsInstanceConfig.ITheme | null = null activeFontObject: NsInstanceConfig.IFontSize | null = null @@ -89,4 +92,8 @@ export class ConfigurationsService { // '_', // )}` // setHostPath = (sitePath: string) => (sitePath).replace(':', '_') + + updateGlobalProfile(state: boolean) { + this.updateProfile.next(state) + } } diff --git a/library/ws-widget/utils/src/lib/services/widget-content.model.ts b/library/ws-widget/utils/src/lib/services/widget-content.model.ts index f5cd8745e..7dfaa1cd9 100644 --- a/library/ws-widget/utils/src/lib/services/widget-content.model.ts +++ b/library/ws-widget/utils/src/lib/services/widget-content.model.ts @@ -138,6 +138,7 @@ export namespace NsContent { MTF_QUESTION = 'MTF Question', MULTIPLE_CHOICE_QUESTION = 'Multiple Choice Question', SINGLE_CHOICE_QUESTION = 'Single Choice Question', + MANDATORY_COURSE_GOAL = 'Mandatory Course Goal', // following will not be available soon /** * @deprecated The type should not be used diff --git a/library/ws-widget/utils/src/lib/services/widget-content.service.ts b/library/ws-widget/utils/src/lib/services/widget-content.service.ts index 602e97084..579dda50f 100644 --- a/library/ws-widget/utils/src/lib/services/widget-content.service.ts +++ b/library/ws-widget/utils/src/lib/services/widget-content.service.ts @@ -214,7 +214,8 @@ export class WidgetContentService { content.primaryCategory === NsContent.EPrimaryCategory.RESOURCE || content.primaryCategory === NsContent.EPrimaryCategory.KNOWLEDGE_ARTIFACT || content.primaryCategory === NsContent.EPrimaryCategory.PROGRAM || - content.primaryCategory === NsContent.EPrimaryCategory.PRACTICE_RESOURCE + content.primaryCategory === NsContent.EPrimaryCategory.PRACTICE_RESOURCE || + content.primaryCategory === NsContent.EPrimaryCategory.MANDATORY_COURSE_GOAL ) { return content } diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.html b/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.html index 0faccbc94..5e9a1f10e 100755 --- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.html +++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.html @@ -106,7 +106,8 @@ !( content?.primaryCategory === primaryCategory.COURSE && !batchData?.enrolled ) && - !(content?.primaryCategory === primaryCategory.RESOURCE && !content?.artifactUrl)) + !(content?.primaryCategory === primaryCategory.RESOURCE && !content?.artifactUrl) && + !(content?.primaryCategory === primaryCategory.MANDATORY_COURSE_GOAL)) && !(content?.primaryCategory === primaryCategory.PROGRAM && currentCourseBatchId) "> @@ -145,8 +147,9 @@ -- + + You are not invited for this Program. @@ -162,7 +165,8 @@ isBatchInProgress && (actionBtnStatus === 'grant' && !(isMobile && content?.isInIntranet) && - (content?.primaryCategory === primaryCategory.PROGRAM && currentCourseBatchId)) + (content?.primaryCategory === primaryCategory.PROGRAM && currentCourseBatchId) || + (content?.primaryCategory === primaryCategory.MANDATORY_COURSE_GOAL && currentCourseBatchId) ) "> star_purple500 Rate this - {{content?.primaryCategory}} + + + + {{content?.primaryCategory}} + ++ course + +Edit rating diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.ts b/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.ts index 39e9e3afa..7f8125f1c 100755 --- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.ts +++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.ts @@ -519,7 +519,9 @@ export class AppTocHomeComponent implements OnInit, OnDestroy, AfterViewChecked, private getUserEnrollmentList() { // tslint:disable-next-line - if (this.content && this.content.identifier && this.content.primaryCategory !== this.primaryCategory.COURSE && this.content.primaryCategory !== this.primaryCategory.PROGRAM) { + if (this.content && this.content.identifier && this.content.primaryCategory !== this.primaryCategory.COURSE && + this.content.primaryCategory !== this.primaryCategory.PROGRAM && + this.content.primaryCategory !== this.primaryCategory.MANDATORY_COURSE_GOAL) { // const collectionId = this.isResource ? '' : this.content.identifier return this.getContinueLearningData(this.content.identifier) } diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-single-page/app-toc-single-page.component.ts b/project/ws/app/src/lib/routes/app-toc/components/app-toc-single-page/app-toc-single-page.component.ts index 47a682f13..88dc2042c 100755 --- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-single-page/app-toc-single-page.component.ts +++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-single-page/app-toc-single-page.component.ts @@ -530,7 +530,7 @@ export class AppTocSinglePageComponent implements OnInit, OnChanges, OnDestroy { // this field can be enabled if specific ratings have to be looked up // rating: 0, limit: this.lookupLimit, - updateOn: (this.lastLookUp && this.lastLookUp.updatedon) || '', + ...((this.lastLookUp && this.lastLookUp.updatedon) ? { updateOn: (this.lastLookUp && this.lastLookUp.updatedon) } : null), } this.ratingSvc.getRatingLookup(req).subscribe( (res: any) => { diff --git a/project/ws/app/src/lib/routes/app-toc/models/rating.model.ts b/project/ws/app/src/lib/routes/app-toc/models/rating.model.ts index 5f7b02d52..639d22fe7 100644 --- a/project/ws/app/src/lib/routes/app-toc/models/rating.model.ts +++ b/project/ws/app/src/lib/routes/app-toc/models/rating.model.ts @@ -12,6 +12,6 @@ export namespace NsAppRating { activityType: string, rating?: number, limit: number, - updateOn: string, + updateOn?: string, } } diff --git a/project/ws/app/src/lib/routes/app-toc/services/app-toc.service.ts b/project/ws/app/src/lib/routes/app-toc/services/app-toc.service.ts index 572952cd8..f17c7f208 100755 --- a/project/ws/app/src/lib/routes/app-toc/services/app-toc.service.ts +++ b/project/ws/app/src/lib/routes/app-toc/services/app-toc.service.ts @@ -45,7 +45,6 @@ export class AppTocService { private updateReviews = new BehaviorSubject(false) updateReviewsObservable = this.updateReviews.asObservable() - constructor(private http: HttpClient, private configSvc: ConfigurationsService) { } get subtitleOnBanners(): boolean { diff --git a/project/ws/app/src/lib/routes/competencies/routes/competence-all/competence-all.component.ts b/project/ws/app/src/lib/routes/competencies/routes/competence-all/competence-all.component.ts index 68b9af602..8658ef777 100755 --- a/project/ws/app/src/lib/routes/competencies/routes/competence-all/competence-all.component.ts +++ b/project/ws/app/src/lib/routes/competencies/routes/competence-all/competence-all.component.ts @@ -256,6 +256,7 @@ export class CompetenceAllComponent implements OnInit { // success // this.myCompetencies.push(item) this.snackBar.open(this.successMsg.nativeElement.value, 'X') + this.configSvc.updateGlobalProfile(true) } }, /* tslint:disable */() => { @@ -283,6 +284,7 @@ export class CompetenceAllComponent implements OnInit { if (response) { // success => removed this.snackBar.open(this.successRemoveMsg.nativeElement.value, 'X'); + this.configSvc.updateGlobalProfile(true) } }, /* tslint:disable */() => { diff --git a/project/ws/app/src/lib/routes/competencies/routes/competency-detailed-view/competency-detailed-view.component.ts b/project/ws/app/src/lib/routes/competencies/routes/competency-detailed-view/competency-detailed-view.component.ts index d75a18c8e..c0c51c0b8 100644 --- a/project/ws/app/src/lib/routes/competencies/routes/competency-detailed-view/competency-detailed-view.component.ts +++ b/project/ws/app/src/lib/routes/competencies/routes/competency-detailed-view/competency-detailed-view.component.ts @@ -88,7 +88,6 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { .subscribe((reponse: NSCompetencie.ICompetencieResponse) => { if (reponse.statusInfo && reponse.statusInfo.statusCode === 200) { this.competencyData = reponse.responseData - console.log(this.competencyData) } else { this.competencyData = [] } @@ -133,7 +132,7 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { .first() .value() - console.log(vc) + // console.log(vc) // this.myCompetencies.push(vc) this.addToProfile(vc, levelId, levelName) // this.reset() @@ -151,7 +150,7 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { .first() .value() - console.log(vc) + // console.log(vc) if (vc) { this.removeFromProfile(vc) } @@ -178,6 +177,7 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { this.isAdded = false; // success => removed this.snackBar.open('Removed competency sucessfully', 'X'); + this.configSvc.updateGlobalProfile(true) } }, /* tslint:disable */() => { @@ -201,7 +201,7 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { competencySelfAttestedLevelValue: levelName || '', } - console.log(newCompetence) + // console.log(newCompetence) const updatedProfile = { ...this.currentProfile } if ( _.get(this, 'currentProfile.competencies') && @@ -227,6 +227,7 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { // this.myCompetencies.push(item) this.isAdded = true; this.snackBar.open('Compentency added successfully', 'X') + this.configSvc.updateGlobalProfile(true) } }, /* tslint:disable */() => { @@ -248,7 +249,7 @@ export class CompetencyDetailedViewComponent implements OnInit, OnDestroy { const instance = dialogRef.componentInstance; instance.isUpdate = (this.isAdded) ? true : false; dialogRef.afterClosed().subscribe((response: any) => { - console.log(response) + // console.log(response) if (response && response.action === 'ADD') { this.addCompetency(response.id, response.levelId, response.levelName); // this.refreshData(this.currentActivePage) diff --git a/project/ws/app/src/lib/routes/competencies/services/competence.service.ts b/project/ws/app/src/lib/routes/competencies/services/competence.service.ts index c4eabe704..2803d58e8 100755 --- a/project/ws/app/src/lib/routes/competencies/services/competence.service.ts +++ b/project/ws/app/src/lib/routes/competencies/services/competence.service.ts @@ -5,16 +5,19 @@ import { Observable } from 'rxjs' import { ConfigurationsService } from 'library/ws-widget/utils/src/public-api' import { map } from 'rxjs/operators' import { IUserProfileDetailsFromRegistry } from '../../user-profile/models/user-profile.model' +// tslint:disable +import _ from 'lodash' +// tslint:enable const API_ENDPOINTS = { SEARCH_V6: `/apis/proxies/v8/sunbirdigot/search`, searchCompetency: 'apis/protected/v8/frac/searchNodes', filterByMappings: 'apis/protected/v8/frac/filterByMappings', // searchCompetency: '/apis/protected/v8/competency/searchCompetency', - fetchProfileNyId: (id: string) => `/apis/proxies/v8/api/user/v5/read/${id}`, + fetchProfileNyId: (id: string) => `/apis/proxies/v8/api/user/v2/read/${id}`, // fetchProfile: '/apis/protected/v8/user/profileDetails/getUserRegistry', fetchCompetencyDetails: (id: string, type: string) => `/apis/protected/v8/frac/getNodeById/${id}/${type}`, - fetchProfile: '/apis/proxies/v8/api/user/v5/read', + fetchProfile: '/apis/proxies/v8/api/user/v2/read', updateProfile: '/apis/protected/v8/user/profileDetails/updateUser', fetchWatCompetency: (id: string) => `/apis/protected/v8/workallocation/getUserCompetencies/${id}`, } @@ -45,7 +48,11 @@ export class CompetenceService { fetchProfileById(id: any): Observable { return this.http.get<[IUserProfileDetailsFromRegistry]>(API_ENDPOINTS.fetchProfileNyId(id)) - .pipe(map((res: any) => res.result.response)) + .pipe(map((res: any) => { + // const roles = _.map(_.get(res, 'result.response.roles'), 'role') + // _.set(res, 'result.response.roles', roles) + return _.get(res, 'result.response') + })) } fetchCompetencyDetails(id: any, type: string): Observable { diff --git a/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.html b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.html new file mode 100644 index 000000000..e85ab2058 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.html @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.scss b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.spec.ts b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.spec.ts new file mode 100644 index 000000000..39f186c3f --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing' + +import { MandatoryCourseStatsComponent } from './mandatory-course-stats.component' + +describe('MandatoryCourseStatsComponent', () => { + let component: MandatoryCourseStatsComponent + let fixture: ComponentFixture++++Total course assigned
+{{stats.totalCourses}}
+++In progress
+{{stats.inprogress}}
+++Not started
+{{stats.notStarted}}
+++Completed
+{{stats.completed}}
++ + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [MandatoryCourseStatsComponent], + }) + .compileComponents() + })) + + beforeEach(() => { + fixture = TestBed.createComponent(MandatoryCourseStatsComponent) + component = fixture.componentInstance + fixture.detectChanges() + }) + + it('should create', () => { + expect(component).toBeTruthy() + }) +}) diff --git a/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.ts b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.ts new file mode 100644 index 000000000..3271f28b3 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/components/mandatory-course-stats/mandatory-course-stats.component.ts @@ -0,0 +1,20 @@ +import { Component, OnInit, Input, OnChanges } from '@angular/core' +import { NSMandatoryCourseData } from '../../models/mandatory-course.model' + +@Component({ + selector: 'ws-app-mandatory-course-stats', + templateUrl: './mandatory-course-stats.component.html', + styleUrls: ['./mandatory-course-stats.component.scss'], +}) +export class MandatoryCourseStatsComponent implements OnInit, OnChanges { + @Input() stats!: NSMandatoryCourseData.IMandatoryCourseStats + + constructor() { } + + ngOnInit() { + } + + ngOnChanges() { + } + +} diff --git a/project/ws/app/src/lib/routes/mandatory-course/manadatory-course-routing.module.ts b/project/ws/app/src/lib/routes/mandatory-course/manadatory-course-routing.module.ts new file mode 100644 index 000000000..ba3e4a5a7 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/manadatory-course-routing.module.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core' +import { Routes, RouterModule } from '@angular/router' +import { MandatoryCourseComponent } from './routes/mandatory-course/mandatory-course.component' +import { MandatoryCourseResolverService } from './resolvers/mandatory-course-resolver.service' + +const routes: Routes = [ + { + path: '', + pathMatch: 'full', + redirectTo: 'mandatory-course', + }, + { + path: 'mandatory-course', + component: MandatoryCourseComponent, + data: { + pageId: 'mandatory-course', + module: 'learn', + }, + resolve: { + enrollmentList: MandatoryCourseResolverService, + }, + }, +] + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MandatoryCourseRoutingModule { } diff --git a/project/ws/app/src/lib/routes/mandatory-course/mandatory-course.module.ts b/project/ws/app/src/lib/routes/mandatory-course/mandatory-course.module.ts new file mode 100644 index 000000000..2f3056759 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/mandatory-course.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { MandatoryCourseComponent } from './routes/mandatory-course/mandatory-course.component' +import { MandatoryCourseRoutingModule } from './manadatory-course-routing.module' +import { ReactiveFormsModule, FormsModule } from '@angular/forms' +import { WidgetResolverModule } from '@sunbird-cb/resolver/src/public-api' +import { RouterModule } from '@angular/router' +import { BtnPageBackModule, CardContentModule } from '@sunbird-cb/collection/src/public-api' +import { MatCardModule } from '@angular/material' +import { MandatoryCourseStatsComponent } from './components/mandatory-course-stats/mandatory-course-stats.component' + +@NgModule({ + declarations: [MandatoryCourseComponent, MandatoryCourseStatsComponent], + imports: [ + CommonModule, + MandatoryCourseRoutingModule, + WidgetResolverModule, + ReactiveFormsModule, + FormsModule, + RouterModule, + BtnPageBackModule, + CardContentModule, + MatCardModule, + ], +}) +export class MandatoryCourseModule { } diff --git a/project/ws/app/src/lib/routes/mandatory-course/models/mandatory-course.model.ts b/project/ws/app/src/lib/routes/mandatory-course/models/mandatory-course.model.ts new file mode 100644 index 000000000..2892be9a4 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/models/mandatory-course.model.ts @@ -0,0 +1,8 @@ +export namespace NSMandatoryCourseData { + export interface IMandatoryCourseStats { + totalCourses: number + inprogress: number + notStarted: number + completed: number + } +} diff --git a/project/ws/app/src/lib/routes/mandatory-course/resolvers/mandatory-course-resolver.service.spec.ts b/project/ws/app/src/lib/routes/mandatory-course/resolvers/mandatory-course-resolver.service.spec.ts new file mode 100644 index 000000000..4220e14bf --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/resolvers/mandatory-course-resolver.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing' + +import { MandatoryCourseResolverService } from './mandatory-course-resolver.service' + +describe('MandatoryCourseResolverService', () => { + beforeEach(() => TestBed.configureTestingModule({})) + + it('should be created', () => { + const service: MandatoryCourseResolverService = TestBed.get(MandatoryCourseResolverService) + expect(service).toBeTruthy() + }) +}) diff --git a/project/ws/app/src/lib/routes/mandatory-course/resolvers/mandatory-course-resolver.service.ts b/project/ws/app/src/lib/routes/mandatory-course/resolvers/mandatory-course-resolver.service.ts new file mode 100644 index 000000000..6b3b851d9 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/resolvers/mandatory-course-resolver.service.ts @@ -0,0 +1,34 @@ +import { Injectable } from '@angular/core' +import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router' +import { Observable, of } from 'rxjs' +import { map, catchError } from 'rxjs/operators' +import { WidgetUserService } from '@sunbird-cb/collection' +import { IResolveResponse, ConfigurationsService } from '@sunbird-cb/utils' +@Injectable({ + providedIn: 'root', +}) + +export class MandatoryCourseResolverService implements + Resolve > { + constructor( + private configSvc: ConfigurationsService, + private userSvc: WidgetUserService, + ) { + + } + + resolve( + _route: ActivatedRouteSnapshot, + _state: RouterStateSnapshot, + ): Observable + ++\ No newline at end of file diff --git a/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.scss b/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.scss new file mode 100644 index 000000000..3298670ef --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.scss @@ -0,0 +1,38 @@ +.container-balanced { + max-width: 1202px; + margin-left: auto!important; + margin-right: auto!important; + height: auto; + min-height: 400px; + + @media (max-width:1024px) { + margin-left: 8px!important; + margin-right: 8px!important; + } +} + +.top_card_container { + margin-top: 30px; +} + +.counts-container { + + .counts-box { + border-right: 1px solid RGBA(0, 0, 0, 0.16); + align-items: center; + justify-content: center; + display: flex; + flex-direction: column; + &:last-child{ + border: 0; + } + } +} + +.cards-container{ + align-items: center; + display: grid!important; + grid-gap: 32px; + grid-template-columns: repeat(auto-fill,276px); + justify-content: flex-start; +} diff --git a/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.spec.ts b/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.spec.ts new file mode 100644 index 000000000..18aa83287 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing' + +import { MandatoryCourseComponent } from './mandatory-course.component' + +describe('MandatoryCourseComponent', () => { + let component: MandatoryCourseComponent + let fixture: ComponentFixture+ + ++ ++++ +Mandatory courses
++ ++ ++ ++ ++ No manadatory courses found! +
++ + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [MandatoryCourseComponent], + }) + .compileComponents() + })) + + beforeEach(() => { + fixture = TestBed.createComponent(MandatoryCourseComponent) + component = fixture.componentInstance + fixture.detectChanges() + }) + + it('should create', () => { + expect(component).toBeTruthy() + }) +}) diff --git a/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.ts b/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.ts new file mode 100644 index 000000000..d1d11a860 --- /dev/null +++ b/project/ws/app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.ts @@ -0,0 +1,113 @@ +import { Component, OnInit, OnDestroy, OnChanges, SimpleChanges } from '@angular/core' +import { NsContent } from '@sunbird-cb/collection/src/public-api' +import { ActivatedRoute } from '@angular/router' +import { NSMandatoryCourseData } from '../../models/mandatory-course.model' + +@Component({ + selector: 'ws-app-mandatory-course', + templateUrl: './mandatory-course.component.html', + styleUrls: ['./mandatory-course.component.scss'], +}) +export class MandatoryCourseComponent implements OnInit, OnDestroy, OnChanges { + public displayLoader = false + defaultThumbnail = '' + stateData: { + param: any, path: any + } | undefined + enrolledCourses: any + mandatoryCourses: any + stats: NSMandatoryCourseData.IMandatoryCourseStats = { + totalCourses: 0, + inprogress: 0, + notStarted: 0, + completed: 0, + } + // searchCompArea = new FormControl('') + titles = [ + { title: 'Learn', url: '/page/learn', icon: 'school' }, + { title: 'Manadatory course', url: 'none', icon: '' }, + ] + + constructor( + private route: ActivatedRoute, + ) { + this.stateData = { param: '', path: 'mandatory-course' } + } + + ngOnInit() { + this.enrolledCourses = this.route.snapshot.data.enrollmentList.data + this.getMandatoryCourses() + } + + getMandatoryCourses() { + let content: NsContent.IContent[] = [] + let contentNew: NsContent.IContent[] = [] + const goals = this.enrolledCourses.reduce((acc: any[], cur: any) => { + if (cur && cur.content && cur.content.primaryCategory === NsContent.EPrimaryCategory.MANDATORY_COURSE_GOAL) { + acc.push(cur) + return acc + } + return acc + // tslint:disable-next-line: align + }, []) + + if (goals && goals.length) { + content = goals.map((c: any) => { + const contentTemp: NsContent.IContent = c.content + contentTemp.batch = c.batch + contentTemp.completionPercentage = c.completionPercentage || 0 + contentTemp.completionStatus = c.status || 0 + return contentTemp + }) + } + // To filter content with completionPercentage > 0, + // so that only those content will show in home page + // continue learing strip + // if (content && content.length) { + // contentNew = content.filter((c: any) => { + // if (c.completionPercentage && c.completionPercentage > 0) { + // return c + // } + // }) + // } + + // To sort in descending order of the enrolled date + contentNew = content.sort((a: any, b: any) => { + const dateA: any = new Date(a.enrolledDate || 0) + const dateB: any = new Date(b.enrolledDate || 0) + return dateB - dateA + }) + this.mandatoryCourses = contentNew + this.calculateStats() + } + + calculateStats() { + if (this.mandatoryCourses && this.mandatoryCourses.length) { + this.stats.totalCourses = this.mandatoryCourses.length + this.mandatoryCourses.map((c: any) => { + if ((c.completionPercentage > 0 && c.completionPercentage < 100) || c.completionStatus === 1) { + this.stats.inprogress = this.stats.inprogress + 1 + } + if (c.completionPercentage === 0 || c.completionStatus === 0) { + this.stats.notStarted = this.stats.notStarted + 1 + } + if (c.completionStatus === 2 || c.completionPercentage >= 100) { + this.stats.completed = this.stats.completed + 1 + } + }) + } + } + + ngOnChanges(changes: SimpleChanges) { + if (changes.param.currentValue) { + // this.getSearchedData() + } + } + + ngOnDestroy() { + // if (this.paramSubscription) { + // this.paramSubscription.unsubscribe() + // } + } + +} diff --git a/project/ws/app/src/lib/routes/network-v2/components/connection-name/connection-hover.servive.ts b/project/ws/app/src/lib/routes/network-v2/components/connection-name/connection-hover.servive.ts index 5c678f01c..1d7f573e4 100755 --- a/project/ws/app/src/lib/routes/network-v2/components/connection-name/connection-hover.servive.ts +++ b/project/ws/app/src/lib/routes/network-v2/components/connection-name/connection-hover.servive.ts @@ -10,7 +10,7 @@ import _ from 'lodash' const API_END_POINTS = { // getUserdetailsV2FromRegistry: '/apis/protected/v8/user/profileRegistry/getUserRegistryByUser', - getUserdetailsV2FromRegistry: '/apis/proxies/v8/api/user/v5/read', + getUserdetailsV2FromRegistry: '/apis/proxies/v8/api/user/v2/read', } @Injectable({ @@ -26,6 +26,8 @@ export class ConnectionHoverService { // _.set(profile, '.', _.first(_.get(data, 'result.UserProfile'))) // profile = _.first(_.get(data, 'result.UserProfile')) || null // profile = _.first(_.get(data.result.response, 'result.UserProfile')) || null + // const roles = _.map(_.get(data, 'result.response.roles'), 'role') + // _.set(data, 'result.response.roles', roles) profile = data.result.response return profile }, diff --git a/project/ws/app/src/lib/routes/network-v2/services/network-v2.service.ts b/project/ws/app/src/lib/routes/network-v2/services/network-v2.service.ts index f004e08a9..c5750ff1b 100755 --- a/project/ws/app/src/lib/routes/network-v2/services/network-v2.service.ts +++ b/project/ws/app/src/lib/routes/network-v2/services/network-v2.service.ts @@ -1,17 +1,21 @@ import { Injectable } from '@angular/core' import { HttpClient } from '@angular/common/http' import { NSNetworkDataV2 } from '../models/network-v2.model' +import { map } from 'rxjs/operators' +// tslint:disable +import _ from 'lodash' +// tslint:enable const API_ENDPOINTS = { getRecommendedUsers: '/apis/protected/v8/connections/v2/connections/recommended', createConnection: `/apis/protected/v8/connections/v2/add/connection`, updateConnection: `/apis/protected/v8/connections/v2/update/connection`, - connectionRequests : `/apis/protected/v8/connections/v2/connections/requested`, - connectionRequestsReceived : `/apis/protected/v8/connections/v2/connections/requests/received`, + connectionRequests: `/apis/protected/v8/connections/v2/connections/requested`, + connectionRequestsReceived: `/apis/protected/v8/connections/v2/connections/requests/received`, connectionEstablished: `/apis/protected/v8/connections/v2/connections/established`, getSuggestedUsers: `/apis/protected/v8/connections/v2/connections/suggests`, // getUserdetailsV2FromRegistry: '/apis/protected/v8/user/profileRegistry/getUserRegistryByUser', - getUserdetailsV2FromRegistry: '/apis/proxies/v8/api/user/v5/read', + getUserdetailsV2FromRegistry: '/apis/proxies/v8/api/user/v2/read', } @Injectable({ @@ -25,6 +29,11 @@ export class NetworkV2Service { fetchProfile(userId: string) { return this.http.get (`${API_ENDPOINTS.getUserdetailsV2FromRegistry}/${userId}`) + .pipe(map(res => { + // const roles = _.map(_.get(res, 'result.response.roles'), 'role') + // _.set(res, 'result.response.roles', roles) + return res + })) } diff --git a/project/ws/app/src/lib/routes/profile-v2/services/profile-v2.servive.ts b/project/ws/app/src/lib/routes/profile-v2/services/profile-v2.servive.ts index c2db62115..6dca631d3 100755 --- a/project/ws/app/src/lib/routes/profile-v2/services/profile-v2.servive.ts +++ b/project/ws/app/src/lib/routes/profile-v2/services/profile-v2.servive.ts @@ -2,6 +2,10 @@ import { Injectable } from '@angular/core' import { HttpClient } from '@angular/common/http' import { Observable } from 'rxjs' import { NSProfileDataV2 } from '../models/profile-v2.model' +// tslint:disable +import _ from 'lodash' +// tslint:enable +import { map } from 'rxjs/operators' const PROTECTED_SLAG_V8 = '/apis/protected/v8' @@ -10,7 +14,7 @@ const API_END_POINTS = { PROFILE_DETAIL: `${PROTECTED_SLAG_V8}/social/post/timeline`, SOCIAL_VIEW_CONVERSATION: `${PROTECTED_SLAG_V8}/social/post/viewConversation`, // getUserdetailsV2FromRegistry: '/apis/protected/v8/user/profileRegistry/getUserRegistryByUser', - getUserdetailsV2FromRegistry: '/apis/proxies/v8/api/user/v5/read', + getUserdetailsV2FromRegistry: '/apis/proxies/v8/api/user/v2/read', } @Injectable({ @@ -23,6 +27,11 @@ export class ProfileV2Service { } fetchProfile(userId: string): Observable { return this.http.get (`${API_END_POINTS.getUserdetailsV2FromRegistry}/${userId}`) + .pipe(map(res => { + // const roles = _.map(_.get(res, 'result.response.roles'), 'role') + // _.set(res, 'result.response.roles', roles) + return res + })) } fetchPost(request: any): Observable { diff --git a/project/ws/app/src/lib/routes/user-profile/services/user-profile.service.ts b/project/ws/app/src/lib/routes/user-profile/services/user-profile.service.ts index 92959b1da..ecee12e89 100755 --- a/project/ws/app/src/lib/routes/user-profile/services/user-profile.service.ts +++ b/project/ws/app/src/lib/routes/user-profile/services/user-profile.service.ts @@ -9,10 +9,13 @@ import { IProfileMetaApiData, } from '../models/user-profile.model' import { map } from 'rxjs/operators' +// tslint:disable +import _ from 'lodash' +// tslint:enable const API_ENDPOINTS = { updateProfileDetails: '/apis/protected/v8/user/profileDetails/updateUser', - getUserdetailsFromRegistry: '/apis/proxies/v8/api/user/v5/read', + getUserdetailsFromRegistry: '/apis/proxies/v8/api/user/v2/read', getUserdetails: '/apis/protected/v8/user/details/detailV1', getMasterNationlity: '/apis/protected/v8/user/profileRegistry/getMasterNationalities', getMasterLanguages: '/apis/protected/v8/user/profileRegistry/getMasterLanguages', @@ -50,7 +53,11 @@ export class UserProfileService { } getUserdetailsFromRegistry(wid: string): Observable<[IUserProfileDetailsFromRegistry]> { return this.http.get<[IUserProfileDetailsFromRegistry]>(`${API_ENDPOINTS.getUserdetailsFromRegistry}/${wid}`) - .pipe(map((res: any) => res.result.response)) + .pipe(map((res: any) => { + // const roles = _.map(_.get(res, 'result.response.roles'), 'role') + // _.set(res, 'result.response.roles', roles) + return res.result.response + })) } getAllDepartments() { return this.http.get (API_ENDPOINTS.getAllDepartments) diff --git a/project/ws/app/src/public-api.ts b/project/ws/app/src/public-api.ts index b2c744cb3..72c897651 100755 --- a/project/ws/app/src/public-api.ts +++ b/project/ws/app/src/public-api.ts @@ -35,3 +35,4 @@ export * from './lib/routes/search-v2/searchv2.module' export * from './lib/routes/events/events.module' export * from './lib/routes/browse-by-competency/browse-by-competency.module' export * from './lib/routes/browse-by-provider/browse-by-provider.module' +export * from './lib/routes/mandatory-course/mandatory-course.module' diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 06852e3db..18fa7d1e3 100755 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -19,6 +19,7 @@ import { TncComponent } from './routes/tnc/tnc.component' import { TncAppResolverService } from './services/tnc-app-resolver.service' import { TncPublicResolverService } from './services/tnc-public-resolver.service' import { AppTocResolverService } from '@ws/app/src/lib/routes/app-toc/resolvers/app-toc-resolver.service' +import { PublicLogoutComponent } from './routes/public/public-logout/public-logout.component' // 💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥💥 // Please declare routes in alphabetical order @@ -187,6 +188,21 @@ const routes: Routes = [ pageData: PageResolve, }, }, + { + path: 'app/learn/mandatory-course', + loadChildren: () => + import('./routes/route-mandatory-course.module').then(u => u.RouteMandatoryCourseModule), + canActivate: [GeneralGuard], + data: { + pageType: 'feature', + pageKey: 'mandatory-course', + pageId: 'app/learn/mandatory-course', + module: 'learn', + }, + resolve: { + pageData: PageResolve, + }, + }, { path: 'app/discussion-forum', pathMatch: 'full', @@ -675,6 +691,10 @@ const routes: Routes = [ pageData: PageResolve, }, }, + { + path: 'public/logout', + component: PublicLogoutComponent, + }, { path: 'public/mobile-app', component: MobileAppHomeComponent, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8bc5fa49a..a94f9e5e7 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -66,6 +66,7 @@ import { environment } from 'src/environments/environment' import { QuickTourModule } from '@ws/app/src/lib/routes/info/quick-tour/quick-tour.module' import { AppIntroComponent } from './component/app-intro/app-intro.component' import { NoConnectionComponent } from './component/no-connection/no-connection.component' +import { PublicLogoutModule } from './routes/public/public-logout/public-logout.module' // import { ServiceWorkerModule } from '@angular/service-worker' // import { environment } from '../environments/environment' @@ -139,6 +140,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => { PipeOrderByModule, PublicAboutModule, PublicContactModule, + PublicLogoutModule, MobileAppModule, PipeSafeSanitizerModule, TourModule, diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.html b/src/app/component/app-nav-bar/app-nav-bar.component.html index f984dc231..412b3eb4a 100755 --- a/src/app/component/app-nav-bar/app-nav-bar.component.html +++ b/src/app/component/app-nav-bar/app-nav-bar.component.html @@ -1,4 +1,4 @@ - @@ -77,7 +77,15 @@ + +++ + ++ +
{ if (e instanceof NavigationEnd) { - if ((e.url.includes('/app/setup') && this.configSvc.instanceConfig && !this.configSvc.instanceConfig.showNavBarInSetup)) { + if (e.url.includes('/public/logout')) { + this.showAppNavBar = false + } else if ((e.url.includes('/app/setup') && this.configSvc.instanceConfig && !this.configSvc.instanceConfig.showNavBarInSetup)) { this.showAppNavBar = false } else { this.showAppNavBar = true } - } }) diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts index 91b67e368..0556daef8 100755 --- a/src/app/component/root/root.component.ts +++ b/src/app/component/root/root.component.ts @@ -30,7 +30,6 @@ import { UtilityService, EventService, WsEvents, - AuthKeycloakService, } from '@sunbird-cb/utils' import { delay, first } from 'rxjs/operators' import { MobileAppsService } from '../../services/mobile-apps.service' @@ -81,7 +80,7 @@ export class RootComponent implements OnInit, AfterViewInit { private logger: LoggerService, private swUpdate: SwUpdate, private dialog: MatDialog, - public authSvc: AuthKeycloakService, + // public authSvc: AuthKeycloakService, public configSvc: ConfigurationsService, private valueSvc: ValueService, private telemetrySvc: TelemetryService, @@ -153,8 +152,8 @@ export class RootComponent implements OnInit, AfterViewInit { } @HostListener('window:unload', ['$event']) unloadHandler(event: any) { - if (event && event.type==='unload') { - this.authSvc.logout() + if (event && event.type === 'unload') { + // this.authSvc.logout() } } openIntro() { diff --git a/src/app/guards/general.guard.ts b/src/app/guards/general.guard.ts index 53a407772..c77a8d5e7 100755 --- a/src/app/guards/general.guard.ts +++ b/src/app/guards/general.guard.ts @@ -85,7 +85,7 @@ export class GeneralGuard implements CanActivate { this.configSvc.instanceConfig && !Boolean(this.configSvc.instanceConfig.disablePidCheck) ) { - return this.router.parseUrl('/app/invalid-user') + return this.router.parseUrl('/public/logout') } /** * Test IF User Tnc Is Accepted @@ -109,7 +109,7 @@ export class GeneralGuard implements CanActivate { } if (!this.configSvc.isActive) { this.router.navigateByUrl('/error-access-forbidden') - this.authSvc.logout() + this.authSvc.force_logout() return false } diff --git a/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html new file mode 100644 index 000000000..a8e55f61b --- /dev/null +++ b/src/app/routes/public/public-logout/public-logout.component.html @@ -0,0 +1,25 @@ + +\ No newline at end of file diff --git a/src/app/routes/public/public-logout/public-logout.component.scss b/src/app/routes/public/public-logout/public-logout.component.scss new file mode 100644 index 000000000..1de7f8db3 --- /dev/null +++ b/src/app/routes/public/public-logout/public-logout.component.scss @@ -0,0 +1,57 @@ + body { + font-family: 'Poppins', sans-serif; + position: relative; + letter-spacing: 0.2px; + // background: url(images/Login_background.png) no-repeat center center fixed; + background-size: cover; + } + + .right_container { + background-color: #fff; + width: 45%; + height: 100vh; + box-sizing: border-box; + box-shadow: 0px 20px 60px #3e3e3e29; + } + + .left_container { + padding: 4.5rem 6rem; + box-sizing: border-box; + width: 55%; + height: 100vh; + } + + .logo_box { + width: 320px; + } + + .slider_box { + padding: 5rem 0 2rem 0; + width: 320px; + box-sizing: border-box; + box-sizing: border-box; + } + + .text_box { + margin: 3rem 0; + } + + .right_inner_container { + width: 320px; + } + + .m_b_2 { + margin-bottom: 1rem; + } + + .button { + font-family: 'Poppins', sans-serif; + color: #F9F9F9; + font-size: 14px; + line-height: 19px; + height: 40px; + background-color: rgb(0, 116, 182, 1); + border-radius: 8px; + transition: all .25s ease-in; + width: 100%; + } \ No newline at end of file diff --git a/src/app/routes/public/public-logout/public-logout.component.ts b/src/app/routes/public/public-logout/public-logout.component.ts new file mode 100644 index 000000000..0fb4a50fb --- /dev/null +++ b/src/app/routes/public/public-logout/public-logout.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, OnDestroy } from '@angular/core' +import { ConfigurationsService, NsPage } from '@sunbird-cb/utils' +import { Subscription } from 'rxjs' +import { ActivatedRoute } from '@angular/router' + +@Component({ + selector: 'ws-public-logout', + templateUrl: './public-logout.component.html', + styleUrls: ['./public-logout.component.scss'], +}) +export class PublicLogoutComponent implements OnInit, OnDestroy { + contactUsMail = '' + contactPage: any + platform = 'Learner' + panelOpenState = false + pageNavbar: Partial= this.configSvc.pageNavBar + private subscriptionContact: Subscription | null = null + + constructor( + private configSvc: ConfigurationsService, + private activateRoute: ActivatedRoute, + // private authSvc: AuthKeycloakService, + ) { } + + ngOnInit() { + this.subscriptionContact = this.activateRoute.data.subscribe(data => { + this.contactPage = data.pageData.data + }) + if (this.configSvc.instanceConfig) { + this.contactUsMail = this.configSvc.instanceConfig.mailIds.contactUs + } + // this.authSvc.force_logout().then(() => { }) + } + + ngOnDestroy() { + if (this.subscriptionContact) { + this.subscriptionContact.unsubscribe() + } + } + login() { + const host = window.location.origin + window.location.href = `${host}/protected/v8/resource` + // window.location.reload() + } +} diff --git a/src/app/routes/public/public-logout/public-logout.module.ts b/src/app/routes/public/public-logout/public-logout.module.ts new file mode 100644 index 000000000..965cf32cc --- /dev/null +++ b/src/app/routes/public/public-logout/public-logout.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { PublicLogoutComponent } from './public-logout.component' +import { + MatToolbarModule, + MatCardModule, + MatDividerModule, + MatIconModule, + MatExpansionModule, +} from '@angular/material' +import { BtnPageBackModule } from '@sunbird-cb/collection' +import { PipeSafeSanitizerModule } from '@sunbird-cb/utils' + +@NgModule({ + declarations: [PublicLogoutComponent], + imports: [ + CommonModule, + MatToolbarModule, + MatCardModule, + BtnPageBackModule, + MatDividerModule, + MatIconModule, + MatExpansionModule, + PipeSafeSanitizerModule, + ], + exports: [PublicLogoutComponent], +}) +export class PublicLogoutModule { } diff --git a/src/app/routes/route-mandatory-course.module.ts b/src/app/routes/route-mandatory-course.module.ts new file mode 100644 index 000000000..d92211903 --- /dev/null +++ b/src/app/routes/route-mandatory-course.module.ts @@ -0,0 +1,11 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { MandatoryCourseModule } from '@ws/app' + +@NgModule({ + imports: [CommonModule, MandatoryCourseModule], + exports: [MandatoryCourseModule], +}) +export class RouteMandatoryCourseModule { + +} diff --git a/src/app/services/app-interceptor.service.ts b/src/app/services/app-interceptor.service.ts index 8af9b5724..f5930e152 100755 --- a/src/app/services/app-interceptor.service.ts +++ b/src/app/services/app-interceptor.service.ts @@ -61,14 +61,14 @@ export class AppInterceptorService implements HttpInterceptor { catchError(error => { if (error instanceof HttpErrorResponse) { const localUrl = location.origin - const pagePath = location.href || `${localUrl}/page/home` - const pageName = (location.href || '').replace(localUrl, '') + // const pagePath = `/public/logout` switch (error.status) { case 0: if (localUrl.includes('localhost')) { this.snackBar.open('Please login Again and Apply new TOKEN', undefined, { duration: NOTIFICATION_TIME * 3 }) } - this.authSvc.logout() + // this.authSvc.logout() + this.authSvc.force_logout() break case 200: if (!error.ok && error.url) { @@ -80,14 +80,15 @@ export class AppInterceptorService implements HttpInterceptor { if (localStorage.getItem('telemetrySessionId')) { localStorage.removeItem('telemetrySessionId') } - if (localUrl.includes('localhost')) { - // tslint:disable-next-line: prefer-template - window.location.href = error.error.redirectUrl + `?q= ${pagePath}` - } else { - // tslint:disable-next-line: prefer-template - window.location.href = error.error.redirectUrl + `?q=${pageName} ` - } + // if (localUrl.includes('localhost')) { + // // tslint:disable-next-line: prefer-template + // window.location.href = error.error.redirectUrl + `?q= ${pagePath}` + // } else { + // // tslint:disable-next-line: prefer-template + // window.location.href = error.error.redirectUrl + `?q=${pageName} ` + // } // window.location.href = '/apis/reset' + this.authSvc.force_logout() break } } diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts index 0751dfc72..37a8f8b77 100755 --- a/src/app/services/init.service.ts +++ b/src/app/services/init.service.ts @@ -26,6 +26,7 @@ import { environment } from '../../environments/environment' import _ from 'lodash' import { map } from 'rxjs/operators' import { v4 as uuid } from 'uuid' +import { Subscription } from 'rxjs' // import { of } from 'rxjs' /* tslint:enable */ // interface IDetailsResponse { @@ -43,7 +44,8 @@ interface IFeaturePermissionConfigs { const PROXY_CREATE_V8 = '/apis/proxies/v8' const endpoint = { - profilePid: '/apis/proxies/v8/api/user/v5/read', + profilePid: '/apis/proxies/v8/api/user/v2/read', + fetchProfileById: (id: string) => `/apis/proxies/v8/api/user/v2/read/${id}`, // profileV2: '/apis/protected/v8/user/profileRegistry/getUserRegistryById', // details: `/apis/protected/v8/user/details?ts=${Date.now()}`, CREATE_USER_API: `${PROXY_CREATE_V8}/discussion/user/v1/create`, @@ -54,6 +56,7 @@ const endpoint = { }) export class InitService { private baseUrl = this.configSvc.baseUrl + updateProfileSubscription: Subscription | null = null httpOptions = { headers: new HttpHeaders({ @@ -111,6 +114,12 @@ export class InitService { } async init() { + // to update the profile from user read api + this.updateProfileSubscription = this.configSvc.updateProfileObservable.subscribe(async (value: boolean) => { + if (value) { + await this.fetchUserDetails() + } + }) // this.logger.removeConsoleAccess() await this.fetchDefaultConfig() // const authenticated = await this.authSvc.initAuth() @@ -122,7 +131,10 @@ export class InitService { // } // Invalid User try { - await this.fetchStartUpDetails() // detail: depends only on userID + const path = window.location.pathname + if (!path.startsWith('/public')) { + await this.fetchStartUpDetails() + }// detail: depends only on userID } catch (e) { this.settingsSvc.initializePrefChanges(environment.production) this.updateNavConfig() @@ -260,8 +272,8 @@ export class InitService { userPidProfile = await this.http .get (endpoint.profilePid) .pipe(map((res: any) => { - const roles = _.map(_.get(res, 'result.response.roles'), 'role') - _.set(res, 'result.response.roles', roles) + // const roles = _.map(_.get(res, 'result.response.roles'), 'role') + // _.set(res, 'result.response.roles', roles) return _.get(res, 'result.response') })).toPromise() if (userPidProfile && userPidProfile.roles && userPidProfile.roles.length > 0 && @@ -316,7 +328,7 @@ export class InitService { } } } else { - this.authSvc.logout() + this.authSvc.force_logout() } const details = { group: [], @@ -351,6 +363,108 @@ export class InitService { } } + // This is a replication of fetchStartUpDetails() method + // only change is calling the read api with userID + // since Backend api is failing if we call the read api twice + private async fetchUserDetails(): Promise { + if (this.configSvc.unMappedUser.id) { + let userPidProfile: any | null = null + try { + userPidProfile = await this.http + .get (endpoint.fetchProfileById(this.configSvc.unMappedUser.id)) + .pipe(map((res: any) => { + // const roles = _.map(_.get(res, 'result.response.roles'), 'role') + // _.set(res, 'result.response.roles', roles) + return _.get(res, 'result.response') + })).toPromise() + if (userPidProfile && userPidProfile.roles && userPidProfile.roles.length > 0 && + this.hasRole(userPidProfile.roles)) { + // if (userPidProfile.result.response.organisations.length > 0) { + // const organisationData = userPidProfile.result.response.organisations + // userRoles = (organisationData[0].roles.length > 0) ? organisationData[0].roles : [] + // } + if (localStorage.getItem('telemetrySessionId')) { + localStorage.removeItem('telemetrySessionId') + } + localStorage.setItem('telemetrySessionId', uuid()) + this.configSvc.unMappedUser = userPidProfile + const profileV2 = _.get(userPidProfile, 'profileDetails') + this.configSvc.userProfile = { + country: _.get(profileV2, 'personalDetails.countryCode') || null, + email: _.get(profileV2, 'profileDetails.officialEmail') || userPidProfile.email, + givenName: userPidProfile.firstName, + userId: userPidProfile.userId, + firstName: userPidProfile.firstName, + lastName: userPidProfile.lastName, + rootOrgId: userPidProfile.rootOrgId, + rootOrgName: userPidProfile.channel, + // tslint:disable-next-line: max-line-length + // userName: `${userPidProfile.firstName ? userPidProfile.firstName : ' '}${userPidProfile.lastName ? userPidProfile.lastName : ' '}`, + userName: userPidProfile.userName, + profileImage: userPidProfile.thumbnail, + departmentName: userPidProfile.channel, + dealerCode: null, + isManager: false, + } + this.configSvc.userProfileV2 = { + userId: _.get(profileV2, 'userId') || userPidProfile.userId, + email: _.get(profileV2, 'personalDetails.officialEmail') || userPidProfile.email, + firstName: _.get(profileV2, 'personalDetails.firstname') || userPidProfile.firstName, + surName: _.get(profileV2, 'personalDetails.surname') || userPidProfile.lastName, + middleName: _.get(profileV2, 'personalDetails.middlename') || '', + departmentName: _.get(profileV2, 'employmentDetails.departmentName') || userPidProfile.channel, + givenName: _.get(userPidProfile, 'userName'), + // tslint:disable-next-line: max-line-length + userName: `${_.get(profileV2, 'personalDetails.firstname') ? _.get(profileV2, 'personalDetails.firstname') : ''}${_.get(profileV2, 'personalDetails.surname') ? _.get(profileV2, 'personalDetails.surname') : ''}`, + profileImage: _.get(profileV2, 'photo') || userPidProfile.thumbnail, + dealerCode: null, + isManager: false, + competencies: _.get(profileV2, 'competencies') || [], + } + + if (!this.configSvc.nodebbUserProfile) { + this.configSvc.nodebbUserProfile = { + username: userPidProfile.userName, + email: 'null', + } + } + } else { + this.authSvc.force_logout() + } + const details = { + group: [], + profileDetailsStatus: !!_.get(userPidProfile, 'profileDetails.mandatoryFieldsExists'), + roles: (userPidProfile.roles || []).map((v: { toLowerCase: () => void; }) => v.toLowerCase()), + tncStatus: !userPidProfile.promptTnC, + isActive: !!!userPidProfile.isDeleted, + } + this.configSvc.hasAcceptedTnc = details.tncStatus + this.configSvc.profileDetailsStatus = details.profileDetailsStatus + // this.configSvc.userRoles = new Set((userRoles || []).map(v => v.toLowerCase())) + // const detailsV: IDetailsResponse = await this.http + // .get (endpoint.details).pipe(retry(3)) + // .toPromise() + this.configSvc.userGroups = new Set(details.group) + this.configSvc.userRoles = new Set((details.roles || []).map((v: string) => v.toLowerCase())) + this.configSvc.isActive = details.isActive + return details + } catch (e) { + this.configSvc.userProfile = null + throw new Error('Invalid user') + } + } else { + return { group: [], profileDetailsStatus: true, roles: new Set(['Public']), tncStatus: true, isActive: true } + // const details: IDetailsResponse = await this.http + // .get (endpoint.details).pipe(retry(3)) + // .toPromise() + // this.configSvc.userGroups = new Set(details.group) + // this.configSvc.userRoles = new Set((details.roles || []).map(v => v.toLowerCase())) + // if (this.configSvc.userProfile && this.configSvc.userProfile.isManager) { + // this.configSvc.userRoles.add('is_manager') + } + + } + private async fetchInstanceConfig(): Promise { // TODO: use the rootOrg and org to fetch the instance const publicConfig = await this.http