diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html
index a045be067baa2c2a97c8e1b3d7ef26d6ea7e3a09..ced47c3a6295b536f64f8f6ac5745e7445069aaa 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html
@@ -79,8 +79,11 @@
</button>
</ng-container>
</div>
+ </div>
+
- <div class="d-flex justify-content-end">
+ <div class="row area-criteria">
+ <div class="d-flex justify-content-end button-space">
<button [matMenuTriggerFor]="menu" class="mat-boutton">
<button type="button" class="circle editable-field-cancel clickable">
<i class="material-icons primary-save-icon">save</i>
@@ -93,31 +96,26 @@
{{'ARCHIVE_SEARCH.SEARCH_CRITERIA_SAVER.NEW_SAVE_MENU' | translate}}
</button>
<app-search-criteria-list
- (storedSearchCriteriaHistory)="showStoredSearchCriteria($event)"
- (clearFilters)="clearFilters($event)">
+ (storedSearchCriteriaHistory)="showStoredSearchCriteria($event)">
</app-search-criteria-list>
</mat-menu>
</div>
- <div *ngIf="searchCriterias && searchCriterias.size > 0 " class="d-flex justify-content-end div-btn-delete">
+ <div *ngIf="searchCriterias && searchCriterias.size > 0 " class="d-flex justify-content-end div-btn-delete button-space">
<button class="mat-boutton">
<button type="button" class="circle editable-field-cancel clickable" (click)="clearCriterias()">
<i class="material-icons primary-save-icon">delete</i>
</button>
</button>
</div>
- </div>
- <div class="row justify-content-around">
- <div class="col-6">
- <a class="hide-ink" *ngIf="!showCriteriaPanel" (click)="showHidePanel()">{{'ARCHIVE_SEARCH.SHOW_SEARCH_CRITERIA'
- | translate}}</a>
- </div>
+ <div class="row justify-content-around">
+ <a class="hide-ink" *ngIf="!showCriteriaPanel" (click)="showHidePanel()">{{'ARCHIVE_SEARCH.SHOW_SEARCH_CRITERIA'
+ | translate}}</a>
+ </div>
</div>
-
-
<div class="card-criteria" *ngIf="showCriteriaPanel">
<div class="row">
<div class="col-11">
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.scss b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.scss
index a49ca17f5460f934ca50da1b1b567bf3f815d54b..456c2806cf332778db4a681cde4adce38fe38118 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.scss
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.scss
@@ -149,6 +149,7 @@
font-weight: bold;
margin-top: 10px;
margin-bottom: 10px;
+ padding-left: 30px;
}
.launch-search-btn{
@@ -233,11 +234,9 @@ top: 0px;
background: var(--vitamui-secondary);
border-radius: 50px;
-
flex: none;
order: 0;
flex-grow: 0;
-margin: 0px 20px;
border: none;
}
@@ -286,4 +285,8 @@ border: none;
.btn-new-save {
font-size: 16px;
+}
+.button-space {
+ margin-left: -20px;
+ padding-left: 30px;
}
\ No newline at end of file
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 2127265b1b4678b7a8f647cb7ca7aa504c11c6fa..8a34f18ad14a0c14c7bb8b5b6b739e72059d038c 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
@@ -308,12 +308,6 @@ emptyForm = {
this.showCriteriaPanel = !this.showCriteriaPanel;
}
- clearFilters(event: boolean) {
- if (event) {
- this.clearCriterias();
- }
- }
-
showStoredSearchCriteria(event: SearchCriteriaHistory) {
if (this.searchCriterias.size > 0) {
this.searchCriterias = new Map();
@@ -597,6 +591,7 @@ emptyForm = {
for (const node of nodes) {
node.hidden = false;
node.checked = show;
+ node.count = null;
this.recursiveCheck(node.children, show);
}
}
@@ -737,6 +732,7 @@ emptyForm = {
this.included = false;
this.nbQueryCriteria = 0;
this.setFilingHoldingScheme();
+ this.archiveExchangeDataService.emitFilingHoldingNodes(this.nodeArray);
this.checkAllNodes(false);
}
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-list/search-criteria-list.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-list/search-criteria-list.component.ts
index 29286a4d1eda5149887796dfe95f8b27f417be3d..3f4b30b430b0d2a7c33320bce02b0d8e130630c5 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-list/search-criteria-list.component.ts
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/search-criteria-list/search-criteria-list.component.ts
@@ -56,9 +56,6 @@ export class SearchCriteriaListComponent implements OnInit {
@Output()
storedSearchCriteriaHistory = new EventEmitter<any>();
- @Output()
- clearFilters = new EventEmitter<boolean>();
-
searchCriteriaHistory: SearchCriteriaHistory[];
private readonly orderChange = new Subject<string>();
direction: Direction = Direction.ASCENDANT;
@@ -116,7 +113,6 @@ export class SearchCriteriaListComponent implements OnInit {
data: {type: 'searchCriteriaHistoryDeleted', name: searchCriteriaHistory.name},
duration: 10000
});
- this.clearFilters.emit(true);
});
});
}
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 bf482a427379af5e6bb4a02598b6544fbcdda024..3411b29f9154e35470dea8d8e8aca1907ce42957 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
@@ -115,8 +115,14 @@ export class FilingHoldingSchemeComponent implements OnInit, OnChanges {
}
this.filterNodes();
});
-}
+ this.archiveSharedDataServiceService.getFilingHoldingNodes().subscribe(nodes => {
+ if (nodes) {
+ this.fullNodes = nodes;
+ this.showAllTreeNodes();
+ }
+ });
+}
convertNodesToList(holdingSchemas: FilingHoldingSchemeNode[]): string[] {
let nodeDataList : string[] = [];
for(const node of holdingSchemas) {
diff --git a/ui/ui-frontend/projects/archive-search/src/assets/i18n/fr.json b/ui/ui-frontend/projects/archive-search/src/assets/i18n/fr.json
index dbb578e9039d4fd4c1e57a36ac560a7e60471ce6..a5f5db2739d5857b6496cef1883bba81e75fe24c 100644
--- a/ui/ui-frontend/projects/archive-search/src/assets/i18n/fr.json
+++ b/ui/ui-frontend/projects/archive-search/src/assets/i18n/fr.json
@@ -99,7 +99,7 @@
"SAVE_REPLACE_CANCEL_BUTTON": "ANNULER",
"SAVE_DELETE_CRITERIA_LABEL": "Suppression de la",
"SAVE_DELETE_CRITERIA_MESSGE": "Voulez-vous supprimer la sauvegarde enregistrée ?",
- "NO_RESULTS": "Pas de critères enregistrées!",
+ "NO_RESULTS": "Pas de critères enregistrés",
"SAVED_WITH_SUCCESS": "Vos critères de recherche ont été correctement sauvegardés sous le nom ",
"DELETED_WITH_SUCCESS_1": "Votre sauvegarde sous le nom ",
"DELETED_WITH_SUCCESS_2": " a bien été supprimée.",