simplify list component

jhipster · Jan 31, 2024 · fa8379e · fa8379e
1 parent 0529c51
commit fa8379e
Showing 1 changed file with 17 additions and 24 deletions.
diff --git a/.../templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs b/.../templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs
@@ -155,6 +155,16 @@ export class <%= componentName %> implements OnInit {
     protected modalService = inject(NgbModal);
 <%_ } _%>
 
+    constructor() {
+      this.subscription = combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.data]).pipe(
+        tap(([params, data]) => this.fillComponentAttributeFromRoute(params, data)),
+        tap(() => this.load()),
+      ).subscribe();
+
+      const { queryParamMap, data } = this.activatedRoute.snapshot;
+      this.fillComponentAttributeFromRoute(queryParamMap, data);
+    }
+
 <%_ if (paginationInfiniteScroll) { _%>
     reset(): void {
       this.page = 1;
@@ -217,21 +227,13 @@ export class <%= componentName %> implements OnInit {
       modalRef.closed
         .pipe(
           filter(reason => reason === ITEM_DELETED_EVENT),
-          switchMap(() => this.loadFromBackendWithRouteInformations())
-        ).subscribe(
-          {
-            next: (res: EntityArrayResponseType) => {
-            this.onResponseSuccess(res);
-          }
-        });
+          tap(() => this.load())
+        ).subscribe();
     }
 
 <%_ } _%>
     load(): void {
-      if (this.subscription !== null) {
-        this.subscription.unsubscribe();
-      }
-      this.subscription = this.loadFromBackendWithRouteInformations().subscribe({
+      this.queryBackend().subscribe({
         next: (res: EntityArrayResponseType) => {
           this.onResponseSuccess(res);
         }
@@ -248,16 +250,6 @@ export class <%= componentName %> implements OnInit {
     }
 
 <%_ } _%>
-    protected loadFromBackendWithRouteInformations(): Observable<EntityArrayResponseType> {
-      return combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.data])
-        .pipe(
-          tap(([params, data]) => this.fillComponentAttributeFromRoute(params, data)),
-          switchMap(() =>
-            this.queryBackend(<% if (!paginationNo) { %>this.page, <% } %>this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters.filterOptions<% } %><% if (searchEngineAny) { %>, this.currentSearch<% } %>)
-          )
-        );
-    }
-
     protected fillComponentAttributeFromRoute(params: ParamMap, data: Data): void {
 <%_ if (paginationPagination) { _%>
       const page = params.get(PAGE_HEADER);
@@ -338,10 +330,11 @@ export class <%= componentName %> implements OnInit {
     }
 
 <%_ } _%>
-    protected queryBackend(<% if (!paginationNo) { %>page?: number, <% } %>predicate?: string, ascending?: boolean<% if (jpaMetamodelFiltering && paginationPagination) { %>, filterOptions?: IFilterOption[]<% } %><% if (searchEngineAny) { %>, currentSearch?: string<% } %>): Observable<EntityArrayResponseType> {
+    protected queryBackend(): Observable<EntityArrayResponseType> {
+      const { <% if (!paginationNo) { %>page, <% } %>predicate, ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, filters<% } %><% if (searchEngineAny) { %>, currentSearch<% } %> } = this;
       this.isLoading = true;
 <%_ if (!paginationNo) { _%>
-      const pageToLoad: number = page ?? 1;
+      const pageToLoad: number = page;
 <%_ } _%>
       const queryObject<% if ((jpaMetamodelFiltering && paginationPagination) || searchEngine) { %>: any <% } %> = {
 <%_ if (!paginationNo) { _%>
@@ -357,7 +350,7 @@ export class <%= componentName %> implements OnInit {
         sort: this.getSortQueryParam(predicate, ascending),
       };
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
-      filterOptions?.forEach(filterOption => {
+      filters.filterOptions.forEach(filterOption => {
         queryObject[filterOption.name] = filterOption.values;
       });
 <%_ } _%>