in progress(plan)

Signed-off-by: Johnny Mariéthoz <Johnny.Mariethoz@rero.ch>

Author: jma

projects/rero/ng-core/src/lib/model/record.interface.ts

@@ -137,6 +137,7 @@ export interface Aggregation {
   bucketSize: any;
   value: { buckets: any[] };
   expanded: boolean;
+  included?: boolean;
   loaded?: boolean;
   doc_count: number;
   type?: string;

projects/rero/ng-core/src/lib/record/component/search/record-search-page.component.spec.ts

@@ -224,8 +224,7 @@ describe('RecordSearchPageComponent', () => {
 
       fixture.detectChanges();
       tick(100);
-      const updatedParams = component.store.searchParams();
-      expect(updatedParams.q).toBe('new search');
+      expect(component.store.q()).toBe('new search');
     }));
 
 
@@ -371,7 +370,7 @@ describe('RecordSearchPageComponent', () => {
       tick(200);
       fixture.detectChanges();
       // Store should still have valid state
-      expect(component.store.searchParams()).toBeDefined();
+      expect(component.store.q()).toBeDefined();
       expect(component.store.currentType()).toBeDefined();
     }));
 
@@ -386,7 +385,7 @@ describe('RecordSearchPageComponent', () => {
       tick(200);
       fixture.detectChanges();
       // Should handle gracefully - the paramMapToSearchParams function should handle this
-      expect(component.store.searchParams()).toBeDefined();
+      expect(component.store.q()).toBeDefined();
     }));
   });
 });

projects/rero/ng-core/src/lib/record/component/search/record-search-page.component.ts

@@ -15,13 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Component, inject, effect, untracked } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
-import { combineLatest, map } from 'rxjs';
+import { map } from 'rxjs';
 import { paramMapToSearchParams, searchParamsToUrlParams, shallowEqual } from '../../record-search-utils';
 import { RecordSearchStore } from './store/record-search.store';
 import { RecordUiService } from '../../service/record-ui/record-ui.service';
-import { DEFAULT_SEARCH_PARAMS } from './store/features/with-search-params.feature';
 import { RecordSearchComponent } from './record-search/record-search.component';
+import { SearchParams } from '../../model';
 
 @Component({
   selector: 'ng-core-record-search-page',
@@ -37,27 +38,26 @@ export class RecordSearchPageComponent {
 
   readonly store = inject(RecordSearchStore);
 
-  /**
-   * 1. Source Stream: The URL (Observable).
-   * Combines Query Params and Path Params into a single SearchParams object.
-   */
-  private readonly searchParamsFromUrl$ = combineLatest([
-    this.route.queryParamMap,
-    this.route.paramMap.pipe(map(p => p.get('type')))
-  ]).pipe(
-    map(([paramMap, currentType]) => ({
-      currentType: currentType || DEFAULT_SEARCH_PARAMS.currentType,
-      ...paramMapToSearchParams(paramMap)
-    }))
-  );
-
   constructor() {
     /**
-     * A. Sync URL -> Store
-     * We "pipe" the URL observable into the store's rxMethod.
-     * No manual subscribe or DestroyRef management needed here.
+     * A1. Sync URL path param :type -> currentType (via updateCurrentType)
+     */
+    this.route.paramMap.pipe(
+      map(p => p.get('type') || ''),
+      takeUntilDestroyed(),
+    ).subscribe(type => {
+      if (type) {
+        this.store.updateCurrentType(type);
+      }
+    });
+    /**
+     * A2. Sync URL query params -> searchParams (via syncUrlParams rxMethod)
      */
-    this.store.syncUrlParams(this.searchParamsFromUrl$);
+    this.store.syncUrlParams(
+      this.route.queryParamMap.pipe(
+        map(paramMap => paramMapToSearchParams(paramMap))
+      )
+    );
 
     /**
      * B. Sync Route Data (Static or Resolved data)
@@ -74,20 +74,26 @@ export class RecordSearchPageComponent {
      * Reacts whenever the store state changes to update the browser URL.
      */
     effect(() => {
-      const storeParams = this.store.searchParams();
+      const currentType = this.store.currentType();
+      // Read individual signals so the effect tracks only the URL-relevant fields
+      const storeParams: Partial<SearchParams> = {
+        q: this.store.q(),
+        page: this.store.page(),
+        size: this.store.size(),
+        sort: this.store.sort(),
+      };
 
       // We use untracked to read current route state without creating dependencies,
       // preventing recursive effect triggers.
       untracked(() => {
         const urlParams = paramMapToSearchParams(this.route.snapshot.queryParamMap);
         const currentTypeInUrl = this.route.snapshot.paramMap.get('type');
 
-        // Final guard: check if the URL already matches the Store state
-        const isAlreadyInSync =
-          shallowEqual(storeParams, { ...urlParams, currentType: currentTypeInUrl });
+        const paramsInSync = shallowEqual(storeParams, urlParams);
+        const typeInSync = currentType === currentTypeInUrl;
 
-        if (!isAlreadyInSync) {
-          this.navigate(storeParams);
+        if (!paramsInSync || !typeInSync) {
+          this.navigate(currentType, storeParams as SearchParams);
         }
       });
     });
@@ -96,9 +102,9 @@ export class RecordSearchPageComponent {
   /**
    * Helper method to perform the actual router navigation
    */
-  private navigate(params: any) {
+  private navigate(currentType: string, params: SearchParams) {
     this.router.navigate(
-      ['..', params.currentType],
+      ['..', currentType],
       {
         relativeTo: this.route,
         queryParams: searchParamsToUrlParams(params, this.store.aggregationsFilters()),

projects/rero/ng-core/src/lib/record/component/search/record-search/record-search.component.html

@@ -52,7 +52,7 @@ <h5>{{ availableTypes()[0].label | translate }}</h5>
     } @else {
       <div class="core:flex core:items-stretch core:w-full">
           <div class="core:flex core:items-center core:w-full">
-            <strong>{{ store.resultsText() | async }}</strong>
+            <strong>{{ store.resultsText() | translate:{ total: store.total() } }}</strong>
           </div>
         <div class="core:flex core:items-center core:justify-end core:w-full">
           @if (adminMode().can && addStatus().can) {
@@ -67,7 +67,7 @@ <h5>{{ availableTypes()[0].label | translate }}</h5>
           @if (config().sortOptions.length) {
             <ng-core-menu-sort
               class="core:ml-1"
-              [selectedValue]="store.sort()"
+              [selectedValue]="store.activeSort()"
               [config]="sortMenuItems()"
               (valueChange)="changeSorting($event)"
             />

projects/rero/ng-core/src/lib/record/component/search/record-search/record-search.component.spec.ts

@@ -93,8 +93,6 @@ describe('RecordSearchComponent', () => {
     }
   ];
 
-  const tabViewChangeEventMock = jasmine.createSpyObj('TabViewChangeEvent', ['']);
-
   const route = {
     snapshot: {
       data: {

projects/rero/ng-core/src/lib/record/component/search/record-search/record-search.component.ts

@@ -184,7 +184,7 @@ export class RecordSearchComponent {
     // // Build aggregations to used.
     // //   This is a combination of `defaultSearchInputFilters` and persistent aggregation filters.
     // const aggregations = new Set(this._extractPersistentAggregationsFilters());
-    // this.store.aggregationsFilters().forEach((aggregation) => aggregations.add(aggregation));
+    // this.store.aggregationsFilters.forEach((aggregation) => aggregations.add(aggregation));
     // this.store.updateAggregationsFilters(Array.from(aggregations));
   }
 
@@ -209,7 +209,18 @@ export class RecordSearchComponent {
         tap(() => {
           this.store.updatePage(1);
           // Force reload of results after deletion
-          this.store.fetchRecords({params: this.store.searchParams(), type: this.store.currentType()});
+          // TODO: force reload event if no params has changed
+          this.store.fetchRecords({
+            index: this.store.currentIndex(),
+            query: this.store.q(),
+            page: this.store.page(),
+            itemsPerPage: this.store.size(),
+            aggregationsFilters: this.store.aggregationsFilters(),
+            preFilters: this.store.config().preFilters,
+            sort: this.store.activeSort(),
+            facets: this.store.facetsParameter(),
+            headers: this.store.config()?.listHeaders,
+          });
         }),
       )
       .subscribe();
@@ -236,7 +247,7 @@ export class RecordSearchComponent {
    * @param format - export format object
    * @return formatted url for an export format.
    */
-  getExportFormatUrl(format: ExportFormat) {
+  getExportFormatUrl(format: ExportFormat): string {
     const queryParams = Object.keys(this.activatedRoute.snapshot.queryParams);
     // TODO: maybe we can use URLSerializer to build query string
     const baseUrl = format.endpoint ? format.endpoint : this.apiService.getEndpointByType(this.store.currentIndex());
@@ -300,7 +311,7 @@ export class RecordSearchComponent {
     //   return item;
     // }));
     // // If query string is specified, search is processed.
-    // const q = this.store.q();
+    // const q = this.store.q;
     // if (q) {
     //   this.searchByQuery(q);
     // }