Story #13593: add query params to archive-search, collect & logbook-m…

…gt-opt
ProgrammeVitam · Feb 4, 2025 · 3323a68 · 3323a68
1 parent 95a12bc
commit 3323a68
Show file tree

Hide file tree

Showing 56 changed files with 1,302 additions and 1,152 deletions.
diff --git a/...eview/archive-unit-objects-details-tab/archive-unit-objects-details-tab.component.spec.ts b/...eview/archive-unit-objects-details-tab/archive-unit-objects-details-tab.component.spec.ts
@@ -53,8 +53,9 @@ import { ArchiveService } from '../../archive.service';
 import { ArchiveUnitObjectsDetailsTabComponent } from './archive-unit-objects-details-tab.component';
 import createSpyObj = jasmine.createSpyObj;
 import anything = jasmine.anything;
+import { ActivatedRoute } from '@angular/router';
 
-describe('ArchiveUnitObjectsDetailsTabComponent tests', () => {
+describe('ArchiveUnitObjectsDetailsTabComponent', () => {
   let component: ArchiveUnitObjectsDetailsTabComponent;
   let fixture: ComponentFixture<ArchiveUnitObjectsDetailsTabComponent>;
   const clipboardSpy = createSpyObj<Clipboard>('Clipboard', ['copy']);
@@ -98,6 +99,12 @@ describe('ArchiveUnitObjectsDetailsTabComponent tests', () => {
         { provide: TenantSelectionService, useValue: tenantSelectionServiceSpy },
         { provide: Clipboard, useValue: clipboardSpy },
         { provide: AccessContractService, useValue: accessContractServiceMock },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            queryParams: of(),
+          },
+        },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();

diff --git a/...ive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.ts b/...ive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.ts
@@ -40,7 +40,6 @@ import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Subscription, merge } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import {
-  ActionOnCriteria,
   CriteriaDataType,
   CriteriaOperator,
   CriteriaValue,
@@ -153,9 +152,9 @@ export class AccessRuleSearchComponent implements OnInit, OnDestroy {
       .receiveAccessFromMainSearchCriteriaSubject()
       .subscribe((criteria) => {
         if (criteria) {
-          if (this.accessAdditionalCriteria && criteria.action === ActionOnCriteria.ADD) {
+          if (this.accessAdditionalCriteria && criteria.action === 'ADD') {
             this.accessAdditionalCriteria.set(criteria.valueElt.value, true);
-          } else if (criteria.action === ActionOnCriteria.REMOVE) {
+          } else if (criteria.action === 'REMOVE') {
             if (this.accessAdditionalCriteria && this.accessAdditionalCriteria.has(criteria.valueElt.value)) {
               this.accessAdditionalCriteria.set(criteria.valueElt.value, false);
             }

diff --git a/...arch/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.ts b/...arch/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.ts
@@ -40,7 +40,6 @@ import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Subscription, merge } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import {
-  ActionOnCriteria,
   CriteriaDataType,
   CriteriaOperator,
   CriteriaValue,
@@ -173,9 +172,9 @@ export class AppraisalRuleSearchComponent implements OnInit, OnDestroy {
       .receiveAppraisalFromMainSearchCriteriaSubject()
       .subscribe((criteria) => {
         if (criteria) {
-          if (criteria.action === ActionOnCriteria.ADD) {
+          if (criteria.action === 'ADD') {
             this.appraisalAdditionalCriteria.set(criteria.valueElt.value, true);
-          } else if (criteria.action === ActionOnCriteria.REMOVE) {
+          } else if (criteria.action === 'REMOVE') {
             if (this.appraisalAdditionalCriteria && this.appraisalAdditionalCriteria.has(criteria.valueElt.value)) {
               this.appraisalAdditionalCriteria.set(criteria.valueElt.value, false);
             }

diff --git a/...hive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.ts b/...hive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.ts
@@ -40,7 +40,6 @@ import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Subscription, merge } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import {
-  ActionOnCriteria,
   CriteriaDataType,
   CriteriaOperator,
   CriteriaValue,
@@ -153,9 +152,9 @@ export class DisseminationRuleSearchComponent implements OnInit, OnDestroy {
       .receiveDisseminationFromMainSearchCriteriaSubject()
       .subscribe((criteria) => {
         if (criteria) {
-          if (this.disseminationAdditionalCriteria && criteria.action === ActionOnCriteria.ADD) {
+          if (this.disseminationAdditionalCriteria && criteria.action === 'ADD') {
             this.disseminationAdditionalCriteria.set(criteria.valueElt.value, true);
-          } else if (criteria.action === ActionOnCriteria.REMOVE) {
+          } else if (criteria.action === 'REMOVE') {
             if (this.disseminationAdditionalCriteria && this.disseminationAdditionalCriteria.has(criteria.valueElt.value)) {
               this.disseminationAdditionalCriteria.set(criteria.valueElt.value, false);
             }

diff --git a/...chive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.ts b/...chive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.ts
@@ -40,7 +40,6 @@ import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Subscription, merge } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import {
-  ActionOnCriteria,
   CriteriaDataType,
   CriteriaOperator,
   CriteriaValue,
@@ -153,9 +152,9 @@ export class ReuseRuleSearchComponent implements OnInit, OnDestroy {
       .receiveReuseFromMainSearchCriteriaSubject()
       .subscribe((criteria) => {
         if (criteria) {
-          if (this.reuseAdditionalCriteria && criteria.action === ActionOnCriteria.ADD) {
+          if (this.reuseAdditionalCriteria && criteria.action === 'ADD') {
             this.reuseAdditionalCriteria.set(criteria.valueElt.value, true);
-          } else if (criteria.action === ActionOnCriteria.REMOVE) {
+          } else if (criteria.action === 'REMOVE') {
             if (this.reuseAdditionalCriteria && this.reuseAdditionalCriteria.has(criteria.valueElt.value)) {
               this.reuseAdditionalCriteria.set(criteria.valueElt.value, false);
             }

diff --git a/...e-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.ts b/...e-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.ts
@@ -41,7 +41,6 @@ import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Subscription, merge } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import {
-  ActionOnCriteria,
   CriteriaDataType,
   CriteriaOperator,
   CriteriaValue,
@@ -173,9 +172,9 @@ export class StorageRuleSearchComponent implements OnInit, OnDestroy {
       .receiveStorageFromMainSearchCriteriaSubject()
       .subscribe((criteria) => {
         if (criteria) {
-          if (criteria.action === ActionOnCriteria.ADD) {
+          if (criteria.action === 'ADD') {
             this.storageAdditionalCriteria.set(criteria.valueElt.value, true);
-          } else if (criteria.action === ActionOnCriteria.REMOVE) {
+          } else if (criteria.action === 'REMOVE') {
             if (this.storageAdditionalCriteria && this.storageAdditionalCriteria.has(criteria.valueElt.value)) {
               this.storageAdditionalCriteria.set(criteria.valueElt.value, false);
             }

diff --git a/...d/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts b/...d/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts
@@ -153,7 +153,7 @@ describe('ArchiveSearchComponent', () => {
             params: of({ tenantIdentifier: 1 }),
             data: of({ appId: 'ARCHIVE_SEARCH_MANAGEMENT_APP' }),
             queryParamMap: of({ get: () => undefined }),
-            snapshot: { queryParamMap: { has: () => false } },
+            snapshot: { queryParamMap: { has: () => false, keys: [] } },
           },
         },
         { provide: MatDialog, useValue: matDialogSpy },