From 7743cd2fb4d67eb6109ec76fd2939bf0ba035110 Mon Sep 17 00:00:00 2001 From: Paris Alexandre Date: Wed, 9 Aug 2023 10:15:11 +0200 Subject: [PATCH] [VAS] Story 8084: mutualisation model --- ui/ui-frontend-common/package.json | 2 +- .../src/app/modules/models/criteria/index.ts | 41 ++++ .../criteria/search-criteria.interface.ts} | 5 + .../criteria/search-response.interface.ts | 44 ++++ .../src/app/modules/models/index.ts | 4 +- ui/ui-frontend/package.json | 2 +- ...rchive-unit-rules-details-tab.component.ts | 3 +- .../dip-request-create.component.ts | 3 +- .../add-management-rules.component.spec.ts | 9 +- .../add-management-rules.component.ts | 3 +- .../archive-unit-rules.component.spec.ts | 3 +- .../block-rules-inheritance.component.ts | 3 +- .../delete-unit-rules.component.spec.ts | 9 +- .../delete-unit-rules.component.ts | 3 +- ...ock-category-inheritance.component.spec.ts | 3 +- .../unlock-category-inheritance.component.ts | 3 +- ...unlock-rules-inheritance.component.spec.ts | 9 +- .../unlock-rules-inheritance.component.ts | 7 +- .../update-unit-rules.component.spec.ts | 9 +- .../update-unit-rules.component.ts | 3 +- .../management-rules.component.spec.ts | 3 +- .../management-rules.component.ts | 15 +- .../reclassification.component.spec.ts | 11 +- .../reclassification.component.ts | 10 +- .../transfer-request-modal.component.ts | 3 +- .../access-rule-search.component.spec.ts | 5 +- .../access-rule-search.component.ts | 5 +- .../appraisal-rule-search.component.spec.ts | 5 +- .../appraisal-rule-search.component.ts | 5 +- ...issemination-rule-search.component.spec.ts | 5 +- .../dissemination-rule-search.component.ts | 5 +- .../reuse-rule-search.component.spec.ts | 5 +- .../reuse-rule-search.component.ts | 5 +- .../storage-rule-search.component.spec.ts | 5 +- .../storage-rule-search.component.ts | 5 +- .../archive-search-rules-facets.component.ts | 2 +- .../search-access-rules-facets.component.ts | 5 +- ...search-appraisal-rules-facets.component.ts | 5 +- ...ch-dissemination-rules-facets.component.ts | 5 +- .../search-reuse-rules-facets.component.ts | 5 +- .../search-storage-rules-facets.component.ts | 5 +- .../archive-search.component.spec.ts | 5 +- .../archive-search.component.ts | 10 +- .../search-criteria-saver.component.spec.ts | 3 +- .../search-criteria-saver.component.ts | 3 +- .../simple-criteria-search.component.spec.ts | 3 +- .../simple-criteria-search.component.ts | 6 +- ...cription-criteria-search.component.spec.ts | 3 +- ...d-description-criteria-search.component.ts | 3 +- .../src/app/archive/archive.service.ts | 5 +- .../archive-facets.service.spec.ts | 2 +- .../common-services/archive-facets.service.ts | 2 +- .../archive-search-helper.service.ts | 8 +- .../archive-unit-dip.service.ts | 8 +- .../archive-unit-elimination.service.ts | 7 +- .../compute-inherited-rules.service.ts | 5 +- .../update-unit-management-rule.service.ts | 7 +- .../criteria-search.component.spec.ts | 3 +- .../criteria-search.component.ts | 2 +- .../filing-holding-scheme.component.ts | 5 +- .../filing-holding-scheme.handler.spec.ts | 3 +- .../filing-holding-scheme.handler.ts | 5 +- .../leaves-tree/leaves-tree.component.spec.ts | 3 +- .../leaves-tree/leaves-tree.component.ts | 5 +- .../leaves-tree/leaves-tree.service.ts | 6 +- .../models/dip-request-detail.interface.ts | 2 +- .../reclassification-request.interface.ts | 2 +- .../archive/models/ruleAction.interface.ts | 2 +- .../search-criteria-history.interface.ts | 3 +- .../models/search-response.interface.ts | 7 - .../transfer-request-detail.interface.ts | 2 +- .../archive-unit-validator.service.ts | 2 +- .../src/app/core/api/archive-api.service.ts | 6 +- .../app/core/archive-shared-data.service.ts | 10 +- .../management-rules-shared-data.service.ts | 2 +- .../archive-collect.service.ts | 14 +- .../archive-search-collect.component.ts | 10 +- .../access-rule-search.component.ts | 10 +- .../appraisal-rule-search.component.ts | 11 +- .../archive-search-rules-facets.component.ts | 2 +- .../search-access-rules-facets.component.ts | 5 +- ...search-appraisal-rules-facets.component.ts | 5 +- ...ch-dissemination-rules-facets.component.ts | 5 +- .../search-reuse-rules-facets.component.ts | 5 +- .../search-storage-rules-facets.component.ts | 5 +- .../criteria-search.component.ts | 2 +- .../dissemination-rule-search.component.ts | 7 +- .../filing-holding-scheme.component.ts | 6 +- .../filing-holding-scheme.handler.ts | 7 +- .../leaves-tree/leaves-tree.component.html | 28 +++ .../leaves-tree/leaves-tree.component.spec.ts | 3 +- .../leaves-tree/leaves-tree.component.ts | 62 ++++-- .../leaves-tree/leaves-tree.service.ts | 201 ++++++++++++++++++ .../reuse-rule-search.component.ts | 7 +- .../search-criteria-saver.component.ts | 3 +- .../simple-criteria-search.component.ts | 6 +- .../storage-rule-search.component.ts | 7 +- ...ption-criteria-search-collect.component.ts | 5 +- .../models/rule-action.interface.ts | 2 +- .../search-criteria-history.interface.ts | 3 +- .../models/search.criteria.ts | 172 --------------- .../services/archive-facets.service.ts | 25 +-- .../services/archive-search-helper.service.ts | 23 +- .../services/archive-shared-data.service.ts | 5 +- .../management-rules-shared-data.service.ts | 3 +- .../core/api/transaction-api.service.ts | 25 +-- .../src/app/collect/core/models/index.ts | 1 - .../src/lib/api/search-unit-api.service.ts | 3 +- .../search-criteria-history.interface.ts | 3 +- .../lib/models/search-response.interface.ts | 7 - .../src/lib/models/search.criteria.ts | 156 -------------- .../vitamui-library/src/public-api.ts | 1 - 112 files changed, 634 insertions(+), 648 deletions(-) create mode 100644 ui/ui-frontend-common/src/app/modules/models/criteria/index.ts rename ui/{ui-frontend/projects/archive-search/src/app/archive/models/search.criteria.ts => ui-frontend-common/src/app/modules/models/criteria/search-criteria.interface.ts} (99%) create mode 100644 ui/ui-frontend-common/src/app/modules/models/criteria/search-response.interface.ts delete mode 100644 ui/ui-frontend/projects/archive-search/src/app/archive/models/search-response.interface.ts create mode 100644 ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.service.ts delete mode 100644 ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search.criteria.ts delete mode 100644 ui/ui-frontend/projects/vitamui-library/src/lib/models/search-response.interface.ts delete mode 100644 ui/ui-frontend/projects/vitamui-library/src/lib/models/search.criteria.ts diff --git a/ui/ui-frontend-common/package.json b/ui/ui-frontend-common/package.json index a7194b21221..f5e8b4b4369 100644 --- a/ui/ui-frontend-common/package.json +++ b/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", diff --git a/ui/ui-frontend-common/src/app/modules/models/criteria/index.ts b/ui/ui-frontend-common/src/app/modules/models/criteria/index.ts new file mode 100644 index 00000000000..61720352010 --- /dev/null +++ b/ui/ui-frontend-common/src/app/modules/models/criteria/index.ts @@ -0,0 +1,41 @@ +/* + * Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020) + * and the signatories of the "VITAM - Accord du Contributeur" agreement. + * + * contact@programmevitam.fr + * + * This software is a computer program whose purpose is to implement + * implement a digital archiving front-office system for the secure and + * efficient high volumetry VITAM solution. + * + * This software is governed by the CeCILL-C license under French law and + * abiding by the rules of distribution of free software. You can use, + * modify and/ or redistribute the software under the terms of the CeCILL-C + * license as circulated by CEA, CNRS and INRIA at the following URL + * "http://www.cecill.info". + * + * As a counterpart to the access to the source code and rights to copy, + * modify and redistribute granted by the license, users are provided only + * with a limited warranty and the software's author, the holder of the + * economic rights, and the successive licensors have only limited + * liability. + * + * In this respect, the user's attention is drawn to the risks associated + * with loading, using, modifying and/or developing or reproducing the + * software by the user in light of its specific status of free software, + * that may mean that it is complicated to manipulate, and that also + * therefore means that it is reserved for developers and experienced + * professionals having in-depth computer knowledge. Users are therefore + * encouraged to load and test the software's suitability as regards their + * requirements in conditions enabling the security of their systems and/or + * data to be ensured and, more generally, to use and operate it in the + * same conditions as regards security. + * + * 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 './criteria.enums'; +export * from './criteria.interface'; +export * from './criterion.interface'; +export * from './search-criteria.interface'; +export * from './search-response.interface'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/search.criteria.ts b/ui/ui-frontend-common/src/app/modules/models/criteria/search-criteria.interface.ts similarity index 99% rename from ui/ui-frontend/projects/archive-search/src/app/archive/models/search.criteria.ts rename to ui/ui-frontend-common/src/app/modules/models/criteria/search-criteria.interface.ts index 7e6afeb8f15..c440a1e813b 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/search.criteria.ts +++ b/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,6 +148,7 @@ export interface SearchCriteriaCategory { name: string; index: number; } + export interface CriteriaValue { id: string; value?: string; diff --git a/ui/ui-frontend-common/src/app/modules/models/criteria/search-response.interface.ts b/ui/ui-frontend-common/src/app/modules/models/criteria/search-response.interface.ts new file mode 100644 index 00000000000..2cbc2903524 --- /dev/null +++ b/ui/ui-frontend-common/src/app/modules/models/criteria/search-response.interface.ts @@ -0,0 +1,44 @@ +/* + * Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020) + * and the signatories of the "VITAM - Accord du Contributeur" agreement. + * + * contact@programmevitam.fr + * + * This software is a computer program whose purpose is to implement + * implement a digital archiving front-office system for the secure and + * efficient high volumetry VITAM solution. + * + * This software is governed by the CeCILL-C license under French law and + * abiding by the rules of distribution of free software. You can use, + * modify and/ or redistribute the software under the terms of the CeCILL-C + * license as circulated by CEA, CNRS and INRIA at the following URL + * "http://www.cecill.info". + * + * As a counterpart to the access to the source code and rights to copy, + * modify and redistribute granted by the license, users are provided only + * with a limited warranty and the software's author, the holder of the + * economic rights, and the successive licensors have only limited + * liability. + * + * In this respect, the user's attention is drawn to the risks associated + * with loading, using, modifying and/or developing or reproducing the + * software by the user in light of its specific status of free software, + * that may mean that it is complicated to manipulate, and that also + * therefore means that it is reserved for developers and experienced + * professionals having in-depth computer knowledge. Users are therefore + * encouraged to load and test the software's suitability as regards their + * requirements in conditions enabling the security of their systems and/or + * data to be ensured and, more generally, to use and operate it in the + * same conditions as regards security. + * + * 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 { Unit } from '../units'; + +export interface SearchResponse { + $hits: any; + $results: T[]; + $facetResults?: any[]; +} diff --git a/ui/ui-frontend-common/src/app/modules/models/index.ts b/ui/ui-frontend-common/src/app/modules/models/index.ts index 14ec5b860f2..092f6b72074 100644 --- a/ui/ui-frontend-common/src/app/modules/models/index.ts +++ b/ui/ui-frontend-common/src/app/modules/models/index.ts @@ -44,9 +44,7 @@ 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'; diff --git a/ui/ui-frontend/package.json b/ui/ui-frontend/package.json index adf7bd8e264..42c96a531ba 100644 --- a/ui/ui-frontend/package.json +++ b/ui/ui-frontend/package.json @@ -138,7 +138,7 @@ "serialize-javascript": "^5.0.1", "timers": "^0.1.1", "tslib": "^2.0.3", - "ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-2.1.57.tgz", + "ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-2.1.58.tgz", "underscore": "^1.13.1", "utf-8-validate": "^5.0.2", "uuid": "^7.0.2", diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-unit-rules-details-tab/archive-unit-rules-details-tab.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-unit-rules-details-tab/archive-unit-rules-details-tab.component.ts index 4301533e717..21cc0bae9d7 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-unit-rules-details-tab/archive-unit-rules-details-tab.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-unit-rules-details-tab/archive-unit-rules-details-tab.component.ts @@ -39,9 +39,8 @@ import { animate, AUTO_STYLE, state, style, transition, trigger } from '@angular import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { CriteriaDataType, CriteriaOperator, Unit } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, SearchCriteriaEltDto, SearchCriteriaTypeEnum, Unit } from 'ui-frontend-common'; import { ArchiveService } from '../../archive.service'; -import { SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; const PAGE_SIZE = 10; const CURRENT_PAGE = 0; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts index 1ce01079124..6229e6fe1c9 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts @@ -40,11 +40,10 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { ConfirmDialogService, Logger, StartupService } from 'ui-frontend-common'; +import { ConfirmDialogService, Logger, SearchCriteriaEltDto, StartupService } from 'ui-frontend-common'; import * as uuid from 'uuid'; import { ArchiveService } from '../../../archive.service'; import { ExportDIPCriteriaList, ExportDIPRequestDetail } from '../../../models/dip-request-detail.interface'; -import { SearchCriteriaEltDto } from '../../../models/search.criteria'; @Component({ selector: 'app-dip-request-create', diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.spec.ts index 72fee10ee04..5327d245fad 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.spec.ts @@ -34,12 +34,15 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { UpdateUnitManagementRuleService } from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; -import { SearchCriteriaDto, SearchCriteriaTypeEnum } from 'projects/archive-search/src/app/archive/models/search.criteria'; +import { + UpdateUnitManagementRuleService +} from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; import { ManagementRulesValidatorService } from 'projects/archive-search/src/app/archive/validators/management-rules-validator.service'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Observable, of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, SearchCriteriaDto, SearchCriteriaTypeEnum, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { ActionsRules, ManagementRules, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; import { AddManagementRulesComponent } from './add-management-rules.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.ts index f448e567e1f..8955716a430 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/add-management-rules/add-management-rules.component.ts @@ -42,13 +42,12 @@ import { TranslateService } from '@ngx-translate/core'; import { cloneDeep } from 'lodash'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService, SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ManagementRulesSharedDataService } from '../../../../../../core/management-rules-shared-data.service'; import { ArchiveService } from '../../../../../archive.service'; import { UpdateUnitManagementRuleService } from '../../../../../common-services/update-unit-management-rule.service'; import { ArchiveSearchConstsEnum } from '../../../../../models/archive-search-consts-enum'; import { ManagementRules, RuleAction, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../../../../../models/search.criteria'; import { ManagementRulesValidatorService } from '../../../../../validators/management-rules-validator.service'; const MANAGEMENT_RULE_IDENTIFIER = 'MANAGEMENT_RULE_IDENTIFIER'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/archive-unit-rules.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/archive-unit-rules.component.spec.ts index 773461dbfbc..1ce3b0d8e4a 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/archive-unit-rules.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/archive-unit-rules.component.spec.ts @@ -34,12 +34,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Observable, of } from 'rxjs'; -import { BASE_URL, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { BASE_URL, InjectorModule, LoggerModule, SearchCriteriaDto, WINDOW_LOCATION } from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { UpdateUnitManagementRuleService } from '../../../../common-services/update-unit-management-rule.service'; import { RuleTypeEnum } from '../../../../models/rule-type-enum'; import { ActionsRules, ManagementRules, RuleCategoryAction } from '../../../../models/ruleAction.interface'; -import { SearchCriteriaDto } from '../../../../models/search.criteria'; import { ArchiveUnitRulesComponent } from './archive-unit-rules.component'; const translations: any = { TEST: 'Mock translate test' }; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/block-rules-inheritance/block-rules-inheritance.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/block-rules-inheritance/block-rules-inheritance.component.ts index eaa10da5a61..e2682fb55bc 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/block-rules-inheritance/block-rules-inheritance.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/block-rules-inheritance/block-rules-inheritance.component.ts @@ -31,10 +31,9 @@ import { MatDialog } from '@angular/material/dialog'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { diff, Rule, RuleService } from 'ui-frontend-common'; +import { diff, Rule, RuleService, SearchCriteriaDto } from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../../../../models/archive-search-consts-enum'; import { ManagementRules, RuleAction, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { SearchCriteriaDto } from '../../../../../models/search.criteria'; import { ManagementRulesValidatorService } from '../../../../../validators/management-rules-validator.service'; @Component({ diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.spec.ts index f23f89452ac..7fa94ea1b0b 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.spec.ts @@ -34,12 +34,15 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { UpdateUnitManagementRuleService } from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; -import { SearchCriteriaDto, SearchCriteriaTypeEnum } from 'projects/archive-search/src/app/archive/models/search.criteria'; +import { + UpdateUnitManagementRuleService +} from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; import { ManagementRulesValidatorService } from 'projects/archive-search/src/app/archive/validators/management-rules-validator.service'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Observable, of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, SearchCriteriaDto, SearchCriteriaTypeEnum, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { ActionsRules, ManagementRules, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; import { DeleteUnitRulesComponent } from './delete-unit-rules.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.ts index 01b14951664..94270522708 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/delete-unit-rules/delete-unit-rules.component.ts @@ -43,12 +43,11 @@ import { cloneDeep } from 'lodash'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService, SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ArchiveService } from '../../../../../archive.service'; import { UpdateUnitManagementRuleService } from '../../../../../common-services/update-unit-management-rule.service'; import { ArchiveSearchConstsEnum } from '../../../../../models/archive-search-consts-enum'; import { ManagementRules, RuleAction, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../../../../../models/search.criteria'; import { ManagementRulesValidatorService } from '../../../../../validators/management-rules-validator.service'; const MANAGEMENT_RULE_IDENTIFIER = 'MANAGEMENT_RULE_IDENTIFIER'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.spec.ts index 1485fe2dc51..7845064b815 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.spec.ts @@ -34,12 +34,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Observable, of } from 'rxjs'; -import { BASE_URL, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { BASE_URL, InjectorModule, LoggerModule, PagedResult, SearchCriteriaDto, WINDOW_LOCATION } from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { UpdateUnitManagementRuleService } from '../../../../../common-services/update-unit-management-rule.service'; import { RuleTypeEnum } from '../../../../../models/rule-type-enum'; import { ActionsRules, ManagementRules, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { PagedResult, SearchCriteriaDto } from '../../../../../models/search.criteria'; import { UnlockCategoryInheritanceComponent } from './unlock-category-inheritance.component'; const translations: any = { TEST: 'Mock translate test' }; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.ts index 2a3e9e87b55..3070c21e5b9 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-category-inheritance/unlock-category-inheritance.component.ts @@ -32,12 +32,11 @@ import { cloneDeep } from 'lodash'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ArchiveService } from '../../../../../archive.service'; import { UpdateUnitManagementRuleService } from '../../../../../common-services/update-unit-management-rule.service'; import { ArchiveSearchConstsEnum } from '../../../../../models/archive-search-consts-enum'; import { ActionsRules, ManagementRules, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../../../../../models/search.criteria'; const ORIGIN_HAS_AT_LEAST_ONE = 'ORIGIN_HAS_AT_LEAST_ONE'; const MANAGEMENT_RULE_INHERITED_CRITERIA = 'MANAGEMENT_RULE_INHERITED_CRITERIA'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.spec.ts index 10ac2425677..8ef9666e533 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.spec.ts @@ -34,12 +34,15 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { UpdateUnitManagementRuleService } from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; -import { SearchCriteriaDto, SearchCriteriaTypeEnum } from 'projects/archive-search/src/app/archive/models/search.criteria'; +import { + UpdateUnitManagementRuleService +} from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; import { ManagementRulesValidatorService } from 'projects/archive-search/src/app/archive/validators/management-rules-validator.service'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Observable, of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, SearchCriteriaDto, SearchCriteriaTypeEnum, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { ActionsRules, ManagementRules, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; import { UnlockRulesInheritanceComponent } from './unlock-rules-inheritance.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.ts index 54a088a71b5..0909852c272 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/unlock-rules-inheritance/unlock-rules-inheritance.component.ts @@ -30,15 +30,16 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { cloneDeep } from 'lodash'; -import { UpdateUnitManagementRuleService } from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; +import { + UpdateUnitManagementRuleService +} from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService, SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ArchiveService } from '../../../../../archive.service'; import { ArchiveSearchConstsEnum } from '../../../../../models/archive-search-consts-enum'; import { ManagementRules, RuleAction, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../../../../../models/search.criteria'; import { ManagementRulesValidatorService } from '../../../../../validators/management-rules-validator.service'; const ORIGIN_HAS_AT_LEAST_ONE = 'ORIGIN_HAS_AT_LEAST_ONE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.spec.ts index 47ff0a78467..514592845f1 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.spec.ts @@ -34,12 +34,15 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { UpdateUnitManagementRuleService } from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; -import { SearchCriteriaDto, SearchCriteriaTypeEnum } from 'projects/archive-search/src/app/archive/models/search.criteria'; +import { + UpdateUnitManagementRuleService +} from 'projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service'; import { ManagementRulesValidatorService } from 'projects/archive-search/src/app/archive/validators/management-rules-validator.service'; import { ManagementRulesSharedDataService } from 'projects/archive-search/src/app/core/management-rules-shared-data.service'; import { Observable, of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, SearchCriteriaDto, SearchCriteriaTypeEnum, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { ActionsRules, ManagementRules, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; import { UpdateUnitRulesComponent } from './update-unit-rules.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.ts index 33a221bb4ec..d3291dc410e 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/archive-unit-rules/update-unit-rules/update-unit-rules.component.ts @@ -42,13 +42,12 @@ import { TranslateService } from '@ngx-translate/core'; import { cloneDeep } from 'lodash'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, diff, Rule, RuleService, SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ManagementRulesSharedDataService } from '../../../../../../core/management-rules-shared-data.service'; import { ArchiveService } from '../../../../../archive.service'; import { UpdateUnitManagementRuleService } from '../../../../../common-services/update-unit-management-rule.service'; import { ArchiveSearchConstsEnum } from '../../../../../models/archive-search-consts-enum'; import { ManagementRules, RuleAction, RuleActionsEnum, RuleCategoryAction } from '../../../../../models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../../../../../models/search.criteria'; import { ManagementRulesValidatorService } from '../../../../../validators/management-rules-validator.service'; const MANAGEMENT_RULE_IDENTIFIER = 'MANAGEMENT_RULE_IDENTIFIER'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.spec.ts index 78f49e799e6..9936104c587 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.spec.ts @@ -44,11 +44,10 @@ import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Observable, of } from 'rxjs'; -import { BASE_URL, InjectorModule, LoggerModule, StartupService, WINDOW_LOCATION } from 'ui-frontend-common'; +import { BASE_URL, InjectorModule, LoggerModule, SearchCriteriaDto, StartupService, WINDOW_LOCATION } from 'ui-frontend-common'; import { ManagementRulesSharedDataService } from '../../../../core/management-rules-shared-data.service'; import { ArchiveService } from '../../../archive.service'; import { ActionsRules, ManagementRules, RuleCategoryAction } from '../../../models/ruleAction.interface'; -import { SearchCriteriaDto } from '../../../models/search.criteria'; import { ManagementRulesComponent } from './management-rules.component'; const translations: any = { TEST: 'Mock translate test' }; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.ts index f4856ed3aa6..baf79616fc6 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/management-rules/management-rules.component.ts @@ -41,19 +41,14 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { Logger, StartupService } from 'ui-frontend-common'; +import { Logger, SearchCriteriaDto, SearchCriteriaEltDto, StartupService } from 'ui-frontend-common'; import { ManagementRulesSharedDataService } from '../../../../core/management-rules-shared-data.service'; import { ArchiveService } from '../../../archive.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; import { RuleTypeEnum } from '../../../models/rule-type-enum'; import { - ActionsRules, - RuleActions, - RuleActionsEnum, - RuleCategoryAction, - RuleSearchCriteriaDto + ActionsRules, RuleActions, RuleActionsEnum, RuleCategoryAction, RuleSearchCriteriaDto } from '../../../models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../../../models/search.criteria'; const ARCHIVE_UNIT_HOLDING_UNIT = 'ARCHIVE_UNIT_HOLDING_UNIT'; @Component({ @@ -363,7 +358,7 @@ export class ManagementRulesComponent implements OnInit, OnChanges, OnDestroy { (managementRule.actionType === RuleActionsEnum.BLOCK_CATEGORY_INHERITANCE || managementRule.actionType === RuleActionsEnum.UNLOCK_CATEGORY_INHERITANCE) )?.ruleCategoryAction.preventInheritance; - + const preventRulesIdToAdd: string[] = data.find( (managementRule) => managementRule.category === RuleTypeEnum.REUSERULE && managementRule.actionType === RuleActionsEnum.ADD_RULES @@ -798,7 +793,7 @@ export class ManagementRulesComponent implements OnInit, OnChanges, OnDestroy { (managementRule.actionType === RuleActionsEnum.BLOCK_CATEGORY_INHERITANCE || managementRule.actionType === RuleActionsEnum.UNLOCK_CATEGORY_INHERITANCE) )?.ruleCategoryAction.preventInheritance; - + const preventRulesIdToAdd: string[] = data.find( (managementRule) => managementRule.category === RuleTypeEnum.STORAGERULE && managementRule.actionType === RuleActionsEnum.ADD_RULES @@ -808,7 +803,7 @@ export class ManagementRulesComponent implements OnInit, OnChanges, OnDestroy { (managementRule) => managementRule.category === RuleTypeEnum.STORAGERULE && managementRule.actionType === RuleActionsEnum.DELETE_RULES )?.ruleCategoryAction?.preventRulesIdToRemove; - + if (data.findIndex((rule) => rule.category === RuleTypeEnum.STORAGERULE && rule.actionType === RuleActionsEnum.ADD_RULES) !== -1) { this.ruleCategoryDuaActionsToAdd = data.find( (rule) => rule.category === RuleTypeEnum.STORAGERULE && rule.actionType === RuleActionsEnum.ADD_RULES diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.spec.ts index e6afc0f5106..ee47a5abffb 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.spec.ts @@ -38,18 +38,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { - BASE_URL, - ConfirmDialogService, - CriteriaDataType, - CriteriaOperator, - InjectorModule, - LoggerModule, - StartupService, - WINDOW_LOCATION, + BASE_URL, ConfirmDialogService, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, SearchCriteriaDto, + SearchCriteriaTypeEnum, StartupService, WINDOW_LOCATION, } from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; import { ArchiveService } from '../../../archive.service'; -import { SearchCriteriaDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { ArchiveUnitValidatorService } from '../../../validators/archive-unit-validator.service'; import { ReclassificationComponent } from './reclassification.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.ts index 36480328a3b..891c2907de4 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/reclassification/reclassification.component.ts @@ -35,15 +35,15 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { intersection } from 'lodash'; import { Subscription } from 'rxjs'; -import { ConfirmDialogService, CriteriaDataType, CriteriaOperator, Logger, Option, StartupService } from 'ui-frontend-common'; +import { + ConfirmDialogService, CriteriaDataType, CriteriaOperator, Logger, Option, PagedResult, SearchCriteriaDto, SearchCriteriaTypeEnum, + StartupService +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../../core/archive-shared-data.service'; import { ArchiveService } from '../../../archive.service'; import { - ReclassificationAction, - ReclassificationCriteriaDto, - ReclassificationQueryActionType + ReclassificationAction, ReclassificationCriteriaDto, ReclassificationQueryActionType } from '../../../models/reclassification-request.interface'; -import { PagedResult, SearchCriteriaDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { ArchiveUnitValidatorService } from '../../../validators/archive-unit-validator.service'; const PROGRESS_BAR_MULTIPLICATOR = 100; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component.ts index 6ee32b9a45a..1ce39dcc9d1 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component.ts @@ -29,9 +29,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { ConfirmDialogService, Logger, StartupService } from 'ui-frontend-common'; +import { ConfirmDialogService, Logger, SearchCriteriaEltDto, StartupService } from 'ui-frontend-common'; import { ArchiveService } from '../../../archive.service'; -import { SearchCriteriaEltDto } from '../../../models/search.criteria'; import { TransferRequestDto, TransferRequestParameters } from '../../../models/transfer-request-detail.interface'; @Component({ diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.spec.ts index d8bd8f3bacd..14414dd5d73 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.spec.ts @@ -36,9 +36,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ArchiveSharedDataService } from 'projects/archive-search/src/app/core/archive-shared-data.service'; import { of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, CriteriaValue, InjectorModule, LoggerModule, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; -import { CriteriaValue } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; import { AccessRuleSearchComponent } from './access-rule-search.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.ts index 4dc69bd50ec..27158f39222 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.ts @@ -3,10 +3,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../../core/archive-shared-data.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; const RULE_TYPE_SUFFIX = '_ACCESS_RULE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.spec.ts index 5a8c9ee1914..9358e671ade 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.spec.ts @@ -36,9 +36,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ArchiveSharedDataService } from 'projects/archive-search/src/app/core/archive-shared-data.service'; import { of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, CriteriaValue, InjectorModule, LoggerModule, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; -import { CriteriaValue } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; import { AppraisalRuleSearchComponent } from './appraisal-rule-search.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.ts index 4f603aa99a6..1c077f93a3f 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.ts @@ -3,10 +3,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../../core/archive-shared-data.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; const RULE_TYPE_SUFFIX = '_APPRAISAL_RULE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.spec.ts index 0f47b22b8a9..bacaeb92845 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.spec.ts @@ -36,9 +36,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ArchiveSharedDataService } from 'projects/archive-search/src/app/core/archive-shared-data.service'; import { of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, CriteriaValue, InjectorModule, LoggerModule, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; -import { CriteriaValue } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; import { DisseminationRuleSearchComponent } from './dissemination-rule-search.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.ts index e08cd5f076b..fb6d3c363e9 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/dissemination-rule-search/dissemination-rule-search.component.ts @@ -40,10 +40,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../../core/archive-shared-data.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; const RULE_TYPE_SUFFIX = '_DISSEMINATION_RULE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.spec.ts index 19855bccfc9..e114533d904 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.spec.ts @@ -36,9 +36,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ArchiveSharedDataService } from 'projects/archive-search/src/app/core/archive-shared-data.service'; import { of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, CriteriaValue, InjectorModule, LoggerModule, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; -import { CriteriaValue } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; import { ReuseRuleSearchComponent } from './reuse-rule-search.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.ts index 1dac6ab314f..943364eb380 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/reuse-rule-search/reuse-rule-search.component.ts @@ -40,10 +40,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../../core/archive-shared-data.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; const RULE_TYPE_SUFFIX = '_REUSE_RULE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.spec.ts index a494409e366..a0ec74142a2 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.spec.ts @@ -36,9 +36,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ArchiveSharedDataService } from 'projects/archive-search/src/app/core/archive-shared-data.service'; import { of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, CriteriaDataType, CriteriaOperator, CriteriaValue, InjectorModule, LoggerModule, WINDOW_LOCATION +} from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; -import { CriteriaValue } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; import { StorageRuleSearchComponent } from './storage-rule-search.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.ts index aa037614883..44fe4a28d54 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/storage-rule-search/storage-rule-search.component.ts @@ -40,10 +40,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../../core/archive-shared-data.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../../models/search.criteria'; import { RuleValidator } from '../../rule.validator'; const RULE_TYPE_SUFFIX = '_STORAGE_RULE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/archive-search-rules-facets.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/archive-search-rules-facets.component.ts index ce2b13abf83..747a2f865af 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/archive-search-rules-facets.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/archive-search-rules-facets.component.ts @@ -36,7 +36,7 @@ */ import { Component, Input, OnInit } from '@angular/core'; -import { RuleFacets } from '../../models/search.criteria'; +import { RuleFacets } from 'ui-frontend-common'; @Component({ selector: 'app-archive-search-rules-facets', diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts index e0ef198ebec..abb0fcb9176 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts @@ -38,11 +38,10 @@ import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveFacetsService } from '../../../common-services/archive-facets.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; @Component({ selector: 'app-search-access-rules-facets', @@ -146,7 +145,7 @@ export class SearchAccessRulesFacetsComponent implements OnInit, OnChanges { private handleWaitingToRecalculateRulesFacets(): number { let archiveUnitWithRules = 0; if (this.accessRuleFacets.waitingToRecalculateRulesListFacets && this.accessRuleFacets.waitingToRecalculateRulesListFacets.length > 0) { - let facetComputedUnits = this.accessRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.accessRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts index 9a6a64ffeae..880cc69d961 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts @@ -38,11 +38,10 @@ import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveFacetsService } from '../../../common-services/archive-facets.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; @Component({ selector: 'app-search-appraisal-rules-facets', @@ -210,7 +209,7 @@ export class SearchAppraisalRulesFacetsComponent implements OnInit, OnChanges { this.appraisalRuleFacets.waitingToRecalculateRulesListFacets && this.appraisalRuleFacets.waitingToRecalculateRulesListFacets.length > 0 ) { - let facetComputedUnits = this.appraisalRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.appraisalRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts index 1e07f0c754f..4b7063351c8 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts @@ -38,11 +38,10 @@ import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveFacetsService } from '../../../common-services/archive-facets.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; @Component({ selector: 'app-search-dissemination-rules-facets', @@ -157,7 +156,7 @@ export class SearchDisseminationRulesFacetsComponent implements OnInit, OnChange this.disseminationRuleFacets.waitingToRecalculateRulesListFacets && this.disseminationRuleFacets.waitingToRecalculateRulesListFacets.length > 0 ) { - let facetComputedUnits = this.disseminationRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.disseminationRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts index e2e3284041d..d7a26952975 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts @@ -38,11 +38,10 @@ import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveFacetsService } from '../../../common-services/archive-facets.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; @Component({ selector: 'app-search-reuse-rules-facets', @@ -154,7 +153,7 @@ export class SearchReuseRulesFacetsComponent implements OnInit, OnChanges { private handleWaitingToRecalculateRulesFacets(): number { let archiveUnitWithRules = 0; if (this.reuseRuleFacets.waitingToRecalculateRulesListFacets && this.reuseRuleFacets.waitingToRecalculateRulesListFacets.length > 0) { - let facetComputedUnits = this.reuseRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.reuseRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts index 6c58188588d..8f93142bbda 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts @@ -38,11 +38,10 @@ import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveFacetsService } from '../../../common-services/archive-facets.service'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; @Component({ selector: 'app-search-storage-rules-facets', @@ -199,7 +198,7 @@ export class SearchStorageRulesFacetsComponent implements OnInit, OnChanges { this.storageRuleFacets.waitingToRecalculateRulesListFacets && this.storageRuleFacets.waitingToRecalculateRulesListFacets.length > 0 ) { - let facetComputedUnits = this.storageRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.storageRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts index 904d10d7ba5..4376c4959b8 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts @@ -51,7 +51,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { environment } from 'projects/archive-search/src/environments/environment'; import { Observable, of } from 'rxjs'; -import { BASE_URL, InjectorModule, LoggerModule, VitamuiRoles, WINDOW_LOCATION } from 'ui-frontend-common'; +import { + BASE_URL, InjectorModule, LoggerModule, PagedResult, SearchCriteriaStatusEnum, VitamuiRoles, WINDOW_LOCATION +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../core/archive-shared-data.service'; import { ArchiveService } from '../archive.service'; import { ArchiveSearchHelperService } from '../common-services/archive-search-helper.service'; @@ -59,7 +61,6 @@ import { ArchiveUnitDipService } from '../common-services/archive-unit-dip.servi import { ArchiveUnitEliminationService } from '../common-services/archive-unit-elimination.service'; import { ComputeInheritedRulesService } from '../common-services/compute-inherited-rules.service'; import { UpdateUnitManagementRuleService } from '../common-services/update-unit-management-rule.service'; -import { PagedResult, SearchCriteriaStatusEnum } from '../models/search.criteria'; import { VitamUISnackBar } from '../shared/vitamui-snack-bar'; import { ArchiveSearchComponent } from './archive-search.component'; import { TransferAcknowledgmentComponent } from './transfer-acknowledgment/transfer-acknowledgment.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts index 78cbbc21b9a..a3a3f4f612b 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts @@ -36,7 +36,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { merge, Subject, Subscription } from 'rxjs'; import { debounceTime, filter } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, Direction, FilingHoldingSchemeNode, Logger, Unit, VitamuiRoles } from 'ui-frontend-common'; +import { + ArchiveSearchResultFacets, CriteriaDataType, CriteriaOperator, CriteriaValue, Direction, FilingHoldingSchemeNode, Logger, PagedResult, + SearchCriteria, SearchCriteriaAddAction, SearchCriteriaCategory, SearchCriteriaEltDto, SearchCriteriaMgtRuleEnum, + SearchCriteriaRemoveAction, SearchCriteriaStatusEnum, SearchCriteriaTypeEnum, Unit, VitamuiRoles +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../core/archive-shared-data.service'; import { ManagementRulesSharedDataService } from '../../core/management-rules-shared-data.service'; import { ArchiveService } from '../archive.service'; @@ -48,10 +52,6 @@ import { ComputeInheritedRulesService } from '../common-services/compute-inherit import { UpdateUnitManagementRuleService } from '../common-services/update-unit-management-rule.service'; import { ActionsRules } from '../models/ruleAction.interface'; import { SearchCriteriaEltements, SearchCriteriaHistory } from '../models/search-criteria-history.interface'; -import { - ArchiveSearchResultFacets, CriteriaValue, PagedResult, SearchCriteria, SearchCriteriaAddAction, SearchCriteriaCategory, - SearchCriteriaEltDto, SearchCriteriaMgtRuleEnum, SearchCriteriaRemoveAction, SearchCriteriaStatusEnum, SearchCriteriaTypeEnum, -} from '../models/search.criteria'; import { ReclassificationComponent } from './additional-actions-search/reclassification/reclassification.component'; import { SearchCriteriaSaverComponent } from './search-criteria-saver/search-criteria-saver.component'; import { TransferAcknowledgmentComponent } from './transfer-acknowledgment/transfer-acknowledgment.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.spec.ts index 7714f26d417..8410c1964e2 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.spec.ts @@ -46,11 +46,10 @@ import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Observable, of } from 'rxjs'; -import { CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, InjectorModule, LoggerModule, SearchCriteriaTypeEnum } from 'ui-frontend-common'; import { environment } from '../../../../environments/environment.prod'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { SearchCriteriaEltements, SearchCriteriaHistory } from '../../models/search-criteria-history.interface'; -import { SearchCriteriaTypeEnum } from '../../models/search.criteria'; import { VitamUISnackBar } from '../../shared/vitamui-snack-bar'; import { SearchCriteriaSaverComponent } from './search-criteria-saver.component'; import { SearchCriteriaSaverService } from './search-criteria-saver.service'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.ts index 36420562244..e2516f8b6e2 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-saver/search-criteria-saver.component.ts @@ -41,10 +41,9 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslatePipe } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { ConfirmDialogService, Direction } from 'ui-frontend-common'; +import { ConfirmDialogService, Direction, SearchCriteria, SearchCriteriaTypeEnum } from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { SearchCriteriaHistory } from '../../models/search-criteria-history.interface'; -import { SearchCriteria, SearchCriteriaTypeEnum } from '../../models/search.criteria'; import { VitamUISnackBarComponent } from '../../shared/vitamui-snack-bar'; import { SearchCriteriaSaverService } from './search-criteria-saver.service'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.spec.ts index 65460952ebe..9ce4b11887c 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.spec.ts @@ -33,11 +33,10 @@ import { FormBuilder } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { BASE_URL, CriteriaDataType, CriteriaOperator, InjectorModule } from 'ui-frontend-common'; +import { BASE_URL, CriteriaDataType, CriteriaOperator, CriteriaValue, InjectorModule } from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { ManagementRulesSharedDataService } from '../../../core/management-rules-shared-data.service'; import { ArchiveService } from '../../archive.service'; -import { CriteriaValue } from '../../models/search.criteria'; import { SimpleCriteriaSearchComponent } from './simple-criteria-search.component'; describe('SimpleCriteriaSearchComponent', () => { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.ts index 2162d7eb884..9fbaedf136e 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/simple-criteria-search/simple-criteria-search.component.ts @@ -40,12 +40,14 @@ import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { merge } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff, Ontology, OntologyService } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, Ontology, OntologyService, SearchCriteriaEltDto, + SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { ManagementRulesSharedDataService } from '../../../core/management-rules-shared-data.service'; import { ArchiveService } from '../../archive.service'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; const FINAL_ACTION_TYPE = 'FINAL_ACTION_TYPE'; const ARCHIVE_UNIT_FILING_UNIT = 'ARCHIVE_UNIT_FILING_UNIT'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.spec.ts index dfe0eba7e52..e5958a895a2 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.spec.ts @@ -40,9 +40,8 @@ import { FormBuilder } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { CriteriaOperator, InjectorModule } from 'ui-frontend-common'; +import { CriteriaOperator, CriteriaValue, InjectorModule } from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; -import { CriteriaValue } from '../../models/search.criteria'; import { TitleAndDescriptionCriteriaSearchComponent } from './title-and-description-criteria-search.component'; describe('TitleAndDescriptionCriteriaSearchComponent', () => { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.ts index 57c7140e17c..2808037ebac 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/title-and-description-criteria-search/title-and-description-criteria-search.component.ts @@ -39,10 +39,9 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaTypeEnum } from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaTypeEnum } from '../../models/search.criteria'; const TITLE_OR_DESCRIPTION = 'TITLE_OR_DESCRIPTION'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts index 17d2ec564f4..6d9f6c896c2 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts @@ -41,14 +41,13 @@ import { Observable, of, throwError, TimeoutError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { AccessContract, AccessContractApiService, ApiUnitObject, CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode, Ontology, - SearchService, SecurityService, Unit, + PagedResult, SearchCriteria, SearchCriteriaDto, SearchCriteriaEltDto, SearchCriteriaTypeEnum, SearchResponse, SearchService, + SecurityService, Unit } from 'ui-frontend-common'; import { ArchiveApiService } from '../core/api/archive-api.service'; import { ExportDIPCriteriaList } from './models/dip-request-detail.interface'; import { ReclassificationCriteriaDto } from './models/reclassification-request.interface'; import { RuleSearchCriteriaDto } from './models/ruleAction.interface'; -import { SearchResponse } from './models/search-response.interface'; -import { PagedResult, SearchCriteria, SearchCriteriaDto, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from './models/search.criteria'; import { TransferRequestDto } from './models/transfer-request-detail.interface'; import { UnitDescriptiveMetadataDto } from './models/unitDescriptiveMetadata.interface'; import { VitamUISnackBarComponent } from './shared/vitamui-snack-bar'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.spec.ts index 6f83c3b43bf..436e4b64023 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.spec.ts @@ -36,7 +36,7 @@ */ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { ResultFacet, ResultFacetList } from '../models/search.criteria'; +import { ResultFacet, ResultFacetList } from 'ui-frontend-common'; import { ArchiveFacetsService } from './archive-facets.service'; describe('ArchiveFacetsService', () => { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.ts index 1c8fd8b0516..117a7abd70f 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-facets.service.ts @@ -35,8 +35,8 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ import { Injectable } from '@angular/core'; +import { ArchiveSearchResultFacets, ResultFacet, ResultFacetList, RuleFacets, SearchCriteriaMgtRuleEnum } from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../models/archive-search-consts-enum'; -import { ArchiveSearchResultFacets, ResultFacet, ResultFacetList, RuleFacets, SearchCriteriaMgtRuleEnum } from '../models/search.criteria'; @Injectable({ providedIn: 'root', diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-search-helper.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-search-helper.service.ts index 79c067d3482..3df0e8fde1f 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-search-helper.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-search-helper.service.ts @@ -27,12 +27,12 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, FilingHoldingSchemeNode, SearchCriteria, SearchCriteriaEltDto, + SearchCriteriaStatusEnum, SearchCriteriaTypeEnum, SearchCriteriaValue +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../core/archive-shared-data.service'; import { ArchiveService } from '../archive.service'; -import { - CriteriaValue, SearchCriteria, SearchCriteriaEltDto, SearchCriteriaStatusEnum, SearchCriteriaTypeEnum, SearchCriteriaValue, -} from '../models/search.criteria'; import { VitamUISnackBarComponent } from '../shared/vitamui-snack-bar'; const ALL_ARCHIVE_UNIT_TYPES = 'ALL_ARCHIVE_UNIT_TYPES'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-dip.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-dip.service.ts index c5feb968f8f..747fc69b6bb 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-dip.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-dip.service.ts @@ -28,10 +28,12 @@ import { Injectable, TemplateRef } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { filter } from 'rxjs/operators'; -import { ArchiveSearchComponent } from '../archive-search/archive-search.component'; +import { SearchCriteriaEltDto } from 'ui-frontend-common'; import { DipRequestCreateComponent } from '../archive-search/additional-actions-search/dip-request-create/dip-request-create.component'; -import { SearchCriteriaEltDto } from '../models/search.criteria'; -import { TransferRequestModalComponent } from '../archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component'; +import { + TransferRequestModalComponent +} from '../archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component'; +import { ArchiveSearchComponent } from '../archive-search/archive-search.component'; const DEFAULT_RESULT_THRESHOLD = 10000; const PAGE_SIZE = 10; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-elimination.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-elimination.service.ts index d9b7ace7bbf..7d849c78d32 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-elimination.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/archive-unit-elimination.service.ts @@ -31,10 +31,9 @@ import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { StartupService } from 'ui-frontend-common'; +import { SearchCriteriaEltDto, StartupService } from 'ui-frontend-common'; import { ArchiveSearchComponent } from '../archive-search/archive-search.component'; import { ArchiveService } from '../archive.service'; -import { SearchCriteriaEltDto } from '../models/search.criteria'; import { ArchiveSearchHelperService } from './archive-search-helper.service'; const DEFAULT_RESULT_THRESHOLD = 10000; @@ -53,7 +52,7 @@ export class ArchiveUnitEliminationService { } launchEliminationAnalysisModal( - listOfUACriteriaSearch: SearchCriteriaEltDto[], + listOfUACriteriaSearch: SearchCriteriaEltDto[], selectedItemCountKnown: boolean, itemSelected: number, tenantIdentifier: number, @@ -86,7 +85,7 @@ export class ArchiveUnitEliminationService { } private launchEliminationAnalysis( - listOfUACriteriaSearch: SearchCriteriaEltDto[], + listOfUACriteriaSearch: SearchCriteriaEltDto[], tenantIdentifier: number, currentPage: number ) { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/compute-inherited-rules.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/compute-inherited-rules.service.ts index 02bdd7af357..cab44091be9 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/compute-inherited-rules.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/compute-inherited-rules.service.ts @@ -30,10 +30,9 @@ import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslateService } from '@ngx-translate/core'; import { filter } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, StartupService } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, SearchCriteriaEltDto, SearchCriteriaTypeEnum, StartupService } from 'ui-frontend-common'; import { ArchiveSearchComponent } from '../archive-search/archive-search.component'; import { ArchiveService } from '../archive.service'; -import { SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../models/search.criteria'; import { ArchiveSearchHelperService } from './archive-search-helper.service'; const ARCHIVE_UNIT_HOLDING_UNIT = 'ARCHIVE_UNIT_HOLDING_UNIT'; @@ -51,7 +50,7 @@ export class ComputeInheritedRulesService { ) {} launchComputedInheritedRulesModal( - listOfUACriteriaSearch: SearchCriteriaEltDto[], + listOfUACriteriaSearch: SearchCriteriaEltDto[], numberOfHoldingUnitTypeOnComputedRules: number, tenantIdentifier: number, currentPage: number, diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service.ts index f4f08856e42..a5abd75a24c 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/common-services/update-unit-management-rule.service.ts @@ -31,11 +31,10 @@ import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator } from 'ui-frontend-common'; +import { CriteriaDataType, CriteriaOperator, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from 'ui-frontend-common'; import { ManagementRulesSharedDataService } from '../../core/management-rules-shared-data.service'; import { ArchiveSearchComponent } from '../archive-search/archive-search.component'; import { ArchiveService } from '../archive.service'; -import { SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../models/search.criteria'; const ARCHIVE_UNIT_HOLDING_UNIT = 'ARCHIVE_UNIT_HOLDING_UNIT'; const PAGE_SIZE = 10; @@ -57,7 +56,7 @@ export class UpdateUnitManagementRuleService { goToUpdateManagementRule( listOfUACriteriaSearch: SearchCriteriaEltDto[], - criteriaSearchList: SearchCriteriaEltDto[], + criteriaSearchList: SearchCriteriaEltDto[], currentPage: number, tenantIdentifier: number, numberOfHoldingUnitType: number, @@ -112,7 +111,7 @@ export class UpdateUnitManagementRuleService { private updateManagementRule( listOfUACriteriaSearch: SearchCriteriaEltDto[], - criteriaSearchList: SearchCriteriaEltDto[], + criteriaSearchList: SearchCriteriaEltDto[], currentPage: number, tenantIdentifier: number, numberOfHoldingUnitType: number, diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.spec.ts index e0ccff3ebf7..25d76b63147 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.spec.ts @@ -35,9 +35,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from 'projects/archive-search/src/environments/environment'; -import { BASE_URL, InjectorModule, LoggerModule, WINDOW_LOCATION } from 'ui-frontend-common'; +import { BASE_URL, InjectorModule, LoggerModule, SearchCriteriaTypeEnum, WINDOW_LOCATION } from 'ui-frontend-common'; import { VitamUICommonTestModule } from 'ui-frontend-common/testing'; -import { SearchCriteriaTypeEnum } from '../models/search.criteria'; import { CriteriaSearchComponent } from './criteria-search.component'; describe('CriteriaSearchComponent', () => { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.ts index c9d783056c3..3d84d05b7db 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/criteria-search/criteria-search.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { CriteriaValue, SearchCriteria, SearchCriteriaTypeEnum } from '../models/search.criteria'; +import { CriteriaValue, SearchCriteria, SearchCriteriaTypeEnum } from 'ui-frontend-common'; @Component({ selector: 'app-criteria-search', diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.component.ts index 136a1809a8c..e0b31444349 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.component.ts @@ -29,11 +29,12 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu import { MatTreeNestedDataSource } from '@angular/material/tree'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs'; -import { CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode, Unit } from 'ui-frontend-common'; +import { + CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode, PagedResult, ResultFacet, SearchCriteriaDto, SearchCriteriaTypeEnum, Unit +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../core/archive-shared-data.service'; import { ArchiveService } from '../archive.service'; import { NodeData } from '../models/nodedata.interface'; -import { PagedResult, ResultFacet, SearchCriteriaDto, SearchCriteriaTypeEnum } from '../models/search.criteria'; import { FilingHoldingSchemeHandler } from './filing-holding-scheme.handler'; @Component({ diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.spec.ts index d86efe4147d..3425ff9833c 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.spec.ts @@ -24,8 +24,7 @@ * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you * accept its terms. */ -import { DescriptionLevel, FilingHoldingSchemeNode, MatchingNodesNumbers, Unit } from 'ui-frontend-common'; -import { ResultFacet } from '../models/search.criteria'; +import { DescriptionLevel, FilingHoldingSchemeNode, MatchingNodesNumbers, ResultFacet, Unit } from 'ui-frontend-common'; import { FilingHoldingSchemeHandler } from './filing-holding-scheme.handler'; export function newNode( diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.ts index b6f2c7289bd..48f982a7879 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.handler.ts @@ -24,8 +24,9 @@ * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you * accept its terms. */ -import { copyNodeWithoutChildren, DescriptionLevel, FilingHoldingSchemeNode, MatchingNodesNumbers, Unit } from 'ui-frontend-common'; -import { ResultFacet } from '../models/search.criteria'; +import { + copyNodeWithoutChildren, DescriptionLevel, FilingHoldingSchemeNode, MatchingNodesNumbers, ResultFacet, Unit +} from 'ui-frontend-common'; const ORPHANS_NODE = 'ORPHANS_NODE'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.spec.ts index 5ba05d990e4..dfd43e0b71d 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.spec.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.spec.ts @@ -34,11 +34,10 @@ import { MatTreeModule, MatTreeNestedDataSource } from '@angular/material/tree'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Observable, of } from 'rxjs'; -import { DescriptionLevel, FilingHoldingSchemeNode, InjectorModule, LoggerModule } from 'ui-frontend-common'; +import { DescriptionLevel, FilingHoldingSchemeNode, InjectorModule, LoggerModule, PagedResult, ResultFacet } from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { ArchiveService } from '../../archive.service'; import { ArchiveFacetsService } from '../../common-services/archive-facets.service'; -import { PagedResult, ResultFacet } from '../../models/search.criteria'; import { newTreeNode } from '../filing-holding-scheme.handler.spec'; import { LeavesTreeComponent } from './leaves-tree.component'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.ts index 7932cfdb015..32b27864651 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.component.ts @@ -29,10 +29,11 @@ import { Component, EventEmitter, Inject, Input, LOCALE_ID, OnChanges, OnDestroy import { MatTreeNestedDataSource } from '@angular/material/tree'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { DescriptionLevel, FilingHoldingSchemeNode, nodeToVitamuiIcon, Unit } from 'ui-frontend-common'; +import { + DescriptionLevel, FilingHoldingSchemeNode, nodeToVitamuiIcon, PagedResult, ResultFacet, SearchCriteriaDto, Unit +} from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../../core/archive-shared-data.service'; import { ArchiveFacetsService } from '../../common-services/archive-facets.service'; -import { PagedResult, ResultFacet, SearchCriteriaDto } from '../../models/search.criteria'; import { FilingHoldingSchemeHandler } from '../filing-holding-scheme.handler'; import { LeavesTreeService } from './leaves-tree.service'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.service.ts index 2e3de7ed49f..aaf20c8e3f1 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/leaves-tree/leaves-tree.service.ts @@ -1,9 +1,11 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { first, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode, Unit } from 'ui-frontend-common'; +import { + CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode, PagedResult, ResultFacet, SearchCriteriaDto, SearchCriteriaEltDto, + SearchCriteriaTypeEnum, Unit +} from 'ui-frontend-common'; import { ArchiveService } from '../../archive.service'; -import { PagedResult, ResultFacet, SearchCriteriaDto, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; import { FilingHoldingSchemeHandler } from '../filing-holding-scheme.handler'; const DEFAULT_UNIT_PAGE_SIZE = 10; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip-request-detail.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip-request-detail.interface.ts index 86225f2bf8f..5867225797b 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip-request-detail.interface.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip-request-detail.interface.ts @@ -24,7 +24,7 @@ * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you * accept its terms. */ -import {SearchCriteriaEltDto} from './search.criteria'; +import { SearchCriteriaEltDto } from 'ui-frontend-common'; export interface ExportDIPRequestDetail { messageRequestIdentifier: string; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/reclassification-request.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/reclassification-request.interface.ts index 98b4ec842db..7dc118c2678 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/reclassification-request.interface.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/reclassification-request.interface.ts @@ -35,7 +35,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -import { SearchCriteriaDto } from './search.criteria'; +import { SearchCriteriaDto } from 'ui-frontend-common'; export interface ReclassificationCriteriaDto { searchCriteriaDto: SearchCriteriaDto; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/ruleAction.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/ruleAction.interface.ts index e67179c6178..22728982bd8 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/ruleAction.interface.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/ruleAction.interface.ts @@ -35,7 +35,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -import { SearchCriteriaDto } from './search.criteria'; +import { SearchCriteriaDto } from 'ui-frontend-common'; export interface ActionsRules { ruleType: string; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-criteria-history.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-criteria-history.interface.ts index c3c77b543bb..45c4718baa4 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-criteria-history.interface.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-criteria-history.interface.ts @@ -35,8 +35,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -import { Id } from 'ui-frontend-common'; -import { CriteriaValue } from './search.criteria'; +import { CriteriaValue, Id } from 'ui-frontend-common'; export interface SearchCriteriaHistory extends Id { name: string; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-response.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-response.interface.ts deleted file mode 100644 index 69fa38a0820..00000000000 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/search-response.interface.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Unit } from 'ui-frontend-common'; - -export interface SearchResponse { - $hits: any; - $results: T[]; - $facetResults?: any[]; -} diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/transfer-request-detail.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/transfer-request-detail.interface.ts index 785cf748f4f..f528d15d2e1 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/transfer-request-detail.interface.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/transfer-request-detail.interface.ts @@ -24,7 +24,7 @@ * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you * accept its terms. */ -import {SearchCriteriaEltDto} from './search.criteria'; +import { SearchCriteriaEltDto } from 'ui-frontend-common'; export interface TransferRequestDto { transferRequestParameters: TransferRequestParameters; diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/validators/archive-unit-validator.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/validators/archive-unit-validator.service.ts index d8e4c8b22bf..3fdc284129a 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/validators/archive-unit-validator.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/validators/archive-unit-validator.service.ts @@ -40,9 +40,9 @@ import { AbstractControl, AsyncValidatorFn } from '@angular/forms'; import { cloneDeep } from 'lodash'; import { of, timer } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; +import { SearchCriteriaDto } from 'ui-frontend-common'; import { ArchiveSharedDataService } from '../../core/archive-shared-data.service'; import { ArchiveService } from '../archive.service'; -import { SearchCriteriaDto } from '../models/search.criteria'; @Injectable() export class ArchiveUnitValidatorService { diff --git a/ui/ui-frontend/projects/archive-search/src/app/core/api/archive-api.service.ts b/ui/ui-frontend/projects/archive-search/src/app/core/api/archive-api.service.ts index 51275885d8f..f5dbe63d46e 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/core/api/archive-api.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/core/api/archive-api.service.ts @@ -38,13 +38,13 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { ApiUnitObject, BASE_URL, BaseHttpClient, Ontology, PageRequest, PaginatedResponse, Unit } from 'ui-frontend-common'; +import { + ApiUnitObject, BaseHttpClient, BASE_URL, Ontology, PageRequest, PaginatedResponse, SearchCriteriaDto, SearchResponse, Unit +} from 'ui-frontend-common'; import { ExportDIPCriteriaList } from '../../archive/models/dip-request-detail.interface'; import { ReclassificationCriteriaDto } from '../../archive/models/reclassification-request.interface'; import { RuleSearchCriteriaDto } from '../../archive/models/ruleAction.interface'; import { SearchCriteriaHistory } from '../../archive/models/search-criteria-history.interface'; -import { SearchResponse } from '../../archive/models/search-response.interface'; -import { SearchCriteriaDto } from '../../archive/models/search.criteria'; import { TransferRequestDto } from '../../archive/models/transfer-request-detail.interface'; import { UnitDescriptiveMetadataDto } from '../../archive/models/unitDescriptiveMetadata.interface'; diff --git a/ui/ui-frontend/projects/archive-search/src/app/core/archive-shared-data.service.ts b/ui/ui-frontend/projects/archive-search/src/app/core/archive-shared-data.service.ts index 5f2c63b15e6..6567488a656 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/core/archive-shared-data.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/core/archive-shared-data.service.ts @@ -36,15 +36,11 @@ */ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Direction, FilingHoldingSchemeNode, Unit } from 'ui-frontend-common'; +import { + Direction, FilingHoldingSchemeNode, ResultFacet, SearchCriteriaAddAction, SearchCriteriaDto, SearchCriteriaRemoveAction, Unit +} from 'ui-frontend-common'; import { NodeData } from '../archive/models/nodedata.interface'; import { SearchCriteriaHistory } from '../archive/models/search-criteria-history.interface'; -import { - ResultFacet, - SearchCriteriaAddAction, - SearchCriteriaDto, - SearchCriteriaRemoveAction -} from '../archive/models/search.criteria'; @Injectable({ providedIn: 'root', diff --git a/ui/ui-frontend/projects/archive-search/src/app/core/management-rules-shared-data.service.ts b/ui/ui-frontend/projects/archive-search/src/app/core/management-rules-shared-data.service.ts index 410d42dd191..25006db2f78 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/core/management-rules-shared-data.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/core/management-rules-shared-data.service.ts @@ -37,8 +37,8 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; +import { SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ActionsRules, ManagementRules } from '../archive/models/ruleAction.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../archive/models/search.criteria'; @Injectable({ providedIn: 'root', diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-collect.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-collect.service.ts index 1023e2a70ba..eb7dbb9c910 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-collect.service.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-collect.service.ts @@ -42,11 +42,11 @@ import { SearchUnitApiService } from 'projects/vitamui-library/src/lib/api/searc import { Observable, of, throwError, TimeoutError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { - AccessContract, AccessContractApiService, ApiUnitObject, FilingHoldingSchemeNode, Ontology, SearchService, Transaction, Unit, + AccessContract, AccessContractApiService, ApiUnitObject, FilingHoldingSchemeNode, Ontology, PagedResult, SearchCriteriaDto, + SearchCriteriaEltDto, SearchResponse, SearchService, Transaction, Unit, } from 'ui-frontend-common'; import { ProjectsApiService } from '../core/api/project-api.service'; import { TransactionApiService } from '../core/api/transaction-api.service'; -import { PagedResult, SearchCriteriaDto, SearchCriteriaEltDto, SearchResponse } from '../core/models'; @Injectable({ providedIn: 'root', @@ -151,7 +151,7 @@ export class ArchiveCollectService extends SearchService { } getAccessContractById(accessContract: string): Observable { - let headers = new HttpHeaders().append('Content-Type', 'application/json'); + const headers = new HttpHeaders().append('Content-Type', 'application/json'); return this.accessContractApiService.getAccessContractById(accessContract, headers); } @@ -196,7 +196,7 @@ export class ArchiveCollectService extends SearchService { } exportCsvSearchArchiveUnitsByCriteria(criteriaDto: SearchCriteriaDto, projectId: string) { - let headers = new HttpHeaders().append('Content-Type', 'application/json'); + const headers = new HttpHeaders().append('Content-Type', 'application/json'); return this.transactionApiService.exportCsvSearchArchiveUnitsByCriteria(criteriaDto, projectId, headers).subscribe( (file) => { @@ -238,13 +238,13 @@ export class ArchiveCollectService extends SearchService { } getReferentialUnitDetails(unitId: string): Observable { - let headers = new HttpHeaders().append('Content-Type', 'application/json'); + const headers = new HttpHeaders().append('Content-Type', 'application/json'); return this.searchUnitApiService.getById(unitId, headers); } getCollectUnitDetails(unitId: string): Observable { - let headers = new HttpHeaders().append('Content-Type', 'application/json'); + const headers = new HttpHeaders().append('Content-Type', 'application/json'); return this.transactionApiService.getCollectUnitById(unitId, headers); } @@ -300,7 +300,7 @@ export class ArchiveCollectService extends SearchService { } selectUnitWithInheritedRules(transactionId: string, criteriaDto: SearchCriteriaDto): Observable { - let headers = new HttpHeaders().append('Content-Type', 'application/json'); + const headers = new HttpHeaders().append('Content-Type', 'application/json'); return this.transactionApiService.selectUnitWithInheritedRules(transactionId, criteriaDto, headers); } diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-collect.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-collect.component.ts index 0c39e38f692..d8a4102d1ff 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-collect.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-collect.component.ts @@ -34,13 +34,11 @@ import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, merge, Observable, Subject, Subscription } from 'rxjs'; import { debounceTime, map, mergeMap, tap } from 'rxjs/operators'; import { - AccessContract, CriteriaDataType, CriteriaOperator, Direction, ExternalParameters, ExternalParametersService, FilingHoldingSchemeNode, - GlobalEventService, SidenavPage, Transaction, TransactionStatus, Unit, + AccessContract, ArchiveSearchResultFacets, CriteriaDataType, CriteriaOperator, CriteriaValue, Direction, ExternalParameters, + ExternalParametersService, FilingHoldingSchemeNode, GlobalEventService, PagedResult, SearchCriteria, SearchCriteriaCategory, + SearchCriteriaEltDto, SearchCriteriaEltements, SearchCriteriaHistory, SearchCriteriaMgtRuleEnum, SearchCriteriaStatusEnum, + SearchCriteriaTypeEnum, SidenavPage, Transaction, TransactionStatus, Unit, } from 'ui-frontend-common'; -import { - ArchiveSearchResultFacets, CriteriaValue, PagedResult, SearchCriteria, SearchCriteriaCategory, SearchCriteriaEltDto, - SearchCriteriaEltements, SearchCriteriaHistory, SearchCriteriaMgtRuleEnum, SearchCriteriaStatusEnum, SearchCriteriaTypeEnum, -} from '../core/models'; import { ArchiveCollectService } from './archive-collect.service'; import { SearchCriteriaSaverComponent } from './archive-search-criteria/components/search-criteria-saver/search-criteria-saver.component'; import { ArchiveFacetsService } from './archive-search-criteria/services/archive-facets.service'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/access-rule-search/access-rule-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/access-rule-search/access-rule-search.component.ts index 2f34795558a..8f55674efe4 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/access-rule-search/access-rule-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/access-rule-search/access-rule-search.component.ts @@ -39,10 +39,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; -import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { RuleValidator } from '../../services/rule.validator'; const RULE_TYPE_SUFFIX = '_ACCESS_RULE'; @@ -397,12 +398,15 @@ export class AccessRuleSearchComponent implements OnInit, OnDestroy { get accessRuleIdentifier() { return this.accessRuleCriteriaForm.controls.accessRuleIdentifier; } + get accessRuleTitle() { return this.accessRuleCriteriaForm.controls.accessRuleTitle; } + get accessRuleStartDate() { return this.accessRuleCriteriaForm.controls.accessRuleStartDate; } + get accessRuleEndDate() { return this.accessRuleCriteriaForm.controls.accessRuleEndDate; } diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/appraisal-rule-search/appraisal-rule-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/appraisal-rule-search/appraisal-rule-search.component.ts index 4427c60e745..e7f087b2f41 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/appraisal-rule-search/appraisal-rule-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/appraisal-rule-search/appraisal-rule-search.component.ts @@ -39,10 +39,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; -import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { RuleValidator } from '../../services/rule.validator'; const RULE_TYPE_SUFFIX = '_APPRAISAL_RULE'; @@ -503,15 +504,19 @@ export class AppraisalRuleSearchComponent implements OnInit, OnDestroy { get appraisalRuleIdentifier() { return this.appraisalRuleCriteriaForm.controls.appraisalRuleIdentifier; } + get appraisalRuleTitle() { return this.appraisalRuleCriteriaForm.controls.appraisalRuleTitle; } + get appraisalRuleStartDate() { return this.appraisalRuleCriteriaForm.controls.appraisalRuleStartDate; } + get appraisalRuleEndDate() { return this.appraisalRuleCriteriaForm.controls.appraisalRuleEndDate; } + get appraisalRuleEliminationIdentifier() { return this.appraisalRuleCriteriaForm.controls.appraisalRuleEliminationIdentifier; } diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/archive-search-rules-facets.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/archive-search-rules-facets.component.ts index 89378a7f5de..f93ee806f01 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/archive-search-rules-facets.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/archive-search-rules-facets.component.ts @@ -35,7 +35,7 @@ knowledge of the CeCILL-C license and that you accept its terms. */ import { Component, Input, OnInit } from '@angular/core'; -import { RuleFacets } from '../../models/search.criteria'; +import { RuleFacets } from 'ui-frontend-common'; @Component({ selector: 'app-archive-search-rules-facets', diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts index 8a409fde23c..622031204a8 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-access-rules-facets/search-access-rules-facets.component.ts @@ -37,10 +37,9 @@ knowledge of the CeCILL-C license and that you accept its terms. import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; import { ArchiveFacetsService } from '../../../services/archive-facets.service'; @Component({ @@ -145,7 +144,7 @@ export class SearchAccessRulesFacetsComponent implements OnInit, OnChanges { private handleWaitingToRecalculateRulesFacets(): number { let archiveUnitWithRules = 0; if (this.accessRuleFacets.waitingToRecalculateRulesListFacets && this.accessRuleFacets.waitingToRecalculateRulesListFacets.length > 0) { - let facetComputedUnits = this.accessRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.accessRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts index c34f957e122..4ce2c7ddcae 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-appraisal-rules-facets/search-appraisal-rules-facets.component.ts @@ -37,10 +37,9 @@ knowledge of the CeCILL-C license and that you accept its terms. import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; import { ArchiveFacetsService } from '../../../services/archive-facets.service'; @Component({ @@ -209,7 +208,7 @@ export class SearchAppraisalRulesFacetsComponent implements OnInit, OnChanges { this.appraisalRuleFacets.waitingToRecalculateRulesListFacets && this.appraisalRuleFacets.waitingToRecalculateRulesListFacets.length > 0 ) { - let facetComputedUnits = this.appraisalRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.appraisalRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts index f404acc7507..ab7089eff8f 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-dissemination-rules-facets/search-dissemination-rules-facets.component.ts @@ -37,10 +37,9 @@ knowledge of the CeCILL-C license and that you accept its terms. import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; import { ArchiveFacetsService } from '../../../services/archive-facets.service'; @Component({ @@ -156,7 +155,7 @@ export class SearchDisseminationRulesFacetsComponent implements OnInit, OnChange this.disseminationRuleFacets.waitingToRecalculateRulesListFacets && this.disseminationRuleFacets.waitingToRecalculateRulesListFacets.length > 0 ) { - let facetComputedUnits = this.disseminationRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.disseminationRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts index 4331bbaa9a1..15cf161ff67 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-reuse-rules-facets/search-reuse-rules-facets.component.ts @@ -37,10 +37,9 @@ knowledge of the CeCILL-C license and that you accept its terms. import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; import { ArchiveFacetsService } from '../../../services/archive-facets.service'; @Component({ @@ -153,7 +152,7 @@ export class SearchReuseRulesFacetsComponent implements OnInit, OnChanges { private handleWaitingToRecalculateRulesFacets(): number { let archiveUnitWithRules = 0; if (this.reuseRuleFacets.waitingToRecalculateRulesListFacets && this.reuseRuleFacets.waitingToRecalculateRulesListFacets.length > 0) { - let facetComputedUnits = this.reuseRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.reuseRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts index 367f86f8fcf..9bfcea88e8d 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/archive-search-rules-facets/search-storage-rules-facets/search-storage-rules-facets.component.ts @@ -37,10 +37,9 @@ knowledge of the CeCILL-C license and that you accept its terms. import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Colors } from 'ui-frontend-common'; +import { Colors, RuleFacets } from 'ui-frontend-common'; import { FacetDetails } from 'ui-frontend-common/app/modules/models/operation/facet-details.interface'; import { ArchiveSearchConstsEnum } from '../../../models/archive-search-consts-enum'; -import { RuleFacets } from '../../../models/search.criteria'; import { ArchiveFacetsService } from '../../../services/archive-facets.service'; @Component({ @@ -198,7 +197,7 @@ export class SearchStorageRulesFacetsComponent implements OnInit, OnChanges { this.storageRuleFacets.waitingToRecalculateRulesListFacets && this.storageRuleFacets.waitingToRecalculateRulesListFacets.length > 0 ) { - let facetComputedUnits = this.storageRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); + const facetComputedUnits = this.storageRuleFacets.waitingToRecalculateRulesListFacets.filter((elt) => elt.node === 'true'); let computedCount = 0; if (facetComputedUnits.length > 0) { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/criteria-search/criteria-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/criteria-search/criteria-search.component.ts index 90b9931beda..03eab53ef48 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/criteria-search/criteria-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/criteria-search/criteria-search.component.ts @@ -35,7 +35,7 @@ knowledge of the CeCILL-C license and that you accept its terms. */ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { CriteriaValue, SearchCriteria, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { CriteriaValue, SearchCriteria, SearchCriteriaTypeEnum } from 'ui-frontend-common'; @Component({ selector: 'app-criteria-search', diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/dissemination-rule-search/dissemination-rule-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/dissemination-rule-search/dissemination-rule-search.component.ts index 29db70f1874..99407561ad1 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/dissemination-rule-search/dissemination-rule-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/dissemination-rule-search/dissemination-rule-search.component.ts @@ -39,10 +39,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; -import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { RuleValidator } from '../../services/rule.validator'; const RULE_TYPE_SUFFIX = '_DISSEMINATION_RULE'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.component.ts index 8ef287f7162..7e694bb212a 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.component.ts @@ -28,10 +28,12 @@ import { NestedTreeControl } from '@angular/cdk/tree'; import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { MatTreeNestedDataSource } from '@angular/material/tree'; import { Subscription } from 'rxjs'; -import { CriteriaDataType, CriteriaOperator, Direction, FilingHoldingSchemeNode, StartupService, Unit } from 'ui-frontend-common'; +import { + CriteriaDataType, CriteriaOperator, Direction, FilingHoldingSchemeNode, PagedResult, ResultFacet, SearchCriteriaEltDto, + SearchCriteriaTypeEnum, StartupService, Unit +} from 'ui-frontend-common'; import { ArchiveCollectService } from '../../../archive-collect.service'; import { NodeData } from '../../models/nodedata.interface'; -import { PagedResult, ResultFacet, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; import { Pair, VitamInternalFields } from '../../models/utils'; import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { FilingHoldingSchemeHandler } from './filing-holding-scheme.handler'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.handler.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.handler.ts index 3f328073616..487d407b65a 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.handler.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.handler.ts @@ -24,9 +24,10 @@ * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you * accept its terms. */ -import { copyNodeWithoutChildren, DescriptionLevel, FilingHoldingSchemeNode, MatchingNodesNumbers, Unit } from 'ui-frontend-common'; -import { ResultFacet } from '../../models/search.criteria'; -import { isEmpty } from "underscore"; +import { + copyNodeWithoutChildren, DescriptionLevel, FilingHoldingSchemeNode, MatchingNodesNumbers, ResultFacet, Unit +} from 'ui-frontend-common'; +import { isEmpty } from 'underscore'; const ORPHANS_NODE = 'ORPHANS_NODE'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.component.html b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.component.html index 83441540413..7287b91968f 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.component.html +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.component.html @@ -62,6 +62,34 @@ + +
+ + + + {{ node.count | number : '1.0' }} + +
+
+ +
+ +
+ +
+ +
{ + const matchingNodesNumbers = FilingHoldingSchemeHandler.addOrphans(parentNode, results); + this.compareAddedNodeWithKnownFacets(matchingNodesNumbers.nodesAddedList); + this.refreshTreeNodes(); + }); + } + private refreshTreeNodes() { const data = this.nestedDataSourceLeaves.data; this.nestedDataSourceLeaves.data = null; @@ -308,18 +324,30 @@ export class LeavesTreeComponent implements OnInit, OnChanges, OnDestroy { } private firstToggle(node: FilingHoldingSchemeNode): boolean { - if (node.toggled === undefined) { - node.toggled = true; - if (!node.children) { - node.children = []; - } - node.paginatedMatchingChildrenLoaded = node.children.length; - node.canLoadMoreMatchingChildren = true; - node.paginatedChildrenLoaded = 0; - node.canLoadMoreChildren = true; - return true; + if (node.toggled) { + return false; + } + node.toggled = true; + if (!node.children) { + node.children = []; + } + node.paginatedMatchingChildrenLoaded = 0; + node.canLoadMoreMatchingChildren = true; + node.paginatedChildrenLoaded = 0; + node.canLoadMoreChildren = true; + return true; + } + + toggleOrphan(node: FilingHoldingSchemeNode) { + const isExpanded = this.nestedTreeControlLeaves.isExpanded(node); + this.nestedTreeControlLeaves.toggle(node); + if (isExpanded) { + return; + } + if (this.firstToggle(node)) { + this.searchOrphans(node); + this.searchOrphansWithSearchCriterias(node); } - return false; } toggleLeave(node: FilingHoldingSchemeNode) { @@ -350,11 +378,15 @@ export class LeavesTreeComponent implements OnInit, OnChanges, OnDestroy { } nodeIsUAWithChildren(_: number, node: FilingHoldingSchemeNode): boolean { - return node.type === 'INGEST' && node.descriptionLevel !== DescriptionLevel.ITEM; + return node.unitType === 'INGEST' && node.descriptionLevel !== DescriptionLevel.ITEM; } nodeIsUAWithoutChildren(_: number, node: FilingHoldingSchemeNode): boolean { - return node.type === 'INGEST' && node.descriptionLevel === DescriptionLevel.ITEM; + return node.unitType === 'INGEST' && node.descriptionLevel === DescriptionLevel.ITEM; + } + + nodeIsOrphanNode(_: number, node: FilingHoldingSchemeNode): boolean { + return FilingHoldingSchemeHandler.isOrphansNode(node); } nodeHasPositiveCount(node: FilingHoldingSchemeNode): boolean { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.service.ts new file mode 100644 index 00000000000..6d940efdd5e --- /dev/null +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.service.ts @@ -0,0 +1,201 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { first, map } from 'rxjs/operators'; +import { + CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode, PagedResult, ResultFacet, SearchCriteriaDto, SearchCriteriaEltDto, + SearchCriteriaTypeEnum, Unit +} from 'ui-frontend-common'; +import { ArchiveCollectService } from '../../../../archive-collect.service'; +import { FilingHoldingSchemeHandler } from '../filing-holding-scheme.handler'; + +const DEFAULT_UNIT_PAGE_SIZE = 10; + +const ALLUNITSUPS = '#allunitups'; + +@Injectable({ + providedIn: 'root', +}) +export class LeavesTreeService { + + private transactionId: string; + + constructor(private archiveCollectService: ArchiveCollectService,) {} + + private prepareSearch(parentNode: FilingHoldingSchemeNode, matchingSearch: boolean): boolean { + if (matchingSearch && !parentNode.canLoadMoreMatchingChildren) { + return false; + } else if (!matchingSearch && !parentNode.canLoadMoreChildren) { + return false; + } + parentNode.isLoadingChildren = true; + return true; + } + + private finishSearch(parentNode: FilingHoldingSchemeNode, pageResult: PagedResult, matchingSearch: boolean): void { + parentNode.isLoadingChildren = false; + if (matchingSearch) { + parentNode.paginatedMatchingChildrenLoaded += pageResult.results.length; + parentNode.canLoadMoreMatchingChildren = parentNode.children.length < pageResult.totalResults; + } else { + parentNode.paginatedChildrenLoaded += pageResult.results.length; + parentNode.canLoadMoreChildren = parentNode.children.length < pageResult.totalResults; + } + } + + recalculateCount(nodes: FilingHoldingSchemeNode[]): void { + for (const node of nodes) { + FilingHoldingSchemeHandler.reCalculateCountRecursively(node); + } + } + + hasCountAnomaly(parentNode: FilingHoldingSchemeNode): boolean { + const sum = FilingHoldingSchemeHandler.getCountSum(parentNode.children) + if (sum >= parentNode.count) { + parentNode.count = sum + 1; + return true; + } + return false; + } + + searchOrphans(parentNode: FilingHoldingSchemeNode, searchCriterias: SearchCriteriaDto): Observable { + if (!this.prepareSearch(parentNode, false)) { + return; + } + const newCriteriaList: SearchCriteriaEltDto[] = [ + { + criteria: '#unitups', + operator: CriteriaOperator.MISSING, + category: SearchCriteriaTypeEnum.FIELDS, + values: [], + dataType: CriteriaDataType.STRING, + }, + ]; + const searchCriteria: SearchCriteriaDto = { + pageNumber: Math.floor(parentNode.paginatedChildrenLoaded / DEFAULT_UNIT_PAGE_SIZE), + size: DEFAULT_UNIT_PAGE_SIZE, + criteriaList: newCriteriaList, + sortingCriteria: searchCriterias.sortingCriteria, + trackTotalHits: false, + computeFacets: false, + }; + return this.sendSearchArchiveUnitsByCriteria(searchCriteria) + .pipe(map((pageResult) => { + this.finishSearch(parentNode, pageResult, false); + return pageResult.results; + })); + } + + searchOrphansWithSearchCriterias(parentNode: FilingHoldingSchemeNode, searchCriterias: SearchCriteriaDto): Observable { + if (!this.prepareSearch(parentNode, true)) { + return; + } + const newCriteriaList = [...searchCriterias.criteriaList]; + newCriteriaList.push({ + criteria: '#allunitups', + operator: CriteriaOperator.MISSING, + category: SearchCriteriaTypeEnum.FIELDS, + values: [], + dataType: CriteriaDataType.STRING, + }); + const searchCriteria: SearchCriteriaDto = { + pageNumber: Math.floor(parentNode.paginatedMatchingChildrenLoaded / DEFAULT_UNIT_PAGE_SIZE), + size: DEFAULT_UNIT_PAGE_SIZE, + criteriaList: newCriteriaList, + sortingCriteria: searchCriterias.sortingCriteria, + trackTotalHits: false, + computeFacets: false, + }; + return this.sendSearchArchiveUnitsByCriteria(searchCriteria) + .pipe(map(pageResult => { + this.finishSearch(parentNode, pageResult, true); + return pageResult; + })); + } + + searchUnderNode(parentNode: FilingHoldingSchemeNode, searchCriterias: SearchCriteriaDto): Observable { + if (!this.prepareSearch(parentNode, false)) { + return; + } + const searchCriteria: SearchCriteriaDto = { + pageNumber: Math.floor(parentNode.paginatedChildrenLoaded / DEFAULT_UNIT_PAGE_SIZE), + size: DEFAULT_UNIT_PAGE_SIZE, + criteriaList: [ + { + criteria: '#unitups', + operator: CriteriaOperator.IN, + category: SearchCriteriaTypeEnum.FIELDS, + values: [{ id: parentNode.id, value: parentNode.id }], + dataType: CriteriaDataType.STRING, + }, + ], + sortingCriteria: searchCriterias.sortingCriteria, + trackTotalHits: false, + computeFacets: false, + }; + return this.sendSearchArchiveUnitsByCriteria(searchCriteria) + .pipe(map(pageResult => { + this.finishSearch(parentNode, pageResult, false); + return pageResult; + })); + } + + searchUnderNodeWithSearchCriterias(parentNode: FilingHoldingSchemeNode, searchCriterias: SearchCriteriaDto): Observable { + if (!this.prepareSearch(parentNode, true)) { + return; + } + const newCriteriaList = [...searchCriterias.criteriaList]; + newCriteriaList.push({ + criteria: ALLUNITSUPS, + operator: CriteriaOperator.EQ, + category: SearchCriteriaTypeEnum.FIELDS, + values: [{ id: parentNode.id, value: parentNode.id }], + dataType: CriteriaDataType.STRING, + }); + const searchCriteria: SearchCriteriaDto = { + pageNumber: Math.floor(parentNode.paginatedMatchingChildrenLoaded / DEFAULT_UNIT_PAGE_SIZE), + size: DEFAULT_UNIT_PAGE_SIZE, + criteriaList: newCriteriaList, + sortingCriteria: searchCriterias.sortingCriteria, + trackTotalHits: false, + computeFacets: false, + }; + return this.sendSearchArchiveUnitsByCriteria(searchCriteria) + .pipe(map(pageResult => { + this.finishSearch(parentNode, pageResult, true); + return pageResult; + })); + } + + + loadNodesDetailsFromFacetsIds(facets: ResultFacet[]): Observable { + const searchCriteria: SearchCriteriaDto = { + pageNumber: 0, + size: facets.length, + criteriaList: [ + { + criteria: '#id', + operator: CriteriaOperator.IN, + category: SearchCriteriaTypeEnum.FIELDS, + values: facets.map((facet) => { + return { id: facet.node, value: facet.node }; + }), + dataType: CriteriaDataType.STRING, + }, + ], + trackTotalHits: false, + computeFacets: false, + }; + // Can be improve with a projection (only nodes fields are needed) + return this.sendSearchArchiveUnitsByCriteria(searchCriteria) + .pipe() + } + + sendSearchArchiveUnitsByCriteria(searchCriteria: SearchCriteriaDto): Observable { + return this.archiveCollectService.searchArchiveUnitsByCriteria(searchCriteria, this.transactionId).pipe(first()); + } + + setTransactionId(transactionId: string) { + this.transactionId = transactionId; + } + +} diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/reuse-rule-search/reuse-rule-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/reuse-rule-search/reuse-rule-search.component.ts index 4bec893164d..3a7764767f0 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/reuse-rule-search/reuse-rule-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/reuse-rule-search/reuse-rule-search.component.ts @@ -39,10 +39,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; -import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { RuleValidator } from '../../services/rule.validator'; const RULE_TYPE_SUFFIX = '_REUSE_RULE'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/search-criteria-saver/search-criteria-saver.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/search-criteria-saver/search-criteria-saver.component.ts index 4a1d52e676c..b1e2e237410 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/search-criteria-saver/search-criteria-saver.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/search-criteria-saver/search-criteria-saver.component.ts @@ -40,10 +40,9 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslatePipe } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { ConfirmDialogService, Direction } from 'ui-frontend-common'; +import { ConfirmDialogService, Direction, SearchCriteria, SearchCriteriaTypeEnum } from 'ui-frontend-common'; import { VitamUISnackBarComponent } from '../../../../shared/vitamui-snack-bar'; import { SearchCriteriaHistory } from '../../models/search-criteria-history.interface'; -import { SearchCriteria, SearchCriteriaTypeEnum } from '../../models/search.criteria'; import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { SearchCriteriaSaverService } from '../../services/search-criteria-saver.service'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/simple-criteria-search/simple-criteria-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/simple-criteria-search/simple-criteria-search.component.ts index 51b7db0a75b..c51ecd52acf 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/simple-criteria-search/simple-criteria-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/simple-criteria-search/simple-criteria-search.component.ts @@ -39,10 +39,12 @@ import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { merge } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, Ontology, OntologyService, diff } from 'ui-frontend-common'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, Ontology, OntologyService, SearchCriteriaEltDto, + SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveCollectService } from '../../../archive-collect.service'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { ManagementRulesSharedDataService } from '../../services/management-rules-shared-data.service'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/storage-rule-search/storage-rule-search.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/storage-rule-search/storage-rule-search.component.ts index 79bec64871f..aec81325768 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/storage-rule-search/storage-rule-search.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/storage-rule-search/storage-rule-search.component.ts @@ -39,10 +39,11 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge, Subscription } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; -import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; +import { + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaEltDto, SearchCriteriaTypeEnum +} from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaEltDto, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; import { RuleValidator } from '../../services/rule.validator'; const RULE_TYPE_SUFFIX = '_STORAGE_RULE'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/title-and-description-criteria-search-collect/title-and-description-criteria-search-collect.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/title-and-description-criteria-search-collect/title-and-description-criteria-search-collect.component.ts index 898c9333261..9391a720326 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/title-and-description-criteria-search-collect/title-and-description-criteria-search-collect.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/components/title-and-description-criteria-search-collect/title-and-description-criteria-search-collect.component.ts @@ -39,10 +39,9 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { merge } from 'rxjs'; import { debounceTime, filter, map } from 'rxjs/operators'; -import { CriteriaDataType, CriteriaOperator, diff } from 'ui-frontend-common'; -import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; +import { CriteriaDataType, CriteriaOperator, CriteriaValue, diff, SearchCriteriaTypeEnum } from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../../models/archive-search-consts-enum'; -import { CriteriaValue, SearchCriteriaTypeEnum } from '../../models/search.criteria'; +import { ArchiveSharedDataService } from '../../services/archive-shared-data.service'; const TITLE_OR_DESCRIPTION = 'TITLE_OR_DESCRIPTION'; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/rule-action.interface.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/rule-action.interface.ts index 6b81c5cca3d..62171d3adea 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/rule-action.interface.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/rule-action.interface.ts @@ -34,7 +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 { SearchCriteriaDto } from './search.criteria'; +import { SearchCriteriaDto } from 'ui-frontend-common'; export interface ActionsRules { ruleType: string; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search-criteria-history.interface.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search-criteria-history.interface.ts index c3c77b543bb..45c4718baa4 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search-criteria-history.interface.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search-criteria-history.interface.ts @@ -35,8 +35,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -import { Id } from 'ui-frontend-common'; -import { CriteriaValue } from './search.criteria'; +import { CriteriaValue, Id } from 'ui-frontend-common'; export interface SearchCriteriaHistory extends Id { name: string; diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search.criteria.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search.criteria.ts deleted file mode 100644 index 9eee2aa0b5f..00000000000 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/models/search.criteria.ts +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020) - * and the signatories of the "VITAM - Accord du Contributeur" agreement. - * - * contact@programmevitam.fr - * - * This software is a computer program whose purpose is to implement - * implement a digital archiving front-office system for the secure and - * efficient high volumetry VITAM solution. - * - * This software is governed by the CeCILL-C license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL-C - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited - * liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and experienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * - * 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', - IN_PROGRESS = 'IN_PROGRESS', -} - -export enum SearchCriteriaTypeEnum { - FIELDS = 'FIELDS', - APPRAISAL_RULE = 'APPRAISAL_RULE', - ACCESS_RULE = 'ACCESS_RULE', - CLASSIFICATION_RULE = 'CLASSIFICATION_RULE', - DISSEMINATION_RULE = 'DISSEMINATION_RULE', - REUSE_RULE = 'REUSE_RULE', - STORAGE_RULE = 'STORAGE_RULE', - HOLD_RULE = 'HOLD_RULE', - NODES = 'NODES', -} - -export enum SearchCriteriaMgtRuleEnum { - APPRAISAL_RULE = 'APPRAISAL_RULE', - ACCESS_RULE = 'ACCESS_RULE', - CLASSIFICATION_RULE = 'CLASSIFICATION_RULE', - DISSEMINATION_RULE = 'DISSEMINATION_RULE', - REUSE_RULE = 'REUSE_RULE', - STORAGE_RULE = 'STORAGE_RULE', - HOLD_RULE = 'HOLD_RULE', -} - -export interface SearchCriteriaValue { - value?: CriteriaValue; - label?: string; - valueShown?: boolean; - status: SearchCriteriaStatusEnum; - keyTranslated: boolean; - valueTranslated: boolean; -} - -export interface SearchCriteriaAddAction { - keyElt: string; - valueElt: CriteriaValue; - labelElt: string; - keyTranslated: boolean; - operator: string; - category: SearchCriteriaTypeEnum; - valueTranslated: boolean; - dataType: string; -} - -export interface SearchCriteriaRemoveAction { - keyElt: string; - valueElt: CriteriaValue; - action: 'REMOVE' | 'ADD'; -} - -export interface SearchCriteria { - key: string; - operator: string; - category: SearchCriteriaTypeEnum; - values: SearchCriteriaValue[]; - keyTranslated: boolean; - valueTranslated: boolean; - dataType: string; -} - -export interface SearchCriteriaEltDto { - criteria: string; - operator: string; - category: string; - values: CriteriaValue[]; - dataType: string; -} -export interface SearchCriteriaDto { - criteriaList: SearchCriteriaEltDto[]; - pageNumber: number; - size: number; - sortingCriteria?: SearchCriteriaSort; - language?: string; - trackTotalHits?: boolean; - computeFacets?: boolean; -} - -export interface PagedResult { - results: any[]; - pageNumbers: number; - totalResults: number; - facets?: ResultFacetList[]; -} - -export interface ResultFacetList { - name: string; - buckets: ResultBucket[]; -} -export interface ResultBucket { - value: string; - count: number; -} -export interface ResultFacet { - node: string; - count: number; -} - -export interface SearchCriteriaSort { - criteria: string; - sorting: 'ASC' | 'DESC'; -} - -export interface SearchCriteriaCategory { - name: string; - index: number; -} -export interface CriteriaValue { - id: string; - value?: string; - beginInterval?: string; - endInterval?: string; -} - -export class ArchiveSearchResultFacets { - nodesFacets?: ResultFacet[]; - appraisalRuleFacets?: RuleFacets; - accessRuleFacets?: RuleFacets; - storageRuleFacets?: RuleFacets; - reuseRuleFacets?: RuleFacets; - disseminationRuleFacets?: RuleFacets; - holdRuleFacets?: RuleFacets; - classificationRuleFacets?: RuleFacets; -} - -export class RuleFacets { - waitingToRecalculateRulesListFacets: ResultFacet[]; - expiredRulesListFacets: ResultFacet[]; - unexpiredRulesListFacets: ResultFacet[]; - rulesListFacets: ResultFacet[]; - finalActionsFacets?: ResultFacet[]; - noRulesFacets: ResultFacet[]; -} diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-facets.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-facets.service.ts index 7d3ce62f7be..63b04923903 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-facets.service.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-facets.service.ts @@ -34,26 +34,20 @@ 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 { Injectable } from '@angular/core'; +import { ArchiveSearchResultFacets, ResultFacet, ResultFacetList, RuleFacets, SearchCriteriaMgtRuleEnum, } from 'ui-frontend-common'; import { ArchiveSearchConstsEnum } from '../models/archive-search-consts-enum'; -import { - ArchiveSearchResultFacets, - ResultFacet, - ResultFacetList, - RuleFacets, - SearchCriteriaMgtRuleEnum, -} from './../models/search.criteria'; @Injectable({ providedIn: 'root', }) export class ArchiveFacetsService { - RULES_COMPUTED_NUMBER_PREFIX: string = 'RULES_COMPUTED_NUMBER_'; - FINAL_ACTION_COMPUTED_PREFIX: string = 'FINAL_ACTION_COMPUTED_'; - EXPIRED_RULES_COMPUTED_PREFIX: string = 'EXPIRED_RULES_COMPUTED_'; - UNEXPIRED_RULES_COMPUTED_PREFIX: string = 'UNEXPIRED_RULES_COMPUTED_'; - COUNT_WITHOUT_RULES_PREFIX: string = 'COUNT_WITHOUT_RULES_'; - COMPUTE_RULES_AU_NUMBER: string = 'COMPUTE_RULES_AU_NUMBER'; - COUNT_BY_NODE: string = 'COUNT_BY_NODE'; + RULES_COMPUTED_NUMBER_PREFIX = 'RULES_COMPUTED_NUMBER_'; + FINAL_ACTION_COMPUTED_PREFIX = 'FINAL_ACTION_COMPUTED_'; + EXPIRED_RULES_COMPUTED_PREFIX = 'EXPIRED_RULES_COMPUTED_'; + UNEXPIRED_RULES_COMPUTED_PREFIX = 'UNEXPIRED_RULES_COMPUTED_'; + COUNT_WITHOUT_RULES_PREFIX = 'COUNT_WITHOUT_RULES_'; + COMPUTE_RULES_AU_NUMBER = 'COMPUTE_RULES_AU_NUMBER'; + COUNT_BY_NODE = 'COUNT_BY_NODE'; extractNodesFacetsResults(facetResults: ResultFacetList[]): ResultFacet[] { const nodesFacets: ResultFacet[] = []; @@ -71,7 +65,7 @@ export class ArchiveFacetsService { } extractRulesFacetsResults(facetResults: ResultFacetList[]): ArchiveSearchResultFacets { - let archiveSearchResultFacets: ArchiveSearchResultFacets = new ArchiveSearchResultFacets(); + const archiveSearchResultFacets: ArchiveSearchResultFacets = new ArchiveSearchResultFacets(); if (facetResults) { archiveSearchResultFacets.appraisalRuleFacets = this.extractRulesFacetsResultsByCategory( @@ -111,6 +105,7 @@ export class ArchiveFacetsService { } return archiveSearchResultFacets; } + private extractRulesFacetsResultsByCategory(facetResults: ResultFacetList[], category: string): RuleFacets { const rulesFacets = new RuleFacets(); if (facetResults && facetResults.length > 0) { diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-search-helper.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-search-helper.service.ts index 03c0fb74766..8b5c447e016 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-search-helper.service.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-search-helper.service.ts @@ -36,16 +36,11 @@ knowledge of the CeCILL-C license and that you accept its terms. import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { ActionOnCriteria, CriteriaDataType, CriteriaOperator, FilingHoldingSchemeNode } from 'ui-frontend-common'; -import { VitamUISnackBarComponent } from '../../../shared/vitamui-snack-bar'; import { - CriteriaValue, - SearchCriteria, - SearchCriteriaEltDto, - SearchCriteriaStatusEnum, - SearchCriteriaTypeEnum, - SearchCriteriaValue, -} from '../models/search.criteria'; + ActionOnCriteria, CriteriaDataType, CriteriaOperator, CriteriaValue, FilingHoldingSchemeNode, SearchCriteria, SearchCriteriaEltDto, + SearchCriteriaStatusEnum, SearchCriteriaTypeEnum, SearchCriteriaValue +} from 'ui-frontend-common'; +import { VitamUISnackBarComponent } from '../../../shared/vitamui-snack-bar'; import { ArchiveSharedDataService } from './archive-shared-data.service'; const ALL_ARCHIVE_UNIT_TYPES = 'ALL_ARCHIVE_UNIT_TYPES'; @@ -358,6 +353,7 @@ export class ArchiveSearchHelperService { }); }); } + openSnackBarForWorkflow(snackBar: MatSnackBar, message: string, serviceUrl?: string) { snackBar.openFromComponent(VitamUISnackBarComponent, { panelClass: 'vitamui-snack-bar', @@ -401,6 +397,7 @@ export class ArchiveSearchHelperService { } return defaultFacetTabIndex; } + checkIfRulesFacetsCanBeComputed(searchCriterias: Map): boolean { let hasMgtRuleCriteria = false; if (searchCriterias && searchCriterias.size > 0) { @@ -448,7 +445,7 @@ export class ArchiveSearchHelperService { criteria.values.forEach((elt) => { strValues.push(elt.value); }); - let replacedCriteria = criteria.key.replace('_' + managementRuleType, ''); + const replacedCriteria = criteria.key.replace('_' + managementRuleType, ''); criteriaSearchList.push({ criteria: replacedCriteria, @@ -527,9 +524,11 @@ export class ArchiveSearchHelperService { isAppraisalRuleCriteria(criteria: SearchCriteria): boolean { return SearchCriteriaTypeEnum[criteria.category] === SearchCriteriaTypeEnum.APPRAISAL_RULE; } + isAccessRuleCriteria(criteria: SearchCriteria): boolean { return SearchCriteriaTypeEnum[criteria.category] === SearchCriteriaTypeEnum.ACCESS_RULE; } + isStorageRuleCriteria(criteria: SearchCriteria): boolean { return SearchCriteriaTypeEnum[criteria.category] === SearchCriteriaTypeEnum.STORAGE_RULE; } @@ -537,15 +536,19 @@ export class ArchiveSearchHelperService { isClassificationRuleCriteria(criteria: SearchCriteria): boolean { return SearchCriteriaTypeEnum[criteria.category] === SearchCriteriaTypeEnum.CLASSIFICATION_RULE; } + isDisseminationRuleCriteria(criteria: SearchCriteria): boolean { return SearchCriteriaTypeEnum[criteria.category] === SearchCriteriaTypeEnum.DISSEMINATION_RULE; } + isReuseRuleCriteria(criteria: SearchCriteria): boolean { return SearchCriteriaTypeEnum[criteria.category] === SearchCriteriaTypeEnum.REUSE_RULE; } + isWaitingToRecalculateCriteria(criteriaKey: string): boolean { return criteriaKey === 'WAITING_RECALCULATE' || criteriaKey === 'ORIGIN_WAITING_RECALCULATE'; } + isEliminationTenchnicalIdCriteria(criteriaKey: string): boolean { return criteriaKey === 'ELIMINATION_TECHNICAL_ID_APPRAISAL_RULE'; } diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-shared-data.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-shared-data.service.ts index 3f3585965e7..e9d6a845def 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-shared-data.service.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/archive-shared-data.service.ts @@ -35,10 +35,11 @@ knowledge of the CeCILL-C license and that you accept its terms. */ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import {Direction, FilingHoldingSchemeNode, Unit} from 'ui-frontend-common'; +import { + Direction, FilingHoldingSchemeNode, ResultFacet, SearchCriteriaAddAction, SearchCriteriaDto, SearchCriteriaRemoveAction, Unit +} from 'ui-frontend-common'; import { NodeData } from '../models/nodedata.interface'; import { SearchCriteriaHistory } from '../models/search-criteria-history.interface'; -import { ResultFacet, SearchCriteriaAddAction, SearchCriteriaDto, SearchCriteriaRemoveAction } from '../models/search.criteria'; @Injectable({ providedIn: 'root', diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/management-rules-shared-data.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/management-rules-shared-data.service.ts index 1772e5d54f1..eedcb211511 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/management-rules-shared-data.service.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/archive-search-criteria/services/management-rules-shared-data.service.ts @@ -37,9 +37,8 @@ knowledge of the CeCILL-C license and that you accept its terms. import { HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Rule, RuleApiService } from 'ui-frontend-common'; +import { Rule, RuleApiService, SearchCriteriaDto, SearchCriteriaEltDto } from 'ui-frontend-common'; import { ActionsRules, ManagementRules } from '../models/rule-action.interface'; -import { SearchCriteriaDto, SearchCriteriaEltDto } from '../models/search.criteria'; @Injectable({ providedIn: 'root', diff --git a/ui/ui-frontend/projects/collect/src/app/collect/core/api/transaction-api.service.ts b/ui/ui-frontend/projects/collect/src/app/collect/core/api/transaction-api.service.ts index 63bf3b88a58..daa05958e12 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/core/api/transaction-api.service.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/core/api/transaction-api.service.ts @@ -34,21 +34,12 @@ 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 {HttpClient, HttpHeaders} from '@angular/common/http'; -import {Inject, Injectable} from '@angular/core'; -import {Observable} from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Inject, Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; import { - ApiUnitObject, - BASE_URL, - BaseHttpClient, - Ontology, - PageRequest, - PaginatedResponse, - Transaction, - Unit + ApiUnitObject, BaseHttpClient, BASE_URL, Ontology, PageRequest, PaginatedResponse, SearchCriteriaDto, SearchResponse, Transaction, Unit } from 'ui-frontend-common'; -import {SearchResponse} from '../../archive-search-collect/archive-search-criteria/models/search-response.interface'; -import {SearchCriteriaDto} from '../../archive-search-collect/archive-search-criteria/models/search.criteria'; @Injectable({ providedIn: 'root', @@ -102,11 +93,11 @@ export class TransactionApiService extends BaseHttpClient { // Manage Archive Units getCollectUnitById(unitId: string, headers?: HttpHeaders) { - return this.http.get(this.apiUrl + '/archive-units/archiveunit/' + unitId, {headers}); + return this.http.get(this.apiUrl + '/archive-units/archiveunit/' + unitId, { headers }); } searchArchiveUnitsByCriteria(criteriaDto: SearchCriteriaDto, tranasctionId: string, headers?: HttpHeaders): Observable { - return this.http.post(`${this.apiUrl}/archive-units/${tranasctionId}/search`, criteriaDto, {headers}); + return this.http.post(`${this.apiUrl}/archive-units/${tranasctionId}/search`, criteriaDto, { headers }); } exportCsvSearchArchiveUnitsByCriteria(criteriaDto: SearchCriteriaDto, tranasctionId: string, headers?: HttpHeaders): Observable { @@ -118,7 +109,7 @@ export class TransactionApiService extends BaseHttpClient { // Get the technical group object of a unit getObjectGroupDetailsById(objectId: string, headers?: HttpHeaders): Observable { - return this.http.get(this.apiUrl + '/objects/' + objectId, {headers, responseType: 'json'}); + return this.http.get(this.apiUrl + '/objects/' + objectId, { headers, responseType: 'json' }); } getExternalOntologiesList(): Observable { @@ -126,6 +117,6 @@ export class TransactionApiService extends BaseHttpClient { } selectUnitWithInheritedRules(tranasctionId: string, criteriaDto: SearchCriteriaDto, headers?: HttpHeaders): Observable { - return this.http.post(`${this.apiUrl}/${tranasctionId}/unit-with-inherited-rules`, criteriaDto, {headers}); + return this.http.post(`${this.apiUrl}/${tranasctionId}/unit-with-inherited-rules`, criteriaDto, { headers }); } } diff --git a/ui/ui-frontend/projects/collect/src/app/collect/core/models/index.ts b/ui/ui-frontend/projects/collect/src/app/collect/core/models/index.ts index 5b8010abf11..71020e51b5d 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/core/models/index.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/core/models/index.ts @@ -1,5 +1,4 @@ export * from '../../archive-search-collect/archive-search-criteria/models/archive-search-consts-enum'; export * from '../../archive-search-collect/archive-search-criteria/models/nodedata.interface'; -export * from '../../archive-search-collect/archive-search-criteria/models/search.criteria'; export * from '../../archive-search-collect/archive-search-criteria/models/search-criteria-history.interface'; export * from '../../archive-search-collect/archive-search-criteria/models/search-response.interface'; diff --git a/ui/ui-frontend/projects/vitamui-library/src/lib/api/search-unit-api.service.ts b/ui/ui-frontend/projects/vitamui-library/src/lib/api/search-unit-api.service.ts index 91454dcacf4..c01457338ab 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/lib/api/search-unit-api.service.ts +++ b/ui/ui-frontend/projects/vitamui-library/src/lib/api/search-unit-api.service.ts @@ -2,8 +2,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { BASE_URL } from 'ui-frontend-common'; -import { SearchResponse } from '../models/search-response.interface'; +import { BASE_URL, SearchResponse } from 'ui-frontend-common'; @Injectable({ providedIn: 'root' diff --git a/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-criteria-history.interface.ts b/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-criteria-history.interface.ts index c3c77b543bb..45c4718baa4 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-criteria-history.interface.ts +++ b/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-criteria-history.interface.ts @@ -35,8 +35,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -import { Id } from 'ui-frontend-common'; -import { CriteriaValue } from './search.criteria'; +import { CriteriaValue, Id } from 'ui-frontend-common'; export interface SearchCriteriaHistory extends Id { name: string; diff --git a/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-response.interface.ts b/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-response.interface.ts deleted file mode 100644 index 60a771ed9f6..00000000000 --- a/ui/ui-frontend/projects/vitamui-library/src/lib/models/search-response.interface.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Unit } from './unit.interface'; - -export interface SearchResponse { - $hits: any; - $results: T[]; - $facetResults?: any[]; -} diff --git a/ui/ui-frontend/projects/vitamui-library/src/lib/models/search.criteria.ts b/ui/ui-frontend/projects/vitamui-library/src/lib/models/search.criteria.ts deleted file mode 100644 index 30e28c8136e..00000000000 --- a/ui/ui-frontend/projects/vitamui-library/src/lib/models/search.criteria.ts +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020) - * and the signatories of the "VITAM - Accord du Contributeur" agreement. - * - * contact@programmevitam.fr - * - * This software is a computer program whose purpose is to implement - * implement a digital archiving front-office system for the secure and - * efficient high volumetry VITAM solution. - * - * This software is governed by the CeCILL-C license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL-C - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited - * liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and experienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * - * 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', - IN_PROGRESS = 'IN_PROGRESS', -} - -export enum SearchCriteriaTypeEnum { - FIELDS = 'FIELDS', - APPRAISAL_RULE = 'APPRAISAL_RULE', - ACCESS_RULE = 'ACCESS_RULE', - CLASSIFICATION_RULE = 'CLASSIFICATION_RULE', - DISSEMINATION_RULE = 'DISSEMINATION_RULE', - REUSE_RULE = 'REUSE_RULE', - STORAGE_RULE = 'STORAGE_RULE', - HOLD_RULE = 'HOLD_RULE', - NODES = 'NODES', -} - -export interface SearchCriteriaValue { - value?: CriteriaValue; - label?: string; - valueShown?: boolean; - status: SearchCriteriaStatusEnum; - keyTranslated: boolean; - valueTranslated: boolean; -} - -export interface SearchCriteriaAddAction { - keyElt: string; - valueElt: CriteriaValue; - labelElt: string; - keyTranslated: boolean; - operator: string; - category: SearchCriteriaTypeEnum; - valueTranslated: boolean; - dataType: string; -} - -export interface SearchCriteriaRemoveAction { - keyElt: string; - valueElt: CriteriaValue; - action: 'REMOVE' | 'ADD'; -} - -export interface SearchCriteria { - key: string; - operator: string; - category: SearchCriteriaTypeEnum; - values: SearchCriteriaValue[]; - keyTranslated: boolean; - valueTranslated: boolean; - dataType: string; -} - -export interface SearchCriteriaEltDto { - criteria: string; - operator: string; - category: string; - values: CriteriaValue[]; - dataType: string; -} -export interface SearchCriteriaDto { - criteriaList: SearchCriteriaEltDto[]; - pageNumber: number; - size: number; - sortingCriteria?: SearchCriteriaSort; - language?: string; - trackTotalHits?: boolean; - computeFacets?: boolean; -} - -export interface PagedResult { - results: any[]; - pageNumbers: number; - totalResults: number; - facets?: ResultFacetList[]; -} - -export interface ResultFacetList { - name: string; - buckets: ResultBucket[]; -} -export interface ResultBucket { - value: string; - count: number; -} -export interface ResultFacet { - node: string; - count: number; -} - -export interface SearchCriteriaSort { - criteria: string; - sorting: 'ASC' | 'DESC'; -} - -export interface SearchCriteriaCategory { - name: string; - index: number; -} -export interface CriteriaValue { - id: string; - value?: string; - beginInterval?: string; - endInterval?: string; -} - -export class ArchiveSearchResultFacets { - nodesFacets?: ResultFacet[]; - appraisalRuleFacets?: RuleFacets; - accessRuleFacets?: RuleFacets; -} - -export class RuleFacets { - waitingToRecalculateRulesListFacets: ResultFacet[]; - expiredRulesListFacets: ResultFacet[]; - rulesListFacets: ResultFacet[]; - finalActionsFacets?: ResultFacet[]; - noRulesFacets: ResultFacet[]; -} diff --git a/ui/ui-frontend/projects/vitamui-library/src/public-api.ts b/ui/ui-frontend/projects/vitamui-library/src/public-api.ts index fe1ad0fe9a6..007c1a822bd 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/public-api.ts +++ b/ui/ui-frontend/projects/vitamui-library/src/public-api.ts @@ -42,7 +42,6 @@ export * from './lib/models/ontology'; export * from './lib/models/precise-date-query.interface'; export * from './lib/models/search-criteria.interface'; export * from './lib/models/search-query.interface'; -export * from './lib/models/search-response.interface'; export * from './lib/models/unit.interface'; export * from './lib/models/year-month-query.interface'; /* SERVICES */