diff --git a/src/frontend/app/app-common.module.ts b/src/frontend/app/app-common.module.ts index c6a11fdee090f408f948be271bf0699a2bdf3611..8cd927b0f0dc9c7ea80ab76212c39771f24aab3a 100755 --- a/src/frontend/app/app-common.module.ts +++ b/src/frontend/app/app-common.module.ts @@ -63,6 +63,7 @@ import { DragDropDirective } from '../app/viewer/upload-f import { DiffusionsListComponent } from './diffusions/diffusions-list.component'; import { DocumentViewerComponent } from './viewer/document-viewer.component'; +import { HeaderService } from '../service/header.service'; @@ -157,6 +158,7 @@ export class MyHammerConfig extends HammerGestureConfig { DragDropDirective ], providers: [ + HeaderService, LatinisePipe, CookieService, { diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts index 5e66527dc96b13086a75b982274898bbf595469d..3d768058c1926cf33b8c4accd8805c2e3ccf54ef 100755 --- a/src/frontend/app/app.module.ts +++ b/src/frontend/app/app.module.ts @@ -4,7 +4,6 @@ import { SharedModule } from './app-common.module'; import { CustomSnackbarComponent, NotificationService } from './notification.service'; import { ConfirmModalComponent } from './confirmModal.component'; -import { HeaderService } from '../service/header.service'; import { FiltersListService } from '../service/filtersList.service'; import { AppComponent } from './app.component'; @@ -171,7 +170,7 @@ import { PrivilegeService } from '../service/privileges.service'; AddPrivateIndexingModelModalComponent, AttachmentShowModalComponent ], - providers: [ HeaderService, FiltersListService, FoldersService, NotificationService, PrivilegeService ], + providers: [ FiltersListService, FoldersService, NotificationService, PrivilegeService ], bootstrap: [ AppComponent ] }) export class AppModule { } diff --git a/src/frontend/app/menu/main-header.component.html b/src/frontend/app/menu/main-header.component.html index 423af982792838860e77cfc8067e62014f871700..827b7712aeac8f4e8e40d8d31cf87f91350b7d5f 100755 --- a/src/frontend/app/menu/main-header.component.html +++ b/src/frontend/app/menu/main-header.component.html @@ -10,7 +10,7 @@ <mat-icon mat-list-icon class="fa fa-th" style="font-size:20px;color:white;height:auto;"></mat-icon> </button> <mat-menu #applications="matMenu" class="headerMaarchShortcut"> - <ng-container *ngFor="let shortcut of menus"> + <ng-container *ngFor="let shortcut of menus | sortBy: 'label'"> <button (click)="gotToMenu(shortcut);" style="white-space:inherit;height: 100px;line-height:20px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{shortcut.comment}}"> <i class="{{shortcut.style}} fa-2x"></i> <br/>{{shortcut.label}} diff --git a/src/frontend/app/menu/main-header.component.ts b/src/frontend/app/menu/main-header.component.ts index 0195401eee2c2e3bffebb533de2f518ed596e1f3..36accf02857e710a1c067d4e3e2fc5a964c30323 100755 --- a/src/frontend/app/menu/main-header.component.ts +++ b/src/frontend/app/menu/main-header.component.ts @@ -48,7 +48,9 @@ export class MainHeaderComponent implements OnInit { } ngOnInit(): void { - this.menus = this.privilegeService.getCurrentUserMenus(); + setTimeout(() => { + this.menus = this.privilegeService.getCurrentUserMenus(); + }, 200); } setTitle(title: string) { diff --git a/src/frontend/service/app.guard.ts b/src/frontend/service/app.guard.ts index f1db35bb1e6c5854e441d48df7df2198a8d978b7..70960b81364b307fb7991bbff5e94fd6b64d4ac0 100644 --- a/src/frontend/service/app.guard.ts +++ b/src/frontend/service/app.guard.ts @@ -21,6 +21,7 @@ export class AppGuard implements CanActivate { localStorage.setItem('PreviousV2Route', state.url); if (this.headerService.user.id === undefined) { + console.log('toto'); return this.http.get('../../rest/currentUser/profile') .pipe( map((data: any) => { diff --git a/src/frontend/service/privileges.service.ts b/src/frontend/service/privileges.service.ts index 2a463c0f2a22db87a45219f6374652fc1ad15460..bf3a70134054e2c3c6c0a8c9e3f192ad1b202311 100644 --- a/src/frontend/service/privileges.service.ts +++ b/src/frontend/service/privileges.service.ts @@ -482,6 +482,7 @@ export class PrivilegeService { } getCurrentUserMenus() { + console.log(this.headerService.user); let menus = this.menus.filter(elem => this.headerService.user.privileges.indexOf(elem.id) > -1); if (this.headerService.user.groups.filter((group: any) => group.can_index === true).length > 0) {