MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Explore | Library | new-theme]: resources.service.ts & menu.ts & navigationBar.component.ts & navigationBar.component.html & app.component.ts: Removed deprecated RootMenuItem and used MenuItem instead.

This commit is contained in:
Konstantina Galouni 2022-09-20 18:00:19 +03:00
parent b1842543e7
commit 4cec2907da
4 changed files with 36 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monitor/services/resources.service.ts
View File

@ -1,5 +1,5 @@
import {Injectable} from "@angular/core"; import {Injectable} from "@angular/core";
import {MenuItem, RootMenuItem} from "../../sharedComponents/menu"; import {MenuItem} from "../../sharedComponents/menu";
import {Option} from "../../sharedComponents/input/input.component"; import {Option} from "../../sharedComponents/input/input.component";
import {StakeholderEntities} from "../entities/stakeholder"; import {StakeholderEntities} from "../entities/stakeholder";
import {from, Subscription} from "rxjs"; import {from, Subscription} from "rxjs";
@ -64,12 +64,12 @@ export class ResourcesService {
/** /**
* @deprecated * @deprecated
* */ * */
setResourcesDeprecated(items: RootMenuItem[], prefix = '', portal: string = null) { setResourcesDeprecated(items: MenuItem[], prefix = '', portal: string = null) {
if (this.subscription) { if (this.subscription) {
this.subscription.unsubscribe(); this.subscription.unsubscribe();
} }
let resources = new MenuItem('resources', 'Resources', "", "", false, [], null, {}); let resources = new MenuItem('resources', 'Resources', "", "", false, [], null, {});
let index = items.push({rootItem: resources, items: []}) - 1; let index = items.push(resources) - 1;
this.subscription = from(this.getResourcesItemsAsync(prefix, portal)).subscribe(resourcesItems => { this.subscription = from(this.getResourcesItemsAsync(prefix, portal)).subscribe(resourcesItems => {
items[index].items = resourcesItems; items[index].items = resourcesItems;
}); });

30
sharedComponents/menu.ts
View File

@ -24,7 +24,7 @@ export class MenuItem {
constructor(id: string, title: string, url: string, route: string, needsAuthorization: boolean, entitiesRequired: string[], constructor(id: string, title: string, url: string, route: string, needsAuthorization: boolean, entitiesRequired: string[],
routeRequired: string[], params, icon: Icon = null, fragment = null, customClass = null, routeActive = null, routeRequired: string[], params, icon: Icon = null, fragment = null, customClass = null, routeActive = null,
target: string = "_blank", type: string = "internal", isFeatured: boolean = false) { target: string = "_blank", type: string = "internal", isFeatured: boolean = false, items: MenuItem[] = []) {
this._id = id; this._id = id;
this.title = title; this.title = title;
this.url = url; this.url = url;
@ -34,7 +34,7 @@ export class MenuItem {
this.entitiesRequired = entitiesRequired; this.entitiesRequired = entitiesRequired;
this.routeRequired = routeRequired; this.routeRequired = routeRequired;
this.params = params; this.params = params;
this.items = []; this.items = items;
this.icon = icon; this.icon = icon;
this.fragment = fragment; this.fragment = fragment;
this.customClass = customClass; this.customClass = customClass;
@ -80,30 +80,6 @@ export class Menu {
menuItems: MenuItemExtended[] = []; menuItems: MenuItemExtended[] = [];
} }
/** export class SideMenuItem extends MenuItem {
* @deprecated
* */
export class RootMenuItem {
rootItem: MenuItem;
items: MenuItem[] = [];
public static isTheActiveRootMenu(menu: RootMenuItem, currentRoute: string): boolean {
if (currentRoute == menu.rootItem.route) {
return true;
} else if (menu.items.length > 0) {
for (let menuItem of menu.items) {
let isActive = MenuItem.isTheActiveMenu(menuItem, currentRoute);
if (isActive) {
return true;
}
}
return false;
}
}
}
export class SideMenuItem {
rootItem: MenuItem;
items: RootMenuItem[] = [];
ukIcon: string = ''; ukIcon: string = '';
} }

42
sharedComponents/navigationBar.component.html
View File

@ -36,19 +36,19 @@
<a routerLink="/" (click)="closeCanvas(canvas)">Home</a> <a routerLink="/" (click)="closeCanvas(canvas)">Home</a>
</li> </li>
<li [class.uk-active]="isTheActiveMenu(menu)" <li [class.uk-active]="isTheActiveMenu(menu)"
*ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)"> *ngIf="isAtleastOneEnabled(menu.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.routeRequired, showPage)">
<!--a routerLink="{{menu.rootItem.route}}" [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a--> <!--a routerLink="{{menu.rootItem.route}}" [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a-->
<a *ngIf="menu.rootItem.route.length > 0 && (isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired)" <a *ngIf="menu.route.length > 0 && (isEnabled([menu.route], showPage) || !menu.routeRequired)"
routerLink="{{menu.rootItem.route}}" (click)="closeCanvas(canvas)" routerLink="{{menu.route}}" (click)="closeCanvas(canvas)"
[queryParams]="menu.rootItem.params" [queryParams]="menu.params"
[fragment]="menu.rootItem.fragment">{{menu.rootItem.title}}</a> [fragment]="menu.fragment">{{menu.title}}</a>
<a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0" <a *ngIf="menu.route.length == 0 && menu.url.length > 0"
href="{{menu.rootItem.url}}" (click)="closeCanvas(canvas)" [class.custom-external]="menu.rootItem.target != '_self'" href="{{menu.url}}" (click)="closeCanvas(canvas)" [class.custom-external]="menu.target != '_self'"
target="{{menu.rootItem.target}}">{{menu.rootItem.title}}</a> target="{{menu.target}}">{{menu.title}}</a>
<a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || <a *ngIf="(menu.route.length == 0 && menu.url.length == 0) ||
(menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) (menu.route.length >0 && menu.routeRequired && !isEnabled([menu.route], showPage)
&& isAtleastOneEnabled(menu.rootItem.routeRequired, showPage))" && isAtleastOneEnabled(menu.routeRequired, showPage))"
(click)="closeCanvas(canvas)">{{menu.rootItem.title}}</a> (click)="closeCanvas(canvas)">{{menu.title}}</a>
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<ng-container *ngFor="let submenu of menu.items"> <ng-container *ngFor="let submenu of menu.items">
<li [class.uk-active]="isTheActiveMenu(submenu)" <li [class.uk-active]="isTheActiveMenu(submenu)"
@ -131,16 +131,16 @@
</li> </li>
<ng-container *ngFor="let menu of menuItems"> <ng-container *ngFor="let menu of menuItems">
<li class="uk-parent" [class.uk-active]="isTheActiveMenu(menu)" <li class="uk-parent" [class.uk-active]="isTheActiveMenu(menu)"
*ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)"> *ngIf="isAtleastOneEnabled(menu.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.routeRequired, showPage)">
<!--a routerLink="{{menu.rootItem.route}}" [queryParams]=menu.rootItem.params class="" aria-expanded="false">{{menu.rootItem.title}}</a--> <!--a routerLink="{{menu.rootItem.route}}" [queryParams]=menu.rootItem.params class="" aria-expanded="false">{{menu.rootItem.title}}</a-->
<a *ngIf="menu.rootItem.route.length > 0 && (isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired )" <a *ngIf="menu.route.length > 0 && (isEnabled([menu.route], showPage) || !menu.routeRequired )"
routerLink="{{menu.rootItem.route}}" routerLink="{{menu.route}}"
[queryParams]="menu.rootItem.params" [queryParams]="menu.params"
[fragment]="menu.rootItem.fragment"> {{menu.rootItem.title}}</a> [fragment]="menu.fragment"> {{menu.title}}</a>
<a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0" <a *ngIf="menu.route.length == 0 && menu.url.length > 0"
href="{{menu.rootItem.url}}" target="{{menu.rootItem.target}}" href="{{menu.url}}" target="{{menu.target}}"
[class.custom-external]="menu.rootItem.target != '_self'">{{menu.rootItem.title}}</a> [class.custom-external]="menu.target != '_self'">{{menu.title}}</a>
<a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || ( menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage))">{{menu.rootItem.title}}</a> <a *ngIf="(menu.route.length == 0 && menu.url.length == 0) || ( menu.route.length >0 && menu.routeRequired && !isEnabled([menu.route], showPage) && isAtleastOneEnabled(menu.routeRequired, showPage))">{{menu.title}}</a>
<div *ngIf="menu.items.length > 0" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left uk-height-max-medium uk-overflow-auto"> <div *ngIf="menu.items.length > 0" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left uk-height-max-medium uk-overflow-auto">
<!-- Do not delete this div, because it will remove the margin bottom of navbar --> <!-- Do not delete this div, because it will remove the margin bottom of navbar -->
<div> <div>

18
sharedComponents/navigationBar.component.ts
View File

@ -2,7 +2,7 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {Session, User} from '../login/utils/helper.class'; import {Session, User} from '../login/utils/helper.class';
import {ConfigurationService} from '../utils/configuration/configuration.service'; import {ConfigurationService} from '../utils/configuration/configuration.service';
import {MenuItem, RootMenuItem} from './menu'; import {MenuItem} from './menu';
import {EnvProperties} from '../utils/properties/env-properties'; import {EnvProperties} from '../utils/properties/env-properties';
import {Subscription} from 'rxjs'; import {Subscription} from 'rxjs';
import {HelpContentService} from '../services/help-content.service'; import {HelpContentService} from '../services/help-content.service';
@ -38,7 +38,7 @@ export class NavigationBarComponent implements OnInit, OnDestroy {
@Input() communityId; @Input() communityId;
@Input() showCommunityName: boolean = false; @Input() showCommunityName: boolean = false;
@Input() userMenuItems: MenuItem[]; @Input() userMenuItems: MenuItem[];
@Input() menuItems: RootMenuItem []; @Input() menuItems: MenuItem[];
@Input() header: Header; @Input() header: Header;
@Input() showMenu: boolean = true; @Input() showMenu: boolean = true;
@Input() homeurl: boolean = true; @Input() homeurl: boolean = true;
@ -182,13 +182,13 @@ export class NavigationBarComponent implements OnInit, OnDestroy {
} }
} }
isTheActiveMenu(menu: MenuItem | RootMenuItem): boolean { isTheActiveMenu(menu: MenuItem): boolean {
if(menu instanceof MenuItem || !menu.rootItem) { // if(menu instanceof MenuItem) {
return MenuItem.isTheActiveMenu(<MenuItem> menu, this.currentRoute, this.layoutService.activeMenuItem); return MenuItem.isTheActiveMenu(<MenuItem> menu, this.currentRoute, this.layoutService.activeMenuItem);
} else { // } else {
let item: MenuItem = menu.rootItem; // let item: MenuItem = menu.rootItem;
item.items = menu.items; // item.items = menu.items;
return MenuItem.isTheActiveMenu(item, this.currentRoute, this.layoutService.activeMenuItem); // return MenuItem.isTheActiveMenu(item, this.currentRoute, this.layoutService.activeMenuItem);
} // }
} }
} }