Browse Source

update: remove loading indicator config from extensible table

pull/20804/head
sumeyyeKurtulus 2 years ago
parent
commit
7822e1fb99
  1. 1
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html
  2. 34
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

1
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html

@ -1,6 +1,5 @@
<ngx-datatable
default
[loadingIndicator]="isLoading"
[rows]="data"
[count]="recordsTotal"
[list]="list"

34
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

@ -8,7 +8,6 @@ import {
Input,
LOCALE_ID,
OnChanges,
OnDestroy,
Output,
SimpleChanges,
TemplateRef,
@ -16,7 +15,7 @@ import {
} from '@angular/core';
import { AsyncPipe, formatDate, NgComponentOutlet, NgTemplateOutlet } from '@angular/common';
import { combineLatest, Observable, map } from 'rxjs';
import { Observable, map } from 'rxjs';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { NgxDatatableModule } from '@swimlane/ngx-datatable';
@ -131,8 +130,6 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
this.actionList.toArray().map(action => ({ requiredPolicy: action.permission })),
).length > 0;
this.setColumnWidths(DEFAULT_ACTIONS_COLUMN_WIDTH);
this.subscribeLoading();
}
private setColumnWidths(actionsColumn: number | undefined) {
@ -237,33 +234,4 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
return visibleActions.length > 0;
}
subscribeLoading() {
this.subscriptionService.addOne(
combineLatest([this.listService.isLoading$, this.routerWaitService.getLoading$()]),
([listLoading, routerLoading]) => {
if (listLoading || routerLoading) {
this.startLoading();
} else {
this.stopLoading();
}
},
);
}
startLoading() {
if (this.isLoading) {
return;
}
this.isLoading = true;
this.cdRef.detectChanges();
}
stopLoading() {
this.isLoading = false;
}
ngOnDestroy() {
this.subscriptionService.closeAll();
}
}

Loading…
Cancel
Save