Bug #15299 - [Search + Collect] "ORPHANS_NODE" is displayed when selecting the "No attachment" checkbox.

Author: Salim Terres

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

@@ -237,12 +237,7 @@
                     ? ('ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.' + getCategoryName(criteriaVal.category) + '.' + criteriaVal.key | translate)
                     : criteriaVal.key
                 }}:{{
-                  criteriaValue.valueTranslated
-                    ? ('ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.' + getCategoryName(criteriaVal.category) + '.' + criteriaValue.label
-                      | translate)
-                    : criteriaVal.key === 'ALL_ARCHIVE_UNIT_TYPES'
-                      ? criteriaValue.label
-                      : criteriaValue.value.value
+                  getCriteriaLabel(criteriaVal.key, criteriaValue)
                 }}"
                 matTooltipClass="vitamui-tooltip"
                 [matTooltipShowDelay]="300"

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

@@ -36,14 +36,15 @@
  */
 import { Component, EventEmitter, Input, OnInit, 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 {
-  constructor() {}
+  constructor(private translateService: TranslateService) {}
 
   ngOnInit() {
     if (this.criteriaVal) {
@@ -74,6 +75,14 @@ export class CriteriaSearchComponent implements OnInit {
   }
 
   getCriteriaLabel(key: string, criteriaValue: SearchCriteriaValue): string {
-    return key === 'ALL_ARCHIVE_UNIT_TYPES' ? criteriaValue.label : criteriaValue.value.value;
+    if (key === 'ALL_ARCHIVE_UNIT_TYPES') {
+      return criteriaValue.keyTranslated
+        ? this.translateService.instant('ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.' + criteriaValue.label)
+        : criteriaValue.label;
+    }
+    if (key === 'ORPHANS_NODE') {
+      return this.translateService.instant('ARCHIVE_SEARCH.FILING_SCHEMA.ORPHANS_NODE');
+    }
+    return criteriaValue.value?.value ?? '';
   }
 }

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

@@ -236,9 +236,7 @@
                     ? ('COLLECT.SEARCH_CRITERIA_FILTER.' + getCategoryName(criteriaVal.category) + '.' + criteriaVal.key | translate)
                     : criteriaVal.key
                 }}:{{
-                  criteriaValue.valueTranslated
-                    ? ('COLLECT.SEARCH_CRITERIA_FILTER.' + getCategoryName(criteriaVal.category) + '.' + criteriaValue.label | translate)
-                    : criteriaValue.label
+                  getCriteriaLabel(criteriaVal.key, criteriaValue)
                 }}"
                 matTooltipClass="vitamui-tooltip"
                 [matTooltipShowDelay]="300"
@@ -259,7 +257,7 @@
                 {{
                   criteriaValue.valueTranslated
                     ? ('COLLECT.SEARCH_CRITERIA_FILTER.' + getCategoryName(criteriaVal.category) + '.' + criteriaValue.label | translate)
-                    : (criteriaValue.label | truncate: 50)
+                    : (getCriteriaLabel(criteriaVal.key, criteriaValue) | truncate: 50)
                 }}
               </div>
               <div

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

@@ -36,15 +36,16 @@
  */
 
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { CriteriaSearchCriteria, CriteriaValue, SearchCriteriaTypeEnum } from 'vitamui-library';
+import { TranslateService } from '@ngx-translate/core';
+import { CriteriaSearchCriteria, CriteriaValue, SearchCriteriaTypeEnum, SearchCriteriaValue } from 'vitamui-library';
 
 @Component({
   selector: 'app-criteria-search',
   templateUrl: './criteria-search.component.html',
   styleUrls: ['./criteria-search.component.scss'],
 })
 export class CriteriaSearchComponent {
-  constructor() {}
+  constructor(private translateService: TranslateService) {}
 
   @Input()
   criteriaKey: string;
@@ -67,4 +68,16 @@ export class CriteriaSearchComponent {
       this.removeCriteria(keyElt, value.value);
     });
   }
+
+  getCriteriaLabel(key: string, criteriaValue: SearchCriteriaValue): string {
+    if (key === 'ALL_ARCHIVE_UNIT_TYPES') {
+      return criteriaValue.keyTranslated
+        ? this.translateService.instant('COLLECT.SEARCH_CRITERIA_FILTER.FIELDS.' + criteriaValue.label)
+        : criteriaValue.label;
+    }
+    if (key === 'ORPHANS_NODE') {
+      return this.translateService.instant('COLLECT.FILING_SCHEMA.ORPHANS_NODE');
+    }
+    return criteriaValue.value?.value ?? '';
+  }
 }