Issue #ED-4150 merge: Merge pull request #3598 from Ajoymaity/release…

…-7.0.0 Issue #ED-4150 fix: Fixed the changed category unselected issue on library page header
Sunbird-Ed · Apr 25, 2024 · 0a054a5 · 0a054a5
2 parents a44c874 + c8c5b5f
commit 0a054a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/src/app/faq-help/faq-help.page.ts b/src/app/faq-help/faq-help.page.ts
@@ -286,7 +286,7 @@ export class FaqHelpPage implements OnInit {
       Environment.USER,
       PageId.FAQ);
 
-    const formConfig = await this.formAndFrameworkUtilService.getFormConfig();
+    let formConfig = await this.formAndFrameworkUtilService.getHelpIssueFormConfig(this.appGlobalService.getCurrentUser().syllabus[0] || '*');
     this.appGlobalService.formConfig = formConfig;
     await this.router.navigate([RouterLinks.FAQ_REPORT_ISSUE], {
       state: {

diff --git a/src/app/faq-report-issue/faq-report-issue.page.ts b/src/app/faq-report-issue/faq-report-issue.page.ts
@@ -166,7 +166,7 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
     const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
       from: CachedItemRequestSourceFrom.SERVER,
       language: this.translate.currentLang,
-      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+      requiredCategories: this.appGlobalService.getRequiredCategories()
     };
 
     this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
@@ -550,15 +550,12 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
       console.error('Telemetry Data Sync Error: ', error);
     });
     await that.zone.run(async () => {
-      if (status.error) {
-        await loader.dismiss();
-        return;
-      } else if (!status.syncedEventCount) {
+      if (status?.error || !status?.syncedEventCount) {
         await loader.dismiss();
         return;
       }
 
-      this.generateInteractEvent(InteractType.OTHER, InteractSubtype.MANUALSYNC_SUCCESS, status.syncedFileSize, correlationlist);
+      this.generateInteractEvent(InteractType.OTHER, InteractSubtype.MANUALSYNC_SUCCESS, status?.syncedFileSize || '', correlationlist);
       await loader.dismiss();
     });
   }
@@ -633,12 +630,8 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
     switch (type) {
       case 'board':
         return this.frameworkCommonFormConfigBuilder.getBoardConfigOptionsBuilder(this.profile);
-      case 'medium':
-        return this.frameworkCommonFormConfigBuilder.getMediumConfigOptionsBuilder(this.profile);
-      case 'grade':
-        return this.frameworkCommonFormConfigBuilder.getGradeConfigOptionsBuilder(this.profile);
-      case 'subject':
-        return this.frameworkCommonFormConfigBuilder.getSubjectConfigOptionsBuilder(this.profile);
+      default:
+        return this.frameworkCommonFormConfigBuilder.getFrameworkConfigOptionsBuilder(type);
     }
   }
 

diff --git a/src/app/resources/resources.component.ts b/src/app/resources/resources.component.ts
@@ -754,6 +754,7 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy, Fra
           selectedCategory = this.profile.serverProfile.framework[categories[2].code]
         }
         this.categoryGradeLevelsArray = res.map(a => (a.name));
+        selectedCategory = this.classSelected.length ? this.categoryGradeLevelsArray[this.classSelected[0]] : selectedCategory;
         if (this.searchGroupingContents && this.searchGroupingContents.combination[this.category3Code]!) {
           const indexOfselectedClass =
             this.categoryGradeLevelsArray.indexOf(this.searchGroupingContents.combination[this.category3Code]!);
@@ -836,7 +837,7 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy, Fra
 
   async mediumClickHandler(index: number, mediumName, isMediumClicked?: boolean) {
     if (isMediumClicked) {
-      this.generateMediumInteractTelemetry(mediumName, this.getGroupByPageReq.medium[0]);
+      this.generateMediumInteractTelemetry(mediumName, this.getGroupByPageReq[this.category2Code][0]);
     }
     this.getGroupByPageReq[this.category2Code] = [mediumName];
     if (this.currentMedium !== mediumName && isMediumClicked) {

diff --git a/src/services/formandframeworkutil.service.ts b/src/services/formandframeworkutil.service.ts
@@ -626,8 +626,9 @@ export class FormAndFrameworkUtilService {
         });
     }
 
-    async getFormConfig() {
-        return (await this.getFormFields(FormConstants.DYNAMIC_FORM_CONFIG).then() as any);
+    async getHelpIssueFormConfig(framework) {
+        let rootOrgId = await this.preferences.getString('defaultRootOrgId').toPromise();
+        return (await this.getFormFields({...FormConstants.DYNAMIC_FORM_CONFIG, framework, rootOrgId}, rootOrgId).then() as any);
     }
 
     async getStateContactList() {