feat(lookup): fazendo lookup cancelar requisiçoes ao fechar modal

po-ui · Jan 30, 2024 · 836b7aa · 836b7aa
1 parent 535cf44
commit 836b7aa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/...i/src/lib/components/po-field/po-lookup/po-lookup-modal/po-lookup-modal-base.component.ts b/...i/src/lib/components/po-field/po-lookup/po-lookup-modal/po-lookup-modal-base.component.ts
@@ -265,7 +265,8 @@ export abstract class PoLookupModalBaseComponent implements OnDestroy, OnInit {
     this.language = languageService.getShortLanguage();
   }
 
-  ngOnDestroy() {
+  // Metodo responsavel por cancelar todas as requisiçoes pendentes
+  unsubscribeAllSubscriptions() {
     if (this.filterSubscription) {
       this.filterSubscription.unsubscribe();
     }
@@ -279,6 +280,10 @@ export abstract class PoLookupModalBaseComponent implements OnDestroy, OnInit {
     }
   }
 
+  ngOnDestroy() {
+    this.unsubscribeAllSubscriptions();
+  }
+
   ngOnInit() {
     this.setAdvancedFilterModalProperties();
     this.initializeData();
@@ -336,6 +341,9 @@ export abstract class PoLookupModalBaseComponent implements OnDestroy, OnInit {
 
   search(): void {
     this.page = 1;
+    if (this.isLoading) {
+      this.unsubscribeAllSubscriptions();
+    }
 
     if (this.searchValue) {
       this.isLoading = true;
@@ -348,6 +356,9 @@ export abstract class PoLookupModalBaseComponent implements OnDestroy, OnInit {
   }
 
   searchFilteredItems(): void {
+    if (this.isLoading) {
+      this.unsubscribeAllSubscriptions();
+    }
     this.searchSubscription = this.getFilteredItems(this.searchValue)
       .pipe(
         catchError(error => {
@@ -362,6 +373,10 @@ export abstract class PoLookupModalBaseComponent implements OnDestroy, OnInit {
   }
 
   showMoreEvent() {
+    if (this.isLoading) {
+      this.unsubscribeAllSubscriptions();
+    }
+
     this.page++;
     this.isLoading = true;
 

diff --git a/...s/ui/src/lib/components/po-field/po-lookup/po-lookup-modal/po-lookup-modal.component.html b/...s/ui/src/lib/components/po-field/po-lookup/po-lookup-modal/po-lookup-modal.component.html
@@ -5,6 +5,7 @@
   [p-primary-action]="isAdvancedFilter ? primaryActionAdvancedFilter : primaryAction"
   [p-secondary-action]="isAdvancedFilter ? secondaryActionAdvancedFilter : secondaryAction"
   [p-title]="isAdvancedFilter ? advancedFilterModalTitle : title"
+  (p-close)="unsubscribeAllSubscriptions()"
 >
   <div [hidden]="isAdvancedFilter">
     <po-field-container class="po-lookup-header po-pull-right" [p-optional]="false">