From 1c3e58691332d916f0d2075a440dae7d3be5ce01 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Mon, 5 Feb 2024 16:46:07 +0530 Subject: [PATCH 1/2] Issue #ED-3356 fix: Fixed filter and label translate issue --- .../content-details/content-details.page.html | 2 +- .../guest-profile/guest-profile.page.ts | 2 +- src/app/search/search.page.ts | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/app/content-details/content-details.page.html b/src/app/content-details/content-details.page.html index 3d46e45220..cc8a37d22e 100644 --- a/src/app/content-details/content-details.page.html +++ b/src/app/content-details/content-details.page.html @@ -238,7 +238,7 @@
{{content?.description}}
-
{{category.label}}
+
{{category.label | translateJson}}
{{content?.contentData[category.alterNativeCode]}}
{{content?.contentData[category.code]}}
diff --git a/src/app/profile/guest-profile/guest-profile.page.ts b/src/app/profile/guest-profile/guest-profile.page.ts index 9c929798e2..818572d852 100644 --- a/src/app/profile/guest-profile/guest-profile.page.ts +++ b/src/app/profile/guest-profile/guest-profile.page.ts @@ -330,7 +330,7 @@ export class GuestProfilePage implements OnInit { e['value'] = this.categoryDetails[e.identifier] } }); - this.supportedProfileAttributes = categories.supportedAttributes; + // this.supportedProfileAttributes = categories.supportedAttributes; } }).catch(e => console.error(e)); } diff --git a/src/app/search/search.page.ts b/src/app/search/search.page.ts index 8f39324463..c3a0551429 100644 --- a/src/app/search/search.page.ts +++ b/src/app/search/search.page.ts @@ -155,6 +155,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWi enableSearch = false; searchInfolVisibility = 'show'; refresh: boolean = false; + frameworkCategory: any; @ViewChild('contentView', { static: false }) contentView: IonContent; headerObservable: Subscription; @@ -257,10 +258,13 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWi await this.headerService.showHeaderWithHomeButton(['download', 'notification']); } this.handleDeviceBackButton(); - let frameworkCategory = this.appGlobalService.getCachedFrameworkCategory(); - this.getCategoriesKeyForContent(frameworkCategory.id); + + let framework = this.appGlobalService.getCachedFrameworkCategory(); + let frameworkId = this.profile.syllabus[0] || framework.id; + this.frameworkCategory = framework.value; + this.getCategoriesKeyForContent(frameworkId); const rootOrgId = this.onboardingConfigurationService.getAppConfig().overriddenDefaultChannelId; - this.searchFilterConfig = await this.formAndFrameworkUtilService.getFrameworkCategoryFilter(frameworkCategory.id, {...FormConstants.SEARCH_FILTER, framework: frameworkCategory.id, rootOrgId: rootOrgId}); + this.searchFilterConfig = await this.formAndFrameworkUtilService.getFrameworkCategoryFilter(frameworkId, {...FormConstants.SEARCH_FILTER, framework: frameworkId, rootOrgId: rootOrgId}); if ((this.source === PageId.GROUP_DETAIL && this.isFirstLaunch) || this.preAppliedFilter) { this.isFirstLaunch = false; await this.handleSearch(true); @@ -852,6 +856,14 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWi } }); }); + if (!this.frameworkCategory) { + this.frameworkCategory = await this.formAndFrameworkUtilService.invokedGetFrameworkCategoryList(this.profile.syllabus[0]) + } + this.frameworkCategory.forEach((e) => { + if (e.alternative && element.name === e.code) { + element['alternative'] = e.alternative; + } + }) await this.router.navigate(['/filters'], { state: { filterCriteria: this.responseData.filterCriteria, From 71545d923541aa4218efbadb6cd18e1b0b840aeb Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Mon, 5 Feb 2024 23:11:56 +0530 Subject: [PATCH 2/2] Issue #ED-3356 fix: Fixed filter issue --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index de51946c92..e7351e0f87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6086,9 +6086,9 @@ } }, "@project-sunbird/sunbird-sdk": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-sdk/-/sunbird-sdk-7.0.13.tgz", - "integrity": "sha512-p9k2BPaM5pWQJ09kmreqcUxqO4kpy+8mv30DOrNz8S74GBEEsmdd4fukNP/+3Hhyki+25V5zP3fi4E0pefjSdg==", + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-sdk/-/sunbird-sdk-7.0.14.tgz", + "integrity": "sha512-oiF1YxDvBuqsTnBdqZP8CEvQkTI7XlNDqac1uz4QT/LvCGZ61rvCri3nRBIPhKw84Wx4XJ9wXhCHV53PSyOmdA==", "requires": { "crypto-js": "3.1.9-1", "dayjs": "^1.9.8", diff --git a/package.json b/package.json index e571f49c58..5048032c1b 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@project-sunbird/sunbird-epub-player-v9": "5.2.1", "@project-sunbird/sunbird-pdf-player-v9": "5.1.1", "@project-sunbird/sunbird-quml-player-v9": "5.0.2", - "@project-sunbird/sunbird-sdk": "7.0.13", + "@project-sunbird/sunbird-sdk": "7.0.14", "@project-sunbird/sunbird-video-player-web-component": "^1.0.1", "chart.js": "^2.9.4", "chartjs-plugin-datalabels": "^0.7.0",