FEAT #8345 Shortcut service

src/frontend/app/app.component.ts

@@ -12,6 +12,7 @@ export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
 
 declare const angularGlobals: any;
 declare function $j(selector: any): any;
+
 @Component({
     selector: 'my-app',
     template: `<main-header></main-header><router-outlet></router-outlet>`,
@@ -22,7 +23,6 @@ declare function $j(selector: any): any;
         '../css/engine.css',
         '../css/jstree-custom.min.css', //treejs module
         '../../../node_modules/ng2-dnd/bundles/style.css'
-
     ],
     viewProviders: [MatIconRegistry],
     providers: [
@@ -30,6 +30,7 @@ declare function $j(selector: any): any;
     ],
 })
 export class AppComponent {
+
     constructor(iconReg: MatIconRegistry, sanitizer: DomSanitizer) {
 
         iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('static.php?filename=logo_white.svg')).addSvgIcon('maarchLogoOnly', sanitizer.bypassSecurityTrustResourceUrl('img/logo_only_white.svg'));

src/frontend/app/app.module.ts

 import { NgModule }                             from '@angular/core';
 
-import { SharedModule }                      from './app-common.module';
+import { SharedModule }                         from './app-common.module';
 
 import { CustomSnackbarComponent }              from './notification.service';
 import { ConfirmModalComponent }                from './confirmModal.component';
+import { ShortcutMenuService }                  from '../service/shortcut-menu.service';
 
 import { AppComponent }                         from './app.component';
 import { AppRoutingModule }                     from './app-routing.module';
@@ -50,6 +51,7 @@ import { ActivateUserComponent }                from './activate-user.component'
         BottomSheetAttachmentList,
         BottomSheetDiffusionList
     ],
-    bootstrap: [AppComponent]
+    providers: [ ShortcutMenuService ],
+    bootstrap: [ AppComponent ]
 })
 export class AppModule { }

src/frontend/app/home.component.ts

@@ -108,5 +108,4 @@ export class HomeComponent extends AutoCompletePlugin implements OnInit {
     goToDetail(row:any){
         location.href = "index.php?page=details&dir=indexing_searching&id="+row.res_id;
     }
-
-}
+}
\ No newline at end of file

src/frontend/app/menu/main-header.component.html

@@ -7,7 +7,7 @@
     </h1>
     <span style="flex: 1 1 auto;"></span>
     <search-home></search-home>
-    <button mat-button [matMenuTriggerFor]="applications" *ngIf="!mobileMode" style="min-width: unset" matTooltip="{{lang.menu}}">
+    <button mat-button [matMenuTriggerFor]="applications" *ngIf="!mobileMode" style="min-width: unset; margin-left: 10px" matTooltip="{{lang.menu}}">
         <mat-icon mat-list-icon class="fa fa-th fa-lg" style="color:white; margin:0px 0px -11px 0px;"></mat-icon>
     </button>
     <mat-menu #applications="matMenu" class="headerMaarchShortcut">

src/frontend/app/menu/main-header.component.ts

-import { Component, OnInit, Input, NgZone, ViewChild  } from '@angular/core';
-import { LANG } from '../translate.component';
-import { MatSidenav } from '@angular/material';
-import { HttpClient } from '@angular/common/http';
-import { Router } from '@angular/router';
+import { Component, OnInit, NgZone } from '@angular/core';
+import { LANG }                 from '../translate.component';
+import { MatSidenav }           from '@angular/material';
+import { HttpClient }           from '@angular/common/http';
+import { Router }               from '@angular/router';
+import { ShortcutMenuService }  from '../../service/shortcut-menu.service';
+
 
 declare function $j(selector: any) : any;
 declare var angularGlobals : any;
@@ -10,22 +12,22 @@ declare var angularGlobals : any;
 
 @Component({
     selector    : "main-header",
-    templateUrl : "main-header.component.html",
+    templateUrl : "main-header.component.html"
 })
 export class MainHeaderComponent implements OnInit {
 
-    coreUrl    : string;
-    lang       : any       = LANG;
-    user       : any       = {firstname : "",lastname : ""};
-    mobileMode : boolean   = false;
-    titleHeader: string;
-    titleSubHeader: string;
-    router :any;
+    coreUrl         : string;
+    lang            : any       = LANG;
+    user            : any       = {firstname : "",lastname : ""};
+    mobileMode      : boolean   = false;
+    titleHeader     : string;
+    router          : any;
+
+    snav            : MatSidenav;
+    snav2           : MatSidenav;
 
-    snav : MatSidenav;
-    snav2 : MatSidenav;
 
-    constructor(public http: HttpClient, private zone: NgZone, private _router: Router) {
+    constructor(public http: HttpClient, private zone: NgZone, private _router: Router, private shortcut: ShortcutMenuService) {
         this.router = _router;
         this.mobileMode = angularGlobals.mobileMode;
         window['MainHeaderComponent'] = {
@@ -41,6 +43,9 @@ export class MainHeaderComponent implements OnInit {
             .subscribe((data: any) => {
                 this.user = data.user;
                 this.user.menu = data.menu;
+
+                this.shortcut.shortcutsData.user = data.user;
+                this.shortcut.shortcutsData.menu = data.menu;
             }, (err) => {
                 console.log(err.error.errors);
             });

src/frontend/app/menu/menuShortcut.component.html → src/frontend/app/menu/menu-shortcut.component.html

@@ -5,22 +5,22 @@
         <mat-expansion-panel style="margin-top:-7px;">
             <mat-expansion-panel-header>
                 <mat-panel-title style="justify-content: center;">
-                    {{user.firstname}} {{user.lastname | uppercase}}
+                    {{shortcut.shortcutsData.user.firstname}} {{shortcut.shortcutsData.user.lastname | uppercase}}
                 </mat-panel-title>
             </mat-expansion-panel-header>
             <mat-list>
                 <mat-divider></mat-divider>
-                <mat-list-item *ngFor="let group of user.groups">
+                <mat-list-item *ngFor="let group of shortcut.shortcutsData.user.groups">
                     <p mat-line style="color:#666;opacity:0.5;"> {{group.group_desc}} </p>
                 </mat-list-item>
                 <h3 mat-subheader style="color:#666;">{{lang.groups}}</h3>
                 <mat-divider></mat-divider>
-                <mat-list-item *ngFor="let group of user.groups">
+                <mat-list-item *ngFor="let group of shortcut.shortcutsData.user.groups">
                     <p mat-line style="color:#666;opacity:0.5;"> {{group.group_desc}} </p>
                 </mat-list-item>
                 <h3 mat-subheader style="color:#666;">{{lang.entities}}</h3>
                 <mat-divider></mat-divider>
-                <mat-list-item *ngFor="let entity of user.entities">
+                <mat-list-item *ngFor="let entity of shortcut.shortcutsData.user.entities">
                     <p mat-line style="color:#666;opacity:0.5;"> {{entity.entity_label}} </p>
                 </mat-list-item>
             </mat-list>
@@ -35,9 +35,9 @@
                 <mat-icon class="fa fa-home" style="height:auto;"></mat-icon>
             </button>
         </span>
-        <ng-container *ngFor="let shortcut of user.menu">
+        <ng-container *ngFor="let shortcut of shortcut.shortcutsData.menu">
             <span style="flex:1;text-align: left;padding: 5px;" *ngIf="shortcut.shortcut == 'true'">
-                <button color="primary" mat-icon-button (click)="gotToMenu(shortcut.servicepage,shortcut.angular);" matTooltip="{{shortcut.name}}">
+                <button color="primary" mat-icon-button (click)="gotToMenu(shortcut.servicepage, shortcut.angular);" matTooltip="{{shortcut.name}}">
                     <mat-icon class="fa {{shortcut.style}}" style="height:auto;"></mat-icon>
                 </button>
             </span>
@@ -52,4 +52,4 @@
         </p>
     </a>
 </mat-nav-list>
-<mat-divider></mat-divider>
+<mat-divider></mat-divider>
\ No newline at end of file

src/frontend/app/menu/menu-shortcut.component.ts

-import { Component, OnInit } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
-import { HttpClient } from '@angular/common/http';
-import {Location} from '@angular/common';
-import { LANG } from '../translate.component';
+import { Component, OnInit }    from '@angular/core';
+import { Router }               from '@angular/router';
+import { HttpClient }           from '@angular/common/http';
+import { Location }             from '@angular/common';
+import { LANG }                 from '../translate.component';
+import { ShortcutMenuService }  from '../../service/shortcut-menu.service';
 
 declare function $j(selector: any) : any;
 
@@ -11,41 +12,29 @@ declare var angularGlobals : any;
 
 @Component({
     selector: 'menu-shortcut',
-    templateUrl :   "menuShortcut.component.html",
+    templateUrl : "menu-shortcut.component.html",
 })
 export class MenuShortcutComponent implements OnInit {
 
-    lang: any = LANG;
-    mobileMode                      : boolean   = false;
-    coreUrl                     : string;
-    router :any;
-    user       : any       = {};
+    coreUrl     : string;
+    lang        : any       = LANG;
+    mobileMode  : boolean   = false;
+    router      : any;
 
-    constructor(public http: HttpClient, private _location: Location, private _router: Router, private activatedRoute:ActivatedRoute) {
+    constructor(public http: HttpClient, private _location: Location, private _router: Router, public shortcut: ShortcutMenuService) {
         this.mobileMode = angularGlobals.mobileMode;
         this.router = _router;
-
-        this.coreUrl = angularGlobals.coreUrl;
-
-        this.http.get(this.coreUrl + 'rest/header')
-        .subscribe((data: any) => {
-            this.user = data.user;
-            this.user.menu = data.menu;
-        }, (err) => {
-            console.log(err.error.errors);
-        });
     }
 
     ngOnInit(): void {      
         this.coreUrl = angularGlobals.coreUrl;
     }
 
-    gotToMenu(link:string, angularMode:string) {
+    gotToMenu(link: string, angularMode: string) {
         if (angularMode == 'true') {
             this.router.navigate([link]);
         } else{
             location.href = link;
         }
     }
-
 }

src/frontend/service/shortcut-menu.service.ts

+import { Injectable } from '@angular/core';
+
+@Injectable()
+export class ShortcutMenuService {
+
+    shortcutsData   : any = {
+        user : [],
+        menu : []
+    };
+}