Merge pull request #3440 from ProgrammeVitam/bug_15558

CP V8.0 - Bug #14713 & #15558 - [Search App] key to translate.

Author: Salimdev

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

@@ -34,23 +34,17 @@
  * 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 { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { CriteriaSearchCriteria, CriteriaValue, SearchCriteriaTypeEnum, SearchCriteriaValue } from 'vitamui-library';
 import { TranslateService } from '@ngx-translate/core';
 @Component({
   selector: 'app-criteria-search',
   templateUrl: './criteria-search.component.html',
   styleUrls: ['./criteria-search.component.scss'],
 })
-export class CriteriaSearchComponent implements OnInit {
+export class CriteriaSearchComponent {
   constructor(private translateService: TranslateService) {}
 
-  ngOnInit() {
-    if (this.criteriaVal) {
-      this.criteriaVal.keyTranslated = true;
-    }
-  }
-
   @Input()
   criteriaKey: string;
 
@@ -64,6 +58,10 @@ export class CriteriaSearchComponent implements OnInit {
     }
   }
 
+  get criteriaVal(): CriteriaSearchCriteria {
+    return this._criteriaVal;
+  }
+
   @Output() criteriaRemoveEvent: EventEmitter<any> = new EventEmitter();
 
   removeCriteria(keyElt: string, valueElt?: CriteriaValue) {

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

@@ -91,11 +91,11 @@ export class CriteriaSearchComponent {
   getCriteriaLabel(key: string, criteriaValue: SearchCriteriaValue): string {
     if (criteriaValue.valueTranslated) {
       return this.translateService.instant(
-        `ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.${this.getCategoryName(this.criteriaVal.category)}.${criteriaValue.label}`,
+        `COLLECT.SEARCH_CRITERIA_FILTER.${this.getCategoryName(this.criteriaVal.category)}.${criteriaValue.label}`,
       );
     }
     if (key === 'ALL_ARCHIVE_UNIT_TYPES') {
-      return this.translateService.instant(`ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.${criteriaValue?.value?.id}`);
+      return this.translateService.instant(`COLLECT.SEARCH_CRITERIA_FILTER.FIELDS.${criteriaValue?.value?.id}`);
     }
     if (key === 'ORPHANS_NODE') {
       return this.translateService.instant('COLLECT.FILING_SCHEMA.ORPHANS_NODE');