@sunbird-cb/cbp-ai 0.1.88 → 0.1.90

package/fesm2022/sunbird-cb-cbp-ai.mjs

@@ -11376,57 +11376,55 @@ class RoleMappingGenerationComponent {
     }
     getMinistryData() {
         this.apiLoading = true;
-        this.sharedService.getMinistryData(this.selectedMinistryType).subscribe((data) => {
-            console.log('data--', data);
-            this.ministryFullData = data;
-            this.apiLoading = false;
-            this.ministryData = [];
-            if (this.selectedMinistryType === 'ministry') {
-                data.forEach((item) => {
-                    if (item?.sbOrgType === 'ministry') {
-                        this.ministryData.push(item);
-                    }
-                });
-            }
-            else if (this.selectedMinistryType === 'state') {
-                data.forEach((item) => {
-                    if (item?.sbOrgType === 'state') {
-                        this.ministryData.push(item);
-                    }
-                });
-            }
-            this.getUserProfileData();
+        const requestedType = this.selectedMinistryType;
+        return new Promise((resolve) => {
+            this.sharedService.getMinistryData(requestedType).subscribe((data) => {
+                console.log('data--', data);
+                this.apiLoading = false;
+                // Ignore stale responses from a type that was changed again before this one returned
+                if (requestedType !== this.selectedMinistryType) {
+                    resolve();
+                    return;
+                }
+                this.ministryFullData = data;
+                this.ministryData = [];
+                if (requestedType === 'ministry') {
+                    data.forEach((item) => {
+                        if (item?.sbOrgType === 'ministry') {
+                            this.ministryData.push(item);
+                        }
+                    });
+                }
+                else if (requestedType === 'state') {
+                    data.forEach((item) => {
+                        if (item?.sbOrgType === 'state') {
+                            this.ministryData.push(item);
+                        }
+                    });
+                }
+                this.getUserProfileData(requestedType, resolve);
+            });
         });
     }
     async onMinistryTypeChange(event) {
         console.log('event', event);
-        if (this.login) {
-            await this.getMinistryData();
-        }
         this.sharedService.cbpPlanFinalObj['ministryType'] = event.value;
         this.sharedService.cbpPlanFinalObj['role_mapping_generation'] = [];
         this.selectedMinistryType = event.value;
-        localStorage.setItem('cbpPlanFinalObj', JSON.stringify(this.sharedService.cbpPlanFinalObj));
         this.ministryData = [];
+        if (this.login) {
+            await this.getMinistryData();
+        }
+        localStorage.setItem('cbpPlanFinalObj', JSON.stringify(this.sharedService.cbpPlanFinalObj));
         if (event?.value === 'state') {
             this.roleMappingForm.get('ministry')?.setValue(null);
             this.roleMappingForm.get('sectors')?.setValue([]);
             this.roleMappingForm.get('departments')?.setValue([]);
-            this.ministryFullData.forEach((item) => {
-                if (item?.type === 'state') {
-                    this.ministryData.push(item);
-                }
-            });
         }
         else if (event?.value === 'ministry') {
             this.roleMappingForm.get('ministry')?.setValue(null);
             this.roleMappingForm.get('sectors')?.setValue([]);
             this.roleMappingForm.get('departments')?.setValue([]);
-            this.ministryFullData.forEach((item) => {
-                if (item?.type === 'central') {
-                    this.ministryData.push(item);
-                }
-            });
         }
         this.sharedService.cbpPlanFinalObj['ministry'] = '';
         this.sharedService.cbpPlanFinalObj['department_name'] = '';
@@ -11967,20 +11965,26 @@ class RoleMappingGenerationComponent {
                 input.value = '';
         }
     }
-    getUserProfileData() {
+    getUserProfileData(requestedType, done) {
         this.sharedService.getUserProfile().subscribe((data) => {
             console.log('data--', data);
             localStorage.setItem('userProfile', JSON.stringify(data));
             this.loginUserOrgIds = data?.organization_ids;
+            // Ignore stale responses from a type that was changed again before this one returned
+            if (requestedType && requestedType !== this.selectedMinistryType) {
+                done?.();
+                return;
+            }
             let filteredMinistryData = [];
             this.ministryFullData.map((item) => {
-                if (this.loginUserOrgIds.indexOf(item?.identifier) > -1) {
+                if (this.loginUserOrgIds.indexOf(item?.identifier) > -1 && item?.sbOrgType === (requestedType || this.selectedMinistryType)) {
                     filteredMinistryData.push(item);
                 }
             });
             this.ministryData = filteredMinistryData;
             this.originalMinistryData = filteredMinistryData;
             this.filteredList = filteredMinistryData;
+            done?.();
         });
     }
     onOpened(opened) {
@@ -12057,9 +12061,6 @@ class DeleteRoleMappingComponent {
         this.planData = data;
     }
     deleteRoleMapping() {
-        // this.sharedService.deleteRoleMapping(this.planData.id).subscribe(()=>{
-        //   this.dialogRef.close('saved')
-        // })
         this.sharedService.deleteRoleMapping(this.planData.id).subscribe({
             next: () => {
                 this.dialogRef.close('saved');
@@ -14374,39 +14375,8 @@ class RoleMappingListComponent {
         });
         dialogRef.afterClosed().subscribe(result => {
             if (result === 'saved') {
-                console.log('Changes saved!');
-                // Refresh data or show a toast here
-                console.log(this.sharedService.cbpPlanFinalObj);
-                if (this.sharedService.cbpPlanFinalObj && this.sharedService.cbpPlanFinalObj.ministry && this.sharedService.cbpPlanFinalObj.ministry.identifier &&
-                    this.sharedService.cbpPlanFinalObj.ministry?.sbOrgType === 'ministry') {
-                    if (this.sharedService.cbpPlanFinalObj.departments) {
-                        this.sharedService.getRoleMappingByStateCenterAndDepartment(this.sharedService.cbpPlanFinalObj.ministry.identifier, this.sharedService.cbpPlanFinalObj.departments).subscribe((res) => {
-                            console.log('res', res);
-                            this.dataSource = new MatTableDataSource(res);
-                            this.dataSource.paginator = this.paginator;
-                            this.originalData = res;
-                            console.log('this.dataSource', this.dataSource);
-                        });
-                    }
-                    else {
-                        this.sharedService.getRoleMappingByStateCenter(this.sharedService.cbpPlanFinalObj.ministry.identifier).subscribe((res) => {
-                            console.log('res', res);
-                            this.dataSource = new MatTableDataSource(res);
-                            this.dataSource.paginator = this.paginator;
-                            this.originalData = res;
-                            console.log('this.dataSource', this.dataSource);
-                        });
-                    }
-                }
-                else {
-                    this.sharedService.getRoleMappingByStateCenterAndDepartment(this.sharedService.cbpPlanFinalObj.ministry.identifier, this.sharedService.cbpPlanFinalObj.departments).subscribe((res) => {
-                        console.log('res', res);
-                        this.dataSource = new MatTableDataSource(res);
-                        this.dataSource.paginator = this.paginator;
-                        this.originalData = res;
-                        console.log('this.dataSource', this.dataSource);
-                    });
-                }
+                this.selection.clear();
+                this.loadRoleMappingList();
             }
         });
     }
@@ -14496,11 +14466,9 @@ class RoleMappingListComponent {
                                 console.log('matchedRoleMapping', matchedRoleMapping);
                                 this.matchedRoleMappingData = matchedRoleMapping?.matched_details || [];
                                 this.matchedRoleMapping = matchedRoleMapping?.matched_count;
-                                this.matchedDesignationNames =
-                                    matchedRoleMapping?.matched_details?.map(x => x.igot_designation_name?.toLowerCase()) || [];
-                                const matchedNames = matchedRoleMapping?.matched_details?.map(x => x.igot_designation_name?.trim().toLowerCase()) || [];
-                                this.matchedDesignationSet = new Set(matchedNames);
-                                this.matchedRoleMapping = matchedNames.length;
+                                const matchedRoleMappingIds = matchedRoleMapping?.matched_details?.map(x => x.role_mapping_id) || [];
+                                this.matchedDesignationSet = new Set(matchedRoleMappingIds);
+                                this.matchedRoleMapping = matchedRoleMappingIds.length;
                                 this.unMatchedRoleMapping = this.masterData.length - this.matchedRoleMapping;
                                 this.applyAllFilters();
                             });
@@ -14539,11 +14507,9 @@ class RoleMappingListComponent {
                         console.log('matchedRoleMapping', matchedRoleMapping);
                         this.matchedRoleMappingData = matchedRoleMapping?.matched_details || [];
                         this.matchedRoleMapping = matchedRoleMapping?.matched_count;
-                        this.matchedDesignationNames =
-                            matchedRoleMapping?.matched_details?.map(x => x.igot_designation_name?.toLowerCase()) || [];
-                        const matchedNames = matchedRoleMapping?.matched_details?.map(x => x.igot_designation_name?.trim().toLowerCase()) || [];
-                        this.matchedDesignationSet = new Set(matchedNames);
-                        this.matchedRoleMapping = matchedNames.length;
+                        const matchedRoleMappingIds = matchedRoleMapping?.matched_details?.map(x => x.role_mapping_id) || [];
+                        this.matchedDesignationSet = new Set(matchedRoleMappingIds);
+                        this.matchedRoleMapping = matchedRoleMappingIds.length;
                         this.unMatchedRoleMapping = this.masterData.length - this.matchedRoleMapping;
                         this.applyAllFilters();
                     });
@@ -14579,11 +14545,9 @@ class RoleMappingListComponent {
                         console.log('matchedRoleMapping', matchedRoleMapping);
                         this.matchedRoleMappingData = matchedRoleMapping?.matched_details || [];
                         this.matchedRoleMapping = matchedRoleMapping?.matched_count;
-                        this.matchedDesignationNames =
-                            matchedRoleMapping?.matched_details?.map(x => x.igot_designation_name?.toLowerCase()) || [];
-                        const matchedNames = matchedRoleMapping?.matched_details?.map(x => x.igot_designation_name?.trim().toLowerCase()) || [];
-                        this.matchedDesignationSet = new Set(matchedNames);
-                        this.matchedRoleMapping = matchedNames.length;
+                        const matchedRoleMappingIds = matchedRoleMapping?.matched_details?.map(x => x.role_mapping_id) || [];
+                        this.matchedDesignationSet = new Set(matchedRoleMappingIds);
+                        this.matchedRoleMapping = matchedRoleMappingIds.length;
                         this.unMatchedRoleMapping = this.masterData.length - this.matchedRoleMapping;
                         this.applyAllFilters();
                     });
@@ -14635,11 +14599,14 @@ class RoleMappingListComponent {
     }
     applyAllFilters() {
         let data = [...this.masterData];
+        this.masterData.forEach(item => {
+            const roleMappingId = item.id;
+        });
         if (this.activeTab === 'matched') {
-            data = data.filter(item => this.matchedDesignationSet.has(item.designation_name?.trim().toLowerCase()));
+            data = data.filter(item => this.matchedDesignationSet.has(item.id));
         }
         if (this.activeTab === 'unmatched') {
-            data = data.filter(item => !this.matchedDesignationSet.has(item.designation_name?.trim().toLowerCase()));
+            data = data.filter(item => !this.matchedDesignationSet.has(item.id));
         }
         if (this.searchText.trim()) {
             const terms = this.searchText.toLowerCase().split(/\s+/);