update for search filter issue

sunbird-cb · Jan 31, 2024 · fec1880 · fec1880
1 parent 1103b90
commit fec1880
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -71,7 +71,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
     this.tpdsSvc.clearFilter.subscribe((result: any) => {
       if (result && result.status) {
-        this.from = result.from;
+        this.from = result.from
         this.clearFilter()
       }
     })
@@ -281,7 +281,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     this.tpdsSvc.filterToggle.next({ from: '', status: false })
   }
 
-  clearFilter() {    
+  clearFilter() {
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
       this.selectedProviders = []
@@ -293,16 +293,17 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.resetFilter()
     } else {
       this.assigneeFilterObj = { group: [], designation: [] }
+      this.resetAssigneeFilter()
     }
 
     if (this.from === 'content') {
       // this.getFilterData.emit(this.filterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+      //this.tpdsSvc.getFilterDataObject.next(this.filterObj)
     } else {
       // this.getFilterData.emit(this.assigneeFilterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+      //this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
     }
-    
+
     if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
         element['checked'] = false
@@ -409,4 +410,22 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     }
 
   }
+
+  resetAssigneeFilter() {
+    if (this.groupList) {
+      this.groupList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+
+    if (this.designationList) {
+      this.designationList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -42,18 +42,18 @@ export class SearchComponent implements OnInit {
 
     this.tpdsSvc.getFilterDataObject.subscribe(event => {
       if (this.selectedDropDownValue === 'Course' ||
-          this.selectedDropDownValue === 'Standalone Assessment' ||
-          this.selectedDropDownValue === 'Program' ||
-          this.selectedDropDownValue === 'Blended program' ||
-          this.selectedDropDownValue === 'Curated program' ||
-          this.selectedDropDownValue === 'Moderated Course'
+        this.selectedDropDownValue === 'Standalone Assessment' ||
+        this.selectedDropDownValue === 'Program' ||
+        this.selectedDropDownValue === 'Blended program' ||
+        this.selectedDropDownValue === 'Curated program' ||
+        this.selectedDropDownValue === 'Moderated Course'
       ) {
         this.getContent(this.selectedDropDownValue, event)
-      } 
+      }
       if (this.selectedDropDownValue === 'CustomUser') {
         this.getCustomUsers(this.selectedDropDownValue, event)
       }
-      
+
     })
     if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
@@ -89,8 +89,8 @@ export class SearchComponent implements OnInit {
         /* tslint:disable */
         event = !event ? 'Course' : event
         /* tslint:enable */
-        this.searchText = '';
-        this.tpdsSvc.clearFilter.next({from:'content', status: true})
+        this.searchText = ''
+        this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
         this.resetPageIndex()
         this.getContent(event)
         break
@@ -100,7 +100,7 @@ export class SearchComponent implements OnInit {
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
         // }
         /* tslint:disable */
-        this.tpdsSvc.clearFilter.next({from:'assignee', status: true})        
+        this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
         this.resetPageIndex()
         this.searchText = ''
         event = !event ? 'Designation' : event
@@ -122,8 +122,11 @@ export class SearchComponent implements OnInit {
       if (contentType === 'Moderated Course') {
         this.tpdsSvc.moderatedCourseSelectStatus.next(true)
       }
+      if (applyFilterObj && Object.keys(applyFilterObj).length) {
+        this.searchText = ''
+      }
       if (this.searchText) {
-        this.tpdsSvc.clearFilter.next({from:'content', status: true})
+        this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
         /* tslint:disable */
         applyFilterObj = {}
         /* tslint:enable */
@@ -180,8 +183,11 @@ export class SearchComponent implements OnInit {
   getCustomUsers(event: any, applyFilterObj?: any) {
     this.loadingService.changeLoaderState(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    if (applyFilterObj && Object.keys(applyFilterObj).length) {
+      this.searchText = ''
+    }
     if (this.searchText) {
-      this.tpdsSvc.clearFilter.next({from:'assignee', status: true})
+      this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
       /* tslint:disable */
       applyFilterObj = {}
       /* tslint:enable */
@@ -204,7 +210,7 @@ export class SearchComponent implements OnInit {
           'profileDetails',
           'organisations',
         ],
-        limit: 500,
+        limit: 100000,
         offset: 0,
       },
     }