fix(import) fix design flaws

PnX-SI · Mar 8, 2024 · 2658f5e · 2658f5e
1 parent 80c53a3
commit 2658f5e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/frontend/src/app/modules/imports/components/destinations/destinations.component.html b/frontend/src/app/modules/imports/components/destinations/destinations.component.html
@@ -9,6 +9,7 @@
   [clearable]="clearable"
   [virtualScroll]="true"
   [formControl]="parentFormControl"
+  (clear)="onClear.emit()"
 >
   <ng-template ng-option-tmp let-item="item" let-index="index" let-search="searchTerm">
     <div matTooltip="{{ item.code }}" [attr.data-qa]="item.code">

diff --git a/frontend/src/app/modules/imports/components/destinations/destinations.component.ts b/frontend/src/app/modules/imports/components/destinations/destinations.component.ts
@@ -1,7 +1,8 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, Output } from '@angular/core';
 import { DataService } from '../../services/data.service';
 import { Destination } from '../../models/import.model';
 import { GenericFormComponent } from '@geonature_common/form/genericForm.component';
+import { EventEmitter } from '@angular/core';
 
 @Component({
   selector: 'pnx-destinations',
@@ -12,6 +13,7 @@ export class DestinationsComponent extends GenericFormComponent {
   destinations: Array<Destination>;
 
   @Input() bindValue: string = 'code';
+  @Output() onClear = new EventEmitter<any>();
 
   constructor(private _ds: DataService) {
     super();

diff --git a/frontend/src/app/modules/imports/components/import_list/import-list.component.html b/frontend/src/app/modules/imports/components/import_list/import-list.component.html
@@ -11,7 +11,8 @@ <h5 class="card-title mb-0">Liste des imports</h5>
               'Import.Destinations' | translate | lowercase
             }}"
             [parentFormControl]="selectDestinationForm"
-            (onChange) = "onImportList()"
+            (onChange) = "resetPage()"
+            (onClear) = "resetPage()"
             class="flex-fill pr-1"
           ></pnx-destinations>
           <div class="flex-fill">

diff --git a/frontend/src/app/modules/imports/components/import_list/import-list.component.ts b/frontend/src/app/modules/imports/components/import_list/import-list.component.ts
@@ -84,7 +84,15 @@ export class ImportListComponent implements OnInit {
    */
   updateSearchQuery() {
     this.searchString = this.search.value;
-    this.onImportList();
+    this.resetPage();
+  }
+
+  /**
+   * Resets the page offset before updating the import list
+   */
+  resetPage() {
+    this.offset = 0;
+    this.updateImports();
   }