MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

[Monitor Dashboard | Trunk]: Remove general route. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59626 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2020-10-19 16:46:48 +00:00
parent 4688d48db6
commit 4da9a7cc9c
4 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/app-routing.module.ts
View File

@ -31,13 +31,6 @@ const routes: Routes = [
resolve: {envSpecific: EnvironmentSpecificResolver},
data: {hasAdminMenu: true}
},
{
path: 'admin/:stakeholder/general',
loadChildren: './manageStakeholder/manageStakeholder.module#ManageStakeholderModule',
resolve: {envSpecific: EnvironmentSpecificResolver},
data: {hasAdminMenu: true}
},
{
path: 'admin/:stakeholder/users',
loadChildren: './users/users.module#UsersModule',
@ -45,9 +38,10 @@ const routes: Routes = [
data: {hasAdminMenu: true}
},
{
path: 'admin/:stakeholder',
loadChildren: './stakeholder/stakeholder.module#StakeholderModule',
path: 'admin/:stakeholder',
loadChildren: './manageStakeholder/manageStakeholder.module#ManageStakeholderModule',
resolve: {envSpecific: EnvironmentSpecificResolver},
data: {hasAdminMenu: true}
},
{
path: 'admin/:stakeholder/indicators/:topic',

2
src/app/app.component.ts
View File

@ -230,7 +230,7 @@ export class AppComponent implements OnInit, OnDestroy {
rootItem: new MenuItem("", "Dashboard",
"", '/'+ this.stakeholder.alias+'/', false, [], null, {}), items: []
});
this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/"+this.stakeholder.alias + '/general', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/"+this.stakeholder.alias, false, [], [], {}, "<i uk-icon=\"image\"></i>"));
this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/"+this.stakeholder.alias + '/indicators', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/"+this.stakeholder.alias+"/users", false, [], [], {}, "<i uk-icon=\"users\"></i>"));
this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin",false, [], null, {});

8
src/app/manageStakeholder/edit-stakeholder/edit-stakeholder.component.ts
View File

@ -74,12 +74,8 @@ import {UtilitiesService} from "../../openaireLibrary/services/utilities.service
[placeholder]="'Select a type'" hint="Select the type of your profile"
label="Type" [options]="stakeholderUtils.types" type="select">
</div>
<ng-container *ngIf="!stakeholderFb.get('isDefault').value && isNew && stakeholderFb.get('type').valid">
<div *ngIf="defaultStakeholdersOptions.length === 0" class="uk-text-danger uk-width-1-3@m">No default profiles
has been found
for this type.
</div>
<div *ngIf="defaultStakeholdersOptions.length > 0" [placeholder]="'Select a template'"
<ng-container *ngIf="!stakeholderFb.get('isDefault').value && isNew && stakeholderFb.get('type').valid && defaultStakeholdersOptions">
<div [placeholder]="'Select a template'"
hint="Select a template for your profile"
dashboard-input class="uk-width-1-3@m" [formInput]="stakeholderFb.get('defaultId')"
label="Template" [options]="defaultStakeholdersOptions" type="select"></div>

7
src/app/manageStakeholders/manageStakeholders.component.html
View File

@ -36,8 +36,7 @@
uk-grid>
<loading *ngIf="loading"></loading>
<ng-template ngFor [ngForOf]="defaultStakeholders" let-stakeholder let-i="index">
<a *ngIf="stakeholder" [routerLink]="stakeholder.alias+'/indicators'+(stakeholder.topics.length > 0 ?
'/' + stakeholder.topics[0].alias:'')">
<a *ngIf="stakeholder" [routerLink]="stakeholder.alias">
<div class="uk-card uk-card-default">
<div class=" uk-padding-small uk-card-header">
<div class="md-card-toolbar-actions uk-float-right" [class.uk-flex-middle]="!grid" [class.uk-flex]="!grid">
@ -122,9 +121,7 @@
uk-grid>
<loading *ngIf="loading"></loading>
<ng-template ngFor [ngForOf]="displayStakeholders" let-stakeholder let-i="index">
<a *ngIf="stakeholder"
[routerLink]="stakeholder.alias+'/indicators'+(stakeholder.topics.length > 0 ?
'/' + stakeholder.topics[0].alias:'')">
<a *ngIf="stakeholder" [routerLink]="stakeholder.alias">
<div class="uk-card uk-card-default">
<div class=" uk-padding-small uk-card-header">
<div class="md-card-toolbar-actions uk-float-right" [class.uk-flex-middle]="!grid" [class.uk-flex]="!grid">