Bug #15363 && Bug #15398 - [Search + Collect] When saving a search with multiple filters, only one filter is retained && [Search] Default filter "Archives with objects" gets unchecked.

Bug #15363 && Bug #15398 - [Search + Collect] When saving a search with multiple filters, only one filter is retained && [Search] Default filter "Archives with objects" gets unchecked.

Bug #15363 && Bug #15398 - [Search + Collect] When saving a search with multiple filters, only one filter is retained && [Search] Default filter "Archives with objects" gets unchecked.

Bug #15363 [Search + Collect] – When saving a search with multiple filters, only one filter is retained.

Author: Salim Terres

ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts

@@ -34,6 +34,7 @@
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
+import { Location } from '@angular/common';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
@@ -129,7 +130,11 @@ describe('ArchiveSearchComponent', () => {
   };
 
   const setupTest = async (queryParams: Params) => {
-    const routerSpy = jasmine.createSpyObj('Router', ['navigate']);
+    const routerSpy = jasmine.createSpyObj('Router', ['navigate', 'createUrlTree', 'serializeUrl']);
+    routerSpy.createUrlTree.and.returnValue({});
+    routerSpy.serializeUrl.and.returnValue('/test-url');
+
+    const locationSpy = jasmine.createSpyObj('Location', ['replaceState']);
 
     spyOn(archiveServiceStub, 'searchArchiveUnitsByCriteria').and.callThrough();
 
@@ -157,6 +162,7 @@ describe('ArchiveSearchComponent', () => {
         { provide: ArchiveUnitEliminationService, useValue: archiveUnitEliminationServiceMock },
         { provide: BASE_URL, useValue: '/fake-api' },
         { provide: ComputeInheritedRulesService, useValue: computeInheritedRulesServiceMock },
+        { provide: Location, useValue: locationSpy },
         { provide: MatDialog, useValue: matDialogSpy },
         { provide: Router, useValue: routerSpy },
         { provide: SchemaService, useValue: { getDescriptiveSchemaTree: () => of(), getSchema: () => of([]) } },

ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts

@@ -789,7 +789,7 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy, Aft
           category,
           criteria.valueTranslated,
           criteria.dataType,
-          true,
+          false,
         );
       });
     });

ui/ui-frontend/projects/archive-search/src/app/core/archive-shared-data.service.ts

@@ -34,7 +34,9 @@
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
+import { Location } from '@angular/common';
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { BehaviorSubject, Observable } from 'rxjs';
 import {
   CriteriaSearchCriteria,
@@ -95,7 +97,11 @@ export class ArchiveSharedDataService {
 
   unitUpdatedWithComputedObjectGroup = new BehaviorSubject<Unit>(null);
 
-  constructor(private queryParamsService: QueryParamsService) {}
+  constructor(
+    private queryParamsService: QueryParamsService,
+    private router: Router,
+    private location: Location,
+  ) {}
 
   emitRuleCategory(ruleCategory: string) {
     this.ruleCategory.next(ruleCategory);
@@ -237,7 +243,11 @@ export class ArchiveSharedDataService {
       }
       this.simpleSearchCriteriaAddSubject.next(searchCriteria);
     });
-    builder.navigate();
+
+    // Update URL using Location.replaceState to prevent navigation and overwriting searchCriterias
+    const queryParams = builder.getQueryParams();
+    const urlTree = this.router.createUrlTree([], { queryParams });
+    this.location.replaceState(this.router.serializeUrl(urlTree));
   }
 
   addSimpleSearchCriteriaSubject(searchCriteria: SearchCriteriaAddAction) {
@@ -304,7 +314,11 @@ export class ArchiveSharedDataService {
         : `${searchCriteriaAction.valueElt.value}/${searchCriteriaAction.valueElt.virtualNodeRealParentId}/${searchCriteriaAction.valueElt.virtualNodeRealParentTitle}`;
     builder.removeQueryParam(searchCriteriaAction.valueElt.id, valueToRemove);
     this.searchCriteriaRemoveFromChildSubject.next(searchCriteriaAction);
-    builder.navigate();
+
+    // Update URL using Location.replaceState
+    const queryParams = builder.getQueryParams();
+    const urlTree = this.router.createUrlTree([], { queryParams });
+    this.location.replaceState(this.router.serializeUrl(urlTree));
   }
 
   receiveRemoveFromChildSearchCriteriaSubject(): Observable<SearchCriteriaRemoveAction> {

ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-collect.component.spec.ts

@@ -34,6 +34,7 @@
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
+import { Location } from '@angular/common';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
@@ -134,7 +135,11 @@ describe('ArchiveSearchCollectComponent', () => {
   };
 
   const setupTest = async (queryParams: Params, withSimpleCriteria = false) => {
-    const routerSpy = jasmine.createSpyObj('Router', ['navigate']);
+    const routerSpy = jasmine.createSpyObj('Router', ['navigate', 'createUrlTree', 'serializeUrl']);
+    routerSpy.createUrlTree.and.returnValue({});
+    routerSpy.serializeUrl.and.returnValue('/test-url');
+
+    const locationSpy = jasmine.createSpyObj('Location', ['replaceState']);
 
     spyOn(archiveCollectServiceStub, 'searchArchiveUnitsByCriteria').and.callThrough();
 
@@ -164,6 +169,7 @@ describe('ArchiveSearchCollectComponent', () => {
         { provide: BASE_URL, useValue: '/fake-api' },
         { provide: ConfigService, useValue: { config$: of() } },
         { provide: ExternalParametersService, useValue: externalParametersServiceStub },
+        { provide: Location, useValue: locationSpy },
         { provide: MatDialog, useValue: matDialogSpy },
         { provide: Router, useValue: routerSpy },
         { provide: SchemaService, useValue: { getDescriptiveSchemaTree: () => of(), getSchema: () => of([]) } },

ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-collect.component.ts

@@ -1182,7 +1182,7 @@ export class ArchiveSearchCollectComponent extends SidenavPage<any> implements O
           category,
           criteria.valueTranslated,
           criteria.dataType,
-          true,
+          false,
         );
       });
     });

ui/ui-frontend/projects/collect/src/app/collect/core/archive-shared-data.service.ts

@@ -35,7 +35,9 @@
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
 
+import { Location } from '@angular/common';
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { BehaviorSubject, Observable } from 'rxjs';
 import {
   CriteriaSearchCriteria,
@@ -94,7 +96,11 @@ export class ArchiveSharedDataService {
   reuseFromMainSearchCriteriaObservable = this.searchReuseCriteriaActionFromMainSubject.asObservable();
   disseminationFromMainSearchCriteriaObservable = this.searchDisseminationCriteriaActionFromMainSubject.asObservable();
 
-  constructor(private queryParamsService: QueryParamsService) {}
+  constructor(
+    private queryParamsService: QueryParamsService,
+    private router: Router,
+    private location: Location,
+  ) {}
 
   emitNumberOfAUsWithoutAttachment(value: number) {
     this.numberOfAUsWithoutAttachment.next(value);
@@ -232,7 +238,11 @@ export class ArchiveSharedDataService {
       }
       this.simpleSearchCriteriaAddSubject.next(searchCriteria);
     });
-    builder.navigate();
+
+    // Update URL using Location.replaceState to prevent navigation and overwriting searchCriterias
+    const queryParams = builder.getQueryParams();
+    const urlTree = this.router.createUrlTree([], { queryParams });
+    this.location.replaceState(this.router.serializeUrl(urlTree));
   }
 
   addSimpleSearchCriteriaSubject(searchCriteria: SearchCriteriaAddAction) {
@@ -271,7 +281,11 @@ export class ArchiveSharedDataService {
         : `${searchCriteriaAction.valueElt.value}/${searchCriteriaAction.valueElt.virtualNodeRealParentId}/${searchCriteriaAction.valueElt.virtualNodeRealParentTitle}`;
     builder.removeQueryParam(searchCriteriaAction.valueElt.id, valueToRemove);
     this.searchCriteriaRemoveFromChildSubject.next(searchCriteriaAction);
-    builder.navigate();
+
+    // Update URL using Location.replaceState
+    const queryParams = builder.getQueryParams();
+    const urlTree = this.router.createUrlTree([], { queryParams });
+    this.location.replaceState(this.router.serializeUrl(urlTree));
   }
 
   receiveRemoveFromChildSearchCriteriaSubject(): Observable<SearchCriteriaRemoveAction> {

ui/ui-frontend/projects/vitamui-library/src/app/modules/url/query-params.service.ts

@@ -62,6 +62,10 @@ class QueryParamBuilder {
     return this;
   }
 
+  getQueryParams(): Params {
+    return { ...this.#queryParams };
+  }
+
   navigate(extras: NavigationExtras = {}): Observable<boolean> {
     return fromPromise(
       this.router.navigate([], {