From 216a2e208f6102d9f44f3ac06dd880bd1cd0f842 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 1 Oct 2020 15:44:12 +0200
Subject: [PATCH] FEAT #13271 TIME 1:15 add criteriatool in admin search +
remove lazy loading amdinistration
---
.../administration-routing.module.ts | 142 +++++++++---------
.../administration/administration.module.ts | 1 -
.../search-administration.component.html | 2 +
.../search/search-administration.component.ts | 5 +-
.../criteria-tool.component.html | 14 +-
.../criteria-tool.component.scss | 20 +++
.../criteria-tool/criteria-tool.component.ts | 7 +-
src/frontend/app/app-common.module.ts | 3 +
src/frontend/app/app-routing.module.ts | 4 -
src/frontend/app/app.module.ts | 6 +-
10 files changed, 116 insertions(+), 88 deletions(-)
diff --git a/src/frontend/app/administration/administration-routing.module.ts b/src/frontend/app/administration/administration-routing.module.ts
index 17b45047164..b29c0cd7ebe 100755
--- a/src/frontend/app/administration/administration-routing.module.ts
+++ b/src/frontend/app/administration/administration-routing.module.ts
@@ -59,77 +59,77 @@ import { SearchAdministrationComponent } from './search/search-administration.co
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', canActivate: [AppGuard], component: AdministrationComponent },
- { path: 'users', canActivate: [AppGuard], component: UsersAdministrationComponent },
- { path: 'users/new', canActivate: [AppGuard], component: UserAdministrationComponent },
- { path: 'users/:id', canActivate: [AppGuard], component: UserAdministrationComponent },
- { path: 'groups', canActivate: [AppGuard], component: GroupsAdministrationComponent },
- { path: 'groups/new', canActivate: [AppGuard], component: GroupAdministrationComponent },
- { path: 'groups/:id', canActivate: [AppGuard], component: GroupAdministrationComponent },
- { path: 'baskets', canActivate: [AppGuard], component: BasketsAdministrationComponent },
- { path: 'baskets/new', canActivate: [AppGuard], component: BasketAdministrationComponent },
- { path: 'baskets/:id', canActivate: [AppGuard], component: BasketAdministrationComponent },
- { path: 'doctypes', canActivate: [AppGuard], component: DoctypesAdministrationComponent },
- { path: 'diffusionModels', canActivate: [AppGuard], component: DiffusionModelsAdministrationComponent },
- { path: 'diffusionModels/new', canActivate: [AppGuard], component: DiffusionModelAdministrationComponent },
- { path: 'diffusionModels/:id', canActivate: [AppGuard], component: DiffusionModelAdministrationComponent },
- { path: 'entities', canActivate: [AppGuard], component: EntitiesAdministrationComponent },
- { path: 'statuses', canActivate: [AppGuard], component: StatusesAdministrationComponent },
- { path: 'statuses/new', canActivate: [AppGuard], component: StatusAdministrationComponent },
- { path: 'statuses/:identifier', canActivate: [AppGuard], component: StatusAdministrationComponent },
- { path: 'parameters', canActivate: [AppGuard], component: ParametersAdministrationComponent },
- { path: 'parameters/new', canActivate: [AppGuard], component: ParameterAdministrationComponent },
- { path: 'parameters/:id', canActivate: [AppGuard], component: ParameterAdministrationComponent },
- { path: 'priorities', canActivate: [AppGuard], component: PrioritiesAdministrationComponent },
- { path: 'priorities/new', canActivate: [AppGuard], component: PriorityAdministrationComponent },
- { path: 'priorities/:id', canActivate: [AppGuard], component: PriorityAdministrationComponent },
- { path: 'actions', canActivate: [AppGuard], component: ActionsAdministrationComponent },
- { path: 'actions/new', canActivate: [AppGuard], component: ActionAdministrationComponent },
- { path: 'actions/:id', canActivate: [AppGuard], component: ActionAdministrationComponent },
- { path: 'notifications', canActivate: [AppGuard], component: NotificationsAdministrationComponent },
- { path: 'notifications/new', canActivate: [AppGuard], component: NotificationAdministrationComponent },
- { path: 'notifications/:identifier', canActivate: [AppGuard], component: NotificationAdministrationComponent },
- { path: 'history', canActivate: [AppGuard], component: HistoryAdministrationComponent },
- { path: 'history-batch', canActivate: [AppGuard], component: HistoryBatchAdministrationComponent },
- { path: 'update-status', canActivate: [AppGuard], component: UpdateStatusAdministrationComponent },
- { path: 'contacts', canActivate: [AppGuard], component: ContactsListAdministrationComponent },
- { path: 'contacts/duplicates', canActivate: [AppGuard], component: ContactDuplicateComponent },
- { path: 'contacts/list', redirectTo: 'contacts', pathMatch: 'full' },
- { path: 'contacts/list/new', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
- { path: 'contacts/list/:id', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
- { path: 'contacts/contactsCustomFields', canActivate: [AppGuard], component: ContactsCustomFieldsAdministrationComponent },
- { path: 'contacts/contacts-groups', canActivate: [AppGuard], component: ContactsGroupsAdministrationComponent },
- { path: 'contacts/contacts-groups/new', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
- { path: 'contacts/contacts-groups/:id', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
- { path: 'contacts/contacts-parameters', canActivate: [AppGuard], component: ContactsParametersAdministrationComponent },
- { path: 'versions-update', canActivate: [AppGuard], component: VersionsUpdateAdministrationComponent },
- { path: 'docservers', canActivate: [AppGuard], component: DocserversAdministrationComponent },
- { path: 'docservers/new', canActivate: [AppGuard], component: DocserverAdministrationComponent },
- { path: 'templates', canActivate: [AppGuard], component: TemplatesAdministrationComponent },
- { path: 'templates/new', canActivate: [AppGuard], component: TemplateAdministrationComponent },
- { path: 'templates/:id', canActivate: [AppGuard], component: TemplateAdministrationComponent },
- { path: 'securities', canActivate: [AppGuard], component: SecuritiesAdministrationComponent },
- { path: 'sendmail', canActivate: [AppGuard], component: SendmailAdministrationComponent },
- { path: 'shippings', canActivate: [AppGuard], component: ShippingsAdministrationComponent },
- { path: 'shippings/new', canActivate: [AppGuard], component: ShippingAdministrationComponent },
- { path: 'shippings/:id', canActivate: [AppGuard], component: ShippingAdministrationComponent },
- { path: 'customFields', canActivate: [AppGuard], component: CustomFieldsAdministrationComponent },
- { path: 'indexingModels', canActivate: [AppGuard], component: IndexingModelsAdministrationComponent },
- { path: 'indexingModels/new', canActivate: [AppGuard], component: IndexingModelAdministrationComponent },
- { path: 'indexingModels/:id', canActivate: [AppGuard], component: IndexingModelAdministrationComponent },
- { path: 'tags', canActivate: [AppGuard], component: TagsAdministrationComponent },
- { path: 'tags/new', canActivate: [AppGuard], component: TagAdministrationComponent },
- { path: 'tags/:id', canActivate: [AppGuard], component: TagAdministrationComponent },
- { path: 'alfresco', canActivate: [AppGuard], component: AlfrescoListAdministrationComponent },
- { path: 'alfresco/new', canActivate: [AppGuard], component: AlfrescoAdministrationComponent },
- { path: 'alfresco/:id', canActivate: [AppGuard], component: AlfrescoAdministrationComponent },
- { path: 'registeredMails', canActivate: [AppGuard], component: RegisteredMailListComponent },
- { path: 'registeredMails/new', canActivate: [AppGuard], component: RegisteredMailComponent },
- { path: 'registeredMails/:id', canActivate: [AppGuard], component: RegisteredMailComponent },
- { path: 'issuingSites', canActivate: [AppGuard], component: IssuingSiteListComponent },
- { path: 'issuingSites/new', canActivate: [AppGuard], component: IssuingSiteComponent },
- { path: 'issuingSites/:id', canActivate: [AppGuard], component: IssuingSiteComponent },
- { path : 'search', canActivate : [AppGuard], component : SearchAdministrationComponent}
+ { path: 'administration', canActivate: [AppGuard], component: AdministrationComponent },
+ { path: 'administration/users', canActivate: [AppGuard], component: UsersAdministrationComponent },
+ { path: 'administration/users/new', canActivate: [AppGuard], component: UserAdministrationComponent },
+ { path: 'administration/users/:id', canActivate: [AppGuard], component: UserAdministrationComponent },
+ { path: 'administration/groups', canActivate: [AppGuard], component: GroupsAdministrationComponent },
+ { path: 'administration/groups/new', canActivate: [AppGuard], component: GroupAdministrationComponent },
+ { path: 'administration/groups/:id', canActivate: [AppGuard], component: GroupAdministrationComponent },
+ { path: 'administration/baskets', canActivate: [AppGuard], component: BasketsAdministrationComponent },
+ { path: 'administration/baskets/new', canActivate: [AppGuard], component: BasketAdministrationComponent },
+ { path: 'administration/baskets/:id', canActivate: [AppGuard], component: BasketAdministrationComponent },
+ { path: 'administration/doctypes', canActivate: [AppGuard], component: DoctypesAdministrationComponent },
+ { path: 'administration/diffusionModels', canActivate: [AppGuard], component: DiffusionModelsAdministrationComponent },
+ { path: 'administration/diffusionModels/new', canActivate: [AppGuard], component: DiffusionModelAdministrationComponent },
+ { path: 'administration/diffusionModels/:id', canActivate: [AppGuard], component: DiffusionModelAdministrationComponent },
+ { path: 'administration/entities', canActivate: [AppGuard], component: EntitiesAdministrationComponent },
+ { path: 'administration/statuses', canActivate: [AppGuard], component: StatusesAdministrationComponent },
+ { path: 'administration/statuses/new', canActivate: [AppGuard], component: StatusAdministrationComponent },
+ { path: 'administration/statuses/:identifier', canActivate: [AppGuard], component: StatusAdministrationComponent },
+ { path: 'administration/parameters', canActivate: [AppGuard], component: ParametersAdministrationComponent },
+ { path: 'administration/parameters/new', canActivate: [AppGuard], component: ParameterAdministrationComponent },
+ { path: 'administration/parameters/:id', canActivate: [AppGuard], component: ParameterAdministrationComponent },
+ { path: 'administration/priorities', canActivate: [AppGuard], component: PrioritiesAdministrationComponent },
+ { path: 'administration/priorities/new', canActivate: [AppGuard], component: PriorityAdministrationComponent },
+ { path: 'administration/priorities/:id', canActivate: [AppGuard], component: PriorityAdministrationComponent },
+ { path: 'administration/actions', canActivate: [AppGuard], component: ActionsAdministrationComponent },
+ { path: 'administration/actions/new', canActivate: [AppGuard], component: ActionAdministrationComponent },
+ { path: 'administration/actions/:id', canActivate: [AppGuard], component: ActionAdministrationComponent },
+ { path: 'administration/notifications', canActivate: [AppGuard], component: NotificationsAdministrationComponent },
+ { path: 'administration/notifications/new', canActivate: [AppGuard], component: NotificationAdministrationComponent },
+ { path: 'administration/notifications/:identifier', canActivate: [AppGuard], component: NotificationAdministrationComponent },
+ { path: 'administration/history', canActivate: [AppGuard], component: HistoryAdministrationComponent },
+ { path: 'administration/history-batch', canActivate: [AppGuard], component: HistoryBatchAdministrationComponent },
+ { path: 'administration/update-status', canActivate: [AppGuard], component: UpdateStatusAdministrationComponent },
+ { path: 'administration/contacts', canActivate: [AppGuard], component: ContactsListAdministrationComponent },
+ { path: 'administration/contacts/duplicates', canActivate: [AppGuard], component: ContactDuplicateComponent },
+ { path: 'administration/contacts/list', redirectTo: 'contacts', pathMatch: 'full' },
+ { path: 'administration/contacts/list/new', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
+ { path: 'administration/contacts/list/:id', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
+ { path: 'administration/contacts/contactsCustomFields', canActivate: [AppGuard], component: ContactsCustomFieldsAdministrationComponent },
+ { path: 'administration/contacts/contacts-groups', canActivate: [AppGuard], component: ContactsGroupsAdministrationComponent },
+ { path: 'administration/contacts/contacts-groups/new', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
+ { path: 'administration/contacts/contacts-groups/:id', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
+ { path: 'administration/contacts/contacts-parameters', canActivate: [AppGuard], component: ContactsParametersAdministrationComponent },
+ { path: 'administration/versions-update', canActivate: [AppGuard], component: VersionsUpdateAdministrationComponent },
+ { path: 'administration/docservers', canActivate: [AppGuard], component: DocserversAdministrationComponent },
+ { path: 'administration/docservers/new', canActivate: [AppGuard], component: DocserverAdministrationComponent },
+ { path: 'administration/templates', canActivate: [AppGuard], component: TemplatesAdministrationComponent },
+ { path: 'administration/templates/new', canActivate: [AppGuard], component: TemplateAdministrationComponent },
+ { path: 'administration/templates/:id', canActivate: [AppGuard], component: TemplateAdministrationComponent },
+ { path: 'administration/securities', canActivate: [AppGuard], component: SecuritiesAdministrationComponent },
+ { path: 'administration/sendmail', canActivate: [AppGuard], component: SendmailAdministrationComponent },
+ { path: 'administration/shippings', canActivate: [AppGuard], component: ShippingsAdministrationComponent },
+ { path: 'administration/shippings/new', canActivate: [AppGuard], component: ShippingAdministrationComponent },
+ { path: 'administration/shippings/:id', canActivate: [AppGuard], component: ShippingAdministrationComponent },
+ { path: 'administration/customFields', canActivate: [AppGuard], component: CustomFieldsAdministrationComponent },
+ { path: 'administration/indexingModels', canActivate: [AppGuard], component: IndexingModelsAdministrationComponent },
+ { path: 'administration/indexingModels/new', canActivate: [AppGuard], component: IndexingModelAdministrationComponent },
+ { path: 'administration/indexingModels/:id', canActivate: [AppGuard], component: IndexingModelAdministrationComponent },
+ { path: 'administration/tags', canActivate: [AppGuard], component: TagsAdministrationComponent },
+ { path: 'administration/tags/new', canActivate: [AppGuard], component: TagAdministrationComponent },
+ { path: 'administration/tags/:id', canActivate: [AppGuard], component: TagAdministrationComponent },
+ { path: 'administration/alfresco', canActivate: [AppGuard], component: AlfrescoListAdministrationComponent },
+ { path: 'administration/alfresco/new', canActivate: [AppGuard], component: AlfrescoAdministrationComponent },
+ { path: 'administration/alfresco/:id', canActivate: [AppGuard], component: AlfrescoAdministrationComponent },
+ { path: 'administration/registeredMails', canActivate: [AppGuard], component: RegisteredMailListComponent },
+ { path: 'administration/registeredMails/new', canActivate: [AppGuard], component: RegisteredMailComponent },
+ { path: 'administration/registeredMails/:id', canActivate: [AppGuard], component: RegisteredMailComponent },
+ { path: 'administration/issuingSites', canActivate: [AppGuard], component: IssuingSiteListComponent },
+ { path: 'administration/issuingSites/new', canActivate: [AppGuard], component: IssuingSiteComponent },
+ { path: 'administration/issuingSites/:id', canActivate: [AppGuard], component: IssuingSiteComponent },
+ { path: 'administration/search', canActivate : [AppGuard], component : SearchAdministrationComponent}
]),
],
exports: [
diff --git a/src/frontend/app/administration/administration.module.ts b/src/frontend/app/administration/administration.module.ts
index 78b966296a8..faaba712683 100755
--- a/src/frontend/app/administration/administration.module.ts
+++ b/src/frontend/app/administration/administration.module.ts
@@ -11,7 +11,6 @@ import { DocumentViewerModule } from '../viewer/document-viewer.module';
import { AdministrationService } from './administration.service';
-
import { AccountLinkComponent } from './user/account-link/account-link.component';
import { ActionAdministrationComponent } from './action/action-administration.component';
import { ActionsAdministrationComponent } from './action/actions-administration.component';
diff --git a/src/frontend/app/administration/search/search-administration.component.html b/src/frontend/app/administration/search/search-administration.component.html
index b8256907afa..907c36f91e5 100644
--- a/src/frontend/app/administration/search/search-administration.component.html
+++ b/src/frontend/app/administration/search/search-administration.component.html
@@ -34,6 +34,8 @@
</mat-select>
</mat-form-field>
<hr />
+ <app-criteria-tool #appCriteriaTool [adminMode]="true"></app-criteria-tool>
+ <hr/>
<mat-toolbar class="editorTool">
<span>
<button color="primary" *ngIf="displayMode=='label'" mat-icon-button (click)="toggleData()"
diff --git a/src/frontend/app/administration/search/search-administration.component.ts b/src/frontend/app/administration/search/search-administration.component.ts
index b62aaa25990..ef381536a9b 100644
--- a/src/frontend/app/administration/search/search-administration.component.ts
+++ b/src/frontend/app/administration/search/search-administration.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { TranslateService } from '@ngx-translate/core';
import { NotificationService } from '../../../service/notification/notification.service';
@@ -10,6 +10,7 @@ import { of } from 'rxjs/internal/observable/of';
import { AppService } from '../../../service/app.service';
import { HeaderService } from '../../../service/header.service';
import { data } from 'jquery';
+import { CriteriaToolComponent } from '@appRoot/adv-search/criteria-tool/criteria-tool.component';
declare var $: any;
@@ -243,6 +244,8 @@ export class SearchAdministrationComponent implements OnInit {
searchAdv: any = { listEvent: {}, listDisplay: {}, list_event_data: {} };
+ @ViewChild('appCriteriaTool', { static: true }) appCriteriaTool: CriteriaToolComponent;
+
constructor(public translate: TranslateService, public http: HttpClient, private notify: NotificationService, public appService: AppService, public headerService: HeaderService) { }
async ngOnInit(): Promise<void> {
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
index 36ef8005e2b..fd4a6375977 100755
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
@@ -1,12 +1,12 @@
<form (ngSubmit)="getCurrentCriteriaValues()" #criteriaFormUp="ngForm">
- <mat-form-field floatLabel="never" class="basket-search">
+ <mat-form-field *ngIf="!adminMode" floatLabel="never" class="basket-search">
<input class="metaSearch" type="text" matInput
[placeholder]="'lang.quickSearch' |Â translate">
<button mat-icon-button matPrefix>
<mat-icon class="fas fa-search"></mat-icon>
</button>
</mat-form-field>
- <mat-accordion class="criteria-container">
+ <mat-accordion [class.criteria-container]="!adminMode" [class.criteria-container-admin]="adminMode">
<mat-expansion-panel expanded #criteriaTool [expanded]="false" togglePosition="before">
<mat-expansion-panel-header>
<mat-panel-title>
@@ -24,7 +24,7 @@
</mat-form-field>
</div>
<button mat-menu-item *ngIf="(getFilteredCriterias() | async)?.length===0" disabled>{{'lang.noResult' | translate}}</button>
- <button mat-menu-item *ngFor="let item of getFilteredCriterias() | async |Â sortBy : 'label'" (click)="addCriteria(item)" [disabled]="isCurrentCriteriaById(item.identifier)">
+ <button mat-menu-item *ngFor="let item of getFilteredCriterias() | async |Â sortBy : 'label'" (click)="addCriteria(item);$event.stopPropagation()" [disabled]="isCurrentCriteriaById(item.identifier)">
<i class="fa {{item.icon}}" color="primary"
style="font-size:14px;width:50px;text-align:center;"></i> {{item.label}}
</button>
@@ -33,7 +33,7 @@
<span style="background: white;height: 1px;flex: 1;margin-left: 10px;"></span>
</mat-panel-title>
<mat-panel-description class="myCriterias" (click)="$event.stopPropagation()">
- <button type="button" mat-button class="button-form-primary"
+ <button type="button" *ngIf="!adminMode" mat-button class="button-form-primary"
style="width: auto; height: 24px; line-height: 0px;" [matMenuTriggerFor]="IndexingModelsMenu">
{{'lang.mySearchTemplates' | translate}}
<i class="fa fa-chevron-down" style="margin: 0 0 0 10px;"></i>
@@ -143,10 +143,10 @@
style="cursor:pointer;">
<mat-date-range-input [rangePicker]="picker">
<input matStartDate [placeholder]="'lang.start' | translate"
- [value]="field.control.value.start"
+ [value]="field.control.value.start" [disabled]="field.control.disabled"
(dateChange)="field.control.value.start=$event.value">
<input matEndDate [placeholder]="'lang.end' | translate"
- [value]="field.control.value.end"
+ [value]="field.control.value.end" [disabled]="field.control.disabled"
(dateChange)="field.control.value.end=$event.value">
</mat-date-range-input>
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
@@ -215,7 +215,7 @@
</ng-template>
</mat-expansion-panel>
</mat-accordion>
- <div class="col-md-12" style="text-align: center;">
+ <div *ngIf="!adminMode" class="col-md-12" style="text-align: center;">
<button mat-raised-button matSuffix color="default" type="submit">
{{'lang.searchMails' | translate}}
</button>
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
index 946d1c771fd..6c9b86f0697 100644
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
@@ -76,6 +76,26 @@
}
}
+.criteria-container-admin {
+ .mat-expansion-panel-header-title {
+ color: $primary;
+ align-items: center;
+ }
+
+ ::ng-deep .mat-expansion-panel-content {
+ background: white;
+ border-radius: 30px;
+ }
+
+ ::ng-deep .mat-expansion-panel-body {
+ padding-top: 5px;
+ }
+
+ ::ng-deep .mat-expansion-indicator::after {
+ // color: white;
+ }
+}
+
.criteria-list {
::ng-deep .mat-option-text {
display: flex;
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
index ce547f56f99..959f102a9d0 100644
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
@@ -123,7 +123,12 @@ export class CriteriaToolComponent implements OnInit {
})
).subscribe();
}, 500);
- this.getSearchTemplates();
+
+ if (!this.adminMode) {
+ this.getSearchTemplates();
+ } else {
+ this.toggleTool(true);
+ }
}
private _filter(value: string): string[] {
diff --git a/src/frontend/app/app-common.module.ts b/src/frontend/app/app-common.module.ts
index f1b05a92455..0139b781ea1 100755
--- a/src/frontend/app/app-common.module.ts
+++ b/src/frontend/app/app-common.module.ts
@@ -80,6 +80,7 @@ import { InternationalizationModule } from '../service/translate/internationaliz
import { TranslateService } from '@ngx-translate/core';
import { RegisteredMailImportComponent } from '@appRoot/registeredMail/import/registered-mail-import.component';
+import { CriteriaToolComponent } from '@appRoot/adv-search/criteria-tool/criteria-tool.component';
@NgModule({
@@ -137,6 +138,7 @@ import { RegisteredMailImportComponent } from '@appRoot/registeredMail/import/re
LinkedResourceListComponent,
NotesListComponent,
NoteEditorComponent,
+ CriteriaToolComponent
],
exports: [
@@ -186,6 +188,7 @@ import { RegisteredMailImportComponent } from '@appRoot/registeredMail/import/re
FolderInputComponent,
IssuingSiteInputComponent,
RegisteredMailRecipientInputComponent,
+ CriteriaToolComponent
],
providers: [],
entryComponents: [
diff --git a/src/frontend/app/app-routing.module.ts b/src/frontend/app/app-routing.module.ts
index 245906aecd8..a2a31aaaca6 100755
--- a/src/frontend/app/app-routing.module.ts
+++ b/src/frontend/app/app-routing.module.ts
@@ -29,10 +29,6 @@ const routes: Routes = [
path: 'install',
loadChildren: () => import('./installer/installer.module').then(m => m.InstallerModule)
},
- {
- path: 'administration',
- loadChildren: () => import('./administration/administration.module').then(m => m.AdministrationModule)
- },
{ path: 'signatureBook/users/:userId/groups/:groupId/baskets/:basketId/resources/:resId', canActivate: [AppGuard], component: SignatureBookComponent },
{ path: 'followed', canActivate: [AppGuard], component: FollowedDocumentListComponent },
{ path: 'saveNumericPackage', canActivate: [AppGuard], component: SaveNumericPackageComponent },
diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts
index bbc10ca94a7..536ec5918c3 100755
--- a/src/frontend/app/app.module.ts
+++ b/src/frontend/app/app.module.ts
@@ -3,6 +3,8 @@ import { NgModule, Injectable } from '@angular/core';
import { SharedModule } from './app-common.module';
import { AppRoutingModule } from './app-routing.module';
+import { AdministrationModule } from './administration/administration.module';
+
import { BrowserModule, HammerGestureConfig, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
@@ -23,8 +25,6 @@ import { ActionsService } from './actions/actions.service';
import { AppComponent } from './app.component';
-import { CriteriaToolComponent } from './adv-search/criteria-tool/criteria-tool.component';
-
// ACTIONS
import { SearchAdvListComponent } from './adv-search/list/search-adv-list.component';
@@ -138,6 +138,7 @@ export class MyHammerConfig extends HammerGestureConfig {
JoyrideModule.forRoot(),
SharedModule,
AppRoutingModule,
+ AdministrationModule,
DocumentViewerModule,
AppListModule,
],
@@ -193,7 +194,6 @@ export class MyHammerConfig extends HammerGestureConfig {
DevLangComponent,
DevToolComponent,
AcknowledgementReceptionComponent,
- CriteriaToolComponent,
SearchAdvListComponent,
ConfirmActionComponent,
ResMarkAsReadActionComponent,
--
GitLab