Merge pull request #128 from Sohith-code/cbrelease-4.8.20-custom-regi…

…stration-sohith loader fix
KB-iGOT · Dec 13, 2024 · 5d76fbc · 5d76fbc
2 parents 72e8020 + b20b898
commit 5d76fbc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss
@@ -718,7 +718,12 @@ $title-line-count: 2;
   margin-left: unset !important;
 }
 
-::ng-deep .mat-column-Actions {
+::ng-deep .mat-column-Actions, .mat-column-type {
   width: 90px;
   flex: none;
+}
+
+::ng-deep .mat-column-organisation {
+  width: 300px;
+  flex: none;
 }
diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts
@@ -17,7 +17,7 @@ import { InfoModalComponent } from '../../info-modal/info-modal.component'
 import { CreateMDOService } from '../../../routes/home/services/create-mdo.services'
 import { DesignationsService } from '../../../routes/create-mdo/routes/designation/services/designations.service'
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
-import { Subject } from 'rxjs'
+import { BehaviorSubject } from 'rxjs'
 
 @Component({
   selector: 'ws-widget-directory-table',
@@ -61,7 +61,7 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang
   customSelfRegistration = false
   selfRegistrationData: any = {}
   dialogRef: any
-  private filterSubject: Subject<any> = new Subject<any>();
+  private filterSubject: BehaviorSubject<any> = new BehaviorSubject<any>('');
   constructor(
     private router: Router, private events: EventService, public dialog: MatDialog,
     private designationsService: DesignationsService,
@@ -107,6 +107,10 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang
     if (this.dataSource && this.dataSource.data && this.dataSource.data.length > 0) {
       this.tableData.loader = false
     }
+
+    else if (this.dataSource && this.dataSource.data && this.dataSource.data.length === 0 && this.getFilterValue) {
+      this.tableData.loader = false
+    }
   }
   ngAfterViewInit() { }
 
@@ -128,6 +132,10 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang
     })
   }
 
+  get getFilterValue(): any {
+    return this.filterSubject.getValue()
+  }
+
 
   buttonClick(action: string, row: any) {
     if (this.tableData) {