[VAS] Story 8084: add orphan node in filing leaves tree view

api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalService.java

@@ -47,8 +47,8 @@
 import fr.gouv.vitamui.archives.search.common.dto.UnitDescriptiveMetadataDto;
 import fr.gouv.vitamui.archives.search.common.dto.VitamUIArchiveUnitResponseDto;
 import fr.gouv.vitamui.commons.api.domain.AgencyModelDto;
-import fr.gouv.vitamui.commons.api.dtos.VitamUiOntologyDto;
 import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaDto;
+import fr.gouv.vitamui.commons.api.dtos.VitamUiOntologyDto;
 import fr.gouv.vitamui.commons.api.exception.BadRequestException;
 import fr.gouv.vitamui.commons.api.exception.InternalServerException;
 import fr.gouv.vitamui.commons.api.exception.UnexpectedDataException;

commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/utils/ArchiveSearchConsts.java

@@ -226,11 +226,13 @@ public enum CriteriaOperators {
     public static final String PRODUCER_SERVICE = "#originating_agency";
     public static final String GUID = "#id";
     public static final String ALL_UNIT_UPS = "#allunitups";
+    public static final String UNIT_UPS = "#unitups";
     public static final String TITLE_OR_DESCRIPTION = "TITLE_OR_DESCRIPTION";
     public static final String ELIMINATION_TECHNICAL_ID_APPRAISAL_RULE = "ELIMINATION_TECHNICAL_ID_APPRAISAL_RULE";
     public static final String ELIMINATION_GUID = "#elimination.OperationId";
     public static final String ALL_ARCHIVE_UNIT_TYPES = "#unitType";
     public static final String ALL_ARCHIVE_UNIT_TYPES_CRITERIA = "ALL_ARCHIVE_UNIT_TYPES";
+    public static final String ORPHANS_NODE_CRITERIA = "ORPHANS_NODE";
     public static final String DESCRIPTION_LEVEL_CRITERIA = "DESCRIPTION_LEVEL";
     public static final String DESCRIPTION_LEVEL = "DescriptionLevel";
     public static final String ARCHIVE_UNIT_OBJECTS = "#object";

commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/utils/MetadataSearchCriteriaUtils.java

@@ -70,6 +70,7 @@
 import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.CriteriaCategory.NODES;
 import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.CriteriaCategory.REUSE_RULE;
 import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.CriteriaOperators.EQ;
+import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.CriteriaOperators.MISSING;
 import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.DEFAULT_DEPTH;
 import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.FACETS_COMPUTE_RULES_AU_NUMBER;
 import static fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.FACETS_COUNT_BY_NODE;
@@ -1045,6 +1046,9 @@ public static void fillQueryFromCriteriaList(BooleanQuery queryToFill, List<Sear
                             searchCriteria.getValues().stream().map(CriteriaValue::getValue).collect(
                                 Collectors.toList())));
                         break;
+                    case ArchiveSearchConsts.ORPHANS_NODE_CRITERIA:
+                        queryToFill.add(buildOrphansNodeQuery());
+                        break;
 
                     case ArchiveSearchConsts.DESCRIPTION_LEVEL_CRITERIA:
                         queryToFill.add(buildArchiveUnitDescriptionLevelQuery(
@@ -1182,6 +1186,11 @@ private static Query buildStartDateEndDateQuery(String searchCriteria, final Lis
         return subQueryAnd;
     }
 
+    private static Query buildOrphansNodeQuery()
+        throws InvalidCreateOperationException {
+        return and().add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.UNIT_UPS, null, MISSING));
+    }
+
     private static Query buildArchiveUnitTypeQuery(final List<String> searchValues)
         throws InvalidCreateOperationException {
         BooleanQuery subQueryAnd = and();
@@ -1275,8 +1284,10 @@ public static void handleSimpleFieldCriteria(BooleanQuery queryToFill, SearchCri
             SIMPLE_FIELDS_VALUES_MAPPING.get(searchCriteria.getCriteria()) :
             searchCriteria.getCriteria();
 
-        List<String> stringValues = searchCriteria.getValues().stream().map(CriteriaValue::getValue)
-            .collect(Collectors.toList());
+        List<String> stringValues =
+            searchCriteria.getValues().stream().filter(Objects::nonNull)
+                .map(CriteriaValue::getValue).filter(Objects::nonNull)
+                .collect(Collectors.toList());
         if (isADateToReplace(searchCriteria)) {
             String stringDate = searchCriteria.getValues().get(0).getValue();
             LocalDateTime date = LocalDateTime.parse(stringDate, ArchiveSearchConsts.ISO_FRENCH_FORMATER);

ui/ui-archive-search/src/main/java/fr/gouv/vitamui/archives/search/ArchiveSearchApplication.java

@@ -39,6 +39,7 @@
 @SpringBootApplication
 @EnableDiscoveryClient
 public class ArchiveSearchApplication implements CommandLineRunner {
+
     @Autowired
     private Environment env;
 

ui/ui-frontend-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-frontend-common",
-  "version": "2.1.57",
+  "version": "2.1.58",
   "main": "src/index.ts",
   "pki": {
     "path": "../../dev-deployment/environments/certs/server/hosts/localhost",

ui/ui-frontend-common/src/app/modules/components/vitamui-tree-node/index.ts

@@ -34,6 +34,5 @@
  * 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.
  */
-export * from './node.interface';
 export * from './vitamui-tree-node.component';
 export * from './vitamui-tree-node.module';

ui/ui-frontend-common/src/app/modules/components/vitamui-tree-node/vitamui-tree-node.component.ts

@@ -25,7 +25,7 @@
  * accept its terms.
  */
 import { AfterContentChecked, ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core';
-import { FilingHoldingSchemeNode } from './node.interface';
+import { FilingHoldingSchemeNode } from '../../models/nodes';
 
 @Component({
   selector: 'vitamui-tree-node',
@@ -37,6 +37,7 @@ export class VitamuiTreeNodeComponent implements AfterContentChecked {
   @Input() icon: string;
   @Input() expanded: boolean;
   @Input() disabled: boolean;
+  @Input() hasCheckBox = true;
   @Input() labelIsLinkedToCheckbox = false;
   @Output() nodeToggle = new EventEmitter<void>();
   @Output() checkboxClick = new EventEmitter<void>();

ui/ui-frontend-common/src/app/modules/index.ts

@@ -119,4 +119,3 @@ export * from './vitamui-global-error-handler';
 export * from './vitamui-icons.enum';
 export * from './vitamui-roles.enum';
 export * from './vitamui-table/index';
-export * from './vitamui-unit-types.enum';

ui/ui-frontend/projects/vitamui-library/src/lib/models/search-criteria-history.interface.ts → ui/ui-frontend-common/src/app/modules/models/criteria/index.ts

@@ -34,23 +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 { Id } from 'ui-frontend-common';
-import { CriteriaValue } from './search.criteria';
-
-export interface SearchCriteriaHistory extends Id {
-  name: string;
-  userId?: string;
-  savingDate: string;
-  searchCriteriaList: SearchCriteriaEltements[];
-}
-
-export interface SearchCriteriaEltements {
-  criteria: string;
-  operator: string;
-  keyTranslated: boolean;
-  valueTranslated: boolean;
-  values: CriteriaValue[];
-  category: string;
-  dataType: string;
-}
+export * from './criteria.enums';
+export * from './criteria.interface';
+export * from './criterion.interface';
+export * from './search-criteria-history.interface';
+export * from './search-criteria.interface';
+export * from './search-response.interface';

ui/ui-frontend/projects/archive-search/src/app/archive/models/search-criteria-history.interface.ts → ui/ui-frontend-common/src/app/modules/models/criteria/search-criteria-history.interface.ts

@@ -35,8 +35,8 @@
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
 
-import { Id } from 'ui-frontend-common';
-import { CriteriaValue } from './search.criteria';
+import { Id } from '../id.interface';
+import { CriteriaValue } from './search-criteria.interface';
 
 export interface SearchCriteriaHistory extends Id {
   name: string;

ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search.criteria.ts → ui/ui-frontend-common/src/app/modules/models/criteria/search-criteria.interface.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.
  */
+
 export enum SearchCriteriaStatusEnum {
   NOT_INCLUDED = 'NOT_INCLUDED',
   INCLUDED = 'INCLUDED',
@@ -105,6 +106,7 @@ export interface SearchCriteriaEltDto {
   values: CriteriaValue[];
   dataType: string;
 }
+
 export interface SearchCriteriaDto {
   criteriaList: SearchCriteriaEltDto[];
   pageNumber: number;
@@ -126,10 +128,12 @@ export interface ResultFacetList {
   name: string;
   buckets: ResultBucket[];
 }
+
 export interface ResultBucket {
   value: string;
   count: number;
 }
+
 export interface ResultFacet {
   node: string;
   count: number;
@@ -144,9 +148,11 @@ export interface SearchCriteriaCategory {
   name: string;
   index: number;
 }
+
 export interface CriteriaValue {
   id: string;
   value?: string;
+  label?: string;
   beginInterval?: string;
   endInterval?: string;
 }
@@ -165,8 +171,8 @@ export class ArchiveSearchResultFacets {
 export class RuleFacets {
   waitingToRecalculateRulesListFacets: ResultFacet[];
   expiredRulesListFacets: ResultFacet[];
-  unexpiredRulesListFacets: ResultFacet[];
   rulesListFacets: ResultFacet[];
   finalActionsFacets?: ResultFacet[];
   noRulesFacets: ResultFacet[];
+  unexpiredRulesListFacets: ResultFacet[];
 }

ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search-criteria-history.interface.ts → ui/ui-frontend-common/src/app/modules/models/criteria/search-response.interface.ts

@@ -35,22 +35,10 @@
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
 
-import { Id } from 'ui-frontend-common';
-import { CriteriaValue } from './search.criteria';
+import { Unit } from '../units';
 
-export interface SearchCriteriaHistory extends Id {
-  name: string;
-  userId?: string;
-  savingDate: string;
-  searchCriteriaList: SearchCriteriaEltements[];
-}
-
-export interface SearchCriteriaEltements {
-  criteria: string;
-  operator: string;
-  keyTranslated: boolean;
-  valueTranslated: boolean;
-  values: CriteriaValue[];
-  category: string;
-  dataType: string;
+export interface SearchResponse<T = Unit> {
+  $hits: any;
+  $results: T[];
+  $facetResults?: any[];
 }

ui/ui-frontend-common/src/app/modules/models/index.ts

@@ -44,16 +44,15 @@ export * from './application/index';
 export * from './breadcrumb/breadcrumb.interface';
 export * from './collect/index';
 export * from './content-disposition.enum';
-export * from './criteria/criteria.enums';
-export * from './criteria/criteria.interface';
-export * from './criteria/criterion.interface';
+export * from './criteria/index';
 export * from './customer/index';
 export * from './externalparamprofile/index';
 export * from './group/index';
 export * from './id.interface';
 export * from './ingest-contract/index';
 export * from './logbook/index';
 export * from './managementContract/index';
+export * from './nodes/index';
 export * from './ontology/index';
 export * from './operation/index';
 export * from './position/index';