From 89ff5c9780fc849597c593e3d0feb462f256c9c6 Mon Sep 17 00:00:00 2001
From: masum-ulu <masum.ulu@hotmail.com>
Date: Wed, 18 Sep 2024 15:10:50 +0300
Subject: [PATCH] improve logic in ngx-datatable-list.directive

---
 .../ngx-datatable-list.directive.ts           | 62 +++++++------------
 1 file changed, 23 insertions(+), 39 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts
index b8811106dd..c31acd9fe8 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts
@@ -10,9 +10,9 @@ import {
   DestroyRef,
   ViewContainerRef,
   Renderer2,
-  AfterViewInit,
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { distinctUntilChanged } from 'rxjs';
 import { DatatableComponent } from '@swimlane/ngx-datatable';
 import { ListService, LocalizationService } from '@abp/ng.core';
 import {
@@ -27,7 +27,7 @@ import { SpinnerComponent } from '../components';
   standalone: true,
   exportAs: 'ngxDatatableList',
 })
-export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck, AfterViewInit {
+export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck {
   protected readonly table = inject(DatatableComponent);
   protected readonly cdRef = inject(ChangeDetectorRef);
   protected readonly destroyRef = inject(DestroyRef);
@@ -36,8 +36,6 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck, Af
   protected readonly viewContainerRef = inject(ViewContainerRef);
   protected readonly renderer = inject(Renderer2);
 
-  protected _loading = true;
-
   @Input() list!: ListService;
 
   constructor() {
@@ -48,11 +46,6 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck, Af
     this.refreshPageIfDataExist();
   }
 
-  ngAfterViewInit() {
-    this.table.loadingIndicator = this._loading;
-    this.handleLoadingStart();
-  }
-
   ngOnInit() {
     this.subscribeToPage();
     this.subscribeToSort();
@@ -70,33 +63,29 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck, Af
   }
 
   protected subscribeToLoadingState() {
-    this.list.isLoading$.subscribe(listLoading => {
-      if (listLoading) {
-        this.handleLoadingStart();
-      } else {
-        this.handleLoadingStop();
-      }
-    });
-  }
+    const requestStatus$ = this.list.requestStatus$.pipe(distinctUntilChanged());
+    const { emptyMessage } = this.ngxDatatableMessages || defaultNgxDatatableMessages;
 
-  protected handleLoadingStop() {
-    if (this._loading) {
-      this.setLoadingState(false);
-      this.removeSpinner();
-    }
-  }
+    requestStatus$.subscribe(status => {
+      this.table.loadingIndicator = false;
+      
+      if (status === 'idle') {
+        return;
+      }
 
-  protected handleLoadingStart() {
-    if (!this._loading) {
-      this.setLoadingState(true);
-      this.updateLoadingIndicator();
-    }
-  }
+      if (status === 'loading') {
+        this.table.messages.emptyMessage = undefined;
+        this.table.loadingIndicator = true;
+        this.cdRef.detectChanges();
+        this.updateLoadingIndicator();
+        return;
+      }
 
-  protected setLoadingState(loading: boolean) {
-    this._loading = loading;
-    this.table.loadingIndicator = loading;
-    this.cdRef.detectChanges();
+      if (status === 'success') {
+        this.table.messages.emptyMessage = this.localizationService.instant(emptyMessage);
+        this.viewContainerRef.clear();
+      }
+    });
   }
 
   protected updateLoadingIndicator() {
@@ -122,19 +111,14 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck, Af
     this.renderer.removeChild(parent, placeholder);
   }
 
-  protected removeSpinner() {
-    this.viewContainerRef.clear();
-  }
-
   protected setInitialValues() {
     this.table.externalPaging = true;
     this.table.externalSorting = true;
 
-    const { emptyMessage, selectedMessage, totalMessage } =
+    const { selectedMessage, totalMessage } =
       this.ngxDatatableMessages || defaultNgxDatatableMessages;
 
     this.table.messages = {
-      emptyMessage: this.localizationService.instant(emptyMessage),
       totalMessage: this.localizationService.instant(totalMessage),
       selectedMessage: this.localizationService.instant(selectedMessage),
     };